Commit 8176135d authored by Benoit Formet's avatar Benoit Formet
Browse files

mono: bliss_controller wip

parent a76b51df
......@@ -17,7 +17,7 @@ class MotorConfig:
self.config_channel = None
try:
breakpoint()
# breakpoint()
config_chan_name = "config.%s" % self.config_dict["name"]
except KeyError:
# can't have config channel if there is no name
......
......@@ -313,15 +313,17 @@ class MonochromatorBase(BlissController):
def _load_config(self):
breakpoint()
# enecc = EnergyCalcMotor("enecc", self._subitems_config["ene"][0], {}, {}, {}, {})
enecc = EnergyCalcMotor(
"enecc", {"name": "enecc"}, self._subitems_config, {}, {}, {}
)
# self.motors["ene"] = self._create_ene_calc_mot()
# self.motors["ene"]._init()
self.motors["ene"] = enecc.get_axis("ene")
# enecc = EnergyCalcMotor(
# "enecc", {"name": "enecc"}, self._subitems_config, {}, {}, {}
# )
self.motors["ene"] = self._create_ene_calc_mot()
self.motors["ene"]._init()
# self.motors["ene"] = enecc.get_axis("ene")
self.motors["ene"].controller.set_mono(self)
self.energy_motor = self.motors["ene"]
self.motors["ene_track"] = enecc.get_axis("enetrack")
# self.motors["ene_track"] = enecc.get_axis("enetrack")
self.motors["ene_track"] = self._create_enetrack_calc_mot()
self.motors["ene_track"]._init()
self.motors["ene_track"].controller.set_mono(self)
self.energy_track_motor = self.motors["ene_track"]
......
......@@ -53,7 +53,7 @@ class EnergyCalcMotor(MonochromatorCalcMotorBase):
def __init__(self, *args, **kwargs):
MonochromatorCalcMotorBase.__init__(self, *args, **kwargs)
breakpoint()
# breakpoint()
self._axes_config["ene"] = (Axis, args[2]["ene"][0])
self._axes_config["enetrack"] = (Axis, args[2]["enetrack"][0])
......
Markdown is supported
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