Implemented (yet another) new boundary handling scheme, whereby we scan radially along survey edge while flagging nearest galaxies. The prepObservation routine was significantly cleaned up to accommodate this, but it was ultimately implemented in python (surveyTools.py) for ease of prototyping, with the intent to move it back into C later.

Some general housekeeping, making sure some new parameters are passed around correctly, and removing the storage of some unused files.

This update is considered HIGHLY UNSTABLE. It will almost certainly break somewhere for simulations.

Still under active development.

python_source/backend/classes.py

@@ -69,7 +69,7 @@ class Sample:
   nickName = "dim"
   outputDir = ""
   maskFile = "rast_window_512.fits"
-  nsideForMask = 128
+  nsideForContour = 128
   selFunFile = "czselfunc.all.dr72dim.dat"
   zBoundary = (0.0, 0.1)
   zBoundaryMpc = (0., 300)
@@ -78,7 +78,8 @@ class Sample:
   zRange    = (0.0, 0.1)
   omegaM    = 0.27
   minVoidRadius = -1
-  fakeDensity = 0.01
+  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
@@ -101,9 +102,9 @@ class Sample:
   stacks = []
 
   def __init__(self, dataFile="", fullName="", dataUnit=1,
-               nickName="", maskFile="", nsideForMask=128, selFunFile="",
+               nickName="", maskFile="", nsideForContour=128, selFunFile="",
                zBoundary=(), zRange=(), zBoundaryMpc=(), boundaryWidth=0.1,
-               shiftSimZ=False,
+               shiftSimZ=False, meanPartSep = 1,
                minVoidRadius=-1, fakeDensity=0.01, volumeLimited=True,
                numAPSlices=1, hasWeightedVolumes=False,
                includeInHubble=True, partOfCombo=False, isCombo=False, 
@@ -118,7 +119,7 @@ class Sample:
     self.fullName = fullName
     self.nickName = nickName
     self.maskFile = maskFile
-    self.nsideForMask = nsideForMask
+    self.nsideForContour = nsideForContour
     self.selFunFile = selFunFile
     self.zBoundary = zBoundary 
     self.zBoundaryMpc = zBoundaryMpc
@@ -126,6 +127,7 @@ class Sample:
     self.shiftSimZ = shiftSimZ
     self.zRange = zRange
     self.minVoidRadius = minVoidRadius
+    self.meanPartSep = meanPartSep
     self.fakeDensity = fakeDensity
     self.hasWeightedVolumes = hasWeightedVolumes
     self.volumeLimited = volumeLimited