Changeset 2703

Timestamp:

Feb 14, 2017 9:52:37 AM (5 years ago)

Author:

vondreele

Message:

fix problem with default Sample parms for lab data default selection

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASII.py

@@ -1345 +1345 @@
                 rd.instfile = ''
                 if 'lab data' in choices[res]:
-                    rd.Sample['Type'] = 'Bragg-Brentano'
+                    rd.Sample.update({'Type':'Bragg-Brentano','Shift':[0.,False],'Transparency':[0.,False],
+                        'SurfRoughA':[0.,False],'SurfRoughB':[0.,False]})
                 else:
-                    rd.Sample['Type'] = 'Debye-Scherrer'
+                    rd.Sample.update({'Type':'Debye-Scherrer','Absorption':[0.,False],'DisplaceX':[0.,False],
+                        'DisplaceY':[0.,False]})
                 if 'Generic' in choices[res]:
                     dlg = G2G.MultiFloatDialog(self,title='Generic TOF detector bank',

trunk/GSASIIIO.py

@@ -908 +908 @@
             if nOcc:
                 Aname += '(%d)'%(nOcc)
-        Sample = G2pdG.SetDefaultSample()
+        Sample = G2pdG.SetDefaultSample()       #set as Debye-Scherrer
         Sample['Gonio. radius'] = data['distance']
         Sample['Omega'] = data['GonioAngles'][0]

trunk/GSASIIpwdGUI.py

@@ -147 +147 @@
 
 def SetDefaultSample():
-    'Fills in default items for the Sample dictionary'
+    'Fills in default items for the Sample dictionary for Debye-Scherrer & SASD'
     return {
         'InstrName':'',