diff --git a/gstlal-calibration/tests/H1GDS_1238952670_filter_tests/H1/Makefile.all_tests b/gstlal-calibration/tests/H1GDS_1238952670_filter_tests/H1/Makefile.all_tests index 839883901c42582dae97d085f2071cf6c3628814..c8fcbfdde9415810d861726c9b94cfb411041c38 100644 --- a/gstlal-calibration/tests/H1GDS_1238952670_filter_tests/H1/Makefile.all_tests +++ b/gstlal-calibration/tests/H1GDS_1238952670_filter_tests/H1/Makefile.all_tests @@ -10,23 +10,19 @@ export OBSRUN=O3 # Set start and stop times for a short lock stretch export SHORT_START=1238962430 export SHORT_END=1238964430 -# Set start and stop times for a longer stretch that spans a lock-unlock stretch -export LONG_START = 1228350334 -export LONG_END = 1228352985 -export SHMRUNTIME=400 # How much time does the calibraiton need to settle at the start and end? PLOT_WARMUP_TIME = 220 PLOT_COOLDOWN_TIME = 64 export SHORT_PLOT_START=$(shell echo $(SHORT_START) + $(PLOT_WARMUP_TIME) | bc) -export LONG_PLOT_START=$(shell echo $(LONG_START) + $(PLOT_WARMUP_TIME) | bc) export SHORT_PLOT_END=$(shell echo $(SHORT_END) - $(PLOT_COOLDOWN_TIME) | bc) -export LONG_PLOT_END=$(shell echo $(LONG_END) - $(PLOT_COOLDOWN_TIME) | bc) # Point to all of the .ini files for different configurations #export GDSCONFIGS=H1GDS_1232821094_gstlal-calibration-1-2-7.ini -export GDSCONFIGS=test.ini -export GDSCONFIGSNOKAPPAS=test_nokappas.ini +export GDSCONFIGS=GDS_test.ini +export GDSCONFIGSNOKAPPAS=GDS_test_nokappas.ini +export DCSCONFIGS=DCS_test.ini +export DCSCONFIGSNOKAPPAS=DCS_test_nokappas.ini # Needed for writing pipeline graphs export GST_DEBUG_DUMP_DOT_DIR=. @@ -52,11 +48,20 @@ $(IFO)1_hoft_GDS_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 $(GDSCONFIGS) ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1_TEST-*.gwf | lalapps_path2cache > $@ +# Calibrate DCS testing data +$(IFO)1_hoft_DCS_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 $(DCSCONFIGS) + ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1_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) ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1_TEST_NOKAPPAS*.gwf | lalapps_path2cache > $@ +# Calibrate DCS testing 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) + ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1_TEST_NOKAPPAS*.gwf | lalapps_path2cache > $@ filters: if [ -d Filters/$(OBSRUN)/GDSFilters ]; then \ @@ -73,7 +78,7 @@ framesdir: mkdir -p Frames/$(OBSRUN)/$(IFO)1/DCS -response_function: $(IFO)1_hoft_GDS_no_kappas_frames.cache $(IFO)1_raw_frames.cache +response_function: $(IFO)1_hoft_GDS_no_kappas_frames.cache $(IFO)1_hoft_DCS_no_kappas_frames.cache $(IFO)1_raw_frames.cache make -f Makefile.response_function ASD_comparison: $(IFO)1_raw_frames.cache $(IFO)1_hoft_GDS_frames.cache diff --git a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf.png b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf.png index fc527c00b4f6054fba329c2b83079933734a721a..dd482a222ab0b2ebd253e7828947d83d8e1356ed 100644 Binary files a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf.png and b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf.png differ diff --git a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio.png b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio.png index eb4a1404fcd8004dbb7c7f7354e84b0534bfbdf9..8b971541176ee789e51fcbccda177e42e5594ee3 100644 Binary files a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio.png and b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio.png differ diff --git a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio_zoomed.png b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio_zoomed.png index 0cfd07d05ef4e3f9780e19b143d2540bab6bf4de..7ab3b36e308bbed3fa67173a870dd0f4abda9e36 100644 Binary files a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio_zoomed.png and b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/L1_1239671444_1239674220_all_tf_ratio_zoomed.png differ diff --git a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.all_tests b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.all_tests index bc5a171562e8e7d4b5df790bae16a501be7b62ae..eebaf79652e4ec53788818ab5752b90acfd42e0b 100644 --- a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.all_tests +++ b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.all_tests @@ -50,12 +50,12 @@ $(IFO)1_C02_frames.cache: # Calibrate DCS testing data $(IFO)1_hoft_DCS_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=64 --wings=364 --config-file $(DCSCONFIGS) + #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=64 --wings=364 --config-file $(DCSCONFIGS) ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS_TEST-*.gwf | lalapps_path2cache > $@ # Calibrate DCS testing 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=64 --wings=364 --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=64 --wings=364 --config-file $(DCSCONFIGSNOKAPPAS) ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS_TEST_NOKAPPAS*.gwf | lalapps_path2cache > $@ @@ -74,7 +74,7 @@ framesdir: mkdir -p Frames/$(OBSRUN)/$(IFO)1/DCS -response_function: $(IFO)1_hoft_DCS_no_kappas_frames.cache $(IFO)1_raw_frames.cache +response_function: $(IFO)1_hoft_DCS_no_kappas_frames.cache $(IFO)1_raw_frames.cache $(IFO)1_C00_frames.cache make -f Makefile.response_function ASD_comparison: $(IFO)1_raw_frames.cache $(IFO)1_hoft_DCS_frames.cache $(IFO)1_C00_frames.cache diff --git a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.response_function b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.response_function index 69fe93ba755db062a8ef2a42a7e65959eadbb327..9481c710b722c316f64b13dbac62962520a51ccf 100644 --- a/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.response_function +++ b/gstlal-calibration/tests/L1DCS_C01_1239579018_filter_tests/L1/Makefile.response_function @@ -3,7 +3,7 @@ all: DCS_response_function_bode_plot FILTERS_FILE = Filters/O3/GDSFilters/L1DCS_C01_1239579018.npz DCS_response_function_bode_plot: - python ../../check_calibration/response_function.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --dt 6.103515625e-05 --ifo $(IFO)1 --hoft-frames-cache $(IFO)1_hoft_DCS_no_kappas_frames.cache --raw-frames-cache $(IFO)1_raw_frames.cache --response-file $(FILTERS_FILE) --analyze-calcs-hoft --hoft-channel-name DCS-CALIB_STRAIN + python ../../check_calibration/response_function.py --gps-start-time $(SHORT_PLOT_START) --gps-end-time $(SHORT_PLOT_END) --dt 6.103515625e-05 --ifo $(IFO)1 --additional-hoft-frames-cache $(IFO)1_hoft_DCS_no_kappas_frames.cache --raw-frames-cache $(IFO)1_raw_frames.cache --response-file $(FILTERS_FILE) --analyze-calcs-hoft --additional-hoft-channel-name DCS-CALIB_STRAIN --analyze-additional-hoft --hoft-frames-cache $(IFO)1_C00_frames.cache --hoft-channel-name GDS-CALIB_STRAIN clean: