Changeset 3429


Ignore:
Timestamp:
Jun 11, 2018 11:00:24 AM (3 years ago)
Author:
vondreele
Message:

add np.int64 to objectScanInnore list
fix order problems in TransformDialog?
fix mask copy warning in G2plot

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r3427 r3429  
    564564    return
    565565
    566 objectScanIgnore = [int,bool,float,str,long,np.float64,np.ndarray,G2obj.G2VarObj]
     566objectScanIgnore = [int,bool,float,str,long,np.float64,np.int64,np.ndarray,G2obj.G2VarObj]
    567567if '2' in platform.python_version_tuple()[0]:
    568568    objectScanIgnore += [unicode,]
  • trunk/GSASIIphsGUI.py

    r3425 r3429  
    352352                msg = 'Space Group Information'
    353353                G2G.SGMessageBox(self.panel,msg,text,table).Show()
     354            if self.ifMag:
     355                self.BNSlatt = SGData['SGLatt']
    354356            if self.Phase['General']['Type'] == 'magnetic':
    355357                Nops = len(SGData['SGOps'])*len(SGData['SGCen'])
     
    357359                    Nops *= 2
    358360                SGData['SpnFlp'] = Nops*[1,]
     361            wx.CallAfter(self.Draw)
    359362
    360363        def OnTest(event):
  • trunk/GSASIIplot.py

    r3428 r3429  
    25592559            # recompute mask from excluded regions, in case they have changed
    25602560            excls = limits[2:]
    2561             xye0 = ma.array(xye0,mask=False)
     2561#            xye0 = ma.masked_outside(xye0,limits[0],limits[1],copy=False)
    25622562            for excl in excls:
    2563                 xye0 = ma.masked_inside(xye0,excl[0],excl[1])                   #excluded region mask
    2564             Pattern[1][0] = ma.array(Pattern[1][0],mask=ma.getmask(xye0))       #save the excluded region masking
     2563                xye0 = ma.masked_inside(xye0,excl[0],excl[1],copy=False)                   #excluded region mask
     2564#            Pattern[1][0] = ma.array(Pattern[1][0],mask=ma.getmask(xye0))       #save the excluded region masking
    25652565            if not G2frame.Contour:
    2566                 xye0 = ma.masked_outside(xye0,limits[1][0],limits[1][1])            #now mask for limits
     2566                xye0 = ma.masked_outside(xye0,limits[1][0],limits[1][1],copy=False)            #now mask for limits
    25672567        if Page.plotStyle['qPlot'] and 'PWDR' in plottype:
    25682568            X = 2.*np.pi/G2lat.Pos2dsp(Parms,xye0)
Note: See TracChangeset for help on using the changeset viewer.