Changeset 2871
- Timestamp:
- Jun 21, 2017 9:35:40 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r2870 r2871 2611 2611 self.dataFrame = None 2612 2612 self.Interpolate = 'nearest' 2613 self.ContourColor = GSASIIpath.GetConfigValue('Contour_color',' gist_ncar')2613 self.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired') 2614 2614 self.VcovColor = 'RdYlGn' 2615 2615 self.RamaColor = 'Blues' -
trunk/GSASIIIO.py
r2867 r2871 310 310 else: 311 311 Data['type'] = 'PWDR' 312 Data['color'] = GSASIIpath.GetConfigValue('Contour_color',' gist_ncar')312 Data['color'] = GSASIIpath.GetConfigValue('Contour_color','Paired') 313 313 Data['tilt'] = 0.0 314 314 Data['rotation'] = 0.0 -
trunk/GSASIImath.py
r2863 r2871 4036 4036 self.__dict__.update(options) 4037 4037 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? 4039 4039 return np.squeeze(np.random.uniform(0.,1.,size=self.dims))*(self.upper-self.lower)+self.lower 4040 4040 … … 4053 4053 # variation of all previous updates and temperature? 4054 4054 4055 # Simulated annealing 4055 # Simulated annealing #TODO - should we switch to scipy basinhopping? 4056 4056 4057 4057 def anneal(func, x0, args=(), schedule='fast', full_output=0, -
trunk/GSASIIobj.py
r2863 r2871 752 752 \ centerAzm (bool) If True then the azimuth reported for the integrated slice 753 753 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'. 755 755 \ cutoff (float) The minimum value of I/Ib for a point selected in a diffraction ring for 756 756 calibration calculations. See pixLimit for details as how point is found. -
trunk/GSASIIplot.py
r2869 r2871 1262 1262 G2frame.ContourColor = choice[sel] 1263 1263 else: 1264 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color',' gist_ncar')1264 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired') 1265 1265 dlg.Destroy() 1266 1266 elif G2frame.SinglePlot: … … 2446 2446 G2frame.ContourColor = choice[sel] 2447 2447 else: 2448 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color',' gist_ncar')2448 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired') 2449 2449 dlg.Destroy() 2450 2450 elif event.key == 'i': #for smoothing contour plot … … 2994 2994 G2frame.ContourColor = choice[sel] 2995 2995 else: 2996 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color',' gist_ncar')2996 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired') 2997 2997 dlg.Destroy() 2998 2998 wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title) -
trunk/fsource/powsubs/psvfcj.for
r436 r2871 203 203 delta = emin + (TTHETAD - emin) * xp(k+it) ! Delta in degrees 204 204 CALL PSVOIGT(DTT+TTHETA-delta*100.,SIG,GAM,R,dRdT,dRdS,dRdG) 205 206 205 dDELTAdA = (1. - xp(k+it))*dEmindA ! N. B. symm w/r A,B 207 206 sinDELTA = sind(Delta) -
trunk/scanCCD.py
r2863 r2871 78 78 self.Image = [] 79 79 self.Hxyw = [] 80 self.data = {'color':' gist_ncar','range':[[0,1000],[0,1000]]}80 self.data = {'color':'Paired','range':[[0,1000],[0,1000]]} 81 81 82 82 def ExitMain(self, event):
Note: See TracChangeset
for help on using the changeset viewer.