Changeset 4820

Timestamp:

Feb 17, 2021 3:05:30 PM (2 years ago)

Author:

vondreele

Message:

remove masks from argument list for MakeGainMap? - not used
Tweak gain map limits
fix to OnOrigX & OnOrien? - now set atom site fractions to the max found for atoms in RB
"fix" (with a try except) for the occasional crash on finding a nonexistent Pattern. Now just skips & tries again.

Location:

trunk

Files:

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

trunk/GSASIIimage.py

@@ -1262 +1262 @@
     return useMask
 
-def MakeGainMap(image,Ix,Iy,data,masks,blkSize=128):
+def MakeGainMap(image,Ix,Iy,data,blkSize=128):
     import scipy.ndimage.filters as sdif
     Iy *= npcosd(Ix[:-1])**3       #undo parallax

trunk/GSASIIimgGUI.py

@@ -171 +171 @@
         G2frame.Integrate = G2img.ImageIntegrate(sumImg,Data,masks,blkSize)            
         Iy,azms,Ix = G2frame.Integrate[:3]
-        GainMap = G2img.MakeGainMap(sumImg,Ix,Iy,Data,masks,blkSize)*1000.
+        GainMap = G2img.MakeGainMap(sumImg,Ix,Iy,Data,blkSize)*1000.
         Npix,imagefile,imagetag = G2IO.GetCheckImageFile(G2frame,G2frame.Image)
         pth = os.path.split(os.path.abspath(imagefile))[0]
@@ -181 +181 @@
             newimagefile = G2IO.FileDlgFixExt(dlg,newimagefile)
             Data['formatName'] = 'GSAS-II image'
-            Data['range'] = [(800,1200),[800,1200]]
-            GainMap = np.where(GainMap > 1200,1000,GainMap)
-            GainMap = np.where(GainMap < 800,1000,GainMap)
+            Data['range'] = [(500,2000),[800,1200]]
+            GainMap = np.where(GainMap > 1200,1200,GainMap)
+            GainMap = np.where(GainMap < 800,800,GainMap)
             G2IO.PutG2Image(newimagefile,[],data,Npix,GainMap)
             GMname = 'IMG '+os.path.split(newimagefile)[1]

trunk/GSASIIphsGUI.py

@@ -9899 +9899 @@
                 Sytsym,Mult = G2spc.SytSym(rbObj['Orig'][0],SGData)[:2]
                 sytsymtxt.SetLabel('Origin site symmetry: %s, multiplicity: %d '%(Sytsym,Mult))
+                maxFrac = 0.0
+                for Id in RBObj['Ids']:
+                    maxFrac = max(maxFrac,data['Atoms'][AtLookUp[Id]][cx+3])
                 for i,Id in enumerate(RBObj['Ids']):
                     data['Atoms'][AtLookUp[Id]][cx:cx+3] = newXYZ[i]
-                    data['Atoms'][AtLookUp[Id]][cx+3] = 1.0
+                    data['Atoms'][AtLookUp[Id]][cx+3] = maxFrac
                 data['Atoms'] = G2lat.RBsymCheck(data['Atoms'],ct,cx,cs,AtLookUp,Amat,RBObj['Ids'],SGData)
                 data['Drawing']['Atoms'] = []
@@ -9920 +9923 @@
                     RBObj['Orient'][0] = Q
                     newXYZ = G2mth.UpdateRBXYZ(Bmat,RBObj,RBData,rbType)[0]
+                    maxFrac = 0.0
+                    for Id in RBObj['Ids']:
+                        maxFrac = max(maxFrac,data['Atoms'][AtLookUp[Id]][cx+3])
                     for i,Id in enumerate(RBObj['Ids']):
                         data['Atoms'][AtLookUp[Id]][cx:cx+3] = newXYZ[i]
-                        data['Atoms'][AtLookUp[Id]][cx+3] = 1.0
+                        data['Atoms'][AtLookUp[Id]][cx+3] = maxFrac
                     data['Atoms'] = G2lat.RBsymCheck(data['Atoms'],ct,cx,cs,AtLookUp,Amat,RBObj['Ids'],SGData)
                     data['Drawing']['Atoms'] = []

trunk/GSASIIplot.py

@@ -2918 +2918 @@
     time0 = time.time()
     if G2frame.SinglePlot and PatternId:
-        Pattern = G2frame.GPXtree.GetItemPyData(PatternId)
-        Pattern.append(G2frame.GPXtree.GetItemText(PatternId))
-        PlotList = [Pattern,]
-        # PId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background')
-        # Pattern[0]['BackFile'] = ['',-1.0,False]
-        # if PId:
-        #     Pattern[0]['BackFile'] =  G2frame.GPXtree.GetItemPyData(PId)[1].get('background PWDR',['',-1.0,False])
-        Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
-            G2frame.PatternId, 'Instrument Parameters'))
-        Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
-        ParmList = [Parms,]
-        SampleList = [Sample,]
-        Title = data[0].get('histTitle')
-        if not Title: 
-            Title = Pattern[-1]
+        try:
+            Pattern = G2frame.GPXtree.GetItemPyData(PatternId)
+            Pattern.append(G2frame.GPXtree.GetItemText(PatternId))
+            PlotList = [Pattern,]
+            # PId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background')
+            # Pattern[0]['BackFile'] = ['',-1.0,False]
+            # if PId:
+            #     Pattern[0]['BackFile'] =  G2frame.GPXtree.GetItemPyData(PId)[1].get('background PWDR',['',-1.0,False])
+            Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
+                G2frame.PatternId, 'Instrument Parameters'))
+            Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
+            ParmList = [Parms,]
+            SampleList = [Sample,]
+            Title = data[0].get('histTitle')
+            if not Title: 
+                Title = Pattern[-1]
+        except AttributeError:
+            pass
     else:     #G2frame.selection   
         Title = os.path.split(G2frame.GSASprojectfile)[1]