Changeset 397 for trunk/GSASII.py


Ignore:
Timestamp:
Oct 21, 2011 12:15:50 PM (10 years ago)
Author:
vondreele
Message:

collect default settings for Sample in one routine
add recalibrate routine for images
azimuths from image integration are now the center angle of each azimuth bin
put in 1/2 pixel offset in image calibration/integration calcs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r395 r397  
    344344                    DataType = DataType.strip()[0:3]                                #just 1st 3 chars
    345345                    wx.BeginBusyCursor()
    346                     Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],
    347                         'DisplaceX':[0.0,False],'DisplaceY':[0.0,False],'Diffuse':[],
    348                         'Temperature':Temperature,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,'Force':0.0,
    349                         'Gonio. radius':200.0,'Omega':0.0,'Chi':0.0,'Phi':0.0}
     346                    Sample = G2pdG.GetDefaultSample()
    350347                    try:
    351348                        for Item in Data:
     
    762759                    Id = self.PatternTree.AppendItem(parent=self.root,text=outname)
    763760                    if Id:
    764                         Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],
    765                             'DisplaceX':[0.0,False],'DisplaceY':[0.0,False],'Diffuse':[],
    766                             'Temperature':300.,'Pressure':1.0,'Humidity':0.0,
    767                             'Voltage':0.0,'Force':0.0,'Gonio. radius':200.0,
    768                             'Omega':0.0,'Chi':0.0,'Phi':0.0}
     761                        Sample = G2pdG.SetDefaultSample()
    769762                        self.PatternTree.SetItemPyData(Id,[[''],[Xsum,Ysum,Wsum,YCsum,YBsum,YDsum]])
    770763                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Comments'),Comments)                   
Note: See TracChangeset for help on using the changeset viewer.