Changeset 2820 for trunk/imports/G2pwd_fxye.py

Timestamp:

May 4, 2017 4:06:25 PM (6 years ago)

Author:

vondreele

Message:

PWDR import now scriptable for single bank patterns

File:

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

trunk/imports/G2pwd_fxye.py

@@ -17 +17 @@
 import numpy as np
 import GSASIIobj as G2obj
-import GSASIIIO as G2IO
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision$")
@@ -32 +31 @@
         self.clockWd = {}
         self.TimeMap = {}
+        self.dnames = []
 
     # Validate the contents -- look for a bank line
     def ContentsValidator(self, filepointer):
-        'Validate by checking to see if the file has BANK lines'
+        'Validrate by checking to see if the file has BANK lines & count them'
         #print 'ContentsValidator: '+self.formatName
+        nBanks= 0
+        fname = ospath.basename(filepointer.name)
         for i,line in enumerate(filepointer):
             self.GSAS = True
@@ -46 +48 @@
             if line[0] == '#': continue
             if line[:4] == 'BANK':
-                return True
+                self.dnames.append(fname+' '+''.join(line.split()[:2]))
+                nBanks += 1
+                continue
             elif line[:7] == 'Monitor': continue
             elif line [:8] == 'TIME_MAP':          #LANSCE TOF data
-                return True
-            else:
-                self.errors = 'Unexpected information in line: '+str(i+1)
-                if all([ord(c) < 128 and ord(c) != 0 for c in str(line)]): # show only if ASCII
-                    self.errors += '  '+str(line)
-                else: 
-                    self.errors += '  (binary)'
-                return False
+                continue
+#            else:
+#                if not all(c in ' 0123456789.eE+-' for c in line[:-1]):
+#                    self.errors = 'Unexpected information in line: '+str(i+1)
+#                    self.errors += '  '+str(line)
+#                    return False
+        if nBanks:
+            if not len(self.selections):
+                self.selections = range(nBanks)
+            return True
+        self.errors = 'No BANK records found'
         return False # no bank records
 
@@ -322 +329 @@
             if self.repeatcount >= len(self.selections): self.repeat = False
         else:                       # choose from options
-            if not len(self.selections):    #use previous selection, otherwise...
-                self.selections = G2IO.MultipleBlockSelector(
-                    Banks,
-                    ParentFrame=ParentFrame,
-                    title='Select Bank(s) to read from the list below',
-                    size=(600,300),
-                    header='Dataset Selector')
-            if len(self.selections) == 0:
-                self.errors = 'No banks selected'
-                return False
             selblk = self.selections[0] # select first in list
             if len(self.selections) > 1: # prepare to loop through again