Commit b7136ff2 authored by Kipp Cannon's avatar Kipp Cannon

Merge branch 'trailing-whitespace-lalapps-string' into 'master'

Remove trailing whitespace from lalapps string code

See merge request lscsoft/lalsuite!1183
parents e5433e75 e372cfb1
...@@ -63,7 +63,7 @@ def parse_command_line(): ...@@ -63,7 +63,7 @@ def parse_command_line():
) )
parser.add_option("-f", "--config-file", metavar = "filename", help = "Use this configuration file (required).") parser.add_option("-f", "--config-file", metavar = "filename", help = "Use this configuration file (required).")
parser.add_option("-l", "--log-path", metavar = "path", help = "Make condor put log files in this directory (required).") parser.add_option("-l", "--log-path", metavar = "path", help = "Make condor put log files in this directory (required).")
parser.add_option("--background-time-slides", metavar = "filename", action = "append", help = "Set the name of the file from which to obtain the time slide table for use in the background branch of the pipeline (required). This option can be given multiple times to parallelize the background analysis across time slides. You will want to make sure the time slide files have distinct vectors to not repeat the same analysis multiple times, and in particular you'll want to make sure only one of them has a zero-lag vector in it.") parser.add_option("--background-time-slides", metavar = "filename", action = "append", help = "Set the name of the file from which to obtain the time slide table for use in the background branch of the pipeline (required). This option can be given multiple times to parallelize the background analysis across time slides. You will want to make sure the time slide files have distinct vectors to not repeat the same analysis multiple times, and in particular you'll want to make sure only one of them has a zero-lag vector in it.")
parser.add_option("--injection-time-slides", metavar = "filename", help = "Set the name of the file from which to obtain the time slide table for use in the injection branch of the pipeline (required).") parser.add_option("--injection-time-slides", metavar = "filename", help = "Set the name of the file from which to obtain the time slide table for use in the injection branch of the pipeline (required).")
parser.add_option("--segments-file", metavar = "filename", help = "Set the name of the LIGO Light-Weight XML file from which to obtain segment lists (required). See ligolw_segments and ligolw_segment_query for more information on constructing an XML-format segments file. See also --segments-name.") parser.add_option("--segments-file", metavar = "filename", help = "Set the name of the LIGO Light-Weight XML file from which to obtain segment lists (required). See ligolw_segments and ligolw_segment_query for more information on constructing an XML-format segments file. See also --segments-name.")
parser.add_option("--segments-name", metavar = "name", default = "segments", help = "Set the name of the segment lists to retrieve from the segments file (default = \"segments\"). See also --segments-file.") parser.add_option("--segments-name", metavar = "name", default = "segments", help = "Set the name of the segment lists to retrieve from the segments file (default = \"segments\"). See also --segments-file.")
......
...@@ -62,7 +62,7 @@ def parse_command_line(): ...@@ -62,7 +62,7 @@ def parse_command_line():
parser.add_option("-v", "--verbose", action = "store_true", parser.add_option("-v", "--verbose", action = "store_true",
help = "Be verbose.") help = "Be verbose.")
parser.add_option("-t", "--live-time", dest="livetime", parser.add_option("-t", "--live-time", dest="livetime",
type = "float", type = "float",
help = "The total amount of live time in the run") help = "The total amount of live time in the run")
options, filenames = parser.parse_args() options, filenames = parser.parse_args()
......
...@@ -62,7 +62,7 @@ def parse_command_line(): ...@@ -62,7 +62,7 @@ def parse_command_line():
parser.add_option("-v", "--verbose", action = "store_true", parser.add_option("-v", "--verbose", action = "store_true",
help = "Be verbose.") help = "Be verbose.")
parser.add_option("-t", "--live-time", dest="livetime", parser.add_option("-t", "--live-time", dest="livetime",
type = "float", type = "float",
help = "The total amount of live time in the run") help = "The total amount of live time in the run")
options, filenames = parser.parse_args() options, filenames = parser.parse_args()
......
...@@ -96,7 +96,7 @@ for i in range(ops.nepsilon): ...@@ -96,7 +96,7 @@ for i in range(ops.nepsilon):
alpha = epsilon * (LOOPS_RAD_POWER * Gmu)**ops.index alpha = epsilon * (LOOPS_RAD_POWER * Gmu)**ops.index
zofA = cs_gamma.findzofA(Gmu, alpha, amp) zofA = cs_gamma.findzofA(Gmu, alpha, amp)
dRdz = cs_gamma.finddRdz(Gmu, alpha, ops.frequency, LOOPS_RAD_POWER, zofA) dRdz = cs_gamma.finddRdz(Gmu, alpha, ops.frequency, LOOPS_RAD_POWER, zofA)
Dlnz = numpy.log(zofA[1:]) - numpy.log(zofA[:-1]) Dlnz = numpy.log(zofA[1:]) - numpy.log(zofA[:-1])
......
...@@ -37,11 +37,9 @@ import bisect ...@@ -37,11 +37,9 @@ import bisect
try: try:
import copyreg import copyreg
import pickle import pickle
import queue
except ImportError: # python < 3 except ImportError: # python < 3
import copy_reg as copyreg import copy_reg as copyreg
import cPickle as pickle import cPickle as pickle
import Queue as queue
import heapq import heapq
import itertools import itertools
from optparse import OptionParser from optparse import OptionParser
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment