From ff92ebe9a6431b68d0ca395751d75049b4b1e554 Mon Sep 17 00:00:00 2001 From: Mathias Sander Date: Fri, 4 Feb 2022 10:49:25 +0100 Subject: [PATCH] changes for LiNb campaign --- eco/acquisition/scan.py | 5 ++++- eco/epics/adjustable.py | 2 +- eco/loptics/bernina_laser.py | 2 +- ~/eco/reference_values/otti_det_rot_offset.json | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 ~/eco/reference_values/otti_det_rot_offset.json diff --git a/eco/acquisition/scan.py b/eco/acquisition/scan.py index f1c20e4..ac349a1 100755 --- a/eco/acquisition/scan.py +++ b/eco/acquisition/scan.py @@ -158,7 +158,10 @@ class Scan: except: print("elog posting failed") if self._run_table: - self._run_table.append_run(runno, metadata=metadata) + try: + self._run_table.append_run(runno, metadata=metadata) + except: + print("WARNING: issue adding data to run table") def get_filename(self, stepNo, Ndigits=4): fina = os.path.join(self.basepath, Path(self.fina).stem) diff --git a/eco/epics/adjustable.py b/eco/epics/adjustable.py index ccbd077..7542691 100644 --- a/eco/epics/adjustable.py +++ b/eco/epics/adjustable.py @@ -194,7 +194,7 @@ class AdjustablePvString: ) def __repr__(self): - return self.get_current_value() + return str(self.get_current_value()) def __call__(self, string=None): if not string is None: diff --git a/eco/loptics/bernina_laser.py b/eco/loptics/bernina_laser.py index e86ed62..a77d0d7 100644 --- a/eco/loptics/bernina_laser.py +++ b/eco/loptics/bernina_laser.py @@ -55,7 +55,7 @@ class LaserBernina(Assembly): self._append( MotorRecord, - self.pvname + "-M521:MOTOR_1", + self.pvname + "-M522:MOTOR_1", name="delaystage_pump", is_setting=True, ) diff --git a/~/eco/reference_values/otti_det_rot_offset.json b/~/eco/reference_values/otti_det_rot_offset.json new file mode 100644 index 0000000..965e974 --- /dev/null +++ b/~/eco/reference_values/otti_det_rot_offset.json @@ -0,0 +1,3 @@ +{ + "value": null +} \ No newline at end of file