frame_manipulator.py: Added CLKGAIN channels

gnuscripts/depcomp

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

tests/check_calibration/Makefile

@@ -10,7 +10,7 @@ OBSRUN = O3
 # Determines whether to find calibration filters in the old SVN or the git repo.  Starting with PreER15 and O4, we switched to the git repo.  Set to 'svn' or 'git'.
 FILTERSRC = svn
 
-START = $(shell echo 1269090048 | bc)
+START = $(shell echo 1367582518 | bc)
 # 1266880202 Comb
 # 1266605804 H1 BB inj
 # 1237831461 start of O3A
@@ -18,7 +18,7 @@ START = $(shell echo 1269090048 | bc)
 # 1238288418
 # 1269090018
 # 1269114645-21449
-END = $(shell echo 1269097248 | bc)
+END = $(shell echo 1367584418 | bc)
 # 1266888034 Comb
 # 1266606486 H1 BB inj
 # 1253977218 end of O3A
@@ -27,10 +27,10 @@ END = $(shell echo 1269097248 | bc)
 # 1269133218
 SHMRUNTIME = 600
 # How much time does the calibration need to settle at the start and end?
-PLOT_WARMUP_TIME = 256
+PLOT_WARMUP_TIME = 505
 PLOT_COOLDOWN_TIME = 256
 
-GDSCONFIGS = Filters/O3/GDSFilters/H1GDS_1362848367_PreO4test.ini
+GDSCONFIGS = Filters/O3/GDSFilters/gstlal_compute_strain_C00_offlineTest_H1.ini
 GDSAPPROXKAPPASCONFIGS = Filters/O3/GDSFilters/H1GDS_1362848367_PreO4test_ApproxKappas.ini
 GDSEXACTKAPPASCONFIGS = Filters/O3/GDSFilters/H1GDS_1362848367_PreO4test_ExactKappas.ini
 DCSAPPROXKAPPASCONFIGS = Filters/O3/GDSFilters/H1DCS_test_1256655618_v2_approxKappas.ini
@@ -74,7 +74,7 @@ GDSSHMCONFIGS = Filters/O3/GDSFilters/H1GDS_1258216456_testing.ini
 GDSOLDCONFIGS = Filters/ER14/GDSFilters/L1GDS_1235491416_old.ini
 EASYRAWFILTERS = H1DCS_20230407_testing.npz
 
-all: DCSEXACTKAPPAS_pcal2darm_plots DCSEXACTKAPPAS_act2darm_plots
+all: noise_subtraction_ASD_GDS
 # state_vector_plot
 # noise_subtraction_ASD_GDS
 # DARM_over_ASC_callines
@@ -380,10 +380,10 @@ noise_subtraction_ASD_DCS_LINES: $(IFO)1_hoft_DCS_frames.cache
 	./ASD_plots --ifo $(IFO)1 --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --frame-cache-list '$(IFO)1_hoft_DCS_frames.cache,$(IFO)1_hoft_DCS_frames.cache' --channel-list 'DCS-CALIB_STRAIN,DCS-CALIB_STRAIN_CLEAN' --ASD-fmin 0.3
 
 noise_subtraction_ASD_GDS: $(IFO)1_hoft_GDS_frames.cache
-	python3 plot_ASD.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache-list $(IFO)1_hoft_GDS_frames.cache,$(IFO)1_hoft_GDS_frames.cache --channel-list GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_NOLINES --sample-rate 16384 --fft-time 1 --fft-spacing 0.5 --freq-res 0.25 --frequency-max=8192 --labels 'GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_NOLINES'
+	python3 plot_ASD.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache-list $(IFO)1_hoft_GDS_frames.cache,$(IFO)1_hoft_GDS_frames.cache --channel-list GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_NOLINES --sample-rate 16384 --fft-time 16 --fft-spacing 8 --freq-res 0.25 --frequency-min 0.1 --frequency-max=8192 --ASD-max=1e-14 --labels 'GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_NOLINES'
 
 noise_subtraction_ASD_C00: $(IFO)1_C00_frames.cache
-	python3 plot_ASD.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache-list $(IFO)1_C00_frames.cache,$(IFO)1_C00_frames.cache --channel-list GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_CLEAN --sample-rate 16384 --fft-time 1 --fft-spacing 0.5 --freq-res 0.25 --frequency-max=8192 --labels 'GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_CLEAN'
+	python3 plot_ASD.py --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --ifo $(IFO)1 --frame-cache-list $(IFO)1_C00_frames.cache,$(IFO)1_C00_frames.cache --channel-list GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_NOLINES --sample-rate 16384 --fft-time 16 --fft-spacing 8 --freq-res 0.25 --frequency-min 0.1 --frequency-max=8192 --ASD-max=1e-14 --labels 'GDS-CALIB_STRAIN,GDS-CALIB_STRAIN_NOLINES'
 
 highpass_filter_ASD_GDS: $(IFO)1_C00_frames.cache $(IFO)1_lowLatency_GDS_frames.cache $(IFO)1_lowLatency_asymmetric_GDS_frames.cache
 	./ASD_plots --ifo $(IFO)1 --gps-start-time $(PLOT_START) --gps-end-time $(PLOT_END) --frame-cache-list '$(IFO)1_C00_frames.cache,$(IFO)1_lowLatency_GDS_frames.cache,$(IFO)1_lowLatency_asymmetric_GDS_frames.cache' --channel-list 'GDS-CALIB_STRAIN,GDS-CALIB_STRAIN,GDS-CALIB_STRAIN' --ASD-fmin 0.5 --ASD-labels 'C00,0.95s Latency Symmetric Filters,0.95s Latency Asymmetric Filters'

tests/check_calibration/frame_manipulator.py

@@ -306,6 +306,12 @@ if not any(channel_list):
 	channel_list.append("SUS-ETMY_L1_CAL_LINE_SINGAIN")
 	channel_list.append("SUS-ETMY_L2_CAL_LINE_SINGAIN")
 	channel_list.append("SUS-ETMY_L3_CAL_LINE_SINGAIN")
+	channel_list.append("SUS-ETMX_L1_CAL_LINE_CLKGAIN")
+	channel_list.append("SUS-ETMX_L2_CAL_LINE_CLKGAIN")
+	channel_list.append("SUS-ETMX_L3_CAL_LINE_CLKGAIN")
+	channel_list.append("SUS-ETMY_L1_CAL_LINE_CLKGAIN")
+	channel_list.append("SUS-ETMY_L2_CAL_LINE_CLKGAIN")
+	channel_list.append("SUS-ETMY_L3_CAL_LINE_CLKGAIN")
 	channel_list.append("CAL-PCALX_PCALOSC1_OSC_SINGAIN")
 	channel_list.append("CAL-PCALX_PCALOSC2_OSC_SINGAIN")
 	channel_list.append("CAL-PCALX_PCALOSC3_OSC_SINGAIN")