gstlal-calibration: Fixed typos in config file

gstlal-calibration/config_files/PreER13/H1/tests/H1GDS_1222058826_shm2frames.ini

@@ -177,8 +177,8 @@ ActuationFilterTaperLength: 32768
 #############################
 # Calibration Channel Names #
 #############################
-DARMCtrlChannel: CAL-DARM_CTRL_WHITEN_OUT_DBL_DQ
-DARMErrChannel: CAL-DARM_ERR_WHITEN_OUT_DBL_DQ
+DARMCtrlChannel: CAL-DARM_CTRL_DBL_DQ
+DARMErrChannel: CAL-DARM_ERR_DBL_DQ
 DeltaLTSTChannel: CAL-DELTAL_CTRL_TST_DBL_DQ
 DeltaLPUMChannel: CAL-DELTAL_CTRL_PUM_DBL_DQ
 DeltaLUIMChannel: CAL-DELTAL_CTRL_UIM_DBL_DQ
@@ -199,9 +199,12 @@ PCALChannel: CAL-PCALY_TX_PD_OUT_DQ
 # Coherence Uncertainty Channel Names #
 #######################################
 CohUncSusLine1Channel: CAL-CS_TDEP_SUS_LINE1_UNCERTAINTY
-CohUncPcalyLine1Channel: CAL-CS_TDEP_PCALY_LINE1_UNCERTAINTY
-CohUncPcalyLine2Channel: CAL-CS_TDEP_PCALY_LINE2_UNCERTAINTY
-CohUncDARMLine1Channel: CAL-CS_TDEP_DARM_LINE1_UNCERTAINTY
+CohUncSusLine2Channel: CAL-CS_TDEP_SUS_LINE2_UNCERTAINTY
+CohUncSusLine3Channel: CAL-CS_TDEP_SUS_LINE3_UNCERTAINTY
+CohUncPcalyLine1Channel: CAL-CS_TDEP_PCAL_LINE1_UNCERTAINTY
+CohUncPcalyLine2Channel: CAL-CS_TDEP_PCAL_LINE2_UNCERTAINTY
+# FIXME: This is a hack. gstlal_compute_strain needs to not require this channel in the next release!
+CohUncDARMLine1Channel: CAL-CS_TDEP_SUS_LINE3_UNCERTAINTY
 ###################################
 # Noise Subtraction Channel Names #
 ###################################
@@ -235,7 +238,7 @@ EP10ImagChannel: CAL-CS_TDEP_SUS_LINE3_REF_A_TST_NOLOCK_IMAG
 EP11RealChannel: CAL-CS_TDEP_PCAL_LINE4_REF_C_NOCAVPOLE_REAL
 EP11ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_C_NOCAVPOLE_IMAG
 EP12RealChannel: CAL-CS_TDEP_PCAL_LINE4_REF_D_REAL
-EP12ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_D_REAL
+EP12ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_D_IMAG
 EP13RealChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_TST_REAL
 EP13ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_TST_IMAG
 EP14RealChannel: CAL-CS_TDEP_PCALY_LINE4_REF_A_USUM_REAL
@@ -249,11 +252,11 @@ EP17ImagChannel: CAL-CS_TDEP_DARM_LINE1_REF_A_PUM_IMAG
 EP18RealChannel: CAL-CS_TDEP_PCAL_LINE2_REF_A_PUM_REAL
 EP18ImagChannel: CAL-CS_TDEP_PCAL_LINE2_REF_A_PUM_IMAG
 EP19RealChannel: CAL-CS_TDEP_PCAL_LINE2_REF_A_UIM_REAL
-EP19ImagChannel: CAL-CS_TDEP_PCAL_LINE2_REF_A_UIM_REAL
+EP19ImagChannel: CAL-CS_TDEP_PCAL_LINE2_REF_A_UIM_IMAG
 EP20RealChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_PUM_REAL
 EP20ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_PUM_IMAG
 EP21RealChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_UIM_REAL
-EP21ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_UIM_REAL
+EP21ImagChannel: CAL-CS_TDEP_PCAL_LINE4_REF_A_UIM_IMAG
 EP22RealChannel: CAL-CS_TDEP_SUS_LINE1_REF_INVA_UIM_RESPRATIO_REAL
 EP22ImagChannel: CAL-CS_TDEP_SUS_LINE1_REF_INVA_UIM_RESPRATIO_IMAG
 EP23RealChannel: CAL-CS_TDEP_PUM_LINE1_REF_A_PUM_NOLOCK_REAL
@@ -311,7 +314,7 @@ FilterLatency: 0.0
 # Remove the DC component from the residual and control channels before filtering
 RemoveDC: No
 # Subtract the calibration lines from the h(t) spectrum
-RemoveCalLines: Yes
+RemoveCalLines: No
 # Subtract the power lines from the h(t) spectrum
 RemovePowerLines: Yes
 #########################################

gstlal-calibration/tests/test_common.py

@@ -73,14 +73,14 @@ def int_test_src(pipeline, buffer_length = 1.0, rate = 2048, width = 64, channel
 		head = pipeparts.mkprogressreport(pipeline, head, "src")
 	return head
 
-def test_src(pipeline, buffer_length = 1.0, rate = 2048, width = 64, channels = 1, test_duration = 10.0, wave = 5, freq = 0, volume = 1, is_live = False, verbose = True):
+def test_src(pipeline, buffer_length = 1.0, rate = 2048, width = 64, channels = 1, test_duration = 10.0, wave = 5, freq = 0, volume = 1, is_live = False, verbose = True, src_suffix = ""):
 	if wave == "ligo":
 		head = pipeparts.mkfakeLIGOsrc(pipeline, instrument = "H1", channel_name = "LSC-STRAIN")
 	else:
 		head = pipeparts.mkaudiotestsrc(pipeline, wave = wave, freq = freq, volume = volume, samplesperbuffer = int(buffer_length * rate), num_buffers = int(test_duration / buffer_length), is_live = is_live)
 		head = pipeparts.mkcapsfilter(pipeline, head, "audio/x-raw, format=F%d%s, rate=%d, channels=%d, channel-mask=(bitmask)0x0" % (width, BYTE_ORDER, rate, channels))
 	if verbose:
-		head = pipeparts.mkprogressreport(pipeline, head, "src")
+		head = pipeparts.mkprogressreport(pipeline, head, "src%s" % src_suffix)
 	return head