Changeset 4546 for trunk

Timestamp:

Aug 17, 2020 4:29:46 PM (3 years ago)

Author:

vondreele

Message:

correct ring intensities for polarization in IntStrSta?
fill missing parm in OnAppendDzero? part of stress-strain
skip motion processing is Page doesn't exist

Location:

trunk

Files:

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

trunk/GSASIIimage.py

@@ -1329 +1329 @@
             ellipse = FitEllipse(R['ImxyObs'].T)
             ringxy,ringazm = makeRing(ring['Dcalc'],ellipse,0,0.,scalex,scaley,Image,5)
+            XY = np.array(ringxy).T
+            Th,Azm = GetTthAzm(XY[0],XY[1],Controls)
+            pola = G2pwd.Polarization(Controls['PolaVal'][0],Th,Azm-90.)[0]
             ring['ImxyCalc'] = np.array(ringxy).T[:2]
             ringint = np.array([float(Image[int(x*scalex),int(y*scaley)]) for y,x in np.array(ringxy)[:,:2]])
             ringint /= np.mean(ringint)
+            ringint /= pola
             G2fil.G2Print (' %s %.3f %s %.3f %s %d'%('d-spacing',ring['Dcalc'],'sig(MRD):',np.sqrt(np.var(ringint)),'# points:',len(ringint)))
             RingsAI.append(np.array(list(zip(ringazm,ringint))).T)

trunk/GSASIIimgGUI.py

@@ -2146 +2146 @@
     def OnAppendDzero(event):
         data['d-zero'].append({'Dset':1.0,'Dcalc':0.0,'pixLimit':10,'cutoff':1.0,
-            'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'fixDset':False})
+            'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'fixDset':False,'Ivar':0})
         UpdateStressStrain(G2frame,data)
         

trunk/GSASIIplot.py

@@ -6882 +6882 @@
 
     def OnImMotion(event):
+        if not Page:
+            return
         Page.SetToolTipString('')
         sizexy = Data['size']
@@ -7488 +7490 @@
             dsp = G2img.GetDsp(Xpos,Ypos,Data)
             StrSta['d-zero'].append({'Dset':dsp,'Dcalc':0.0,'pixLimit':10,'cutoff':0.5,'Ivar':0.0,
-                'ImxyObs':[[],[]],'ImxyCalc':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
+                'ImxyObs':[[],[]],'ImxyCalc':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'Ivar':0})
             R,r = G2img.MakeStrStaRing(StrSta['d-zero'][-1],G2frame.ImageZ,Data)
             if not len(R):