From 5f272ccd952f48ec91a9d2e54a09329ba42d193b Mon Sep 17 00:00:00 2001
From: Aaron Viets <aaron.viets@ligo.org>
Date: Sun, 3 Mar 2019 19:32:57 -0800
Subject: [PATCH] gstlal_compute_strain: Do ont require expected fcc, fs, or
srcQ in config file.
---
gstlal-calibration/bin/gstlal_compute_strain | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain
index 630f180120..3f5b0c7634 100755
--- a/gstlal-calibration/bin/gstlal_compute_strain
+++ b/gstlal-calibration/bin/gstlal_compute_strain
@@ -293,9 +293,9 @@ expected_kappapum_imag = float(TDCFConfigs["expectedkappapumimag"])
expected_kappauim_real = float(TDCFConfigs["expectedkappauimreal"])
expected_kappauim_imag = float(TDCFConfigs["expectedkappauimimag"])
expected_kappac = float(TDCFConfigs["expectedkappac"])
-expected_fcc = float(TDCFConfigs["expectedfcc"])
-expected_fs = float(TDCFConfigs["expectedfs"])
-expected_srcq = float(TDCFConfigs["expectedsrcq"])
+expected_fcc = float(TDCFConfigs["expectedfcc"]) if "expectedfcc" in TDCFConfigs else 0.0
+expected_fs = float(TDCFConfigs["expectedfs"]) if "expectedfs" in TDCFConfigs else 0.0
+expected_srcq = float(TDCFConfigs["expectedsrcq"]) if "expectedsrcq" in TDCFConfigs else 0.0
kappatst_real_var = float(TDCFConfigs["kappatstrealvar"])
kappatst_imag_var = float(TDCFConfigs["kappatstimagvar"])
kappapu_real_var = float(TDCFConfigs["kappapurealvar"])
@@ -489,12 +489,18 @@ try:
fcc_default = float(filters["fcc"])
except:
fcc_default = expected_fcc
+ if fcc_default == 0.0:
+ print("Warning: Could not find expected fcc in filters file or config file. Setting to zero.")
try:
fs_default = float(filters["fs"])
srcQ_default = float(filters["srcQ"])
except:
fs_default = expected_fs
+ if fs_default == 0:
+ print("Warning: Could not find expected fs in filters file or config file. Setting to zero.")
srcQ_default = expected_srcq
+ if srcQ_default == 0:
+ print("Warning: Could not find expected srcQ in filters file or config file. Setting to zero.")
# Load kappa dewhitening factors
if dewhitening:
--
GitLab