Commit e101e7d5 authored by Vivien Raymond's avatar Vivien Raymond Committed by Salvatore Vitale
Browse files

Set correct GraceDB ID for LALInference sky maps. Closes #5295

parent a0049e85
......@@ -1030,7 +1030,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
respagenode.set_psd_files(enginenodes[0].get_psd_files())
respagenode.set_snr_file(enginenodes[0].get_snr_file())
if os.path.exists(self.basepath+'/coinc.xml'):
respagenode.set_coinc_file(self.basepath+'/coinc.xml')
respagenode.set_coinc_file(self.basepath+'/coinc.xml',self.config.get('input','gid'))
mkdirs(os.path.join(self.basepath,'coherence_test'))
par_mergenodes=[]
for ifo in enginenodes[0].ifos:
......@@ -1067,7 +1067,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
subresnode.set_psd_files(cotest_nodes[0].get_psd_files())
subresnode.set_snr_file(cotest_nodes[0].get_snr_file())
if os.path.exists(self.basepath+'/coinc.xml'):
subresnode.set_coinc_file(self.basepath+'/coinc.xml')
subresnode.set_coinc_file(self.basepath+'/coinc.xml',self.config.get('input','gid'))
if self.config.has_option('input','injection-file') and event.event_id is not None:
subresnode.set_injection(self.config.get('input','injection-file'),event.event_id)
elif self.config.has_option('input','burst-injection-file') and event.event_id is not None:
......@@ -1088,7 +1088,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
respagenode.set_psd_files(enginenodes[0].get_psd_files())
respagenode.set_snr_file(enginenodes[0].get_snr_file())
if os.path.exists(self.basepath+'/coinc.xml'):
respagenode.set_coinc_file(self.basepath+'/coinc.xml')
respagenode.set_coinc_file(self.basepath+'/coinc.xml',self.config.get('input','gid'))
if self.config.has_option('input','injection-file') and event.event_id is not None:
respagenode.set_injection(self.config.get('input','injection-file'),event.event_id)
elif self.config.has_option('input','burst-injection-file') and event.event_id is not None:
......@@ -1139,7 +1139,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
respagenode.set_psd_files(enginenodes[0].get_psd_files())
respagenode.set_snr_file(enginenodes[0].get_snr_file())
if os.path.exists(self.basepath+'/coinc.xml'):
respagenode.set_coinc_file(self.basepath+'/coinc.xml')
respagenode.set_coinc_file(self.basepath+'/coinc.xml',self.config.get('input','gid'))
if self.config.has_option('input','injection-file') and event.event_id is not None:
respagenode.set_injection(self.config.get('input','injection-file'),event.event_id)
if self.config.has_option('input','burst-injection-file') and event.event_id is not None:
......@@ -1178,7 +1178,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
respagenode.set_psd_files(enginenodes[0].get_psd_files())
respagenode.set_snr_file(enginenodes[0].get_snr_file())
if os.path.exists(self.basepath+'/coinc.xml'):
respagenode.set_coinc_file(self.basepath+'/coinc.xml')
respagenode.set_coinc_file(self.basepath+'/coinc.xml',self.config.get('input','gid'))
respagenode.set_header_file(enginenodes[0].get_header_file())
if self.config.has_option('input','injection-file') and event.event_id is not None:
respagenode.set_injection(self.config.get('input','injection-file'),event.event_id)
......@@ -2231,7 +2231,9 @@ class ResultsPageNode(pipeline.CondorDAGNode):
return
self.add_file_opt('snr',st)
def set_coinc_file(self,coinc):
def set_coinc_file(self,coinc,gid=None):
if gid:
self.__event=gid
if coinc is None:
return
self.add_var_arg('--trig '+coinc)
......
Supports Markdown
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