Skip to content

Commit

Permalink
Fixes a ton of import problems
Browse files Browse the repository at this point in the history
  • Loading branch information
lukecampbell committed Jun 18, 2013
1 parent aec5fdb commit e47dbb9
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 22 deletions.
16 changes: 0 additions & 16 deletions ion_functions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,16 +0,0 @@
from version import version as __version__

from utils import isempty, islogical, ismatrix, isnumeric, isreal, isscalar, isvector
from qc.qc_functions import dataqc_condcompress, dataqc_globalrangetest, dataqc_globalrangetest_minmax, dataqc_gradienttest, dataqc_localrangetest, dataqc_polytrendtest, dataqc_propagateflags, dataqc_solarelevation, dataqc_spiketest, dataqc_stuckvaluetest
from data.adcp_functions import adcp_beam2ins, adcp_beam_eastward, adcp_beam_error, adcp_beam_northward, adcp_beam_vertical, adcp_ins2earth, adcp_magvar
from data.co2_functions import pco2_abs434_blank, pco2_abs620_blank, pco2_thermistor, pco2_pco2wat, pco2_calc_pco2
from data.ctd_functions import ctd_sbe16plus_condwat, ctd_sbe16plus_preswat, ctd_sbe16plus_tempwat, ctd_density, ctd_pracsal
from data.opt_functions import opt_beam_attenuation, opt_optical_absorption
from data.ph_functions import ph_434_intensity, ph_578_intensity, ph_thermistor, ph_phwater
from data.sfl_functions import sfl_trhph_chlorconc, sfl_trhph_vfltemp
#from data.vel_functions import nobska_mag_corr_east, nobska_mag_corr_north, nobska_mag_corr_up, vel_mag_correction

from data.generic_functions import extract_parameter, magnetic_declination, ntp_to_unix_time


fill_value = -9999999.
2 changes: 1 addition & 1 deletion ion_functions/data/co2_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import numpy as np
import numexpr as ne
from ion_functions import fill_value
from ion_functions.utils import fill_value


# wrapper functions to extract parameters from SAMI-II CO2 instruments (PCO2W)
Expand Down
2 changes: 1 addition & 1 deletion ion_functions/data/perf/test_co2_performance.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from ion_functions.data.perf.test_performance import PerformanceTestCase
from ion_functions.data.co2_functions import pco2_thermistor, pco2_abs434_blank, pco2_abs620_blank, pco2_pco2wat
import numpy as np
from ion_functions import fill_value
from ion_functions.utils import fill_value

class TestCO2Performance(PerformanceTestCase):
def setUp(self):
Expand Down
2 changes: 1 addition & 1 deletion ion_functions/data/sfl_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@author Christopher Wingard
@brief Module containing Seafloor Properties related data-calculations.
"""
from ion_functions import fill_value
from ion_functions.utils import fill_value
def sfl_trhph_vfltemp(V_s, V_c, a, b, c, d, e):
"""
Description:
Expand Down
2 changes: 1 addition & 1 deletion ion_functions/data/test/test_co2_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import numpy as np
from ion_functions.data import co2_functions as co2func
from ion_functions import fill_value
from ion_functions.utils import fill_value

@attr('UNIT', group='func')
class Testpco2FunctionsUnit(BaseUnitTestCase):
Expand Down
2 changes: 1 addition & 1 deletion ion_functions/data/test/test_sfl_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import numpy as np
from ion_functions.data import sfl_functions as sflfunc
from ion_functions import fill_value
from ion_functions.utils import fill_value

@attr('UNIT', group='func')
class TestSFLFunctionsUnit(BaseUnitTestCase):
Expand Down
3 changes: 2 additions & 1 deletion ion_functions/qc/qc_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import numpy as np
import numexpr as ne
from scipy.interpolate import LinearNDInterpolator
from ion_functions import utils, fill_value
from ion_functions import utils
from ion_functions.utils import fill_value

# try to load the OOI logging module, using default Python logging module if
# unavailable
Expand Down
1 change: 1 addition & 0 deletions ion_functions/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
NUMERIC_KINDS = ('i', 'u', 'f', 'c')
REAL_KINDS = ('i', 'u', 'f', 'S', 'a', 'U') # All kinds but complex

fill_value = -9999999.

def isnumeric(dat):
"""
Expand Down

0 comments on commit e47dbb9

Please sign in to comment.