Changeset 3098 for trunk/GSASIIscriptable.py
- Timestamp:
- Sep 25, 2017 2:11:37 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIscriptable.py
r3091 r3098 184 184 of 'axial' or 'equatorial'. If boolean 185 185 given sets both axial and equatorial. 186 Pref.Ori. Boolean, whetherto refine187 Show Boolean, whetherto refine186 Pref.Ori. Boolean, True to refine 187 Show Boolean, True to refine 188 188 Size Not implemented 189 Use Boolean, whetherto refine190 Scale Boolean, whetherto refine189 Use Boolean, True to refine 190 Scale Phase fraction; Boolean, True to refine 191 191 ===================== ===================== ==================== 192 192 … … 631 631 block += 1 632 632 rd.objname = os.path.basename(filename) 633 flag = rd.Reader(filename, fp, buffer=rdbuffer, blocknum=block) 633 try: 634 flag = rd.Reader(filename, fp, buffer=rdbuffer, blocknum=block) 635 except: 636 flag = False 634 637 if flag: 635 638 # Omitting image loading special cases … … 638 641 repeat = rd.repeat 639 642 else: 640 raise G2ImportException("{}.Reader() returned:".format(rd), 641 flag) 642 643 if GSASIIpath.GetConfigValue('debug'): print("{} Reader failed to read {}".format(rd.formatName,filename)) 643 644 if rd_list: 644 645 if rd.warnings: 645 646 print("Read warning by", rd.formatName, "reader:", 646 647 rd.warnings, file=sys.stderr) 648 else: 649 print("{} read by Reader {}\n".format(filename,rd.formatName)) 647 650 return rd_list 648 651 raise G2ImportException("No reader could read file: " + filename) … … 924 927 925 928 Automatically checks for an instrument parameter file, or one can be 926 provided. 929 provided. Note that in unix fashion, "~" can be used to indicate the 930 home directory (e.g. ~/G2data/data.fxye). 927 931 928 932 :param str datafile: The powder data file to read, a filename. … … 973 977 phasereaders = import_generic(phasefile, PhaseReaders) 974 978 phasereader = phasereaders[0] 975 979 976 980 phasename = phasename or phasereader.Phase['General']['Name'] 977 981 phaseNameList = [p.name for p in self.phases()]
Note: See TracChangeset
for help on using the changeset viewer.