Changeset 3496

Timestamp:

Jul 21, 2018 10:34:41 AM (5 years ago)

Author:

vondreele

Message:

fix issues with masks & powder patterns
remove stray print

Location:

trunk

Files:

• GSASIIindex.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIpwd.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)
• exports/G2export_CIF.py (modified) (1 diff)

trunk/GSASIIindex.py

@@ -386 +386 @@
             if dp > dm: pos += 1                            # closer to upper than lower
             if pos >= N:
-                print ('%.4f %d'%(pos,N))
+#                print ('%.4f %d'%(pos,N))
                 break
             hkl = HKL[pos]                                 # put in hkl

trunk/GSASIIphsGUI.py

@@ -455 +455 @@
         mainSizer.Add(MatSizer)
         if self.ifMag:
-            Mtrans = wx.CheckBox(self.panel,label=' M from Bilbao routine MAXMAGN? Use transform')
+            Mtrans = wx.CheckBox(self.panel,label=' M from Bilbao routine MAXMAGN? Use matrix transform')
             Mtrans.SetValue(self.Mtrans)
             Mtrans.Bind(wx.EVT_CHECKBOX,OnMtrans)

trunk/GSASIIplot.py

@@ -2562 +2562 @@
 #            xye0 = ma.masked_outside(xye0,limits[0],limits[1],copy=False)
             for excl in excls:
-                xye0 = ma.masked_inside(xye0,excl[0],excl[1],copy=False)                   #excluded region mask
+                xye0 = ma.masked_inside(xye[0],excl[0],excl[1],copy=False)                   #excluded region mask
 #            Pattern[1][0] = ma.array(Pattern[1][0],mask=ma.getmask(xye0))       #save the excluded region masking
             if not G2frame.Contour:
-                xye0 = ma.masked_outside(xye0,limits[1][0],limits[1][1],copy=False)            #now mask for limits
+                xye0 = ma.masked_outside(xye[0],limits[1][0],limits[1][1],copy=False)            #now mask for limits
         if Page.plotStyle['qPlot'] and 'PWDR' in plottype:
             X = 2.*np.pi/G2lat.Pos2dsp(Parms,xye0)

trunk/GSASIIpwd.py

@@ -1798 +1798 @@
     if oneCycle:
         Ftol = 1.0
-    x,y,w,yc,yb,yd = data               #these are numpy arrays!
+    x,y,w,yc,yb,yd = ma.getdata(data)   #these are numpy arrays - remove masks!
     yc *= 0.                            #set calcd ones to zero
     yb *= 0.

trunk/GSASIIpwdGUI.py

@@ -1373 +1373 @@
         if invalid: return
         plottype = G2frame.GPXtree.GetItemText(G2frame.PatternId)[:4]
-#        print 'new plot'
         wx.CallAfter(G2plt.PlotPatterns,G2frame,newPlot=False,plotType=plottype)  #unfortunately this resets the plot width
 

trunk/exports/G2export_CIF.py

@@ -1248 +1248 @@
                 parentSpGrp = parentSpGrp[0].upper() + parentSpGrp[1:].lower().rstrip('rh ')
                 WriteCIFitem(self.fp, '_parent_space_group.name_H-M_alt',parentSpGrp)
+#                [Trans,Uvec,Vvec] = phasedict['General']['SGData']['fromParent']         #save these
                 spacegroup = phasedict['General']['SGData']['MagSpGrp'].strip()
                 spacegroup = spacegroup[0].upper() + spacegroup[1:].lower().rstrip('rh ')