Commit f1223ccd authored by Kipp Cannon's avatar Kipp Cannon

Merge branch 'lalapps_ring_gcc8fixes' into 'master'

Lalapps ring gcc8fixes

See merge request !497
parents 1fa52827 33238b17
Pipeline #35399 passed with stages
in 26 minutes and 21 seconds
include $(top_srcdir)/gnuscripts/lalapps.am
MOSTLYCLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/gnuscripts/lalsuite_python.am
include $(top_srcdir)/gnuscripts/lalsuite_help2man.am
RINGPROG = \
lalapps_ring \
lalapps_rinj \
lalapps_ringread \
lalapps_rinca \
lalapps_coincringread \
lalapps_collatesim \
bin_PROGRAMS = \
lalapps_coh_PTF_inspiral \
lalapps_coh_PTF_spin_checker
bin_PROGRAMS = $(RINGPROG)
GENERAL_SOURCES = \
COH_PTF_SOURCES = \
errutil.c \
errutil.h \
gpstime.c \
......@@ -31,41 +21,16 @@ GENERAL_SOURCES = \
spectrm.c \
spectrm.h \
segment.c \
segment.h
COH_PTF_SOURCES = \
segment.h \
coh_PTF.h \
coh_PTF_option.c \
coh_PTF_template.c \
coh_PTF_output.c \
coh_PTF_bankveto.c \
coh_PTF_utils.c
lalapps_ring_SOURCES = \
ring.c \
ring.h \
ring_option.c \
ring_filter.c \
ring_output.c \
$(GENERAL_SOURCES)
lalapps_coh_PTF_inspiral_SOURCES = \
coh_PTF_inspiral.c \
$(COH_PTF_SOURCES) \
$(GENERAL_SOURCES)
$(COH_PTF_SOURCES)
lalapps_coh_PTF_spin_checker_SOURCES = \
coh_PTF_spin_checker.c \
$(COH_PTF_SOURCES) \
$(GENERAL_SOURCES)
lalapps_rinj_SOURCES = rinj.c
lalapps_ringread_SOURCES = ringread.c
lalapps_rinca_SOURCES = rinca.c
lalapps_coincringread_SOURCES = coincringread.c
lalapps_collatesim_SOURCES = collatesim.c
if HAVE_PYTHON
pkgpython_PYTHON = ring.py
pybin_scripts = \
lalapps_ring_pipe \
lalapps_ringcorse
endif
pkgdata_DATA = ring_test.ini ringpost_remove_cluster.sql
EXTRA_DIST += $(DATA)
$(COH_PTF_SOURCES)
This diff is collapsed.
This diff is collapsed.
; ihope configuration script for the ringdown pipeline.
;
;
;
; GENERAL SECTIONS
;;;;;;;;;;;;;;;;;;;
[segments]
l1-analyze = L1:Science,L1:Injection
h1-analyze = H1:Science,H1:Injection
h2-analyze = H2:Science,H2:Injection
veto-def-server-url = https://www.lsc-group.phys.uwm.edu/ligovirgo/cbc/public/segments/S5/
veto-def-file = H1H2L1-CBC_RINGDOWN_DQ_VETO_CATEGORIES-815155213-60076801.xml
;v1-analyze = STATEVEC.5.12,STATEVEC.5.8
; server where veto-definer xml file located
veto-categories = 2,3,4
[ifo-details]
l1-data =
h1-data =
h2-data =
;v1-data =
one-ifo =
two-ifo =
three-ifo =
;four-ifo =
[hipe-arguments]
datafind =
inspiral =
output-segs =
write-script =
inspinj =
ringdown =
coincidence =
coire-coincidence =
summary-first-coinc-triggers =
[condor]
; setup of condor universe and location of executables
universe = standard
hipe = lalapps_inspiral_hipe
plot = /bin/false
follow = /bin/false
datafind = ligo_data_find
segfind = ligolw_segment_query
segs_from_cats = ligolw_segments_from_cats
ligolw_print = ligolw_print
ligolw_add = ligolw_add
tmpltbank = /bin/false
inspiral = lalapps_ring
; both inspinj and rinj are necessary if you want to run inspiral and ringdown injections
inspinj = lalapps_inspinj
rinj = lalapps_rinj
inca = /bin/false
thinca = lalapps_rinca
trigbank = /bin/false
cohbank = /bin/false
frjoin = /bin/false
chia = /bin/false
sire = /bin/false
coire = lalapps_coincringread
tmpltbank32 = /bin/false
inspiral32 = /bin/false
inspinj32 = /bin/false
inca32 = /bin/false
thinca32 = /bin/false
trigbank32 = /bin/false
cohbank32 = /bin/false
frjoin32 = /bin/false
chia32 = /bin/false
sire32 = /bin/false
coire32 = /bin/false
plotinspiral = /bin/false
plotthinca = /bin/false
plotnumtemplates = /bin/false
plotinjnum = /bin/false
plotethinca = /bin/false
plotinspmissed = /bin/false
plotinspfound = /bin/false
plotinspfound = /bin/false
plotcoincmissed = /bin/false
plotinspinj = /bin/false
plotsnrchi = /bin/false
plotinspiralrange = /bin/false
ploteffdistcut = /bin/false
cohbank = /bin/false
cohinspbank = /bin/false
frjoin = /bin/false
chia = /bin/false
cohire = /bin/false
[condor-max-jobs]
;maximum number of jobs that condor should run of a given category
datafind= 10
thinca = 20
trigbank = 20
coire = 20
sire = 20
[ldgsubmitdax]
sites-file = ldg-sites.xml
properties-file = pegasus-properties.bundle
gsiftp = ldas-grid.ligo.caltech.edu
pool = cit
[sites]
eobnr__inj = local
ringdown_inj = local
phenom_inj = local
playground = local
full_data = local
[pipeline]
; tagging information for the configure script
version =
cvs-tag = $Name$
user-tag =
num-slides = 50
playground-data-mask = all_data
retry-subdag = 1
;Set matplotlibdir to a local directory to avoid NFS issues with the TeX part
;of matplotlib. Ensure this directory exists on all nodes!
;matplotlibdir =
; INSPINJ SECTIONS
;;;;;;;;;;;;;;;;;;
[injections]
eobnr_inj = 1201
ringdown_inj = 1202
phenom_inj = 1203
[eobnr_inj]
f-lower = 10
time-step=724.077
waveform = EOBNRpseudoFourPN
min-distance = 1000
max-distance = 750000
d-distr = log10
l-distr = random
i-distr = uniform
min-mass1 = 1.0
max-mass1 = 99.0
min-mass2 = 1.0
max-mass2 = 99.0
m-distr = componentMass
min-mtotal = 25.0
max-mtotal = 100.0
disable-spin =
taper-injection = start
write-sim-ring =
injection-type = EOBNR
[ringdown_inj]
waveform = Ringdown
inj-distr = 0
time-step = 2630
minimum-frequency = 50
maximum-frequency = 2000
minimum-quality = 2.1187
maximum-quality = 20
minimum-distance = 10
maximum-distance = 1000000
epsilon = 0.01
injection-type = ringdown
[phenom_inj]
time-step = 2.630000e+03
time-interval = 5.000000e+01
d-distr = log10
l-distr = random
m-distr = log
i-distr = uniform
f-lower = 10.000000
min-mass1 = 10
min-mass2 = 10
max-mass1 = 3.700000e+02
max-mass2 = 3.700000e+02
min-mtotal = 10
max-mtotal = 3.700000e+02
min-mratio = 1
max-mratio = 10
min-distance = 100000
max-distance = 1000000
waveform = IMRPhenomAtwoPN
disable-spin =
taper-injection = start
write-sim-ring=
injection-type = Phenom
; HIPE SECTIONS
;;;;;;;;;;;;;;;
[input]
ligo-channel = LSC-STRAIN
ligo-type = RDS_C03_L2
ligo-qscan-type = RDS_R_L1
max-thinca-segment = 3600
geo-channel =
geo-type =
virgo-type = HrecOnline
virgo-channel =h_16384Hz
[calibration]
; location of the calibration cache and the cache files
; if using h(t) data, then no calibration cache required
path = /home/lgoggin/projects/ringdown/s5/calibration
L1 = L1_CAL_REF_DARM_ERR_S5_V1_U.cache
H1 = H1_CAL_REF_DARM_ERR_S5_V1_U.cache
H2 = H2_CAL_REF_DARM_ERR_S5_V1_U.cache
[datafind]
; type of data to use -- for LDAS-GRID, nothing required here.
;match=localhost
;url-type = file
[segfind]
segment-url=https://metaserver.phy.syr.edu
;file:///home/lppekows/dmt/triggers/DQ_Segments/
[data]
; data conditioning parameters common to tmpltbank and inspiral
pad-data = 8
sample-rate = 8192
block-duration = 2176
segment-duration = 256
[ligo-data]
strain-data =
highpass-frequency = 35
cutoff-frequency = 39
dynamic-range-factor = 1.0e+20
geo-data =
geo-highpass-frequency = 30
geo-data-scale = 1.0e+20
spectrum-type = median_mean
[virgo-data]
; not needed for ringdowns
[geo-data]
; not needed for ringdowns
[tmpltbank]
; not needed for ringdowns
[h1-tmpltbank]
; not needed for ringdowns
[h2-tmpltbank]
; not needed for ringdowns
[l1-tmpltbank]
; not needed for ringdowns
[inspiral]
bank-max-mismatch = 0.03
bank-min-frequency = 50
bank-max-frequency = 2000
bank-min-quality = 2.1187
bank-max-quality = 20.0
bank-template-phase = 0
maximize-duration = 1
[h1-inspiral]
threshold = 5.5
[h2-inspiral]
threshold = 5.5
[l1-inspiral]
threshold = 5.5
[v1-inspiral]
; not needed for ringdowns
[no-veto-inspiral]
; not needed for ringdowns
[veto-inspiral]
; not needed for ringdowns
[coherent-inspiral]
; not needed for ringdowns
[inca]
; not needed for ringdowns
[thinca]
multi-ifo-coinc =
maximization-interval = 1
parameter-test = ds_sq_fQt
h1-ds_sq-accuracy = 0.6
h2-ds_sq-accuracy = 0.6
l1-ds_sq-accuracy = 0.6
; only turn on if you want no vetoes applied
;[thinca-2]
[thinca-slide]
; time slide parameters
h1-slide = 0
h2-slide = 0
l1-slide = 5
[trigbank]
; not needed for ringdowns
[sire]
; not needed for ringdowns
[sire-inj]
; not needed for ringdowns
[coire]
cluster-time = 10000
coinc-stat = bitten_l
h1-bittenl-a = 2
h1-bittenl-b = 2.2
h2-bittenl-a = 2
h2-bittenl-b = 2.2
sort-triggers =
h1-h2-distance-cut =
h1-kappa = 2
h2-kappa = 2
[coire-1]
; not needed for ringdowns
[coire-2]
; not needed for ringdowns
[coire-2-cat-2]
; not needed for ringdowns
[coire-2-cat-3]
; not needed for ringdowns
[coire-2-cat-4]
; not needed for ringdowns
[coire-inj]
injection-window = 100
[cohbank]
; not needed for ringdowns
[trigbank-coherent]
; not needed for ringdowns
[inspiral-coherent]
; not needed for ringdowns
[cohinspbank]
; not needed for ringdowns
[chia]
; not needed for ringdowns
[chia-inj]
; not needed for ringdowns
[cohire]
; not needed for ringdowns
[cohire-inj]
; not needed for ringdowns
; PLOTTING SECTIONS
;;;;;;;;;;;;;;;;;;;
[plotnumtemplates]
; not needed for ringdowns
[plotnumtemplates-meta]
; not needed for ringdowns
[plotinspiralrange]
; not needed for ringdowns
[plotinspiralrange-meta]
; not needed for ringdowns
[plotinspiral]
; not needed for ringdowns
[plotinspiral-meta]
; not needed for ringdowns
[plotthinca]
; not needed for ringdowns
[plotthinca-meta]
; not needed for ringdowns
[plotinjnum]
; not needed for ringdowns
[plotinjnum-meta]
; not needed for ringdowns
[plotethinca]
; not needed for ringdowns
[plotethinca-meta]
; not needed for ringdowns
[plotinspmissed]
; not needed for ringdowns
[plotinspmissed-meta]
; not needed for ringdowns
[plotinspfound]
; not needed for ringdowns
[plotcoincmissed]
; not needed for ringdowns
[ploteffdistcut]
; not needed for ringdowns
[ploteffdistcut-meta]
; not needed for ringdowns
[plotinspinj]
; not needed for ringdowns
[plotinspinj-meta]
; not needed for ringdowns
[plotsnrchi]
; not needed for ringdowns
[plotsnrchi-meta]
; not needed for ringdowns
; FOLLOWUP SECTIONS
;;;;;;;;;;;;;;;;;;;
[triggers]
; not needed for ringdowns
[q-datafind]
; not needed for ringdowns
[qscan]
; not needed for ringdowns
[q-hoft-datafind]
; not needed for ringdowns
[qscan-hoft]
; not needed for ringdowns
[plots]
; detail of followup plots
[output]
; details of follow-up output
[seg]
; details of follow-up segments
"""
ring_pipe.py - standalone ring pipeline driver script
This script produces the condor submit and dag files to run
the standalone ring code on LIGO data
"""
__author__ = 'Duncan Brown <duncan@gravity.phys.uwm.edu>'
__date__ = '$Date$'
__version__ = '$Revision$'
# import standard modules
import sys, os
import getopt, re, string
import tempfile
import ConfigParser
# import the modules we need to build the pipeline
from glue import pipeline
import ring
def usage():
msg = """\
Usage: lalapps_ring_pipe [options]
-h, --help display this message
-v, --version print version information and exit
-u, --user-tag TAG tag the job with TAG (overrides value in ini file)
-d, --datafind run LSCdataFind to create frame cache files
-r, --ring run lalapps_inspiral on the first IFO
-j, --injections FILE add simulated bursts from FILE
-p, --playground-only only create chunks that overlap with playground
-P, --priority PRIO run jobs with condor priority PRIO
-f, --config-file FILE use configuration file FILE
-l, --log-path PATH directory to write condor log file
"""
print >> sys.stderr, msg
# pasrse the command line options to figure out what we should do
shortop = "hvdrj:u:P:f:l:"
longop = [
"help",
"version",
"datafind",
"ring",
"injections=",
"playground-only",
"user-tag=",
"priority=",
"config-file=",
"log-path="
]
try:
opts, args = getopt.getopt(sys.argv[1:], shortop, longop)
except getopt.GetoptError:
usage()
sys.exit(1)
config_file = None
do_datafind = None
do_ring = None
inj_file = None
usertag = None
playground_only = 0
condor_prio = None
config_file = None
log_path = None
for o, a in opts:
if o in ("-v", "--version"):
print "$Id$"
sys.exit(0)
elif o in ("-h", "--help"):
usage()
sys.exit(0)
elif o in ("-d", "--datafind"):
do_datafind = 1
elif o in ("-r", "--ring"):
do_ring = 1
elif o in ("-j", "--injections"):
inj_file = a
elif o in ("-u", "--user-tag"):
usertag = a
elif o in ("-p", "--playground-only"):
playground_only = 1
elif o in ("-P", "--priority"):
condor_prio = a
elif o in ("-f", "--config-file"):
config_file = a
elif o in ("-l", "--log-path"):
log_path = a
else:
print >> sys.stderr, "Unknown option:", o
usage()
sys.exit(1)
if not config_file:
print >> sys.stderr, "No configuration file specified."
print >> sys.stderr, "Use --config-file FILE to specify location."
sys.exit(1)
if not log_path:
print >> sys.stderr, "No log file path specified."
print >> sys.stderr, "Use --log-path PATH to specify a location."
sys.exit(1)
# try and make a directory to store the cache files and job logs
try: os.mkdir('cache')
except: pass
try: os.mkdir('logs')
except: pass
# create the config parser object and read in the ini file
cp = ConfigParser.ConfigParser()
cp.read(config_file)
# if a usertag has been specified, override the config file
if usertag:
cp.set('pipeline','user-tag',usertag)
else:
try:
usertag = string.strip(cp.get('pipeline','user-tag'))
except:
usertag = None
# create a log file that the Condor jobs will write to
basename = re.sub(r'\.ini',r'',config_file)
tempfile.tempdir = log_path
if usertag:
tempfile.template = basename + '.' + usertag + '.dag.log.'
else:
tempfile.template = basename + '.dag.log.'
logfile = tempfile.mktemp()
fh = open( logfile, "w" )
fh.close()
# create the DAG writing the log to the specified directory
dag = pipeline.CondorDAG(logfile)
if usertag:
dag.set_dag_file(basename + '.' + usertag + '.dag')
else:
dag.set_dag_file(basename + '.dag')
# create the Condor jobs that will be used in the DAG
df_job = pipeline.LSCDataFindJob('cache','logs',cp)
ring_job = ring.RingJob(cp)
# set better submit file names than the default
if usertag:
subsuffix = '.' + usertag + '.sub'
else: