Commit b5f494cb authored by Thomas Dent's avatar Thomas Dent
Browse files

Revert "changes to pipedown, lalapps inspiralutils.py, thinca-to-coinc for single-stage pipeline"

This reverts commit 01dbc4b5a103e04aedcffc4fa66c29f2b56938f2.
Original: cda89db152fb3a6ae715756402966b15686d4a05
parent 9af0cb7e
......@@ -129,7 +129,6 @@ cp = ConfigParser.ConfigParser()
cp.read(options.config_file)
tmp_space = cp.get('pipeline', 'node-tmp-dir')
onestage = cp.has_option('pipeline', 'single-stage')
experiment_start = options.gps_start_time
experiment_duration = str(int(options.gps_end_time) - int(options.gps_start_time))
......@@ -161,7 +160,7 @@ dag.set_dag_file(basename)
print "Parsing the ihope cache..."
ihope_cache = [line for line in file(options.ihope_cache) \
if "THINCA_SECOND" in line or "THINCA_SLIDE_SECOND" in line \
or " INJECTIONS" in line or "INSPIRAL" in line]
or " INJECTIONS" in line or "INSPIRAL_SECOND" in line]
zero_lag_cache = lal.Cache([lal.CacheEntry(entry) for entry in ihope_cache \
if "THINCA_SECOND" in entry])
......@@ -169,12 +168,8 @@ slide_cache = lal.Cache([lal.CacheEntry(entry) for entry in ihope_cache \
if "THINCA_SLIDE_SECOND" in entry])
inj_cache = lal.Cache([lal.CacheEntry(entry) for entry in ihope_cache if \
" INJECTIONS" in entry])
if onestage:
all_inspirals_cache = lal.Cache([lal.CacheEntry(entry) for entry in ihope_cache \
if "INSPIRAL_FIRST" in entry])
else:
all_inspirals_cache = lal.Cache([lal.CacheEntry(entry) for entry in ihope_cache \
if "INSPIRAL_SECOND" in entry])
all_inspirals_cache = lal.Cache([lal.CacheEntry(entry) for entry in ihope_cache \
if "INSPIRAL_SECOND" in entry])
del ihope_cache
......
......@@ -742,7 +742,7 @@ def hipe_setup(hipeDir, config, ifos, logPath, injSeed=None, dataFind = False, \
"summary-coinc-triggers", "sire-second-coinc",
"summary-single-ifo-triggers","write-script",
"coherent-bank","coherent-inspiral","cohire",
"summary-coherent-inspiral-triggers","single-stage"]
"summary-coherent-inspiral-triggers"]
else:
hipe_args = ["coincidence","write-script"]
for hipe_arg in hipe_args:
......
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