From 260385d9d0ca11999932fc35b3139aeafc38b52f Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 25 Feb 2013 23:04:24 -0600 Subject: [PATCH] fix to prepareCatalogs to correctly handle non-lightconed outputs --- .../pipeline_source/prepareCatalogs.in.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/python_tools/pipeline_source/prepareCatalogs.in.py b/python_tools/pipeline_source/prepareCatalogs.in.py index 95bc8b8..7c36497 100755 --- a/python_tools/pipeline_source/prepareCatalogs.in.py +++ b/python_tools/pipeline_source/prepareCatalogs.in.py @@ -170,15 +170,21 @@ newSample.addStack(0.0, 5.0, 90, 95, False, False) LIGHT_SPEED*lbox, zVsDX, zVsDY)-zBox dzSafe = 0.03 else: - boxWidthZ = lbox*100./LIGHT_SPEED + boxWidthZ = np.interp(vp.angularDiameter(zBox,Om=Om)+100. / \ + LIGHT_SPEED*lbox, zVsDX, zVsDY)-zBox + #boxWidthZ = lbox*100./LIGHT_SPEED dzSafe = 0.0 for iSlice in xrange(numSlices): - sliceMin = zBox + dzSafe + iSlice*(boxWidthZ-dzSafe)/numSlices - sliceMax = zBox + dzSafe + (iSlice+1)*(boxWidthZ-dzSafe)/numSlices + 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. + if useLightCone: + 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) sliceMin = "%0.2f" % sliceMin sliceMax = "%0.2f" % sliceMax