From ae6ebe986c3925a9b755ec3db636be74460d9755 Mon Sep 17 00:00:00 2001
From: "P.M. Sutter" <sutter@iap.fr>
Date: Mon, 11 Feb 2013 14:18:39 -0600
Subject: [PATCH] added the new HOD parameters to config files

---
 pipeline/datasets/multidark.py | 37 +++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/pipeline/datasets/multidark.py b/pipeline/datasets/multidark.py
index dc5b4e9..4b100fb 100644
--- a/pipeline/datasets/multidark.py
+++ b/pipeline/datasets/multidark.py
@@ -11,12 +11,12 @@ catalogDir = os.getenv("HOME")+"/workspace/Voids/catalogs/multidark/"
 hodPath = os.getenv("HOME")+"/projects/Voids/hod/HOD.x"
 
 # where to put the final void catalog, figures, and output logs
-voidOutputDir = os.getenv("HOME")+"/workspace/Voids/multidark/"
-figDir = os.getenv("PWD")+"/../figs/multidark/"
-logDir = os.getenv("PWD")+"/../logs/multidark/"
+voidOutputDir = os.getenv("HOME")+"/workspace/Voids/multidark_nocone/"
+figDir = os.getenv("PWD")+"/../figs/multidark_nocone/"
+logDir = os.getenv("PWD")+"/../logs/multidark_nocone/"
 
 # where to place the pipeline scripts
-scriptDir = os.getenv("PWD")+"/multidark/"
+scriptDir = os.getenv("PWD")+"/multidark_nocone/"
 
 # simulation or observation?
 dataType = "simulation"
@@ -26,7 +26,7 @@ dataFormat = "multidark"
 dataUnit = 1 # as multiple of Mpc/h
 
 # place particles on the lightcone?
-useLightCone = True
+useLightCone = False
 
 # common filename of particle files
 particleFileBase = "mdr1_particles_z"
@@ -53,7 +53,7 @@ prefix = "md_"
 
 # list of desired subsamples - these are in unts of h Mpc^-3!
 #subSamples = [0.0004]
-subSamples = ((0.1, 0.05, 0.01, 0.002, 0.001, 0.0004, 0.000175, 0.00001))
+subSamples = [0.1, 0.05, 0.01, 0.002, 0.001, 0.0004, 0.000175, 0.00001]
 
 # common filename of halo files, leave blank to ignore halos
 haloFileBase = "mdr1_halos_z"
@@ -78,15 +78,34 @@ haloFileNumComLines = 0
 #   numZobovDivisions: how many sub-volumes per dimension will zobov process
 #   numZobovThreads: how many sub-volumes to process at once?   
 numZobovDivisions = 4
-numZobovThreads = 4
+numZobovThreads = 2
 
 # simulation information
-numPart = 1024*1024*1024
+numPart = 2048*2048*2048
 lbox = 1000 # Mpc/h
 omegaM = 0.27
 hubble = 0.70
 
-galDens = 0.000225
+#galDens = 0.000225
+hodParmList = [
+  {'name'       : "dr9mid", #BOSS: Manera et al. 2012, eq. 26
+   'Mmin'       : 0.0,
+   'M1'         : 1.e14,
+   'sigma_logM' : 0.596,
+   'alpha'      : 1.0127,
+   'Mcut'       : 1.19399e13,
+   'galDens'    : 0.00016,
+  },
+
+  {'name'       : "dr7dim2",
+   'Mmin'       : 1.99525e12,
+   'M1'         : 3.80189e13,
+   'sigma_logM' : 0.21,
+   'alpha'      : 1.12,
+   'Mcut'       : 6.91831e11,
+   'galDens'    : 0.02,
+  }
+]
 
 # END CONFIGURATION
 # -----------------------------------------------------------------------------