Changeset 3098 for trunk/GSASIIscriptable.py

Timestamp:

Sep 25, 2017 2:11:37 PM (4 years ago)

Author:

toby

Message:

fix powder data import errors with G2scriptable

File:

• trunk/GSASIIscriptable.py (modified) (5 diffs)

trunk/GSASIIscriptable.py

@@ -184 +184 @@
                                              of 'axial' or 'equatorial'. If boolean
                                              given sets both axial and equatorial.
-Pref.Ori.                                    Boolean, whether to refine
-Show                                         Boolean, whether to refine
+Pref.Ori.                                    Boolean, True to refine
+Show                                         Boolean, True to refine
 Size                                         Not implemented
-Use                                          Boolean, whether to refine
-Scale                                        Boolean, whether to refine
+Use                                          Boolean, True to refine
+Scale                                        Phase fraction; Boolean, True to refine
 ===================== =====================  ====================
 
@@ -631 +631 @@
                 block += 1
                 rd.objname = os.path.basename(filename)
-                flag = rd.Reader(filename, fp, buffer=rdbuffer, blocknum=block)
+                try:
+                    flag = rd.Reader(filename, fp, buffer=rdbuffer, blocknum=block)
+                except:
+                    flag = False
                 if flag:
                     # Omitting image loading special cases
@@ -638 +641 @@
                     repeat = rd.repeat
                 else:
-                    raise G2ImportException("{}.Reader() returned:".format(rd),
-                                            flag)
-
+                    if GSASIIpath.GetConfigValue('debug'): print("{} Reader failed to read {}".format(rd.formatName,filename))
             if rd_list:
                 if rd.warnings:
                     print("Read warning by", rd.formatName, "reader:",
                           rd.warnings, file=sys.stderr)
+                else:
+                    print("{} read by Reader {}\n".format(filename,rd.formatName))                    
                 return rd_list
     raise G2ImportException("No reader could read file: " + filename)
@@ -924 +927 @@
 
         Automatically checks for an instrument parameter file, or one can be
-        provided.
+        provided. Note that in unix fashion, "~" can be used to indicate the
+        home directory (e.g. ~/G2data/data.fxye).
 
         :param str datafile: The powder data file to read, a filename.
@@ -973 +977 @@
         phasereaders = import_generic(phasefile, PhaseReaders)
         phasereader = phasereaders[0]
-
+        
         phasename = phasename or phasereader.Phase['General']['Name']
         phaseNameList = [p.name for p in self.phases()]