moved sedfitter.util to sedfitter.utils.io

astrofrog · Oct 3, 2013 · 1d4fdeb · 1d4fdeb
1 parent 5800c7c
commit 1d4fdeb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/sedfitter/fit.py b/sedfitter/fit.py
@@ -18,7 +18,7 @@
 from .models import Models
 from .fit_info import FitInfo
 from .source import Source
-from . import util
+from .utils import io
 from . import six
 
 
@@ -121,7 +121,7 @@ def fit(data, filter_names, apertures, model_dir, output, n_data_min=3,
 
     # Cycle through sources
 
-    util.delete_file(output)
+    io.delete_file(output)
 
     fout = open(output, 'wb')
     pickle.dump(model_dir, fout, 2)

diff --git a/sedfitter/plot.py b/sedfitter/plot.py
@@ -33,7 +33,7 @@
 from .extinction import Extinction
 from .fit_info import FitInfo
 from .sed import SED
-from . import util
+from .utils import io
 from .utils import parfile
 from .utils.formatter import LogFormatterMathtextAuto
 
@@ -234,7 +234,7 @@ def plot(input_file, output_dir=None, select_format=("N", 1), plot_max=None,
     '''
 
     if output_dir:
-        util.create_dir(output_dir)
+        io.create_dir(output_dir)
     else:
         figures = {}
 

diff --git a/sedfitter/plot_params_1d.py b/sedfitter/plot_params_1d.py
@@ -17,7 +17,7 @@
 from .fit_info import FitInfo
 from .extinction import Extinction
 from .models import load_parameter_table
-from . import util
+from .utils import io
 from .utils.formatter import LogFormatterMathtextAuto
 
 
@@ -82,7 +82,7 @@ def plot_params_1d(input_file, parameter, output_dir=None,
     if output_dir is None:
         raise ValueError("No output directory has been specified")
     # Create output directory
-    util.create_dir(output_dir)
+    io.create_dir(output_dir)
 
     # Open output file
     fin = open(input_file, 'rb')

diff --git a/sedfitter/plot_params_2d.py b/sedfitter/plot_params_2d.py
@@ -19,7 +19,7 @@
 from .fit_info import FitInfo
 from .extinction import Extinction
 from .models import load_parameter_table
-from . import util
+from .utils import io
 from .utils.formatter import LogFormatterMathtextAuto
 
 KERNEL = Tophat2DKernel(5.5,x_size=11,y_size=11,mode='oversample').array
@@ -91,7 +91,7 @@ def plot_params_2d(input_file, parameter_x, parameter_y, output_dir=None,
         raise ValueError("No output directory has been specified")
 
     # Create output directory
-    util.create_dir(output_dir)
+    io.create_dir(output_dir)
 
     # Open output file
     fin = open(input_file, 'rb')

diff --git a/sedfitter/util.py → sedfitter/utils/io.py b/sedfitter/util.py → sedfitter/utils/io.py
@@ -4,7 +4,7 @@
 import sys
 import shutil
 
-from .six.moves import input
+from ..six.moves import input
 
 def create_dir(dir_name):
     delete_dir(dir_name)