gstlal-calibration: fixed muxer bug in frame_manipulator.py

gstlal-calibration/tests/check_calibration/frame_manipulator.py

@@ -144,9 +144,16 @@ channel_list.append("CAL-CS_TDEP_PCALY_LINE1_UNCERTAINTY")
 channel_list.append("CAL-CS_TDEP_PCALY_LINE2_UNCERTAINTY")
 channel_list.append("CAL-CS_TDEP_DARM_LINE1_UNCERTAINTY")
 channel_list.append("CAL-CS_LINE_SUM_DQ")
+channel_list.append("SUS-ETMY_L1_CAL_LINE_OUT_DQ")
+channel_list.append("SUS-ETMY_L2_CAL_LINE_OUT_DQ")
 channel_list.append("SUS-ETMY_L3_CAL_LINE_OUT_DQ")
 channel_list.append("CAL-PCALY_RX_PD_OUT_DQ")
 channel_list.append("CAL-PCALY_TX_PD_OUT_DQ")
+channel_list.append("SUS-ETMY_L1_CAL_LINE_FREQ")
+channel_list.append("SUS-ETMY_L2_CAL_LINE_FREQ")
+channel_list.append("SUS-ETMY_L3_CAL_LINE_FREQ")
+channel_list.append("CAL-CS_TDEP_CAVITY_POLE_PCAL_FREQ")
+channel_list.append("CAL-CS_TDEP_D2N_SPRING_PCAL_FREQ")
 channel_list.append("PEM-EY_MAINSMON_EBAY_1_DQ")
 channel_list.append("CAL-CS_TDEP_REF_INVA_CLGRATIO_TST_REAL")
 channel_list.append("CAL-CS_TDEP_REF_INVA_CLGRATIO_TST_IMAG")
@@ -235,8 +242,6 @@ channel_list.append("CAL-CS_TDEP_PCAL_LINE4_REF_D_REAL")
 channel_list.append("CAL-CS_TDEP_PCAL_LINE4_UNCERTAINTY")
 channel_list.append("CAL-DARM_CTRL_DBL_DQ")
 channel_list.append("CAL-DARM_ERR_DBL_DQ")
-channel_list.append("SUS-ETMY_L1_CAL_LINE_OUT_DQ")
-channel_list.append("SUS-ETMY_L2_CAL_LINE_OUT_DQ")
 channel_list.append("CAL-CS_TDEP_SUS_LINE2_UNCERTAINTY")
 channel_list.append("CAL-CS_TDEP_SUS_LINE3_UNCERTAINTY")
 channel_list.append("GRD-ISC_LOCK_OK")
@@ -268,16 +273,13 @@ def frame_manipulator(pipeline, name):
 	demux = pipeparts.mkframecppchanneldemux(pipeline, src, do_file_checksum = False, skip_bad_files = True, channel_list = map("%s:%s".__mod__, ifo_channel_list))
 
 	# Make a muxer to collect the channels we need
-	mux = pipeparts.mkframecppchannelmux(pipeline, None)
-	mux.set_property("frame-duration", frame_length)
-	mux.set_property("frames-per-file", frames_per_file)
-	mux.set_property("compression-scheme", 6)
-	mux.set_property("compression-level", 3)
-
+	channelmux_input_dict = {}
 	for key, chan in zip(channel_list, channel_list):
 		head_dict[key] = calibration_parts.hook_up(pipeline, demux, chan, ifo, 1.0)
 		head_dict[key] = pipeparts.mkprogressreport(pipeline, head_dict[key], "before muxer %s" % key)
-		calibration_parts.mkqueue(pipeline, head_dict[key]).get_static_pad("src").link(mux.get_request_pad("%s:%s" % (ifo, chan)))
+		channelmux_input_dict["%s:%s" % (ifo, chan)] = calibration_parts.mkqueue(pipeline, head_dict[key])
+
+	mux = pipeparts.mkframecppchannelmux(pipeline, channelmux_input_dict, frame_duration = frame_length, frames_per_file = frames_per_file, compression_scheme = 6, compression_level = 3)
 
 	mux = pipeparts.mkprogressreport(pipeline, mux, "end")
 	pipeparts.mkframecppfilesink(pipeline, mux, frame_type = frame_type, path = output_path, instrument = ifo)