Changeset 3842

Timestamp:

Mar 7, 2019 2:15:49 PM (5 years ago)

Author:

vondreele

Message:

force number of integration bins to be divisible by 4 - solves crash problem from fortran histogram routine

Location:

trunk

Files:

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

trunk/GSASIIimage.py

@@ -961 +961 @@
     LRazm = np.array(data['LRazimuth'],dtype=np.float64)
     numAzms = data['outAzimuths']
-    numChans = data['outChannels']
+    numChans = (data['outChannels']//4)*4
     Dazm = (LRazm[1]-LRazm[0])/numAzms
     if '2-theta' in data.get('binType','2-theta'):

trunk/GSASIIimgGUI.py

@@ -894 +894 @@
         def OnNumOutAzms(invalid,value,tc):
             wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=tc.event)
+            
+        def OnNumOutBins(invalid,value,tc):
+            data['outChannels'] = (data['outChannels']//4)*4
+            outChan.SetValue(data['outChannels'])
         
         def OnOblique(event):
@@ -979 +983 @@
         dataSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' No. 2-theta/azimuth bins'),0,WACV)
         littleSizer = wx.BoxSizer(wx.HORIZONTAL)
-        outChan = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,'outChannels',typeHint=int,min=10)
+        outChan = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,'outChannels',typeHint=int,min=10,OnLeave=OnNumOutBins)
         littleSizer.Add(outChan,0,WACV)
         outAzim = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,'outAzimuths',nDig=(10,4),min=1,typeHint=int,OnLeave=OnNumOutAzms)