re-added some essential routines; updated example sceipts to reflect new layout

python_tools/setup.py

@@ -31,6 +31,5 @@ setup(
 #    cmdclass = {'build_ext': build_ext},
     include_dirs = [np.get_include()],
     packages=
-       ['vide','vide.backend','vide.voidUtil',
-        'vide.apTools.profiles','vide.apTools.chi2',],
+       ['vide','vide.backend','vide.voidUtil'],
 )

python_tools/vide/backend/__init__.py

@@ -19,3 +19,4 @@
 #+
 from .classes import *
 from .launchers import *
+from .cosmologyTools import *

python_tools/vide/backend/launchers.py

@@ -20,7 +20,7 @@
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # routines which communicate with individual data analysis portions -
-#   they make the analyzeVoids.py script easier to read
+#   they make the main script easier to read
 
 import os
 import glob
@@ -35,6 +35,7 @@ import sys
 from   pylab import figure
 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

python_tools/vide/voidUtil/plotUtil.py

@@ -24,7 +24,7 @@ from .plotDefs import *
 import numpy as np
 import os
 import pylab as plt
-import vide.apTools as vp
+import vide.backend.cosmologyTools as vp
 from vide.voidUtil import getArray, shiftPart, getVoidPart
 
 def fill_between(x, y1, y2=0, ax=None, **kwargs):

python_tools/void_pipeline/__main__.py

@@ -32,7 +32,7 @@ import pickle
 # ------------------------------------------------------------------------------
 
 if (len(sys.argv) == 1):
-  print("Usage: ./generateCatalog.py parameter_file.py")
+  print("Usage: python3 -m void_pipeline parameter_file.py")
   exit(-1)
 
 if (len(sys.argv) > 1):