Move top level apps to mosaic/apps.

usnistgov · Jun 25, 2016 · bbec7a0 · bbec7a0
1 parent 45eac89
commit bbec7a0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/bin/analysis.py b/bin/analysis.py
@@ -6,7 +6,7 @@
 import resource
 import csv
 
-import mosaic.SingleChannelAnalysis
+import mosaic.apps.SingleChannelAnalysis
 
 import mosaic.partition.eventSegment as es
 
@@ -23,23 +23,23 @@
 from mosaic.filters.besselLowpassFilter import *
 from mosaic.filters.waveletDenoiseFilter import *
 
-mosaic.SingleChannelAnalysis.SingleChannelAnalysis(
+mosaic.apps.SingleChannelAnalysis.SingleChannelAnalysis(
 			'data/',
 			qdfTrajIO, 
 			None,
 			es.eventSegment,
 			adept.adept
 		).Run()
 
-mosaic.SingleChannelAnalysis.SingleChannelAnalysis(
+mosaic.apps.SingleChannelAnalysis.SingleChannelAnalysis(
 			'data/',
 			qdfTrajIO, 
 			None,
 			es.eventSegment,
 			adept2State.adept2State
 		).Run()
 
-mosaic.SingleChannelAnalysis.SingleChannelAnalysis(
+mosaic.apps.SingleChannelAnalysis.SingleChannelAnalysis(
 			'data/',
 			qdfTrajIO, 
 			None,

diff --git a/mosaic/__init__.py b/mosaic/__init__.py
@@ -33,8 +33,8 @@
 
 import mosaic.mdio.sqlite3MDIO
 
-import mosaic.ConvertToCSV
-import mosaic.SingleChannelAnalysis
+import mosaic.apps.ConvertToCSV
+import mosaic.apps.SingleChannelAnalysis
 
 from mosaic.utilities.mosaicLogging import mosaicExceptionHandler
 
@@ -75,5 +75,5 @@
 
 __all__.extend(mosaic.mdio.sqlite3MDIO.__all__)
 
-__all__.extend(mosaic.ConvertToCSV.__all__)
-__all__.extend(mosaic.SingleChannelAnalysis.__all__)
+__all__.extend(mosaic.apps.ConvertToCSV.__all__)
+__all__.extend(mosaic.apps.SingleChannelAnalysis.__all__)
diff --git a/mosaic/apps/SingleChannelAnalysis.py b/mosaic/apps/SingleChannelAnalysis.py
@@ -10,7 +10,7 @@
 """
 __docformat__ = 'restructuredtext'
 
-import settings
+import mosaic.settings as settings
 import multiprocessing
 import os
 import signal

diff --git a/mosaic/apps/__init__.py b/mosaic/apps/__init__.py