diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain
index f5c1f4726001e0b766ef9653b0747a69cadcb9fd..080c6d9c366fd7a5872f343732864644ea433f6e 100755
--- a/gstlal-calibration/bin/gstlal_compute_strain
+++ b/gstlal-calibration/bin/gstlal_compute_strain
@@ -465,7 +465,8 @@ try:
if src_pcal_line_freq > 10.0 and src_pcal_line_freq != act_pcal_line_freq:
pcal_line_removal_dict["pcal4_linefreq"] = [None, src_pcal_line_freq, pcal_corr_at_src_freq_real, pcal_corr_at_src_freq_imag, False]
elif src_pcal_line_freq == act_pcal_line_freq and "low_pcal_line_freq" in filters:
- pcal_line_removal_dict["pcal4_linefreq"] = [None, float(filters["low_pcal_line_freq"]), float(filters["low_pcal_corr_re"]), float(filters["low_pcal_corr_im"]), False]
+ if float(filters["low_pcal_line_freq"]) > 10.0:
+ pcal_line_removal_dict["pcal4_linefreq"] = [None, float(filters["low_pcal_line_freq"]), float(filters["low_pcal_corr_re"]), float(filters["low_pcal_corr_im"]), False]
except:
if compute_srcq or compute_fs:
diff --git a/gstlal-calibration/tests/check_calibration/ASD_plots b/gstlal-calibration/tests/check_calibration/ASD_plots
index 558e0a13223e5791d74353272c35a3147b8606d5..2a0196c5c375749040be9d39b932838402ce4afa 100755
--- a/gstlal-calibration/tests/check_calibration/ASD_plots
+++ b/gstlal-calibration/tests/check_calibration/ASD_plots
@@ -52,7 +52,7 @@ if options.analyze_additional_hoft_channel:
ax = plot.gca()
ax.set_ylabel('Strain [Hz $^{-1/2}$]', fontname = 'Times', fontsize = 18)
ax.set_xlabel('Frequency [Hz]', fontname = 'Times', fontsize = 18)
-ax.legend(['DCS-CALIB\_STRAIN', 'DCS-CALIB\_STRAIN\_CLEAN', r'DCS h(t) ASD'], loc='upper right', fontsize='small')
+ax.legend(['%s:GDS-CALIB\_STRAIN' % options.ifo, '%s:GDS-CALIB\_STRAIN\_CLEAN' % options.ifo, r'DCS h(t) ASD'], loc='upper right', fontsize='small')
ax.set_xlim(0.5,8192)
ax.set_ylim(1e-24,1e-16)
plot.save('%s_%s_%s_spectrum_comparison%s.png' % (options.ifo, start_time, end_time, options.filename_suffix))
diff --git a/gstlal-calibration/tests/check_calibration/Makefile b/gstlal-calibration/tests/check_calibration/Makefile
index 81c9861a7a206b5e9fbe0c052ae36c80124b53d7..20563ecce368a9ed65478a8901983ed2fa6edf6c 100644
--- a/gstlal-calibration/tests/check_calibration/Makefile
+++ b/gstlal-calibration/tests/check_calibration/Makefile
@@ -6,30 +6,31 @@
# which interferometer (H or L)
IFO = H
# determines where to look for filters files (e.g., O1, O2, O3, ER10, ER13, ER14, PreER10, PreER13, PreER14)
-OBSRUN = ER13
+OBSRUN = ER14
-START = $(shell echo 1231728640 - 715 | bc)
+START = $(shell echo 1232874910 - 415 | bc)
#1229094912
#1225967424
#1185763328
-END = $(shell echo 1231732736 + 715 | bc)
+END = $(shell echo 1232875986 + 415 | bc)
#1229099008
#1225968448
#1185771520
SHMRUNTIME = 400
# How much time does the calibration need to settle at the start and end?
-PLOT_WARMUP_TIME = 1715
-PLOT_COOLDOWN_TIME = 715
+PLOT_WARMUP_TIME = 425
+PLOT_COOLDOWN_TIME = 477
-GDSCONFIGS = Filters/ER13/GDSFilters/H1GDS_TEST_1231802073.ini
+GDSCONFIGS = Filters/ER13/GDSFilters/H1GDS_noisesub_test_1232874910.ini
DCSCONFIGS = Filters/ER13/GDSFilters/L1DCS_TEST_1231620000.ini
#../../config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
DCSFCCCONFIGS = ../../config_files/O2/H1/tests/H1DCS_FreqIndepAndFccCorrections_Cleaning.ini
GDSTESTCONFIGS = ../../config_files/PreER13/H1/H1GDS_TEST_1225558818.ini
DCSTESTCONFIGS = ../../config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning_TEST.ini
-GDSSHMCONFIGS = ../../config_files/PreER13/H1/tests/H1GDS_1222058826_shm2frames.ini
+GDSSHMCONFIGS = Filters/ER14/GDSFilters/H1GDS_1234630818_latency_test.ini
-all: noise_subtraction_ASD_GDS filters_tf_GDS noise_subtraction_tf_GDS
+all: latency_test
+#noise_subtraction_ASD_GDS noise_subtraction_tf_GDS filters_tf_GDS latency_test
###############################################
### These commands should change less often ###
@@ -107,10 +108,14 @@ pcal_DCS_transfer_functions: $(IFO)1_easy_raw_frames.cache $(IFO)1_hoft_DCS_fram
lines_ratio_DCS: $(IFO)1_hoft_DCS_frames.cache
python demod_ratio_timeseries.py --ifo $(IFO)1 --gps-end-time $(PLOT_END) --gps-start-time $(PLOT_START) --denominator-frame-cache $(IFO)1_hoft_DCS_frames.cache --numerator-frame-cache $(IFO)1_hoft_DCS_frames.cache --denominator-channel-name 'DCS-CALIB_STRAIN' --numerator-channel-name 'DCS-CALIB_STRAIN_CLEAN' --frequencies '35.9,36.7,331.9,1083.7;60,120,180' --magnitude-ranges '0.0,0.1;0.0,1.0' --phase-ranges '-180.0,180.0;-180.0,180.0' --plot-titles '$(IFO)1 Calibration Line Subtraction;$(IFO)1 Power Mains Line Subtraction'
+filters_tf_GDS: $(IFO)1_hoft_GDS_frames.cache
+ python plot_filters_transfer_function.py --tf-frequency-min 0.5 --tf-frequency-max 8192 --ratio-frequency-min 10 --ratio-frequency-max 8192 --ratio-magnitude-min 0.7 --ratio-magnitude-max 1.3 --tf-phase-min -180 --tf-phase-max 180 --ratio-phase-min -20 --ratio-phase-max 20
+
filters_tf_DCS: $(IFO)1_hoft_DCS_frames.cache
python plot_filters_transfer_function.py --tf-frequency-min 0.5 --tf-frequency-max 8192 --ratio-frequency-min 10 --ratio-frequency-max 8192 --ratio-magnitude-min 0.7 --ratio-magnitude-max 1.3 --tf-phase-min -180 --tf-phase-max 180 --ratio-phase-min -20 --ratio-phase-max 20
-latency_test: $(IFO)1_hoft_GDS_SHM_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'
CALCS_GDS_ASD: $(IFO)1_hoft_GDS_frames.cache $(IFO)1_easy_raw_frames.cache
@@ -129,7 +134,7 @@ noise_subtraction_ASD_DCS: $(IFO)1_hoft_DCS_frames.cache
./ASD_comparison_plots --ifo $(IFO)1 --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --raw-frame-cache $(IFO)1_hoft_DCS_frames.cache --calcs-channel-name DCS-CALIB_STRAIN --hoft-frame-cache $(IFO)1_hoft_DCS_frames.cache --hoft-channel-name DCS-CALIB_STRAIN_CLEAN
noise_subtraction_ASD_GDS: $(IFO)1_hoft_GDS_frames.cache
- ./ASD_comparison_plots --ifo $(IFO)1 --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --raw-frame-cache $(IFO)1_hoft_GDS_frames.cache --calcs-channel-name GDS-CALIB_STRAIN --hoft-frame-cache $(IFO)1_hoft_GDS_frames.cache --hoft-channel-name GDS-CALIB_STRAIN_CLEAN
+ ./ASD_plots --ifo $(IFO)1 --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --raw-frame-cache $(IFO)1_hoft_GDS_frames.cache --calcs-channel-name GDS-CALIB_STRAIN --hoft-frame-cache $(IFO)1_hoft_GDS_frames.cache --hoft-channel-name GDS-CALIB_STRAIN_CLEAN
noise_subtraction_ASD_DCH_DCS: $(IFO)1_hoft_DCS_frames.cache $(IFO)1_clean_C02_frames.cache
./ASD_comparison_plots --ifo $(IFO)1 --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --raw-frame-cache $(IFO)1_clean_C02_frames.cache --calcs-channel-name DCH-CLEAN_STRAIN_C02 --hoft-frame-cache $(IFO)1_hoft_DCS_frames.cache --hoft-channel-name DCS-CALIB_STRAIN_CLEAN
diff --git a/gstlal-calibration/tests/check_calibration/latency_plot.py b/gstlal-calibration/tests/check_calibration/latency_plot.py
index 4f1f3753da2667cd0212321608aeedb2c6236afb..f5de5d67cc0309ecc183c3967656b48df2ad8cbe 100644
--- a/gstlal-calibration/tests/check_calibration/latency_plot.py
+++ b/gstlal-calibration/tests/check_calibration/latency_plot.py
@@ -85,6 +85,7 @@ plt.ylabel('Latency [s]')
plt.xlabel('Time in %s since %s UTC' % (t_unit, time.strftime("%b %d %Y %H:%M:%S", time.gmtime(t_start + 315964782))))
plt.ylim(0, 8)
plt.grid(True)
+plt.savefig('%s_%d-%d.png' % (options.plot_filename_prefix, int(t_start), int(dur)))
plt.savefig('%s_%d-%d.pdf' % (options.plot_filename_prefix, int(t_start), int(dur)))
diff --git a/gstlal-calibration/tests/check_calibration/plot_filters_transfer_function.py b/gstlal-calibration/tests/check_calibration/plot_filters_transfer_function.py
index 8cf162e14554471685d21d5a724f830c0bcbeea1..9a21ca31f62a7f7b11512b40b822931fb25c1cd1 100644
--- a/gstlal-calibration/tests/check_calibration/plot_filters_transfer_function.py
+++ b/gstlal-calibration/tests/check_calibration/plot_filters_transfer_function.py
@@ -42,7 +42,8 @@ from optparse import OptionParser, Option
parser = OptionParser()
parser.add_option("--tf-file-directory", metavar = "directory", default = '.', help = "location of txt files with transfer functions (Default is current directory, '.')")
-parser.add_option("--model-jump-delay", metavar = "seconds", type = float, default = 0.000061035, help = "Time delay in time-stamping DARM_ERR (Default is one 16384-Hz clock cycle)")
+parser.add_option("--response-model-jump-delay", metavar = "seconds", type = float, default = 0.000061035, help = "Time delay in time-stamping DARM_ERR (Default is one 16384-Hz clock cycle)")
+parser.add_option("--filters-model-jump-delay", metavar = "seconds", type = float, default = 0.0, help = "Any time delay in time-stamping DARM_ERR not contained in the model in the filters file (Default is 0.0 seconds).")
parser.add_option("--tf-frequency-min", type = float, default = -1, help = "Minimum frequency for transfer function plots (Default is to disable)")
parser.add_option("--tf-frequency-max", type = float, default = -1, help = "Maximum frequency for transfer function plots (Default is to disable)")
parser.add_option("--tf-frequency-scale", default = "log", help = "Frequency scale for transfer function plots (linear or log, default is log)")
@@ -95,6 +96,7 @@ for tf_file in tf_files:
print "Loading calibration filters from %s\n" % filters_paths[0]
filters = numpy.load(filters_paths[0])
+ model_jump_delay = options.filters_model_jump_delay
# Determine what transfer function this is
if '_tst_' in tf_file and 'DCS' in tf_file:
plot_title = "TST Transfer Function"
@@ -129,6 +131,7 @@ for tf_file in tf_files:
elif '_response_' in tf_file:
plot_title = "Response Function"
model_name = "response_function" if "response_function" in filters else None
+ model_jump_delay = options.response_model_jump_delay
else:
plot_title = "Transfer Function"
model_name = None
@@ -159,7 +162,7 @@ for tf_file in tf_files:
df = data[1][0] - data[0][0] # frequency spacing
for j in range(0, len(data)):
frequency.append(data[j][0])
- tf_at_f = (data[j][1] + 1j * data[j][2]) * numpy.exp(-2j * numpy.pi * data[j][0] * options.model_jump_delay)
+ tf_at_f = (data[j][1] + 1j * data[j][2]) * numpy.exp(-2j * numpy.pi * data[j][0] * model_jump_delay)
filters_tf.append(tf_at_f)
magnitude.append(abs(tf_at_f))
phase.append(numpy.angle(tf_at_f) * 180.0 / numpy.pi)