Changeset 4286

Timestamp:

Feb 3, 2020 8:23:04 AM (4 years ago)

Author:

vondreele

Message:

remove some IPyBreaks
fix reading of hdf5 & applying a dark image - had to force all images to int32 (hdf ones were int16) in GetImageZ

Location:

trunk

Files:

• GSASIIexprGUI.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (1 diff)

trunk/GSASIIexprGUI.py

@@ -778 +778 @@
         neigh = []
         if self.Oatom:
-#            GSASIIpath.IPyBreak()
             neigh = G2mth.FindAllNeighbors(Phase,self.Oatom,aNames)
         bNames = ['',]
@@ -890 +889 @@
         Atoms = Phase['Atoms']
         aNames = [atom[ct-1] for atom in Atoms]
-#        GSASIIpath.IPyBreak()
         atomSizer = wx.BoxSizer(wx.HORIZONTAL)
         atomSizer.Add(wx.StaticText(self.panel,label=' Origin atom (O in A-O-B): '),0,WACV)
@@ -904 +902 @@
             bNames = ['',]
             if neigh:
-#                GSASIIpath.IPyBreak()
                 for iA,aName in enumerate(neigh):
                     for cName in neigh[iA+1:]:

trunk/GSASIIimgGUI.py

@@ -80 +80 @@
     if imagefile is None: return []
     formatName = data.get('formatName','')
-    sumImg = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=formatName)
+    sumImg = np.array(G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=formatName),dtype='int32')
     if sumImg is None:
         return []