Changeset 2360

Timestamp:

Jul 2, 2016 7:22:46 PM (5 years ago)

Author:

toby

Message:

new Mac .so files, incorporate data corrections into .instprm file

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• binmac64-2.7/Compilation_Details (added)
• binmac64-2.7/fellipse.so (modified) (previous)
• binmac64-2.7/histogram2d.so (modified) (previous)
• binmac64-2.7/histosigma2d.so (modified) (previous)
• binmac64-2.7/pack_f.so (modified) (previous)
• binmac64-2.7/polymask.so (modified) (previous)
• binmac64-2.7/pypowder.so (modified) (previous)
• binmac64-2.7/pyspg.so (modified) (previous)
• binmac64-2.7/pytexture.so (modified) (previous)

trunk/GSASII.py

@@ -1014 +1014 @@
                     S = instLines[il]
             Found = True
-            S = S.replace(' ','')
-            SS = S[:-1].split(';')
-            for s in SS:
-                [item,val] = s.split(':')
-                newItems.append(item)
-                try:
-                    newVals.append(float(val))
-                except ValueError:
-                    newVals.append(val)
-            il += 1                        
+            if '"""' in S:
+                delim = '"""' 
+            elif "'''" in S:
+                delim = "'''"
+            else:
+                S = S.replace(' ','')
+                SS = S.strip().split(';')
+                for s in SS:
+                    [item,val] = s.split(':',1)
+                    newItems.append(item)
+                    try:
+                        newVals.append(float(val))
+                    except ValueError:
+                        newVals.append(val)
+                il += 1
+                continue
+            # read multiline values, delimited by ''' or """
+            item,val = S.strip().split(':',1)
+            val = val.replace(delim,'').rstrip()
+            val += '\n'
+            while True:
+                il += 1
+                if il >= len(instLines): break
+                S = instLines[il]
+                if delim in S:
+                    val += S.replace(delim,'').rstrip()
+                    val += '\n'
+                    break
+                else:
+                    val += S.rstrip()
+                    val += '\n'
+            newItems.append(item)
+            newVals.append(val)
+            il += 1
         return [G2IO.makeInstDict(newItems,newVals,len(newVals)*[False,]),{}]
         
@@ -1504 +1528 @@
                 'qPlot':False,'dPlot':False,'sqrtPlot':False
                 }
-            # apply user-supplied corrections to powder data
+            # 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):
@@ -1517 +1542 @@
                     print('error: '+str(err))
                     print('with commands '+str(corr))
+            # apply user-supplied corrections to powder data
+            if 'CorrectionCode' in Iparm1:
+                print('Applying corrections from instprm file')
+                corr = Iparm1['CorrectionCode'][0]
+                try:
+                    exec(corr)
+                    print('done')
+                except Exception as err:
+                    print('error: '+str(err))
+                    print('with commands -------------------')
+                    print(str(corr))
+                    print('---------------------------------')
             rd.Sample['ranId'] = valuesdict['ranId'] # this should be removed someday
             self.PatternTree.SetItemPyData(Id,[valuesdict,rd.powderdata])