diff --git a/gracedb/translator.py b/gracedb/translator.py index e5ff72379904b6e93ca3c6d3576569a24966e7ae..c2343173fccd6e1442c12bcae00f875ad8dbbd88 100644 --- a/gracedb/translator.py +++ b/gracedb/translator.py @@ -76,7 +76,7 @@ def handle_uploaded_data(event, datafilename, log_data.append("SNR: %0.3f" % origdata[0][0].snr) log_data.append("IFOs: %s" % origdata[0][0].ifos) if origdata[0][0].combined_far is not None: - log_data.append("FAR: %0.3f" % origdata[0][0].combined_far) + log_data.append("FAR: %0.3e" % origdata[0][0].combined_far) else: log_data.append("FAR: ---") except Exception, e: diff --git a/gracedb/views.py b/gracedb/views.py index d4fe5a31eb8a7fd9ac7ad45b59de1313469fee5a..bffbd4b1c33d01f54a3b91e6270698ba0e2c3494 100644 --- a/gracedb/views.py +++ b/gracedb/views.py @@ -27,6 +27,8 @@ from buildVOEvent import buildVOEvent, submitToSkyalert # XXX This should be configurable / moddable or something MAX_QUERY_RESULTS = 1000 +GRACEDB_DATA_DIR = settings.GRACEDB_DATA_DIR + import simplejson def index(request): @@ -228,7 +230,7 @@ def _createEventFromForm(request, form): saved = True # in case we have to undo this. # Create data directory/directories # Save uploaded file. - dirPrefix = "/mnt/gracedb-web/data" + dirPrefix = GRACEDB_DATA_DIR eventDir = os.path.join(dirPrefix, event.graceid()) os.mkdir( eventDir ) os.mkdir( os.path.join(eventDir,"private") ) @@ -276,7 +278,7 @@ def _createEventFromForm(request, form): def _saveUploadedFile(event, uploadedFile): # XXX Hardcoding. - fname = os.path.join("/mnt/gracedb-web/data", event.graceid(), "private", uploadedFile.name) + fname = os.path.join(GRACEDB_DATA_DIR, event.graceid(), "private", uploadedFile.name) f = open(fname, "w") for chunk in uploadedFile.chunks(): f.write(chunk) @@ -354,7 +356,7 @@ def upload(request): # Badnesses: # Same hardcoded path in multiple places. # What if we're clobbering an existing file? - fname = os.path.join("/mnt/gracedb-web/data", event.graceid(), "private", uploadedfile.name) + fname = os.path.join(GRACEDB_DATA_DIR, event.graceid(), "private", uploadedfile.name) f = open(fname, "w") for chunk in uploadedfile.chunks(): f.write(chunk) @@ -831,7 +833,7 @@ def flexigridResponse(request, objects): return response def get_file(graceid, filename="event.log"): - dirPrefix = "/mnt/gracedb-web/data" + dirPrefix = GRACEDB_DATA_DIR logfilename = os.path.join(dirPrefix, graceid, "private", filename) contents = "" try: diff --git a/settings.py b/settings.py index 05f8c90213f2e16e6e41e47a4de3305f674aa896..f6c935299d2ed0310c1e7f08cb80c3799a5b46e2 100644 --- a/settings.py +++ b/settings.py @@ -35,7 +35,7 @@ ALERT_EMAIL_BCC = [ ALERT_TEST_EMAIL_FROM = "GraCEDb TEST <gracedb@archie.phys.uwm.edu>" ALERT_TEST_EMAIL_TO = [ - "bmoe@gravity.phys.uwm.edu", +# "bmoe@gravity.phys.uwm.edu", ] XMPP_ALERT_CHANNELS = [ @@ -67,6 +67,9 @@ SKYALERT_DESCRIPTION = "LIGO / Virgo trigger" SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe'] +GRACEDB_DATA_DIR = "/mnt/gracedb-web/data" +#GRACEDB_DATA_DIR = "/mnt/gracedb-web-temp/data" + # Latency histograms. Where they go and max latency to bin. LATENCY_REPORT_DEST_DIR = "/home/gracedb/data/latency" LATENCY_MAXIMUM_CHARTED = 1800