Changeset 144e032a in sasview for src/sas/sascalc/calculator/sas_gen.py

Timestamp:

Nov 14, 2017 8:57:07 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f0ce6e2

Parents:

a57ae07

Message:

tinycc doesn't return structures, so must pass return structure as pointer

File:

• src/sas/sascalc/calculator/sas_gen.py (modified) (1 diff)

src/sas/sascalc/calculator/sas_gen.py

@@ -133 +133 @@
         sldn = copy.deepcopy(self.data_sldn)
         sldn -= self.params['solvent_SLD']
-        model = mod.new_GenI((1 if self.is_avg else 0),
-                             pos_x, pos_y, pos_z,
-                             sldn, self.data_mx, self.data_my,
-                             self.data_mz, self.data_vol,
-                             self.params['Up_frac_in'],
-                             self.params['Up_frac_out'],
-                             self.params['Up_theta'])
+        # **** WARNING **** new_GenI holds pointers to numpy vectors
+        # be sure that they are contiguous double precision arrays and make 
+        # sure the GC doesn't eat them before genicom is called.
+        # TODO: rewrite so that the parameters are passed directly to genicom
+        args = (
+            (1 if self.is_avg else 0),
+            pos_x, pos_y, pos_z,
+            sldn, self.data_mx, self.data_my,
+            self.data_mz, self.data_vol,
+            self.params['Up_frac_in'],
+            self.params['Up_frac_out'],
+            self.params['Up_theta'])
+        model = mod.new_GenI(*args)
         if len(qy):
             qx, qy = _vec(qx), _vec(qy)