Skip to content
Snippets Groups Projects
Commit 64f4b341 authored by Michael DM Dryden's avatar Michael DM Dryden
Browse files

Moved rest of source to native logging.

parent 23e361d8
No related merge requests found
......@@ -26,7 +26,7 @@ import pygtk
import gtk
from numpy import mean, trapz
logger = logging.getLogger(__name__)
logger = logging.getLogger('dstat.analysis')
class AnalysisOptions(object):
"""Analysis options window."""
......
......@@ -23,9 +23,11 @@ import os
import gtk
import numpy as np
import logging
from errors import InputError, VarError, ErrorLogger
_logger = ErrorLogger(sender="dstat-interface-save")
logger = logging.getLogger("dstat.interface.save")
from errors import InputError, VarError
from params import save_params, load_params
def manSave(current_exp):
......@@ -45,7 +47,7 @@ def manSave(current_exp):
if response == gtk.RESPONSE_OK:
path = fcd.get_filename()
_logger.error(" ".join(("Selected filepath:", path)),'INFO')
logger.info("Selected filepath: %s", path)
filter_selection = fcd.get_filter().get_name()
if filter_selection.endswith("(.npy)"):
......@@ -86,7 +88,7 @@ def plotSave(plots):
if response == gtk.RESPONSE_OK:
path = fcd.get_filename()
_logger.error(" ".join(("Selected filepath:", path)),'INFO')
logger.info("Selected filepath: %s", path)
filter_selection = fcd.get_filter().get_name()
for i in plots:
......@@ -128,7 +130,7 @@ def man_param_save(window):
if response == gtk.RESPONSE_OK:
path = fcd.get_filename()
_logger.error(" ".join(("Selected filepath:", path)),'INFO')
logger.info("Selected filepath: %s", path)
if not path.endswith(".yml"):
path += '.yml'
......@@ -159,7 +161,7 @@ def man_param_load(window):
if response == gtk.RESPONSE_OK:
path = fcd.get_filename()
_logger.error(" ".join(("Selected filepath:", path)),'INFO')
logger.info("Selected filepath: %s", path)
load_params(window, path)
......
......@@ -18,8 +18,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from errors import ErrorLogger, InputError
_logger = ErrorLogger(sender="dstat-interface-parameters")
import logging
from errors import InputError
logger = logging.getLogger("dstat.parameter_test")
def lsv_test(params):
"""Test LSV parameters for sanity"""
......
......@@ -39,7 +39,7 @@ def get_params(window):
try:
parameters.update(window.adc_pot.params)
except InputError:
_logger.error("No gain selected.", 'INFO')
logger.info("No gain selected.")
parameters.update(window.exp_window.get_params(selection))
parameters.update(window.analysis_opt_window.params)
......@@ -69,7 +69,7 @@ def set_params(window, params):
window.adc_pot.params = params
if not 'experiment_index' in params:
_logger.error("Missing experiment parameters.", 'WAR')
logger.warning("Missing experiment parameters.")
return
window.expcombobox.set_active(
window.exp_window.classes[params['experiment_index']][0])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment