diff --git a/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini b/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini index 52ba2649f30295c20cebf2b8595077610fb9786d..d57933e80412535220cd18bd2e3bcfdeae16f7bf 100644 --- a/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini +++ b/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini @@ -76,9 +76,6 @@ ApplyKappaUIM: No # Set this to have the \kappa_u factors the actuation chain with an adaptive filter that corrects for both magnitude and phase errors. ApplyComplexKappaUIM: No -# Set this to use a calibration line injected using the UIM stage of actuation to compute \kappa_U. Otherwise, the DARM_ctrl line is used. -UseUIMLine: Yes - ComputeKappaC: Yes ApplyKappaC: Yes @@ -319,9 +316,9 @@ Dewhitening: No FilterLatency: 1.0 [DataCleaningConfigurations] -#################################################### +################################################### # Options for turning on and off line subtraction # -#################################################### +################################################### # Remove the DC component from the residual and control channels before filtering RemoveDC: No # Subtract the calibration lines from the h(t) spectrum diff --git a/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning_TEST.ini b/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning_TEST.ini index 1e7788448351bb17cf693761df0820df684cb9f3..0dffee8efa00feb7f3822556992a5bc13e241497 100644 --- a/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning_TEST.ini +++ b/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning_TEST.ini @@ -76,9 +76,6 @@ ApplyKappaUIM: No # Set this to have the \kappa_u factors the actuation chain with an adaptive filter that corrects for both magnitude and phase errors. ApplyComplexKappaUIM: No -# Set this to use a calibration line injected using the UIM stage of actuation to compute \kappa_U. Otherwise, the DARM_ctrl line is used. -UseUIMLine: Yes - ComputeKappaC: Yes ApplyKappaC: Yes @@ -101,8 +98,6 @@ CoherenceTime: 130 ################################################################### # Options related to the computation configurations for the TDCFs # ################################################################### -ComputeFactorsSR: 16 -RecordFactorsSR: 16 # Length in seconds of low-pass FIR filter used in demodulation of the calibration lines DemodulationFilterTime: 20 # Time (in seconds) to smooth out \kappas with a median-like method @@ -110,6 +105,8 @@ MedianSmoothingTime: 128 TDCFAveragingTime: 10 #If set to yes, bad computed kappas will be replaced by the previous computed median in the running median array. Otherwise, they are replaced with the default value TDCFDefaultToMedian: Yes +# If using X-end Pcal, we need a minus sign, so set this to -1.0 +PcalSign: 1.0 ################################################## # Options related to updating cavity pole filter # ################################################## @@ -193,6 +190,17 @@ TSTExcChannel: SUS-ETMY_L3_CAL_LINE_OUT_DQ PUMExcChannel: SUS-ETMY_L2_CAL_LINE_OUT_DQ UIMExcChannel: SUS-ETMY_L1_CAL_LINE_OUT_DQ PCALChannel: CAL-PCALY_TX_PD_OUT_DQ +############################################ +# Calibration Line Frequency Channel Names # +############################################ +DARMExcLineFreqChannel: None +TSTExcLineFreqChannel: SUS-ETMY_L3_CAL_LINE_FREQ +PUMExcLineFreqChannel: SUS-ETMY_L2_CAL_LINE_FREQ +UIMExcLineFreqChannel: SUS-ETMY_L1_CAL_LINE_FREQ +PCALLine1FreqChannel: None +PCALLine2FreqChannel: CAL-CS_TDEP_CAVITY_POLE_PCAL_FREQ +PCALLine3FreqChannel: None +PCALLine4FreqChannel: CAL-CS_TDEP_D2N_SPRING_PCAL_FREQ ####################################### # Coherence Uncertainty Channel Names # ####################################### @@ -308,9 +316,9 @@ Dewhitening: No FilterLatency: 1.0 [DataCleaningConfigurations] -#################################################### +################################################### # Options for turning on and off line subtraction # -#################################################### +################################################### # Remove the DC component from the residual and control channels before filtering RemoveDC: No # Subtract the calibration lines from the h(t) spectrum