Changes in / [25b30fd:e6c1491] in sasmodels

Location:

sasmodels

Files:

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

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;