Changeset 3757 for trunk/imports/G2pwd_xye.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_xye.py (modified) (4 diffs)

trunk/imports/G2pwd_xye.py

@@ -78 +78 @@
                 else:
                     if2theta = True
+                    if  i == 0 and 'xydata' in S.lower():
+                        continue   # fullprof header
                     if gotCcomment and S.find('*/') > -1:
                         begin = False
@@ -84 +86 @@
                         gotCcomment = True
                         continue   
-                    if S[0] in ["'",'#']:
+                    if S[0] in ["'",'#','!']:
                         continue       #ignore comments, if any
+                    elif S.startswith('TITLE'):
+                        continue
                     else:
                         begin = False
@@ -122 +126 @@
             # or a block of comments delimited by /* and */
             # or (GSAS style) each line can begin with '#'
+            # or WinPLOTR style, a '!'
             if begin:
                 if self.Chi or self.Wave:
@@ -137 +142 @@
                         gotCcomment = True
                         continue   
-                    if S[0] in ["'",'#']:
+                    if S[0] in ["'",'#','!']:
                         self.comments.append(S[:-1])
                         continue       #ignore comments, if any
+                    elif  i == 0 and 'xydata' in S.lower():
+                        continue   # fullprof header
+                    elif S.startswith('TITLE'):
+                        self.comments = [S]
+                        continue
                     else:
                         begin = False