Changeset 3365

Timestamp:

Apr 28, 2018 12:04:52 PM (5 years ago)

Author:

vondreele

Message:

remove qplot,dplot, etc from PWDR data[0] dict - weren't ever used
make sqrt & log plots mutually exclusive

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)
• GSASIIscriptable.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -799 +799 @@
             G2frame.GPXtree.SetItemPyData(G2frame.GPXtree.AppendItem(Id,text='Models'),G2pdG.SetDefaultSASDModel())
         valuesdict = {
-            'wtFactor':1.0,
-            'Dummy':False,
-            'ranId':ran.randint(0,sys.maxsize),
-            'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,
-            'qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]
-            }
-        G2frame.GPXtree.SetItemPyData(
-            Id,[valuesdict,
-                [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]])
+            'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxsize),'Offset':[0.0,0.0],'delOffset':0.02*Ymax,
+            'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,'Yminmax':[Ymin,Ymax]}
+        G2frame.GPXtree.SetItemPyData(Id,[valuesdict,
+            [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]])
     return Id       #last powder pattern generated
     

trunk/GSASIIdataGUI.py

@@ -1662 +1662 @@
                 'ranId':ran.randint(0,sys.maxsize),
                 'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-.1*Ymax,'refDelt':0.1*Ymax,
-                'qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]
+                'Yminmax':[Ymin,Ymax]
                 }
             # apply user-supplied corrections to powder data
@@ -1880 +1880 @@
             'ranId':ran.randint(0,sys.maxsize),
             'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-.1*Ymax,'refDelt':0.1*Ymax,
-            'qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]
+            'Yminmax':[Ymin,Ymax]
             }
         self.GPXtree.SetItemPyData(Id,[valuesdict,rd.powderdata])
@@ -2261 +2261 @@
                 'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxsize),
                 'Offset':[0.0,0.0],'delOffset':0.02*Ymax,
-                'qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]
+                'Yminmax':[Ymin,Ymax]
                 }
             self.GPXtree.SetItemPyData(
@@ -3266 +3266 @@
                             'ranId':ran.randint(0,sys.maxsize),
                             'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-.1*Ymax,'refDelt':0.1*Ymax,
-                            'qPlot':False,'dPlot':False,'sqrtPlot':False,'Yminmax':[Ymin,Ymax]
+                            'Yminmax':[Ymin,Ymax]
                             }
                         self.GPXtree.SetItemPyData(Id,[valuesdict,[np.array(Xsum),np.array(Ysum),np.array(Wsum),

trunk/GSASIIplot.py

@@ -392 +392 @@
         self.toolbar.Realize()
         self.plotStyle = {'qPlot':False,'dPlot':False,'sqrtPlot':False,'sqPlot':False,'logPlot':False}
-        self.logPlot = False
-        self.sqrtPlot = False
         
         sizer=wx.BoxSizer(wx.VERTICAL)
@@ -1639 +1637 @@
             else:
                 Page.plotStyle['logPlot'] = not Page.plotStyle['logPlot']
-                if not Page.plotStyle['logPlot']:
+                if Page.plotStyle['logPlot']:
+                    Page.plotStyle['sqrtPlot'] = False
+                else:
                     Pattern[0]['Offset'][0] = 0
                 newPlot = True
@@ -1645 +1645 @@
             if G2frame.SinglePlot:  #toggle sqrt plot
                 Page.plotStyle['sqrtPlot'] = not Page.plotStyle['sqrtPlot']
+                if Page.plotStyle['sqrtPlot']:
+                    Page.plotStyle['logPlot'] = False
                 Ymax = max(Pattern[1][1])
                 if Page.plotStyle['sqrtPlot']:

trunk/GSASIIpwdGUI.py

@@ -341 +341 @@
     if 'Offset' not in sourceData[0]:    #patch for old data
         sourceData[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,
-            'refDelt':0.01,'qPlot':False,'dPlot':False,'sqrtPlot':False})
+            'refDelt':0.01,})
         G2frame.GPXtree.SetItemPyData(G2frame.PatternId,sourceData)
         
@@ -356 +356 @@
         copyList.append(histList[i])
 
-    keys = ['Offset','delOffset','refOffset','refDelt','qPlot','dPlot','sqrtPlot']
+    keys = ['Offset','delOffset','refOffset','refDelt']
     source = dict(zip(keys,[sourceData[0][item] for item in keys]))
     for hist in copyList:

trunk/GSASIIscriptable.py

@@ -1079 +1079 @@
                   'Offset': [0.0, 0.0], 'delOffset': 0.02*Ymax,
                   'refOffset': -0.1*Ymax, 'refDelt': 0.1*Ymax,
-                  'qPlot': False, 'dPlot': False, 'sqrtPlot': False,
                   'Yminmax': [Ymin, Ymax]}
     reader.Sample['ranId'] = valuesdict['ranId']