Commit 3c18a12d authored by Soichiro Morisaki's avatar Soichiro Morisaki
Browse files

lalinference_pipe_utils.py: remove unnecessary gracedb from interface of readLValert

parent 9d47bdfb
...@@ -157,7 +157,7 @@ class Event(): ...@@ -157,7 +157,7 @@ class Event():
dummyCacheNames=['LALLIGO','LALVirgo','LALAdLIGO','LALAdVirgo'] dummyCacheNames=['LALLIGO','LALVirgo','LALAdLIGO','LALAdVirgo']
def readLValert(threshold_snr=None,gid=None,flow=20.0,gracedb="gracedb",basepath="./",downloadpsd=True,roq=False,service_url=None): def readLValert(threshold_snr=None,gid=None,flow=20.0,basepath="./",downloadpsd=True,roq=False,service_url=None):
""" """
Parse LV alert file, containing coinc, sngl, coinc_event_map. Parse LV alert file, containing coinc, sngl, coinc_event_map.
and create a list of Events as input for pipeline and create a list of Events as input for pipeline
...@@ -529,7 +529,7 @@ def get_xml_psds(psdxml,ifos,outpath,end_time=None): ...@@ -529,7 +529,7 @@ def get_xml_psds(psdxml,ifos,outpath,end_time=None):
out[ifo]=os.path.join(outpath,ifo+'_psd_'+time+'.txt') out[ifo]=os.path.join(outpath,ifo+'_psd_'+time+'.txt')
return out return out
def get_trigger_chirpmass(gid=None,gracedb="gracedb",service_url=None): def get_trigger_chirpmass(gid=None,service_url=None):
from glue.ligolw import lsctables from glue.ligolw import lsctables
from glue.ligolw import ligolw from glue.ligolw import ligolw
from glue.ligolw import utils as ligolw_utils from glue.ligolw import utils as ligolw_utils
...@@ -1031,7 +1031,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG): ...@@ -1031,7 +1031,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
service_url = None service_url = None
if self.config.has_option('analysis','service-url'): if self.config.has_option('analysis','service-url'):
service_url = self.config.get('analysis','service-url') service_url = self.config.get('analysis','service-url')
events = readLValert(gid=gid,flow=flow,gracedb=self.config.get('condor','gracedb'),basepath=self.basepath,downloadpsd=downloadgracedbpsd, events = readLValert(gid=gid,flow=flow,basepath=self.basepath,downloadpsd=downloadgracedbpsd,
threshold_snr=threshold_snr,roq=self.config.getboolean('analysis','roq'),service_url=service_url) threshold_snr=threshold_snr,roq=self.config.getboolean('analysis','roq'),service_url=service_url)
else: gid=None else: gid=None
# pipedown-database # pipedown-database
......
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