Move read_table() and Counter() to a top-level utils directory as they are...

Move read_table() and Counter() to a top-level utils directory as they are used both by pcigale and pcigale-plots.

pcigale/analysis_modules/pdf_analysis/__init__.py

@@ -31,7 +31,7 @@ import multiprocessing as mp
 import numpy as np
 
 from .. import AnalysisModule
-from ..utils import Counter
+from utils.counter import Counter
 from .workers import sed as worker_sed
 from .workers import init_sed as init_worker_sed
 from .workers import init_analysis as init_worker_analysis

pcigale/analysis_modules/savefluxes/__init__.py

@@ -19,7 +19,7 @@ from collections import OrderedDict
 import multiprocessing as mp
 
 from .. import AnalysisModule
-from ..utils import Counter
+from utils.counter import Counter
 from .workers import init_fluxes as init_worker_fluxes
 from .workers import fluxes as worker_fluxes
 from ...managers.models import ModelsManager

pcigale/managers/observations.py

@@ -8,7 +8,7 @@ import numpy as np
 from scipy.constants import parsec
 
 from ..utils.cosmology import luminosity_distance
-from ..utils.io import read_table
+from utils.io import read_table
 from .utils import get_info
 
 

pcigale/managers/parameters.py

@@ -8,7 +8,7 @@ import collections
 import itertools
 import numpy as np
 
-from ..utils.io import read_table
+from utils.io import read_table
 
 
 class ParametersManager(object):

pcigale/sed_modules/loadfile.py

@@ -13,7 +13,7 @@ This module reads a SED spectrum from a file.
 
 from collections import OrderedDict
 
-from ..utils.io import read_table
+from utils.io import read_table
 from . import SedModule
 
 

pcigale/sed_modules/sfhfromfile.py

@@ -15,7 +15,7 @@ from collections import OrderedDict
 
 import numpy as np
 
-from ..utils.io import read_table
+from utils.io import read_table
 from . import SedModule
 
 

pcigale/session/configuration.py

@@ -16,7 +16,7 @@ import validate
 
 from ..managers.parameters import ParametersManager
 from ..data import Database
-from ..utils.io import read_table
+from utils.io import read_table
 from .. import sed_modules
 from .. import analysis_modules
 from ..warehouse import SedWarehouse

pcigale_plots/plot_types/chi2.py

@@ -16,8 +16,8 @@ matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import multiprocessing as mp
 import numpy as np
-from pcigale.utils import read_table
-from pcigale.analysis_modules.utils import Counter
+from utils.io import read_table
+from utils.counter import Counter
 
 
 def pool_initializer(counter):

pcigale_plots/plot_types/mock.py

@@ -17,7 +17,7 @@ import multiprocessing as mp
 import numpy as np
 import pkg_resources
 from scipy import stats
-from pcigale.analysis_modules.utils import Counter
+from utils.counter import Counter
 
 # Name of the file containing the best models information
 BEST_RESULTS = "results.fits"

pcigale_plots/plot_types/pdf.py

@@ -15,8 +15,8 @@ matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import multiprocessing as mp
 import numpy as np
-from pcigale.utils import read_table
-from pcigale.analysis_modules.utils import Counter
+from utils.io import read_table
+from utils.counter import Counter
 
 
 def pool_initializer(counter):

pcigale_plots/plot_types/sed.py

@@ -20,9 +20,9 @@ from os import path
 import pkg_resources
 from scipy.constants import c
 from pcigale.data import Database
-from pcigale.utils import read_table
+from utils.io import read_table
 import matplotlib.gridspec as gridspec
-from pcigale.analysis_modules.utils import Counter
+from utils.counter import Counter
 
 # Name of the file containing the best models information
 BEST_RESULTS = "results.fits"

pcigale/analysis_modules/utils.py → utils/counter.py

@@ -4,7 +4,8 @@
 # Author: Médéric Boquien
 
 """
-Various utility functions for pcigale analysis modules
+Multiprocessing counter class with utility functions for periodic updating and
+printing.
 """
 
 import multiprocessing as mp