Changeset 886 for trunk/GSASII.py

Timestamp:

Apr 13, 2013 7:08:32 PM (10 years ago)

Author:

toby

Message:

make GSAS iparm files the default option; suppress iparm reuse for GPX data import

File:

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

trunk/GSASII.py

@@ -785 +785 @@
                 +'" (or Cancel for default)',
                 '.', '',
+                'GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|'
                 'GSAS-II iparm file (*.instprm)|*.instprm|'
-                'GSAS iparm file (*.prm)|*.prm|'
-                'GSAS iparm file (*.inst)|*.inst|'
-                'GSAS iparm file (*.ins)|*.ins|'
                 'All files (*.*)|*.*', 
                 wx.OPEN|wx.CHANGE_DIR)
@@ -834 +832 @@
         '''
         reqrdr = self.ImportMenuId.get(event.GetId())  # look up which format was requested
-        rdlist = self.OnImportGeneric(reqrdr,self.ImportPowderReaderlist,
-            'Powder Data',multiple=True)
+        rdlist = self.OnImportGeneric(
+            reqrdr,self.ImportPowderReaderlist,'Powder Data',multiple=True)
         if len(rdlist) == 0: return
         self.CheckNotebook()
@@ -844 +842 @@
             # get instrument parameters for each dataset
             Iparm1,Iparm2 = self.GetPowderIparm(rd, Iparm, lastIparmfile, lastdatafile)
-            lastIparmfile = rd.instfile
+            if rd.repeat_instparm: 
+                lastIparmfile = rd.instfile
             lastdatafile = rd.powderentry[0]
             print 'Read powder data '+str(rd.idstring)+ \