Changeset 4303 for trunk/GSASIIscriptable.py

Timestamp:

Feb 14, 2020 4:54:30 PM (3 years ago)

Author:

toby

Message:

fix scriptable for multiple image files and xfer correction in @4286

File:

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

trunk/GSASIIscriptable.py

@@ -1771 +1771 @@
     if sumImg is None:
         return []
+    sumImg = np.array(sumImg,dtype='int32')
     darkImg = False
     if 'dark image' in Controls:
@@ -1778 +1779 @@
             formatName = dImgObj.data['Image Controls'].get('formatName','')
             imagefile = dImgObj.data['data'][1]
-            ImageTag = None # fix this for multiimage files
+            if type(imagefile) is tuple:
+                imagefile,ImageTag  = imagefile
             darkImage = G2fil.RereadImageData(ImageReaderlist,imagefile,ImageTag=ImageTag,FormatName=formatName)
             if darkImg is None:
@@ -2889 +2891 @@
         return G2obj.G2VarObj(phase, hist, varname, atomId)
 
-    def add_image(self, imagefile, fmthint=None, defaultImage=None):
+    def add_image(self, imagefile, fmthint=None, defaultImage=None, indexList=None):
         """Load an image into a project
 
@@ -2900 +2902 @@
         :param str defaultImage: The name of an image to use as a default for 
           setting parameters for the image file to read. 
-
-        :returns: a list of G2Image object for the added image(s) [this routine 
-          has not yet been tested with files with multiple images...]
+        :param list indexList: specifies the image numbers (counting from zero) 
+          to be used from the file when a file has multiple images. A value of
+          ``[0,2,3]`` will cause the only first, third and fourth images in the file
+          to be included in the project. 
+
+        :returns: a list of :class:`G2Image` object(s) for the added image(s) 
         """
         LoadG2fil()
@@ -2908 +2913 @@
         readers = import_generic(imagefile, Readers['Image'], fmthint=fmthint)
         objlist = []
-        for rd in readers:
+        for i,rd in enumerate(readers):
+            if indexList is not None and i not in indexList:
+                G2fil.G2Print("Image {} skipped".format(i))
+                continue
             if rd.SciPy:        #was default read by scipy; needs 1 time fixes
                 G2fil.G2Print('Warning: Image {} read by generic SciPy import. Image parameters likely wrong'.format(imagefile))