Changeset 886


Ignore:
Timestamp:
Apr 13, 2013 7:08:32 PM (9 years ago)
Author:
toby
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r884 r886  
    785785                +'" (or Cancel for default)',
    786786                '.', '',
     787                'GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|'
    787788                'GSAS-II iparm file (*.instprm)|*.instprm|'
    788                 'GSAS iparm file (*.prm)|*.prm|'
    789                 'GSAS iparm file (*.inst)|*.inst|'
    790                 'GSAS iparm file (*.ins)|*.ins|'
    791789                'All files (*.*)|*.*',
    792790                wx.OPEN|wx.CHANGE_DIR)
     
    834832        '''
    835833        reqrdr = self.ImportMenuId.get(event.GetId())  # look up which format was requested
    836         rdlist = self.OnImportGeneric(reqrdr,self.ImportPowderReaderlist,
    837             'Powder Data',multiple=True)
     834        rdlist = self.OnImportGeneric(
     835            reqrdr,self.ImportPowderReaderlist,'Powder Data',multiple=True)
    838836        if len(rdlist) == 0: return
    839837        self.CheckNotebook()
     
    844842            # get instrument parameters for each dataset
    845843            Iparm1,Iparm2 = self.GetPowderIparm(rd, Iparm, lastIparmfile, lastdatafile)
    846             lastIparmfile = rd.instfile
     844            if rd.repeat_instparm:
     845                lastIparmfile = rd.instfile
    847846            lastdatafile = rd.powderentry[0]
    848847            print 'Read powder data '+str(rd.idstring)+ \
  • trunk/GSASIIIO.py

    r885 r886  
    14391439        self.idstring = ''
    14401440        self.Sample = G2pdG.SetDefaultSample()
     1441        self.repeat_instparm = True # Should a parm file be
     1442        #                             used for multiple histograms?
    14411443        self.instparm = None # name hint
    14421444        self.instfile = '' # full path name to instrument parameter file
  • trunk/imports/G2pwd_GPX.py

    r884 r886  
    112112            # likewise for dataset type as self.instdict['type'] = 'SNC' etc
    113113            # and self.Sample['Temperature'] for T
     114            self.repeat_instparm = False # prevent reuse of iparm when several hists are read
    114115            return True
    115116        except Exception as detail:
Note: See TracChangeset for help on using the changeset viewer.