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

cleaned up vide toolkit calls

Browse source
This commit is contained in:
Paul M. Sutter 2024-05-22 19:38:20 -04:00
parent 288e2263b6
commit 438407be74
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_source/setup.py
View file

@ -27,8 +27,7 @@ VOID_GSL=os.environ.get('VOID_GSL')
setup( setup(
name='vide', name='vide',
version='1.0', version='3.0',
# cmdclass = {'build_ext': build_ext},
include_dirs = [np.get_include()], include_dirs = [np.get_include()],
packages= packages=
['vide','vide.backend','vide.voidUtil'], ['vide','vide.backend','vide.voidUtil'],

3
python_source/vide/backend/launchers.py
View file

@ -37,7 +37,6 @@ from netCDF4 import Dataset
from vide.backend.classes import * from vide.backend.classes import *
from vide.backend.cosmologyTools import * from vide.backend.cosmologyTools import *
import pickle import pickle
import vide.apTools as vp
import scipy.interpolate as interpolate import scipy.interpolate as interpolate
NetCDFFile = Dataset NetCDFFile = Dataset
@ -274,7 +273,7 @@ def launchPrep(sample, binPath, workDir=None, inputDataDir=None,
# add to sample info file # add to sample info file
if sample.dataType == "observation": if sample.dataType == "observation":
(boxVol, nbar) = vp.getSurveyProps(sample.maskFile, sample.zRange[0], (boxVol, nbar) = 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) useComoving=useComoving)
else: else:

5
python_source/vide/voidUtil/catalogUtil.py
View file

@ -24,7 +24,6 @@ import numpy as np
from netCDF4 import Dataset from netCDF4 import Dataset
import sys import sys
from vide.backend import * from vide.backend import *
import vide.apTools as vp
import pickle import pickle
from .periodic_kdtree import PeriodicCKDTree from .periodic_kdtree import PeriodicCKDTree
import os import os
@ -123,7 +122,7 @@ def loadPart(sampleDir):
# else: # else:
# maskFile = sampleDir+"/"+os.path.basename(sample.maskFile) # maskFile = sampleDir+"/"+os.path.basename(sample.maskFile)
# print "Using maskfile found in:", maskFile # print "Using maskfile found in:", maskFile
# props = vp.getSurveyProps(maskFile, sample.zBoundary[0], # props = getSurveyProps(maskFile, sample.zBoundary[0],
# sample.zBoundary[1], # sample.zBoundary[1],
# sample.zBoundary[0], # sample.zBoundary[0],
# sample.zBoundary[1], "all", # sample.zBoundary[1], "all",
@ -173,7 +172,7 @@ def getVolNorm(sampleDir):
# else: # else:
# maskFile = sampleDir+"/"+os.path.basename(sample.maskFile) # maskFile = sampleDir+"/"+os.path.basename(sample.maskFile)
# print "Using maskfile found in:", maskFile # print "Using maskfile found in:", maskFile
# props = vp.getSurveyProps(maskFile, sample.zBoundary[0], # props = getSurveyProps(maskFile, sample.zBoundary[0],
# sample.zBoundary[1], # sample.zBoundary[1],
# sample.zBoundary[0], # sample.zBoundary[0],
# sample.zBoundary[1], "all", # sample.zBoundary[1], "all",

1
python_source/vide/voidUtil/profileUtil.py
View file

@ -24,7 +24,6 @@ from vide.voidUtil import *
from .plotDefs import * from .plotDefs import *
import numpy as np import numpy as np
import os import os
import vide.apTools as vp
from scipy.optimize import curve_fit from scipy.optimize import curve_fit
from scipy.interpolate import interp1d from scipy.interpolate import interp1d