Commit 28bc310b authored by John Douglas Veitch's avatar John Douglas Veitch

Merge branch 'master' into dist_marg_bayestar

parents dfea27b2 7feb32c7
......@@ -280,7 +280,7 @@ nightly:python3:stretch:
# building with python3, temporarily allow this to fail
allow_failure: true
nightly:macos:
.nightly:macos:
tags:
- macos
stage: nightly
......@@ -369,11 +369,11 @@ nightly:wheel:cp35-cp35m-manylinux1:
<<: *nightly-wheel-manylinux1
nightly:wheel:cp36-cp36m-manylinux1:
<<: *nightly-wheel-manylinux1
nightly:wheel:cp27-cp27m-macosx:
.nightly:wheel:cp27-cp27m-macosx:
<<: *nightly-wheel-macos
nightly:wheel:cp35-cp35m-macosx:
.nightly:wheel:cp35-cp35m-macosx:
<<: *nightly-wheel-macos
nightly:wheel:cp36-cp36m-macosx:
.nightly:wheel:cp36-cp36m-macosx:
<<: *nightly-wheel-macos
.levelN:rpm: &levelN-rpm-package
......@@ -528,9 +528,9 @@ deploy:wheel:
- nightly:wheel:cp34-cp34m-manylinux1
- nightly:wheel:cp35-cp35m-manylinux1
- nightly:wheel:cp36-cp36m-manylinux1
- nightly:wheel:cp27-cp27m-macosx
- nightly:wheel:cp35-cp35m-macosx
- nightly:wheel:cp36-cp36m-macosx
# - nightly:wheel:cp27-cp27m-macosx
# - nightly:wheel:cp35-cp35m-macosx
# - nightly:wheel:cp36-cp36m-macosx
only:
- master@lscsoft/lalsuite
except:
......
......@@ -573,7 +573,7 @@ void LALCreateDetector( LALStatus *status, LALDetector *output, const LALFrDetec
#define LAL_ET1_DETECTOR_LATITUDE_RAD 0.76151183984 /**< ET1 vertex latitude (rad) */
#define LAL_ET1_DETECTOR_ELEVATION_SI 51.884 /**< ET1 vertex elevation (m) */
#define LAL_ET1_DETECTOR_ARM_X_AZIMUTH_RAD 0.33916285222 /**< ET1 x arm azimuth (rad) */
#define LAL_ET1_DETECTOR_ARM_Y_AZIMUTH_RAD 5.05155183261 /**< ET1 y arm azimuth (rad) */
#define LAL_ET1_DETECTOR_ARM_Y_AZIMUTH_RAD 5.57515060820 /**< ET1 y arm azimuth (rad) */
#define LAL_ET1_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**< ET1 x arm altitude (rad) */
#define LAL_ET1_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**< ET1 y arm altitude (rad) */
#define LAL_ET1_DETECTOR_ARM_X_MIDPOINT_SI 5000.00000000000 /**< ET1 x arm midpoint (m) */
......
/*
* Copyright (C) 2007 Patrick Brady
* Copyright (C) 2007 Patrick R Brady
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......
......@@ -75,7 +75,7 @@ def parse_command_line():
raise ValueError, "missing required options %s" % ", ".join(sorted("--%s" % option.replace("_", "-") for option in missing_options))
if options.vetoes_file is not None:
options.vetoes_cache = set([CacheEntry(None, None, None, "file://localhost" + os.path.abspath(options.vetoes_file))])
options.vetoes_cache = set([CacheEntry(None, "VETO", None, "file://localhost" + os.path.abspath(options.vetoes_file))])
else:
options.vetoes_cache = set()
......@@ -174,7 +174,7 @@ overlap = short_segment_duration / 2 + 2 * pad # FIXME: correct?
#
instruments = lsctables.instrumentsproperty.get(config_parser.get('pipeline','ifos'))
segments_cache = set([CacheEntry(None, None, None, "file://localhost" + os.path.abspath(options.segments_file))])
segments_cache = set([CacheEntry(None, "SEG", None, "file://localhost" + os.path.abspath(options.segments_file))])
seglists = ligolw_segments.segmenttable_get_by_name(ligolw_utils.load_filename(options.segments_file, contenthandler = ligolw_segments.LIGOLWContentHandler, verbose = options.verbose), options.segments_name).coalesce()
# remove extra instruments
for instrument in set(seglists) - instruments:
......@@ -198,7 +198,7 @@ if options.verbose:
background_time_slides = {}
background_seglists = segments.segmentlistdict()
for filename in options.background_time_slides:
cache_entry = CacheEntry(None, None, None, "file://localhost" + os.path.abspath(filename))
cache_entry = CacheEntry(None, "BG", None, "file://localhost" + os.path.abspath(filename))
background_time_slides[cache_entry] = lsctables.TimeSlideTable.get_table(ligolw_utils.load_filename(filename, verbose = options.verbose, contenthandler = ligolw_segments.LIGOLWContentHandler)).as_dict().values()
......@@ -210,7 +210,7 @@ for filename in options.background_time_slides:
injection_time_slides = {}
injection_seglists = segments.segmentlistdict()
for filename in options.injection_time_slides:
cache_entry = CacheEntry(None, None, None, "file://localhost" + os.path.abspath(filename))
cache_entry = CacheEntry(None, "INJ", None, "file://localhost" + os.path.abspath(filename))
injection_time_slides[cache_entry] = lsctables.TimeSlideTable.get_table(ligolw_utils.load_filename(filename, verbose = options.verbose, contenthandler = ligolw_segments.LIGOLWContentHandler)).as_dict().values()
......
......@@ -143,8 +143,8 @@ skyarea=%(lalsuite-install)s/bin/run_sky_area
processareas=%(lalsuite-install)s/bin/process_areas
# ROQ weight computation, requires roq_b_matrix_directory in the [paths] section
# Disabled by default, uncomment line below to use it
# computeroqweights=%(lalsuite-install)s/bin/lalapps_compute_roq_weights
# and roq=True in the [analysis] section
computeroqweights=%(lalsuite-install)s/bin/lalapps_compute_roq_weights
# MPIrun only needed for MCMC, if not available use /bin/true
mpirun=%(lalsuite-install)s/bin/mpirun
......
......@@ -451,7 +451,7 @@ LALSimNeutronStarEOS *XLALSimNeutronStarEOS4ParameterPiecewisePolytrope(double
if (gamma1 <= 1.0 || gamma2 <= 1.0 || gamma3 <= 1.0)
XLAL_ERROR_NULL(XLAL_EINVAL,
"Adiabitic indices gamma1=%g, gamma2=%g, and gamma3=%g "
"Adiabatic indices gamma1=%g, gamma2=%g, and gamma3=%g "
"must all be greater than 1", gamma1, gamma2, gamma3);
/* Transition densities between the 3 high-density polytropes */
......@@ -482,9 +482,8 @@ LALSimNeutronStarEOS *XLALSimNeutronStarEOS4ParameterPiecewisePolytrope(double
eos->datatype = LALSIM_NEUTRON_STAR_EOS_DATA_TYPE_PIECEWISE_POLYTROPE;
eos->data.piecewisePolytrope = data;
if(snprintf(eos->name, sizeof(eos->name), "4-Piece Polytrope (p1=10^%g Pa,"
"Gamma1=%g,Gamma2=%g,Gamma3=%g)", logp1_si, gamma1, gamma2, gamma3) >= (int) sizeof(eos->name))
XLAL_ERROR_NULL(XLAL_EINVAL, "eos name overflow");
if(snprintf(eos->name, sizeof(eos->name), "4-Pc Polytrope (p1=10^%.2f Pa,Gam1=%.2f,Gam2=%.2f,Gam3=%.2f)", logp1_si, gamma1, gamma2, gamma3) >= (int) sizeof(eos->name))
XLAL_PRINT_WARNING("eos name overflow (max. size %d).",(int) sizeof(eos->name));
/* setup function pointers */
eos->free = eos_free_piecewise_polytrope;
......
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