Changeset 1834 for trunk

Timestamp:

May 4, 2015 9:10:23 AM (10 years ago)

Author:

vondreele

Message:

redefine azimuthal angle in Sample Parms as the center of the azimuthal bin; the azimuthat angle in Instrument parms is defined as the mean angle for polarization (only 0-90 & slightly different)
some cosmetic changes to GUI displays
fix imports/G2pwd_fxye.py to handle multi time-maps found in HIPPO data & the slightly screwy one in HIPD data

Location:

trunk

Files:

• GSASIIIO.py (modified) (3 diffs)
• GSASIIddataGUI.py (modified) (11 diffs)
• GSASIIimage.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (3 diffs)
• imports/G2pwd_fxye.py (modified) (3 diffs)

trunk/GSASIIIO.py ¶

@@ -1037 +1037 @@
     LRazm = data['LRazimuth']
     Azms = []
+    dazm = 0.
     if data['fullIntegrate'] and data['outAzimuths'] == 1:
         Azms = [45.0,]                              #a poor man's average?
@@ -1045 +1046 @@
             else:    
                 Azms.append(G2img.meanAzm(azm,azms[i+1]))
+        dazm = np.min(np.abs(np.diff(azms)))/2.
     for i,azm in enumerate(azms[:-1]):
-        Aname = name+" Azm= %.2f"%(Azms[i])
+        Aname = name+" Azm= %.2f"%((azm+dazm)%360.)
         item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
         nOcc = 0
@@ -1061 +1063 @@
         Sample['Chi'] = data['GonioAngles'][1]
         Sample['Phi'] = data['GonioAngles'][2]
-        Sample['Azimuth'] = Azms[i]     #put here too
+        Sample['Azimuth'] = (azm+dazm)%360.    #put here as bin center 
         if 'PWDR' in Aname:
             parms = ['PXC',data['wavelength'],0.0,0.99,1.0,-0.10,0.4,0.30,1.0,0.0001,Azms[i]]    #set polarization for synchrotron radiation!

trunk/GSASIIddataGUI.py ¶

@@ -145 +145 @@
         scaleRef.SetValue(UseList[G2frame.hist]['Scale'][1])
         scaleRef.Bind(wx.EVT_CHECKBOX, OnScaleRef)
-        scaleSizer.Add(scaleRef,0,WACV)
+        scaleSizer.Add(scaleRef,0,WACV|wx.LEFT,5)
         scaleVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.4f'%(UseList[G2frame.hist]['Scale'][0]),style=wx.TE_PROCESS_ENTER)
@@ -470 +470 @@
         Indx[lgmixRef.GetId()] = [G2frame.hist,name]
         lgmixRef.Bind(wx.EVT_CHECKBOX, OnRef)
-        lgmixSizer.Add(lgmixRef,0,WACV)
+        lgmixSizer.Add(lgmixRef,0,WACV|wx.LEFT,5)
         lgmixVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.4f'%(UseList[G2frame.hist][name][1][2]),style=wx.TE_PROCESS_ENTER)
@@ -476 +476 @@
         lgmixVal.Bind(wx.EVT_TEXT_ENTER,OnVal)
         lgmixVal.Bind(wx.EVT_KILL_FOCUS,OnVal)
-        lgmixSizer.Add(lgmixVal,0,WACV)
+        lgmixSizer.Add(lgmixVal,0,WACV|wx.LEFT,5)
         return lgmixSizer
                     
@@ -486 +486 @@
         Indx[reset.GetId()] = [G2frame.hist,name]
         reset.Bind(wx.EVT_CHECKBOX,OnReset)
-        resetSizer.Add(reset,0,WACV|wx.TOP,5)
+        resetSizer.Add(reset,0,WACV|wx.TOP|wx.LEFT,5)
         return resetSizer
         
@@ -496 +496 @@
         Indx[sizeRef.GetId()] = [G2frame.hist,0]
         sizeRef.Bind(wx.EVT_CHECKBOX, OnRef)
-        isoSizer.Add(sizeRef,0,WACV)
+        isoSizer.Add(sizeRef,0,WACV|wx.LEFT,5)
         sizeVal = wx.TextCtrl(DData,wx.ID_ANY,
             fmt%(UseList[G2frame.hist][parm][1][0]),style=wx.TE_PROCESS_ENTER)
@@ -583 +583 @@
             Indx[hstrainRef.GetId()] = [G2frame.hist,id]
             hstrainRef.Bind(wx.EVT_CHECKBOX, OnHstrainRef)
-            hstrainSizer.Add(hstrainRef,0,WACV)
+            hstrainSizer.Add(hstrainRef,0,WACV|wx.LEFT,5)
             hstrainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.3g'%(val),style=wx.TE_PROCESS_ENTER)
             Indx[hstrainVal.GetId()] = [G2frame.hist,id]
@@ -654 +654 @@
             ODFval.Bind(wx.EVT_TEXT_ENTER,OnODFValue)
             ODFval.Bind(wx.EVT_KILL_FOCUS,OnODFValue)
-            ODFSizer.Add(ODFval,0,WACV)
+            ODFSizer.Add(ODFval,0,WACV|wx.LEFT,5)
         return ODFSizer
         
