From 9f8d0be177fd2598a0487dd786477ffef19a551a Mon Sep 17 00:00:00 2001
From: David Keitel <david.keitel@ligo.org>
Date: Mon, 18 Dec 2017 17:55:48 +0000
Subject: [PATCH] gridsearch: fix old-data check in transient case, add
filenames to logging
---
pyfstat/grid_based_searches.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyfstat/grid_based_searches.py b/pyfstat/grid_based_searches.py
index da2ad8f..8204d64 100644
--- a/pyfstat/grid_based_searches.py
+++ b/pyfstat/grid_based_searches.py
@@ -128,7 +128,7 @@ class GridSearch(BaseSearchClass):
if args.clean:
return False
if os.path.isfile(self.out_file) is False:
- logging.info('No old data found, continuing with grid search')
+ logging.info('No old data found in "{:s}", continuing with grid search'.format(self.out_file))
return False
if self.sftfilepattern is not None:
oldest_sft = min([os.path.getmtime(f) for f in
@@ -139,13 +139,13 @@ class GridSearch(BaseSearchClass):
return False
data = np.atleast_2d(np.genfromtxt(self.out_file, delimiter=' '))
- if np.all(data[:, 0:-1] == self.input_data):
+ if np.all(data[:,0:len(self.coord_arrays)] == self.input_data[:,0:len(self.coord_arrays)]):
logging.info(
- 'Old data found with matching input, no search performed')
+ 'Old data found in "{:s}" with matching input, no search performed'.format(self.out_file))
return data
else:
logging.info(
- 'Old data found, input differs, continuing with grid search')
+ 'Old data found in "{:s}", input differs, continuing with grid search'.format(self.out_file))
return False
return False
--
GitLab