Changeset 5254

Timestamp:

Mar 29, 2022 3:39:01 PM (12 months ago)

Author:

vondreele

Message:

fix image integration for 2-theta stepped images
fix issues with unnecessary menu items for SASD/REFD data types

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIimage.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (6 diffs)

trunk/GSASIIdataGUI.py

@@ -6318 +6318 @@
         self.PostfillDataMenu()
         
+        # SASD & REFD / Limits
+        G2G.Define_wxId('wxID_SASDLIMITCOPY', )
+        self.SASDLimitMenu = wx.MenuBar()
+        self.PrefillDataMenu(self.SASDLimitMenu)
+        self.SASDLimitEdit = wx.Menu(title='')
+        self.SASDLimitMenu.Append(menu=self.SASDLimitEdit, title='Edit Limits')
+        self.SASDLimitEdit.Append(G2G.wxID_SASDLIMITCOPY,'Copy','Copy limits to other histograms')
+        self.PostfillDataMenu()
+            
         # SASD / Instrument Parameters
         G2G.Define_wxId('wxID_SASDINSTCOPY',)

trunk/GSASIIimage.py

@@ -596 +596 @@
     return np.array([tth,azm,G,dsp])
     
-# def GetTthAzmDsp(x,y,data): #expensive
-#     '''Computes a 2theta, etc. from a detector position and calibration constants - checked
-#     OK for ellipses & hyperbola.
-
-#     :returns: np.array(tth,azm,G,dsp) where tth is 2theta, azm is the azimutal angle,
-#        G is ? and dsp is the d-space
-#     '''
-    
-#     def costth(xyz):
-#         u = xyz/nl.norm(xyz,axis=-1)[:,:,nxs]
-#         return np.dot(u,np.array([0.,0.,1.]))
+def GetTthAzmDsp(x,y,data): #expensive
+    '''Computes a 2theta, etc. from a detector position and calibration constants - checked
+    OK for ellipses & hyperbola.
+
+    :returns: np.array(tth,azm,G,dsp) where tth is 2theta, azm is the azimutal angle,
+        G is ? and dsp is the d-space
+    '''
+    
+    def costth(xyz):
+        u = xyz/nl.norm(xyz,axis=-1)[:,:,nxs]
+        return np.dot(u,np.array([0.,0.,1.]))
         
