Changeset 1644

Timestamp:

Feb 10, 2015 1:24:18 PM (9 years ago)

Author:

vondreele

Message:

setting up image calibration to allow more control over refined parameters

Location:

trunk

Files:

• GSASIIimage.py (modified) (7 diffs)
• GSASIIimgGUI.py (modified) (5 diffs)

trunk/GSASIIimage.py

@@ -154 +154 @@
         
     def ellipseCalcD(B,xyd,varyList,parmDict):
+        
         x,y,dsp = xyd
-        wave = parmDict['wave']
-        if 'dep' in varyList:
-            dist,x0,y0,tilt,chi,dep = B[:6]
-        else:
-            dist,x0,y0,tilt,chi = B[:5]
-            dep = parmDict['dep']
-        if 'wave' in varyList:
-            wave = B[-1]
-        phi = chi-90.               #get rotation of major axis from tilt axis
-        tth = 2.0*npasind(wave/(2.*dsp))
-        phi0 = npatan2d(y-y0,x-x0)
-        dxy = peneCorr(tth,dep,tilt,phi0)
+        varyDict = dict(zip(varyList,B))
+        parms = {}
+        for parm in parmDict:
+            if parm in varyList:
+                parms[parm] = varyDict[parm]
+            else:
+                parms[parm] = parmDict[parm]
+        phi = parms['phi']-90.               #get rotation of major axis from tilt axis
+        tth = 2.0*npasind(parms['wave']/(2.*dsp))
+        phi0 = npatan2d(y-parms['det-Y'],x-parms['det-X'])
+        dxy = peneCorr(tth,parms['dep'],parms['tilt'],phi0)
         ttth = nptand(tth)
         stth = npsind(tth)
-        cosb = npcosd(tilt)
-        tanb = nptand(tilt)        
-        tbm = nptand((tth-tilt)/2.)
-        tbp = nptand((tth+tilt)/2.)
-        sinb = npsind(tilt)
-        d = dist+dxy
+        cosb = npcosd(parms['tilt'])
+        tanb = nptand(parms['tilt'])        
+        tbm = nptand((tth-parms['tilt'])/2.)
+        tbp = nptand((tth+parms['tilt'])/2.)
+        sinb = npsind(parms['tilt'])
+        d = parms['dist']+dxy
         fplus = d*tanb*stth/(cosb+stth)
         fminus = d*tanb*stth/(cosb-stth)
@@ -182 +182 @@
         R1 = (vplus+vminus)/2.                                    #major axis
         zdis = (fplus-fminus)/2.
-        Robs = np.sqrt((x-x0)**2+(y-y0)**2)
+        Robs = np.sqrt((x-parms['det-X'])**2+(y-parms['det-Y'])**2)
         rsqplus = R0**2+R1**2
         rsqminus = R0**2-R1**2
@@ -201 +201 @@
     sig = list(np.sqrt(chisq*np.diag(result[1])))
     sigList = np.zeros(7)
-    for i,name in enumerate(names):
-        if name in varyList:
-            sigList[i] = sig[varyList.index(name)]
-    ValSig = zip(names,fmt,vals,sig)
+    for i,name in enumerate(varyList):
+        sigList[i] = sig[varyList.index(name)]
+    ValSig = zip(varyList,fmt,vals,sig)
     if Print:
         CalibPrint(ValSig,chisq,rings.shape[0])
@@ -517 +516 @@
             HKL += hkl
     HKL = G2lat.sortHKLd(HKL,True,False)
-    varyList = ['dist','det-X','det-Y','tilt','phi']
+    varyList = [item for item in data['varyList'] if data['varyList'][item]]
     parmDict = {'dist':data['distance'],'det-X':data['center'][0],'det-Y':data['center'][1],
         'tilt':data['tilt'],'phi':data['rotation'],'wave':data['wavelength'],'dep':data['DetDepth']}
@@ -547 +546 @@
 #            break
     rings = np.concatenate((data['rings']),axis=0)
-    if data['DetDepthRef']:
-        varyList.append('dep')
     chisq = FitDetector(rings,varyList,parmDict)
     data['distance'] = parmDict['dist']
@@ -667 +664 @@
         Ringp = makeRing(dsp,ellipsep,3,cutoff,scalex,scaley,self.ImageZ)
         parmDict = {'dist':dist,'det-X':centp[0],'det-Y':centp[1],
-            'tilt':tilt,'phi':phi,'wave':wave,'dep':0.0}
-        varyList = ['dist','det-X','det-Y','tilt','phi']
+            'tilt':tilt,'phi':phi,'wave':wave,'dep':0.0}        
+        varyList = [item for item in data['varyList'] if data['varyList'][item]]
         if len(Ringp) > 10:
             chip = FitDetector(np.array(Ring0+Ringp),varyList,parmDict,True)
@@ -706 +703 @@
     parmDict = {'dist':data['distance'],'det-X':data['center'][0],'det-Y':data['center'][1],
         'tilt':data['tilt'],'phi':data['rotation'],'wave':data['wavelength'],'dep':data['DetDepth']}
-    varyList = ['dist','det-X','det-Y','tilt','phi']
-    if data['DetDepthRef']:
-        varyList.append('dep')
+    varyList = [item for item in data['varyList'] if data['varyList'][item]]
     data['rings'] = []
     data['ellipses'] = []

trunk/GSASIIimgGUI.py

@@ -99 +99 @@
     if 'DetDepth' not in data:
         data['DetDepth'] = 0.
-        data['DetDepthRef'] = False
     if 'SampleAbs' not in data:
         data['SampleShape'] = 'Cylinder'
@@ -108 +107 @@
         elif 'SASD' in data['type']:
             data['binType'] = 'log(q)'
+    if 'varyList' not in data:
+        data['varyList'] = {'dist':True,'det-X':True,'det-Y':True,'tilt':True,'phi':True,'dep':False,'wave':False}
 #end patch
     
@@ -480 +481 @@
             
         def OnDetDepthRef(event):
-            data['DetDepthRef'] = penSel.GetValue()
+            data['varyList']['dep'] = penSel.GetValue()
             
         def OnDetDepth(event):
@@ -505 +506 @@
         calibSizer.Add(waveSel,0,WACV)             
         calibSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Distance'),0,WACV)
-#        dist = wx.CheckBox(G2frame.dataDisplay,label=' Distance')  #possible future mod. to allow fix of calib. parms.?
+#        distVary = wx.CheckBox(G2frame.dataDisplay,label=' Distance')
         distSel = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%8.2f"%(data['distance'])),style=wx.TE_READONLY)
         distSel.SetBackgroundColour(VERY_LIGHT_GREY)
@@ -521 +522 @@
             calibSizer.Add(penSel,0,WACV)
             penSel.Bind(wx.EVT_CHECKBOX, OnDetDepthRef)
-            penSel.SetValue(data['DetDepthRef'])
+            penSel.SetValue(data['varyList']['dep'])
             penVal = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%6.5f" % (data['DetDepth'])),
                 style=wx.TE_PROCESS_ENTER)