Changeset 4349

Timestamp:

Mar 8, 2020 10:40:55 PM (4 years ago)

Author:

toby

Message:

fix integration over azimuths with no pixels

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIimage.py (modified) (2 diffs)

trunk/GSASII.py

@@ -25 +25 @@
 
 import sys
-import os
+#import os
 import platform
 import wx

trunk/GSASIIimage.py

@@ -34 +34 @@
 import GSASIIpwd as G2pwd
 import GSASIIspc as G2spc
-import GSASIImath as G2mth
+#import GSASIImath as G2mth
 import GSASIIfiles as G2fil
 
@@ -1218 +1218 @@
     H0msk = [ma.array(np.divide(h0,nst),mask=np.logical_not(nst)) for nst,h0 in zip(NST,H0)]
     #make linear interpolators; outside limits give NaN
-    H0int = [scint.interp1d(h2msk.compressed(),h0msk.compressed(),bounds_error=False) for h0msk,h2msk in zip(H0msk,H2msk)]
-    #do interpolation on all points - fills in the empty bins; leaves others the same
-    H0 = np.array([h0int(H2[:-1]) for h0int in H0int])
-    H0 = np.nan_to_num(H0)
+    H0 = []
+    for h0msk,h2msk in zip(H0msk,H2msk):
+        try:
+            h0int = scint.interp1d(h2msk.compressed(),h0msk.compressed(),bounds_error=False)
+            #do interpolation on all points - fills in the empty bins; leaves others the same
+            h0 = h0int(H2[:-1])
+            H0.append(h0)
+        except ValueError:
+            H0.append(np.zeros(numChans,order='F',dtype=np.float32))
+    H0 = np.nan_to_num(np.array(H0))        
     if 'log(q)' in data.get('binType',''):
         H2 = 2.*npasind(np.exp(H2)*data['wavelength']/(4.*np.pi))