From 9bd0cbbb8820cd076cb75f8e0eab83788a4f76de Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@illinois.edu>
Date: Tue, 29 Jan 2013 13:58:12 -0600
Subject: [PATCH] Fixed regeneration step in generateMock. Fixed gadget loading
 (missing initialization for multiple files)

---
 c_tools/mock/generateMock.cpp          | 8 +++++---
 c_tools/mock/loaders/gadget_loader.cpp | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp
index ad334e9..b3864c6 100644
--- a/c_tools/mock/generateMock.cpp
+++ b/c_tools/mock/generateMock.cpp
@@ -317,9 +317,9 @@ void buildBox(SimuData *simu, long num_targets, long loaded,
       
       for (int j = 0; j < 3; j++)
 	{
-	  boxed->Pos[j][loaded] = (simu->Pos[j][pid]-ranges[j*2])*mul[j];
-	  assert(boxed->Pos[j][loaded] > 0);
-	  assert(boxed->Pos[j][loaded] < 1);
+	  boxed->Pos[j][loaded] = max(min((simu->Pos[j][pid]-ranges[j*2])*mul[j], double(1)), double(0));
+	  assert(boxed->Pos[j][loaded] >= 0);
+	  assert(boxed->Pos[j][loaded] <= 1);
 	}
       uniqueID[loaded] = (simu_uniqueID != 0) ? simu_uniqueID[pid] : 0;
       expansion_fac[loaded] = efac[pid];
@@ -400,6 +400,7 @@ void makeBoxFromParameter(SimuData *simu, SimuData* &boxed, generateMock_info& a
   mul = new double[3];
   ranges = new double[6];
   snapshot_split = new long[*num_snapshots];
+  expansion_fac = new double[boxed->NumPart];
 
 
   boxed->new_attribute("uniqueID", uniqueID, delete_adaptor<long>);
@@ -408,6 +409,7 @@ void makeBoxFromParameter(SimuData *simu, SimuData* &boxed, generateMock_info& a
   boxed->new_attribute("particle_id", particle_id, delete_adaptor<long>);
   boxed->new_attribute("num_snapshots", num_snapshots, delete_adaptor<int>);
   boxed->new_attribute("snapshot_split", snapshot_split, delete_adaptor<long>);
+  boxed->new_attribute("expansion_fac", expansion_fac, delete_adaptor<double>);
 
   v_id->get(particle_id, boxed->NumPart);
   v_snap->get(snapshot_split, *num_snapshots);
diff --git a/c_tools/mock/loaders/gadget_loader.cpp b/c_tools/mock/loaders/gadget_loader.cpp
index 1c108ee..906f6c1 100644
--- a/c_tools/mock/loaders/gadget_loader.cpp
+++ b/c_tools/mock/loaders/gadget_loader.cpp
@@ -77,7 +77,7 @@ public:
 
 SimulationLoader *gadgetLoader(const std::string& snapshot, double Mpc_unitLength, int flags)
 {
-  bool singleFile;
+  bool singleFile = false;
   int num_files;
   SimuData *d;