Skip to content

Commit

Permalink
#85
Browse files Browse the repository at this point in the history
  • Loading branch information
jemian committed Feb 12, 2019
1 parent 4bc9fec commit 61ff8f7
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions apstools/devices.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
from datetime import datetime
import epics
import itertools
import logging
import numpy as np
import threading
import time
Expand All @@ -109,6 +110,8 @@
from bluesky import plan_stubs as bps


logger = logging.getLogger(__name__)

"""for convenience""" # TODO: contribute to ophyd?
SCALER_AUTOCOUNT_MODE = 1

Expand Down Expand Up @@ -654,12 +657,12 @@ def __init__(self, *args, **kwargs):

def _default_pre_tune_method(self):
"""called before `tune()`"""
print("{} position before tuning: {}".format(self.name, self.position))
logger.info("{} position before tuning: {}".format(self.name, self.position))
yield from bps.null()

def _default_post_tune_method(self):
"""called after `tune()`"""
print("{} position after tuning: {}".format(self.name, self.position))
logger.info("{} position after tuning: {}".format(self.name, self.position))
yield from bps.null()

def tune(self, md=None, **kwargs):
Expand Down Expand Up @@ -1390,7 +1393,7 @@ def generate_datum(self, key, timestamp, datum_kwargs):
# inject the actual name of the HDF5 file here into datum_kwargs
datum_kwargs["HDF5_file_name"] = hdf5_file_name

# print("make_filename:", hdf5_file_name)
logger.debug("make_filename:", hdf5_file_name)
return super().generate_datum(key, timestamp, datum_kwargs)

def get_frames_per_point(self):
Expand Down

0 comments on commit 61ff8f7

Please sign in to comment.