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

@ -169,14 +169,9 @@ def getVolNorm(sampleDir):
else:
maskFile = sampleDir+"/"+os.path.basename(sample.maskFile)
print("Using maskfile found in: " + maskFile)
props = getSurveyProps(maskFile, sample.zBoundary[0],
sample.zBoundary[1],
sample.zBoundary[0],
sample.zBoundary[1],
"all",
sample.omegaM,
selectionFuncFile=sample.selFunFile,
useComoving=sample.useComoving)
props = getSurveyProps(sample)
surveyVol = props[0]
volNormObs = nGal/surveyVol

View file

@ -80,12 +80,7 @@ def plotNumberFunction(catalogList,
if sample.dataType == "observation":
maskFile = sample.maskFile
boxVol = sp.getSurveyProps(maskFile,
sample.zBoundary[0], sample.zBoundary[1],
sample.zRange[0], sample.zRange[1], "all",
selectionFuncFile=sample.selFunFile,
omegaM=sample.omegaM)[0]
boxVol = sp.getSurveyProps(sample)[0]
else:
boxVol = sample.boxLen*sample.boxLen*(sample.zBoundaryMpc[1] -
sample.zBoundaryMpc[0])
@ -110,7 +105,7 @@ def plotNumberFunction(catalogList,
lowerbound = hist - sig
upperbound = hist + sig
mean = np.log10(hist/boxVol)
lowerbound = np.log10(lowerbound/boxVol)
upperbound = np.log10(upperbound/boxVol)
@ -137,8 +132,8 @@ def plotNumberFunction(catalogList,
linewidth=3)
distList.append((binCentersToUse, mean, lower, upper))
plt.legend(loc = "upper right", fancybox=True, prop={'size':14})
plt.legend(loc = "lower left", fancybox=True, prop={'size':14})
plt.savefig(figDir+"/fig_"+plotName+".pdf", bbox_inches="tight")
#plt.savefig(figDir+"/fig_"+plotName+".eps", bbox_inches="tight")