Changeset 3496


Ignore:
Timestamp:
Jul 21, 2018 10:34:41 AM (3 years ago)
Author:
vondreele
Message:

fix issues with masks & powder patterns
remove stray print

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIindex.py

    r3357 r3496  
    386386            if dp > dm: pos += 1                            # closer to upper than lower
    387387            if pos >= N:
    388                 print ('%.4f %d'%(pos,N))
     388#                print ('%.4f %d'%(pos,N))
    389389                break
    390390            hkl = HKL[pos]                                 # put in hkl
  • trunk/GSASIIphsGUI.py

    r3474 r3496  
    455455        mainSizer.Add(MatSizer)
    456456        if self.ifMag:
    457             Mtrans = wx.CheckBox(self.panel,label=' M from Bilbao routine MAXMAGN? Use transform')
     457            Mtrans = wx.CheckBox(self.panel,label=' M from Bilbao routine MAXMAGN? Use matrix transform')
    458458            Mtrans.SetValue(self.Mtrans)
    459459            Mtrans.Bind(wx.EVT_CHECKBOX,OnMtrans)
  • trunk/GSASIIplot.py

    r3474 r3496  
    25622562#            xye0 = ma.masked_outside(xye0,limits[0],limits[1],copy=False)
    25632563            for excl in excls:
    2564                 xye0 = ma.masked_inside(xye0,excl[0],excl[1],copy=False)                   #excluded region mask
     2564                xye0 = ma.masked_inside(xye[0],excl[0],excl[1],copy=False)                   #excluded region mask
    25652565#            Pattern[1][0] = ma.array(Pattern[1][0],mask=ma.getmask(xye0))       #save the excluded region masking
    25662566            if not G2frame.Contour:
    2567                 xye0 = ma.masked_outside(xye0,limits[1][0],limits[1][1],copy=False)            #now mask for limits
     2567                xye0 = ma.masked_outside(xye[0],limits[1][0],limits[1][1],copy=False)            #now mask for limits
    25682568        if Page.plotStyle['qPlot'] and 'PWDR' in plottype:
    25692569            X = 2.*np.pi/G2lat.Pos2dsp(Parms,xye0)
  • trunk/GSASIIpwd.py

    r3444 r3496  
    17981798    if oneCycle:
    17991799        Ftol = 1.0
    1800     x,y,w,yc,yb,yd = data               #these are numpy arrays!
     1800    x,y,w,yc,yb,yd = ma.getdata(data)   #these are numpy arrays - remove masks!
    18011801    yc *= 0.                            #set calcd ones to zero
    18021802    yb *= 0.
  • trunk/GSASIIpwdGUI.py

    r3477 r3496  
    13731373        if invalid: return
    13741374        plottype = G2frame.GPXtree.GetItemText(G2frame.PatternId)[:4]
    1375 #        print 'new plot'
    13761375        wx.CallAfter(G2plt.PlotPatterns,G2frame,newPlot=False,plotType=plottype)  #unfortunately this resets the plot width
    13771376
  • trunk/exports/G2export_CIF.py

    r3491 r3496  
    12481248                parentSpGrp = parentSpGrp[0].upper() + parentSpGrp[1:].lower().rstrip('rh ')
    12491249                WriteCIFitem(self.fp, '_parent_space_group.name_H-M_alt',parentSpGrp)
     1250#                [Trans,Uvec,Vvec] = phasedict['General']['SGData']['fromParent']         #save these
    12501251                spacegroup = phasedict['General']['SGData']['MagSpGrp'].strip()
    12511252                spacegroup = spacegroup[0].upper() + spacegroup[1:].lower().rstrip('rh ')
Note: See TracChangeset for help on using the changeset viewer.