Changeset 2600

Timestamp:

Dec 22, 2016 11:14:21 AM (5 years ago)

Author:

vondreele

Message:

remove comment about mag structures under construction
set powder peak widths to be 50*FWHM for TOF & 75/50 for CW (bigger on low side for axial divergence)
Tune up density map color rendering - make "red" really orange (brighter) & both orange/green more intense.

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (2 diffs)
• GSASIIpwd.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -801 +801 @@
             magSizer = wx.BoxSizer(wx.VERTICAL)
             magSizer.Add(wx.StaticText(General,label=' Magnetic spin operator selection:'),0,WACV)
-            magSizer.Add(wx.StaticText(General,label='  NB: UNDER CONSTRUCTION - LS NOT FINISHED'),0,WACV)
             if not len(GenSym):
                 magSizer.Add(wx.StaticText(General,label=' No spin inversion allowed'),0,WACV)

trunk/GSASIIplot.py

@@ -5568 +5568 @@
             x,y,z = xyz
             r,c = rc
-            GL.glColor3ubv(c)
+            GL.glColor3fv(c/255.)
             GL.glPointSize(r*50)
             GL.glBegin(GL.GL_POINTS)
@@ -5736 +5736 @@
                 if rho[I,J,K] < 0.:
                     XYZ.append(xyz)
-                    RC.append([0.1*alpha,2*Rd])
+                    RC.append([0.2*alpha,2*Or])
                 else:
                     XYZ.append(xyz)
-                    RC.append([0.1*alpha,2*Gr])
+                    RC.append([0.2*alpha,2*Gr])
         RenderDots(XYZ,RC)
         GL.glShadeModel(GL.GL_SMOOTH)

trunk/GSASIIpwd.py

@@ -539 +539 @@
 def getWidthsCW(pos,sig,gam,shl):
     '''Compute the peak widths used for computing the range of a peak
-    for constant wavelength data. On low-angle side, 10 FWHM are used, 
-    on high-angle side 15 are used, low angle side extended by axial divergence
+    for constant wavelength data. On low-angle side, 50 FWHM are used, 
+    on high-angle side 75 are used, low angle side extended for axial divergence
     (for peaks above 90 deg, these are reversed.)
     '''
     widths = [np.sqrt(sig)/100.,gam/100.]
     fwhm = 2.355*widths[0]+widths[1]
-    fmin = 100.*(fwhm+shl*abs(npcosd(pos)))
-    fmax = 150.0*fwhm
+    fmin = 50.*(fwhm+shl*abs(npcosd(pos)))
+    fmax = 75.0*fwhm
     if pos > 90:
         fmin,fmax = [fmax,fmin]          
@@ -553 +553 @@
 def getWidthsTOF(pos,alp,bet,sig,gam):
     '''Compute the peak widths used for computing the range of a peak
-    for constant wavelength data. 10 FWHM are used on both sides each 
+    for constant wavelength data. 50 FWHM are used on both sides each 
     extended by exponential coeff.
     '''
     widths = [np.sqrt(sig),gam]
     fwhm = 2.355*widths[0]+2.*widths[1]
-    fmin = 30.*fwhm*(1.+1./alp)    
-    fmax = 30.*fwhm*(1.+1./bet)
+    fmin = 50.*fwhm*(1.+1./alp)    
+    fmax = 50.*fwhm*(1.+1./bet)
     return widths,fmin,fmax