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

buildSkyProjections now fully integrated into vide

Browse source
This commit is contained in:
P.M. Sutter 2014-01-15 16:02:18 -06:00
parent 82dfc3bd0f
commit 8c446d1079
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,7 +87,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
if regenerate or not (continueRun and jobSuccessful(logFile, "Done!\n")): if regenerate or not (continueRun and jobSuccessful(logFile, "Done!\n")):
file(parmFile, mode="w").write(conf) file(parmFile, mode="w").write(conf)
arg1 = "-configFile=%s" % parmFile arg1 = "--configFile=%s" % parmFile
log = open(logFile, 'w') log = open(logFile, 'w')
subprocess.call([binPath, arg1], stdout=log, stderr=log) subprocess.call([binPath, arg1], stdout=log, stderr=log)
log.close() log.close()
@ -209,12 +209,14 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
if (prevSubSample == -1): if (prevSubSample == -1):
#cmd = "%s --configFile=%s &> %s" % (binPath,parmFile,logFile) #cmd = "%s --configFile=%s &> %s" % (binPath,parmFile,logFile)
cmd = "%s --configFile=%s" % (binPath,parmFile)
log = open(logFile, 'w') log = open(logFile, 'w')
else: else:
#cmd = "%s --configFile=%s &>> %s" % (binPath,parmFile,logFile) #cmd = "%s --configFile=%s &>> %s" % (binPath,parmFile,logFile)
cmd = "%s --configFile=%s" % (binPath,parmFile)
log = open(logFile, 'a') log = open(logFile, 'a')
arg1 = "--configFile=%s" % parmFile arg1 = "--configFile=%s" % parmFile
subprocess.call([binPath, arg1], stdout=log, stderr=log) subprocess.call(cmd, stdout=log, stderr=log, shell=True)
#subprocess.call([binPath, arg1], stdout=log, stderr=log) #subprocess.call([binPath, arg1], stdout=log, stderr=log)
log.close() log.close()
#os.system(cmd) #os.system(cmd)
@ -254,7 +256,7 @@ def launchGenerate(sample, binPath, workDir=None, inputDataDir=None,
if sample.dataType == "observation": if sample.dataType == "observation":
(boxVol, nbar) = vp.getSurveyProps(sample.maskFile, sample.zRange[0], (boxVol, nbar) = vp.getSurveyProps(sample.maskFile, sample.zRange[0],
sample.zRange[1], sample.zRange[0], sample.zRange[1], "all", sample.zRange[1], sample.zRange[0], sample.zRange[1], "all",
useComoving=useComoving) useLCDM=useComoving)
else: else:
iX = float(sample.mySubvolume[0]) iX = float(sample.mySubvolume[0])
iY = float(sample.mySubvolume[1]) iY = float(sample.mySubvolume[1])
@ -1224,15 +1226,16 @@ def launchFit(sample, stack, logFile=None, voidDir=None, figDir=None,
# Rextracut=Rtruncate) # Rextracut=Rtruncate)
#else: #else:
# ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect, # ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect,
# Niter=500000, # Niter=300000,
# Nburn=100000, # Nburn=100000,
# Rextracut=Rtruncate) # Rextracut=Rtruncate)
#badChain = (args[0][0] > 0.5 or args[0][1] > stack.rMax or \ #badChain = (args[0][0] > 0.5 or args[0][1] > stack.rMax or \
# args[0][2] > stack.rMax) and \ # args[0][2] > stack.rMax) and \
# (ntries < maxtries) # (ntries < maxtries)
#ret,fits,args = vp.compute_radial_inertia(voidDir, stack.rMax, mode="symmetric", nBootstraps=5) #ret,fits,args = vp.compute_radial_inertia(voidDir, stack.rMax, mode="symmetric", nBootstraps=5)
ret,fits,args = vp.compute_inertia(voidDir, stack.rMax, nBootstraps=100, rMaxInertia=1.0) #ret,fits,args = vp.compute_inertia(voidDir, stack.rMax, nBootstraps=100, rMaxInertia=1.0)
#ret,fits,args = vp.compute_inertia(voidDir, stack.rMax, mode="symmetric", nBootstraps=500, rMaxInertia=1.5) ret,fits,args = vp.compute_inertia(voidDir, stack.rMax, mode="2d", nBootstraps=500, rMaxInertia=0.7)
#ret,fits,args = vp.compute_inertia(voidDir, stack.rMax, mode="symmetric", nBootstraps=500, rMaxInertia=100)
badChain = False badChain = False
#np.save(voidDir+"/chain.npy", ret) #np.save(voidDir+"/chain.npy", ret)
@ -1406,7 +1409,7 @@ def launchHubble(dataPortions=None, dataSampleList=None, logDir=None,
aveDist = vp.aveStretchCone(zBin.zMin, zBin.zMax, aveDist = vp.aveStretchCone(zBin.zMin, zBin.zMax,
skyFrac = sample.skyFraction) skyFrac = sample.skyFraction)
else: else:
aveDist = vp.aveStretch(zBin.zMin, zBin.zMax, Om=sample.omegaOm) aveDist = vp.aveStretch(zBin.zMin, zBin.zMax, Om=sample.omegaM)
expList[0, iR, iZBin, 2] = aveDist expList[0, iR, iZBin, 2] = aveDist