diff --git a/python_tools/pipeline_source/prepareInputs.in.py b/python_tools/pipeline_source/prepareInputs.in.py index 4f5d863..f5a23ef 100644 --- a/python_tools/pipeline_source/prepareInputs.in.py +++ b/python_tools/pipeline_source/prepareInputs.in.py @@ -299,12 +299,20 @@ dataSampleList.append(newSample) if shiftSimZ: 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) + sliceMinForName = sliceMin else: sliceMinMpc = iSlice*lbox/numSlices sliceMaxMpc = (iSlice+1)*lbox/numSlices - sliceMin = np.interp(sliceMinMpc*100./LIGHT_SPEED, zVsDX, zVsDY) - sliceMax = np.interp(sliceMaxMpc*100./LIGHT_SPEED, zVsDX, zVsDY) + sliceMin = np.interp(sliceMinMpc*100./LIGHT_SPEED, zVsDX, zVsDY) + sliceMax = np.interp(sliceMaxMpc*100./LIGHT_SPEED, zVsDX, zVsDY) + sliceMinMpcForName = zBoxMpc + iSlice*lbox/numSlices + sliceMinForName = np.interp(sliceMinMpcForName*100./LIGHT_SPEED, \ + zVsDX, zVsDY) + + sliceMinForName = "%0.2f" % sliceMinForName sliceMin = "%0.2f" % sliceMin sliceMax = "%0.2f" % sliceMax sliceMinMpc = "%0.2f" % sliceMinMpc @@ -320,7 +328,7 @@ dataSampleList.append(newSample) mySubvolume = "%d%d" % (iX, iY) - sampleName = getSampleName(setName, sliceMin, useVel, + sampleName = getSampleName(setName, sliceMinForName, useVel, iSlice=iSlice, iVol=mySubvolume) nickName = getNickName(setName, sampleName) @@ -348,21 +356,6 @@ dataSampleList.append(newSample) useLightCone=useLightCone, subsample=str(subsample).strip('[]'))) - #for iAPSlice in xrange(numAPSlices): - # sliceWidth = float(sliceMax) - float(sliceMin) - # sliceAPMin = float(sliceMin) + iAPSlice*sliceWidth/numAPSlices - # sliceAPMax = float(sliceMin) + (iAPSlice+1)*sliceWidth/numAPSlices - # sliceAPMin = "%0.2f" % sliceAPMin - # sliceAPMax = "%0.2f" % sliceAPMax - # scriptFile.write(stackInfo.format(zMin=sliceAPMin, - # zMax=sliceAPMax, - # minRadius=minRadius, - # rescaleMode=stackRescaleMode, - # maxVoids=maxVoidsInStack, - # fittingMode=fittingMode - # )) - - scriptFile.close() return