From 0e49aa78b2210708437d14e4c32b7b87eeeb4cf8 Mon Sep 17 00:00:00 2001
From: "gregory.ashton" <gregory.ashton@ligo.org>
Date: Wed, 23 Nov 2016 21:50:23 +0100
Subject: [PATCH] Fix to the way the run_setup is saved

---
 pyfstat.py | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pyfstat.py b/pyfstat.py
index 2e3492e..c3d5364 100755
--- a/pyfstat.py
+++ b/pyfstat.py
@@ -2237,32 +2237,31 @@ class MCMCFollowUpSearch(MCMCSemiCoherentSearch):
                     self.maxStartTime, DeltaOmega, DeltaFs, fiducial_freq,
                     self.search.detector_names, self.earth_ephem,
                     self.sun_ephem)
-                run_setup = [(self.nsteps[0], nsegs)
+                run_setup = [((self.nsteps[0], 0),  nsegs, False)
                              for nsegs in nsegs_vals[:-1]]
                 run_setup.append(
-                    ((self.nsteps[0], self.nsteps[1]), nsegs_vals[-1]))
+                    ((self.nsteps[0], self.nsteps[1]), nsegs_vals[-1], False))
                 self.write_setup_input_file(run_setup_input_file, R0, Vmin,
                                             run_setup, V_vals)
 
         else:
             logging.info('Calculating the number of templates for this setup')
             V_vals = []
-
-        for i, rs in enumerate(run_setup):
-            rs = list(rs)
-            if len(rs) == 2:
-                rs.append(False)
-            if np.shape(rs[0]) == ():
-                rs[0] = (rs[0], 0)
-            run_setup[i] = rs
-
-            if len(V_vals) > 0:
-                V, Vsky, Vpe = get_V_estimate(
-                    rs[1], self.tref, self.minStartTime, self.maxStartTime,
-                    DeltaOmega, DeltaFs, fiducial_freq,
-                    self.search.detector_names, self.earth_ephem,
-                    self.sun_ephem)
-                V_vals.append([V, Vsky, Vpe])
+            for i, rs in enumerate(run_setup):
+                rs = list(rs)
+                if len(rs) == 2:
+                    rs.append(False)
+                if np.shape(rs[0]) == ():
+                    rs[0] = (rs[0], 0)
+                run_setup[i] = rs
+
+                if len(V_vals) > 0:
+                    V, Vsky, Vpe = get_V_estimate(
+                        rs[1], self.tref, self.minStartTime, self.maxStartTime,
+                        DeltaOmega, DeltaFs, fiducial_freq,
+                        self.search.detector_names, self.earth_ephem,
+                        self.sun_ephem)
+                    V_vals.append([V, Vsky, Vpe])
 
         if log_table:
             logging.info('Using run-setup as follows:')
-- 
GitLab