Changeset 1359 for trunk/GSASII.py

Timestamp:

May 21, 2014 12:59:59 PM (10 years ago)

Author:

vondreele

Message:

start allowing reading of multiple HKLF files.
put an IndexAllIds? into UpdateConstraints?
edf image fixes
more places in Pawley d-min
format of penalty fxn chi2
allow one Bank selection set to be used for multiple files
new reader for TOF HKLF^{2 data - nonworking just now}

File:

• trunk/GSASII.py (modified) (2 diffs)

trunk/GSASII.py

@@ -705 +705 @@
         reqrdr = self.ImportMenuId.get(event.GetId())
         rdlist = self.OnImportGeneric(reqrdr,self.ImportSfactReaderlist,
-            'Structure Factor')
+            'Structure Factor',multiple=True)
         if len(rdlist) == 0: return
         self.CheckNotebook()
@@ -1022 +1022 @@
                             s = Iparm['INS  1IECOF'+str(i+1)].split()
                             Iesd += [float(S) for S in s]
+                        NT = 10
                         for i in range(8):
-                            s = Iparm['INS  1IECOR'+str(i+1)].split()
-                            Icovar += [float(S) for S in s]
+                            s = Iparm['INS  1IECOR'+str(i+1)]
+                            if i == 7:
+                                NT = 8
+                            Icovar += [float(s[6*j:6*j+6]) for j in range(NT)]
                         Inst2['Icoeff'] = Icoeff
                         Inst2['Iesd'] = Iesd