diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain index e4ab5900f0aece48809c73119fe33fdd33e60e60..92ed2f995ab21e270bdba6efbe86c200a8df0b7f 100755 --- a/gstlal-calibration/bin/gstlal_compute_strain +++ b/gstlal-calibration/bin/gstlal_compute_strain @@ -49,6 +49,7 @@ For a full list of example command lines that were used to create the O2 h(t) fr Type gstlal_compute_strain --help to see the full list of command line options. """ +import os import sys import numpy import time @@ -366,7 +367,29 @@ if (not factors_from_filters_file) and (compute_fs or compute_srcq) and ((InputC # Load in the filters file that contains filter coefficients, etc. # -filters = numpy.load(InputConfigs["filtersfilename"]) +# Search the directory tree for files with names matching the one we want. +filters_name = InputConfigs["filtersfilename"] +filters_paths = [] +# Check the user's home directory +for dirpath, dirs, files in os.walk(os.environ['HOME']): + if filters_name in files: + # We prefer filters that came directly from a GDSFilters directory of the calibration SVN + if dirpath.count("GDSFilters") > 0: + filters_paths.insert(0, os.path.join(dirpath, filters_name)) + else: + filters_paths.append(os.path.join(dirpath, filters_name)) +# Check if there is a checkout of the entire calibration SVN +for dirpath, dirs, files in os.walk('/ligo/svncommon/CalSVN/aligocalibration/trunk/Runs/'): + if filters_name in files: + # We prefer filters that came directly from a GDSFilters directory of the calibration SVN + if dirpath.count("GDSFilters") > 0: + filters_paths.insert(0, os.path.join(dirpath, filters_name)) + else: + filters_paths.append(os.path.join(dirpath, filters_name)) +if not len(filters_paths): + raise ValueError("Cannot find filters file %s in home directory %s or in /ligo/svncommon/CalSVN/aligocalibration/trunk/Runs/*/GDSFilters", (filters_name, os.environ['HOME'])) +print "\nLoading calibration filters from %s\n" % filters_paths[0] +filters = numpy.load(filters_paths[0]) # If we're reading the reference model factors from the filters file, load them if factors_from_filters_file or compute_calib_statevector: diff --git a/gstlal-calibration/config_files/H1DCS_AllCorrections_Cleaning.ini b/gstlal-calibration/config_files/H1DCS_AllCorrections_Cleaning.ini index d992703a9eb32981123f58835b3154f77eac8225..e9aad81253c33623e477ddc1b0c1bb600cf1718e 100644 --- a/gstlal-calibration/config_files/H1DCS_AllCorrections_Cleaning.ini +++ b/gstlal-calibration/config_files/H1DCS_AllCorrections_Cleaning.ini @@ -1,6 +1,6 @@ [InputConfigurations] # Filters file containing calibration FIR filters, relative to the directory gstlal-calibration/tests/check_calibration/, from which the pipeline is expected to be run -FiltersFileName: Filters/O2filters/GDSFilters/H1DCS_newsrcline_1173225472.npz +FiltersFileName: H1DCS_newsrcline_1173225472.npz # Data source should be set to frames or lvshm DataSource: frames FileChecksum: No diff --git a/gstlal-calibration/config_files/H1GDS_LowLatency_AllCorrections_Cleaning.ini b/gstlal-calibration/config_files/H1GDS_LowLatency_AllCorrections_Cleaning.ini index 7f8ac8c57d3df5de0b6d66ab40cc8cd0e1fe98aa..60081bf20a6e328ce2b3877425e160badfdd6b6c 100644 --- a/gstlal-calibration/config_files/H1GDS_LowLatency_AllCorrections_Cleaning.ini +++ b/gstlal-calibration/config_files/H1GDS_LowLatency_AllCorrections_Cleaning.ini @@ -1,6 +1,6 @@ [InputConfigurations] # Filters file containing calibration FIR filters -FiltersFileName: Filters/O2filters/GDSFilters/H1GDS_minlatency_1175954418.npz +FiltersFileName: H1GDS_minlatency_1175954418.npz # Data source should be set to frames or lvshm DataSource: frames FileChecksum: No diff --git a/gstlal-calibration/config_files/gstlal_compute_strain_config_example.ini b/gstlal-calibration/config_files/gstlal_compute_strain_config_example.ini index 4cc6141fd6a235be421c36abcb8aa2b9d4211df8..47de4f714f194ade09c0b782b14540ce4244998c 100644 --- a/gstlal-calibration/config_files/gstlal_compute_strain_config_example.ini +++ b/gstlal-calibration/config_files/gstlal_compute_strain_config_example.ini @@ -1,6 +1,6 @@ [InputConfigurations] # Filters file containing calibration FIR filters -FiltersFileName: GDSFilters/L1DCS_1175961600.npz +FiltersFileName: L1DCS_1175961600.npz # Data source should be set to frames or lvshm DataSource: frames FileChecksum: No