Changeset 3758 for trunk/imports/G2pwd_FP.py

Timestamp:

Dec 10, 2018 12:27:04 PM (4 years ago)

Author:

toby

Message:

more fullprof .dat fiddling

File:

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

trunk/imports/G2pwd_FP.py

@@ -40 +40 @@
         fp = open(filename,'r')
         for i,S in enumerate(fp):
-            if i > 100: break
+            if i > 50: break
             if begin:
                 if gotCcomment and S.find('*/') > -1:
@@ -56 +56 @@
             try:    #look for start,step,stop card
                 for j,val in enumerate(vals):
-                    num = float(val)
+                    float(val)
                     if j == 2:
                         break
@@ -84 +84 @@
         for i,S in enumerate(fp):
             self.errors = 'Error reading line: '+str(i+1)
-            # or a block of comments delimited by /* and */
-            # or (GSAS style) each line can begin with '#' or '!'
+            # Allow a block of comments delimited by /* and */
+            # or (GSAS style) each comment line can begin with '#' or '!'
+            if S.lstrip()[0] in ["'",'#','!',]:
+                self.comments.append(S[:-1])
+                continue       # store comments, if any
             if begin:
                 if gotCcomment and S.find('*/') > -1:
@@ -95 +98 @@
                     gotCcomment = True
                     continue   
-                if S.lstrip()[0] in ["'",'#','!',]:
-                    self.comments.append(S[:-1])
-                    continue       #ignore comments, if any
-                else:
-                    begin = False
-            # valid line to read
+            # look for a line with start, steps etc. in 1st 4 lines
             if not steps:
                 vals = S.replace(',',' ').split(None,4)
@@ -108 +106 @@
                 elif len(vals) >= 3:
                     try:
-                        steps = True
                         start = float(vals[0])
                         step = float(vals[1])
                         stop = float(vals[2])
+                        steps = True
+                        begin = False
                         if len(vals) > 3:
                             self.comments.append(vals[3][:-1])
@@ -120 +119 @@
                     print('Skipping header line ',S)
                     continue
+            # should be a valid line to read
             vals = S.split()    #data strings
             try: