Changeset 3767

Timestamp:

Dec 18, 2018 3:07:28 PM (5 years ago)

Author:

vondreele

Message:

add sample changer position as an image parameter & have it show up in sequential calibration results

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (3 diffs)
• imports/G2img_1TIF.py (modified) (3 diffs)

trunk/GSASIIimgGUI.py

@@ -141 +141 @@
         min=0.,max=1.,typeHint=float),0,WACV)
     mainSizer.Add(distSizer,0)
+    if 'samplechangerpos' not in data:
+        data['samplechangerpos'] = 0.0
+    mainSizer.Add(wx.StaticText(G2frame.dataWindow,label='Sample changer position %.2f mm'%data['samplechangerpos']),0,WACV)
 
 ################################################################################
@@ -222 +225 @@
                     varyList.append('setdist')
                     sigList.append(None)
+                    vals.append(Data.get('samplechangerpos',Data['samplechangerpos']))
+                    varyList.append('chgrpos')
+                    sigList.append(None)
+                    
                     SeqResult[name] = {'variables':vals,'varyList':varyList,'sig':sigList,'Rvals':[],
                         'covMatrix':np.eye(len(varyList)),'title':name,'parmDict':parmDict}
@@ -341 +348 @@
                     Data['size'] = oldData['size']
                     Data['GonioAngles'] = oldData.get('GonioAngles', [0.,0.,0.])
+                    Data['samplechangerpos'] = oldData.get('samplechangerpos',0.0)
                     Data['ring'] = []
                     Data['rings'] = []

trunk/imports/G2img_1TIF.py

@@ -100 +100 @@
     distance = None
     polarization = None
+    samplechangerpos = None
     try:
         Meta = open(filename+'.metadata','Ur')
@@ -116 +117 @@
                 elif 'polarization' == keyword.lower():
                     polarization = float(line.split('=')[1])
+                elif 'samplechangercoordinate' == keyword.lower():
+                    samplechangerpos = float(line.split('=')[1])
             except:
                 print('error reading metadata: '+line)
@@ -365 +368 @@
     distance = (not distance) and 100.0 or distance
     polarization = (not polarization) and 0.99 or polarization
+    samplechangerpos = (not samplechangerpos) and 0.0 or samplechangerpos
     data = {'pixelSize':pixy,'wavelength':wavelength,'distance':distance,'center':center,'size':sizexy,
-            'setdist':distance,'PolaVal':[polarization,False]}
+            'setdist':distance,'PolaVal':[polarization,False],'samplechangerpos':samplechangerpos}
     File.close()    
     return head,data,Npix,image