Changeset 08e2af7 in sasmodels

Timestamp:

Dec 12, 2016 6:26:21 AM (8 years ago)

Author:

jhbakker

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

15ec718

Parents:

777d369

Message:

Memerror fix

File:

• sasmodels/sesans.py (modified) (2 diffs)

sasmodels/sesans.py

@@ -44 +44 @@
 
     def _set_q(self):
-        q_min = dq = 0.1 * 2*pi / self.Rmax
+        #q_min = dq = 0.1 * 2*pi / self.Rmax
+
         q_max = self.zaccept
+        q_min = dq = q_max / 100000
         q=np.arange(q_min, q_max, q_min)
         self.q = q
@@ -57 +59 @@
 
         H0 = dq / (2 * pi) * q
-        repSE, repq = np.meshgrid(SElength, q)
-        repq=np.array(repq,dtype='float32')
-        repSE=np.array(repSE,dtype='float32')
-        H = dq / (2 * pi) * j0(repSE*repq)*repq
+        q=np.array(q,dtype='float32')
+        SElength=np.array(SElength,dtype='float32')
+
+        # Using numpy tile, dtype is conserved
+        repq=np.tile(q,(SElength.size,1))
+        repSE=np.tile(SElength,(q.size,1))
+        H = dq / (2 * pi) * j0(repSE*repq.T)*repq.T
+
+        # Using numpy meshgrid - meshgrid produces float64 from float32 inputs! Problem for 32-bit OS: Memerrors!
+        #H0 = dq / (2 * pi) * q
+        #repSE, repq = np.meshgrid(SElength, q)
+        #repq=np.array(repq,dtype='float32')
+        #repSE=np.array(repSE,dtype='float32')
+        #H = dq / (2 * pi) * j0(repSE*repq)*repq
 
         self._H, self._H0 = H, H0