Commit 511d25b5 authored by Ducoin Jean-Gregoire's avatar Ducoin Jean-Gregoire

try rebase

parents e6ab0255 26fa706b
Pipeline #50064 failed with stages
in 3 minutes and 28 seconds
<<<<<<< HEAD
<<<<<<< HEAD
{
"coinc.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coinc.xml",
"initial.data": "https://gracedb-dev1.ligo.org/api/events/S1234/files/initial.data",
......@@ -19,3 +20,6 @@
=======
{"coinc.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coinc.xml", "initial.data": "https://gracedb-dev1.ligo.org/api/events/S1234/files/initial.data", "initial.data,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/initial.data,0", "event.log,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/event.log,0", "psd.xml.gz,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/psd.xml.gz,0", "event.log": "https://gracedb-dev1.ligo.org/api/events/S1234/files/event.log", "bayestar.fits.gz,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/bayestar.fits.gz,0", "psd.xml.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/psd.xml.gz", "coinc.xml,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coinc.xml,0", "bayestar.fits.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/bayestar.fits.gz", "LALInference.fits.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/LALInference.fits.gz", "LALInference.fits.gz,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/LALInference.fits.gz,0", "S1234-1-Initial.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/S1234-1-Initial.xml", "S1234-2-Update.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/S1234-2-Update.xml", "source_classification.json": "https://gracedb-dev1.ligo.org/api/events/S1234/files/source_classification.json", "coincidence_far.json": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coincidence_far.json", "coincidence_far_2.json": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coincidence_far_2.json", "bayestar-gbm.fits.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/bayestar-gbm.fits.gz"}
>>>>>>> ff2b443... add the template for the em_coinc circular(need to be edited)
=======
{"coinc.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coinc.xml", "initial.data": "https://gracedb-dev1.ligo.org/api/events/S1234/files/initial.data", "initial.data,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/initial.data,0", "event.log,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/event.log,0", "psd.xml.gz,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/psd.xml.gz,0", "event.log": "https://gracedb-dev1.ligo.org/api/events/S1234/files/event.log", "bayestar.fits.gz,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/bayestar.fits.gz,0", "psd.xml.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/psd.xml.gz", "coinc.xml,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coinc.xml,0", "bayestar.fits.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/bayestar.fits.gz", "LALInference.fits.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/LALInference.fits.gz", "LALInference.fits.gz,0": "https://gracedb-dev1.ligo.org/api/events/S1234/files/LALInference.fits.gz,0", "S1234-1-Initial.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/S1234-1-Initial.xml", "S1234-2-Update.xml": "https://gracedb-dev1.ligo.org/api/events/S1234/files/S1234-2-Update.xml", "source_classification.json": "https://gracedb-dev1.ligo.org/api/events/S1234/files/source_classification.json", "coincidence_far.json": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coincidence_far.json", "coincidence_far_2.json": "https://gracedb-dev1.ligo.org/api/events/S1234/files/coincidence_far_2.json", "bayestar-gbm.fits.gz": "https://gracedb-dev1.ligo.org/api/events/S1234/files/bayestar-gbm.fits.gz"}
>>>>>>> 26fa706bdca9b9ebce9897310e8b3f93ce12bf1b
<<<<<<< HEAD
<<<<<<< HEAD
{
"superevent_id": "S1234",
"created": "2018-06-28 03:08:38 UTC",
......@@ -25,3 +26,6 @@
=======
{"superevent_id": "S1234", "created": "2018-06-28 03:08:38 UTC", "submitter": "leo.singer@LIGO.ORG", "preferred_event": "M1234", "t_start": 1214190501.74, "t_0": 1214190502.74, "t_end": 1214190503.74, "gw_events": ["M1234"], "em_events": ["E1234"], "labels": ["EM_COINC"], "links": {"files": "https://gracedb-dev1.ligo.org/api/superevents/S1234/files/", "logs": "https://gracedb-dev1.ligo.org/api/superevents/S1234/logs/", "self": "https://gracedb-dev1.ligo.org/api/superevents/S1234/", "labels": "https://gracedb-dev1.ligo.org/api/superevents/S1234/labels/", "voevents": "https://gracedb-dev1.ligo.org/api/superevents/S1234/voevents/", "emobservations": "https://gracedb-dev1.ligo.org/api/superevents/S1234/emobservations/", "events": "https://gracedb-dev1.ligo.org/api/superevents/S1234/events/"}}
>>>>>>> ff2b443... add the template for the em_coinc circular(need to be edited)
=======
{"superevent_id": "S1234", "created": "2018-06-28 03:08:38 UTC", "submitter": "leo.singer@LIGO.ORG", "preferred_event": "M1234", "t_start": 1214190501.74, "t_0": 1214190502.74, "t_end": 1214190503.74, "gw_events": ["M1234"], "em_events": ["E1234"], "labels": ["EM_COINC"], "links": {"files": "https://gracedb-dev1.ligo.org/api/superevents/S1234/files/", "logs": "https://gracedb-dev1.ligo.org/api/superevents/S1234/logs/", "self": "https://gracedb-dev1.ligo.org/api/superevents/S1234/", "labels": "https://gracedb-dev1.ligo.org/api/superevents/S1234/labels/", "voevents": "https://gracedb-dev1.ligo.org/api/superevents/S1234/voevents/", "emobservations": "https://gracedb-dev1.ligo.org/api/superevents/S1234/emobservations/", "events": "https://gracedb-dev1.ligo.org/api/superevents/S1234/events/"}}
>>>>>>> 26fa706bdca9b9ebce9897310e8b3f93ce12bf1b
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