fix indentations in many files

Author: mirca

__init__.py

@@ -1,3 +1,6 @@
+from .kepio        import *
+from .kepmsg       import *
+from .kepfit       import *
 from .kepbls       import kepbls
 from .kepclip      import kepclip
 from .kepconvert   import kepconvert

kepbls.py

@@ -126,7 +126,7 @@ def kepbls(infile,outfile,datacol,errcol,minper,maxper,mindur,maxdur,nsearch,
         dPeriod = (maxper - minper) / nsearch
         trialPeriods = np.arange(minper,maxper+dPeriod,dPeriod,dtype='float32')
         complete = 0
-        print ' '
+        print(' ')
         for trialPeriod in trialPeriods:
             fracComplete = float(complete) / float(len(trialPeriods) - 1) * 100.0
             txt  = '\r'
@@ -206,7 +206,7 @@ def kepbls(infile,outfile,datacol,errcol,minper,maxper,mindur,maxdur,nsearch,
         srMax /= bestSr
         transitDuration *= trialPeriods / 24.0
         BJD0 = np.array(transitPhase * trialPeriods / nbins,dtype='float64') + intime[0] - 2454833.0
-        print '\n'
+        print('\n')
 
 # clean up x-axis unit
 
@@ -235,21 +235,6 @@ def kepbls(infile,outfile,datacol,errcol,minper,maxper,mindur,maxdur,nsearch,
 
 # plot light curve
 
-    if status == 0 and plot:
-        plotLatex = True
-        try:
-            params = {'backend': 'png',
-                      'axes.linewidth': 2.5,
-                      'axes.labelsize': labelsize,
-                      'axes.font': 'sans-serif',
-                      'axes.fontweight' : 'bold',
-                      'text.fontsize': 12,
-                      'legend.fontsize': 12,
-                      'xtick.labelsize': ticksize,
-                      'ytick.labelsize': ticksize}
-            rcParams.update(params)
-        except:
-            plotLatex = False
     if status == 0 and plot:
         plt.figure(figsize=[xsize,ysize])
         plt.clf()
@@ -333,10 +318,10 @@ def kepbls(infile,outfile,datacol,errcol,minper,maxper,mindur,maxdur,nsearch,
 # print best trial period results
 
     if status == 0:
-        print '      Best trial period = %.5f days' % trialPeriods[bestTrial]
-        print '    Time of mid-transit = BJD %.5f' % (BJD0[bestTrial] + 2454833.0)
-        print '       Transit duration = %.5f hours' % transitDuration[bestTrial]
-        print ' Maximum signal residue = %.4g \n' % (srMax[bestTrial] * bestSr)
+        print('      Best trial period = %.5f days' % trialPeriods[bestTrial])
+        print('    Time of mid-transit = BJD %.5f' % (BJD0[bestTrial] + 2454833.0))
+        print('       Transit duration = %.5f hours' % transitDuration[bestTrial])
+        print(' Maximum signal residue = %.4g \n' % (srMax[bestTrial] * bestSr))
 
 # end time
 
@@ -356,18 +341,25 @@ def kepbls(infile,outfile,datacol,errcol,minper,maxper,mindur,maxdur,nsearch,
     parser.add_argument('outfile', help='Name of FITS file to output', type=str)
     parser.add_argument('--datacol', default='DETSAP_FLUX',
                         help='Name of data column to plot', type=str)
-    parser.add_argument('--errcol', default='DETSAP_FLUX_ERR', help='Name of data error column to plot', type=str)
+    parser.add_argument('--errcol', default='DETSAP_FLUX_ERR',
+                        help='Name of data error column to plot', type=str)
     parser.add_argument('--minper', default=1.0, help='Minimum search period [days]', type=float)
     parser.add_argument('--maxper', default=30.0, help='Maximum search period [days]', type=float)
     parser.add_argument('--mindur', default=0.5, help='Minimum transit duration [hours]', type=float)
     parser.add_argument('--maxdur', default=12.0, help='Maximum transit duration [hours]', type=float)
-    parser.add_argument('--nsearch', default=1000, help='Number of test periods between minper and maxper', type=int)
-    parser.add_argument('--nbins', default=1000, help='Number of bins in the folded time series at any test period', type=int)
+    parser.add_argument('--nsearch', default=1000,
+                        help='Number of test periods between minper and maxper',
+                        type=int)
+    parser.add_argument('--nbins', default=1000,
+                        help='Number of bins in the folded time series at any test period',
+                        type=int)
     parser.add_argument('--plot', action='store_true', help='Plot result?')
     parser.add_argument('--clobber', action='store_true', help='Overwrite output file?')
     parser.add_argument('--verbose', action='store_true', help='Write to a log file?')
-    parser.add_argument('--logfile', '-l', help='Name of ascii log file', default='kepcotrend.log', dest='logfile', type=str)
-    parser.add_argument('--status', '-e', help='Exit status (0=good)', default=0, dest='status', type=int)
+    parser.add_argument('--logfile', '-l', help='Name of ascii log file',
+                        default='kepbls.log', dest='logfile', type=str)
+    parser.add_argument('--status', '-e', help='Exit status (0=good)',
+                        default=0, dest='status', type=int)
     args = parser.parse_args()
     cmdLine=True
     kepbls(args.infile,args.outfile,args.datacol,args.errcol,args.minper,args.maxper,args.mindur,

kepclip.py

@@ -52,8 +52,8 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
 
     if clobber: status = kepio.clobber(outfile,logfile,verbose)
     if kepio.fileexists(outfile):
-	    message = 'ERROR -- KEPCLIP: ' + outfile + ' exists. Use --clobber'
-	    status = kepmsg.err(logfile,message,verbose)
+        message = 'ERROR -- KEPCLIP: ' + outfile + ' exists. Use --clobber'
+        status = kepmsg.err(logfile,message,verbose)
 
 # time ranges for region
 
@@ -128,8 +128,8 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
 # clean up x-axis unit
 
     if status == 0:
-	barytime0 = float(int(tstart / 100) * 100.0)
-	barytime = work1 - barytime0
+        barytime0 = float(int(tstart / 100) * 100.0)
+        barytime = work1 - barytime0
         xlab = 'BJD $-$ %d' % barytime0
 
 # clean up y-axis units
@@ -139,17 +139,17 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
             nrm = len(str(int(work2.max())))-1
         except:
             nrm = 0
-	flux = work2 / 10**nrm
-	ylab = '10$^%d$ e$^-$ s$^{-1}$' % nrm
+        flux = work2 / 10**nrm
+        ylab = '10$^%d$ e$^-$ s$^{-1}$' % nrm
 
 # data limits
 
-	xmin = barytime.min()
-	xmax = barytime.max()
-	ymin = flux.min()
-	ymax = flux.max()
-	xr = xmax - xmin
-	yr = ymax - ymin
+        xmin = barytime.min()
+        xmax = barytime.max()
+        ymin = flux.min()
+        ymax = flux.max()
+        xr = xmax - xmin
+        yr = ymax - ymin
 
 # clear window, plot box
 
@@ -170,8 +170,8 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
 
 # plot line data
 
-	ltime = [barytime[0]]; ldata = [flux[0]]
-	for i in range(1,len(flux)):
+        ltime = [barytime[0]]; ldata = [flux[0]]
+        for i in range(1,len(flux)):
             if (barytime[i-1] > barytime[i] - 0.025):
                 ltime.append(barytime[i])
                 ldata.append(flux[i])
@@ -180,9 +180,9 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
                 ldata = np.array(ldata, dtype=np.float)
                 plt.plot(ltime,ldata,color=lcolor,linestyle='-',linewidth=lwidth)
                 ltime = []; ldata = []
-	ltime = np.array(ltime, dtype=np.float)
-	ldata = np.array(ldata, dtype=np.float)
-	plt.plot(ltime,ldata,color=lcolor,linestyle='-',linewidth=lwidth)
+        ltime = np.array(ltime, dtype=np.float)
+        ldata = np.array(ldata, dtype=np.float)
+        plt.plot(ltime,ldata,color=lcolor,linestyle='-',linewidth=lwidth)
 
 # plot fill data
 
@@ -192,13 +192,13 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
         flux = np.append(flux,[0.0])
         plt.fill(barytime,flux,fc=fcolor,linewidth=0.0,alpha=falpha)
         plt.xlim(xmin-xr*0.01,xmax+xr*0.01)
-	if ymin-yr*0.01 <= 0.0:
+        if ymin-yr*0.01 <= 0.0:
             plt.ylim(1.0e-10,ymax+yr*0.01)
-	else:
+        else:
             plt.ylim(ymin-yr*0.01,ymax+yr*0.01)
-	plt.xlabel(xlab, {'color' : 'k'})
-	plt.ylabel(ylab, {'color' : 'k'})
-	plt.grid()
+        plt.xlabel(xlab, {'color' : 'k'})
+        plt.ylabel(ylab, {'color' : 'k'})
+        plt.grid()
 
 # render plot
 
@@ -214,9 +214,9 @@ def kepclip(infile, outfile, ranges, plot, plotcol, clobber, verbose, logfile,
 # end time
 
     if (status == 0):
-	    message = 'KEPCLIP completed at'
+        message = 'KEPCLIP completed at'
     else:
-	    message = '\nKEPCLIP aborted at'
+        message = '\nKEPCLIP aborted at'
     kepmsg.clock(message,logfile,verbose)
 
 # main

kepconvert.py

@@ -73,11 +73,11 @@ def kepconvert(infile,outfile,conversion,columns,baddata,clobber,verbose,logfile
 
 # check columns exist in FITS file
     if not baddata and status == 0 and conversion == 'fits2asc':
-	    try:
-	        qualcol = table.field('SAP_QUALITY') == 0
-	    except:
-		message = 'No SAP_QUALITY column in data, are you using an old FITS file?'
-		status = kepmsg.err(logfile,message,verbose)
+            try:
+                qualcol = table.field('SAP_QUALITY') == 0
+            except:
+                message = 'No SAP_QUALITY column in data, are you using an old FITS file?'
+                status = kepmsg.err(logfile,message,verbose)
 
     if status == 0 and conversion == 'fits2asc':
         work = []
@@ -304,10 +304,10 @@ def kepconvert(infile,outfile,conversion,columns,baddata,clobber,verbose,logfile
 
 ## end time
 
-    if (status == 0):
-	message = 'KEPCONVERT completed at'
+    if status == 0:
+        message = 'KEPCONVERT completed at'
     else:
-	message = '\nKEPCONVERT aborted at'
+        message = '\nKEPCONVERT aborted at'
     kepmsg.clock(message,logfile,verbose)
 
 ## main

kepcotrend.py

@@ -6,7 +6,7 @@
 Changelog:
 1.0 released
 1.0.1 caught not having a new version of numpy with the in1d function and changed the simplex algorithm so that it fits the first two BV then fits
-		the rest of them, now much more stable (Sep 5 2011)
+                the rest of them, now much more stable (Sep 5 2011)
 2.0 code will now work on short cadence data by interpolating the basis vectors down to short cadence, several interpolation methods are available
 3.0 made it possible to run from the command line if there are arguements given to the call to kepcotrend
 """
@@ -482,12 +482,12 @@ def split_on_nans(bad_data,cad):
     blocks = []
     time_of_nans = cad[bad_data == False]
     if bad_data[0] == True:
-	blocks.append(cad[0])
+        blocks.append(cad[0])
     for i in range(1,len(time_of_nans)):
-	if time_of_nans[i] - time_of_nans[i-1] > 1:
-	    blocks.append(time_of_nans[i])
-	if bad_data[-1] == True:
-	    blocks.append(cad[-1])
+        if time_of_nans[i] - time_of_nans[i-1] > 1:
+            blocks.append(time_of_nans[i])
+        if bad_data[-1] == True:
+            blocks.append(cad[-1])
     return blocks
 
 def kepcotrendsc(infile,outfile,bvfile,listbv,fitmethod,fitpower,iterate,
@@ -557,7 +557,7 @@ def kepcotrendsc(infile,outfile,bvfile,listbv,fitmethod,fitpower,iterate,
     call += 'infile='+infile+' '
     call += 'outfile='+outfile+' '
     call += 'bvfile='+bvfile+' '
-#	call += 'numpcomp= '+str(numpcomp)+' '
+#       call += 'numpcomp= '+str(numpcomp)+' '
     call += 'listbv= '+str(listbv)+' '
     call += 'fitmethod=' +str(fitmethod)+ ' '
     call += 'fitpower=' + str(fitpower)+ ' '
@@ -607,23 +607,23 @@ def kepcotrendsc(infile,outfile,bvfile,listbv,fitmethod,fitpower,iterate,
             message = 'ERROR -- KEPCOTREND: ' + bvfile + ' does not exist.'
             status = kepmsg.err(logfile,message,verbose)
 
-	#lsq_sq - nonlinear least squares fitting and simplex_abs have been
-	#removed from the options in PyRAF but they are still in the code!
+        #lsq_sq - nonlinear least squares fitting and simplex_abs have been
+        #removed from the options in PyRAF but they are still in the code!
     if status == 0:
-	if fitmethod not in ['llsq','matrix','lst_sq','simplex_abs','simplex']:
-	    message = 'Fit method must either: llsq, matrix, lst_sq or simplex'
-	    status = kepmsg.err(logfile,message,verbose)
+        if fitmethod not in ['llsq','matrix','lst_sq','simplex_abs','simplex']:
+            message = 'Fit method must either: llsq, matrix, lst_sq or simplex'
+            status = kepmsg.err(logfile,message,verbose)
 
     if status == 0:
-	if not is_numlike(fitpower) and fitpower is not None:
-	    message = 'Fit power must be an real number or None'
-	    status = kepmsg.err(logfile,message,verbose)
+        if not is_numlike(fitpower) and fitpower is not None:
+            message = 'Fit power must be an real number or None'
+            status = kepmsg.err(logfile,message,verbose)
 
 
 
     if status == 0:
-	if fitpower is None:
-	    fitpower = 1.
+        if fitpower is None:
+            fitpower = 1.
 
     # input data
     if status == 0:
@@ -797,9 +797,9 @@ def kepcotrendsc(infile,outfile,bvfile,listbv,fitmethod,fitpower,iterate,
                                                            lc_cad_masked,
                                                            short,scinterp)
 
-	if iterate and sigma is None:
-	    message = 'If fitting iteratively you must specify a clipping range'
-	    status = kepmsg.err(logfile,message,verbose)
+        if iterate and sigma is None:
+            message = 'If fitting iteratively you must specify a clipping range'
+            status = kepmsg.err(logfile,message,verbose)
 
     if status == 0:
         #uses Pvals = yhat * U_transpose
@@ -834,14 +834,14 @@ def kepcotrendsc(infile,outfile,bvfile,listbv,fitmethod,fitpower,iterate,
         bvsum_nans = putInNans(bad_data, bvsum)
         flux_after_nans = putInNans(bad_data, flux_after)
 
-	if plot and status == 0:
+        if plot and status == 0:
             newmedflux = np.median(flux_after + 1)
             bvsum_un_norm = newmedflux*(1-bvsum)
             do_plot(lc_date, lc_flux, flux_after, bvsum_un_norm, lc_cad,
                     bad_data, lc_cad_o, version, cmdLine)
 
     if status == 0:
-	make_outfile(instr,outfile,flux_after_nans,bvsum_nans,version)
+        make_outfile(instr,outfile,flux_after_nans,bvsum_nans,version)
 
     # close input file
     if status == 0: