Changes in / [d8e81f7:2ed7de0] in sasmodels

Location:

sasmodels

Files:

• direct_model.py (modified) (1 diff)
• model_test.py (modified) (2 diffs)
• models/sphere.py (modified) (2 diffs)
• product.py (modified) (3 diffs)

sasmodels/direct_model.py

@@ -61 +61 @@
     #print("in call_kernel: pars:", list(zip(*mesh))[0])
     call_details, values, is_magnetic = make_kernel_args(calculator, mesh)
-    print("in call_kernel: values:", values)
+    #print("in call_kernel: values:", values)
     return calculator(call_details, values, cutoff, is_magnetic)
 

sasmodels/model_test.py

@@ -247 +247 @@
                                            platform=self.platform)
                     # run the tests
-<<<<<<< HEAD
-                    #self.info = ps_model.info
-                    #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters])
-                    #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters])
-=======
->>>>>>> 2ed7de04217c5103c5fd8d7c14e29e04923269d5
                     results.append(self.run_one(ps_model, ps_test))
 
@@ -310 +304 @@
             """Run a single test case."""
             user_pars, x, y = test[:3]
-            print("PS MODEL PARAMETERS:",[p.id for p in model.info.parameters.call_parameters])
             pars = expand_pars(model.info.parameters, user_pars)
             invalid = invalid_pars(model.info.parameters, pars)

sasmodels/models/sphere.py

@@ -75 +75 @@
               ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld",
                "Solvent scattering length density"],
-              ["radius", "Ang", 45, [0, inf], "volume",
+              ["radius", "Ang", 50, [0, inf], "volume",
                "Sphere radius"],
              ]
@@ -92 +92 @@
 
 tests = [
-   #  [{}, 0.2, 0.726362],
-   #  [{"scale": 1., "background": 0., "sld": 6., "sld_solvent": 1.,
-   #    "radius": 120., "radius_pd": 0.2, "radius_pd_n":45},
-   #   0.2, 0.2288431],
-   # [{"radius": 120., "radius_pd": 0.02, "radius_pd_n":45},
-   #   0.2, 792.0646662454202, [1166737.0473152], 120.0, 7246723.820358589, 1.0], # the longer list here checks  F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars)
-   #  #          But note P(Q) = F2/volume,  F1 and F2 are vectors, for some reason only F2 needs square brackets
-   #  #          BUT what is scaling of F1 ???  At low Pd F2 ~ F1^2 ?
-   # [{"@S": "hardsphere"},
-   #    0.01, 55.881884232102124], # this is current value, not verified elsewhere yet
-   # [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45},
-   #   0.2, 1.233304061, [1850806.119736], 120.0, 8087664.1226, 1.0], # the longer list here checks  F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars)
-   # [{"@S": "hardsphere"},
-   #     0.2, 0.14730859242492958], #  this is current value, not verified elsewhere yet
-    # [{"@S": "hardsphere"},
-    #    0.1, 0.7940350343811906], #  this is current value, not verified elsewhere yet
-    [{"@S": "hardsphere",
-     "radius": 120., "radius_pd": 0.2, "radius_pd_n":45,
-     "volfraction":0.2,
-     "radius_effective":45.0,        # hard sphere structure factor
-     "structure_factor_mode": 1,  # decoupling approximation
-     #"effective_radius_type": 1 # equivalent sphere   Currently have hardwired model_test to accept radius_effective
-     # direct_model has the name & value BUT does it get passed to S(Q)???  What about volfracion, plus the many parameters used by other S(Q) ?
+    [{}, 0.2, 0.726362],
+    [{"scale": 1., "background": 0., "sld": 6., "sld_solvent": 1.,
+      "radius": 120., "radius_pd": 0.2, "radius_pd_n":45},
+     0.2, 0.2288431],
+    [{"radius": 120., "radius_pd": 0.02, "radius_pd_n":45}, 0.2,
+     # F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars) at q=0.2
+     792.0646662454202, 1166737.0473152, 120.0, 7246723.820358589, 1.0],
+    #  But note P(Q) = F2/volume+background,  F1 and F2 are vectors
+    #  BUT what is scaling of F1 ???  At low Pd F2 ~ F1^2 ?
+   [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 0.2,
+     # F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars) at q=0.2
+     1.233304061, 1850806.119736, 120.0, 8087664.1226, 1.0],
+    [{"@S": "hardsphere"},
+       0.01, 55.881884232102124], # current value, not verified elsewhere yet
+    [{"@S": "hardsphere"},
+       0.2, 0.14730859242492958], # current value, not verified elsewhere yet
+    [{"@S": "hardsphere"},
+       0.1, 0.7940350343811906], # current value, not verified elsewhere yet
+    [{"@S": "hardsphere",        # hard sphere structure factor
+     "structure_factor_mode": 1, # decoupling approximation
+     "radius_effective_mode": 1,
+     # Currently have hardwired model_test to accept radius_effective
+     "radius_effective": 27.0, # equivalent sphere
+     # direct_model has the name & value BUT does it get passed to S(Q)???
+     # What about volfracion, plus the many parameters used by other S(Q) ?
      # effective_radius_type does NOT appear in the list, has it been stripped out???
-     }, 0.01, 0.7940350343881906],
-        # [{"@S": "hardsphere",          # hard sphere structure factor
-    # "structure_factor_mode": 2,  #  -  WHY same result?
-    # "effective_radius_type": 2, "radius_effective":23.0    #
-        #  }, 0.1, 0.7940350343881906]
+     }, 0.1, 0.7940350343881906],
+#    [{"@S": "hardsphere",          # hard sphere structure factor
+#     "structure_factor_mode": 3,  #  -  WHY same result?
+#     "effective_radius_type": 3, "radius_effective": 23.0    #
+#     }, 0.1, 0.7940350343881906]
 ]
-# putting None for expected result will pass the test if there are no errors from the routine, but without any check on the value of the result
+# putting None for expected result will pass the test if there are no errors
+# from the routine, but without any check on the value of the result

sasmodels/product.py

@@ -282 +282 @@
         # 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
 
@@ -342 +340 @@
         # 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
@@ -358 +356 @@
 
         # 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