Changeset 2185 for trunk/GSASII.py


Ignore:
Timestamp:
Mar 29, 2016 10:11:57 AM (6 years ago)
Author:
vondreele
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2174 r2185  
    12801280        # with extension .instprm, .prm, .inst, or .ins? If so read it
    12811281        basename = os.path.splitext(filename)[0]
    1282         for ext in '.instprm','.prm','.inst','.ins':
     1282        for ext in '.prm','.inst','.ins','.instprm':
    12831283            if self.zipfile:
    12841284                instfile = G2IO.ExtractFileFromZip(self.zipfile,
     
    13201320                # for multiple reads of one data file, reuse the inst parm file
    13211321                instfile = lastIparmfile
    1322             if self.zipfile:
    1323                 instfile = G2IO.ExtractFileFromZip(self.zipfile,
    1324                     selection=os.path.split(instfile)[1],parent=self)
     1322#            if self.zipfile:
     1323#                instfile = G2IO.ExtractFileFromZip(self.zipfile,
     1324#                    selection=os.path.split(instfile)[1],parent=self)
    13251325            if instfile != None and os.path.exists(instfile):
    13261326                #print 'debug: try read',instfile
Note: See TracChangeset for help on using the changeset viewer.