mirror of
https://bitbucket.org/cosmicvoids/vide_public.git
synced 2025-07-05 15:51:12 +00:00
multiple improvement to cross-comparison analysis
This commit is contained in:
parent
f17e2dbdc8
commit
a04bf89265
4 changed files with 43 additions and 32 deletions
|
@ -50,69 +50,77 @@ globals().update(vars(parms))
|
|||
if not os.access(dataDir, os.F_OK):
|
||||
os.makedirs(dataDir)
|
||||
|
||||
mergerFileBase = dataDir + "/" + mergerNameBase
|
||||
if not os.access(logDir, os.F_OK):
|
||||
os.makedirs(logDir)
|
||||
|
||||
baseIDList = []
|
||||
mergerFileBase = dataDir + "/" + mergerNameBase
|
||||
|
||||
# get list of base voids
|
||||
with open(workDir+baseSampleDir+"/sample_info.dat", 'rb') as input:
|
||||
baseSample = pickle.load(input)
|
||||
baseSampleName = baseSample.fullName
|
||||
baseVoidList = np.loadtxt(workDir+baseSampleDir+"/centers_nocut_central_"+\
|
||||
baseVoidList = np.loadtxt(workDir+baseSampleDir+"/untrimmed_centers_central_"+\
|
||||
baseSampleName+".out")
|
||||
|
||||
for stack in baseSample.stacks:
|
||||
print " Stack:", stack.rMin
|
||||
|
||||
accepted = (baseVoidList[:,4] > stack.rMin) & (baseVoidList[:,4] < stack.rMax)
|
||||
baseIDList = baseVoidList[accepted][:,7]
|
||||
baseIDList = baseVoidList[:,7][accepted]
|
||||
|
||||
for (iSample, sampleDir) in enumerate(sampleDirList):
|
||||
with open(workDir+sampleDir+"/sample_info.dat", 'rb') as input:
|
||||
sample = pickle.load(input)
|
||||
|
||||
print " Working with", sample.fullName, "...",
|
||||
print " Working with", sample.fullName, "..."
|
||||
sys.stdout.flush()
|
||||
sampleName = sample.fullName
|
||||
|
||||
# get list of appropriate voids
|
||||
if sample == baseSample:
|
||||
if sample.fullName == baseSample.fullName:
|
||||
idList = baseIDList
|
||||
else:
|
||||
idList = 2
|
||||
matchList = np.loadtxt(mergerFileBase+"_"+baseSampleName+"_"+sampleName+\
|
||||
"_summary.out")
|
||||
accepted = (matchList[:,0] == baseIDList).any()
|
||||
idList = matchList[accepted][:,8]
|
||||
idList = []
|
||||
for i,testID in enumerate(matchList[:,8]):
|
||||
if np.any(testID == baseIDList):
|
||||
idList.append(matchList[i,0])
|
||||
idList = np.array(idList)
|
||||
|
||||
idList = idList.astype(int)
|
||||
|
||||
print " Found", len(idList), "voids to work with"
|
||||
|
||||
voidBaseDir = workDir+"/"+sampleDir+"stacks"
|
||||
|
||||
runSuffix = getStackSuffix(stack.zMin, stack.zMax, stack.rMin,
|
||||
stack.rMax, thisDataPortion,
|
||||
stack.rMax, dataPortion,
|
||||
customLine="selected")
|
||||
stack.rMin = 0.
|
||||
stack.rMax = 1000.
|
||||
|
||||
voidDir = voidBaseDir+"_"+runSuffix
|
||||
|
||||
if not os.access(voidDir,os.F_OK): os.makedirs(voidDir)
|
||||
|
||||
if len(idList) == 0:
|
||||
print " No voids here anyway, skipping..."
|
||||
continue
|
||||
|
||||
print " Stacking voids...",
|
||||
sys.stdout.flush()
|
||||
|
||||
STACK_PATH = CTOOLS_PATH+"/stacking/stackVoidsZero"
|
||||
|
||||
launchStack(sample, stack, STACK_PATH,
|
||||
thisDataPortion=thisDataPortion,
|
||||
thisDataPortion=dataPortion,
|
||||
logDir=logDir, voidDir=voidDir,
|
||||
zobovDir=workDir+"/"+sampleDir,
|
||||
freshStack=freshStack, INCOHERENT=False,
|
||||
freshStack=True, INCOHERENT=False,
|
||||
ranSeed=101010, summaryFile=None,
|
||||
continueRun=continueRun,
|
||||
continueRun=False,
|
||||
dataType=sample.dataType,
|
||||
idList=idList)
|
||||
|
||||
print " Profiling stacks...",
|
||||
idList=idList, rescaleOverride="")
|
||||
|
||||
print " Profiling stacks...",
|
||||
sys.stdout.flush()
|
||||
logFile = logDir+"/profile_"+sampleName+"_"+runSuffix+".out"
|
||||
launchProfile(sample, stack, voidDir=voidDir,
|
||||
|
|
|
@ -26,18 +26,18 @@ dataDir = "/home/psutter2/workspace/Voids/crossCompare/mergerTree/"
|
|||
|
||||
CTOOLS_PATH = "../../c_tools/"
|
||||
|
||||
baseSampleDir = "multidark/md_ss0.05/sample_md_ss0.05_z0.56_d00/"
|
||||
baseSampleDir = "mergertree512/mt_ss0.1/sample_md_ss0.1_z0.00_d00/"
|
||||
|
||||
sampleDirList = [
|
||||
"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/",
|
||||
"mergertree512/mt_ss1e-05/sample_md_ss1e-05_z0.00_d00/",
|
||||
#"mergertree512/mt_ss0.000175/sample_md_ss0.000175_z0.00_d00/",
|
||||
#"mergertree512/mt_ss0.0004/sample_md_ss0.0004_z0.00_d00/",
|
||||
#"mergertree512/mt_ss0.001/sample_md_ss0.001_z0.00_d00/",
|
||||
#"mergertree512/mt_ss0.002/sample_md_ss0.002_z0.00_d00/",
|
||||
"mergertree512/mt_ss0.01/sample_md_ss0.01_z0.00_d00/",
|
||||
"mergertree512/mt_hod_dr72dim2/sample_md_hod_dr72dim2_z0.00_d00/",
|
||||
"mergertree512/mt_hod_dr9mid/sample_md_hod_dr9mid_z0.00_d00/",
|
||||
"mergertree512/mt_halos_min1.2e+13/sample_md_halos_min1.2e+13_z0.00_d00/",
|
||||
]
|
||||
|
||||
dataPortion = "central"
|
||||
|
|
|
@ -66,7 +66,7 @@ for (iSample, sampleDir) in enumerate(sampleDirList):
|
|||
sampleName = sample.fullName
|
||||
|
||||
binPath = CTOOLS_PATH+"/analysis/voidOverlap"
|
||||
logFile = os.getcwd()+"/mergerTree.log"
|
||||
logFile = logDir+"/mergertree_"+baseSample.fullName+"_"+sampleName+".out"
|
||||
stepOutputFileName = outFileName + "_" + baseSample.fullName + "_" + \
|
||||
sampleName + "_"
|
||||
#stepOutputFileName = os.getcwd()+"/data/overlap_"
|
||||
|
@ -77,6 +77,7 @@ for (iSample, sampleDir) in enumerate(sampleDirList):
|
|||
continueRun=False, workDir=workDir,
|
||||
outputFile=stepOutputFileName,
|
||||
matchMethod="useID")
|
||||
#matchMethod="prox")
|
||||
|
||||
# attach columns to summary file
|
||||
#if iSample == 1:
|
||||
|
|
|
@ -157,13 +157,15 @@ for (iSample,sampleDir) in enumerate(sampleDirList):
|
|||
minHist = minHist[trim]
|
||||
maxHist = maxHist[trim]
|
||||
binCentersToUse = binCenters[trim]
|
||||
alpha = 0.75
|
||||
if dataPortion == "central":
|
||||
hatch = '/'
|
||||
hatch = '//'
|
||||
else:
|
||||
hatch = None
|
||||
fill_between(binCentersToUse, minHist, maxHist,
|
||||
label=lineLabel, color=colorList[iSample],
|
||||
alpha=0.5, hatch=hatch
|
||||
alpha=alpha,
|
||||
hatch=hatch
|
||||
)
|
||||
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue