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

another attempt at making the jobSuccessful call work; some other minor fixes

Browse source
This commit is contained in:
P.M. Sutter 2012-12-07 08:11:28 -06:00
parent f155564d6d
commit 6e18299ade
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c_tools/mock/generateMock.cpp
View file

@ -200,7 +200,7 @@ void generateOutput(SimuData *data, int axis,
f.beginCheckpoint(); f.beginCheckpoint();
for (uint32_t i = 0; i < data->NumPart; i++) for (uint32_t i = 0; i < data->NumPart; i++)
{ {
f.writeReal32(data->Pos[x2][i]); f.writeReal32(data->Pos[x2][i]*LIGHT_SPEED);
} }
f.endCheckpoint(); f.endCheckpoint();

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

@ -158,10 +158,11 @@ def jobSuccessful(logFile, doneString):
jobDone = False jobDone = False
checkLine = "" checkLine = ""
if os.access(logFile, os.F_OK): if os.access(logFile, os.F_OK):
filelines = file(logFile, "r").readlines() #filelines = file(logFile, "r").readlines()
if len(filelines) >= 1: #if len(filelines) >= 1:
checkLine = filelines[-1] # checkLine = filelines[-1]
jobDone = (checkLine == doneString) for line in open(logFile, 'r'):
if doneString in line: jobDone = True
return jobDone return jobDone
def getStackSuffix(zMin, zMax, rMin, rMax, dataPortion): def getStackSuffix(zMin, zMax, rMin, rMax, dataPortion):

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

@ -379,8 +379,8 @@ def launchStack(sample, stack, binPath, thisDataPortion=None, logDir=None,
%s %s
ranSeed %d ranSeed %d
dataPortion %s dataPortion %s
#barycenters %s barycenters %s
#boundaryDistances %s boundaryDistances %s
%s %s
""" % \ """ % \
(zobovDir+"/voidDesc_"+thisDataPortion+"_"+sampleName+".out", (zobovDir+"/voidDesc_"+thisDataPortion+"_"+sampleName+".out",

2
python_tools/void_python_tools/plotting/plotTools.py
View file

@ -240,7 +240,7 @@ def plotNumberDistribution(workDir=None, sampleList=None, figDir=None,
boxVol = vp.getSurveyProps(sample.maskFile, boxVol = vp.getSurveyProps(sample.maskFile,
sample.zBoundary[0], sample.zBoundary[1], sample.zBoundary[0], sample.zBoundary[1],
sample.zRange[0], sample.zRange[1], "all", sample.zRange[0], sample.zRange[1], "all",
selectionFuncFile=sample.selFunFile)[0] selectionFuncFile=None)[0]
else: else:
boxVol = sample.boxLen*sample.boxLen*(sample.zBoundaryMpc[1] - boxVol = sample.boxLen*sample.boxLen*(sample.zBoundaryMpc[1] -
sample.zBoundaryMpc[0]) sample.zBoundaryMpc[0])