Changeset 2286

Timestamp:

May 22, 2016 3:51:48 PM (7 years ago)

Author:

vondreele

Message:

fix problems in INS importer

File:

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

trunk/imports/G2phase_INS.py

@@ -68 +68 @@
         Compnd = ''
         Atoms = []
+        aTypes = []
         A = np.zeros(shape=(3,3))
         S = file.readline()
@@ -92 +93 @@
                 SGData = G2IO.SGData # P 1
                 self.warnings += '\nThe space group is not given in an ins file and has been set to "P 1".'
-                self.warnings += "Change this in phase's General tab."
+                self.warnings += "\nChange this in phase's General tab; NB: it might be in the Phase name."
             elif S[:4] in 'SFAC':
                 aTypes = S[4:].split()
+                if 'H' in aTypes:
+                    self.warnings += '\nHydrogen atoms found; consider replacing them with stereochemically tied ones.'
+                    self.warnings += "\nDo 'Edit/Insert H atoms' in this phase's Atoms tab after deleting the old ones."
             elif S[0] == 'Q':
                 pass
-            elif np.any(Aindx):   #this will find an atom record!
-                iNum = Aindx.index(True)
-                Atype = S[:iNum]
+            elif np.any(Aindx) or S[:4].strip() in aTypes:   #this will find an atom record!
+                try:
+                    iNum = Aindx.index(True)
+                except ValueError:
+                    iNum = 4
+                Atype = S[:iNum].strip()
                 Aname = S[:4]
                 x,y,z = S[9:45].split()
@@ -130 +137 @@
         self.errors = 'Error after read complete'
         Phase = G2IO.SetNewPhase(Name='ShelX phase',SGData=SGData,cell=cell+[Volume,])
+        Phase['General']['Name'] = Title
         Phase['General']['Type'] = 'nuclear'
         Phase['General']['AtomPtrs'] = [3,1,7,9]