Changeset 89

Timestamp:

Jun 18, 2010 9:22:13 AM (13 years ago)

Author:

vondreel

Message:

make arc masks bigger

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -469 +469 @@
     tax,tay = np.dsplit(TA,2)    #azimuth, 2-theta
     for tth,thick in rings:
-        tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),tth-thick/2.,tth+thick/2.)))
+        tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.)))
     for tth,azm,thick in arcs:
-        tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),tth-thick/2.,tth+thick/2.))* \
+        tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.))* \
             ma.getmask(ma.masked_inside(tax.flatten(),azm[0],azm[1])))
     taz = ma.masked_greater(ma.masked_less(image,Zlim[0]),Zlim[1]).flatten()

trunk/GSASIIplot.py

@@ -845 +845 @@
         wave = Data['wavelength']
         x1,y1 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(tth+thick/2.,wave),Data),azm)),2)
-        x2,y2 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(tth-thick/2.,wave),Data),azm)),2)
+        x2,y2 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(max(0.01,tth-thick/2.),wave),Data),azm)),2)
         self.arcList.append([Plot.plot(x1,y1,'r',picker=3),iarc,'o'])            
         self.arcList.append([Plot.plot(x2,y2,'r',picker=3),iarc,'i'])