@@ -702 +702 @@
         extRef.SetValue(UseList[G2frame.hist]['Extinction'][1])
         extRef.Bind(wx.EVT_CHECKBOX, OnExtRef)
-        extSizer.Add(extRef,0,WACV)
+        extSizer.Add(extRef,0,WACV|wx.LEFT,5)
         extVal = wx.TextCtrl(DData,wx.ID_ANY,
             '%.2f'%(UseList[G2frame.hist]['Extinction'][0]),style=wx.TE_PROCESS_ENTER)
@@ -760 +760 @@
                 Indx[Eref.GetId()] = [G2frame.hist,ekey]
                 Eref.Bind(wx.EVT_CHECKBOX, OnEref)
-                val2Sizer.Add(Eref,0,WACV)
+                val2Sizer.Add(Eref,0,WACV|wx.LEFT,5)
                 Eval = wx.TextCtrl(DData,wx.ID_ANY,
                     '%10.3e'%(UseList[G2frame.hist]['Extinction'][2][ekey][0]),style=wx.TE_PROCESS_ENTER)
@@ -778 +778 @@
             Indx[babRef.GetId()] = [G2frame.hist,bab]
             babRef.Bind(wx.EVT_CHECKBOX, OnBabRef)
-            babSizer.Add(babRef,0,WACV)
+            babSizer.Add(babRef,0,WACV|wx.LEFT,5)
             babVal = wx.TextCtrl(DData,wx.ID_ANY,
                 '%.3f'%(UseList[G2frame.hist]['Babinet']['Bab'+bab][0]),style=wx.TE_PROCESS_ENTER)
@@ -821 +821 @@
         useData.Bind(wx.EVT_CHECKBOX, OnUseData)
         useData.SetValue(UseList[G2frame.hist]['Use'])
-        bottomSizer.Add(showSizer,0,WACV|wx.TOP|wx.BOTTOM,5)
+        bottomSizer.Add(showSizer,0,WACV|wx.TOP|wx.BOTTOM|wx.LEFT,5)
         
         bottomSizer.Add(ScaleSizer(),0,WACV|wx.BOTTOM,5)

trunk/GSASIIimage.py ¶

@@ -431 +431 @@
     AZM = lambda a,b: npacosd(0.5*(npsind(2.*b)-npsind(2.*a))/(np.pi*(b-a)/180.))/2.
     azm = AZM(a,b)
-    quad = int((a+b)/180.)
-    if quad == 1:
-        azm = 180.-azm
-    elif quad == 2:
-        azm += 180.
-    elif quad == 3:
-        azm = 360-azm
+#    quad = int((a+b)/180.)
+#    if quad == 1:
+#        azm = 180.-azm
+#    elif quad == 2:
+#        azm += 180.
+#    elif quad == 3:
+#        azm = 360-azm
     return azm      
        

trunk/GSASIIpwdGUI.py ¶

@@ -117 +117 @@
     parms.append(['Chi','Goniometer chi:',[10,3]])
     parms.append(['Phi','Goniometer phi:',[10,3]])
-    parms.append(['Azimuth','Detector azimuth',[10,3]])
-    parms.append(['Time','Clock time (s)',[12,3]])
+    parms.append(['Azimuth','Detector azimuth:',[10,3]])
+    parms.append(['Time','Clock time (s):',[12,3]])
     parms.append(['Temperature','Sample temperature (K): ',[10,3]])
     parms.append(['Pressure','Sample pressure (MPa): ',[10,3]])
@@ -1607 +1607 @@
         if not G2frame.dataFrame.GetStatusBar():
             Status = G2frame.dataFrame.CreateStatusBar()            
+            Status.SetStatusText('NB: Azimuth is used for polarization only')
         G2frame.Bind(wx.EVT_MENU,OnCalibrate,id=G2gd.wxID_INSTCALIB)
         G2frame.Bind(wx.EVT_MENU,OnLoad,id=G2gd.wxID_INSTLOAD)
@@ -1618 +1619 @@
         G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.InstMenu)
         if not G2frame.dataFrame.GetStatusBar():
-            Status = G2frame.dataFrame.CreateStatusBar()            
+            Status = G2frame.dataFrame.CreateStatusBar()
         G2frame.Bind(wx.EVT_MENU,OnInstCopy,id=G2gd.wxID_INSTCOPY)
     MakeParameterWindow()

trunk/imports/G2pwd_fxye.py ¶

@@ -135 +135 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
+                if len(self.clockWd) == 1:
+                    x = Tmap2TOF(self.TimeMap['1'],self.clockWd['1'])
+                else:
+                    x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
             return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
         
@@ -177 +180 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
+                if len(self.clockWd) == 1:
+                    x = Tmap2TOF(self.TimeMap['1'],self.clockWd['1'])
+                else:
+                    x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
             return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
            
@@ -213 +219 @@
             cons = TimeMap[8:].split()
             mapNo = cons[0]
-            if mapNo == '10': mapNo = '1'   #HIPD cluge!
+            if 'TIME_MAP10' in TimeMap: mapNo = '1'   #HIPD cluge!
             Nch = int(cons[1])
             Nrec = int(cons[2])