frame_manipulator.py: more flexible handling of output path with txt file names

tests/check_calibration/Makefile

@@ -300,18 +300,18 @@ kappastimeseries_GDS: $(IFO)1_hoft_GDS_frames.cache $(IFO)1_easy_raw_frames.cach
 	python3 timeserieskappas.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache $(IFO)1_hoft_GDS_frames.cache --channel-list 'GDS-CALIB_KAPPA_TST_REAL_NOGATE','GDS-CALIB_KAPPA_TST_IMAGINARY_NOGATE','GDS-CALIB_KAPPA_PUM_REAL_NOGATE','GDS-CALIB_KAPPA_PUM_IMAGINARY_NOGATE','GDS-CALIB_KAPPA_UIM_REAL_NOGATE','GDS-CALIB_KAPPA_UIM_IMAGINARY_NOGATE','GDS-CALIB_KAPPA_C_NOGATE','GDS-CALIB_F_CC_NOGATE' --raw-channel-list 'CAL-CS_TDEP_KAPPA_TST_REAL_OUTPUT','CAL-CS_TDEP_KAPPA_TST_IMAG_OUTPUT','CAL-CS_TDEP_KAPPA_PUM_REAL_OUTPUT','CAL-CS_TDEP_KAPPA_PUM_IMAG_OUTPUT','CAL-CS_TDEP_KAPPA_UIM_REAL_OUTPUT','CAL-CS_TDEP_KAPPA_UIM_IMAG_OUTPUT','CAL-CS_TDEP_KAPPA_C_OUTPUT','CAL-CS_TDEP_F_C_OUTPUT' --raw-frame-cache $(IFO)1_easy_raw_frames.cache
 
 exactkappastimeseries:
