Changeset 4388

Timestamp:

Apr 2, 2020 10:48:25 AM (4 years ago)

Author:

vondreele

Message:

Add warning for using type=2 TOF instrument profile function in old gsas iparm files

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIfiles.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -5733 +5733 @@
         '''
         dlg = wx.DirDialog(self, "Choose a directory for tutorial downloads:",
-                           defaultPath=self.tutorialPath)#,style=wx.DD_DEFAULT_STYLE)
-                           #)
+            defaultPath=self.tutorialPath)#,style=wx.DD_DEFAULT_STYLE)
         try:
             if dlg.ShowModal() != wx.ID_OK:

trunk/GSASIIfiles.py

@@ -220 +220 @@
                     data.extend([0.0,0.0,sfloat(s[0]),sfloat(s[1]),0.0,0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y, Z
             elif abs(pfType) == 2:
+                print('''***WARNING gsas profile function #2 does not give valid GSAS-II diffractometer/profile coefficients ***
+                you should request GSAS-II instparm file from Instrument responsible''')
                 data.extend([sfloat(s[1]),0.0,1./sfloat(s[3])]) #alpha, beta-0, beta-1
                 data.extend([0.0,0.0,sfloat(s[1]),0.0,0.0,0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y, Z