Changeset 2736 for trunk/imports/G2phase_INS.py

Timestamp:

Mar 3, 2017 11:03:36 AM (7 years ago)

Author:

toby

Message:

more unicode fixes, fix shelx END problem

File:

• trunk/imports/G2phase_INS.py (modified) (3 diffs)

trunk/imports/G2phase_INS.py

@@ -49 +49 @@
     def Reader(self,filename,filepointer, ParentFrame=None, **unused):
         'Read a ins file using :meth:`ReadINSPhase`'
-        try:
-            self.Phase = self.ReadINSPhase(filename, ParentFrame)
-            return True
-        except Exception as detail:
-            self.errors += '\n  '+str(detail)
-            print 'INS read error:',detail # for testing
-            traceback.print_exc(file=sys.stdout)
-            return False
+        #try:
+        self.Phase = self.ReadINSPhase(filename, ParentFrame)
+        return True
+        #except Exception as detail:
+        #    self.errors += '\n  '+str(detail)
+        #    print 'INS read error:',detail # for testing
+        #    traceback.print_exc(file=sys.stdout)
+        #    return False
 
     def ReadINSPhase(self,filename,parent=None):
@@ -62 +62 @@
         '''
         Shelx = ['TITL','CELL','ZERR','LATT','SYMM','SFAC','DISP','UNIT','LAUE','EADP',
-            'MORE','TIME','END ','HKLF','OMIT','SHEL','BASF','TWIN','EXTI','SWAT',
+            'MORE','TIME','HKLF','OMIT','SHEL','BASF','TWIN','EXTI','SWAT',
             'HOPE','MERG','SPEC','RESI','RTAB','MPLA','HFIX','MOVE','ANIS','AFIX',
             'FRAG','FEND','EXYZ','EDAP','EQIV','CONN','PART','BIND','FREE','DFIX','DANG',
@@ -116 +116 @@
             elif S[:3].upper() == 'REM':
                 pass
-            elif S[:4].upper() not in Shelx:   #this will find an atom record!
+            elif S[:3].upper() == 'END':
+                pass
+            elif S[:4].strip().upper() not in Shelx:   #this will find an atom record!
                 AtRec = S.split()
                 Atype = aTypes[int(AtRec[1])-1]