-# #zero detector 2-theta: tested with tilted images - perfect integrations
-#     wave = data['wavelength']
-#     dx = x-data['center'][0]
-#     dy = y-data['center'][1]
-#     tilt = data['tilt']
-#     dist = data['distance']/npcosd(tilt)    #sample-beam intersection point
-#     T = makeMat(tilt,0)
-#     R = makeMat(data['rotation'],2)
-#     MN = np.inner(R,np.inner(R,T))
-#     dxyz0 = np.inner(np.dstack([dx,dy,np.zeros_like(dx)]),MN)    #correct for 45 deg tilt
-#     dxyz0 += np.array([0.,0.,dist])
-#     if data['DetDepth']:
-#         ctth0 = costth(dxyz0)
-#         tth0 = npacosd(ctth0)
-#         dzp = peneCorr(tth0,data['DetDepth'],dist)
-#         dxyz0[:,:,2] += dzp
-# #non zero detector 2-theta:
-#     if data['det2theta']:        
-#         tthMat = makeMat(data['det2theta'],1)
-#         dxyz = np.inner(dxyz0,tthMat.T)
-#     else:
-#         dxyz = dxyz0
-#     ctth = costth(dxyz)
-#     tth = npacosd(ctth)
-#     dsp = wave/(2.*npsind(tth/2.))
-#     azm = (npatan2d(dxyz[:,:,1],dxyz[:,:,0])+data['azmthOff']+720.)%360.        
-# # G-calculation        
-#     x0 = data['distance']*nptand(tilt)
-#     x0x = x0*npcosd(data['rotation'])
-#     x0y = x0*npsind(data['rotation'])
-#     distsq = data['distance']**2
-#     G = ((dx-x0x)**2+(dy-x0y)**2+distsq)/distsq       #for geometric correction = 1/cos(2theta)^2 if tilt=0.
-#     return [tth,azm,G,dsp]
+#zero detector 2-theta: tested with tilted images - perfect integrations
+    wave = data['wavelength']
+    dx = x-data['center'][0]
+    dy = y-data['center'][1]
+    tilt = data['tilt']
+    dist = data['distance']/npcosd(tilt)    #sample-beam intersection point
+    T = makeMat(tilt,0)
+    R = makeMat(data['rotation'],2)
+    MN = np.inner(R,np.inner(R,T))
+    dxyz0 = np.inner(np.dstack([dx,dy,np.zeros_like(dx)]),MN)    #correct for 45 deg tilt
+    dxyz0 += np.array([0.,0.,dist])
+    if data['DetDepth']:
+        ctth0 = costth(dxyz0)
+        tth0 = npacosd(ctth0)
+        dzp = peneCorr(tth0,data['DetDepth'],dist)
+        dxyz0[:,:,2] += dzp
+#non zero detector 2-theta:
+    if data['det2theta']:        
+        tthMat = makeMat(data['det2theta'],1)
+        dxyz = np.inner(dxyz0,tthMat.T)
+    else:
+        dxyz = dxyz0
+    ctth = costth(dxyz)
+    tth = npacosd(ctth)
+    dsp = wave/(2.*npsind(tth/2.))
+    azm = (npatan2d(dxyz[:,:,1],dxyz[:,:,0])+data['azmthOff']+720.)%360.        
+# G-calculation        
+    x0 = data['distance']*nptand(tilt)
+    x0x = x0*npcosd(data['rotation'])
+    x0y = x0*npsind(data['rotation'])
+    distsq = data['distance']**2
+    G = ((dx-x0x)**2+(dy-x0y)**2+distsq)/distsq       #for geometric correction = 1/cos(2theta)^2 if tilt=0.
+    return [tth,azm,G,dsp]
     
 def GetTth(x,y,data):
     'Give 2-theta value for detector x,y position; calibration info in data'
-    return GetTthAzmDsp2(x,y,data)[0]
+    if data['det2theta']:
+        return GetTthAzmDsp(x,y,data)[0]
+    else:
+        return GetTthAzmDsp2(x,y,data)[0]
     
 def GetTthAzm(x,y,data):
     'Give 2-theta, azimuth values for detector x,y position; calibration info in data'
-    return GetTthAzmDsp2(x,y,data)[0:2]
+    if data['det2theta']:
+        return GetTthAzmDsp(x,y,data)[0:2]
+    else:
+        return GetTthAzmDsp2(x,y,data)[0:2]
     
 def GetTthAzmG2(x,y,data):
@@ -718 +724 @@
 def GetDsp(x,y,data):
     'Give d-spacing value for detector x,y position; calibration info in data'
-    return GetTthAzmDsp2(x,y,data)[3]
+    if data['det2theta']:
+        return GetTthAzmDsp(x,y,data)[3]
+    else:
+        return GetTthAzmDsp2(x,y,data)[3]
        
 def GetAzm(x,y,data):
     'Give azimuth value for detector x,y position; calibration info in data'
-    return GetTthAzmDsp2(x,y,data)[1]
+    if data['det2theta']:
+        return GetTthAzmDsp(x,y,data)[1]
+    else:
+        return GetTthAzmDsp2(x,y,data)[1]
     
 def meanAzm(a,b):
@@ -1210 +1222 @@
     nJ = jLim[1]-jLim[0]
     TA = np.empty((4,nI,nJ))
