From b03254e660745c9b7113adf33903fb5b29dec148 Mon Sep 17 00:00:00 2001 From: Aaron Viets <aaron.viets@ligo.org> Date: Fri, 12 Oct 2018 06:01:51 -0700 Subject: [PATCH] gstlal_compute_strain: Bug fix for subtracting calibration lines when applying real kappas. --- gstlal-calibration/bin/gstlal_compute_strain | 2 +- gstlal-calibration/tests/check_calibration/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain index a219351a2c..77c88108ec 100755 --- a/gstlal-calibration/bin/gstlal_compute_strain +++ b/gstlal-calibration/bin/gstlal_compute_strain @@ -2114,7 +2114,7 @@ if remove_cal_lines: act_line_removal_dict[act_line_name][0] = calibration_parts.mkmultiplier(pipeline, calibration_parts.list_srcs(pipeline, act_line_removal_dict[act_line_name][0], act_line_removal_dict[act_line_name][7])) elif act_line_removal_dict[act_line_name][6]: # Apply the real part of a time-dependent correction factor - act_line_removal_dict[act_line_name][0] = calibration_parts.mkmultiplier(pipeline, calibration_parts.list_srcs(pipeline, act_line_removal_dict[act_line_name][0], pipeparts.mktogglecomplex(pipeline, pipeparts.mkmatrixmixer(pipeline, act_line_removal_dict[act_line_name][7]), matrix = [[1.0, 0.0]]))) + act_line_removal_dict[act_line_name][0] = calibration_parts.mkmultiplier(pipeline, calibration_parts.list_srcs(pipeline, act_line_removal_dict[act_line_name][0], pipeparts.mktogglecomplex(pipeline, pipeparts.mkmatrixmixer(pipeline, act_line_removal_dict[act_line_name][7], matrix = [[1.0, 0.0]])))) # Reconstruct a signal at only this actuation line act_line_removal_dict[act_line_name][0] = calibration_parts.mkresample(pipeline, act_line_removal_dict[act_line_name][0], 3, False, "audio/x-raw, format=Z128LE, rate=%d, channel-mask=(bitmask)0x0" % hoft_sr) diff --git a/gstlal-calibration/tests/check_calibration/Makefile b/gstlal-calibration/tests/check_calibration/Makefile index 8214f64389..557c26abeb 100644 --- a/gstlal-calibration/tests/check_calibration/Makefile +++ b/gstlal-calibration/tests/check_calibration/Makefile @@ -37,7 +37,7 @@ $(IFO)1_raw_frames.cache: $(IFO)1_easy_raw_frames.cache: $(IFO)1_raw_frames.cache framesdir FrChannels $(shell sed -nr '0,/localhost/ s/.*localhost([^"]+).*/\1/p' $(IFO)1_raw_frames.cache) > frchannels.txt python frame_manipulator.py --ifo $(IFO)1 --gps-start-time $(START) --gps-end-time $(END) --frame-cache $(IFO)1_raw_frames.cache --frame-type $(IFO)1_R --output-path Frames/$(OBSRUN)/$(IFO)1/easy_raw/ - ls Frames/$(OBSRUN)/$(IFO)1/easy_raw/$(IFO)-$(IFO)1_R*.gwf + ls Frames/$(OBSRUN)/$(IFO)1/easy_raw/$(IFO)-$(IFO)1_R*.gwf | lalapps_path2cache > $@ rm frchannels.txt $(IFO)1_C00_frames.cache: -- GitLab