Changes in sasmodels/product.py [2ed7de0:b39bf3b] in sasmodels

File:

• sasmodels/product.py (modified) (4 diffs)

sasmodels/product.py

@@ -39 +39 @@
 STRUCTURE_MODE_ID = "structure_factor_mode"
 RADIUS_MODE_ID = "radius_effective_mode"
+# rkh add this to pass to model_test
+RADIUS_TYPE_ID = "effective_radius_type"
 RADIUS_ID = "radius_effective"
 VOLFRAC_ID = "volfraction"
@@ -282 +284 @@
         # unless the model doesn't support beta mode, in which case it is first
         have_radius_type = p_info.effective_radius_type is not None
+        #print(p_npars,s_npars)
         radius_type_offset = 2+p_npars+s_npars + (1 if have_beta_mode else 0)
+        print(values[radius_type_offset])
         radius_type = int(values[radius_type_offset]) if have_radius_type else 0
 
@@ -340 +344 @@
         # polydispersity distribution slot in the values array due to
         # implementation details in kernel_iq.c.
-        #print("R_eff=%d:%g, volfrac=%g, volume ratio=%g"
-        #      % (radius_type, effective_radius, volfrac, volume_ratio))
+        print("R_eff=%d:%g, volfrac=%g, volume ratio=%g"
+              % (radius_type, effective_radius, volfrac, volume_ratio))
         if radius_type > 0:
             # set the value to the model R_eff and set the weight to 1
@@ -356 +360 @@
 
         # Combine form factor and structure factor
-        #print("beta", beta_mode, F1, F2, S)
+        print("beta", beta_mode, F1, F2, S)
         PS = F2 + F1**2*(S-1) if beta_mode else F2*S
         final_result = combined_scale*PS + background