Changeset 1edf610 in sasmodels

Timestamp:

Mar 21, 2016 10:54:55 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

a4e2ae5, afda63c

Parents:

839283a

Message:

debug checkin

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• core.py (modified) (1 diff)
• generate.py (modified) (3 diffs)

sasmodels/compare.py

@@ -452 +452 @@
     """
     # initialize the code so time is more accurate
-    value = calculator(**suppress_pd(pars))
+    #value = calculator(**suppress_pd(pars))
     toc = tic()
     for _ in range(max(Nevals, 1)):  # make sure there is at least one eval

sasmodels/core.py

@@ -225 +225 @@
         weights = [1.0]*len(values)
     else:
-        wv_pairs = [get_weights(p, pars) for p in kernel.info['parameters']]
-        weights, values = [v for v in zip(*wv_pairs)]
+        vw_pairs = [get_weights(p, pars) for p in kernel.info['parameters']]
+        values, weights = zip(*vw_pairs)
 
     #TODO: This is what we thought to do if max([len(w) for w in weights]) > 1:
-    if max([w for w in weights]) > 1:
+    print("from")
+    import pprint; pprint.pprint(weights)
+    print("to")
+    if max([len(w) for w in weights]) > 1:
         details = generate.poly_details(kernel.info, weights)
     else:

sasmodels/generate.py

@@ -684 +684 @@
 
 def poly_details(model_info, weights):
+    print("entering poly",weights)
     pars = model_info['parameters'][2:]  # skip scale and background
     max_pd = model_info['max_pd']
     npars = len(pars) # scale and background already removed
-    p = 5*max_pd
-    constants_offset = p + 3*npars
+    par_offset = 5*max_pd
+    constants_offset = par_offset + 3*npars
 
     # Decreasing list of polydispersity lengths
@@ -707 +708 @@
             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')
     details[0*max_pd:1*max_pd] = idx             # pd_par
@@ -713 +721 @@
     details[3*max_pd:4*max_pd] = pd_stride
     details[4*max_pd:5*max_pd] = pd_isvol[idx]
-    details[p+0*npars:p+1*npars] = par_offsets
-    details[p+1*npars:p+2*npars] = 0  # no coordination for most
-    details[p+2*npars:p+3*npars] = 0  # no fast coord with 0
-    coord_offset = p+1*pars
+    details[par_offset+0*npars:par_offset+1*npars] = par_offsets
+    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
     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] = theta_par
+    print ("details",details)
     return details