From 863ad3be410c9ee3b2e8472afd65728f902ebab4 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <guilhem.lavaux@gmail.com>
Date: Sun, 15 Jan 2012 16:40:30 -0500
Subject: [PATCH] Revert "Add more mask"

This reverts commit 9274da1587f5c3fbf20dec5f087c87cda2f67fdd.
---
 mytools/contour_pixels.cpp      |  9 -----
 mytools/contour_pixels.hpp      |  2 --
 mytools/generateFromCatalog.cpp | 61 ---------------------------------
 mytools/generateFromCatalog.ggo |  5 +--
 voztie.c                        |  6 ++--
 5 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/mytools/contour_pixels.cpp b/mytools/contour_pixels.cpp
index 6486ae7..725e6a5 100644
--- a/mytools/contour_pixels.cpp
+++ b/mytools/contour_pixels.cpp
@@ -7,17 +7,8 @@ using namespace std;
 
 static const bool DEBUG = true;
 
-void computeFilledPixels(Healpix_Map<float>& m, vector<int>& filled)
-{
-  filled.clear();
-  for (int p = 0; p < m.Npix(); p++)
-    if (m[p] > 0)
-      filled.push_back(p);
-}
-
 void computeContourPixels(Healpix_Map<float>& m, vector<int>& contour)
 {
-  contour.clear();
   for (int p = 0; p < m.Npix(); p++)
     {
       fix_arr<int, 8> result;
diff --git a/mytools/contour_pixels.hpp b/mytools/contour_pixels.hpp
index d3a893b..bdf209c 100644
--- a/mytools/contour_pixels.hpp
+++ b/mytools/contour_pixels.hpp
@@ -4,8 +4,6 @@
 #include <vector>
 #include <healpix_map.h>
 
-
 void computeContourPixels(Healpix_Map<float>& map, std::vector<int>& contour);
-void computeFilledPixels(Healpix_Map<float>& map, std::vector<int>& contour);
 
 #endif
diff --git a/mytools/generateFromCatalog.cpp b/mytools/generateFromCatalog.cpp
index 62279ef..c41f150 100644
--- a/mytools/generateFromCatalog.cpp
+++ b/mytools/generateFromCatalog.cpp
@@ -92,65 +92,6 @@ void generateGalaxiesInCube(NYU_VData& data, ParticleData& output_data)
   
 }
 
-static double cube(double x)
-{
-  return x*x*x;
-}
-
-void generateBoxMask(generateFromCatalog_info& args ,
-                         Healpix_Map<float>& mask,
-                         vector<int>& pixel_list,
-                         NYU_VData& data,
-                         ParticleData& output_data)
-{
-  int idx = -1;
-  int insertion = 0;
-  double volume = pixel_list.size()*1.0/mask.Npix()*4*M_PI;
-  int numToInsert;
-
-  idx = output_data.id_mask;
-
-  cout << "Generate box mask..." << endl;
-
-  double Rmax = output_data.Lmax, t = args.box_thickness_arg;
-  output_data.Lmax += args.box_thickness_arg;
-
-
-  volume *= Rmax*Rmax/1e6 * args.box_thickness_arg;
-  numToInsert = (int)floor(volume*args.box_density_arg);
-
-  for (int i = 0; i < numToInsert; i++)
-    {
-      Position p;
-      bool stop_here;
-
-      do
-        {
-
-          int p0 = (int)floor(drand48()*pixel_list.size());
-          vec3 v = mask.pix2vec(pixel_list[p0]);
-          double r = Rmax*pow(drand48()*(cube(1+t/Rmax)-1) + 1,1./3);
-
-          p.xyz[0] = v.x * r;
-          p.xyz[1] = v.y * r;
-          p.xyz[2] = v.z * r;
-
-          stop_here = true;
-          for (int j = 0; j < 3; j++)
-            {
-              if (p.xyz[j] > output_data.box[j][0] ||
-                  p.xyz[j] < output_data.box[j][1])
-                stop_here = false;
-            }
-        }
-      while (!stop_here);
-
-      output_data.pos.push_back(p);
-      output_data.id_gal.push_back(idx);
-      insertion++;
-    }
-}
-
 void generateSurfaceMask(generateFromCatalog_info& args ,
 			 Healpix_Map<float>& mask, 
 			 vector<int>& pixel_list, 
@@ -355,8 +296,6 @@ int main(int argc, char **argv)
 
   generateGalaxiesInCube(data, output_data);
   generateSurfaceMask(args_info, mask, pixel_list, data, output_data);
-  computeFilledPixels(mask,pixel_list);
-  generateBoxMask(args_info, mask, pixel_list, data, output_data);
   
   saveForZobov(output_data, args_info.output_arg, args_info.params_arg);
   //  saveData(output_data);
diff --git a/mytools/generateFromCatalog.ggo b/mytools/generateFromCatalog.ggo
index 2a41f4f..bda567d 100644
--- a/mytools/generateFromCatalog.ggo
+++ b/mytools/generateFromCatalog.ggo
@@ -8,7 +8,4 @@ option "mask" - "Healpix mask of unobserved data (in Equatorial coordinates)" st
 option "density_fake" - "Number density of boundary fake tracers (1 h^3/ Mpc^3)"  double optional default="1"
 
 option "output"	- "Filename of particle datafile" string required
-option "params" - "Output parameters of the datacube" string required
-
-option "box_thickness"  - "Thickness of the limiting mask" double optional default="1"
-option  "box_density" - "Fake Galaxy density on the box" double optional default="1"
+option "params" - "Output parameters of the datacube" string required
\ No newline at end of file
diff --git a/voztie.c b/voztie.c
index d779989..242bf88 100644
--- a/voztie.c
+++ b/voztie.c
@@ -94,9 +94,9 @@ int main(int argc, char *argv[]) {
 	fread(&volstemp,1,sizeof(float),part);
 	if (vols[orig[p]] > -1.)
 	  if (fabs(vols[orig[p]]-volstemp)/volstemp > 1.5e-3) {
-//	    printf("Inconsistent volumes for p. %d: (%10g,%10g)!\n",
-//		   orig[p],vols[orig[p]],volstemp);
-//	    exit(0);
+	    printf("Inconsistent volumes for p. %d: (%10g,%10g)!\n",
+		   orig[p],vols[orig[p]],volstemp);
+	    exit(0);
 	  }
 	vols[orig[p]] = volstemp;
       }