Changeset 2238 for trunk/GSASII.py


Ignore:
Timestamp:
May 4, 2016 10:07:30 AM (6 years ago)
Author:
vondreele
Message:

remove commented block from GSASII.py
add Bruker RAW file importer for powder data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2234 r2238  
    13541354                self.ErrorDialog('Open Error','Error opening instrument parameter file '
    13551355                    +str(instfile)+' requested by file '+ filename)
    1356 #        # did we read the data file from a zip? If so, look there for a
    1357 #        # instrument parameter file
    1358 #        if self.zipfile:
    1359 #            for ext in '.instprm','.prm','.inst','.ins':
    1360 #                instfile = G2IO.ExtractFileFromZip(self.zipfile,
    1361 #                    selection=os.path.split(basename + ext)[1],parent=self)
    1362 #                if instfile is not None and instfile != self.zipfile:
    1363 #                    print 'debug:',instfile,'created from ',self.zipfile
    1364 #                    Lines = self.OpenPowderInstprm(instfile)
    1365 #                    instParmList = None
    1366 #                    if Lines is not None:
    1367 #                        instParmList = self.ReadPowderInstprm(Lines,bank)    #this is [Inst1,Inst2] a pair of dicts
    1368 #                    if 'dict' in str(type(instParmList)):
    1369 #                        rd.instfile = instfile
    1370 #                        rd.instmsg = 'GSAS-II file '+instfile
    1371 #                        return instParmList
    1372 #                    else:
    1373 #                        rd.instmsg = instParmList   #an error message
    1374 #                        print 'three',instParmList
    1375 #                        return GetDefaultParms(self,rd)
    1376 #                    Iparm = self.ReadPowderIparm(instfile,bank,numbanks,rd)
    1377 #                    if Iparm:
    1378 #                        rd.instfile = instfile
    1379 #                        rd.instmsg = instfile + ' bank ' + str(rd.instbank)
    1380 #                        return SetPowderInstParms(Iparm,rd)
    1381 #                    else:
    1382 #                        #print 'debug: open/read for',instfile,'from',self.zipfile,'failed'
    1383 #                        pass # fail silently
    1384 #
    13851356        #Finally - ask user for Instrument parametrs file - seems it can't be in a zip file
    13861357        while True: # loop until we get a file that works or we get a cancel
Note: See TracChangeset for help on using the changeset viewer.