Changeset 4697

Timestamp:

Jan 2, 2021 9:30:28 AM (3 years ago)

Author:

vondreele

Message:

move superminusone definition to header block in G2pwdrGUI
replace deprecated GetLabel? with GetItemLabelText? in G2restrGUI
set default gain map color to 'gray' & force all gain map > 1200 or < 800 toequal 1000 - gets rid of zingers & other flaws

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (3 diffs)
• GSASIIrestrGUI.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1284 +1284 @@
             Ipix = IyInt(TA[0])
             GainMap[iBeg:iFin,jBeg:jFin] = image[iBeg:iFin,jBeg:jFin]/(Ipix*TA[3])
-    GainMap = np.nan_to_num(GainMap)
+    GainMap = np.nan_to_num(GainMap,1.0)
     GainMap = sdif.gaussian_filter(GainMap,3.,order=0)
     return 1./GainMap

trunk/GSASIIimgGUI.py

@@ -181 +181 @@
             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)
             G2IO.PutG2Image(newimagefile,[],data,Npix,GainMap)
             Id = G2frame.GPXtree.AppendItem(parent=G2frame.root,text='IMG '+os.path.split(newimagefile)[1])

trunk/GSASIIpwdGUI.py

@@ -65 +65 @@
     Pwrm4 = unichr(0x207b)+unichr(0x2074)
     Angstr = unichr(0x00c5)
+    superMinusOne = unichr(0xaf)+unichr(0xb9)
 else:
     GkDelta = chr(0x0394)
@@ -74 +75 @@
     Pwrm4 = chr(0x207b)+chr(0x2074)
     Angstr = chr(0x00c5)   
+    superMinusOne = chr(0xaf)+chr(0xb9)
 # trig functions in degrees
 sind = lambda x: math.sin(x*math.pi/180.)
@@ -1393 +1395 @@
         pwddata = G2frame.GPXtree.GetItemPyData(PatternId)[1]
         auxPlot = G2pwd.MakeRDF(RDFcontrols,background,inst,pwddata)
-        if '2' in platform.python_version_tuple()[0]:
-            superMinusOne = unichr(0xaf)+unichr(0xb9)
-        else:
-            superMinusOne = chr(0xaf)+chr(0xb9)
         for plot in auxPlot:
             XY = np.array(plot[:2])

trunk/GSASIIrestrGUI.py

@@ -1171 +1171 @@
         items = G2frame.dataWindow.RestraintEdit.GetMenuItems()
         for item in items:
-            if item.GetLabel() in ['Change value']:
+            if item.GetItemLabelText() in ['Change value']:
                 item.Enable(False)