guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-08 01:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

committing misc local edits before mergering with GPL'd versions

Browse source
This commit is contained in:
P.M. Sutter 2013-03-03 21:00:37 -06:00
parent af4f6cf41e
commit 29cb7a5a45
6 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crossCompare/analysis/datasetsToAnalyze.py
View file

@ -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"

8
crossCompare/analysis/mergerTree.py
View file

@ -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: