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

removed a few extraneous checks in launchers

Browse source
This commit is contained in:
P.M. Sutter 2013-04-11 09:53:01 -05:00
parent a343938049
commit dbc4c87c3e
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,7 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None,
cmd = "./%s >> %s 2>&1" % (vozScript, logFile) cmd = "./%s >> %s 2>&1" % (vozScript, logFile)
os.system(cmd) os.system(cmd)
cmd = "%s/jozov %s %s %s %s %s %g %s >> %s 2>&1" % \ cmd = "%s/../c_tools/zobov2/jozov2 %s %s %s %s %s %g %s >> %s 2>&1" % \
(binPath, \ (binPath, \
zobovDir+"/adj_"+sampleName+".dat", \ zobovDir+"/adj_"+sampleName+".dat", \
zobovDir+"/vol_"+sampleName+".dat", \ zobovDir+"/vol_"+sampleName+".dat", \
@ -973,12 +973,12 @@ def launchProfile(sample, stack, voidDir=None, logFile=None, continueRun=None):
fp.write(numVoids+"\n") fp.write(numVoids+"\n")
fp.close() fp.close()
if sample.zRange[0] > stack.zMax or sample.zRange[1] < stack.zMin: #if sample.zRange[0] > stack.zMax or sample.zRange[1] < stack.zMin:
print "outside sample redshift range; skipping!" # print "outside sample redshift range; skipping!"
fp = open(voidDir+"/NOVOID", "w") # fp = open(voidDir+"/NOVOID", "w")
fp.write("outside z range: profile\n") # fp.write("outside z range: profile\n")
fp.close() # fp.close()
return # return
if sample.profileBinSize == "auto": if sample.profileBinSize == "auto":
density = 0.5 * 50 / Rcircular / 2 density = 0.5 * 50 / Rcircular / 2
@ -1025,9 +1025,9 @@ def launchFit(sample, stack, logFile=None, voidDir=None, figDir=None,
fp.close() fp.close()
return return
if stack.zMin < sample.zRange[0] or stack.zMax > sample.zRange[1]: #if stack.zMin < sample.zRange[0] or stack.zMax > sample.zRange[1]:
print "outside sample redshift range; skipping!" # print "outside sample redshift range; skipping!"
return # return
if sample.partOfCombo or not sample.includeInHubble: if sample.partOfCombo or not sample.includeInHubble:
print "sample not needed for further analysis; skipping!" print "sample not needed for further analysis; skipping!"
@ -1071,7 +1071,7 @@ def launchFit(sample, stack, logFile=None, voidDir=None, figDir=None,
#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_inertia(voidDir, stack.rMax, mode="symmetric") ret,fits,args = vp.compute_inertia(voidDir, stack.rMax, mode="symmetric", nBootstraps=500)
badChain = False badChain = False
ntries += 1 ntries += 1
@ -1091,10 +1091,10 @@ def launchFit(sample, stack, logFile=None, voidDir=None, figDir=None,
else: else:
rescaleFactor = 1.0 rescaleFactor = 1.0
# TEST - plotting raw galaxy counts vp.draw_fit(*args, delta_tick=0.2, vmax=10.0, delta_v=0.1,
#vp.draw_fit(*args, delta_tick=50, vmax=1.0, delta_v=0.01, nocontour=True, model_max=10.0, delta_model=1.0,
vp.draw_fit(*args, delta_tick=0.2, vmax=1.0, delta_v=0.01, #vp.draw_fit(*args, delta_tick=0.2, vmax=1.0, delta_v=0.01,
nocontour=True, model_max=1.0, delta_model=0.1, # nocontour=True, model_max=1.0, delta_model=0.1,
plotTitle=plotTitle, show_ratio=showRatio, plotTitle=plotTitle, show_ratio=showRatio,
showContours=showContours, showContours=showContours,
rescaleFactor=rescaleFactor) rescaleFactor=rescaleFactor)