From 873b3ea2b0c93d83be716c9e30015467acf2a4ed Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@illinois.edu>
Date: Fri, 11 Mar 2011 14:31:56 -0600
Subject: [PATCH] Fixes.

---
 mytools/generateMock.cpp | 8 +++++++-
 mytools/generateMock.ggo | 4 +++-
 mytools/particleInfo.cpp | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mytools/generateMock.cpp b/mytools/generateMock.cpp
index 85261b6..d3eec42 100644
--- a/mytools/generateMock.cpp
+++ b/mytools/generateMock.cpp
@@ -335,7 +335,13 @@ int main(int argc, char **argv)
 
   double *expfact;
 
-  metricTransform(simu, args_info.axis_arg, args_info.preReShift_flag, args_info.peculiarVelocities_flag, expfact);
+  if (args_info.cosmo_flag)
+    metricTransform(simu, args_info.axis_arg, args_info.preReShift_flag, args_info.peculiarVelocities_flag, expfact);
+  else
+    { 
+      expfact = new double[simu->NumPart];
+      for (int j = 0; j < simu->NumPart; j++) expfact[j] = 1.0;
+    }
 
   makeBox(simu, expfact, simuOut, args_info);
   delete simu;
diff --git a/mytools/generateMock.ggo b/mytools/generateMock.ggo
index d71114a..f6ebf17 100644
--- a/mytools/generateMock.ggo
+++ b/mytools/generateMock.ggo
@@ -20,4 +20,6 @@ option "rangeZ_min"   -   "Minimum range in Z for making the box (after distorti
 option "rangeZ_max"   -   "Maximum range in Z for making the box (after distortion)" double required
 
 option "preReShift" - "Reshift the zero of the Z axis" flag off
-option "peculiarVelocities" - "Added peculiar velocities distortion" flag off
\ No newline at end of file
+option "peculiarVelocities" - "Added peculiar velocities distortion" flag off
+
+option "cosmo"	- "Apply cosmological redshift" flag on
diff --git a/mytools/particleInfo.cpp b/mytools/particleInfo.cpp
index 8ab125c..e4e5454 100644
--- a/mytools/particleInfo.cpp
+++ b/mytools/particleInfo.cpp
@@ -9,6 +9,7 @@ bool loadParticleInfo(ParticleInfo& info,
 		      const std::string& particles, 
 		      const std::string& extra_info)
 {
+      int numpart;
 
   NcFile f_info(extra_info.c_str());
   
@@ -29,7 +30,6 @@ bool loadParticleInfo(ParticleInfo& info,
     {
       UnformattedRead f(particles);
 
-      int numpart;
       float mul, offset;
       
       f.beginCheckpoint();