Changeset 2362

Timestamp:

Jul 4, 2016 8:06:22 AM (7 years ago)

Author:

toby

Message:

fix bug due to addition of CorrectionCode? to InstParms?

Location:

trunk

Files:

• CorrectionCode.instprm.sample (added)
• G2powdercorrections.txt.sample (deleted)
• GSASII.py (modified) (2 diffs)
• help/gsasII.html (modified) (2 diffs)

trunk/GSASII.py

@@ -1528 +1528 @@
                 'qPlot':False,'dPlot':False,'sqrtPlot':False
                 }
-            # apply user-supplied corrections to powder data (remove this below, also from help)
-            # also see https://subversion.xray.aps.anl.gov/trac/pyGSAS/changeset/2344
-            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))
             # apply user-supplied corrections to powder data
             if 'CorrectionCode' in Iparm1:
@@ -1554 +1540 @@
                     print(str(corr))
                     print('---------------------------------')
+                finally:
+                    del Iparm1['CorrectionCode']
             rd.Sample['ranId'] = valuesdict['ranId'] # this should be removed someday
             self.PatternTree.SetItemPyData(Id,[valuesdict,rd.powderdata])

trunk/help/gsasII.html

@@ -2775 +2775 @@
 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.
+intensity or weight values by creating a adding Python command(s) to
+the instrument (.instprm) parameter with a variable named
+CorrectionCode. See the CorrectionCode.instprm.sample file 
+provided in the GSAS-II source directory for an example of how this
+is done.
 </p>
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
@@ -6393 +6395 @@
 style='mso-bookmark:Pawley'><o:p>&nbsp;</o:p></span></p>
 
-<p class=MsoNormal><span style='mso-bookmark:Pawley'><!-- hhmts start -->Last modified: Sun Jun 26 12:58:26 CDT 2016 <!-- hhmts end -->
+<p class=MsoNormal><span style='mso-bookmark:Pawley'><!-- hhmts start -->Last modified: Mon Jul  4 09:03:37 EDT 2016 <!-- hhmts end -->
 </body>