From 053c46e57b094c94fe0c2fa0430e934be34c2aed Mon Sep 17 00:00:00 2001
From: "P.M. Sutter" <sutter@iap.fr>
Date: Wed, 7 Nov 2012 11:51:51 -0600
Subject: [PATCH] fix to allow switching on/off cosmological distortions

---
 c_tools/mock/generateMock.ggo                       | 2 +-
 python_tools/void_python_tools/backend/launchers.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/c_tools/mock/generateMock.ggo b/c_tools/mock/generateMock.ggo
index 7148f48..7ca7158 100644
--- a/c_tools/mock/generateMock.ggo
+++ b/c_tools/mock/generateMock.ggo
@@ -26,6 +26,6 @@ option "rangeZ_max"   -   "Maximum range in Z for making the box (after distorti
 option "preReShift" - "Reshift the zero of the Z axis" flag off
 option "peculiarVelocities" - "Added peculiar velocities distortion" flag off
 
-option "cosmo"	- "Apply cosmological redshift" flag on
+option "cosmo"	- "Apply cosmological redshift" flag off
 
 option "subsample" - "Subsample the input simulation by the specified amount" double optional
diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py
index e75343e..8f9e397 100755
--- a/python_tools/void_python_tools/backend/launchers.py
+++ b/python_tools/void_python_tools/backend/launchers.py
@@ -101,6 +101,11 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
     else:
       includePecVelString = ""
 
+    if sample.useLightCone:
+      useLightConeString = "cosmo"
+    else:
+      useLightConeString = ""
+
     if sample.dataFormat == "multidark":
       dataFileLine = "multidark " + datafile
     elif sample.dataFormat == "gadget":
@@ -119,6 +124,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
       output %s
       outputParameter %s
       %s
+      %s
       rangeX_min %g
       rangeX_max %g
       rangeY_min %g
@@ -129,6 +135,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
       """ % (dataFileLine, zobovDir+"/zobov_slice_"+sampleName,
              zobovDir+"/zobov_slice_"+sampleName+".par",
              includePecVelString,
+             useLightConeString,
              xMin, xMax, yMin, yMax,
              sample.zBoundaryMpc[0], sample.zBoundaryMpc[1],
              sample.subsample)