cleaned up survey volume calculations. now uses correct z range, which corrects mean tracer separation estimation

This commit is contained in:
Paul M. Sutter 2025-04-22 20:02:30 -04:00
parent cee027a759
commit 1b4751958f
4 changed files with 20 additions and 28 deletions

View file

@ -115,10 +115,8 @@ def launchPrep(sample, binPath, workDir=None, inputDataDir=None,
# compute mean particle separation
log.write("\nFlagging edge galaxies.\n")
(boxVol, nbar) = getSurveyProps(sample.maskFile, sample.zRange[0],
sample.zRange[1], sample.zRange[0], sample.zRange[1], "all",
sample.omegaM, useComoving=useComoving)
(boxVol, nbar) = getSurveyProps(sample)
numTracers = int(open("total_particles.txt", "r").read())
sample.meanPartSep = (1.*numTracers/boxVol/nbar)**(-1/3.)
@ -153,9 +151,7 @@ def launchPrep(sample, binPath, workDir=None, inputDataDir=None,
# compute mean particle separation
# TODO - clean up this duplicate to cover all continueRun options
(boxVol, nbar) = getSurveyProps(sample.maskFile, sample.zRange[0],
sample.zRange[1], sample.zRange[0], sample.zRange[1], "all",
sample.omegaM, useComoving=useComoving)
(boxVol, nbar) = getSurveyProps(sample)
numTracers = int(open("total_particles.txt", "r").read())
sample.meanPartSep = (1.*numTracers/boxVol/nbar)**(-1/3.)

View file

@ -30,11 +30,17 @@ from backend.cosmologyTools import *
__all__=['getSurveyProps', 'getNside', 'figureOutMask', 'findEdgeGalaxies']
# -----------------------------------------------------------------------------
# returns the volume and galaxy density for a given redshit slice
def getSurveyProps(maskFile, zmin, zmax, selFunMin, selFunMax, portion,
omegaM, selectionFuncFile=None, useComoving=False):
# returns the survey volume and scaled galaxy density for a given redshit slice
def getSurveyProps(sample):
#LIGHT_SPEED = 299792.458
maskFile = sample.maskFile
zmin = sample.zBoundary[0]
zmax = sample.zBoundary[1]
selFunMin = sample.zBoundary[0]
selFunMax = sample.zBoundary[1]
omegaM = sample.omegaM
selectionFuncFile = sample.selFunFile
useComoving = sample.useComoving
mask = healpy.read_map(maskFile)
area = (1.*np.size(np.where(mask > 0)) / np.size(mask)) * 4.*np.pi