From 6868a026f5ba237df76904b674b7da5dd65b6bc5 Mon Sep 17 00:00:00 2001
From: "P.M. Sutter" <sutter@iap.fr>
Date: Thu, 15 Nov 2012 06:47:06 -0600
Subject: [PATCH] fixed bug where zobov wasn't getting correct nmber of
 threads; fixed and now hard-coded to 2 parallel threads

---
 pipeline/datasets/multidark.py                | 62 +++++++++++++++++++
 .../void_python_tools/backend/launchers.py    |  4 +-
 2 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 pipeline/datasets/multidark.py

diff --git a/pipeline/datasets/multidark.py b/pipeline/datasets/multidark.py
new file mode 100644
index 0000000..ae7d8c4
--- /dev/null
+++ b/pipeline/datasets/multidark.py
@@ -0,0 +1,62 @@
+import os
+
+# -----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+# CONFIGURATION
+
+# directory for the input simulation/observational particle files
+catalogDir = os.getenv("HOME")+"/workspace/Voids/catalogs/multidark/"
+
+# path to HOD code
+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/"
+
+# where to place the pipeline scripts
+scriptDir = os.getenv("PWD")+"/multidark/"
+
+# simulation or observation?
+dataType = "simulation"
+
+# available formats for simulation: gadget, multidark
+dataFormat = "multidark"
+dataUnit = 1 # as multiple of Mpc/h
+
+# place particles on the lightcone?
+useLightCone = True
+
+# common filename of particle files
+particleFileBase = "mdr1_particles_z"
+
+# list of file numbers for the particle files
+# to get particle file name, we take particleFileBase+fileNum
+fileNums = (("0.0", "0.53", "1.0"))
+
+# redshift of each file in the above list
+redshifts = (("0.0", "0.53", "1.0"))
+
+# how many independent slices along the z-axis?
+numSlices = 4
+
+# how many subdivisions along the x- and y- axis?
+#   ( = 2 will make 4 subvolumes for each slice, = 3 will make 9, etc.)
+numSubvolumes = 1
+
+# prefix to give all outputs
+prefix = "md_"
+
+# list of desired subsamples
+subSamples = ((0.1, 0.05, 0.01, 0.002, 0.001, 0.0004, 0.0002))
+
+# simulation information
+numPart = 1024*1024*1024
+lbox = 1000 # Mpc/h
+omegaM = 0.27
+hubble = 0.70
+
+# END CONFIGURATION
+# -----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py
index 33ef904..e7a1fc6 100755
--- a/python_tools/void_python_tools/backend/launchers.py
+++ b/python_tools/void_python_tools/backend/launchers.py
@@ -200,8 +200,8 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None):
     numThreads = 2
    
     cmd = "%s/vozinit %s 0.1 1.0 %g %s %g %s %s %s >& %s" % \
-          (binPath, datafile,  numThreads, \
-                      "_"+sampleName, sample.numSubDivisions, \
+          (binPath, datafile,  sample.numSubDivisions, \
+                      "_"+sampleName, numThreads, \
                       binPath, zobovDir, maskIndex, logFile)
     os.system(cmd)