Changeset 4286


Ignore:
Timestamp:
Feb 3, 2020 8:23:04 AM (21 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIexprGUI.py

    r3772 r4286  
    778778        neigh = []
    779779        if self.Oatom:
    780 #            GSASIIpath.IPyBreak()
    781780            neigh = G2mth.FindAllNeighbors(Phase,self.Oatom,aNames)
    782781        bNames = ['',]
     
    890889        Atoms = Phase['Atoms']
    891890        aNames = [atom[ct-1] for atom in Atoms]
    892 #        GSASIIpath.IPyBreak()
    893891        atomSizer = wx.BoxSizer(wx.HORIZONTAL)
    894892        atomSizer.Add(wx.StaticText(self.panel,label=' Origin atom (O in A-O-B): '),0,WACV)
     
    904902            bNames = ['',]
    905903            if neigh:
    906 #                GSASIIpath.IPyBreak()
    907904                for iA,aName in enumerate(neigh):
    908905                    for cName in neigh[iA+1:]:
  • trunk/GSASIIimgGUI.py

    r4219 r4286  
    8080    if imagefile is None: return []
    8181    formatName = data.get('formatName','')
    82     sumImg = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=formatName)
     82    sumImg = np.array(G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=formatName),dtype='int32')
    8383    if sumImg is None:
    8484        return []
Note: See TracChangeset for help on using the changeset viewer.