Changeset e6c1491 in sasmodels

Timestamp:

Mar 21, 2016 4:45:31 PM (9 years ago)

Author:

wojciech

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

ea1f14d

Parents:

5462ffb (diff), 25b30fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'polydisp' of ​https://github.com/SasView/sasmodels into polydisp

Location:

sasmodels

Files:

• kernelcl.py (modified) (1 diff)
• generate.py (modified) (4 diffs)
• kernel_iq.c (modified) (3 diffs)

sasmodels/kernelcl.py

@@ -244 +244 @@
             #print("compiling",name)
             dtype = np.dtype(dtype)
-            program = compile_model(self.get_context(dtype), source, dtype, fast)
+            program = compile_model(self.get_context(dtype), str(source), dtype, fast)
             self.compiled[key] = program
         return self.compiled[key]

sasmodels/generate.py

@@ -687 +687 @@
     print([p.name for p in model_info['parameters']])
     pars = model_info['parameters'][2:]  # skip scale and background
+    weights = weights[2:]
     max_pd = model_info['max_pd']
     npars = len(pars) # scale and background already removed
@@ -696 +697 @@
     pd_length = np.array([len(w) for w in weights])
     print (pd_length)
+    print (weights)
     pd_offset = np.cumsum(np.hstack((0, pd_length)))
     pd_isvol = np.array([p.type=='volume' for p in pars])
@@ -708 +710 @@
         if theta_par >= 0 and pd_length[theta_par] <= 1:
             theta_par = -1
-
-    print("p","max_pd","constants_offset",par_offset,max_pd,constants_offset,npars)
-    print(idx)
-    print(pd_length[idx])
-    print(pd_offset[idx])
-    print(pd_stride)
-    print(pd_isvol[idx])
 
     details = np.empty(constants_offset + 2, 'int32')
@@ -725 +720 @@
     details[par_offset+1*npars:par_offset+2*npars] = 0  # no coordination for most
     details[par_offset+2*npars:par_offset+3*npars] = 0  # no fast coord with 0
-    coord_offset = par_offset+1*pars
+    coord_offset = par_offset+1*npars
     for k,parameter_num in enumerate(idx):
         details[coord_offset+parameter_num] = 2**k
-    details[constants_offset]   = 1   # fast_coord_count: one fast index
+    details[constants_offset] = 1   # fast_coord_count: one fast index
     details[constants_offset+1] = theta_par
     print ("details",details)

sasmodels/kernel_iq.c

@@ -56 +56 @@
   local int offset[NPARS];  // NPARS excludes scale/background
 
-#if 1 // defined(USE_SHORTCUT_OPTIMIZATION)
+#if 0 // defined(USE_SHORTCUT_OPTIMIZATION)
   if (problem->pd_length[0] == 1) {
     // Shouldn't need to copy!!
@@ -77 +77 @@
 #endif
 
-
+  printf("Entering polydispersity\n");
   // Since we are no longer looping over the entire polydispersity hypercube
   // for each q, we need to track the normalization values for each q in a
@@ -193 +193 @@
     }
   }
+  
   //Makes a normalization avialable for the next round
   result[nq] = norm;