Changeset 2871


Ignore:
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:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2870 r2871  
    26112611        self.dataFrame = None
    26122612        self.Interpolate = 'nearest'
    2613         self.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
     2613        self.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
    26142614        self.VcovColor = 'RdYlGn'
    26152615        self.RamaColor = 'Blues'
  • trunk/GSASIIIO.py

    r2867 r2871  
    310310    else:
    311311        Data['type'] = 'PWDR'
    312         Data['color'] = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
     312        Data['color'] = GSASIIpath.GetConfigValue('Contour_color','Paired')
    313313        Data['tilt'] = 0.0
    314314        Data['rotation'] = 0.0
  • trunk/GSASIImath.py

    r2863 r2871  
    40364036        self.__dict__.update(options)
    40374037       
    4038     def update_guess(self,x0):     #same as default
     4038    def update_guess(self,x0):     #same as default #TODO - is this a reasonable update procedure?
    40394039        return np.squeeze(np.random.uniform(0.,1.,size=self.dims))*(self.upper-self.lower)+self.lower
    40404040       
     
    40534053#     variation of all previous updates and temperature?
    40544054
    4055 # Simulated annealing
     4055# Simulated annealing   #TODO - should we switch to scipy basinhopping?
    40564056
    40574057def anneal(func, x0, args=(), schedule='fast', full_output=0,
  • trunk/GSASIIobj.py

    r2863 r2871  
    752752\                           centerAzm           (bool) If True then the azimuth reported for the integrated slice
    753753                                                of the image is at the center line otherwise it is at the leading edge.
    754 \                           color               (str) The name of the colormap used to display the image. Default = 'gist_ncar'.
     754\                           color               (str) The name of the colormap used to display the image. Default = 'Paired'.
    755755\                           cutoff              (float) The minimum value of I/Ib for a point selected in a diffraction ring for
    756756                                                calibration calculations. See pixLimit for details as how point is found.           
  • trunk/GSASIIplot.py

    r2869 r2871  
    12621262                    G2frame.ContourColor = choice[sel]
    12631263                else:
    1264                     G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
     1264                    G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
    12651265                dlg.Destroy()
    12661266            elif G2frame.SinglePlot:
     
    24462446                G2frame.ContourColor = choice[sel]
    24472447            else:
    2448                 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
     2448                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
    24492449            dlg.Destroy()
    24502450        elif event.key == 'i':                  #for smoothing contour plot
     
    29942994                G2frame.ContourColor = choice[sel]
    29952995            else:
    2996                 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar')
     2996                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
    29972997            dlg.Destroy()
    29982998        wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title)
  • trunk/fsource/powsubs/psvfcj.for

    r436 r2871  
    203203          delta = emin + (TTHETAD - emin) * xp(k+it) ! Delta in degrees
    204204          CALL PSVOIGT(DTT+TTHETA-delta*100.,SIG,GAM,R,dRdT,dRdS,dRdG)
    205 
    206205          dDELTAdA = (1. - xp(k+it))*dEmindA ! N. B. symm w/r A,B
    207206          sinDELTA = sind(Delta)
  • trunk/scanCCD.py

    r2863 r2871  
    7878        self.Image = []
    7979        self.Hxyw = []
    80         self.data = {'color':'gist_ncar','range':[[0,1000],[0,1000]]}
     80        self.data = {'color':'Paired','range':[[0,1000],[0,1000]]}
    8181
    8282    def ExitMain(self, event):
Note: See TracChangeset for help on using the changeset viewer.