Changeset 2863
- Timestamp:
- Jun 14, 2017 4:11:42 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r2851 r2863 2611 2611 self.dataFrame = None 2612 2612 self.Interpolate = 'nearest' 2613 self.ContourColor = 'Paired'2613 self.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 2614 2614 self.VcovColor = 'RdYlGn' 2615 2615 self.RamaColor = 'Blues' -
trunk/GSASIIIO.py
r2818 r2863 310 310 else: 311 311 Data['type'] = 'PWDR' 312 Data['color'] = 'Paired'312 Data['color'] = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 313 313 Data['tilt'] = 0.0 314 314 Data['rotation'] = 0.0 -
trunk/GSASIIctrls.py
r2853 r2863 24 24 import wx.aui 25 25 import wx.lib.scrolledpanel as wxscroll 26 import matplotlib as mpl 26 27 import time 27 28 import copy … … 3621 3622 self.choice = {} 3622 3623 btn = G2ChoiceButton(self, sorted(self.vars.keys(),key=lambda s: s.lower()), 3623 strLoc=self.choice,strKey=0, 3624 onChoice=self.OnSelection) 3624 strLoc=self.choice,strKey=0,onChoice=self.OnSelection) 3625 3625 btn.SetLabel("") 3626 3626 self.sizer.Add(btn) … … 3651 3651 self.sizer.Fit(self) 3652 3652 self.CenterOnParent() 3653 3653 3654 3654 def OnChange(self,event=None): 3655 3655 ''' Check if anything been changed. Turn the save button on/off. … … 3705 3705 def OnSelection(self): 3706 3706 'show a selected variable' 3707 def OnNewColorBar(event): 3708 self.vars['Contour_color'][1] = self.colSel.GetValue() 3709 self.OnChange(event) 3710 3707 3711 self.varsizer.DeleteWindows() 3708 3712 var = self.choice[0] … … 3726 3730 s += ' (default)' 3727 3731 ch += [s] 3728 rb = wx.RadioBox( 3729 self, wx.ID_ANY, lbl, wx.DefaultPosition, wx.DefaultSize, 3730 ch, 1, wx.RA_SPECIFY_COLS 3731 ) 3732 rb = wx.RadioBox(self, wx.ID_ANY, lbl, wx.DefaultPosition, wx.DefaultSize, 3733 ch, 1, wx.RA_SPECIFY_COLS) 3732 3734 # set initial value 3733 3735 if self.vars[var][1] is None: … … 3746 3748 btn = None 3747 3749 sz = (250,-1) 3748 self.strEd = ValidatedTxtCtrl(self,self.vars[var],1,typeHint=str,OKcontrol=self.OnChange, 3749 size=sz) 3750 if self.vars[var][1] is not None: 3751 self.strEd.SetValue(self.vars[var][1]) 3752 self.varsizer.Add(self.strEd, 0, wx.ALIGN_CENTRE|wx.ALL, 5) 3750 if var == 'Contour_color': 3751 colorList = sorted([m for m in mpl.cm.datad.keys() ],key=lambda s: s.lower()) #if not m.endswith("_r") 3752 self.colSel = wx.ComboBox(self,value=self.vars[var][1],choices=colorList, 3753 style=wx.CB_READONLY|wx.CB_DROPDOWN) 3754 self.colSel.Bind(wx.EVT_COMBOBOX, OnNewColorBar) 3755 self.varsizer.Add(self.colSel, 0, wx.ALIGN_CENTRE|wx.ALL, 5) 3756 else: 3757 self.strEd = ValidatedTxtCtrl(self,self.vars[var],1,typeHint=str, 3758 OKcontrol=self.OnChange,size=sz) 3759 if self.vars[var][1] is not None: 3760 self.strEd.SetValue(self.vars[var][1]) 3761 self.varsizer.Add(self.strEd, 0, wx.ALIGN_CENTRE|wx.ALL, 5) 3753 3762 if btn: 3754 3763 btn.Bind(wx.EVT_BUTTON,self.onSelDir) -
trunk/GSASIIimgGUI.py
r2835 r2863 1175 1175 return 1176 1176 1177 colorList = sorted([m for m in mpl.cm.datad.keys() if not m.endswith("_r")],key=lambda s: s.lower())1177 colorList = sorted([m for m in mpl.cm.datad.keys() ],key=lambda s: s.lower()) #if not m.endswith("_r") 1178 1178 calList = sorted([m for m in calFile.Calibrants.keys()],key=lambda s: s.lower()) 1179 1179 typeList = ['PWDR - powder diffraction data','SASD - small angle scattering data',] -
trunk/GSASIImath.py
r2860 r2863 2573 2573 2574 2574 def validProtein(Phase): 2575 2576 def sumintact(intact): 2577 return {'CC':intact['CC'],'NN':intact['NN'],'OO':intact['OO'], 2578 'CN':(intact['CN']+intact['NC']),'CO':(intact['CO']+intact['OC']), 2579 'NO':(intact['NO']+intact['ON'])} 2580 2575 2581 resNames = ['ALA','ARG','ASN','ASP','CYS','GLN','GLU','GLY','HIS','ILE', 2576 2582 'LEU','LYS','MET','PHE','PRO','SER','THR','TRP','TYR','VAL','MSE'] … … 2583 2589 [0, 4236.200004171890200, 1521.387352718486200, 6620.715738223072500, 18368.343774298410000, 4050.797811118806700], 2584 2590 [0, 5054.781210204625500, 4304.078200827220800, 5287.691183798409800, 4050.797811118806700, 6666.856740479164700]]) 2585 avg = np.array([0. 192765509919262, 0.195575208778518, 0.275322406824210, 0.059102357035642, 0.233154192767480])2591 avg = np.array([0.,0.192765509919262, 0.195575208778518, 0.275322406824210, 0.059102357035642, 0.233154192767480]) 2586 2592 General = Phase['General'] 2587 2593 Amat,Bmat = G2lat.cell2AB(General['Cell'][1:7]) … … 2589 2595 Atoms = Phase['Atoms'] 2590 2596 cartAtoms = [] 2591 chains = []2592 chainBeg = []2593 2597 xyzmin = 999.*np.ones(3) 2594 2598 xyzmax = -999.*np.ones(3) 2599 #select residue atoms, skipping main chain C & N; make cartesian 2595 2600 for atom in Atoms: 2596 2601 if atom[1] in resNames: 2602 if atom[4].strip() in ['S','Se']: 2603 atom[4] = 'O' 2604 if atom[3].strip() in ['C','N']: #skip main chain C & N atoms 2605 continue 2597 2606 cartAtoms.append(atom[:cx+3]) 2598 if atom[2] not in chains:2599 chains.append(atom[2])2600 chainBeg.append(len(cartAtoms)-1)2601 2607 cartAtoms[-1][cx:cx+3] = np.inner(Amat,cartAtoms[-1][cx:cx+3]) 2602 2608 XYZ = np.array([atom[cx:cx+3] for atom in cartAtoms]) … … 2612 2618 Units = np.array([[h,k,l] for h in indices for k in indices for l in indices]) 2613 2619 dsmax = 3.75**2 2620 chains = [] 2621 resIntAct = [] 2622 chainIntAct = [] 2623 res = [] 2624 newChain = True 2625 intact = {'CC':0,'CN':0,'CO':0,'NN':0,'NO':0,'OO':0,'NC':0,'OC':0,'ON':0} 2614 2626 for ia,atom in enumerate(cartAtoms): 2615 if atom[3].strip() in ['C','N']: #skip main chain C & N atoms 2616 continue 2627 if atom[2] not in chains: #get chain id & save residue sequence from last chain 2628 chains.append(atom[2]) 2629 if len(resIntAct): 2630 resIntAct.append(sumintact(intact)) 2631 chainIntAct.append(resIntAct) 2632 res = [] 2633 resIntAct = [] 2634 intact = {'CC':0,'CN':0,'CO':0,'NN':0,'NO':0,'OO':0,'NC':0,'OC':0,'ON':0} 2635 newChain = True 2636 if atom[0] not in res: #new residue, get residue no. 2637 res.append(atom[0]) 2638 if not newChain: 2639 resIntAct.append(sumintact(intact)) 2640 intact = {'CC':0,'CN':0,'CO':0,'NN':0,'NO':0,'OO':0,'NC':0,'OC':0,'ON':0} 2641 newChain = False 2617 2642 ibox = iBox[ia] #box location of atom 2618 2643 tgts = [] … … 2625 2650 tgts = [tgt for tgt in tgts if cartAtoms[tgt][3].strip() not in ['C','N']] #exclude main chain 2626 2651 tgts = [tgt for tgt in tgts if np.sum((XYZ[ia]-XYZ[tgt])**2) <= dsmax] 2652 for tgt in tgts: 2653 dsqt = np.sqrt(np.sum((XYZ[ia]-XYZ[tgt])**2)) 2654 mult = 1.0 2655 if dsqt > 3.25: 2656 mult = 2.*(3.75-dsqt) 2657 intype = atom[4].strip()+cartAtoms[tgt][4].strip() 2658 intact[intype] += mult 2659 resIntAct.append(sumintact(intact)) 2660 chainIntAct.append(resIntAct) 2661 chainProb = [] 2662 for ich,chn in enumerate(chains): 2663 IntAct = chainIntAct[ich] 2664 nRes = len(IntAct) 2665 Probs = [] 2666 for i in range(4,nRes-4): 2667 mtrx = np.zeros(6) 2668 summ = 0. 2669 for j in range(i-4,i+4): 2670 summ += np.sum(np.array(IntAct[j].values())) 2671 mtrx[1] += IntAct[j]['CC'] 2672 mtrx[2] += IntAct[j]['CN'] 2673 mtrx[3] += IntAct[j]['CO'] 2674 mtrx[4] += IntAct[j]['NN'] 2675 mtrx[5] += IntAct[j]['NO'] 2676 mtrx /= summ 2677 mtrx -= avg 2678 prob = np.inner(np.inner(mtrx,b1),mtrx) 2679 Probs.append(prob) 2680 chainProb.append(Probs) 2627 2681 2628 2682 … … 2697 2751 Refs = refData[hist] 2698 2752 Refs[:,5] = np.where(Refs[:,5]>0.,Refs[:,5],0.) 2699 wt = 1./np.sqrt(np. max(Refs[:,4],.25))2753 wt = 1./np.sqrt(np.fmax(Refs[:,4],.25)) 2700 2754 # wt = 1./np.max(Refs[:,4],.25) 2701 2755 sumObs += np.sum(wt*Refs[:,5]) … … 2726 2780 Refs = refData[hist] 2727 2781 H = Refs[:,:3] 2728 wt = 1./np.sqrt(np. max(Refs[:,4],.25))2782 wt = 1./np.sqrt(np.fmax(Refs[:,4],.25)) 2729 2783 # wt = 1./np.max(Refs[:,4],.25) 2730 2784 phi,beta = G2lat.CrsAng(H,cell,SGData) -
trunk/GSASIIobj.py
r2846 r2863 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 = ' Paired'.754 \ color (str) The name of the colormap used to display the image. Default = 'gist_ncar'. 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/GSASIIphsGUI.py
r2853 r2863 5497 5497 if 'Axial' not in textureData['PlotType'] and '3D' not in textureData['PlotType']: 5498 5498 PTSizer.Add(wx.StaticText(Texture,-1,' Color scheme'),0,WACV) 5499 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]5499 choice = [m for m in mpl.cm.datad.keys()] #if not m.endswith("_r") 5500 5500 choice.sort() 5501 5501 colorSel = wx.ComboBox(Texture,-1,value=G2frame.ContourColor,choices=choice, … … 7642 7642 if 'Map Peaks' in data: 7643 7643 mapPeaks = np.array(data['Map Peaks']) 7644 peakMax = np. max(mapPeaks.T[0])7644 peakMax = np.fmax(mapPeaks.T[0]) 7645 7645 Ind = MapPeaks.GetSelectedRows() 7646 7646 for ind in Ind: -
trunk/GSASIIplot.py
r2849 r2863 1255 1255 elif event.key == 's' and 'PWDR' in plottype: 1256 1256 if G2frame.Contour: 1257 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]1257 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 1258 1258 choice.sort() 1259 1259 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 1262 1262 G2frame.ContourColor = choice[sel] 1263 1263 else: 1264 G2frame.ContourColor = 'Paired'1264 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 1265 1265 dlg.Destroy() 1266 1266 elif G2frame.SinglePlot: … … 1374 1374 xpos = G2lat.Dsp2pos(Parms,xpos) 1375 1375 elif G2frame.Contour and 'T' in Parms['Type'][0]: 1376 xpos = X[ xpos]1376 xpos = X[int(xpos)] 1377 1377 dsp = G2lat.Pos2dsp(Parms,xpos) 1378 1378 q = 2.*np.pi/dsp … … 2439 2439 dlg.Destroy() 2440 2440 elif event.key == 's': 2441 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]2441 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 2442 2442 choice.sort() 2443 2443 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 2446 2446 G2frame.ContourColor = choice[sel] 2447 2447 else: 2448 G2frame.ContourColor = 'Paired'2448 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 2449 2449 dlg.Destroy() 2450 2450 elif event.key == 'i': #for smoothing contour plot … … 2987 2987 2988 2988 elif event.key == 's': 2989 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]2989 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 2990 2990 choice.sort() 2991 2991 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 2994 2994 G2frame.ContourColor = choice[sel] 2995 2995 else: 2996 G2frame.ContourColor = 'Paired'2996 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 2997 2997 dlg.Destroy() 2998 2998 wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title) … … 3625 3625 except ValueError: 3626 3626 pass 3627 Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1]) 3627 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 3628 Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1]) 3628 3629 Plot.plot(-x,y,'+',picker=3) 3629 3630 Page.figure.colorbar(Img) … … 3746 3747 except ValueError: 3747 3748 pass 3748 Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1]) 3749 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 3750 Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1]) 3749 3751 Page.figure.colorbar(Img) 3750 3752 x,y,z = SHData['PFxyz'] … … 3794 3796 except ValueError: 3795 3797 pass 3796 Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1]) 3798 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 3799 Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1]) 3797 3800 Page.figure.colorbar(Img) 3798 3801 h,k,l = SHData['PFhkl'] … … 3937 3940 def OnPlotKeyPress(event): 3938 3941 if event.key == 's': 3939 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]3942 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 3940 3943 choice.sort() 3941 3944 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 4096 4099 def OnPlotKeyPress(event): 4097 4100 if event.key == 's': 4098 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]4101 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 4099 4102 choice.sort() 4100 4103 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) -
trunk/GSASIIsasd.py
r2802 r2863 444 444 scale = args[0] 445 445 nP = 500 446 xMin = np. max([0.,pos-4.*scale])447 xMax = np. min([pos+4.*scale,1.e5])446 xMin = np.fmax([0.,pos-4.*scale]) 447 xMax = np.fmin([pos+4.*scale,1.e5]) 448 448 X = np.linspace(xMin,xMax,nP,True) 449 449 fxn = LSWDist(X,pos) … … 1003 1003 x,y = Profile[:2] 1004 1004 rx,ry = refProfile[:2] 1005 Beg = np. max([rx[0],x[0],Limits[1][0],refLimits[1][0]])1006 Fin = np. min([rx[-1],x[-1],Limits[1][1],refLimits[1][1]])1005 Beg = np.fmax([rx[0],x[0],Limits[1][0],refLimits[1][0]]) 1006 Fin = np.fmin([rx[-1],x[-1],Limits[1][1],refLimits[1][1]]) 1007 1007 iBeg = np.searchsorted(x,Beg) 1008 1008 iFin = np.searchsorted(x,Fin)+1 #include last point … … 1404 1404 step = 0.02*distDict['StdDev'] 1405 1405 mode = distDict['Mean'] 1406 minX = np. max([mode-4.*distDict['StdDev'],1.])1407 maxX = np. min([mode+4.*distDict['StdDev'],1.e5])1406 minX = np.fmax([mode-4.*distDict['StdDev'],1.]) 1407 maxX = np.fmin([mode+4.*distDict['StdDev'],1.e5]) 1408 1408 elif 'LSW' in DistName: 1409 1409 distFxn = 'LSWDist' … … 1417 1417 pos = distDict['Mean'] 1418 1418 args = [distDict['StdDev']] 1419 minX = np. max([1.,pos-4.*distDict['StdDev']])1420 maxX = np. min([pos+4.*distDict['StdDev'],1.e5])1419 minX = np.fmax([1.,pos-4.*distDict['StdDev']]) 1420 maxX = np.fmin([pos+4.*distDict['StdDev'],1.e5]) 1421 1421 nP = 500 1422 1422 Diam = np.logspace(0.,5.,nP,True) -
trunk/config_example.py
r2796 r2863 139 139 '''Specifies the width of phase tick marks in pixels. 140 140 Fractional values do seem to produce an effect. Default is 1.''' 141 Contour_color = 'Paired' 142 ''' Specifies the color map to be used for contour plots (images, pole figures, etc.) 143 ''' -
trunk/fsource/SConstruct
r1357 r2863 32 32 # need command-line options for fortran command and fortran options 33 33 F2PYflags = '' # compiler options for f2py command 34 F2PYpath = ARGUMENTS.get('F2PYpath', '') 34 35 # find a default f2py relative to the scons location. Should be in the same place as f2py 35 F2PYpath = '' 36 for program in ['f2py','../f2py']: 37 if sys.platform == "win32" and os.path.splitext(program)[1].lower() != '.exe': 38 program = program + '.exe' 39 spath = os.path.split(sys.executable)[0] 40 print spath 41 f2pyprogram = os.path.normpath(os.path.join(spath,program)) 36 spath = os.path.normpath(os.path.split(sys.executable)[0]) 37 for pth in [F2PYpath,spath,os.path.normpath(os.path.join(spath,'..')),os.path.join(spath,'Scripts')]: 38 if not pth: continue 39 if sys.platform == "win32": 40 program = 'f2py.exe' 41 else: 42 program = 'f2py' 43 f2pyprogram = os.path.join(pth,program) 42 44 if is_exe(f2pyprogram): 43 F2PYpath = os.path.split(f2pyprogram)[0] 45 F2PYpath,F2PYprog = os.path.split(f2pyprogram) 46 break 47 program = 'f2py.py' 48 f2pyprogram = os.path.join(pth,program) 49 if os.path.exists(f2pyprogram) and os.path.splitext(program)[1] == '.py': 50 F2PYpath,F2PYprog = os.path.split(f2pyprogram) 44 51 break 45 52 else: 46 53 print 'Note: Using f2py from path (hope that works!)' 47 54 F2PYpath = which_path('f2py') # default path to f2py 55 F2PYprog = 'f2py' 56 # check if we have a working path to f2py: 57 f2pyprogram = os.path.normpath(os.path.join(F2PYpath,F2PYprog)) 58 if os.path.exists(f2pyprogram) and os.path.splitext(program)[1] == '.py': 59 pass 60 elif is_exe(f2pyprogram): 61 pass 62 else: 63 print ''' 64 ERROR: The f2py program was not found. If this program is installed 65 but not in your path, you should specify the path on the command line: 66 scons -Q F2PYpath=/Library/Frameworks/Python.framework/Versions/6.2/bin/ 67 scons -Q F2PYpath=D:/Python27/Scripts 68 ''' 69 sys.exit() 48 70 49 71 GFORTpath = which_path('gfortran') # path to compiler … … 144 166 #========================================================================================== 145 167 # get the python version number from the python image in the f2py directory 146 # first check if we have a working path to f2py:147 f2pyprogram = os.path.normpath(os.path.join(F2PYpath,'f2py'))148 if sys.platform == "win32" and os.path.splitext(f2pyprogram)[1].lower() != '.exe':149 f2pyprogram = f2pyprogram + '.exe'150 if not is_exe(f2pyprogram):151 print '''152 ERROR: The f2py program was not found. If this program is installed153 but not in your path, you should specify the path on the command line:154 scons -Q F2PYpath=/Library/Frameworks/Python.framework/Versions/6.2/bin/155 scons -Q F2PYpath=D:/Python27/Scripts156 '''157 sys.exit()158 168 # find the python location associated with the f2py in use. Note 159 169 # that on Windows it may be in the parent of the f2py location. … … 213 223 elif sys.platform == "darwin": 214 224 if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m32"' 225 elif sys.platform == "win32": 226 if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=gfortran --f77flags="-fno-range-check -m64"' 215 227 elif FCompiler == 'g77': 216 228 if FORTpath == "": FORTpath = G77path 217 229 if sys.platform == "win32": 218 if F2PYflags == "": F2PYflags = '--compiler=mingw32 '230 if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=g77' 219 231 if FORTflags == "": FORTflags = ' -w -O2 -fno-automatic -finit-local-zero -malign-double -mwindows' 220 232 else: … … 235 247 for lib in liblist: 236 248 module = module + ' ' + str(lib) 237 return os.path.join(F2PYpath,'f2py') + ' -c $SOURCE -m ' + module + ' ' + F2PYflags 249 f2pyprogram = os.path.normpath(os.path.join(F2PYpath,F2PYprog)) 250 if os.path.splitext(F2PYprog)[1] == '.py': 251 return pythonprogram + ' ' + f2pyprogram + ' -c $SOURCE ' + ' -m ' + module + ' ' + F2PYflags 252 else: 253 return f2pyprogram + ' -c $SOURCE' + ' -m ' + module + ' ' + F2PYflags 238 254 f2py = Builder(generator = generate_f2py) 239 255 env.Append(BUILDERS = {'f2py' : f2py},) … … 243 259 obj = os.path.splitext(str(source[0]))[0]+'.o' 244 260 return os.path.join(FORTpath,FCompiler) + ' -c $SOURCE ' + FORTflags + ' -I' + dir + ' -o' + obj 245 fort = Builder(generator = generate_obj, suffix = '.o', 246 src_suffix = '.for') 261 fort = Builder(generator = generate_obj, suffix = '.o', src_suffix = '.for') 247 262 # create a library builder so we can control how it is done on windows 248 263 def generate_lib(source, target, env, for_signature): -
trunk/scanCCD.py
r1378 r2863 78 78 self.Image = [] 79 79 self.Hxyw = [] 80 self.data = {'color':' Paired','range':[[0,1000],[0,1000]]}80 self.data = {'color':'gist_ncar','range':[[0,1000],[0,1000]]} 81 81 82 82 def ExitMain(self, event):
Note: See TracChangeset
for help on using the changeset viewer.