-    TA[:3] = np.array(GetTthAzmG2(np.reshape(tax,(nI,nJ)),np.reshape(tay,(nI,nJ)),data))     #includes geom. corr. as dist**2/d0**2 - most expensive step
+    if data['det2theta']:
+        TA[:3] = np.array(GetTthAzmG(np.reshape(tax,(nI,nJ)),np.reshape(tay,(nI,nJ)),data))     #includes geom. corr. as dist**2/d0**2 - most expensive step
+    else:
+        TA[:3] = np.array(GetTthAzmG2(np.reshape(tax,(nI,nJ)),np.reshape(tay,(nI,nJ)),data))     #includes geom. corr. as dist**2/d0**2 - most expensive step
     TA[1] = np.where(TA[1]<0,TA[1]+360,TA[1])
     TA[3] = G2pwd.Polarization(data['PolaVal'][0],TA[0],TA[1]-90.)[0]

trunk/GSASIIpwdGUI.py

@@ -1811 +1811 @@
 ################################################################################           
        
-def UpdateLimitsGrid(G2frame, data,plottype):
+def UpdateLimitsGrid(G2frame, data,datatype):
     '''respond to selection of PWDR Limits data tree item.
     Allows setting of limits and excluded regions in a PWDR data set
@@ -1817 +1817 @@
     def AfterChange(invalid,value,tc):
         if invalid: return
-        plottype = G2frame.GPXtree.GetItemText(G2frame.PatternId)[:4]
-        wx.CallAfter(G2plt.PlotPatterns,G2frame,newPlot=False,plotType=plottype)  #unfortunately this resets the plot width
+        datatype = G2frame.GPXtree.GetItemText(G2frame.PatternId)[:4]
+        wx.CallAfter(G2plt.PlotPatterns,G2frame,newPlot=False,plotType=datatype)  #unfortunately this resets the plot width
 
     def LimitSizer():
@@ -1837 +1837 @@
             item = Indx[Obj.GetId()]
             del(data[item+2])
-            G2plt.PlotPatterns(G2frame,newPlot=False,plotType=plottype)
-            wx.CallAfter(UpdateLimitsGrid,G2frame,data,plottype)
+            G2plt.PlotPatterns(G2frame,newPlot=False,plotType=datatype)
+            wx.CallAfter(UpdateLimitsGrid,G2frame,data,datatype)
         
         Indx = {}
@@ -1898 +1898 @@
 
     G2frame.ifGetExclude = False
-    G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.LimitMenu)
-    #G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Limits')
-    G2frame.Bind(wx.EVT_MENU,OnLimitCopy,id=G2G.wxID_LIMITCOPY)
-    G2frame.Bind(wx.EVT_MENU,OnAddExcl,id=G2G.wxID_ADDEXCLREGION)
+    if 'P' in datatype:                   #powder data menu commands
+        G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.LimitMenu)
+        G2frame.Bind(wx.EVT_MENU,OnLimitCopy,id=G2G.wxID_LIMITCOPY)
+        G2frame.Bind(wx.EVT_MENU,OnAddExcl,id=G2G.wxID_ADDEXCLREGION)
+    elif 'L' in datatype or 'R' in datatype:                   #SASD & REFD data menu commands
+        G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.SASDLimitMenu)
+        G2frame.Bind(wx.EVT_MENU,OnLimitCopy,id=G2G.wxID_SASDLIMITCOPY)
     Draw() 
     
@@ -2601 +2604 @@
     #end of patch
     if 'P' in insVal['Type']:                   #powder data menu commands
+        G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.LimitMenu)
         G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.InstMenu)
         G2frame.GetStatusBar().SetStatusText('NB: Azimuth is used for polarization only',1)
@@ -2611 +2615 @@
         G2frame.Bind(wx.EVT_MENU,OnInstFlagCopy,id=G2G.wxID_INSTFLAGCOPY)
         G2frame.Bind(wx.EVT_MENU,OnCopy1Val,id=G2G.wxID_INST1VAL)
-    elif 'L' in insVal['Type'] or 'R' in insVal['Type']:                   #SASD data menu commands
+    elif 'L' in insVal['Type'] or 'R' in insVal['Type']:                   #SASD & REFD data menu commands
         G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.SASDInstMenu)
         G2frame.Bind(wx.EVT_MENU,OnInstCopy,id=G2G.wxID_SASDINSTCOPY)