From c81fd8913bfa21b2c39ce3d2fee4f181823faa6f Mon Sep 17 00:00:00 2001
From: "P.M. Sutter" <sutter@iap.fr>
Date: Thu, 25 Apr 2013 09:35:32 -0500
Subject: [PATCH] now outputs mass into particle and halo files

---
 c_tools/mock/loaders/multidark_loader.cpp     |  2 +-
 .../pipeline_source/prepareCatalogs.in.py     | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/c_tools/mock/loaders/multidark_loader.cpp b/c_tools/mock/loaders/multidark_loader.cpp
index 26f1daf..b1acf10 100644
--- a/c_tools/mock/loaders/multidark_loader.cpp
+++ b/c_tools/mock/loaders/multidark_loader.cpp
@@ -98,7 +98,7 @@ public:
       SingleParticle p;
 
       fp >> p.ID >> p.Pos[0] >> p.Pos[1]
-         >> p.Pos[2] >> p.Vel[2] >> tempData >> tempData;
+         >> p.Pos[2] >> p.Vel[2] >> tempData >> tempData >> tempData;
 
       if (p.ID == -99 && 
           p.Pos[0] == -99 && p.Pos[1] == -99 && 
diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py
index 50e5a00..fbb0c36 100644
--- a/python_tools/pipeline_source/prepareCatalogs.in.py
+++ b/python_tools/pipeline_source/prepareCatalogs.in.py
@@ -259,8 +259,8 @@ newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, Fal
 
       sliceMin = "%0.2f" % sliceMin
       sliceMax = "%0.2f" % sliceMax
-      sliceMinMpc = "%0.1f" % sliceMinMpc
-      sliceMaxMpc = "%0.1f" % sliceMaxMpc
+      sliceMinMpc = "%0.2f" % sliceMinMpc
+      sliceMaxMpc = "%0.2f" % sliceMaxMpc
 
       if (dataFileNameList != None):
         dataFileName = dataFileNameList[iFile]
@@ -422,7 +422,7 @@ for iSubSample in xrange(len(subSamples)):
           rescale_position = hubble/1000./scale
           shift = lbox/2.
           rescale_velocity = 3.08567802e16/3.1558149984e16
-          command = "%s %s x y z vz vy vx | awk '{print $1*%g+%g, $2*%g+%g, $3*%g+%g, $4*%g, $5*%g, $6*%g}' > %s" % (SDFcvt_PATH, dataFile,
+          command = "%s %s x y z vz vy vx mass | awk '{print $1*%g+%g, $2*%g+%g, $3*%g+%g, $4*%g, $5*%g, $6*%g, $7}' > %s" % (SDFcvt_PATH, dataFile,
                                      rescale_position,
                                      shift,
                                      rescale_position,
@@ -470,12 +470,14 @@ for iSubSample in xrange(len(subSamples)):
             vz = float(line[3])
             vy = float(line[4])
             vx = float(line[5])
+            mass = float(line[6])
             uniqueID = i
-            outFile.write("%d %e %e %e %e %e %e\n" %(uniqueID,x,y,z,vz,vy,vx))
+            outFile.write("%d %e %e %e %e %e %e %e\n" %(uniqueID,x,y,z,
+                                                     vz,vy,vx,mass))
           else:
             outFile.write(line)
 
-        outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
+        outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
         inFile.close()
         outFile.close()
 
@@ -497,9 +499,9 @@ for iSubSample in xrange(len(subSamples)):
           y  = np.random.uniform()*lbox
           z  = np.random.uniform()*lbox
 
-          outFile.write("%d %e %e %e 0. 0. 0.\n" % (i, x,y,z))
+          outFile.write("%d %e %e %e 0. 0. 0. 0.\n" % (i, x,y,z))
 
-        outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
+        outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
         outFile.close()
 
   prevSubSample = thisSubSample
@@ -597,10 +599,10 @@ if (args.halos or args.all) and haloFileBase != "":
       if dataFormat == "sdf":
         SDFcvt_PATH = "@CMAKE_BINARY_DIR@/external/libsdf/apps/SDFcvt/SDFcvt.x86_64"
         if minHaloMass == "none": minHaloMass = 0.0
-        command = "%s %s mass id x y z vz vy vx | awk '{if ($1>%g) print $2, $3, $4, $5, $6, $7, $8}'>>%s" % (SDFcvt_PATH, dataFile, minHaloMass, outFileName )
+        command = "%s %s mass id x y z vz vy vx | awk '{if ($1>%g) print $2, $3, $4, $5, $6, $7, $8, $1}'>>%s" % (SDFcvt_PATH, dataFile, minHaloMass, outFileName )
         os.system(command)
         outFile = open(outFileName, 'a')
-        outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
+        outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
         outFile.close()
       else:
         outFile = open(outFileName, 'a')
@@ -615,11 +617,13 @@ if (args.halos or args.all) and haloFileBase != "":
             vz = float(line[haloFileVZCol])
             vy = float(line[haloFileVYCol])
             vx = float(line[haloFileVXCol])
+            mass = float(line[haloFileMCol])
 
             # write to output file
-            outFile.write("%d %e %e %e %e %e %e\n" %(iHalo,x,y,z,vz,vy,vx))
+            outFile.write("%d %e %e %e %e %e %e %e\n" %(iHalo,x,y,z,
+                                                        vz,vy,vx,mass))
 
-        outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
+        outFile.write("-99 -99 -99 -99 -99 -99 -99 -99\n")
         outFile.close()
         inFile.close()