Changeset 2185 for trunk/GSASII.py

Timestamp:

Mar 29, 2016 10:11:57 AM (7 years ago)

Author:

vondreele

Message:

fix PWDR import from zip problem when iparm/instparm file isn'r in zip.

File:

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

trunk/GSASII.py

@@ -1280 +1280 @@
         # with extension .instprm, .prm, .inst, or .ins? If so read it
         basename = os.path.splitext(filename)[0]
-        for ext in '.instprm','.prm','.inst','.ins':
+        for ext in '.prm','.inst','.ins','.instprm':
             if self.zipfile:
                 instfile = G2IO.ExtractFileFromZip(self.zipfile,
@@ -1320 +1320 @@
                 # for multiple reads of one data file, reuse the inst parm file
                 instfile = lastIparmfile
-            if self.zipfile:
-                instfile = G2IO.ExtractFileFromZip(self.zipfile,
-                    selection=os.path.split(instfile)[1],parent=self)
+#            if self.zipfile:
+#                instfile = G2IO.ExtractFileFromZip(self.zipfile,
+#                    selection=os.path.split(instfile)[1],parent=self)
             if instfile != None and os.path.exists(instfile):
                 #print 'debug: try read',instfile