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

replaced void shape fitter with rudimentary moment of inertia calculation

Browse source
This commit is contained in:
P.M. Sutter 2013-01-18 09:56:31 -06:00
parent ea58ff2b83
commit ae9701e99c
3 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c_tools/stacking/pruneVoids.cpp
View file

@ -490,7 +490,7 @@ int main(int argc, char **argv) {
} }
// toss out voids that are obviously wrong // toss out voids that are obviously wrong
if (voids[iVoid].densCon > 1.e3) { if (voids[iVoid].densCon > 1.e4) {
voids[iVoid].accepted = -4; voids[iVoid].accepted = -4;
numWrong++; numWrong++;
} }

1
python_tools/void_python_tools/apTools/profiles/__init__.py
View file

@ -1,6 +1,7 @@
from build import * from build import *
from draw import * from draw import *
from fit import * from fit import *
from inertia import *
from mcmc import * from mcmc import *
from generateExpFigure import * from generateExpFigure import *
from getSurveyProps import * from getSurveyProps import *

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

@ -314,7 +314,8 @@ def launchPrune(sample, binPath, thisDataPortion=None,
def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
binPath, thisDataPortion=None, binPath, thisDataPortion=None,
logFile=None, workDir=None, logFile=None, workDir=None,
continueRun=None, outputFile=None): continueRun=None, outputFile=None,
matchMethod=None):
sampleName1 = sample1.fullName sampleName1 = sample1.fullName
sampleName2 = sample2.fullName sampleName2 = sample2.fullName
@ -358,7 +359,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir,
cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \ cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \
str(sampleName2)+".dat" str(sampleName2)+".dat"
cmd += " --useID" if matchMethod == "useID": cmd += " --useID"
cmd += periodicLine cmd += periodicLine
cmd += " --outfile=" + outputFile cmd += " --outfile=" + outputFile
cmd += " &> " + logFile cmd += " &> " + logFile
@ -600,13 +601,18 @@ def launchStack(sample, stack, binPath, thisDataPortion=None, logDir=None,
os.system("mv %s %s" % ("tree.data", treeFile)) os.system("mv %s %s" % ("tree.data", treeFile))
os.system("mv %s %s" % ("void_indexes.txt", voidDir+"/")) os.system("mv %s %s" % ("void_indexes.txt", voidDir+"/"))
os.system("mv %s %s" % ("posx.nc", voidDir+"/posx.nc")) os.system("mv %s %s" % ("posx.nc", voidDir+"/"))
os.system("mv %s %s" % ("posy.nc", voidDir+"/posy.nc")) os.system("mv %s %s" % ("posy.nc", voidDir+"/"))
os.system("mv %s %s" % ("posz.nc", voidDir+"/posz.nc")) os.system("mv %s %s" % ("posz.nc", voidDir+"/"))
os.system("mv %s %s" % ("redshifts.nc", voidDir+"/redshifts.nc")) os.system("mv %s %s" % ("z_void_indexes.txt", voidDir+"/"))
os.system("mv %s %s" % ("z_posx.nc", voidDir+"/"))
os.system("mv %s %s" % ("z_posy.nc", voidDir+"/"))
os.system("mv %s %s" % ("z_posz.nc", voidDir+"/"))
os.system("mv %s %s" % ("redshifts.nc", voidDir+"/"))
os.system("mv %s %s" % ("indexes.nc", voidDir+"/")) os.system("mv %s %s" % ("indexes.nc", voidDir+"/"))
os.system("mv %s %s" % ("kdtree_stackvoids.dat", voidDir+"/")) os.system("mv %s %s" % ("kdtree_stackvoids.dat", voidDir+"/"))
os.system("mv %s %s" % ("centers.txt", voidDir+"/")) os.system("mv %s %s" % ("centers.txt", voidDir+"/"))
os.system("mv %s %s" % ("z_centers.txt", voidDir+"/"))
os.system("mv %s %s" % ("sky_positions.txt", voidDir+"/")) os.system("mv %s %s" % ("sky_positions.txt", voidDir+"/"))
os.system("mv %s %s" % ("check.txt", voidDir+"/")) os.system("mv %s %s" % ("check.txt", voidDir+"/"))
os.system("mv %s %s" % ("tracer.txt", voidDir+"/")) os.system("mv %s %s" % ("tracer.txt", voidDir+"/"))
@ -899,22 +905,24 @@ def launchFit(sample, stack, logFile=None, voidDir=None, figDir=None,
while badChain: while badChain:
Rexpect = (stack.rMin+stack.rMax)/2 Rexpect = (stack.rMin+stack.rMax)/2
Rtruncate = stack.rMin*3. + 1 # TEST Rtruncate = stack.rMin*3. + 1 # TEST
if sample.dataType == "observation": #if sample.dataType == "observation":
ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect, # ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect,
Niter=300000, # Niter=300000,
Nburn=100000, # Nburn=100000,
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=300000, # 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_inertia(voidDir, stack.rMax)
badChain = False
ntries += 1 ntries += 1
np.save(voidDir+"/chain.npy", ret) #np.save(voidDir+"/chain.npy", ret)
np.savetxt(voidDir+"/fits.out", fits) np.savetxt(voidDir+"/fits.out", fits)
plotTitle = "Sample: "+sample.nickName+\ plotTitle = "Sample: "+sample.nickName+\