From 39896ee1d595c756199c59accc0905e612a6a78c Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Mon, 1 Aug 2022 09:10:16 -0700 Subject: [PATCH 1/3] lalapps_run_sqlite has been replaced with ligolw_run_sqlite --- lalapps/.gitignore | 1 - lalapps/conda/meta.yaml.in.in | 1 - lalapps/src/inspiral/Makefile.am | 1 - lalapps/src/inspiral/lalapps_run_sqlite.py | 127 --------------------- 4 files changed, 130 deletions(-) delete mode 100644 lalapps/src/inspiral/lalapps_run_sqlite.py diff --git a/lalapps/.gitignore b/lalapps/.gitignore index 9f1a249dae..44c4ee26b7 100644 --- a/lalapps/.gitignore +++ b/lalapps/.gitignore @@ -99,7 +99,6 @@ src/inspiral/lalapps_multi_hipe src/inspiral/lalapps_ninja src/inspiral/lalapps_plot_hipe src/inspiral/lalapps_randombank -src/inspiral/lalapps_run_sqlite src/inspiral/lalapps_siminspiral_to_frame src/inspiral/lalapps_skymap src/inspiral/lalapps_spininj diff --git a/lalapps/conda/meta.yaml.in.in b/lalapps/conda/meta.yaml.in.in index 4910dc3f86..bcc61826cd 100644 --- a/lalapps/conda/meta.yaml.in.in +++ b/lalapps/conda/meta.yaml.in.in @@ -159,7 +159,6 @@ test: - lalapps_power_pipe --help - lalapps_random_bank 10 20 10 - lalapps_randombank --minimum-mass 10 --maximum-mass 20 --number-of-templates 10 - - lalapps_run_sqlite --help - lalapps_splitbank --verbose --bank-file P1-TMPLTBANK-0-0.xml --number-of-banks 2 --minimal-match 0.9 - lalapps_string_apply_vetoes --help - lalapps_string_calc_likelihood --help diff --git a/lalapps/src/inspiral/Makefile.am b/lalapps/src/inspiral/Makefile.am index 85450c5e32..c55baae1ef 100644 --- a/lalapps/src/inspiral/Makefile.am +++ b/lalapps/src/inspiral/Makefile.am @@ -57,7 +57,6 @@ endif if HAVE_PYTHON pybin_scripts = \ lalapps_make_nr_hdf_catalog \ - lalapps_run_sqlite \ $(END_OF_LIST) pkgpython_PYTHON = \ diff --git a/lalapps/src/inspiral/lalapps_run_sqlite.py b/lalapps/src/inspiral/lalapps_run_sqlite.py deleted file mode 100644 index b2a2e31681..0000000000 --- a/lalapps/src/inspiral/lalapps_run_sqlite.py +++ /dev/null @@ -1,127 +0,0 @@ -# -# Copyright (C) 2010 Chad Hanna -# -# 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 the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -from __future__ import print_function - -from optparse import OptionParser -import sqlite3 -import sys - -from ligo.lw import ligolw -from ligo.lw import dbtables -from ligo.lw.utils import ligolw_sqlite -from lalapps import git_version - -__author__ = "Chad Hanna " -__version__ = "git id %s" % git_version.id -__date__ = git_version.date - - -def parse_command_line(): - parser = OptionParser( - version = "Name: %%prog\n%s" % git_version.verbose_msg, usage = "%prog (--sql CODE|--sql-file FILENAME) [options] database1.sqlite database2.xml ..." - ) - parser.add_option("-t", "--tmp-space", metavar = "path", help = "Path to a directory suitable for use as a work area while manipulating the database file. The database file will be worked on in this directory, and then moved to the final location when complete. This option is intended to improve performance when running in a networked environment, where there might be a local disk with higher bandwidth than is available to the filesystem on which the final output will reside.") - parser.add_option("-c", "--sql", metavar = "code", help = "Execute this SQL code.") - parser.add_option("-s", "--sql-file", metavar = "filename", help = "Execute this SQL file.") - parser.add_option("-v", "--verbose", action = "store_true", help = "Be verbose.") - options, filenames = parser.parse_args() - if bool(options.sql) + bool(options.sql_file) != 1: - raise ValueError("must set exactly one of --sql or --sql-file") - return options, (filenames or []) - - -options, databases = parse_command_line() - - -if options.sql_file: - # Parse the sql file into something that can be executed in sequence - sql = [line.strip() for line in open(options.sql_file)] - # Remove comments and pragmas - sql = [s for s in sql if not s.startswith("--") and not s.startswith("PRAGMA")] - sql = "\n".join(sql) - sql = [statement.strip() for statement in sql.split(";\n")] -elif options.sql: - sql = [statement.strip() for statement in options.sql.split(";")] -else: - raise NotImplemented -# remove no-ops -sql = [statement for statement in sql if statement] - -# Apply the SQL to all the databases sequentially -for n, filename in enumerate(databases, 1): - # - # access the document - # - - if options.verbose: - print("%d/%d:" % (n, len(databases)), end=' ', file=sys.stderr) - if filename.endswith(".xml") or filename.endswith(".xml.gz"): - # load XML file into in-ram database for processing - fileformat = "xml" - working_filename = None - connection = sqlite3.connect(":memory:") - @dbtables.use_in - class LIGOLWContentHandler(ligolw.LIGOLWContentHandler): - connection = connection - ligolw_sqlite.insert_from_url(filename, contenthandler = LIGOLWContentHandler, preserve_ids = True, verbose = options.verbose) - del LIGOLWContentHandler - else: - # assume it's an SQLite file - fileformat = "sqlite" - working_filename = dbtables.get_connection_filename(filename, tmp_path = options.tmp_space, verbose = options.verbose) - connection = sqlite3.connect(str(working_filename)) - # disable sync() system calls for the database - connection.execute("PRAGMA synchronous = OFF;") - # also use the scratch space for sqlite's temp store, but don't try - # to do so if the working filename is the same as the original - # filename as that most likely indicates some problem was found - # with the scratch space like that it's full - if options.tmp_space is not None and working_filename != filename: - dbtables.set_temp_store_directory(connection, options.tmp_space, verbose = options.verbose) - - # - # apply SQL - # - - if options.verbose: - print("Executing SQL ...", file=sys.stderr) - cursor = connection.cursor() - for statement in sql: - if options.verbose: - print(statement, file=sys.stderr) - cursor.execute(statement) - connection.commit() - cursor.close() - if options.verbose: - print("... Done.", file=sys.stderr) - - # - # commit changes - # - - if fileformat == "xml": - # overwrite XML file with in-ram database' contents - ligolw_sqlite.extract(connection, filename, verbose = options.verbose) - connection.close() - elif fileformat == "sqlite": - # return SQLite file to its home - connection.close() - dbtables.put_connection_filename(filename, working_filename, verbose = options.verbose) - else: - raise Exception("internal error") -- GitLab From b8556102840c0d9fe5f704e0a1711e0408d0e7f8 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Wed, 24 Aug 2022 09:25:53 -0700 Subject: [PATCH 2/3] update configuration files for ligolw_run_sqlite also removes old/unused test data patch from Florent Robinet --- lalapps/src/string/JW1_H1H2_StringDag.ini | 2 +- lalapps/src/string/JW1_StringDag.ini | 2 +- lalapps/src/string/O1test/Makefile.O1test | 17 --- lalapps/src/string/O1test/O1_StringDag.ini | 115 ------------------ .../src/string/O1test/S5-H1-template-bank.xml | 44 ------- .../src/string/O1test/S5-L1-template-bank.xml | 43 ------- lalapps/src/string/O2/O2C02_CuspDag.ini | 2 +- lalapps/src/string/S5_StringDag.ini | 2 +- lalapps/src/string/S6_StringDag.ini | 2 +- .../src/string/lalapps_cosmicstring_pipe.py | 2 +- 10 files changed, 6 insertions(+), 225 deletions(-) delete mode 100644 lalapps/src/string/O1test/Makefile.O1test delete mode 100644 lalapps/src/string/O1test/O1_StringDag.ini delete mode 100644 lalapps/src/string/O1test/S5-H1-template-bank.xml delete mode 100644 lalapps/src/string/O1test/S5-L1-template-bank.xml diff --git a/lalapps/src/string/JW1_H1H2_StringDag.ini b/lalapps/src/string/JW1_H1H2_StringDag.ini index a216e9fec4..5d6362a7f6 100644 --- a/lalapps/src/string/JW1_H1H2_StringDag.ini +++ b/lalapps/src/string/JW1_H1H2_StringDag.ini @@ -13,7 +13,7 @@ ligolw_add = $ENV(HOME)/jw1string/local/bin/ligolw_add lalapps_binjfind = $ENV(HOME)/jw1string/local/bin/lalapps_binjfind lalapps_burca = $ENV(HOME)/jw1string/local/bin/lalapps_burca ligolw_sqlite = $ENV(HOME)/jw1string/local/bin/ligolw_sqlite -lalapps_run_sqlite = $ENV(HOME)/jw1string/local/bin/lalapps_run_sqlite +lalapps_run_sqlite = $ENV(HOME)/jw1string/local/bin/ligolw_run_sqlite lalapps_string_meas_likelihood = $ENV(HOME)/jw1string/local/bin/lalapps_string_meas_likelihood lalapps_string_calc_likelihood = $ENV(HOME)/jw1string/local/bin/lalapps_string_calc_likelihood diff --git a/lalapps/src/string/JW1_StringDag.ini b/lalapps/src/string/JW1_StringDag.ini index f8e840a1ce..6630f55d93 100644 --- a/lalapps/src/string/JW1_StringDag.ini +++ b/lalapps/src/string/JW1_StringDag.ini @@ -13,7 +13,7 @@ ligolw_add = $ENV(HOME)/jw1string/local/bin/ligolw_add lalapps_binjfind = $ENV(HOME)/jw1string/local/bin/lalapps_binjfind lalapps_burca = $ENV(HOME)/jw1string/local/bin/lalapps_burca ligolw_sqlite = $ENV(HOME)/jw1string/local/bin/ligolw_sqlite -lalapps_run_sqlite = $ENV(HOME)/local/bin/lalapps_run_sqlite +lalapps_run_sqlite = $ENV(HOME)/local/bin/ligolw_run_sqlite lalapps_string_meas_likelihood = $ENV(HOME)/jw1string/local/bin/lalapps_string_meas_likelihood lalapps_string_calc_likelihood = $ENV(HOME)/jw1string/local/bin/lalapps_string_calc_likelihood diff --git a/lalapps/src/string/O1test/Makefile.O1test b/lalapps/src/string/O1test/Makefile.O1test deleted file mode 100644 index 1ee3f4155d..0000000000 --- a/lalapps/src/string/O1test/Makefile.O1test +++ /dev/null @@ -1,17 +0,0 @@ -dag : - ligolw_segment_query_dqsegdb --segment-url=https://segments.ligo.org -q --gps-start-time 1127000000 --gps-end-time 1127100000 --include-segments=H1:DCS-ANALYSIS_READY_C02:1 > segmentspadded_H1.xml - ligolw_segment_query_dqsegdb --segment-url=https://segments.ligo.org -q --gps-start-time 1127000000 --gps-end-time 1127100000 --include-segments=L1:DCS-ANALYSIS_READY_C02:1 > segmentspadded_L1.xml - ligolw_add --output segdb.xml.gz segmentspadded_H1.xml segmentspadded_L1.xml - # FIXME: can't enable --verbose because lalapps C programs can't - # preserve the NULL values in the process_params table - - lalapps_gen_timeslides --instrument H1=0:0:0 --instrument L1=78.7653294765398375645:78.7653294765398375645:0 injection_time_slides.xml.gz - lalapps_gen_timeslides --instrument H1=0:0:0 --instrument L1=-2835.9261614488255:+2835.9261614488255:3.5449077018110318 background_time_slides_0.xml.gz - - n=1 ; while [ $$n -le 1 ] ; do \ - mkdir -p dag_c$$n ; { cd dag_c$$n || break ; } ; lalapps_cosmicstring_pipe --verbose --config-file ../O1_StringDag.ini --log-path $(TMPDIR) --segments-file ../segdb.xml.gz --segments-name RESULT --injection-time-slides ../injection_time_slides.xml.gz --background-time-slides ../background_time_slides_0.xml.gz ; cd .. ; \ - n=$$(($$n + 1)) ; \ - done - -clean : - rm -Rvf segmentspadded*.xml segdb.xml.gz *_time_slides*.xml.gz dag_c* diff --git a/lalapps/src/string/O1test/O1_StringDag.ini b/lalapps/src/string/O1test/O1_StringDag.ini deleted file mode 100644 index bf14462f60..0000000000 --- a/lalapps/src/string/O1test/O1_StringDag.ini +++ /dev/null @@ -1,115 +0,0 @@ -; cosmic string pipeline configuration script. -; -; this is the configuration file for the cosmic string DAG generation -; program that creates a condor DAG to run the cosmic string analysis -; pipeline. - - -[condor] -universe = vanilla -accounting_group = ligo.dev.o2.burst.cs.cs -datafind = /usr/bin/gw_data_find -lalapps_StringSearch = $ENV(HOME)/local/bin/lalapps_StringSearch -lalapps_binj = $ENV(HOME)/local/bin/lalapps_binj -ligolw_add = $ENV(HOME)/local/bin/ligolw_add -lalapps_binjfind = $ENV(HOME)/local/bin/lalapps_binjfind -lalapps_burca = $ENV(HOME)/local/bin/lalapps_burca -ligolw_sqlite = $ENV(HOME)/local/bin/ligolw_sqlite -lalapps_run_sqlite = $ENV(HOME)/local/bin/lalapps_run_sqlite -lalapps_string_meas_likelihood = $ENV(HOME)/local/bin/lalapps_string_meas_likelihood -lalapps_string_calc_likelihood = $ENV(HOME)/local/bin/lalapps_string_calc_likelihood - -[pipeline] -version = $Id$ -user_tag = O1 -ifos = H1,L1 -injection-runs = 10 -; an even number of short-segment-durations with 50% overlap -segment-length = 344 -trig_overlap = 0 -out_dir = logs -cache_dir = cache -triggers_dir = triggers -files_per_burca = 10 -files_per_binjfind = 30 -files_per_meas_likelihood = 10 -; this number only applies to injection runs, the dag script hard-codes the -; files-per-job to 1 (at the time of writing) in non-injection runs -files_per_calc_likelihood = 25 -files_per_run_sqlite = 20 - -[input] - -[datafind] -; uncomment to check for missing data -;gaps = -lal-cache = -url-type = file -type_H1 = H1_HOFT_C02 -type_L1 = L1_HOFT_C02 - -[lalapps_binj] -; seconds -time-step = 83.66600265340756 -population = string_cusp -min-frequency = 75 -max-frequency = 8192 -min-amplitude = 0.04e-20 -max-amplitude = 150e-20 -seed = $(macroseed) - -[lalapps_StringSearch] -sample-rate = 8192 -bank-freq-start = 50 -bank-lowest-hifreq-cutoff = 75 -settling-time = 4 -short-segment-duration = 16 -cusp-search = -cluster-events = 0.1 -pad = 4 -max-mismatch = 0.001 - -[lalapps_StringSearch_H1] -channel = H1:DCS-CALIB_STRAIN_C02 -template-bank = ../../S5-H1-template-bank.xml -threshold = 3.6 -chi2par0 = 0.5 -chi2par1 = 1.8 -chi2par2 = -2.4 - -[lalapps_StringSearch_L1] -channel = L1:DCS-CALIB_STRAIN_C02 -template-bank =../../S5-L1-template-bank.xml -threshold = 3.6 -chi2par0 = 0.5 -chi2par1 = 1.8 -chi2par2 = -2.3 - -[ligolw_add] - -[lalapps_burca] -comment = $(macrocomment) -coincidence-algorithm = stringcusp -threshold = 0.008 - -[lalapps_binjfind] -comment = $(macrocomment) -match-algorithm = stringcusp - -[ligolw_sqlite] -replace = -preserve-ids = -database = $(macrodatabase) -tmp-space = $ENV(TMPDIR) - -[lalapps_run_sqlite] -tmp-space = $ENV(TMPDIR) - -[lalapps_string_meas_likelihood] -tmp-space = $ENV(TMPDIR) -vetoes-name = vetoes -injection-reweight = astrophysical - -[lalapps_string_calc_likelihood] -tmp-space = $ENV(TMPDIR) -vetoes-name = vetoes diff --git a/lalapps/src/string/O1test/S5-H1-template-bank.xml b/lalapps/src/string/O1test/S5-H1-template-bank.xml deleted file mode 100644 index 7405c18b98..0000000000 --- a/lalapps/src/string/O1test/S5-H1-template-bank.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,75,0,0,0,0,0,0,"sngl_burst:event_id:0", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,78.0285,6.05703,0,0,0,0,0,"sngl_burst:event_id:1", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,81.0285,12.057,0,0,0,0,0,"sngl_burst:event_id:2", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,84.0404,18.0808,0,0,0,0,0,"sngl_burst:event_id:3", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,87.5603,25.1207,0,0,0,0,0,"sngl_burst:event_id:4", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,91.4358,32.8715,0,0,0,0,0,"sngl_burst:event_id:5", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,95.4358,40.8715,0,0,0,0,0,"sngl_burst:event_id:6", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,99.9358,49.8715,0,0,0,0,0,"sngl_burst:event_id:7", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,105.227,60.4531,0,0,0,0,0,"sngl_burst:event_id:8", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,111.292,72.5837,0,0,0,0,0,"sngl_burst:event_id:9", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,118.663,87.3255,0,0,0,0,0,"sngl_burst:event_id:10", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,128.09,106.18,0,0,0,0,0,"sngl_burst:event_id:11", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,140.735,131.471,0,0,0,0,0,"sngl_burst:event_id:12", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,159.609,169.219,0,0,0,0,0,"sngl_burst:event_id:13", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,194.79,239.581,0,0,0,0,0,"sngl_burst:event_id:14", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,292.511,435.023,0,0,0,0,0,"sngl_burst:event_id:15", - "process:process_id:0","H1","StringCusp","H1:LSC-STRAIN",0,0,0,0,0,2085,4021,0,0,0,0,0,"sngl_burst:event_id:16" - -
- - diff --git a/lalapps/src/string/O1test/S5-L1-template-bank.xml b/lalapps/src/string/O1test/S5-L1-template-bank.xml deleted file mode 100644 index a16a8c2549..0000000000 --- a/lalapps/src/string/O1test/S5-L1-template-bank.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,75,0,0,0,0,0,0,"sngl_burst:event_id:0", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,78.03,6.06,0,0,0,0,0,"sngl_burst:event_id:1", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,81.03,12.06,0,0,0,0,0,"sngl_burst:event_id:2", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,84.3271,18.6542,0,0,0,0,0,"sngl_burst:event_id:3", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,87.8471,25.6942,0,0,0,0,0,"sngl_burst:event_id:4", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,91.8471,33.6942,0,0,0,0,0,"sngl_burst:event_id:5", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,96.3471,42.6942,0,0,0,0,0,"sngl_burst:event_id:6", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,101.381,52.7618,0,0,0,0,0,"sngl_burst:event_id:7", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,107.306,64.6121,0,0,0,0,0,"sngl_burst:event_id:8", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,114.507,79.013,0,0,0,0,0,"sngl_burst:event_id:9", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,123.666,97.3319,0,0,0,0,0,"sngl_burst:event_id:10", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,135.845,121.689,0,0,0,0,0,"sngl_burst:event_id:11", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,153.91,157.82,0,0,0,0,0,"sngl_burst:event_id:12", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,186.497,222.994,0,0,0,0,0,"sngl_burst:event_id:13", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,281.151,412.302,0,0,0,0,0,"sngl_burst:event_id:14", - "process:process_id:0","L1","StringCusp","L1:LSC-STRAIN",0,0,0,0,0,2085,4021,0,0,0,0,0,"sngl_burst:event_id:15" - -
- - diff --git a/lalapps/src/string/O2/O2C02_CuspDag.ini b/lalapps/src/string/O2/O2C02_CuspDag.ini index 077a81d4fb..c60194176f 100644 --- a/lalapps/src/string/O2/O2C02_CuspDag.ini +++ b/lalapps/src/string/O2/O2C02_CuspDag.ini @@ -15,7 +15,7 @@ ligolw_add = /home/min-a.cho/opt/glue/bin/ligolw_add lalapps_binjfind = /home/min-a.cho/opt/lalsuite/bin/lalapps_binjfind lalapps_burca = /home/min-a.cho/opt/lalsuite/bin/lalapps_burca ligolw_sqlite = /home/min-a.cho/opt/glue/bin/ligolw_sqlite -lalapps_run_sqlite = /home/min-a.cho/opt/lalsuite/bin/lalapps_run_sqlite +lalapps_run_sqlite = /home/min-a.cho/opt/lalsuite/bin/ligolw_run_sqlite lalapps_string_meas_likelihood = /home/min-a.cho/opt/lalsuite/bin/lalapps_string_meas_likelihood lalapps_string_calc_likelihood = /home/min-a.cho/opt/lalsuite/bin/lalapps_string_calc_likelihood diff --git a/lalapps/src/string/S5_StringDag.ini b/lalapps/src/string/S5_StringDag.ini index 2b80a2b8c8..c83df01963 100644 --- a/lalapps/src/string/S5_StringDag.ini +++ b/lalapps/src/string/S5_StringDag.ini @@ -14,7 +14,7 @@ ligolw_add = $ENV(HOME)/S5VSR1string/local/bin/ligolw_add lalapps_binjfind = $ENV(HOME)/S5VSR1string/local/bin/lalapps_binjfind lalapps_burca = $ENV(HOME)/S5VSR1string/local/bin/lalapps_burca ligolw_sqlite = $ENV(HOME)/S5VSR1string/local/bin/ligolw_sqlite -lalapps_run_sqlite = $ENV(HOME)/S5VSR1string/local/bin/lalapps_run_sqlite +lalapps_run_sqlite = $ENV(HOME)/S5VSR1string/local/bin/ligolw_run_sqlite lalapps_string_meas_likelihood = $ENV(HOME)/S5VSR1string/local/bin/lalapps_string_meas_likelihood lalapps_string_calc_likelihood = $ENV(HOME)/S5VSR1string/local/bin/lalapps_string_calc_likelihood diff --git a/lalapps/src/string/S6_StringDag.ini b/lalapps/src/string/S6_StringDag.ini index 8a8b9c6fc4..56d7883282 100644 --- a/lalapps/src/string/S6_StringDag.ini +++ b/lalapps/src/string/S6_StringDag.ini @@ -14,7 +14,7 @@ ligolw_add = $ENV(HOME)/S5VSR1string/local/bin/ligolw_add lalapps_binjfind = $ENV(HOME)/S5VSR1string/local/bin/lalapps_binjfind lalapps_burca = $ENV(HOME)/S5VSR1string/local/bin/lalapps_burca ligolw_sqlite = $ENV(HOME)/S5VSR1string/local/bin/ligolw_sqlite -lalapps_run_sqlite = $ENV(HOME)/S5VSR1string/local/bin/lalapps_run_sqlite +lalapps_run_sqlite = $ENV(HOME)/S5VSR1string/local/bin/ligolw_run_sqlite lalapps_string_meas_likelihood = $ENV(HOME)/S5VSR1string/local/bin/lalapps_string_meas_likelihood lalapps_string_calc_likelihood = $ENV(HOME)/S5VSR1string/local/bin/lalapps_string_calc_likelihood diff --git a/lalapps/src/string/lalapps_cosmicstring_pipe.py b/lalapps/src/string/lalapps_cosmicstring_pipe.py index 0b3ad21f7e..a4984c30cc 100644 --- a/lalapps/src/string/lalapps_cosmicstring_pipe.py +++ b/lalapps/src/string/lalapps_cosmicstring_pipe.py @@ -385,7 +385,7 @@ def make_coinc_branch(dag, datafinds, seglists, time_slides, min_segment_length, coinc_nodes = [power.make_binjfind_fragment(dag, these_coinc_nodes, "%s_%d" % (tag, n), verbose = verbose) for n, these_coinc_nodes in enumerate(coinc_nodes)] # - # ligolw_sqlite and lalapps_run_sqlite + # ligolw_sqlite and ligolw_run_sqlite # if verbose: -- GitLab From c0947136eb6b94ee63e91c170d61b655628db428 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Wed, 24 Aug 2022 09:22:13 -0700 Subject: [PATCH 3/3] lalapps: bump required ligolw version --- lalapps/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalapps/configure.ac b/lalapps/configure.ac index 62e67ab89f..a1afa096ac 100644 --- a/lalapps/configure.ac +++ b/lalapps/configure.ac @@ -51,7 +51,7 @@ MIN_LALBURST_VERSION="1.6.0" MIN_LALINSPIRAL_VERSION="3.0.0" MIN_LALINFERENCE_VERSION="4.0.0" MIN_LALPULSAR_VERSION="5.0.0" -MIN_PYTHON_LIGO_LW_VERSION="1.7.0" +MIN_PYTHON_LIGO_LW_VERSION="1.8.0" AC_SUBST([MIN_FRAMEL_VERSION]) AC_SUBST([MIN_LAL_VERSION]) AC_SUBST([MIN_LALFRAME_VERSION]) -- GitLab