Changeset 3757 for trunk/imports/G2pwd_FP.py

Timestamp:

Dec 7, 2018 4:03:37 PM (4 years ago)

Author:

toby

Message:

fix reading of FullProf? & WinPLOTR-2006 files

File:

• trunk/imports/G2pwd_FP.py (modified) (4 diffs)

trunk/imports/G2pwd_FP.py

@@ -21 +21 @@
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision: 1620 $")
-class xye_ReaderClass(G2obj.ImportPowderData):
+class fp_ReaderClass(G2obj.ImportPowderData):
     'Routines to import powder data from a FullProf 1-10 column .dat file'
     def __init__(self):
@@ -40 +40 @@
         fp = open(filename,'r')
         for i,S in enumerate(fp):
-            if i > 1000: break
+            if i > 100: break
             if begin:
                 if gotCcomment and S.find('*/') > -1:
@@ -65 +65 @@
                 else: 
                     self.errors += '  (binary)'
-                fp.close()
-                return False
+                if i > 2:
+                    fp.close()
+                    return False
         fp.close()
         return True # no errors encountered
@@ -101 +102 @@
             # valid line to read
             if not steps:
-                vals = S.split(None,4)
-                if len(vals) >= 3:
-                    steps = True
-                    start = float(vals[0])
-                    step = float(vals[1])
-                    stop = float(vals[2])
-                    if len(vals) > 3:
-                        self.comments.append(vals[3][:-1])
+                vals = S.replace(',',' ').split(None,4)
+                if 'lambda' in S:
+                    self.instdict['wave'] = float(vals[1])
+                    continue
+                elif len(vals) >= 3:
+                    try:
+                        steps = True
+                        start = float(vals[0])
+                        step = float(vals[1])
+                        stop = float(vals[2])
+                        if len(vals) > 3:
+                            self.comments.append(vals[3][:-1])
+                    except:
+                        print('Skipping line ',S)
+                    continue
+                elif i<3:
+                    print('Skipping header line ',S)
                     continue
             vals = S.split()    #data strings