Index: sodar/trunk/plotSodar.py =================================================================== --- sodar/trunk/plotSodar.py (revision 162) +++ sodar/trunk/plotSodar.py (revision 288) @@ -5,6 +5,4 @@ import optparse -from sodar.utils import openAnything, findMissing -from sodar import arrayData as a import numpy as n import pylab as p @@ -12,4 +10,6 @@ import shutil import csv +from sodar.utils import openAnything, findMissing +from sodar.remtech import arrayData as a _uComponentsPlotName = 'uComponents.png' Index: sodar/trunk/sodar/remtech/__init__.py =================================================================== --- sodar/trunk/sodar/remtech/__init__.py (revision 282) +++ sodar/trunk/sodar/remtech/__init__.py (revision 288) @@ -7,4 +7,3 @@ 'formattedData', 'adjustedData', - 'arrayData', - 'utils'] + 'arrayData',] Index: sodar/trunk/sodar/remtech/adjustedData.py =================================================================== --- sodar/trunk/sodar/remtech/adjustedData.py (revision 280) +++ sodar/trunk/sodar/remtech/adjustedData.py (revision 288) @@ -19,7 +19,7 @@ __license__ = 'GPL2' -import rawData import numpy as n import datetime +from sodar.remtech import rawData class AdjustedData(list): Index: sodar/trunk/sodar/remtech/arrayData.py =================================================================== --- sodar/trunk/sodar/remtech/arrayData.py (revision 275) +++ sodar/trunk/sodar/remtech/arrayData.py (revision 288) @@ -9,8 +9,8 @@ __license__ = 'GPL2' -import rawData -import formattedData import numpy as n import datetime +from sodar.remtech import rawData +from sodar.remtech import formattedData class ArrayData(object): Index: sodar/trunk/sodar/remtech/formattedData.py =================================================================== --- sodar/trunk/sodar/remtech/formattedData.py (revision 283) +++ sodar/trunk/sodar/remtech/formattedData.py (revision 288) @@ -19,7 +19,7 @@ __license__ = 'GPL2' -import rawData import numpy as n import datetime +from sodar.remtech import rawData class FormattedData(list): Index: sodar/trunk/sodar/utils/__init__.py =================================================================== --- sodar/trunk/sodar/utils/__init__.py (revision 132) +++ sodar/trunk/sodar/utils/__init__.py (revision 288) @@ -4,4 +4,4 @@ """ -__all__ = ['openAnything' - 'findMissing'] +__all__ = ['openAnything', + 'findMissing',]