From 377fb8eed8823f6f4fc637292a8cfd38eec358cc Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 4 Nov 2013 17:10:25 -0600 Subject: [PATCH 01/12] added new option to automatically generate stacks with a given number of voids --- python_tools/void_python_tools/backend/classes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python_tools/void_python_tools/backend/classes.py b/python_tools/void_python_tools/backend/classes.py index 43fee14..ed72bc1 100644 --- a/python_tools/void_python_tools/backend/classes.py +++ b/python_tools/void_python_tools/backend/classes.py @@ -58,7 +58,7 @@ class Sample: dataType = "observation" dataFormat = "sdss" dataFile = "lss.dr72dim.dat" - dataUNit = 1 + dataUnit = 1 fullName = "lss.dr72dim.dat" nickName = "dim" zobovDir = "" @@ -72,11 +72,13 @@ class Sample: minVoidRadius = 5 fakeDensity = 0.01 profileBinSize = 2 # Mpc + autoNumInStack = -1 # set to >0 to automatically generate stacks of size N volumeLimited = True includeInHubble = True partOfCombo = False isCombo = False useLCDM = False # if True, convert population to comoving coordinates + comboList = [] # applies to simulations only @@ -99,7 +101,7 @@ class Sample: numSubvolumes=1, mySubvolume=1, dataFormat="sdss", useLCDM=False, dataType="observation", - subsample=1.0, useLightCone=True): + subsample=1.0, useLightCone=True, autoNumInStack=-1): self.dataFile = dataFile self.fullName = fullName self.nickName = nickName @@ -129,6 +131,7 @@ class Sample: self.useLightCone = useLightCone self.dataUnit = dataUnit self.useLCDM = useLCDM + self.autoNumInStack = autoNumInStack self.stacks = [] From f83616a1fb6c1d9d2f0ee3d6c6f2b609d726c5b2 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 4 Nov 2013 17:12:31 -0600 Subject: [PATCH 02/12] whoops forgot an import! From 751c807ff535613b46234db31c780b297c510400 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 4 Nov 2013 21:45:43 -0600 Subject: [PATCH 03/12] added some logic to handle combo samples when building automatic stacks From 3dda3677bb5cefeb64deeccbb658ed3fbfba3de0 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Tue, 5 Nov 2013 17:24:41 -0600 Subject: [PATCH 04/12] more coherent handling of combo stacks with custom widths From cde70952c401deabcc3737abc9979a207345053a Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 18 Nov 2013 08:00:19 -0600 Subject: [PATCH 05/12] added logarithmic binning for profiles --- .../pipeline_source/prepareCatalogs.in.py | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index a210e7e..abf8189 100644 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -143,6 +143,7 @@ startAPStage = {startAPStage} endAPStage = {endAPStage} regenerateFlag = False +#ZOBOV_PATH = "@CMAKE_BINARY_DIR@/c_tools/zobov2/" ZOBOV_PATH = "@CMAKE_BINARY_DIR@/zobov/" CTOOLS_PATH = "@CMAKE_BINARY_DIR@/c_tools/" freshStack = True @@ -180,6 +181,7 @@ numZobovThreads = {numZobovThreads} numZobovDivisions=numZobovDivisions, numZobovThreads=numZobovThreads)) + sampleInfo = """ newSample = Sample(dataFile = "{dataFile}", dataFormat = "{dataFormat}", @@ -195,6 +197,7 @@ newSample = Sample(dataFile = "{dataFile}", profileBinSize = "auto", includeInHubble = True, partOfCombo = False, + {autoStack} isCombo = False, boxLen = {boxLen}, usePecVel = {usePecVel}, @@ -212,24 +215,46 @@ newSample.addStack(0.0, 5.0, 5 , 10, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 10, 15, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 15, 20, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 20, 25, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 25, 30, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 30, 35, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 35, 40, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 40, 45, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 45, 50, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 50, 55, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 55, 60, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 60, 65, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 65, 70, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 70, 75, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 75, 80, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 80, 85, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 85, 90, False, False, rescaleMode="rv") newSample.addStack(0.0, 5.0, 90, 95, False, False, rescaleMode="rv") +newSample.addStack(0.0, 5.0, 95, 100, False, False, rescaleMode="rv") """ - elif stackMode == "auto": - stackInfo = """ -newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+2, True, False, rescaleMode="rv") -newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+4, True, False, rescaleMode="rv") -newSample.addStack({zMin}, {zMax}, 2*{minRadius}+2, 2*{minRadius}+6, True, False, rescaleMode="rv") -newSample.addStack({zMin}, {zMax}, 2*{minRadius}+6, 2*{minRadius}+10, True, False, rescaleMode="rv") -newSample.addStack({zMin}, {zMax}, 2*{minRadius}+10, 2*{minRadius}+18, True, False, rescaleMode="rv") -newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, False, rescaleMode="rv") - """ + elif stackMode == "log": + stackInfo = "" + rMin = 10 + rMax = 100 + rStart = rMin + rEnd = rMin + dlogR = 0.25 + while rEnd < rMax: + rEnd = (1+0.5*dlogR)*rStart/(1-0.5*dlogR) + + stackInfo += """newSample.addStack({zMin}, {zMax}"""+ ", %g, %g, True, False, rescaleMode='rv')" % (rStart, rEnd) + + rStart = rEnd + +# elif stackMode == "auto": +# stackInfo = """ +#newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+2, True, False, rescaleMode="rv") +#newSample.addStack({zMin}, {zMax}, 2*{minRadius} , 2*{minRadius}+4, True, False, rescaleMode="rv") +#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+2, 2*{minRadius}+6, True, False, rescaleMode="rv") +#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+6, 2*{minRadius}+10, True, False, rescaleMode="rv") +#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+10, 2*{minRadius}+18, True, False, rescaleMode="rv") +#newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, False, rescaleMode="rv") +# """ else: stackInfo = """ # {zMin}, {zMax}, {minRadius} @@ -286,6 +311,8 @@ newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, Fal nickName = getNickName(setName, sampleName) + autoStack = "" + if stackMode == "auto": autoStack = "autoNumInStack = 400," scriptFile.write(sampleInfo.format(dataFile=dataFileName, dataFormat=dataFormat, dataUnit=dataUnit, @@ -297,6 +324,7 @@ newSample.addStack({zMin}, {zMax}, 2*{minRadius}+18, 2*{minRadius}+24, True, Fal zMaxMpc=sliceMaxMpc, omegaM=Om, boxLen=lbox, + autoStack=autoStack, usePecVel=useVel, minRadius=minRadius, numSubvolumes=numSubvolumes, From 4cdcb2f48b9ca7938d3794d3c3f1740f7f1a3c14 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 24 Nov 2013 16:00:15 -0600 Subject: [PATCH 06/12] fixed bug in overlap launcher --- python_tools/void_python_tools/backend/launchers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 48e53a5..b966e83 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -455,8 +455,8 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, str(sampleName2)+".par" cmd += " --centerFile2=" + sample2Dir + \ "/trimmed_nodencut_barycenters_"+thisDataPortion+"_"+str(sampleName2)+".out" - cmd += " --shapeFile2=" + sample1Dir + \ - "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName1)+".out" + cmd += " --shapeFile2=" + sample2Dir + \ + "/trimmed_nodencut_shapes_"+thisDataPortion+"_"+str(sampleName2)+".out" cmd += " --zoneFile2=" + sample2Dir+"/voidZone_" + \ str(sampleName2)+".dat" cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \ From 7e001aff29aa48f2a39fbb4f5ee0f3ef13707bef Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 24 Nov 2013 16:00:35 -0600 Subject: [PATCH 07/12] turned back off mocks at redshift caps --- c_tools/mock/generateFromCatalog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c_tools/mock/generateFromCatalog.cpp b/c_tools/mock/generateFromCatalog.cpp index 6992a1b..202d9b0 100644 --- a/c_tools/mock/generateFromCatalog.cpp +++ b/c_tools/mock/generateFromCatalog.cpp @@ -369,7 +369,7 @@ void generateSurfaceMask(generateFromCatalog_info& args , fp = fopen("mock_sphere.txt", "w"); for (int q = 0; q < 0; q++) { - //for (int p = 0; p < full_mask_list.size(); p++) { + //for (int q = 0; q < full_mask_list.size(); q++) { vec3 v = mask.pix2vec(full_mask_list[q]); Position p; From 573f4437af87ea2d4a29217e13354a005474b0ab Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 24 Nov 2013 16:01:07 -0600 Subject: [PATCH 08/12] added code for special AHF-like output of void catalogs for merger tree analysis From fa0d46c55aaee76f050f8ef03778c0e40d18cea6 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sat, 30 Nov 2013 22:19:58 -0600 Subject: [PATCH 09/12] moved all of sample_info printing to launchGenerate --- pipeline/generateCatalog.py | 25 ------------------- python_tools/pipeline_source/defaults.py | 1 + .../pipeline_source/prepareCatalogs.in.py | 6 ++--- .../void_python_tools/backend/launchers.py | 24 ++++++++++++++++-- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/pipeline/generateCatalog.py b/pipeline/generateCatalog.py index 70828ef..a76482b 100755 --- a/pipeline/generateCatalog.py +++ b/pipeline/generateCatalog.py @@ -77,31 +77,6 @@ for sample in dataSampleList: if not os.access(zobovDir, os.F_OK): os.makedirs(zobovDir) - # save this sample's information - with open(zobovDir+"/sample_info.dat", 'w') as output: - pickle.dump(sample, output, pickle.HIGHEST_PROTOCOL) - - fp = open(zobovDir+"/sample_info.txt", 'w') - fp.write("Sample name: %s\n" % sample.fullName) - fp.write("Sample nickname: %s\n" % sample.nickName) - fp.write("Data type: %s\n" % sample.dataType) - fp.write("Redshift range: %f - %f\n" %(sample.zBoundary[0],sample.zBoundary[1])) - - #fp.write("Estimated mean particle separation: %g\n" % sample.minVoidRadius) - - if (sample.dataType == "simulation"): - fp.write("Particles placed on lightcone: %g\n" % sample.useLightCone) - fp.write("Peculiar velocities included: %g\n" % sample.usePecVel) - if (len(sample.subsample) == 1): - fp.write("Additional subsampling fraction: %s\n" % sample.subsample) - else: - 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) - fp.write("My subvolume index: %s\n" % sample.mySubvolume) - fp.close() - # --------------------------------------------------------------------------- if (startCatalogStage <= 1) and (endCatalogStage >= 1) and not sample.isCombo: print " Extracting tracers from catalog...", diff --git a/python_tools/pipeline_source/defaults.py b/python_tools/pipeline_source/defaults.py index 360bfd6..c0b3328 100644 --- a/python_tools/pipeline_source/defaults.py +++ b/python_tools/pipeline_source/defaults.py @@ -121,6 +121,7 @@ haloFileVYCol = 4 haloFileVZCol = 5 haloFileColSep = ',' haloFileNumComLines = 0 +haloFilePosRescale = 1.0 # rescaling necessary to get Mpc/h # adjust these two parameters given the memory contraints on your system: # numZobovDivisions: how many sub-volumes per dimension will zobov process diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index abf8189..e2e28c8 100644 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -681,9 +681,9 @@ if (args.halos or args.all) and haloFileBase != "": if iHalo < haloFileNumComLines: continue line = line.split(haloFileColSep) if minHaloMass == "none" or float(line[haloFileMCol]) > minHaloMass: - x = float(line[haloFileXCol]) - y = float(line[haloFileYCol]) - z = float(line[haloFileZCol]) + x = float(line[haloFileXCol]) * haloFilePosRescale + y = float(line[haloFileYCol]) * haloFilePosRescale + z = float(line[haloFileZCol]) * haloFilePosRescale vz = float(line[haloFileVZCol]) vy = float(line[haloFileVYCol]) vx = float(line[haloFileVXCol]) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index b966e83..dab68b9 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -261,7 +261,26 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, meanSep = (1.*numTracers/boxVol)**(-1/3.) - fp = open(zobovDir+"/sample_info.txt", 'a') + # save this sample's information + with open(zobovDir+"/sample_info.dat", 'w') as output: + pickle.dump(sample, output, pickle.HIGHEST_PROTOCOL) + + fp = open(zobovDir+"/sample_info.txt", 'w') + fp.write("Sample name: %s\n" % sample.fullName) + fp.write("Sample nickname: %s\n" % sample.nickName) + fp.write("Data type: %s\n" % sample.dataType) + fp.write("Redshift range: %f - %f\n" %(sample.zBoundary[0],sample.zBoundary[1])) + if (sample.dataType == "simulation"): + fp.write("Particles placed on lightcone: %g\n" % sample.useLightCone) + fp.write("Peculiar velocities included: %g\n" % sample.usePecVel) + if (len(sample.subsample) == 1): + fp.write("Additional subsampling fraction: %s\n" % sample.subsample) + else: + 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) + fp.write("My subvolume index: %s\n" % sample.mySubvolume) fp.write("Estimated volume (cubic Mpc/h): %g\n" % boxVol) fp.write("Number of real (non-boundary) tracers: %d\n" % numTracers) fp.write("Total number of tracers: %d\n" % numTotal) @@ -310,8 +329,9 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None, cmd = "./%s >> %s 2>&1" % (vozScript, logFile) os.system(cmd) +#cmd = "%s/../c_tools/zobov2/jozov2/jozov2 %s %s %s %s %s %g %s >> %s 2>&1" % \ - cmd = "%s/../c_tools/zobov2/jozov2/jozov2 %s %s %s %s %s %g %s >> %s 2>&1" % \ + cmd = "%s/jozov %s %s %s %s %s %g %s >> %s 2>&1" % \ (binPath, \ zobovDir+"/adj_"+sampleName+".dat", \ zobovDir+"/vol_"+sampleName+".dat", \ From 1274573b0107fecb1ed58f6c3473c4366ffe7377 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sat, 30 Nov 2013 22:22:04 -0600 Subject: [PATCH 10/12] added import of pickle --- python_tools/void_python_tools/backend/launchers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index dab68b9..810c423 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -35,6 +35,7 @@ import sys from pylab import figure from netCDF4 import Dataset from void_python_tools.backend.classes import * +import pickle import void_python_tools.apTools as vp NetCDFFile = Dataset From 586496601fd0737795d7fa10a53c7dd68df38818 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 1 Dec 2013 20:49:28 -0600 Subject: [PATCH 11/12] added a version of pruneVoids whichs filters the output in a way compatible with the standard emrger trees format From 842c2beaaa7a0b9b64b865d37c179447b401bdd4 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Sun, 1 Dec 2013 20:59:00 -0600 Subject: [PATCH 12/12] changed name in headers --- analysis/datasetsToAnalyze.py | 2 +- analysis/xcor.py | 2 +- build_tools/gather_sources.py | 6 +- c_tools/analysis/voidOverlap.cpp | 116 ++++++++++++++++-- c_tools/libzobov/contour_pixels.cpp | 2 +- c_tools/libzobov/loadZobov.cpp | 11 +- c_tools/libzobov/particleInfo.cpp | 12 +- c_tools/mock/generateFromCatalog.cpp | 2 +- c_tools/mock/generateMock.cpp | 2 +- c_tools/mock/generateTestMock.cpp | 2 +- c_tools/mock/loaders/basic_loader.cpp | 2 +- c_tools/mock/loaders/flash_loader.cpp | 2 +- c_tools/mock/loaders/gadget_loader.cpp | 2 +- c_tools/mock/loaders/multidark_loader.cpp | 2 +- c_tools/mock/loaders/ramses_loader.cpp | 2 +- c_tools/mock/loaders/sdf_loader.cpp | 2 +- c_tools/mock/loaders/simulation_loader.cpp | 2 +- c_tools/stacking/pruneVoids.cpp | 2 +- crossCompare/analysis/makeCocenterProfiles.py | 2 +- crossCompare/analysis/overlapVoids.py | 2 +- crossCompare/plotting/plotCocenterProfiles.py | 2 +- crossCompare/plotting/plotDenMaps.py | 2 +- python_tools/pipeline_source/defaults.py | 2 +- .../pipeline_source/prepareCatalogs.in.py | 2 +- python_tools/setup.py | 2 +- python_tools/void_python_tools/__init__.py | 2 +- .../void_python_tools/apTools/__init__.py | 2 +- .../apTools/chi2/__init__.py | 2 +- .../apTools/chi2/cosmologyTools.py | 2 +- .../apTools/profiles/__init__.py | 2 +- .../apTools/profiles/getSurveyProps.py | 2 +- .../void_python_tools/backend/__init__.py | 2 +- .../void_python_tools/backend/classes.py | 2 +- .../void_python_tools/backend/launchers.py | 2 +- .../void_python_tools/plotting/__init__.py | 2 +- .../void_python_tools/plotting/plotDefs.py | 2 +- .../void_python_tools/plotting/plotTools.py | 2 +- .../void_python_tools/xcor/__init__.py | 2 +- zobov/vozinit.c | 24 ++-- 39 files changed, 173 insertions(+), 64 deletions(-) diff --git a/analysis/datasetsToAnalyze.py b/analysis/datasetsToAnalyze.py index 412de5c..1d3a922 100644 --- a/analysis/datasetsToAnalyze.py +++ b/analysis/datasetsToAnalyze.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./crossCompare/analysis/datasetsToAnalyze.py +# VIDE -- Void IDentification and Examination -- ./crossCompare/analysis/datasetsToAnalyze.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/analysis/xcor.py b/analysis/xcor.py index 2343443..fda7440 100755 --- a/analysis/xcor.py +++ b/analysis/xcor.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #+ -# VIDE -- Void IDEntification pipeline -- ./crossCompare/analysis/mergerTree.py +# VIDE -- Void IDentification and Examination -- ./crossCompare/analysis/mergerTree.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/build_tools/gather_sources.py b/build_tools/gather_sources.py index bb30185..472a4de 100644 --- a/build_tools/gather_sources.py +++ b/build_tools/gather_sources.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./build_tools/gather_sources.py +# VIDE -- Void IDentification and Examination -- ./build_tools/gather_sources.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # @@ -40,7 +40,7 @@ def apply_license(license, relimit, filename): def apply_python_license(filename): license="""#+ -# VIDE -- Void IDEntification pipeline -- @FILENAME@ +# VIDE -- Void IDentification and Examination -- @FILENAME@ # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # @@ -67,7 +67,7 @@ def apply_python_license(filename): def apply_cpp_license(filename): license="""/*+ - VIDE -- Void IDEntification pipeline -- @FILENAME@ + VIDE -- Void IDentification and Examination -- @FILENAME@ Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/analysis/voidOverlap.cpp b/c_tools/analysis/voidOverlap.cpp index 1f2e560..122c404 100644 --- a/c_tools/analysis/voidOverlap.cpp +++ b/c_tools/analysis/voidOverlap.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/analysis/voidOverlap.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/analysis/voidOverlap.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter @@ -73,6 +73,7 @@ typedef struct voidStruct { float nearestEdge; float barycenter[3]; float ellipticity; + float eigv1[3], eigv2[3], eigv3[3], eig[3]; std::vector matches; int numMatches; int numBigMatches; @@ -375,6 +376,87 @@ int main(int argc, char **argv) { catalog1.voids[iVoid1].radius; float ellipRatio = catalog2.voids[iVoid2].ellipticity / catalog1.voids[iVoid1].ellipticity; + + // find angles between major axes, etc. + int iMaj1, iMed1, iMin1; + int iMaj2, iMed2, iMin2; + float eig1[3], eig2[3]; + float eigv1[6], eigv2[6]; + float cosThetaMaj, cosThetaMed, cosThetaMin; + + for (int i = 0; i < 3; i++) { + eig1[i] = catalog1.voids[iVoid1].eig[i]; + eigv1[0,i] = catalog1.voids[iVoid1].eigv1[i]; + eigv1[1,i] = catalog1.voids[iVoid1].eigv2[i]; + eigv1[2,i] = catalog1.voids[iVoid1].eigv3[i]; + eig2[i] = catalog2.voids[iVoid2].eig[i]; + eigv2[0,i] = catalog2.voids[iVoid2].eigv1[i]; + eigv2[1,i] = catalog2.voids[iVoid2].eigv2[i]; + eigv2[2,i] = catalog2.voids[iVoid2].eigv3[i]; + } + + if (eig1[0] > eig1[1] && eig1[0] > eig1[2]) iMaj1 = 0; + if (eig1[1] > eig1[2] && eig1[1] > eig1[0]) iMaj1 = 1; + if (eig1[2] > eig1[1] && eig1[2] > eig1[0]) iMaj1 = 2; + if (eig1[0] > eig1[1] && eig1[0] < eig1[2]) iMed1 = 0; + if (eig1[1] > eig1[2] && eig1[1] < eig1[0]) iMed1 = 1; + if (eig1[2] > eig1[1] && eig1[2] < eig1[0]) iMed1 = 2; + if (eig1[0] < eig1[1] && eig1[0] < eig1[2]) iMin1 = 0; + if (eig1[1] < eig1[2] && eig1[1] < eig1[0]) iMin1 = 1; + if (eig1[2] < eig1[1] && eig1[2] < eig1[0]) iMin1 = 2; + + if (eig2[0] > eig2[1] && eig2[0] > eig2[2]) iMaj2 = 0; + if (eig2[1] > eig2[2] && eig2[1] > eig2[0]) iMaj2 = 1; + if (eig2[2] > eig2[1] && eig2[2] > eig2[0]) iMaj2 = 2; + if (eig2[0] > eig2[1] && eig2[0] < eig2[2]) iMed2 = 0; + if (eig2[1] > eig2[2] && eig2[1] < eig2[0]) iMed2 = 1; + if (eig2[2] > eig2[1] && eig2[2] < eig2[0]) iMed2 = 2; + if (eig2[0] < eig2[1] && eig2[0] < eig2[2]) iMin2 = 0; + if (eig2[1] < eig2[2] && eig2[1] < eig2[0]) iMin2 = 1; + if (eig2[2] < eig2[1] && eig2[2] < eig2[0]) iMin2 = 2; + +//printf("EIG CHECK %d %d %e %e %e %d %e %e %e %d\n", iVoid1, iVoid2, eig1[0], eig1[1], eig1[2], iMin1, eig2[0], eig2[1], eig2[2], iMin2); + cosThetaMaj = (eigv1[iMaj1,0]*eigv2[iMaj2,0] + + eigv1[iMaj1,1]*eigv2[iMaj2,1] + + eigv1[iMaj1,2]*eigv2[iMaj2,2]); +//printf("EIG CHECK %d %d %e %e %e %e %e %e %e\n", iVoid1, iVoid2, eigv1[iMaj1,0], eigv1[iMaj1,1], eigv1[iMaj1,2], eigv2[iMaj2,0], eigv2[iMaj2,1], eigv2[iMaj2,2], cosThetaMaj); + + + if (fabs(cosThetaMaj) > 0.) cosThetaMaj = acos(fabs(cosThetaMaj)); + + float majAxisRatio = eig2[iMaj2]/eig1[iMaj1]; + float minAxisRatio = eig2[iMin2]/eig1[iMin1]; + +// TEST +/* + if (catalog1.voids[iVoid1].voidID == 267 && + catalog2.voids[iVoid2].voidID == 346) { + + int voidID1 = catalog1.voids[iVoid1].voidID; + for (iZ1 = 0; iZ1 < catalog1.void2Zones[voidID1].numZones; iZ1++) { + zoneID1 = catalog1.void2Zones[voidID1].zoneIDs[iZ1]; + for (p1 = 0; p1 < catalog1.zones2Parts[zoneID1].numPart; p1++) { + partID1 = catalog1.zones2Parts[zoneID1].partIDs[p1]; + printf("VOID1 %e %e %e\n", catalog1.part[partID1].x, + catalog1.part[partID1].y, + catalog1.part[partID1].z); + } + } + + int voidID2 = catalog2.voids[iVoid2].voidID; + for (iZ2 = 0; iZ2 < catalog2.void2Zones[voidID2].numZones; iZ2++) { + zoneID2 = catalog2.void2Zones[voidID2].zoneIDs[iZ2]; + for (p2 = 0; p2 < catalog2.zones2Parts[zoneID2].numPart; p2++) { + partID2 = catalog2.zones2Parts[zoneID2].partIDs[p2]; + printf("VOID1 %e %e %e\n", catalog2.part[partID2].x, + catalog2.part[partID2].y, + catalog2.part[partID2].z); + } + } + + } +*/ +// END TEST commonVolRatio = catalog1.voids[iVoid1].matches[0].commonVolOrig / //catalog1.voids[iVoid1].numPart; catalog1.voids[iVoid1].vol; @@ -383,7 +465,7 @@ int main(int argc, char **argv) { rdist = catalog1.voids[iVoid1].matches[0].dist; rdist /= catalog1.voids[iVoid1].radius; - fprintf(fp, "%d %.4f %.4f %e %e %.4f %d %d %d %e %e %e\n", voidID, + fprintf(fp, "%d %.4f %.4f %e %e %.4f %d %d %d %e %e %e %e %e %e\n", voidID, //fprintf(fp, "%d %.4f %.4f %.4f %.4f %.4f %d %d %d\n", voidID, catalog1.voids[iVoid1].radiusMpc, rRatio, @@ -395,10 +477,14 @@ int main(int argc, char **argv) { catalog2.voids[iVoid2].voidID, catalog1.voids[iVoid1].matches[0].merit, ellipRatio, - catalog1.voids[iVoid1].densCon); + catalog1.voids[iVoid1].densCon, + cosThetaMaj, + majAxisRatio, + minAxisRatio + ); } else { - fprintf(fp, "%d %.4f 0.0 0.0 0.0 0.0 0.0 0 0 0 0.0 0.0\n", voidID, + fprintf(fp, "%d %.4f 0.0 0.0 0.0 0.0 0.0 0 0 0 0.0 0.0 0.0 0.0 0.0\n", voidID, catalog1.voids[iVoid1].radiusMpc); } } // end printing @@ -601,17 +687,29 @@ void loadCatalog(const char *partFile, const char *volFile, printf(" Loading shapes\n"); fp = fopen(shapeFile, "r"); iVoid = 0; - float tempEllip; + float tempEllip, eig[3], eigv1[3], eigv2[3], eigv3[3]; fgets(line, sizeof(line), fp); while (fgets(line, sizeof(line), fp) != NULL) { sscanf(line, "%d %f %f %f %f %f %f %f %f %f %f %f %f %f\n", - &tempInt, &tempEllip, &tempFloat, &tempFloat, &tempFloat, - &tempFloat, &tempFloat, &tempFloat, - &tempFloat, &tempFloat, &tempFloat, - &tempFloat, &tempFloat, &tempFloat); + &tempInt, &tempEllip, &eig[0], &eig[1], &eig[2], + &eigv1[0], &eigv1[1], &eigv1[2], + &eigv2[0], &eigv2[1], &eigv2[2], + &eigv3[0], &eigv3[1], &eigv3[2]); //if (iVoid < 10) printf("SHAPE %d %d %e\n", iVoid, catalog.voids[iVoid].voidID, tempEllip); catalog.voids[iVoid].ellipticity = tempEllip; + catalog.voids[iVoid].eig[0] = eig[0]; + catalog.voids[iVoid].eig[1] = eig[1]; + catalog.voids[iVoid].eig[2] = eig[2]; + catalog.voids[iVoid].eigv1[0] = eigv1[0]; + catalog.voids[iVoid].eigv1[1] = eigv1[1]; + catalog.voids[iVoid].eigv1[2] = eigv1[2]; + catalog.voids[iVoid].eigv2[0] = eigv2[0]; + catalog.voids[iVoid].eigv2[1] = eigv2[1]; + catalog.voids[iVoid].eigv2[2] = eigv2[2]; + catalog.voids[iVoid].eigv3[0] = eigv3[0]; + catalog.voids[iVoid].eigv3[1] = eigv3[1]; + catalog.voids[iVoid].eigv3[2] = eigv3[2]; iVoid++; } fclose(fp); diff --git a/c_tools/libzobov/contour_pixels.cpp b/c_tools/libzobov/contour_pixels.cpp index c2f8447..4ca2247 100644 --- a/c_tools/libzobov/contour_pixels.cpp +++ b/c_tools/libzobov/contour_pixels.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/libzobov/contour_pixels.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/libzobov/contour_pixels.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/libzobov/loadZobov.cpp b/c_tools/libzobov/loadZobov.cpp index e34ef45..2b5fbb1 100644 --- a/c_tools/libzobov/loadZobov.cpp +++ b/c_tools/libzobov/loadZobov.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/libzobov/loadZobov.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/libzobov/loadZobov.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter @@ -167,7 +167,14 @@ bool loadZobov(const char *descName, const char *adjName, const char *voidsName, cerr << "Error in text stream at line " << lineid << endl; abort(); } - + +/* + sscanf(line.c_str(), "%d %d %d %f %f %d %d %f %d %f %f\n", &orderId, &volId, + &coreParticle, &coreDensity, &volumeZone, &numParticlesInZone, + &numZonesInVoid, + &volumeVoid, &numInVoid, &densityContrast, &probability); +*/ + z.allVoids[volId].proba = probability; z.allVoids[volId].volume = volumeVoid; z.allVoids[volId].numParticles = numInVoid; diff --git a/c_tools/libzobov/particleInfo.cpp b/c_tools/libzobov/particleInfo.cpp index e368eec..1ab86f4 100644 --- a/c_tools/libzobov/particleInfo.cpp +++ b/c_tools/libzobov/particleInfo.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/libzobov/particleInfo.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/libzobov/particleInfo.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter @@ -93,21 +93,25 @@ bool loadParticleInfo(ParticleInfo& info, info.particles.resize(numpart); offset = info.ranges[0][0]; - mul = info.ranges[0][1] - info.ranges[0][0]; + // TEST PMS NON-COBIC BOXES + mul = 1.0; + //mul = info.ranges[0][1] - info.ranges[0][0]; f.beginCheckpoint(); for (int i = 0; i < numpart; i++) info.particles[i].x = mul*f.readReal32(); f.endCheckpoint(); offset = info.ranges[1][0]; - mul = info.ranges[1][1] - info.ranges[1][0]; + mul = 1.0; + //mul = info.ranges[1][1] - info.ranges[1][0]; f.beginCheckpoint(); for (int i = 0; i < numpart; i++) info.particles[i].y = mul*f.readReal32(); f.endCheckpoint(); offset = info.ranges[2][0]; - mul = info.ranges[2][1] - info.ranges[2][0]; + mul = 1.0; + //mul = info.ranges[2][1] - info.ranges[2][0]; f.beginCheckpoint(); for (int i = 0; i < numpart; i++) info.particles[i].z = mul*f.readReal32(); diff --git a/c_tools/mock/generateFromCatalog.cpp b/c_tools/mock/generateFromCatalog.cpp index 202d9b0..f114208 100644 --- a/c_tools/mock/generateFromCatalog.cpp +++ b/c_tools/mock/generateFromCatalog.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/generateFromCatalog.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/generateFromCatalog.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp index a6defff..1635a05 100644 --- a/c_tools/mock/generateMock.cpp +++ b/c_tools/mock/generateMock.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/generateMock.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/generateMock.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/generateTestMock.cpp b/c_tools/mock/generateTestMock.cpp index 4ab3467..1099dbb 100644 --- a/c_tools/mock/generateTestMock.cpp +++ b/c_tools/mock/generateTestMock.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/generateTestMock.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/generateTestMock.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/basic_loader.cpp b/c_tools/mock/loaders/basic_loader.cpp index 0e346d6..31254b6 100644 --- a/c_tools/mock/loaders/basic_loader.cpp +++ b/c_tools/mock/loaders/basic_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/basic_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/basic_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/flash_loader.cpp b/c_tools/mock/loaders/flash_loader.cpp index b8b6439..02e7df7 100644 --- a/c_tools/mock/loaders/flash_loader.cpp +++ b/c_tools/mock/loaders/flash_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/flash_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/flash_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/gadget_loader.cpp b/c_tools/mock/loaders/gadget_loader.cpp index a0562d1..6abd00d 100644 --- a/c_tools/mock/loaders/gadget_loader.cpp +++ b/c_tools/mock/loaders/gadget_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/gadget_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/gadget_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/multidark_loader.cpp b/c_tools/mock/loaders/multidark_loader.cpp index b1acf10..3d9c8a8 100644 --- a/c_tools/mock/loaders/multidark_loader.cpp +++ b/c_tools/mock/loaders/multidark_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/multidark_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/multidark_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/ramses_loader.cpp b/c_tools/mock/loaders/ramses_loader.cpp index a7e3a95..f6bcf81 100644 --- a/c_tools/mock/loaders/ramses_loader.cpp +++ b/c_tools/mock/loaders/ramses_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/ramses_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/ramses_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/sdf_loader.cpp b/c_tools/mock/loaders/sdf_loader.cpp index 55cb279..eb02eb0 100644 --- a/c_tools/mock/loaders/sdf_loader.cpp +++ b/c_tools/mock/loaders/sdf_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/sdf_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/sdf_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/mock/loaders/simulation_loader.cpp b/c_tools/mock/loaders/simulation_loader.cpp index 014ebd2..e5cc53e 100644 --- a/c_tools/mock/loaders/simulation_loader.cpp +++ b/c_tools/mock/loaders/simulation_loader.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/mock/loaders/simulation_loader.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/mock/loaders/simulation_loader.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/c_tools/stacking/pruneVoids.cpp b/c_tools/stacking/pruneVoids.cpp index f220869..08212d5 100644 --- a/c_tools/stacking/pruneVoids.cpp +++ b/c_tools/stacking/pruneVoids.cpp @@ -1,5 +1,5 @@ /*+ - VIDE -- Void IDEntification pipeline -- ./c_tools/stacking/pruneVoids.cpp + VIDE -- Void IDentification and Examination -- ./c_tools/stacking/pruneVoids.cpp Copyright (C) 2010-2013 Guilhem Lavaux Copyright (C) 2011-2013 P. M. Sutter diff --git a/crossCompare/analysis/makeCocenterProfiles.py b/crossCompare/analysis/makeCocenterProfiles.py index 53075c1..685aa85 100755 --- a/crossCompare/analysis/makeCocenterProfiles.py +++ b/crossCompare/analysis/makeCocenterProfiles.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #+ -# VIDE -- Void IDEntification pipeline -- ./pipeline/apAnalysis.py +# VIDE -- Void IDentification and Examination -- ./pipeline/apAnalysis.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/crossCompare/analysis/overlapVoids.py b/crossCompare/analysis/overlapVoids.py index 27001c4..f20450a 100755 --- a/crossCompare/analysis/overlapVoids.py +++ b/crossCompare/analysis/overlapVoids.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #+ -# VIDE -- Void IDEntification pipeline -- ./crossCompare/analysis/mergerTree.py +# VIDE -- Void IDentification and Examination -- ./crossCompare/analysis/mergerTree.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/crossCompare/plotting/plotCocenterProfiles.py b/crossCompare/plotting/plotCocenterProfiles.py index 8a2c0a8..fbb861e 100755 --- a/crossCompare/plotting/plotCocenterProfiles.py +++ b/crossCompare/plotting/plotCocenterProfiles.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #+ -# VIDE -- Void IDEntification pipeline -- ./pipeline/apAnalysis.py +# VIDE -- Void IDentification and Examination -- ./pipeline/apAnalysis.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/crossCompare/plotting/plotDenMaps.py b/crossCompare/plotting/plotDenMaps.py index 6eb2e11..a690bfb 100755 --- a/crossCompare/plotting/plotDenMaps.py +++ b/crossCompare/plotting/plotDenMaps.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #+ -# VIDE -- Void IDEntification pipeline -- ./pipeline/apAnalysis.py +# VIDE -- Void IDentification and Examination -- ./pipeline/apAnalysis.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/pipeline_source/defaults.py b/python_tools/pipeline_source/defaults.py index c0b3328..2a3de54 100644 --- a/python_tools/pipeline_source/defaults.py +++ b/python_tools/pipeline_source/defaults.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./pipeline/datasets/mergertree.py +# VIDE -- Void IDentification and Examination -- ./pipeline/datasets/mergertree.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index e2e28c8..8f3a90f 100644 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/pipeline_source/prepareCatalogs.in.py +# VIDE -- Void IDentification and Examination -- ./python_tools/pipeline_source/prepareCatalogs.in.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/setup.py b/python_tools/setup.py index ad0518b..aa7286d 100644 --- a/python_tools/setup.py +++ b/python_tools/setup.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/setup.py +# VIDE -- Void IDentification and Examination -- ./python_tools/setup.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/__init__.py b/python_tools/void_python_tools/__init__.py index a84eedd..5dd3665 100644 --- a/python_tools/void_python_tools/__init__.py +++ b/python_tools/void_python_tools/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/apTools/__init__.py b/python_tools/void_python_tools/apTools/__init__.py index 8b6353c..f6af7d9 100644 --- a/python_tools/void_python_tools/apTools/__init__.py +++ b/python_tools/void_python_tools/apTools/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/apTools/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/apTools/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/apTools/chi2/__init__.py b/python_tools/void_python_tools/apTools/chi2/__init__.py index f4956d6..5d9f6d2 100644 --- a/python_tools/void_python_tools/apTools/chi2/__init__.py +++ b/python_tools/void_python_tools/apTools/chi2/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/apTools/chi2/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/apTools/chi2/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py b/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py index 4b9b35d..341e7ec 100644 --- a/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py +++ b/python_tools/void_python_tools/apTools/chi2/cosmologyTools.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/apTools/chi2/cosmologyTools.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/apTools/chi2/cosmologyTools.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/apTools/profiles/__init__.py b/python_tools/void_python_tools/apTools/profiles/__init__.py index d4b802c..14c0fa1 100644 --- a/python_tools/void_python_tools/apTools/profiles/__init__.py +++ b/python_tools/void_python_tools/apTools/profiles/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/apTools/profiles/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/apTools/profiles/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/apTools/profiles/getSurveyProps.py b/python_tools/void_python_tools/apTools/profiles/getSurveyProps.py index f707e09..c3d37c7 100644 --- a/python_tools/void_python_tools/apTools/profiles/getSurveyProps.py +++ b/python_tools/void_python_tools/apTools/profiles/getSurveyProps.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/apTools/profiles/getSurveyProps.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/apTools/profiles/getSurveyProps.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/backend/__init__.py b/python_tools/void_python_tools/backend/__init__.py index 43a9c88..998fc76 100644 --- a/python_tools/void_python_tools/backend/__init__.py +++ b/python_tools/void_python_tools/backend/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/backend/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/backend/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/backend/classes.py b/python_tools/void_python_tools/backend/classes.py index ed72bc1..c15716c 100644 --- a/python_tools/void_python_tools/backend/classes.py +++ b/python_tools/void_python_tools/backend/classes.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/backend/classes.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/backend/classes.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 810c423..cc851bb 100644 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/backend/launchers.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/backend/launchers.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/plotting/__init__.py b/python_tools/void_python_tools/plotting/__init__.py index ff0bc67..c53f8af 100644 --- a/python_tools/void_python_tools/plotting/__init__.py +++ b/python_tools/void_python_tools/plotting/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/plotting/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/plotting/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/plotting/plotDefs.py b/python_tools/void_python_tools/plotting/plotDefs.py index 1980cdc..fbdaf02 100644 --- a/python_tools/void_python_tools/plotting/plotDefs.py +++ b/python_tools/void_python_tools/plotting/plotDefs.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/plotting/plotDefs.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/plotting/plotDefs.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/plotting/plotTools.py b/python_tools/void_python_tools/plotting/plotTools.py index 33a4db7..8dca84b 100644 --- a/python_tools/void_python_tools/plotting/plotTools.py +++ b/python_tools/void_python_tools/plotting/plotTools.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/plotting/plotTools.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/plotting/plotTools.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/python_tools/void_python_tools/xcor/__init__.py b/python_tools/void_python_tools/xcor/__init__.py index 26f152d..31dc0a5 100644 --- a/python_tools/void_python_tools/xcor/__init__.py +++ b/python_tools/void_python_tools/xcor/__init__.py @@ -1,5 +1,5 @@ #+ -# VIDE -- Void IDEntification pipeline -- ./python_tools/void_python_tools/plotting/__init__.py +# VIDE -- Void IDentification and Examination -- ./python_tools/void_python_tools/plotting/__init__.py # Copyright (C) 2010-2013 Guilhem Lavaux # Copyright (C) 2011-2013 P. M. Sutter # diff --git a/zobov/vozinit.c b/zobov/vozinit.c index c1e7865..ea22173 100644 --- a/zobov/vozinit.c +++ b/zobov/vozinit.c @@ -22,7 +22,8 @@ int main(int argc, char *argv[]) { int p; int nvp, nvpall, nvpbuf, nvpmin, nvpmax, nvpbufmin, nvpbufmax; /* yes, the insurance */ float width, width2, totwidth, totwidth2, bf, s, g; - float border, boxsize; + float widthX, widthY, widthZ; + float border, boxsize, boxsizeX, boxsizeY, boxsizeZ; float c[3]; int numGuards; int b[3]; @@ -34,12 +35,12 @@ int main(int argc, char *argv[]) { printf("arg1: position file\n"); printf("arg2: buffer size (default 0.1)\n"); printf("arg3: box size\n"); - printf("arg4: number of divisions (default 2)\n"); - printf("arg5: suffix describing this run\n"); - printf("arg6: number of parallel threads\n"); - printf("arg7: location of voboz executables\n"); - printf("arg8: output directory\n"); - printf("arg9: index of mock galaxies\n\n"); + printf("arg6: number of divisions (default 2)\n"); + printf("arg7: suffix describing this run\n"); + printf("arg8: number of parallel threads\n"); + printf("arg9: location of voboz executables\n"); + printf("arg10: output directory\n"); + printf("arg11: index of mock galaxies\n\n"); exit(0); } posfile = argv[1]; @@ -81,7 +82,8 @@ int main(int argc, char *argv[]) { np = posread(posfile,&rfloat,1./boxsize); /* Boxsize should be the range in r, yielding a range 0-1 */ - width = 1./(float)numdiv; + width = boxsize/(float)numdiv; + //width = 1./(float)numdiv; width2 = 0.5*width; if (border > 0.) bf = border; else bf = 0.1; @@ -171,12 +173,10 @@ int main(int argc, char *argv[]) { for (b[0]=0;b[0]