Revision: 94747 https://trac.macports.org/changeset/94747 Author: ram@macports.org Date: 2012-06-28 08:32:55 -0700 (Thu, 28 Jun 2012) Log Message: ----------- science/ligo-gracedb: update to 1.3 Modified Paths: -------------- trunk/dports/science/ligo-gracedb/Portfile trunk/dports/science/ligo-gracedb/files/patch-disable_server.diff Modified: trunk/dports/science/ligo-gracedb/Portfile =================================================================== --- trunk/dports/science/ligo-gracedb/Portfile 2012-06-28 14:55:30 UTC (rev 94746) +++ trunk/dports/science/ligo-gracedb/Portfile 2012-06-28 15:32:55 UTC (rev 94747) @@ -4,7 +4,7 @@ PortGroup python27 1.0 name ligo-gracedb -version 1.1 +version 1.3 categories science platforms darwin maintainers ram @@ -20,14 +20,14 @@ homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/gracedb.html master_sites http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/ -checksums md5 f1422e90859fd07383c7b6e59f599a50 \ - sha1 1dec7da0ccd12f4f820bb0dddf1f74e15139acab \ - rmd160 cbc546551eebaa03f3c1af752b1d7ce77564ca0e +checksums rmd160 0b2e7c6842464ce3cb392cd64795b12b45dd0369 \ + sha256 16dfebd773b30f5d33ab3202b31ec616f92ba340ab96fc4de61744856ae0149b patchfiles patch-disable_server.diff depends_lib-append port:ligo-common \ - port:py27-m2crypto + port:py27-m2crypto \ + port:py27-cjson python.link_binaries_suffix Modified: trunk/dports/science/ligo-gracedb/files/patch-disable_server.diff =================================================================== --- trunk/dports/science/ligo-gracedb/files/patch-disable_server.diff 2012-06-28 14:55:30 UTC (rev 94746) +++ trunk/dports/science/ligo-gracedb/files/patch-disable_server.diff 2012-06-28 15:32:55 UTC (rev 94747) @@ -1,17 +1,18 @@ ---- ligo/gracedb/__init__.py -+++ gracedb/__init__.py -@@ -16,8 +16,6 @@ +--- ligo/gracedb/__init__.py 2012-06-14 17:42:55.000000000 +0100 ++++ ligo/gracedb/__init__.py 2012-06-15 10:00:43.000000000 +0100 +@@ -16,9 +16,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -__all__ = ["utils"] - - +- import httplib, mimetypes, urllib import socket ---- ligo/gracedb/utils.py -+++ /dev/null -@@ -1,436 +0,0 @@ + import os, sys, shutil +--- ligo/gracedb/utils.py 2012-03-19 16:24:47.000000000 +0000 ++++ ligo/gracedb/utils.py 1970-01-01 01:00:00.000000000 +0100 +@@ -1,437 +0,0 @@ -#!/usr/bin/python - -from math import log @@ -182,7 +183,7 @@ - - log_data = event['comment'] + '\n' - try: -- far = 1/(float(event['IFAR_year'])*365.0) +- far = 1/(float(event['IFAR_year'])*365.0*24*60*60) - except KeyError: - far = None - for ifo in detectors: @@ -248,11 +249,12 @@ - #the snr here is really the snr NOT effective snr - row.snr = pow(sum([x*x for x in snr.values()]),0.5) - if far is not None: -- #far is triggers/day -- row.false_alarm_rate = float(far) +- #far is triggers in Hz +- row.combined_far = float(far) - else: -- row.false_alarm_rate = None -- row.combined_far = 0 +- row.combined_far = None +- row.false_alarm_rate = None +- - cin_table.append(row) - -