From 1dd45c214463696da2486b83bb3a9566a4635318 Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Fri, 21 Sep 2018 21:25:20 +0900 Subject: [PATCH] add --ilwdchar-compat to ligolw_cut --- .../Makefile.gstlal_feature_extractor_offline | 2 +- gstlal-inspiral/share/O2/Makefile.BNS_test_dag | 6 +++--- gstlal-inspiral/share/O2/Makefile.O2_offline_dag | 6 +++--- gstlal-inspiral/share/O2/Makefile.O2_offline_hybridbank_dag | 6 +++--- gstlal-inspiral/share/post_O2/Makefile.BNS_HLV_test_dag_O2 | 6 +++--- gstlal-inspiral/share/post_O2/Makefile.BNS_HL_test_dag_O2 | 6 +++--- .../share/post_O2/Makefile.offline_HLV_dag_O2_C02 | 6 +++--- gstlal-inspiral/share/post_O2/Makefile.offline_dag_O1_C02 | 6 +++--- gstlal-inspiral/share/post_O2/Makefile.offline_dag_O2_C02 | 6 +++--- gstlal-ugly/examples/configurations/BBH/triggers/Makefile | 2 +- .../examples/configurations/IIRinspiral/bank/Makefile | 2 +- .../examples/configurations/IIRinspiral/triggers/Makefile | 2 +- .../examples/configurations/LOW_MASS/S6/bank/Makefile | 2 +- .../examples/configurations/LOW_MASS/S6/triggers/Makefile | 2 +- gstlal-ugly/examples/configurations/LOW_MASS/bank/Makefile | 2 +- gstlal-ugly/examples/configurations/LOW_MASS/psd/Makefile | 2 +- .../examples/configurations/LOW_MASS/triggers/Makefile | 2 +- gstlal-ugly/examples/configurations/NINJA2/bank/Makefile | 2 +- gstlal-ugly/examples/configurations/PBH/bank/Makefile | 4 ++-- .../examples/configurations/SPIIR/MDC1/triggers/Makefile | 2 +- 20 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_offline b/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_offline index 7c4971d06b..d5e69b35aa 100644 --- a/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_offline +++ b/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_offline @@ -228,7 +228,7 @@ $(CHANNEL_LIST) : frame.cache # Produce segments file segments.xml.gz : frame.cache ligolw_segment_query_dqsegdb --segment-url=${SEG_SERVER} -q --gps-start-time ${FSTART} --gps-end-time ${STOP} --include-segments=$(LIGO_SEGMENTS) --result-name=datasegments > $@ - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(FSTART) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ frame.cache : diff --git a/gstlal-inspiral/share/O2/Makefile.BNS_test_dag b/gstlal-inspiral/share/O2/Makefile.BNS_test_dag index e0b8b4ade4..4c7f36347d 100644 --- a/gstlal-inspiral/share/O2/Makefile.BNS_test_dag +++ b/gstlal-inspiral/share/O2/Makefile.BNS_test_dag @@ -319,7 +319,7 @@ inj_tisi.xml : vetoes.xml.gz: $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ %_vetoes.xml: $(VETODEF) ligolw_segments_from_cats_dqsegdb --segment-url=$(SEG_SERVER) --veto-file=$(VETODEF) --gps-start-time $(START) --gps-end-time $(STOP) --cumulative-categories @@ -327,13 +327,13 @@ vetoes.xml.gz: $(VETOES_FILES) segments.xml.gz: $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ CAT1_vetoes.xml.gz: $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ %_CAT1_vetoes.xml : $(VETODEF) ligolw_segments_from_cats_dqsegdb --segment-url=$(SEG_SERVER) --veto-file=$(VETODEF) --gps-start-time $(START) --gps-end-time $(STOP) --cumulative-categories diff --git a/gstlal-inspiral/share/O2/Makefile.O2_offline_dag b/gstlal-inspiral/share/O2/Makefile.O2_offline_dag index 55e257e6e6..07f8f88921 100644 --- a/gstlal-inspiral/share/O2/Makefile.O2_offline_dag +++ b/gstlal-inspiral/share/O2/Makefile.O2_offline_dag @@ -218,7 +218,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ %_vetoes.xml : $(VETODEF) ligolw_segments_from_cats_dqsegdb --segment-url=$(SEG_SERVER) --veto-file=$(VETODEF) --gps-start-time $(START) --gps-end-time $(STOP) --cumulative-categories @@ -227,14 +227,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ %_CAT1_vetoes.xml : $(VETODEF) ligolw_segments_from_cats_dqsegdb --segment-url=$(SEG_SERVER) --veto-file=$(VETODEF) --gps-start-time $(START) --gps-end-time $(STOP) --cumulative-categories diff --git a/gstlal-inspiral/share/O2/Makefile.O2_offline_hybridbank_dag b/gstlal-inspiral/share/O2/Makefile.O2_offline_hybridbank_dag index db2f86fea5..ae1bfb2b18 100644 --- a/gstlal-inspiral/share/O2/Makefile.O2_offline_hybridbank_dag +++ b/gstlal-inspiral/share/O2/Makefile.O2_offline_hybridbank_dag @@ -252,7 +252,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ %_vetoes.xml : $(VETODEF) gstlal_segments_operations --union --segment-name VETO_CAT3_CUMULATIVE --output-file $@ --output-segment-name vetoes $*-VETOTIME_CAT3-*.xml $*-VETOTIME_CAT3-*.xml @@ -260,14 +260,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ %_CAT1_vetoes.xml : $(VETODEF) ligolw_segments_from_cats_dqsegdb --segment-url=$(SEG_SERVER) --veto-file=$(VETODEF) --gps-start-time $(START) --gps-end-time $(STOP) --cumulative-categories diff --git a/gstlal-inspiral/share/post_O2/Makefile.BNS_HLV_test_dag_O2 b/gstlal-inspiral/share/post_O2/Makefile.BNS_HLV_test_dag_O2 index 2e1bb03dde..5278085aac 100644 --- a/gstlal-inspiral/share/post_O2/Makefile.BNS_HLV_test_dag_O2 +++ b/gstlal-inspiral/share/post_O2/Makefile.BNS_HLV_test_dag_O2 @@ -344,7 +344,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_vetoes.xml : $(VETODEF) lauras_txt_files_to_xml H1-GATES-1163203217-24537601.txt L1-GATES-1163203217-24537601.txt @@ -356,14 +356,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_CAT1_vetoes.xml : $(VETODEF) diff --git a/gstlal-inspiral/share/post_O2/Makefile.BNS_HL_test_dag_O2 b/gstlal-inspiral/share/post_O2/Makefile.BNS_HL_test_dag_O2 index c3f0268686..c1338bc4d3 100644 --- a/gstlal-inspiral/share/post_O2/Makefile.BNS_HL_test_dag_O2 +++ b/gstlal-inspiral/share/post_O2/Makefile.BNS_HL_test_dag_O2 @@ -341,7 +341,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_vetoes.xml : $(VETODEF) lauras_txt_files_to_xml H1-GATES-1163203217-24537601.txt L1-GATES-1163203217-24537601.txt @@ -352,14 +352,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_CAT1_vetoes.xml : $(VETODEF) diff --git a/gstlal-inspiral/share/post_O2/Makefile.offline_HLV_dag_O2_C02 b/gstlal-inspiral/share/post_O2/Makefile.offline_HLV_dag_O2_C02 index 811d79a641..90c5478c23 100644 --- a/gstlal-inspiral/share/post_O2/Makefile.offline_HLV_dag_O2_C02 +++ b/gstlal-inspiral/share/post_O2/Makefile.offline_HLV_dag_O2_C02 @@ -263,7 +263,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_vetoes.xml : $(VETODEF) @@ -276,14 +276,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_CAT1_vetoes.xml : $(VETODEF) diff --git a/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O1_C02 b/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O1_C02 index a30102efa0..1cacac1900 100644 --- a/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O1_C02 +++ b/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O1_C02 @@ -258,7 +258,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_vetoes.xml : $(VETODEF) @@ -267,14 +267,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_CAT1_vetoes.xml : $(VETODEF) diff --git a/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O2_C02 b/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O2_C02 index b288cc3a19..f218b3d2c1 100644 --- a/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O2_C02 +++ b/gstlal-inspiral/share/post_O2/Makefile.offline_dag_O2_C02 @@ -258,7 +258,7 @@ inj_tisi.xml : # Produce veto file vetoes.xml.gz : $(VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_vetoes.xml : $(VETODEF) lauras_txt_files_to_xml H1-GATES-1163203217-24537601.txt L1-GATES-1163203217-24537601.txt @@ -269,14 +269,14 @@ vetoes.xml.gz : $(VETOES_FILES) # Produce segments file segments.xml.gz : $(SEGMENTS_FILES) frame.cache CAT1_vetoes.xml.gz ligolw_add --ilwdchar-compat --output segdb.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segdb.xml gstlal_segments_operations --diff --output-file $@ segdb.xml CAT1_vetoes.xml.gz gstlal_segments_trim --trim $(SEGMENT_TRIM) --gps-start-time $(START) --gps-end-time $(STOP) --min-length $(SEGMENT_MIN_LENGTH) --output $@ $@ # Produce CAT1 veto file CAT1_vetoes.xml.gz : $(CAT1_VETOES_FILES) ligolw_add --ilwdchar-compat --output $@ $(CAT1_VETOES_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time $@ gzip $@ %_CAT1_vetoes.xml : $(VETODEF) diff --git a/gstlal-ugly/examples/configurations/BBH/triggers/Makefile b/gstlal-ugly/examples/configurations/BBH/triggers/Makefile index e56e97bc1a..be0dfad764 100644 --- a/gstlal-ugly/examples/configurations/BBH/triggers/Makefile +++ b/gstlal-ugly/examples/configurations/BBH/triggers/Makefile @@ -88,7 +88,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml %_injections.xml: lalapps_inspinj \ diff --git a/gstlal-ugly/examples/configurations/IIRinspiral/bank/Makefile b/gstlal-ugly/examples/configurations/IIRinspiral/bank/Makefile index ce203d8c8e..b72cad4413 100644 --- a/gstlal-ugly/examples/configurations/IIRinspiral/bank/Makefile +++ b/gstlal-ugly/examples/configurations/IIRinspiral/bank/Makefile @@ -117,7 +117,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml sql : cat uniqueify_coinc_definer.sql uniqueify_time_slide.sql > simplify.sql diff --git a/gstlal-ugly/examples/configurations/IIRinspiral/triggers/Makefile b/gstlal-ugly/examples/configurations/IIRinspiral/triggers/Makefile index b1af743f30..4381759554 100644 --- a/gstlal-ugly/examples/configurations/IIRinspiral/triggers/Makefile +++ b/gstlal-ugly/examples/configurations/IIRinspiral/triggers/Makefile @@ -93,7 +93,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml %_injections.xml: lalapps_inspinj \ diff --git a/gstlal-ugly/examples/configurations/LOW_MASS/S6/bank/Makefile b/gstlal-ugly/examples/configurations/LOW_MASS/S6/bank/Makefile index af7d28a8ff..34f94a1db5 100644 --- a/gstlal-ugly/examples/configurations/LOW_MASS/S6/bank/Makefile +++ b/gstlal-ugly/examples/configurations/LOW_MASS/S6/bank/Makefile @@ -127,7 +127,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml sql : cat uniqueify_coinc_definer.sql uniqueify_time_slide.sql > simplify.sql diff --git a/gstlal-ugly/examples/configurations/LOW_MASS/S6/triggers/Makefile b/gstlal-ugly/examples/configurations/LOW_MASS/S6/triggers/Makefile index 7cf58b732d..ac6b54c395 100644 --- a/gstlal-ugly/examples/configurations/LOW_MASS/S6/triggers/Makefile +++ b/gstlal-ugly/examples/configurations/LOW_MASS/S6/triggers/Makefile @@ -101,7 +101,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml %_injections.xml: gstlal_injections_by_local_rate \ diff --git a/gstlal-ugly/examples/configurations/LOW_MASS/bank/Makefile b/gstlal-ugly/examples/configurations/LOW_MASS/bank/Makefile index 645d57df80..35518c955a 100644 --- a/gstlal-ugly/examples/configurations/LOW_MASS/bank/Makefile +++ b/gstlal-ugly/examples/configurations/LOW_MASS/bank/Makefile @@ -116,7 +116,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml sql : cat uniqueify_coinc_definer.sql uniqueify_time_slide.sql > simplify.sql diff --git a/gstlal-ugly/examples/configurations/LOW_MASS/psd/Makefile b/gstlal-ugly/examples/configurations/LOW_MASS/psd/Makefile index 5203f6ad3a..3898afe742 100644 --- a/gstlal-ugly/examples/configurations/LOW_MASS/psd/Makefile +++ b/gstlal-ugly/examples/configurations/LOW_MASS/psd/Makefile @@ -49,7 +49,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml diff --git a/gstlal-ugly/examples/configurations/LOW_MASS/triggers/Makefile b/gstlal-ugly/examples/configurations/LOW_MASS/triggers/Makefile index bc27aa24c1..bb05045fd4 100644 --- a/gstlal-ugly/examples/configurations/LOW_MASS/triggers/Makefile +++ b/gstlal-ugly/examples/configurations/LOW_MASS/triggers/Makefile @@ -94,7 +94,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml %_injections.xml: gstlal_injections_by_local_rate \ diff --git a/gstlal-ugly/examples/configurations/NINJA2/bank/Makefile b/gstlal-ugly/examples/configurations/NINJA2/bank/Makefile index 2776278803..da975e0e7c 100644 --- a/gstlal-ugly/examples/configurations/NINJA2/bank/Makefile +++ b/gstlal-ugly/examples/configurations/NINJA2/bank/Makefile @@ -72,7 +72,7 @@ V1_segmentspadded.xml: segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml sql : cat uniqueify_coinc_definer.sql uniqueify_time_slide.sql > simplify.sql diff --git a/gstlal-ugly/examples/configurations/PBH/bank/Makefile b/gstlal-ugly/examples/configurations/PBH/bank/Makefile index 4d9c8fa13e..3ae1b0e3d9 100644 --- a/gstlal-ugly/examples/configurations/PBH/bank/Makefile +++ b/gstlal-ugly/examples/configurations/PBH/bank/Makefile @@ -113,7 +113,7 @@ H1_segmentspadded.xml: ligolw_segment_query --segment-url=https://metaserver.phy.syr.edu -q --gps-start-time ${PSDSTART} --gps-end-time ${PSDSTOP} --include-segments=$*:Science --result-name=datasegments > $*segments.xml ligolw_segments_compat $*segments.xml gstlal_segments_trim $*segments.xml --trim $(TRIM) --output $@ - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time --delete-column segment_definer:version $@ + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time --delete-column segment_definer:version $@ H1_frame.cache: cp $(H1_COH_CACHE) $@ @@ -130,7 +130,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml sql : cat uniqueify_coinc_definer.sql uniqueify_time_slide.sql > simplify.sql diff --git a/gstlal-ugly/examples/configurations/SPIIR/MDC1/triggers/Makefile b/gstlal-ugly/examples/configurations/SPIIR/MDC1/triggers/Makefile index b1af743f30..4381759554 100644 --- a/gstlal-ugly/examples/configurations/SPIIR/MDC1/triggers/Makefile +++ b/gstlal-ugly/examples/configurations/SPIIR/MDC1/triggers/Makefile @@ -93,7 +93,7 @@ frame.cache: $(FRAME_CACHE_FILES) segments.xml: $(SEGMENTS_FILES) ligolw_add --ilwdchar-compat --output segments.xml $(SEGMENTS_FILES) - ligolw_cut --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml + ligolw_cut --ilwdchar-compat --delete-column segment:segment_def_cdb --delete-column segment:creator_db --delete-column segment_definer:insertion_time segments.xml %_injections.xml: lalapps_inspinj \ -- GitLab