Commit 2efb0fba authored by James Clark's avatar James Clark

Support single-trigger event lists and add a new short option -l to specify the list

parent 6f55330f
......@@ -782,12 +782,8 @@ class triggerList:
def parse_trigger_list(self, cp, trigger_file, rho_threshold=-1.0,
keep_frac=1.0):
trigger_data = np.loadtxt(trigger_file)
try:
nrows, ncols = trigger_data.shape
except ValueError:
nrows = len(trigger_data)
ncols = 1
trigger_data = np.loadtxt(trigger_file, ndmin=2)
nrows, ncols = trigger_data.shape
triggers = list()
......@@ -832,7 +828,6 @@ class triggerList:
trigger_frequency=trigger_data[i,2],
rho=trigger_data[i,3]))
# Finally, downsample to a smaller fraction of triggers
try:
keep_frac = cp.getfloat('input', 'keep-frac')
......
......@@ -168,10 +168,9 @@ def parser():
parser.add_argument(dest="configfile", help="Config file")
parser.add_argument("-t", "--user-tag", default="", type=str)
parser.add_argument("-r", "--workdir", type=str, default=None, required=True)
parser.add_argument("--trigger-time", type=float, default=None)
parser.add_argument("--trigger-list", type=str, default=None)
parser.add_argument("-t", "--trigger-time", type=float, default=None)
parser.add_argument("-l", "--trigger-list", type=str, default=None)
parser.add_argument("--bayesline-median-psd", default=False,
action="store_true")
parser.add_argument("--cwb-trigger-list", type=str, default=None)
......
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