Changeset 2871

Timestamp:

Jun 21, 2017 9:35:40 AM (4 years ago)

Author:

vondreele

Message:

change ContourColor? default back to Paired even if it is 12 color discrete in new matplotlib

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (1 diff)
• GSASIImath.py (modified) (2 diffs)
• GSASIIobj.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)
• fsource/powsubs/psvfcj.for (modified) (1 diff)
• scanCCD.py (modified) (1 diff)

trunk/GSASII.py

@@ -2611 +2611 @@
         self.dataFrame = None
         self.Interpolate = 'nearest'
-        self.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
+        self.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
         self.VcovColor = 'RdYlGn'
         self.RamaColor = 'Blues'

trunk/GSASIIIO.py

@@ -310 +310 @@
     else:
         Data['type'] = 'PWDR'
-        Data['color'] = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
+        Data['color'] = GSASIIpath.GetConfigValue('Contour_color','Paired')
         Data['tilt'] = 0.0
         Data['rotation'] = 0.0

trunk/GSASIImath.py

@@ -4036 +4036 @@
         self.__dict__.update(options)
         
-    def update_guess(self,x0):     #same as default
+    def update_guess(self,x0):     #same as default #TODO - is this a reasonable update procedure?
         return np.squeeze(np.random.uniform(0.,1.,size=self.dims))*(self.upper-self.lower)+self.lower
         
@@ -4053 +4053 @@
 #     variation of all previous updates and temperature?
 
-# Simulated annealing
+# Simulated annealing   #TODO - should we switch to scipy basinhopping?
 
 def anneal(func, x0, args=(), schedule='fast', full_output=0,

trunk/GSASIIobj.py

@@ -752 +752 @@
 \                           centerAzm           (bool) If True then the azimuth reported for the integrated slice
                                                 of the image is at the center line otherwise it is at the leading edge.
-\                           color               (str) The name of the colormap used to display the image. Default = 'gist_ncar'.
+\                           color               (str) The name of the colormap used to display the image. Default = 'Paired'.
 \                           cutoff              (float) The minimum value of I/Ib for a point selected in a diffraction ring for 
                                                 calibration calculations. See pixLimit for details as how point is found.           

trunk/GSASIIplot.py

@@ -1262 +1262 @@
                     G2frame.ContourColor = choice[sel]
                 else:
-                    G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
+                    G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
                 dlg.Destroy()
             elif G2frame.SinglePlot:
@@ -2446 +2446 @@
                 G2frame.ContourColor = choice[sel]
             else:
-                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
+                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
             dlg.Destroy()
         elif event.key == 'i':                  #for smoothing contour plot
@@ -2994 +2994 @@
                 G2frame.ContourColor = choice[sel]
             else:
-                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
+                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
             dlg.Destroy()
         wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title)

trunk/fsource/powsubs/psvfcj.for

@@ -203 +203 @@
           delta = emin + (TTHETAD - emin) * xp(k+it) ! Delta in degrees
           CALL PSVOIGT(DTT+TTHETA-delta*100.,SIG,GAM,R,dRdT,dRdS,dRdG)
-
           dDELTAdA = (1. - xp(k+it))*dEmindA ! N. B. symm w/r A,B
           sinDELTA = sind(Delta)

trunk/scanCCD.py

@@ -78 +78 @@
         self.Image = []
         self.Hxyw = []
-        self.data = {'color':'gist_ncar','range':[[0,1000],[0,1000]]}
+        self.data = {'color':'Paired','range':[[0,1000],[0,1000]]}
 
     def ExitMain(self, event):