Changeset 2179

Timestamp:

Mar 18, 2016 3:20:03 PM (8 years ago)

Author:

vondreele

Message:

fixes for IntegrateAll? & AutoIntegrate? - now properly steps to next image
fix some traps for old image projects

Location:

trunk

Files:

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

trunk/GSASIIimage.py

@@ -867 +867 @@
     azmOff = data['azmthOff']
     Dazm = (LRazm[1]-LRazm[0])/numAzms
-    if 'log(q)' in data['binType']:
-        lutth = np.log(4.*np.pi*npsind(LUtth/2.)/data['wavelength'])
+    if '2-theta' in data.get('binType','2-theta'):
+        lutth = LUtth                
     elif 'Q' == data['binType']:
         lutth = 4.*np.pi*npsind(LUtth/2.)/data['wavelength']
-    elif '2-theta' in data['binType']:
-        lutth = LUtth                
+    elif 'log(q)' in data['binType']:
+        lutth = np.log(4.*np.pi*npsind(LUtth/2.)/data['wavelength'])
     dtth = (lutth[1]-lutth[0])/numChans
-    muT = data['SampleAbs'][0]
+    muT = data.get('SampleAbs',[0.0,''])[0]
     if 'SASD' in data['type']:
         muT = -np.log(muT)/2.       #Transmission to 1/2 thickness muT
@@ -909 +909 @@
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
             tax = np.where(tax < LRazm[0],tax+360.,tax)
-            if data['SampleAbs'][1]:
+            if data.get('SampleAbs',[0.0,''])[1]:
                 if 'Cylind' in data['SampleShape']:
                     muR = muT*(1.+npsind(tax)**2/2.)/(npcosd(tay))      #adjust for additional thickness off sample normal
@@ -915 +915 @@
                 elif 'Fixed' in data['SampleShape']:    #assumes flat plate sample normal to beam
                     tabs = G2pwd.Absorb('Fixed',muT,tay)
-            if 'log(q)' in data['binType']:
+            if 'log(q)' in data.get('binType',''):
                 tay = np.log(4.*np.pi*npsind(tay/2.)/data['wavelength'])
-            elif 'Q' == data['binType']:
+            elif 'Q' == data.get('binType',''):
                 tay = 4.*np.pi*npsind(tay/2.)/data['wavelength']
             t0 = time.time()
@@ -932 +932 @@
     H0 = np.nan_to_num(H0)
     H2 = np.array([tth for tth in np.linspace(lutth[0],lutth[1],numChans+1)])
-    if 'log(q)' in data['binType']:
+    if 'log(q)' in data.get('binType',''):
         H2 = 2.*npasind(np.exp(H2)*data['wavelength']/(4.*np.pi))
-    elif 'Q' == data['binType']:
+    elif 'Q' == data.get('binType',''):
         H2 = 2.*npasind(H2*data['wavelength']/(4.*np.pi))
     if Dazm:        

trunk/GSASIIimgGUI.py

@@ -59 +59 @@
     imagefile = G2IO.CheckImageFile(G2frame,imagefile)
     sumImg = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
+    if not 'dark image' in data:
+        return sumImg
     darkImg,darkScale = data['dark image']
-    backImg,backScale = data['background image']            
     if darkImg:
         Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, darkImg)
@@ -67 +68 @@
         darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
         sumImg += darkImage*darkScale
+    if not 'background image' in data:
+        return sumImg
+    backImg,backScale = data['background image']            
     if backImg:     #ignores any transmission effect in the background image
         Bid = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, backImg)
@@ -215 +219 @@
                     for item in result:
                         ifintegrate,name,id = item
+                        G2frame.Image = id
                         if ifintegrate:
                             Id = G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls')
@@ -226 +231 @@
                                 style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
                             try:
+#                                GSASIIpath.IPyBreak()
                                 image = GetImageZ(G2frame,Data)
                                 Masks = G2frame.PatternTree.GetItemPyData(
@@ -819 +825 @@
             
         def OnFlatBkg(event):
+            oldFlat = data.get('Flat Bkg',0.)
             try:
                 value = float(flatbkg.GetValue())
@@ -825 +832 @@
                 pass
             flatbkg.SetValue("%.0f"%(data['Flat Bkg']))    
-            G2frame.ImageZ = GetImageZ(G2frame,data)
+            G2frame.ImageZ += (oldFlat-data['Flat Bkg'])
             G2plt.PlotExposedImage(G2frame,event=event)
 
@@ -2310 +2317 @@
         for Id in G2frame.IntgOutList: # loop over newly created PDWR entry(ies)
             # save the created PWDR tree names so that a reset can delete them
+            G2frame.Image = Id
             treename = G2frame.PatternTree.GetItemText(Id)
             G2frame.AutointPWDRnames.append(treename)