From ae9701e99c8e762c142323fd68aabcdafadf551a Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Fri, 18 Jan 2013 09:56:31 -0600 Subject: [PATCH] replaced void shape fitter with rudimentary moment of inertia calculation --- c_tools/stacking/pruneVoids.cpp | 2 +- .../apTools/profiles/__init__.py | 1 + .../void_python_tools/backend/launchers.py | 48 +++++++++++-------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/c_tools/stacking/pruneVoids.cpp b/c_tools/stacking/pruneVoids.cpp index b0c284c..37f39a3 100644 --- a/c_tools/stacking/pruneVoids.cpp +++ b/c_tools/stacking/pruneVoids.cpp @@ -490,7 +490,7 @@ int main(int argc, char **argv) { } // toss out voids that are obviously wrong - if (voids[iVoid].densCon > 1.e3) { + if (voids[iVoid].densCon > 1.e4) { voids[iVoid].accepted = -4; numWrong++; } diff --git a/python_tools/void_python_tools/apTools/profiles/__init__.py b/python_tools/void_python_tools/apTools/profiles/__init__.py index b05e408..0f04a3e 100644 --- a/python_tools/void_python_tools/apTools/profiles/__init__.py +++ b/python_tools/void_python_tools/apTools/profiles/__init__.py @@ -1,6 +1,7 @@ from build import * from draw import * from fit import * +from inertia import * from mcmc import * from generateExpFigure import * from getSurveyProps import * diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 45c117a..28cd70c 100755 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -314,7 +314,8 @@ def launchPrune(sample, binPath, thisDataPortion=None, def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, binPath, thisDataPortion=None, logFile=None, workDir=None, - continueRun=None, outputFile=None): + continueRun=None, outputFile=None, + matchMethod=None): sampleName1 = sample1.fullName sampleName2 = sample2.fullName @@ -358,7 +359,7 @@ def launchVoidOverlap(sample1, sample2, sample1Dir, sample2Dir, cmd += " --zonePartFile2=" + sample2Dir+"/voidPart_" + \ str(sampleName2)+".dat" - cmd += " --useID" + if matchMethod == "useID": cmd += " --useID" cmd += periodicLine cmd += " --outfile=" + outputFile 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" % ("void_indexes.txt", voidDir+"/")) - os.system("mv %s %s" % ("posx.nc", voidDir+"/posx.nc")) - os.system("mv %s %s" % ("posy.nc", voidDir+"/posy.nc")) - os.system("mv %s %s" % ("posz.nc", voidDir+"/posz.nc")) - os.system("mv %s %s" % ("redshifts.nc", voidDir+"/redshifts.nc")) + os.system("mv %s %s" % ("posx.nc", voidDir+"/")) + os.system("mv %s %s" % ("posy.nc", voidDir+"/")) + os.system("mv %s %s" % ("posz.nc", voidDir+"/")) + 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" % ("kdtree_stackvoids.dat", 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" % ("check.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: Rexpect = (stack.rMin+stack.rMax)/2 Rtruncate = stack.rMin*3. + 1 # TEST - if sample.dataType == "observation": - ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect, - Niter=300000, - Nburn=100000, - Rextracut=Rtruncate) - else: - ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect, - Niter=300000, - Nburn=100000, - Rextracut=Rtruncate) - badChain = (args[0][0] > 0.5 or args[0][1] > stack.rMax or \ - args[0][2] > stack.rMax) and \ - (ntries < maxtries) + #if sample.dataType == "observation": + # ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect, + # Niter=300000, + # Nburn=100000, + # Rextracut=Rtruncate) + #else: + # ret,fits,args = vp.fit_ellipticity(voidDir,Rbase=Rexpect, + # Niter=300000, + # Nburn=100000, + # Rextracut=Rtruncate) + #badChain = (args[0][0] > 0.5 or args[0][1] > stack.rMax or \ + # args[0][2] > stack.rMax) and \ + # (ntries < maxtries) + ret,fits,args = vp.compute_inertia(voidDir, stack.rMax) + badChain = False ntries += 1 - np.save(voidDir+"/chain.npy", ret) + #np.save(voidDir+"/chain.npy", ret) np.savetxt(voidDir+"/fits.out", fits) plotTitle = "Sample: "+sample.nickName+\