From fc19453800d5307908d5692240c3988a4e385118 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 12 May 2014 17:50:07 -0400 Subject: [PATCH] fixed calls after reorganization --- pipeline/generateCatalog.py | 12 +++++------- python_tools/void_python_tools/__init__.py | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pipeline/generateCatalog.py b/pipeline/generateCatalog.py index 1403e8d..7c66d14 100644 --- a/pipeline/generateCatalog.py +++ b/pipeline/generateCatalog.py @@ -43,10 +43,8 @@ # Stage 3 : prune catalog from void_python_tools.backend import * -from void_python_tools.plotting import * import imp import pickle -import void_python_tools.apTools as vp # ------------------------------------------------------------------------------ @@ -142,14 +140,14 @@ if (startCatalogStage <= 4) and (endCatalogStage >= 4): print " Plotting...", sys.stdout.flush() - for thisDataPortion in dataPortions: + #for thisDataPortion in dataPortions: #plotRedshiftDistribution(workDir, dataSampleList, figDir, showPlot=False, # dataPortion=thisDataPortion, setName=setName) #plotSizeDistribution(workDir, dataSampleList, figDir, showPlot=False, # dataPortion=thisDataPortion, setName=setName) - plotNumberDistribution(workDir, dataSampleList, figDir, showPlot=False, - dataPortion=thisDataPortion, setName=setName) - plotVoidDistribution(workDir, dataSampleList, figDir, showPlot=False, - dataPortion=thisDataPortion, setName=setName) + #plotNumberDistribution(workDir, dataSampleList, figDir, showPlot=False, + # dataPortion=thisDataPortion, setName=setName) + #plotVoidDistribution(workDir, dataSampleList, figDir, showPlot=False, + # dataPortion=thisDataPortion, setName=setName) print "\n Done!" diff --git a/python_tools/void_python_tools/__init__.py b/python_tools/void_python_tools/__init__.py index 2ea700c..8ea7472 100644 --- a/python_tools/void_python_tools/__init__.py +++ b/python_tools/void_python_tools/__init__.py @@ -19,5 +19,4 @@ #+ from void_python_tools.backend import * from void_python_tools.apTools import * -from void_python_tools.xcor import * from void_python_tools.voidUtil import *