From 466dfd85768024a54c1b2a9484fca9d2cf2d6aed Mon Sep 17 00:00:00 2001
From: "P.M. Sutter" <sutter@iap.fr>
Date: Thu, 29 May 2014 15:41:37 -0500
Subject: [PATCH] fixed bug in shifting z-axis

---
 python_tools/pipeline_source/prepareInputs.in.py    | 2 ++
 python_tools/void_python_tools/backend/classes.py   | 4 +++-
 python_tools/void_python_tools/backend/launchers.py | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/python_tools/pipeline_source/prepareInputs.in.py b/python_tools/pipeline_source/prepareInputs.in.py
index f5a23ef..7a0deaf 100644
--- a/python_tools/pipeline_source/prepareInputs.in.py
+++ b/python_tools/pipeline_source/prepareInputs.in.py
@@ -253,6 +253,7 @@ newSample = Sample(dataFile = "{dataFile}",
                    zBoundary = ({zMin}, {zMax}),
                    zRange    = ({zMin}, {zMax}),
                    zBoundaryMpc = ({zMinMpc}, {zMaxMpc}),
+                   shiftSimZ = {shiftSimZ},
                    omegaM    = {omegaM},
                    minVoidRadius = {minRadius},
                    profileBinSize = "auto",
@@ -345,6 +346,7 @@ dataSampleList.append(newSample)
                                          zMax=sliceMax,
                                          zMinMpc=sliceMinMpc,
                                          zMaxMpc=sliceMaxMpc,
+                                         shiftSimZ=shiftSimZ,
                                          omegaM=Om,
                                          boxLen=lbox,
                                          autoStack=autoStack,
diff --git a/python_tools/void_python_tools/backend/classes.py b/python_tools/void_python_tools/backend/classes.py
index fb1efbf..db017ab 100644
--- a/python_tools/void_python_tools/backend/classes.py
+++ b/python_tools/void_python_tools/backend/classes.py
@@ -70,6 +70,7 @@ class Sample:
   selFunFile = "czselfunc.all.dr72dim.dat"
   zBoundary = (0.0, 0.1)
   zBoundaryMpc = (0., 300)
+  shiftSimZ = False
   zRange    = (0.0, 0.1)
   omegaM    = 0.27
   minVoidRadius = -1
@@ -96,7 +97,7 @@ class Sample:
 
   def __init__(self, dataFile="", fullName="", dataUnit=1,
                nickName="", maskFile="", selFunFile="",
-               zBoundary=(), zRange=(), zBoundaryMpc=(),
+               zBoundary=(), zRange=(), zBoundaryMpc=(), shiftSimZ=False,
                minVoidRadius=-1, fakeDensity=0.01, volumeLimited=True,
                numAPSlices=1,
                includeInHubble=True, partOfCombo=False, isCombo=False, 
@@ -114,6 +115,7 @@ class Sample:
     self.selFunFile = selFunFile
     self.zBoundary = zBoundary 
     self.zBoundaryMpc = zBoundaryMpc
+    self.shiftSimZ = shiftSimZ
     self.zRange = zRange
     self.minVoidRadius = minVoidRadius
     self.fakeDensity = fakeDensity
diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py
index c20b076..471e495 100644
--- a/python_tools/void_python_tools/backend/launchers.py
+++ b/python_tools/void_python_tools/backend/launchers.py
@@ -180,6 +180,9 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
       xMax = (iX+1)/sample.numSubvolumes * sample.boxLen
       yMax = (iY+1)/sample.numSubvolumes * sample.boxLen
 
+      reshiftFlag = ""
+      if not sample.shiftSimZ: reshiftFlag = "preReShift"
+
       conf="""
       %s
       output %s
@@ -196,6 +199,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
       %s
       %s
       %s
+      %s
       """ % (dataFileLine, outputFile,
              outputFile+".par",
              includePecVelString,
@@ -203,7 +207,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
              sample.dataUnit,
              xMin, xMax, yMin, yMax,
              sample.zBoundaryMpc[0], sample.zBoundaryMpc[1],
-             subSampleLine,resubSampleLine,inputParameterFlag)
+             subSampleLine,resubSampleLine,inputParameterFlag,reshiftFlag)
 
       parmFile = os.getcwd()+"/generate_"+sample.fullName+".par"