Changeset 397 for trunk/GSASII.py

Timestamp:

Oct 21, 2011 12:15:50 PM (12 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:

• trunk/GSASII.py (modified) (2 diffs)

trunk/GSASII.py

@@ -344 +344 @@
                     DataType = DataType.strip()[0:3]                                #just 1st 3 chars
                     wx.BeginBusyCursor()
-                    Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],
-                        'DisplaceX':[0.0,False],'DisplaceY':[0.0,False],'Diffuse':[],
-                        'Temperature':Temperature,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,'Force':0.0,
-                        'Gonio. radius':200.0,'Omega':0.0,'Chi':0.0,'Phi':0.0}
+                    Sample = G2pdG.GetDefaultSample()
                     try:
                         for Item in Data:
@@ -762 +759 @@
                     Id = self.PatternTree.AppendItem(parent=self.root,text=outname)
                     if Id:
-                        Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],
-                            'DisplaceX':[0.0,False],'DisplaceY':[0.0,False],'Diffuse':[],
-                            'Temperature':300.,'Pressure':1.0,'Humidity':0.0,
-                            'Voltage':0.0,'Force':0.0,'Gonio. radius':200.0,
-                            'Omega':0.0,'Chi':0.0,'Phi':0.0}
+                        Sample = G2pdG.SetDefaultSample()
                         self.PatternTree.SetItemPyData(Id,[[''],[Xsum,Ysum,Wsum,YCsum,YBsum,YDsum]])
                         self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Comments'),Comments)