From 438407be74ca00ae4ef0e899a2aea1f4edc9b516 Mon Sep 17 00:00:00 2001
From: "Paul M. Sutter" <pmsutter@gmail.com>
Date: Wed, 22 May 2024 19:38:20 -0400
Subject: [PATCH] cleaned up vide toolkit calls

---
 python_source/setup.py                     | 3 +--
 python_source/vide/backend/launchers.py    | 3 +--
 python_source/vide/voidUtil/catalogUtil.py | 5 ++---
 python_source/vide/voidUtil/profileUtil.py | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/python_source/setup.py b/python_source/setup.py
index ca18b7e..502b2b6 100644
--- a/python_source/setup.py
+++ b/python_source/setup.py
@@ -27,8 +27,7 @@ VOID_GSL=os.environ.get('VOID_GSL')
 
 setup(
     name='vide',
-    version='1.0',
-#    cmdclass = {'build_ext': build_ext},
+    version='3.0',
     include_dirs = [np.get_include()],
     packages=
        ['vide','vide.backend','vide.voidUtil'],
diff --git a/python_source/vide/backend/launchers.py b/python_source/vide/backend/launchers.py
index 469311b..cd7c86c 100644
--- a/python_source/vide/backend/launchers.py
+++ b/python_source/vide/backend/launchers.py
@@ -37,7 +37,6 @@ from   netCDF4 import Dataset
 from vide.backend.classes import *
 from vide.backend.cosmologyTools import *
 import pickle
-import vide.apTools as vp
 import scipy.interpolate as interpolate
 
 NetCDFFile = Dataset
@@ -274,7 +273,7 @@ def launchPrep(sample, binPath, workDir=None, inputDataDir=None,
 
   # add to sample info file
   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",
      useComoving=useComoving)
   else:
diff --git a/python_source/vide/voidUtil/catalogUtil.py b/python_source/vide/voidUtil/catalogUtil.py
index 450df67..dbae453 100644
--- a/python_source/vide/voidUtil/catalogUtil.py
+++ b/python_source/vide/voidUtil/catalogUtil.py
@@ -24,7 +24,6 @@ import numpy as np
 from netCDF4 import Dataset
 import sys
 from vide.backend import *
-import vide.apTools as vp
 import pickle
 from .periodic_kdtree import PeriodicCKDTree
 import os
@@ -123,7 +122,7 @@ def loadPart(sampleDir):
     #  else:
     #    maskFile = sampleDir+"/"+os.path.basename(sample.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[0],
     #                            sample.zBoundary[1], "all",
@@ -173,7 +172,7 @@ def getVolNorm(sampleDir):
     #  else:
     #    maskFile = sampleDir+"/"+os.path.basename(sample.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[0],
     #                            sample.zBoundary[1], "all",
diff --git a/python_source/vide/voidUtil/profileUtil.py b/python_source/vide/voidUtil/profileUtil.py
index 47c5e8a..0577680 100644
--- a/python_source/vide/voidUtil/profileUtil.py
+++ b/python_source/vide/voidUtil/profileUtil.py
@@ -24,7 +24,6 @@ from vide.voidUtil import *
 from .plotDefs import *
 import numpy as np
 import os
-import vide.apTools as vp
 from scipy.optimize import curve_fit
 from scipy.interpolate import interp1d