cleaned out AP from prepareInputs

This commit is contained in:
P.M. Sutter 2014-06-02 10:22:21 -04:00
parent 27344eb1f7
commit 455fcdb9d8

View file

@ -170,32 +170,15 @@ startCatalogStage = {startCatalogStage}
endCatalogStage = {endCatalogStage} endCatalogStage = {endCatalogStage}
regenerateFlag = False regenerateFlag = False
#ZOBOV_PATH = "@CMAKE_BINARY_DIR@/c_tools/zobov2/"
ZOBOV_PATH = "@CMAKE_BINARY_DIR@/zobov/" ZOBOV_PATH = "@CMAKE_BINARY_DIR@/zobov/"
CTOOLS_PATH = "@CMAKE_BINARY_DIR@/c_tools/" CTOOLS_PATH = "@CMAKE_BINARY_DIR@/c_tools/"
freshStack = True
errorBars = "CALCULATED"
numIncoherentRuns = 100
ranSeed = 101010
useComoving = False
bias = 1.16
dataPortions = {dataPortions}
dataSampleList = [] dataSampleList = []
# for the A-P test
minVoidsToFit = {minVoidsToFit}
minPartToFit = {minPartToFit}
fittingMode = '{fittingMode}'
""" """
scriptFile.write(header.format(startCatalogStage=startCatalogStage, scriptFile.write(header.format(startCatalogStage=startCatalogStage,
endCatalogStage=endCatalogStage, endCatalogStage=endCatalogStage,
continueRun=continueRun, continueRun=continueRun,
dataPortions=dataPortions,
minVoidsToFit=minVoidsToFit,
minPartToFit=minPartToFit,
fittingMode=fittingMode,
)) ))
dataInfo = """ dataInfo = """
@ -233,8 +216,6 @@ newSample = Sample(dataFile = "{dataFile}",
includeInHubble = True, includeInHubble = True,
partOfCombo = False, partOfCombo = False,
{autoStack} {autoStack}
numAPSlices = {numAPSlices},
isCombo = False,
boxLen = {boxLen}, boxLen = {boxLen},
usePecVel = {usePecVel}, usePecVel = {usePecVel},
numSubvolumes = {numSubvolumes}, numSubvolumes = {numSubvolumes},
@ -323,7 +304,6 @@ dataSampleList.append(newSample)
omegaM=Om, omegaM=Om,
boxLen=lbox, boxLen=lbox,
autoStack=autoStack, autoStack=autoStack,
numAPSlices=numAPSlices,
usePecVel=useVel, usePecVel=useVel,
minRadius=minRadius, minRadius=minRadius,
numSubvolumes=numSubvolumes, numSubvolumes=numSubvolumes,