From 0f5e90b002223e2a54ec60f7b4fc9691d20dd4c4 Mon Sep 17 00:00:00 2001 From: Marco Bonici Date: Mon, 19 Apr 2021 01:26:58 +0200 Subject: [PATCH] First working beyond-limber. Still need a couple of cosmetics --- src/PowerSpectrum.jl | 6 ++++-- src/TransferFunctions.jl | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/PowerSpectrum.jl b/src/PowerSpectrum.jl index 5a924a5d..ffc38f62 100644 --- a/src/PowerSpectrum.jl +++ b/src/PowerSpectrum.jl @@ -73,8 +73,10 @@ function InterpolateAndEvaluatePowerSpectrum(CosmologicalGrid::CosmologicalGrid, PowerSpectrum.InterpolatedPowerSpectrumBeyondLimber[iidx, lidx, :] = 10 .^(InterpPmm.(log10.( CosmologicalGrid.KBeyondLimberArray[lidx, :]), - (ConvolvedDensity.ZBinArray[iidx+1]+ - ConvolvedDensity.ZBinArray[iidx])/2)) + #(ConvolvedDensity.ZBinArray[iidx+1]+ + #ConvolvedDensity.ZBinArray[iidx])/2) + 0.001 + )) end end end diff --git a/src/TransferFunctions.jl b/src/TransferFunctions.jl index 64bfdd58..1c53cd63 100644 --- a/src/TransferFunctions.jl +++ b/src/TransferFunctions.jl @@ -3,13 +3,14 @@ function EvaluateTransferFunction(CosmologicalGrid::CosmologicalGridStruct, ConvolvedDensity::ConvolvedDensityStruct, κTransferFunction::κTransferFunctionStruct, PowerSpectrum::PowerSpectrumStruct) - GrowthFactorZ = Dierckx.Spline1D(CosmologicalGrid.ZArray, - PowerSpectrum.GrowthFactor) + #GrowthFactorZ = Dierckx.Spline1D(CosmologicalGrid.ZArray, + #PowerSpectrum.GrowthFactor) for iidx in 1:length(ConvolvedDensity.ZBinArray)-1 FFTLog = FFTLogStruct(XArray = BackgroundQuantities.rZArray, FXArray = κTransferFunction.LensingSourceFunction.SourceFunctionArray[iidx, :] .* - PowerSpectrum.GrowthFactor ./ GrowthFactorZ(( - ConvolvedDensity.ZBinArray[iidx+1]+ConvolvedDensity.ZBinArray[iidx])/2)) + PowerSpectrum.GrowthFactor)# ./ GrowthFactorZ(( + #ConvolvedDensity.ZBinArray[iidx+1]+ConvolvedDensity.ZBinArray[iidx])/2)) + #TODO Understand why the elimination of this term looks to be the fix Kl, κTransferFunction.TransferFunctionArray[iidx, :, :] = CosmoCentral.EvaluateFFTLog(FFTLog, CosmologicalGrid.MultipolesArray) κTransferFunction.TransferFunctionArray[iidx, :, :] =