Changeset 1772
- Timestamp:
- Mar 31, 2015 12:44:58 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIddataGUI.py
r1770 r1772 204 204 SHflags = {} 205 205 for item in SHterms: 206 SHflags[item] = SHterms[item] [1]206 SHflags[item] = SHterms[item] 207 207 copyDict[name].append(SHflags) 208 208 elif name == 'Babinet': … … 238 238 SHflags = copy.deepcopy(copyDict[name][2]) 239 239 SHterms = copy.deepcopy(sourceDict[name][5]) 240 for item in SHflags:241 SHterms[item][1] = copy.deepcopy(SHflags[item])242 240 elif name == 'Babinet': 243 241 for bab in babNames: -
trunk/GSASIIgrid.py
r1770 r1772 135 135 136 136 [ wxID_RENAMESEQSEL,wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_SAVESEQCSV,wxID_PLOTSEQSEL, 137 wxID_ORGSEQSEL,wxADDSEQVAR,wxDELSEQVAR,wxEDITSEQVAR,wxCOPYPARFIT, 137 wxID_ORGSEQSEL,wxADDSEQVAR,wxDELSEQVAR,wxEDITSEQVAR,wxCOPYPARFIT,wxID_AVESEQSEL, 138 138 wxADDPARFIT,wxDELPARFIT,wxEDITPARFIT,wxDOPARFIT, 139 ] = [wx.NewId() for item in range(1 4)]139 ] = [wx.NewId() for item in range(15)] 140 140 141 141 [ wxID_MODELCOPY,wxID_MODELFIT,wxID_MODELADD,wxID_ELEMENTADD,wxID_ELEMENTDELETE, … … 1285 1285 self.SequentialFile.Append(id=wxID_PLOTSEQSEL, kind=wx.ITEM_NORMAL,text='Plot selected', 1286 1286 help='Plot selected sequential refinement results') 1287 self.SequentialFile.Append(id=wxID_AVESEQSEL, kind=wx.ITEM_NORMAL,text='Compute average', 1288 help='Compute average for selected parameter') 1287 1289 self.SequentialFile.Append(id=wxID_ORGSEQSEL, kind=wx.ITEM_NORMAL,text='Reorganize', 1288 1290 help='Reorganize variables where variables change') … … 2554 2556 ) 2555 2557 2558 def OnAveSelSeq(event): 2559 'average the selected columns from menu command' 2560 cols = sorted(G2frame.dataDisplay.GetSelectedCols()) # ignore selection order 2561 if cols: 2562 for col in cols: 2563 ave = np.mean(GetColumnInfo(col)[1]) 2564 sig = np.std(GetColumnInfo(col)[1]) 2565 print ' Average for '+G2frame.SeqTable.GetColLabelValue(col)+': '+'%.6g'%(ave)+' +/- '+'%.6g'%(sig) 2566 else: 2567 G2frame.ErrorDialog( 2568 'Select columns', 2569 'No columns selected in table. Click on column labels to select fields for averaging.' 2570 ) 2571 2556 2572 def OnRenameSelSeq(event): 2557 2573 cols = sorted(G2frame.dataDisplay.GetSelectedCols()) # ignore selection order … … 3197 3213 G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveSeqCSV, id=wxID_SAVESEQCSV) 3198 3214 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPlotSelSeq, id=wxID_PLOTSEQSEL) 3215 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAveSelSeq, id=wxID_AVESEQSEL) 3199 3216 G2frame.dataFrame.Bind(wx.EVT_MENU, OnReOrgSelSeq, id=wxID_ORGSEQSEL) 3200 3217 G2frame.dataFrame.Bind(wx.EVT_MENU, AddNewPseudoVar, id=wxADDSEQVAR) -
trunk/GSASIIphsGUI.py
r1770 r1772 556 556 def DenSizer(): 557 557 558 mass= G2mth.getMass(generalData)558 generalData['Mass'] = G2mth.getMass(generalData) 559 559 density,mattCoeff = G2mth.getDensity(generalData) 560 560 denSizer = wx.BoxSizer(wx.HORIZONTAL) … … 564 564 denSizer.Add(denTxt,0,WACV) 565 565 mattTxt = None 566 if generalData['Type'] == 'macromolecular' and mass> 0.0:566 if generalData['Type'] == 'macromolecular' and generalData['Mass'] > 0.0: 567 567 denSizer.Add(wx.StaticText(General,-1,' Matthews coeff.: '), 568 568 0,WACV) … … 3712 3712 mainSizer.Add((0,5),0) 3713 3713 mainSizer.Add((0,5),0) 3714 mainSizer.Add(wx.StaticText(Texture,-1,'Sample orientation angle s: '),0,WACV)3714 mainSizer.Add(wx.StaticText(Texture,-1,'Sample orientation angle zeros: '),0,WACV) 3715 3715 mainSizer.Add((0,5),0) 3716 3716 angSizer = wx.BoxSizer(wx.HORIZONTAL) -
trunk/GSASIIplot.py
r1764 r1772 2909 2909 title = ' for\n'+Data['title'] 2910 2910 newAtomDict = Data.get('newAtomDict',{}) 2911 G2frame.G2plotNB.Delete('Covariance') 2911 2912 2912 2913 … … 2926 2927 2927 2928 def OnMotion(event): 2928 #there is a problem here - reports wrong values2929 2929 if event.button: 2930 2930 ytics = imgAx.get_yticks() -
trunk/GSASIIstrMain.py
r1770 r1772 42 42 43 43 ateln2 = 8.0*math.log(2.0) 44 DEBUG = True44 DEBUG = False 45 45 46 46 def RefineCore(Controls,Histograms,Phases,restraintDict,rigidbodyDict,parmDict,varyList,
Note: See TracChangeset
for help on using the changeset viewer.