Changeset 1743

Timestamp:

Mar 19, 2015 11:44:06 AM (9 years ago)

Author:

vondreele

Message:

fix to data selection issue
formatting error for histogram scale
change ':' to ';' for SASD parameter names

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIplot.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)
• GSASIIsasd.py (modified) (4 diffs)

trunk/GSASII.py

@@ -2200 +2200 @@
     def OnPatternTreeItemExpanded(self, event):
         'Called when a tree item is expanded'
-        event.Skip()
+        self.OnPatternTreeSelChanged(event)
         
     def OnPatternTreeItemDelete(self, event):

trunk/GSASIIplot.py

@@ -1236 +1236 @@
             if  lineNo in [0,1] or lineNo in exclLines:
                 LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Limits')
-                data = G2frame.PatternTree.GetItemPyData(LimitId)
+                limits = G2frame.PatternTree.GetItemPyData(LimitId)
                 id = lineNo/2+1
                 id2 = lineNo%2
                 if G2frame.plotStyle['qPlot'] and 'PWDR' in plottype:
-                    data[id][id2] = G2lat.Dsp2pos(Parms,2.*np.pi/xpos)
+                    limits[id][id2] = G2lat.Dsp2pos(Parms,2.*np.pi/xpos)
                 elif G2frame.plotStyle['dPlot'] and 'PWDR' in plottype:
-                    data[id][id2] = G2lat.Dsp2pos(Parms,xpos)
+                    limits[id][id2] = G2lat.Dsp2pos(Parms,xpos)
                 else:
-                    data[id][id2] = xpos
-                if id > 1 and data[id][0] > data[id][1]:
-                        data[id].reverse()
-                data[1][0] = min(max(data[0][0],data[1][0]),data[1][1])
-                data[1][1] = max(min(data[0][1],data[1][1]),data[1][0])
-                G2frame.PatternTree.SetItemPyData(LimitId,data)
+                    limits[id][id2] = xpos
+                if id > 1 and limits[id][0] > limits[id][1]:
+                        limits[id].reverse()
+                limits[1][0] = min(max(limits[0][0],limits[1][0]),limits[1][1])
+                limits[1][1] = max(min(limits[0][1],limits[1][1]),limits[1][0])
+                G2frame.PatternTree.SetItemPyData(LimitId,limits)
                 if G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Limits':
                     G2pdG.UpdateLimitsGrid(G2frame,data,plottype)
             elif lineNo > 1:
                 PeakId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Peak List')
-                data = G2frame.PatternTree.GetItemPyData(PeakId)
+                peaks = G2frame.PatternTree.GetItemPyData(PeakId)
                 if event.button == 3:
-                    del data['peaks'][lineNo-2]
+                    del peaks['peaks'][lineNo-2]
                 else:
                     if G2frame.plotStyle['qPlot']:
-                        data['peaks'][lineNo-2][0] = G2lat.Dsp2pos(Parms,2.*np.pi/xpos)
+                        peaks['peaks'][lineNo-2][0] = G2lat.Dsp2pos(Parms,2.*np.pi/xpos)
                     elif G2frame.plotStyle['dPlot']:
-                        data['peaks'][lineNo-2][0] = G2lat.Dsp2pos(Parms,xpos)
+                        peaks['peaks'][lineNo-2][0] = G2lat.Dsp2pos(Parms,xpos)
                     else:
-                        data['peaks'][lineNo-2][0] = xpos
-                    data['sigDict'] = {}        #no longer valid
-                G2frame.PatternTree.SetItemPyData(PeakId,data)
-                G2pdG.UpdatePeakGrid(G2frame,data)
+                        peaks['peaks'][lineNo-2][0] = xpos
+                    peaks['sigDict'] = {}        #no longer valid
+                G2frame.PatternTree.SetItemPyData(PeakId,peaks)
+                G2pdG.UpdatePeakGrid(G2frame,peaks)
         elif G2frame.PatternTree.GetItemText(PickId) in ['Models',] and xpos:
             lines = []
@@ -1479 +1479 @@
         xye = ma.array(ma.getdata(Pattern[1]))
         Zero = Parms.get('Zero',[0.,0.])[1]
-        if PickId:
-            ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId)
-            LimitId = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Limits')
-            limits = np.array(G2frame.PatternTree.GetItemPyData(LimitId))
-            excls = limits[2:]
-            for excl in excls:
-                xye[0] = ma.masked_inside(xye[0],excl[0],excl[1])
+        ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId)
+        LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Limits')
+        limits = G2frame.PatternTree.GetItemPyData(LimitId)
+        excls = limits[2:]
+        for excl in excls:
+            xye[0] = ma.masked_inside(xye[0],excl[0],excl[1])
         if G2frame.plotStyle['qPlot'] and 'PWDR' in plottype:
             Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, Pattern[2])

trunk/GSASIIpwdGUI.py

@@ -95 +95 @@
     '''
     parms = []
-    parms.append(['Scale','Histogram scale factor: ',[10,4]])
+    parms.append(['Scale','Histogram scale factor: ',[10,7]])
     if 'C' in histType:
         parms.append(['Gonio. radius','Goniometer radius (mm): ',[10,3]])

trunk/GSASIIsasd.py

@@ -1096 +1096 @@
         partData = Model['Particle']
         for i,level in enumerate(partData['Levels']):
-            cid = str(i)+':'
+            cid = str(i)+';'
             controls = level['Controls']
             Type = controls['DistType']
@@ -1143 +1143 @@
             else:
                 print ' Component %d: Type: %s: '%(i,Type,)
-            cid = str(i)+':'
+            cid = str(i)+';'
             if Type in ['LogNormal','Gaussian','LSW','Schulz-Zimm','Monodisperse']:
                 for item in FFparmOrder:
@@ -1167 +1167 @@
         Ic = np.zeros_like(Q)
         for i,Type in enumerate(levelTypes):
-            cid = str(i)+':'
+            cid = str(i)+';'
             if Type in ['LogNormal','Gaussian','LSW','Schulz-Zimm']:
                 FFfxn = parmDict[cid+'FormFact']
@@ -1183 +1183 @@
                 for item in [cid+'Volume',cid+'Mean',cid+'StdDev',cid+'MinSize',]:
                     if item in parmDict:
-                        distDict[item.split(':')[1]] = parmDict[item]
+                        distDict[item.split(';')[1]] = parmDict[item]
                 contrast = parmDict[cid+'Contrast']
                 rBins,dBins,dist = MakeDiamDist(Type,parmDict[cid+'NumPoints'],parmDict[cid+'Cutoff'],distDict)