Updating some of the testing scripts for preparing for gstlal-calibration-1.2.2 release

gstlal-calibration/tests/check_calibration/pcal2darm_timeseries.py

@@ -82,6 +82,7 @@ parser.add_option("--demodulation-time", metavar = "seconds", type = int, defaul
 parser.add_option("--magnitude-ranges", metavar = "list", type = str, default = "0.9,1.1;0.9,1.1;0.9,1.1", help = "Ranges for magnitude plots. Semicolons separate ranges for different plots, and commas separate min and max values.")
 parser.add_option("--phase-ranges", metavar = "list", type = str, default = "-6.0,6.0;-6.0,6.0;-6.0,6.0", help = "Ranges for phase plots, in degrees. Semicolons separate ranges for different plots, and commas separate min and max values.")
 parser.add_option("--labels", metavar = "list", type = str, help = "Comma-separated List of labels for each calibrated channel being tested. This is put in the plot legends and in the txt file names to distinguish them.")
+parser.add_option("--file-name-prefix", metavar = "name", type = str, help = "Prefix for naming unique file.")
 
 options, filenames = parser.parse_args()
 
@@ -325,6 +326,6 @@ for i in range(0, len(frequencies)):
 		plt.plot(times, phases[j], colors[j % 6], markersize = markersize, label = r'%s [$\mu$ = %0.3f$^{\circ}$, $\sigma$ = %0.3f$^{\circ}$]' % (labels[j], numpy.mean(phases[j]), numpy.std(phases[j])))
 		leg = plt.legend(fancybox = True, markerscale = 4.0 / markersize, numpoints = 3)
 		leg.get_frame().set_alpha(0.5)
-plt.savefig("deltal_over_pcal_%d.png" % options.gps_start_time)
-plt.savefig("deltal_over_pcal_%d.pdf" % options.gps_start_time)
+plt.savefig("%s_%s_deltal_over_pcal_%d.png" % (options.file_name_prefix, ifo, options.gps_start_time))
+plt.savefig("%s_%s_deltal_over_pcal_%d.pdf" % (options.file_name_prefix, ifo, options.gps_start_time))
 

gstlal-calibration/tests/gstlal-calibration-1.2.1-tests/H1/Makefile.all_tests

@@ -35,8 +35,7 @@ export GDSSHMCONFIGS=H1GDSSHM_gstlal-calibration-1.2.1-testing.ini
 # Needed for writing pipeline graphs
 export GST_DEBUG_DUMP_DOT_DIR=.
 
-# FIXME: Need to fix timeserieskappas script to plot based on provided frame cache (or check if this is already option)
-all: response_function ASD_comparison pcal_to_darm calib_version_comparison timeserieskappas
+all: response_function ASD_comparison pcal_to_darm timeserieskappas
 
 # Create frame cache files for raw, C00, C01, and C02 frames
 $(IFO)1_raw_frames.cache:
@@ -53,22 +52,22 @@ $(IFO)1_C02_frames.cache:
 
 # Calibrate DCS data
 $(IFO)1_hoft_DCS_frames.cache: $(IFO)1_raw_frames.cache filters framesdir
-	gstlal_compute_strain --gps-start-time $(LONG_START) --gps-end-time $(LONG_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSCONFIGS)
+	#gstlal_compute_strain --gps-start-time $(LONG_START) --gps-end-time $(LONG_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSCONFIGS)
 	ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS_TEST-*.gwf | lalapps_path2cache > $@
 
 # Calibrate DCS data with no kappas applied for response function test
 $(IFO)1_hoft_DCS_no_kappas_frames.cache: $(IFO)1_raw_frames.cache filters framesdir
-	gstlal_compute_strain --gps-start-time $(SHORT_START) --gps-end-time $(SHORT_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSCONFIGSNOKAPPAS)
+	#gstlal_compute_strain --gps-start-time $(SHORT_START) --gps-end-time $(SHORT_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSCONFIGSNOKAPPAS)
 	ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS_TEST_NOKAPPAS*.gwf | lalapps_path2cache > $@
 
 # Calibrate GDS testing data
 $(IFO)1_hoft_GDS_frames.cache: $(IFO)1_raw_frames.cache filters framesdir
-	gstlal_compute_strain --gps-start-time $(LONG_START) --gps-end-time $(LONG_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/GDS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(GDSCONFIGS)
+	#gstlal_compute_strain --gps-start-time $(LONG_START) --gps-end-time $(LONG_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/GDS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(GDSCONFIGS)
 	ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1GDS_TEST-*.gwf | lalapps_path2cache > $@
 
 # Calibrate GDS testing data with no kappas applied for response function test
 $(IFO)1_hoft_GDS_no_kappas_frames.cache: $(IFO)1_raw_frames.cache filters framesdir
-	gstlal_compute_strain --gps-start-time $(SHORT_START) --gps-end-time $(SHORT_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/GDS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(GDSCONFIGSNOKAPPAS)
+	#gstlal_compute_strain --gps-start-time $(SHORT_START) --gps-end-time $(SHORT_END) --frame-cache $(IFO)1_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/GDS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(GDSCONFIGSNOKAPPAS)
 	ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1GDS_TEST_NOKAPPAS*.gwf | lalapps_path2cache > $@
 
 # Calibrate GDS data from shared memory to check latency
@@ -109,6 +108,7 @@ lines_ratio: $(IFO)1_hoft_DCS_frames.cache
 latency: $(IFO)1_hoft_GDS_SHM_frames.cache
 	make -f Makefile.latency
 
+# FIXME: This is seg faulting for me right now
 calib_version_comparison: $(IFO)1_hoft_GDS_frames.cache $(IFO)1_C02_frames.cache $(IFO)1_hoft_DCS_frames.cache
 	make -f Makefile.calib_version_comparison
 

gstlal-calibration/tests/gstlal-calibration-1.2.1-tests/H1/Makefile.calib_version_comparison

 all: DCS_over_C02 GDS_over_C02
 
 GDS_over_C02: $(IFO)1_hoft_GDS_frames.cache $(IFO)1_C02_frames.cache
-	python ../../check_calibration/plot_transfer_function.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --numerator-frame-cache $(IFO)1_hoft_GDS_frames.cache --denominator-frame-cache $(IFO)1_C02_frames.cache --numerator-channel-name GDS-CALIB_STRAIN --denominator-channel-name DCS-CALIB_STRAIN_C02 --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --plot-title 'GDS Test / C02 Transfer Function'
+	python ../../check_calibration/plot_transfer_function.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --numerator-frame-cache-list $(IFO)1_hoft_GDS_frames.cache --denominator-frame-cache $(IFO)1_C02_frames.cache --numerator-channel-list GDS-CALIB_STRAIN --denominator-channel-name DCS-CALIB_STRAIN_C02 --denominator-name 'C02' --numerator-name 'GDS_TEST --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --labels 'GDS Test / C02 Transfer Function'
 
 DCS_over_C02: $(IFO)1_hoft_DCS_frames.cache $(IFO)1_C02_frames.cache
-	python ../../check_calibration/plot_transfer_function.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --numerator-frame-cache $(IFO)1_hoft_DCS_frames.cache --denominator-frame-cache $(IFO)1_C02_frames.cache --numerator-channel-name DCS-CALIB_STRAIN --denominator-channel-name DCS-CALIB_STRAIN_C02 --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --plot-title 'DCS Test / C02 Transfer Function'
+	python ../../check_calibration/plot_transfer_function.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --numerator-frame-cache-list $(IFO)1_hoft_DCS_frames.cache --denominator-frame-cache $(IFO)1_C02_frames.cache --numerator-channel-list DCS-CALIB_STRAIN --denominator-channel-name DCS-CALIB_STRAIN_C02 --numerator-name 'GDS' --denominator-name 'C02' --magnitude-min 0.7 --magnitude-max 1.3 --phase-min -20.0 --phase-max 20.0 --labels 'DCS Test / C02 Transfer Function'
 
 clean:
 	*.png

gstlal-calibration/tests/gstlal-calibration-1.2.1-tests/H1/Makefile.pcal_to_darm

 all: GDS_pcal2darm_plots DCS_pcal2darm_plots
 
 GDS_pcal2darm_plots: $(IFO)1_raw_frames.cache $(IFO)1_hoft_GDS_frames.cache
-	python ../../check_calibration/pcal2darm_timeseries.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --raw-frame-cache $(IFO)1_raw_frames.cache --calibrated-frame-cache $(IFO)1_hoft_GDS_frames.cache --config-file '$(GDSCONFIGS)' --pcal-channel-name CAL-PCALY_TX_PD_OUT_DQ --calibrated-channel-list='GDS-CALIB_STRAIN' --plot-filename-prefix GDS --phase-ranges='0.0,3.0;-5.0,5.0;-10.0,10.0' --magnitude-ranges="0.96,1.00;0.93,1.00;0.8,1.2"
+	python ../../check_calibration/pcal2darm_timeseries.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --raw-frame-cache $(IFO)1_raw_frames.cache --gstlal-frame-cache $(IFO)1_hoft_GDS_frames.cache --config-file '$(GDSCONFIGS)' --pcal-channel-name CAL-PCALY_TX_PD_OUT_DQ --gstlal-channel-list='GDS-CALIB_STRAIN' --labels 'GDS' --phase-ranges='0.0,3.0;-5.0,5.0;-10.0,10.0' --magnitude-ranges="0.96,1.00;0.93,1.00;0.8,1.2" --file-name-prefix GDS
 
 DCS_pcal2darm_plots: $(IFO)1_raw_frames.cache $(IFO)1_hoft_DCS_frames.cache
-	python ../../check_calibration/pcal2darm_timeseries.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --raw-frame-cache $(IFO)1_raw_frames.cache --calibrated-frame-cache $(IFO)1_hoft_DCS_frames.cache --config-file '$(DCSCONFIGS)' --pcal-channel-name CAL-PCALY_TX_PD_OUT_DQ --calibrated-channel-list='DCS-CALIB_STRAIN,DCS-CALIB_STRAIN_CLEAN' --plot-filename-prefix DCS --phase-ranges='0.0,3.0;-3.0,3.0;-10.0,10.0' --magnitude-ranges='0.96,1.00;0.96,1.04;0.85,1.15'
+	python ../../check_calibration/pcal2darm_timeseries.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --ifo $(IFO)1 --raw-frame-cache $(IFO)1_raw_frames.cache --gstlal-frame-cache $(IFO)1_hoft_DCS_frames.cache --config-file '$(DCSCONFIGS)' --pcal-channel-name CAL-PCALY_TX_PD_OUT_DQ --gstlal-channel-list='DCS-CALIB_STRAIN' --labels 'DCS' --phase-ranges='0.0,3.0;-3.0,3.0;-10.0,10.0' --magnitude-ranges='0.96,1.00;0.96,1.04;0.85,1.15' --file-name-prefix DCS
 
 clean:
 	rm *.gwf *.cache *.png *.txt