Changeset facb052 in sasmodels

Timestamp:

Mar 27, 2019 12:02:32 PM (6 years ago)

Author:

richardh

Branches:

master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests

Children:

a7db39fa, a430f5f

Parents:

0b8a1fc

Message:

added some debug print in direct_model

Location:

sasmodels

Files:

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

sasmodels/direct_model.py

@@ -59 +59 @@
     """
     mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono)
-    #print("pars", list(zip(*mesh))[0])
+    print("in call_kernel: pars:", list(zip(*mesh))[0])
     call_details, values, is_magnetic = make_kernel_args(calculator, mesh)
-    #print("values:", values)
+    #print("in call_kernel: values:", values)
     return calculator(call_details, values, cutoff, is_magnetic)
 
@@ -76 +76 @@
     R_eff_type = int(pars.pop(RADIUS_MODE_ID, 1.0))
     mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono)
-    #print("pars", list(zip(*mesh))[0])
+    print("in call_Fq: pars", list(zip(*mesh))[0])
     call_details, values, is_magnetic = make_kernel_args(calculator, mesh)
-    #print("values:", values)
+    #print("in call_Fq: values:", values)
     return calculator.Fq(call_details, values, cutoff, is_magnetic, R_eff_type)
 
@@ -118 +118 @@
         active = lambda name: True
 
-    #print("pars",[p.id for p in parameters.call_parameters])
+    print("in get_mesh: pars:",[p.id for p in parameters.call_parameters])
     mesh = [_get_par_weights(p, values, active(p.name))
             for p in parameters.call_parameters]

sasmodels/model_test.py

@@ -242 +242 @@
                     # build the P@S model
                     s_info = load_model_info(s_name)
+                    print("in run_all: s_info:", s_info)
                     ps_info = product.make_product_info(self.info, s_info)
                     ps_model = build_model(ps_info, dtype=self.dtype,

sasmodels/models/sphere.py

@@ -99 +99 @@
      0.1, None, None, 120., None, 1.0],
     [{"@S": "hardsphere"},
-       0.1, 0.7940350343881906], # this is current value, not verified elsewhere yet
+       0.1, 0.7940350343881906], # Q=0.1 this is current value, not verified elsewhere yet
         [{"@S": "hardsphere",          # hard sphere structure factor
      "structure_factor_mode": 1,  # decoupling approximation
-     "effective_radius_type": 1, "radius_effective":27.0  # equivalent sphere   Currently have hardwired model_test to accept radius_effective BUT doe sit get passed to S(Q)???
+     "effective_radius_type": 1, "radius_effective":27.0 # 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) ?
+     # effective_radius_type does NOT appear in the list, has it been stripped out???
          }, 0.1, 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]
+#       [{"@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