Changeset 2195

Timestamp:

Apr 3, 2016 2:30:21 PM (7 years ago)

Author:

vondreele

Message:

remove selected area image multiplier - not necessary
fix image scaling issues for selected area simulations
fix issues with absent pydiffaxlib & DIFFaX.exe on some platforms

Location:

trunk

Files:

• GSASIIgrid.py (modified) (4 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIpwd.py (modified) (5 diffs)

trunk/GSASIIgrid.py

@@ -506 +506 @@
         self.lmax = '2'
         self.lmaxChoice = [str(i+1) for i in range(6)]
-        self.mult = '1'
-        self.multChoice = [str(2**i) for i in range(10)]
         self.Parms = parms
         self.Parm = None
@@ -527 +525 @@
         def OnMaxL(event):
             self.lmax = lmax.GetValue()
-            
-        def OnMult(event):
-            self.mult = mult.GetValue()
             
         def OnParmSel(event):
@@ -592 +587 @@
             planeSizer.Add(lmax,0,WACV)            
             mainSizer.Add(planeSizer)
-            multSizer = wx.BoxSizer(wx.HORIZONTAL)
-            multSizer.Add(wx.StaticText(self.panel,label=' Image scale: '),0,WACV)
-            mult = wx.ComboBox(self.panel,value=self.mult,choices=self.multChoice,
-                style=wx.CB_READONLY|wx.CB_DROPDOWN)
-            mult.Bind(wx.EVT_COMBOBOX,OnMult)
-            multSizer.Add(mult,0,WACV)
-            mainSizer.Add(multSizer)
         OkBtn = wx.Button(self.panel,-1,"Ok")
         OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
@@ -617 +605 @@
     def GetSelection(self):
         if 'powder' in self.calcType:
-            return '0\n0\n3\n','','','',self.Parm,self.parmRange,self.parmStep
+            return '0\n0\n3\n','','',self.Parm,self.parmRange,self.parmStep
         elif 'selected' in self.calcType:
-            return '0\n0\n4\n1\n%d\n%d\n16\n1\n%d\n0\nend\n'%    \
-                (self.planeChoice.index(self.plane)+1,self.lmaxChoice.index(self.lmax)+1,   \
-                self.multChoice.index(self.mult)+1),self.plane,self.lmax,self.mult,       \
-                self.Parm,self.parmRange,self.parmStep
+            return '0\n0\n4\n1\n%d\n1\n16\n1\n%d\n0\nend\n'%    \
+                (self.planeChoice.index(self.plane)+1,self.lmaxChoice.index(self.lmax)+1),   \
+                self.plane,self.lmax,self.Parm,self.parmRange,self.parmStep
 
     def OnOk(self,event):

trunk/GSASIIphsGUI.py

@@ -2431 +2431 @@
             lmax = float(Layers['Sadp']['Lmax'])
             XY = 2*lmax*np.mgrid[0:256:256j,0:256:256j]/256.-lmax
+            G2frame.Cmax = 1.0
             G2plt.PlotXYZ(G2frame,XY,Layers['Sadp']['Img'].T,labelX=labels[:-1],
                 labelY=labels[-1],newPlot=False,Title=Layers['Sadp']['Plane'])
@@ -2925 +2926 @@
         dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
         if dlg.ShowModal() == wx.ID_OK:
-            ctrls,plane,lmax,mult,x,x,x = dlg.GetSelection()
+            ctrls,plane,lmax,x,x,x = dlg.GetSelection()
             data['Layers']['Sadp'] = {}
             data['Layers']['Sadp']['Plane'] = plane
             data['Layers']['Sadp']['Lmax'] = lmax
-            data['Layers']['Sadp']['Mult'] = mult
         else:
             return
@@ -2981 +2981 @@
             data['Layers']['Sadp']['Plane'] = plane
             data['Layers']['Sadp']['Lmax'] = lmax
-            data['Layers']['Sadp']['Mult'] = mult
             data['Layers']['Multi'] = [parm,parmRange,parmStep]
         else:

trunk/GSASIIpwd.py

@@ -40 +40 @@
     import pydiffax as pyx
 except ImportError:
-    print 'the pydiffax library could not be loaded'
+    print 'pydiffax is not available for this platform - under develpment'
 
     
@@ -1916 +1916 @@
     df.close()    
     time0 = time.time()
-    subp.call(DIFFaX)
+    try:
+        subp.call(DIFFaX)
+    except OSError:
+        print 'DIFFax.exe is not available for this platform - under development'
     print 'DIFFaX time = %.2fs'%(time.time()-time0)
     if os.path.exists('GSASII-DIFFaX.spc'):
@@ -1979 +1982 @@
     planeId = ['h0l','0kl','hhl','h-hl'].index(Layers['Sadp']['Plane'])+1
     lmax = int(Layers['Sadp']['Lmax'])
-    mult = int(Layers['Sadp']['Mult'])
+    mult = 1
 # Sequences
     StkType = ['recursive','explicit'].index(Layers['Stacking'][0])
@@ -2046 +2049 @@
     hkLim,Incr,Nblk = pyx.pygetsadp(controls,Nspec,spec)
     Sapd = np.zeros((256,256))
-    maxInt = np.max(spec[1:])
-    Scale = mult*32767./maxInt
     iB = 0
     for i in range(hkLim):
@@ -2064 +2065 @@
             Sapd[:,p2] = spec[iB:iF]
         iB += Nblk
-    Sapd *= Scale
-    Sapd = np.where(Sapd<32767.,Sapd,32767.)
     Layers['Sadp']['Img'] = Sapd
     print 'GETSAD time = %.2fs'%(time.time()-time0)