From 33cc210bbe53d80de16af215e5590b7680b2b62b Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Wed, 27 Feb 2013 16:28:00 -0600 Subject: [PATCH] fixed issues with slicing in redshift or real space --- .../pipeline_source/prepareCatalogs.in.py | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index 7c36497..9157d89 100755 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -165,26 +165,22 @@ newSample.addStack(0.0, 5.0, 90, 95, False, False) for i in xrange(len(zVsDY)): zVsDX[i] = vp.angularDiameter(zVsDY[i], Om=Om) - if useLightCone: - boxWidthZ = np.interp(vp.angularDiameter(zBox,Om=Om)+100. / \ - LIGHT_SPEED*lbox, zVsDX, zVsDY)-zBox - dzSafe = 0.03 - else: - boxWidthZ = np.interp(vp.angularDiameter(zBox,Om=Om)+100. / \ - LIGHT_SPEED*lbox, zVsDX, zVsDY)-zBox - #boxWidthZ = lbox*100./LIGHT_SPEED - dzSafe = 0.0 + boxWidthZ = np.interp(vp.angularDiameter(zBox,Om=Om)+100. / \ + LIGHT_SPEED*lbox, zVsDX, zVsDY)-zBox for iSlice in xrange(numSlices): - sliceMin = zBox + dzSafe + iSlice*(boxWidthZ-2.*dzSafe)/numSlices - sliceMax = zBox + dzSafe + (iSlice+1)*(boxWidthZ-2.*dzSafe)/numSlices if useLightCone: + dzSafe = 0.03 + sliceMin = zBox + dzSafe + iSlice*(boxWidthZ-2.*dzSafe)/numSlices + sliceMax = zBox + dzSafe + (iSlice+1)*(boxWidthZ-2.*dzSafe)/numSlices sliceMinMpc = sliceMin*LIGHT_SPEED/100. sliceMaxMpc = sliceMax*LIGHT_SPEED/100. else: - sliceMinMpc = LIGHT_SPEED/100.*vp.angularDiameter(sliceMin, Om=Om) - sliceMaxMpc = LIGHT_SPEED/100.*vp.angularDiameter(sliceMax, Om=Om) + sliceMinMpc = zBoxMpc + iSlice*lbox/numSlices + sliceMaxMpc = zBoxMpc + (iSlice+1)*lbox/numSlices + sliceMin = np.interp(sliceMinMpc*100./LIGHT_SPEED, zVsDX, zVsDY) + sliceMax = np.interp(sliceMaxMpc*100./LIGHT_SPEED, zVsDX, zVsDY) sliceMin = "%0.2f" % sliceMin sliceMax = "%0.2f" % sliceMax