guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bug for data unit, and fixed bug for detecting completion of pruning

Browse source
This commit is contained in:
P.M. Sutter 2012-11-09 07:10:08 -06:00
parent ed3f18f6d0
commit 9c10c3714f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_tools/void_python_tools/backend/classes.py
View file

@ -38,6 +38,7 @@ class Sample:
dataType = "observation" dataType = "observation"
dataFormat = "sdss" dataFormat = "sdss"
dataFile = "lss.dr72dim.dat" dataFile = "lss.dr72dim.dat"
dataUNit = 1
fullName = "lss.dr72dim.dat" fullName = "lss.dr72dim.dat"
nickName = "dim" nickName = "dim"
zobovDir = "" zobovDir = ""
@ -68,7 +69,7 @@ class Sample:
stacks = [] stacks = []
def __init__(self, dataFile="", fullName="", def __init__(self, dataFile="", fullName="", dataUnit=1,
nickName="", maskFile="", selFunFile="", nickName="", maskFile="", selFunFile="",
zBoundary=(), zRange=(), zBoundaryMpc=(), zBoundary=(), zRange=(), zBoundaryMpc=(),
minVoidRadius=0, fakeDensity=0.01, volumeLimited=True, minVoidRadius=0, fakeDensity=0.01, volumeLimited=True,
@ -106,6 +107,7 @@ class Sample:
self.dataFormat = dataFormat self.dataFormat = dataFormat
self.subsample = subsample self.subsample = subsample
self.useLightCone = useLightCone self.useLightCone = useLightCone
self.dataUnit = dataUnit
self.stacks = [] self.stacks = []

2
python_tools/void_python_tools/backend/launchers.py
View file

@ -287,7 +287,7 @@ def launchPrune(sample, binPath, thisDataPortion=None,
cmd += " >& " + logFile cmd += " >& " + logFile
os.system(cmd) os.system(cmd)
if jobSuccessful(logFile, "NetCDF: Not a valid ID\n"): if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or jobSuccessful(logFile, "Done!"):
print "done" print "done"
else: else:
print "FAILED!" print "FAILED!"