Changeset 2344

Timestamp:

Jun 26, 2016 1:04:34 PM (7 years ago)

Author:

toby

Message:

add option to correct data on import

Location:

trunk

Files:

• G2powdercorrections.txt.sample (added)
• GSASII.py (modified) (1 diff)
• help/gsasII.html (modified) (2 diffs)

trunk/GSASII.py

@@ -1504 +1504 @@
                 'qPlot':False,'dPlot':False,'sqrtPlot':False
                 }
+            # apply user-supplied corrections to powder data
+            corrfile = os.path.join(os.path.split(rd.readfilename)[0],'G2powdercorrections.txt')
+            if os.path.exists(corrfile):
+                print('Applying corrections from file '+corrfile)
+                fp = open(corrfile,'r')
+                corr = fp.read()
+                fp.close()
+                try:
+                    exec(corr)
+                    print('done')
+                except Exception as err:
+                    print('error: '+str(err))
+                    print('with commands '+str(corr))
             rd.Sample['ranId'] = valuesdict['ranId'] # this should be removed someday
             self.PatternTree.SetItemPyData(Id,[valuesdict,rd.powderdata])

trunk/help/gsasII.html

@@ -2772 +2772 @@
 GSAS-II<b style='mso-bidi-font-weight:normal'> </b>data tree as ‘PWDR file
 name’.<b style='mso-bidi-font-weight:normal'><o:p></o:p></b></p>
-
+<p class=MsoListParagraphCxSpMiddle style='margin-left:1.2in;mso-add-space:
+auto;text-indent:-.0in;mso-list:l14 level2 lfo1'>
+Note that it is possible to apply corrections to the 2-theta,
+intensity or weight values by creating a file with Python commands named
+G2powdercorrections.txt. See the  G2powdercorrections.txt.sample file
+provided in the GSAS-II source directory.
+</p>
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
 auto;text-indent:-.25in;mso-list:l14 level3 lfo1;tab-stops:list 1.5in'><![if !supportLists]><b
@@ -6387 +6393 @@
 style='mso-bookmark:Pawley'><o:p>&nbsp;</o:p></span></p>
 
-<p class=MsoNormal><span style='mso-bookmark:Pawley'><!-- hhmts start -->Last modified: Fri Jun 19 16:41:44 CDT 2015 <!-- hhmts end -->
+<p class=MsoNormal><span style='mso-bookmark:Pawley'><!-- hhmts start -->Last modified: Sun Jun 26 12:58:26 CDT 2016 <!-- hhmts end -->
 </body>