committing misc local edits before mergering with GPL'd versions

c_tools/analysis/voidOverlap.cpp

@@ -265,7 +265,7 @@ int main(int argc, char **argv) {
       rdist = catalog1.voids[iVoid1].matches[0].dist;
       rdist /= catalog1.voids[iVoid1].radius;
 
-      fprintf(fp, "%d %.2f %.2f %.2f %.2f %.2f %d %d\n", voidID, 
+      fprintf(fp, "%d %.4f %.4f %.4f %.4f %.4f %d %d\n", voidID, 
                                    catalog1.voids[iVoid1].radiusMpc,
                                    rRatio, 
                                    commonVolRatio,

crossCompare/analysis/datasetsToAnalyze.py

@@ -2,15 +2,23 @@
 
 
 workDir = "/home/psutter2/workspace/Voids/"
-dataDir = "/home/psutter2/workspace/Voids/multidark/crossCompare/mergerTree/"
+dataDir = "/home/psutter2/workspace/Voids/crossCompare/mergerTree/"
  
 
 CTOOLS_PATH = "../../c_tools/"
 
-baseSampleDir = "multidark/md_ss0.000175/sample_md_ss0.000175_z0.56_d00/"
+baseSampleDir = "multidark/md_ss0.05/sample_md_ss0.05_z0.56_d00/"
 
 sampleDirList = [ 
-                  "multidark/md_ss0.0004/sample_md_ss0.0004_z0.56_d00/",
+                  "multidark/md_ss1e-05/sample_md_ss1e-05_z0.56_d00/",
+                  #"multidark/md_ss0.000175/sample_md_ss0.000175_z0.56_d00/",
+                  #"multidark/md_ss0.0004/sample_md_ss0.0004_z0.56_d00/",
+                  #"multidark/md_ss0.001/sample_md_ss0.001_z0.56_d00/",
+                  #"multidark/md_ss0.002/sample_md_ss0.002_z0.56_d00/",
+                  "multidark/md_ss0.01/sample_md_ss0.01_z0.56_d00/",
+                  "multidark/md_hod_dr72dim2/sample_md_hod_dr72dim2_z0.56_d00/",
+                  "multidark/md_hod_dr9mid/sample_md_hod_dr9mid_z0.56_d00/",
+                  "multidark/md_halos_min1.2e+13/sample_md_halos_min1.2e+13_z0.56_d00/",
                 ]
 
 dataPortion = "central"

crossCompare/analysis/mergerTree.py

@@ -44,6 +44,7 @@ for (iSample, sampleDir) in enumerate(sampleDirList):
     sample = pickle.load(input)
 
   print " Working with", sample.fullName, "...",
+  sys.stdout.flush()
 
   sampleName = sample.fullName
 
@@ -53,11 +54,12 @@ for (iSample, sampleDir) in enumerate(sampleDirList):
                        sampleName + "_"
   #stepOutputFileName = os.getcwd()+"/data/overlap_"
 
-  launchVoidOverlap(baseSample, sample, workDir+baseSampleDir, 
-                    workDir+sampleDir, binPath, 
+  launchVoidOverlap(sample, baseSample, workDir+sampleDir, 
+                    workDir+baseSampleDir, binPath, 
                     thisDataPortion="central", logFile=logFile,
                     continueRun=False, workDir=workDir,
-                    outputFile=stepOutputFileName)
+                    outputFile=stepOutputFileName,
+                    matchMethod="proximity")
 
   # attach columns to summary file
   #if iSample == 1:

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_nocone/"
-figDir = os.getenv("PWD")+"/../figs/multidark_nocone/"
-logDir = os.getenv("PWD")+"/../logs/multidark_nocone/"
+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_nocone/"
+scriptDir = os.getenv("PWD")+"/multidark/"
 
 # simulation or observation?
 dataType = "simulation"
@@ -30,15 +30,19 @@ useLightCone = False
 
 # common filename of particle files
 particleFileBase = "mdr1_particles_z"
+particleFileDummy = ''
 
 # list of file numbers for the particle files
 # to get particle file name, we take particleFileBase+fileNum
 #fileNums = ["0.53"]
-fileNums = ["0.0", "0.53", "1.0"]
+fileNums = ["0.0"]
+#fileNums = ["0.0", "0.53", "1.0"]
 
 # redshift of each file in the above list
 #redshifts = ["0.53"]
-redshifts = ["0.0", "0.53", "1.0"]
+redshifts = ["0.0"]
+#redshifts = ["0.0", "0.53"]
+#redshifts = ["0.0", "0.53", "1.0"]
 
 # how many independent slices along the z-axis?
 numSlices = 1
@@ -52,7 +56,7 @@ numSubvolumes = 1
 prefix = "md_"
 
 # list of desired subsamples - these are in unts of h Mpc^-3!
-#subSamples = [0.0004]
+#subSamples = [0.01]
 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
@@ -78,11 +82,12 @@ haloFileNumComLines = 0
 # adjust these two parameters given the memory contraints on your system:
 #   numZobovDivisions: how many sub-volumes per dimension will zobov process
 #   numZobovThreads: how many sub-volumes to process at once?   
-numZobovDivisions = 4
+numZobovDivisions = 2
 numZobovThreads = 2
 
 # simulation information
-numPart = 2048*2048*2048
+numPart = 100000000
+#numPart = 2048*2048*2048
 lbox = 1000 # Mpc/h
 omegaM = 0.27
 hubble = 0.70

pipeline/generateCatalog.py

@@ -69,7 +69,7 @@ for sample in dataSampleList:
   if (sample.dataType == "simulation"):
     fp.write("Particles placed on lightcone: %g\n" % sample.useLightCone)
     fp.write("Peculiar velocities included: %g\n" % sample.usePecVel)
-    fp.write("Additional subsampling fraction: %g\n" % sample.subsample)
+    fp.write("Additional subsampling fraction: %s\n" % sample.subsample[-1])
     fp.write("Simulation box length (Mpc/h): %g\n" % sample.boxLen)
     fp.write("Simulation Omega_M: %g\n" % sample.omegaM)
     fp.write("Number of simulation subvolumes: %s\n" % sample.numSubvolumes)

python_tools/pipeline_source/prepareCatalogs.in.py

@@ -434,6 +434,7 @@ if (args.halos or args.all) and haloFileBase != "":
 
       if dataFormat == "sdf":
         # TODO process halo file with SDFcvt
+        SDFcvt_PATH = "@CMAKE_BINARY_DIR@/ep_build/sdf/bin/SDFcvt/"
         outFile = open(catalogDir+"/"+sampleName+".dat", 'w')
         outFile.write("-99 -99 -99 -99 -99 -99 -99\n")
         outFile.close()