more error fixing

bin/event_peak.py

@@ -1,14 +1,21 @@
 #!/usr/bin/env python
 from __future__ import print_function
 import numpy as num
+import sys
 import presto.events as evts
 from presto import kuiper
 from presto.Pgplot import *
 
 
+if len(sys.argv) != 2:
+    print("\nusage: {} file\n".format(sys.argv[0]))
+    sys.exit(1)
+
+
 def calc_phases(events, f, fd):
     return num.fmod(events*(f+(0.5*fd*events)), 1.0)
 
+
 events = num.loadtxt(sys.argv[1])
 events.sort()
 print("Read %d events from '%s'." % (events.size, sys.argv[1]))

bin/fb_truncate.py

@@ -9,13 +9,15 @@
 
 import sys
 import copy
-import optparse
+from argparse import ArgumentParser
 import numpy as np
 from presto import filterbank
 
 BLOCKSIZE = 1e5 # Number of spectra to manipulate at once
 
-def main():
+
+
+def main(args):
     infn = args[0]
     print("Reading filterbank file (%s)" % infn)
     fil = filterbank.FilterbankFile(infn)
@@ -106,36 +108,34 @@ def main():
 
 
 if __name__ == '__main__':
-    parser = optparse.OptionParser(prog='fb_truncate.py', \
-                    version="v0.1 Patrick Lazarus (Aug. 28, 2012)")
-    parser.add_option("-L", "--lo-freq", dest="lo_freq", type='float', \
-                    help="Desired low frequency for output file. Note: " \
-                        "actual low frequency will be rounded to the nearest" \
-                        "channel (Default: Don't truncate low-freq channels)", \
+    parser = ArgumentParser(description="v0.1 Patrick Lazarus (Aug. 28, 2012)")
+    parser.add_argument("-L", "--lo-freq", dest="lo_freq", type=float,
+                    help="Desired low frequency for output file. Note: "
+                        "actual low frequency will be rounded to the nearest"
+                        "channel (Default: Don't truncate low-freq channels)",
                     default=None)
-    parser.add_option("-H", "--hi-freq", dest="hi_freq", type='float', \
-                    help="Desired high frequency for output file. Note: " \
-                        "actual high frequency will be rounded to the nearest" \
-                        "channel (Default: Don't truncate high-freq channels)", \
+    parser.add_argument("-H", "--hi-freq", dest="hi_freq", type=float,
+                    help="Desired high frequency for output file. Note: "
+                        "actual high frequency will be rounded to the nearest"
+                        "channel (Default: Don't truncate high-freq channels)",
                     default=None)
-    parser.add_option("-s", "--start-time", dest="start_time", type='float', \
-                    help="Start of desired range of input file to write " \
-                        "to output file. Note: The actual start time will " \
-                        "be rounded to the nearest sample.(Default: Don't " \
+    parser.add_argument("-s", "--start-time", dest="start_time", type=float,
+                    help="Start of desired range of input file to write "
+                        "to output file. Note: The actual start time will "
+                        "be rounded to the nearest sample.(Default: Don't "
                         "truncate from start of file.)", default=None)
-    parser.add_option("-e", "--end-time", dest="end_time", type='float', \
-                    help="End of desired range of input file to write " \
-                        "to output file. Note: The actual end time will " \
-                        "be rounded to the nearest sample. (Default: " \
+    parser.add_argument("-e", "--end-time", dest="end_time", type=float,
+                    help="End of desired range of input file to write "
+                        "to output file. Note: The actual end time will "
+                        "be rounded to the nearest sample. (Default: "
                         "Don't truncate from end of file.)", default=None)
-    parser.add_option("--block-size", dest='block_size', default=BLOCKSIZE, \
-                    type='float', \
-                    help="Number of spectra per block. This is the amount " \
-                        "of data manipulated/written at a time. (Default: " \
+    parser.add_argument("--block-size", dest='block_size', default=BLOCKSIZE,
+                    type=float,
+                    help="Number of spectra per block. This is the amount "
+                        "of data manipulated/written at a time. (Default: "
                         " %d spectra)" % BLOCKSIZE)
-    parser.add_option("-o", "--outname", dest='outname', action='store', \
+    parser.add_argument("-o", "--outname", dest='outname', action='store', required=True,
                     help="The name of the output file.")
     (options, args) = parser.parse_args()
-    if not hasattr(options, 'outname'):
-        raise ValueError("An output file name _must_ be provided!")
-    main()
+
+    main(args)

bin/filter_zerolags.py

@@ -4,6 +4,12 @@
 import numpy as N
 import sys, scipy.io, scipy.signal
 
+
+if len(sys.argv) != 2:
+    print("\nusage: {} file\n".format(sys.argv[0]))
+    sys.exit(1)
+
+
 plot=0
 
 infilenm = sys.argv[1]

bin/fit_circular_orbit.py

@@ -12,6 +12,7 @@
 period = num.asarray([])
 time = num.asarray([])
 
+
 def parse_eph(filenm):
     global period, time
     suffix = filenm.split(".")[-1]
@@ -41,14 +42,17 @@ def parse_eph(filenm):
     period = num.concatenate((period, newps))
     print("%13.7f (%0.1f sec): " % (epoch, T), fs)
 
+
 def orbeqn(Ppxt, times):
     # P = Ppsr, p = Porb, x = a*sin(i)/s, t = T_o
     phi = pu.TWOPI*(times - Ppxt[3])*86400.0/Ppxt[1]
     return Ppxt[0]*(1.0+pu.TWOPI*Ppxt[2]/Ppxt[1]*num.cos(phi))
 
+
 def funct(Ppxt, times, measured):
     return orbeqn(Ppxt, times) - measured
 
+
 if __name__ == '__main__':
     if len(sys.argv)==1:
         print("\nusage: fit_circular_orbit.py P_psr P_orb X_orb parfiles or bestprofs")

bin/guppidrift2fil.py

@@ -268,12 +268,12 @@ def main(fits_fn, outfn, nbits, \
                     input_nbits=input_nbits)
         if flip_band:
             subint = np.fliplr(subint)
-	subint /= scale_fac
-	outfil.append_spectra(subint)
-	pcnt = "%d" % (i*100.0/output_subints)
-	if pcnt != oldpcnt:
-            sys.stdout.write("% 4s%% complete\r" % pcnt)
-            sys.stdout.flush()
+    subint /= scale_fac
+    outfil.append_spectra(subint)
+    pcnt = "%d" % (i*100.0/output_subints)
+    if pcnt != oldpcnt:
+        sys.stdout.write("% 4s%% complete\r" % pcnt)
+        sys.stdout.flush()
 
     print("Done               ")
     outfil.close()