eliminated extranneous/deprecated parameters: zRange (for filtering voids on redshift range during pruning) and fakeDensity (for inserting boundary particles)

python_source/backend/classes.py

@@ -71,16 +71,14 @@ class Sample:
   outputDir = ""
   maskFile = "rast_window_512.fits"
   nsideForContour = 128
-  selFunFile = "czselfunc.all.dr72dim.dat"
+  selFunFile = None
   zBoundary = (0.0, 0.1)
   zBoundaryMpc = (0., 300)
   boundaryWidth = 0.02
   shiftSimZ = False
-  zRange    = (0.0, 0.1)
   omegaM    = 0.27
   minVoidRadius = -1
   meanPartSep = 1 # calculated mean particle separation
-  fakeDensity = 0.01 # TODO - remove
   hasWeightedVolumes = False
   profileBinSize = 2 # Mpc
   autoNumInStack = -1 # set to >0 to automatically generate stacks of size N
@@ -104,9 +102,9 @@ class Sample:
 
   def __init__(self, dataFile="", fullName="", dataUnit=1,
                nickName="", maskFile="", nsideForContour=128, selFunFile="",
-               zBoundary=(), zRange=(), zBoundaryMpc=(), boundaryWidth=0.1,
+               zBoundary=(), zBoundaryMpc=(), boundaryWidth=0.1,
                shiftSimZ=False, meanPartSep = 1,
-               minVoidRadius=-1, fakeDensity=0.01, volumeLimited=True,
+               minVoidRadius=-1, volumeLimited=True,
                numAPSlices=1, hasWeightedVolumes=False,
                includeInHubble=True, partOfCombo=False, isCombo=False, 
                comboList=(), profileBinSize=2.0,
@@ -126,10 +124,8 @@ class Sample:
     self.zBoundaryMpc = zBoundaryMpc
     self.boundaryWidth = boundaryWidth
     self.shiftSimZ = shiftSimZ
-    self.zRange = zRange
     self.minVoidRadius = minVoidRadius
     self.meanPartSep = meanPartSep
-    self.fakeDensity = fakeDensity
     self.hasWeightedVolumes = hasWeightedVolumes
     self.volumeLimited = volumeLimited
     self.includeInHubble = includeInHubble 

python_source/backend/launchers.py

@@ -91,14 +91,13 @@ def launchPrep(sample, binPath, workDir=None, inputDataDir=None,
       params %s
       zMin %g
       zMax %g
-      density_fake %g
       %s
       %s
       omegaM %g
       nsideForContour %g
       """ % (datafile, sample.maskFile, outputFile,
              outputDir+"/zobov_slice_"+sampleName+".par",
-             sample.zBoundary[0], sample.zBoundary[1], sample.fakeDensity,
+             sample.zBoundary[0], sample.zBoundary[1],
              useComovingFlag, inputParameterFlag, sample.omegaM,
              sample.nsideForContour)
 
@@ -629,8 +628,6 @@ def launchPrune(sample, binPath,
     cmd += " --extraInfo=" + outputDir+"/zobov_slice_"+str(sampleName)+".par"
     cmd += " --tolerance=" + str(boundaryTolerance)
     cmd += " --maxCentralDen=" + str(maxDen)
-    cmd += " --zMin=" + str(sample.zRange[0])
-    cmd += " --zMax=" + str(sample.zRange[1])
     cmd += " --rMin=" + str(minRadius)
     cmd += " --numVoids=" + str(numVoids)
     cmd += observationLine

python_source/vide_pipeline/vide_prepare_simulation.py

@@ -204,7 +204,6 @@ newSample = Sample(dataFile = "{dataFile}",
                    nickName = "{nickName}",
                    dataType = "simulation",
                    zBoundary = ({zMin}, {zMax}),
-                   zRange    = ({zMin}, {zMax}),
                    zBoundaryMpc = ({zMinMpc}, {zMaxMpc}),
                    shiftSimZ = {shiftSimZ},
                    omegaM    = {omegaM},