-	$(IFO)1_hoft_DCS_APPROXKAPPAS_frames.cache $(IFO)1_hoft_DCS_EXACTKAPPAS_frames.cache
-	python3 frame_manipulator.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache $(IFO)1_hoft_DCS_EXACTKAPPAS_frames.cache --output-path txt --channel-list 'DCS-CALIB_KAPPA_TST_REALEXACTKAPPAS,DCS-CALIB_KAPPA_TST_IMAGINARYEXACTKAPPAS,DCS-CALIB_KAPPA_PUM_REALEXACTKAPPAS,DCS-CALIB_KAPPA_PUM_IMAGINARYEXACTKAPPAS,DCS-CALIB_KAPPA_UIM_REALEXACTKAPPAS,DCS-CALIB_KAPPA_UIM_IMAGINARYEXACTKAPPAS,DCS-CALIB_KAPPA_CEXACTKAPPAS,DCS-CALIB_F_CCEXACTKAPPAS,DCS-CALIB_F_S_SQUAREDEXACTKAPPAS,DCS-CALIB_SRC_Q_INVERSEEXACTKAPPAS'
-	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_TST_REALEXACTKAPPAS.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_TST_IMAGINARYEXACTKAPPAS.txt --config-file $(DCSEXACTKAPPASCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_TST_EXACTKAPPAS.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_TST_EXACTKAPPAS.txt
-	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_REALEXACTKAPPAS.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_IMAGINARYEXACTKAPPAS.txt --config-file $(DCSEXACTKAPPASCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_PUM_EXACTKAPPAS.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_PUM_EXACTKAPPAS.txt
-	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_REALEXACTKAPPAS.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_IMAGINARYEXACTKAPPAS.txt --config-file $(DCSEXACTKAPPASCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_UIM_EXACTKAPPAS.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_UIM_EXACTKAPPAS.txt
-	python3 compute_fs_over_Q.py --fs-squared-txt $(IFO)1-DCS-CALIB_F_S_SQUAREDEXACTKAPPAS.txt --Qinv-txt $(IFO)1-DCS-CALIB_SRC_Q_INVERSEEXACTKAPPAS.txt --filename $(IFO)1-DCS-CALIB_F_S_OVER_QEXACTKAPPAS.txt
-	python3 frame_manipulator.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache $(IFO)1_hoft_DCS_APPROXKAPPAS_frames.cache --output-path txt --channel-list 'DCS-CALIB_KAPPA_TST_REALAPPROXKAPPAS,DCS-CALIB_KAPPA_TST_IMAGINARYAPPROXKAPPAS,DCS-CALIB_KAPPA_PUM_REALAPPROXKAPPAS,DCS-CALIB_KAPPA_PUM_IMAGINARYAPPROXKAPPAS,DCS-CALIB_KAPPA_UIM_REALAPPROXKAPPAS,DCS-CALIB_KAPPA_UIM_IMAGINARYAPPROXKAPPAS,DCS-CALIB_KAPPA_CAPPROXKAPPAS,DCS-CALIB_F_CCAPPROXKAPPAS,DCS-CALIB_F_S_SQUAREDAPPROXKAPPAS,DCS-CALIB_SRC_Q_INVERSEAPPROXKAPPAS'
-	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_TST_REALAPPROXKAPPAS.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_TST_IMAGINARYAPPROXKAPPAS.txt --config-file $(DCSAPPROXKAPPASCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_TST_APPROXKAPPAS.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_TST_APPROXKAPPAS.txt
-	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_REALAPPROXKAPPAS.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_IMAGINARYAPPROXKAPPAS.txt --config-file $(DCSAPPROXKAPPASCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_PUM_APPROXKAPPAS.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_PUM_APPROXKAPPAS.txt
-	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_REALAPPROXKAPPAS.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_IMAGINARYAPPROXKAPPAS.txt --config-file $(DCSAPPROXKAPPASCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_UIM_APPROXKAPPAS.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_UIM_APPROXKAPPAS.txt
-	python3 compute_fs_over_Q.py --fs-squared-txt $(IFO)1-DCS-CALIB_F_S_SQUAREDAPPROXKAPPAS.txt --Qinv-txt $(IFO)1-DCS-CALIB_SRC_Q_INVERSEAPPROXKAPPAS.txt --filename $(IFO)1-DCS-CALIB_F_S_OVER_QAPPROXKAPPAS.txt
-	python3 plot_kappas_from_txt.py --txt-list '$(IFO)1-DCS-CALIB_KAPPA_TST_APPROXKAPPAS.txt,$(IFO)1-DCS-CALIB_KAPPA_PUM_APPROXKAPPAS.txt,$(IFO)1-DCS-CALIB_KAPPA_UIM_APPROXKAPPAS.txt;$(IFO)1-DCS-CALIB_KAPPA_TST_EXACTKAPPAS.txt,$(IFO)1-DCS-CALIB_KAPPA_PUM_EXACTKAPPAS.txt,$(IFO)1-DCS-CALIB_KAPPA_UIM_EXACTKAPPAS.txt:$(IFO)1-DCS-CALIB_TAU_TST_APPROXKAPPAS.txt,$(IFO)1-DCS-CALIB_TAU_PUM_APPROXKAPPAS.txt,$(IFO)1-DCS-CALIB_TAU_UIM_APPROXKAPPAS.txt;$(IFO)1-DCS-CALIB_TAU_TST_EXACTKAPPAS.txt,$(IFO)1-DCS-CALIB_TAU_PUM_EXACTKAPPAS.txt,$(IFO)1-DCS-CALIB_TAU_UIM_EXACTKAPPAS.txt:$(IFO)1-DCS-CALIB_KAPPA_CAPPROXKAPPAS.txt;$(IFO)1-DCS-CALIB_KAPPA_CEXACTKAPPAS.txt|$(IFO)1-DCS-CALIB_F_CCAPPROXKAPPAS.txt;$(IFO)1-DCS-CALIB_F_CCEXACTKAPPAS.txt:$(IFO)1-DCS-CALIB_F_S_SQUAREDAPPROXKAPPAS.txt;$(IFO)1-DCS-CALIB_F_S_SQUAREDEXACTKAPPAS.txt|$(IFO)1-DCS-CALIB_F_S_OVER_QAPPROXKAPPAS.txt;$(IFO)1-DCS-CALIB_F_S_OVER_QEXACTKAPPAS.txt' --labels 'Approx;Exact' --filename TDCFs
+	#$(IFO)1_hoft_DCS_ALLCORR_frames.cache $(IFO)1_hoft_DCS_ALLCORREXACT_frames.cache
+	python3 frame_manipulator.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache $(IFO)1_hoft_DCS_ALLCORREXACT_frames.cache --output-path '_exact.txt' --channel-list 'DCS-CALIB_KAPPA_TST_REAL,DCS-CALIB_KAPPA_TST_IMAGINARY,DCS-CALIB_KAPPA_PUM_REAL,DCS-CALIB_KAPPA_PUM_IMAGINARY,DCS-CALIB_KAPPA_UIM_REAL,DCS-CALIB_KAPPA_UIM_IMAGINARY,DCS-CALIB_KAPPA_C,DCS-CALIB_F_CC,DCS-CALIB_F_S_SQUARED,DCS-CALIB_SRC_Q_INVERSE'
+	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_TST_REAL_exact.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_TST_IMAGINARY_exact.txt --config-file $(DCSALLCORREXACTCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_TST_exact.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_TST_exact.txt
+	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_REAL_exact.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_IMAGINARY_exact.txt --config-file $(DCSALLCORREXACTCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_PUM_exact.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_PUM_exact.txt
+	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_REAL_exact.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_IMAGINARY_exact.txt --config-file $(DCSALLCORREXACTCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_UIM_exact.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_UIM_exact.txt
+	python3 compute_fs_over_Q.py --fs-squared-txt $(IFO)1-DCS-CALIB_F_S_SQUARED_exact.txt --Qinv-txt $(IFO)1-DCS-CALIB_SRC_Q_INVERSE_exact.txt --filename $(IFO)1-DCS-CALIB_F_S_OVER_Q_exact.txt
+	python3 frame_manipulator.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache $(IFO)1_hoft_DCS_ALLCORR_frames.cache --output-path '_approx.txt' --channel-list 'DCS-CALIB_KAPPA_TST_REAL,DCS-CALIB_KAPPA_TST_IMAGINARY,DCS-CALIB_KAPPA_PUM_REAL,DCS-CALIB_KAPPA_PUM_IMAGINARY,DCS-CALIB_KAPPA_UIM_REAL,DCS-CALIB_KAPPA_UIM_IMAGINARY,DCS-CALIB_KAPPA_C,DCS-CALIB_F_CC,DCS-CALIB_F_S_SQUARED,DCS-CALIB_SRC_Q_INVERSE'
+	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_TST_REAL_approx.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_TST_IMAGINARY_approx.txt --config-file $(DCSALLCORRCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_TST_approx.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_TST_approx.txt
+	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_REAL_approx.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_PUM_IMAGINARY_approx.txt --config-file $(DCSALLCORRCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_PUM_approx.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_PUM_approx.txt
+	python3 compute_tau.py --kappar-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_REAL_approx.txt --kappai-txt $(IFO)1-DCS-CALIB_KAPPA_UIM_IMAGINARY_approx.txt --config-file $(DCSALLCORRCONFIGS) --kappa-filename $(IFO)1-DCS-CALIB_KAPPA_UIM_approx.txt --tau-filename $(IFO)1-DCS-CALIB_TAU_UIM_approx.txt
+	python3 compute_fs_over_Q.py --fs-squared-txt $(IFO)1-DCS-CALIB_F_S_SQUARED_approx.txt --Qinv-txt $(IFO)1-DCS-CALIB_SRC_Q_INVERSE_approx.txt --filename $(IFO)1-DCS-CALIB_F_S_OVER_Q_approx.txt
+	python3 plot_kappas_from_txt.py --txt-list '$(IFO)1-DCS-CALIB_KAPPA_TST_approx.txt,$(IFO)1-DCS-CALIB_KAPPA_PUM_approx.txt,$(IFO)1-DCS-CALIB_KAPPA_UIM_approx.txt;$(IFO)1-DCS-CALIB_KAPPA_TST_exact.txt,$(IFO)1-DCS-CALIB_KAPPA_PUM_exact.txt,$(IFO)1-DCS-CALIB_KAPPA_UIM_exact.txt:$(IFO)1-DCS-CALIB_TAU_TST_approx.txt,$(IFO)1-DCS-CALIB_TAU_PUM_approx.txt,$(IFO)1-DCS-CALIB_TAU_UIM_approx.txt;$(IFO)1-DCS-CALIB_TAU_TST_exact.txt,$(IFO)1-DCS-CALIB_TAU_PUM_exact.txt,$(IFO)1-DCS-CALIB_TAU_UIM_exact.txt:$(IFO)1-DCS-CALIB_KAPPA_C_approx.txt;$(IFO)1-DCS-CALIB_KAPPA_C_exact.txt|$(IFO)1-DCS-CALIB_F_CC_approx.txt;$(IFO)1-DCS-CALIB_F_CC_exact.txt:$(IFO)1-DCS-CALIB_F_S_SQUARED_approx.txt;$(IFO)1-DCS-CALIB_F_S_SQUARED_exact.txt|$(IFO)1-DCS-CALIB_F_S_OVER_Q_approx.txt;$(IFO)1-DCS-CALIB_F_S_OVER_Q_exact.txt' --labels 'Approx;Exact' --filename TDCFs
 
 kappastimeseries: $(IFO)1_hoft_DCS_frames.cache $(IFO)1_C01_frames.cache
 	python3 frame_manipulator.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache $(IFO)1_C01_frames.cache --output-path txt --channel-list 'DCS-CALIB_KAPPA_TST_REAL_C01,DCS-CALIB_KAPPA_TST_IMAGINARY_C01,DCS-CALIB_KAPPA_PUM_REAL_C01,DCS-CALIB_KAPPA_PUM_IMAGINARY_C01,DCS-CALIB_KAPPA_UIM_REAL_C01,DCS-CALIB_KAPPA_UIM_IMAGINARY_C01,DCS-CALIB_KAPPA_C_C01,DCS-CALIB_F_CC_C01,DCS-CALIB_F_S_SQUARED_C01,DCS-CALIB_SRC_Q_INVERSE_C01'

tests/check_calibration/frame_manipulator.py

@@ -58,7 +58,7 @@ parser.add_option("--channel-prefix", metavar = "name", default = "", help = "Pr
 parser.add_option("--channel-suffix", metavar = "name", default = "", help = "Suffix for channels to read, also given to output channels (default is no suffix)")
 parser.add_option("--frame-length", metavar = "seconds", type = int, default = 64, help = "Length of output frames in seconds (Default = 64)")
 parser.add_option("--frames-per-file", type = int, default = 1, help = "Number of frames per frame file (Default = 1)")
-parser.add_option("--output-path", metavar = "name", help = "Location to write output frames.  If set to 'txt', *.txt files will be written for each channel instead of frames.")
+parser.add_option("--output-path", metavar = "name", default = '.', help = "Location where to write frames.  If string contains '.txt', data will be written to txt files.  Otherwise, channels are written to frames.")
 parser.add_option("--channel-list", metavar = "name", default = None, help = "Comma-separated list of channels to read from frames")
 
 options, filenames = parser.parse_args()
@@ -445,9 +445,9 @@ def frame_manipulator(pipeline, name):
 		head_dict[key] = pipeparts.mkprogressreport(pipeline, head_dict[key], "before muxer %s" % key)
 		channelmux_input_dict["%s:%s" % (ifo, chan)] = calibration_parts.mkqueue(pipeline, head_dict[key])
 
-	if output_path == 'txt':
+	if '.txt' in output_path:
 		for chan in channel_list:
-			pipeparts.mknxydumpsink(pipeline, channelmux_input_dict["%s:%s" % (ifo, chan)], "%s-%s.txt" % (ifo, chan))
+			pipeparts.mknxydumpsink(pipeline, channelmux_input_dict["%s:%s" % (ifo, chan)], "%s-%s%s" % (ifo, chan, output_path))
 	else:
 		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")