diff --git a/python_tools/void_python_tools/backend/classes.py b/python_tools/void_python_tools/backend/classes.py index 7466acb..60de62f 100755 --- a/python_tools/void_python_tools/backend/classes.py +++ b/python_tools/void_python_tools/backend/classes.py @@ -38,6 +38,7 @@ class Sample: dataType = "observation" dataFormat = "sdss" dataFile = "lss.dr72dim.dat" + dataUNit = 1 fullName = "lss.dr72dim.dat" nickName = "dim" zobovDir = "" @@ -68,7 +69,7 @@ class Sample: stacks = [] - def __init__(self, dataFile="", fullName="", + def __init__(self, dataFile="", fullName="", dataUnit=1, nickName="", maskFile="", selFunFile="", zBoundary=(), zRange=(), zBoundaryMpc=(), minVoidRadius=0, fakeDensity=0.01, volumeLimited=True, @@ -106,6 +107,7 @@ class Sample: self.dataFormat = dataFormat self.subsample = subsample self.useLightCone = useLightCone + self.dataUnit = dataUnit self.stacks = [] diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 52beefb..71d6ea3 100755 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -287,7 +287,7 @@ def launchPrune(sample, binPath, thisDataPortion=None, cmd += " >& " + logFile 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" else: print "FAILED!"