Changeset 4571

Timestamp:

Sep 17, 2020 3:50:24 PM (3 years ago)

Author:

vondreele

Message:

Improvements to polarization stuff

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIpwd.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1217 +1217 @@
     #prepare masked arrays of bins with pixels for interpolation setup
     H2msk = [ma.array(H2[:-1],mask=np.logical_not(nst)) for nst in NST]
-    H0msk = [ma.array(np.divide(h0,nst),mask=np.logical_not(nst)) for nst,h0 in zip(NST,H0)]
+#    H0msk = [ma.array(np.divide(h0,nst),mask=np.logical_not(nst)) for nst,h0 in zip(NST,H0)]
+    H0msk = [ma.array(h0/nst,mask=np.logical_not(nst)) for nst,h0 in zip(NST,H0)]
     #make linear interpolators; outside limits give NaN
     H0 = []
@@ -1512 +1513 @@
     '''
     from scipy.optimize import minimize_scalar
-    Arc = [arcTth,[45.,135.],2.0]
+    print(' Polarization fit for mask at %.1f deg 2-theta'%arcTth)
+    data = copy.deepcopy(imageData)
+    data['IOtth'] = [arcTth-2.,arcTth+2.]
+    data['fullIntegrate'] = True
+    data['LRazimuth'] = [0.,360.]
+    data['outChannels'] = 200
+    data['outAzimuths'] = 1
+    Arc = [arcTth,[85.,95.],2.0]
+    print(' Integration 2-theta test range %.1f - %.1f in 200 steps'%(data['IOtth'][0],data['IOtth'][1]))
     Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],
         'Thresholds':imageData['range'],'SpotMask':{'esdMul':3.,'spotMask':None}}
     AMasks = {'Points':[],'Rings':[],'Arcs':[Arc,],'Polygons':[],'Frames':[],
         'Thresholds':imageData['range'],'SpotMask':{'esdMul':3.,'spotMask':None}}
-    data = copy.deepcopy(imageData)
     
     def func(p):
@@ -1524 +1532 @@
         H0 = ImageIntegrate(ImageZ,data,Masks)[0]
         H0A = ImageIntegrate(ImageZ,data,AMasks)[0]
-        M = np.sum(H0-H0A)
-        print('polarization %.4f, fxn: %.1f'%(p,M))
+        M = np.sum(H0)-np.sum(H0A)
+        print(' Polarization %.4f, fxn: %.1f'%(p,M))
         return M**2
     

trunk/GSASIIimgGUI.py

@@ -137 +137 @@
         
     def OnPolaCalib(event):
-        IOtth = [data['IOtth'][0]+2.,data['IOtth'][1]-2.]
+        if data['IOtth'][1] < 34.:
+            G2G.G2MessageBox(G2frame,'Maximum 2-theta not greater than 34 deg',
+                    'Polarization Calibration Error')
+            return
+        IOtth = [32.,data['IOtth'][1]-2.]
         dlg = G2G.SingleFloatDialog(G2frame,'Polarization test arc mask',
 ''' Do not use if pattern has uneven absorption
- Set 2-theta max in image controls to be fully inside image  
- Enter 2-theta position for arc mask (%.1f-%.1f) '''%(IOtth[0],IOtth[1]),IOtth[1],IOtth,format='%.2f')
+ Set 2-theta max in image controls to be fully inside image 
+ Enter 2-theta position for arc mask (32-%.1f) '''%IOtth[1],IOtth[1],IOtth,format='%.2f')
         if dlg.ShowModal() == wx.ID_OK:
             arcTth = dlg.GetValue()

trunk/GSASIIpwd.py

@@ -237 +237 @@
 
     """
-    cazm = npcosd(Azm)
-    sazm = npsind(Azm)
-    pola = ((1.0-Pola)*cazm**2+Pola*npsind(Azm)**2)*npcosd(Tth)**2+   \
-        (1.0-Pola)*sazm**2+Pola*cazm**2
-    dpdPola = -npsind(Tth)**2*(sazm**2-cazm**2)
+    cazm = npcosd(Azm)**2
+    sazm = npsind(Azm)**2
+    pola = ((1.0-Pola)*cazm+Pola*sazm)*npcosd(Tth)**2+(1.0-Pola)*sazm+Pola*cazm
+    dpdPola = -npsind(Tth)**2*(sazm-cazm)
     return pola,dpdPola