diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain
index af0c237429d779f0706f5aa4daf15b8d3fc7ffe3..763811ea9c308989473c039bfa1623c5b73eef68 100755
--- a/gstlal-calibration/bin/gstlal_compute_strain
+++ b/gstlal-calibration/bin/gstlal_compute_strain
@@ -676,8 +676,6 @@ if not factors_from_filters_file or compute_calib_statevector:
if compute_kappauim or (not compute_kappapu and (compute_kappac or compute_fcc or compute_fs or compute_srcq)):
channel_list.extend(((instrument, ChannelNames["ep22realchannel"]), (instrument, ChannelNames["ep22imagchannel"])))
headkeys.extend(("EP22_real", "EP22_imag"))
- channel_list.extend(((instrument, ChannelNames["ep2realchannel"]), (instrument, ChannelNames["ep2imagchannel"]), (instrument, ChannelNames["ep4realchannel"]), (instrument, ChannelNames["ep4imagchannel"]), (instrument, ChannelNames["ep16realchannel"]), (instrument, ChannelNames["ep16imagchannel"]), (instrument, ChannelNames["ep17realchannel"]), (instrument, ChannelNames["ep17imagchannel"])))
- headkeys.extend(("EP2_real", "EP2_imag", "EP4_real", "EP4_imag", "EP16_real", "EP16_imag", "EP17_real", "EP17_imag"))
# These are needed for kappa_PU
if compute_kappapu:
channel_list.extend(((instrument, ChannelNames["ep2realchannel"]), (instrument, ChannelNames["ep2imagchannel"]), (instrument, ChannelNames["ep3realchannel"]), (instrument, ChannelNames["ep3imagchannel"]), (instrument, ChannelNames["ep4realchannel"]), (instrument, ChannelNames["ep4imagchannel"])))
@@ -724,10 +722,10 @@ if use_coherence:
channel_list.append((instrument, ChannelNames["cohuncdarmline1channel"]))
headkeys.append("darm_coh")
if compute_kappapum or (not compute_kappapu and (compute_kappac or compute_fcc or compute_fs or compute_srcq)):
- channel_list.append((instrument, "cohuncsusline2channel"))
+ channel_list.append((instrument, ChannelNames["cohuncsusline2channel"]))
headkeys.append("sus_line2_coh")
if compute_kappauim or (not compute_kappapu and (compute_kappac or compute_fcc or compute_fs or compute_srcq)):
- channel_list.append((instrument, "cohuncsusline1channel"))
+ channel_list.append((instrument, ChannelNames["cohuncsusline1channel"]))
headkeys.append("sus_line1_coh")
if compute_kappac or compute_fcc or compute_fs or compute_srcq:
channel_list.append((instrument, ChannelNames["cohuncpcalyline2channel"]))
@@ -1077,7 +1075,7 @@ if compute_kappauim or (not compute_kappapu and (compute_kappac or compute_fcc o
# Gate kappa_uim with the coherence of the PCALY_line1 line
kuim_gated = calibration_parts.mkgate(pipeline, kuim, pcaly_line1_coh, coherence_unc_threshold, attack_length = kappa_gate_attack_length, hold_length = kappa_gate_hold_length, invert_control = True, name = 'kuimgate1')
# Gate kappa_uim with the coherence of the UIM (L1) suspension line
- kuim_gated = calibration_parts.mkgate(pipeline, kuim_gated, sus_line1_coh, coherence_unc_threshold, attack_length = kappa_gate_attack_length, hold_length = kappa_gate_hold_length, invert_control = True, name = 'kuimgate1')
+ kuim_gated = calibration_parts.mkgate(pipeline, kuim_gated, sus_line1_coh, coherence_unc_threshold, attack_length = kappa_gate_attack_length, hold_length = kappa_gate_hold_length, invert_control = True, name = 'kuimgate2')
# Smooth kappa_uim
smooth_kuim = calibration_parts.smooth_complex_kappas(pipeline, kuim_gated, expected_kappauim_real, expected_kappauim_imag, median_smoothing_samples, factors_average_samples, tdcf_default_to_median, filter_latency_factor)
diff --git a/gstlal-calibration/debian/gstlal-calibration.install b/gstlal-calibration/debian/gstlal-calibration.install
index eb5590ab238411555da8ed317706a3497b4dd840..a623e25794f03f70fbb6188e275b477f64cee8b4 100644
--- a/gstlal-calibration/debian/gstlal-calibration.install
+++ b/gstlal-calibration/debian/gstlal-calibration.install
@@ -1,4 +1,5 @@
usr/bin/*
usr/lib/gstreamer-*/lib*.a
-usr/lib/gstreamer-*/lib*.so
-usr/lib/python*/site-packages/gstlal
+#usr/lib/gstreamer-*/lib*.la
+usr/lib/gstreamer-*/lib*.so*
+usr/lib/python*/*-packages/gstlal
diff --git a/gstlal-calibration/tests/check_calibration/Makefile b/gstlal-calibration/tests/check_calibration/Makefile
index ec045710206e5650f02c643eb6070ad6ebae9c8a..4ca031d119843df51d42be73861d1ce4891f3dd9 100644
--- a/gstlal-calibration/tests/check_calibration/Makefile
+++ b/gstlal-calibration/tests/check_calibration/Makefile
@@ -8,21 +8,21 @@ IFO = H
# determines where to look for filters files (e.g., O1, O2, O3, ER10, ER13, ER14, PreER10, PreER13, PreER14)
OBSRUN = O2
-START = 1186944000
-END = 1186945024
+START = 1225519232
+END = 1225520256
SHMRUNTIME = 400
# How much time does the calibration need to settle at the start and end?
PLOT_WARMUP_TIME = 300
PLOT_COOLDOWN_TIME = 64
-GDSCONFIGS = ../../config_files/PreER13/L1/tests/L1GDS_1222058826_frames.ini
+GDSCONFIGS = ../../config_files/PreER13/H1/C00/H1GDS_FRAMES_1225558818.ini
DCSCONFIGS = ../../config_files/O2/H1/tests/H1DCS_FreqIndepCorrections_Cleaning.ini
DCSFCCCONFIGS = ../../config_files/O2/H1/tests/H1DCS_FreqIndepAndFccCorrections_Cleaning.ini
-GDSTESTCONFIGS = ../../config_files/O2/H1/tests/H1GDS_LowLatency_AllCorrections_Cleaning.ini
+GDSTESTCONFIGS = ../../config_files/PreER13/H1/H1GDS_TEST_1225558818.ini
DCSTESTCONFIGS = ../../config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
GDSSHMCONFIGS = ../../config_files/PreER13/H1/tests/H1GDS_1222058826_shm2frames.ini
-all: DCS_over_C02
+all: GDS_over_CALCS
###############################################
### These commands should change less often ###
@@ -89,11 +89,13 @@ lines_ratio_DCS: $(IFO)1_hoft_DCS_frames.cache
latency_test: $(IFO)1_hoft_GDS_SHM_frames.cache
python latency_plot.py --intime-file gstlal_compute_strain_timestamps_in.txt --outtime-file gstlal_compute_strain_timestamps_out.txt --plot-filename-prefix $(IFO)1GDS_latency --plot-title '$(IFO)1 Calibration Latency vs Time'
+GDS_over_CALCS: $(IFO)1_hoft_GDS_frames.cache $(IFO)1_easy_raw_frames.cache
+ python plot_transfer_function.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --denominator-frame-cache $(IFO)1_easy_raw_frames.cache --denominator-channel-name CAL-DELTAL_EXTERNAL_DQ --denominator-name 'CALCS' --numerator-frame-cache-list $(IFO)1_hoft_GDS_frames.cache --numerator-channel-list GDS-CALIB_STRAIN --numerator-name 'GDS' --use-median --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --labels 'GDS / CALCS'
+
GDS_over_C02: $(IFO)1_hoft_GDS_frames.cache $(IFO)1_C02_frames.cache
python plot_transfer_function.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --denominator-frame-cache $(IFO)1_C02_frames.cache --denominator-channel-name DCS-CALIB_STRAIN_C02 --denominator-name 'C02' --numerator-frame-cache-list $(IFO)1_hoft_GDS_frames.cache --numerator-channel-list GDS-CALIB_STRAIN --numerator-name 'GDS' --use-median --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --labels 'GDS / C02'
-DCS_over_C02:
- #$(IFO)1_hoft_DCS_FCC_frames.cache $(IFO)1_C02_frames.cache
+DCS_over_C02: $(IFO)1_hoft_DCS_FCC_frames.cache $(IFO)1_C02_frames.cache
python plot_transfer_function.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --denominator-frame-cache $(IFO)1_C02_frames.cache --denominator-channel-name DCS-CALIB_STRAIN_C02 --denominator-name 'C02' --numerator-frame-cache-list $(IFO)1_hoft_DCS_FCC_frames.cache --numerator-channel-list DCS-CALIB_STRAIN --numerator-name 'DCS' --use-median --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --labels 'DCS / C02'
noise_subtraction_tf_DCS: $(IFO)1_hoft_DCS_frames.cache
diff --git a/gstlal-calibration/tests/check_calibration/frame_manipulator.py b/gstlal-calibration/tests/check_calibration/frame_manipulator.py
index 09d418f62cab2c4a9a84ab00f3b2e9015cd4f930..7df4bdad1279b7e328c948ffc768f19eaa3dcd1a 100644
--- a/gstlal-calibration/tests/check_calibration/frame_manipulator.py
+++ b/gstlal-calibration/tests/check_calibration/frame_manipulator.py
@@ -178,6 +178,8 @@ channel_list.append("CAL-CS_TDEP_PCALY_LINE4_REF_A_USUM_REAL")
channel_list.append("CAL-CS_TDEP_PCALY_LINE4_REF_A_USUM_IMAG")
channel_list.append("CAL-DARM_CTRL_WHITEN_OUT_DBL_DQ")
channel_list.append("CAL-DARM_ERR_WHITEN_OUT_DBL_DQ")
+channel_list.append("CAL-DELTAL_EXTERNAL_DQ")
+channel_list.append("CAL-CFTD_DELTAL_EXTERNAL_DQ")
channel_list.append("CAL-DELTAL_CTRL_TST_DBL_DQ")
channel_list.append("CAL-DELTAL_CTRL_PUM_DBL_DQ")
channel_list.append("CAL-DELTAL_CTRL_UIM_DBL_DQ")