From 6c2ad4aa506288365c6a52ba5c5a152b3fefc98f Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Wed, 29 Jul 2009 18:31:35 -0500
Subject: [PATCH] New gracedb.utils translator.
---
gracedb/translator.py | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/gracedb/translator.py b/gracedb/translator.py
index 5fd870c8f..dd21975c0 100644
--- a/gracedb/translator.py
+++ b/gracedb/translator.py
@@ -4,8 +4,8 @@ import os
from models import EventLog
import glue, glue.ligolw.utils
-from glue.gracedb.utils import InspiralCoincIdBase, InspiralCoincDef
-from glue.gracedb.utils import BurstCoincIdBase, BurstCoincDef
+from glue.gracedb.utils import InspiralCoincDef
+from glue.gracedb.utils import BurstCoincDef
from glue.gracedb.utils import insp_event_id_dict
from glue.gracedb.utils import coherent_event_id_dict
@@ -44,7 +44,7 @@ def handle_uploaded_data(event, datafilename,
log.save()
log = EventLog(event=event,
- filename=datafilename,
+ filename=os.path.basename(datafilename),
issuer=event.submitter,
comment="Original Data")
log.save()
@@ -68,15 +68,15 @@ def handle_uploaded_data(event, datafilename,
if event.analysisType == 'MBTA':
- xmldoc, log_data, detectors = \
- populate_inspiral_tables(datafilename, 0)
- # XXX ligolw wants ints.
- #populate_inspiral_tables(datafilename, #event.graceid())
+ #xmldoc, log_data, detectors, cid = populate_inspiral_tables("MbtaFake-930909680-16.gwf")
+ #final_xmldoc = populate_coinc_tables(xmldoc,cid,insp_event_id_dict,\
+ # InspiralCoincDef,detectors)
+ #write the output
+ #write_output_files('.', xmldoc, log_data)
+ xmldoc, log_data, detectors, cid = \
+ populate_inspiral_tables(datafilename)
xmldoc = populate_coinc_tables(xmldoc,
- # XXX ligolw wants ints.
- #event.graceid(),
- 0,
- InspiralCoincIdBase,
+ cid,
insp_event_id_dict,
InspiralCoincDef,
detectors)
@@ -102,7 +102,7 @@ def handle_uploaded_data(event, datafilename,
log.save()
log = EventLog(event=event,
- filename=datafilename,
+ filename=os.path.basename(datafilename),
issuer=event.submitter,
comment="Original Data")
log.save()
@@ -124,9 +124,13 @@ def handle_uploaded_data(event, datafilename,
event.save()
elif event.analysisType == 'OM': # Omega
- xmldoc, log_data, detectors = populate_burst_tables(datafilename, 0)
+ #xmldoc, log_data, detectors, cid = populate_burst_tables("initial.data")
+ #final_xmldoc = populate_coinc_tables(xmldoc,cid, coherent_event_id_dict,\
+ # BurstCoincDef, detectors)
+ #write_output_files('.', final_xmldoc, log_data)
+ xmldoc, log_data, detectors, cid = populate_burst_tables(datafilename)
xmldoc = populate_coinc_tables(
- xmldoc, 0, BurstCoincIdBase, \
+ xmldoc, cid, \
coherent_event_id_dict, BurstCoincDef, \
detectors)
--
GitLab