fix0
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
from numbers import Number
|
||||
import os
|
||||
from pathlib import Path
|
||||
from escape.swissfel import load_dataset_from_scan
|
||||
|
||||
@@ -41,7 +42,7 @@ class RunData:
|
||||
if run_number < 0:
|
||||
run_number = self.get_available_run_numbers()[run_number]
|
||||
print(f"Loading run number {run_number}")
|
||||
tkwargs = self.load_kwargs
|
||||
tkwargs = self.load_kwargs.copy()
|
||||
tkwargs.update(kwargs)
|
||||
|
||||
tks = {}
|
||||
@@ -53,6 +54,10 @@ class RunData:
|
||||
trun = load_dataset_from_scan(
|
||||
pgroup=self.pgroup.get_current_value(), run_numbers=[run_number], **tks
|
||||
)
|
||||
|
||||
###
|
||||
self.adjust_group()
|
||||
|
||||
self.loaded_runs[run_number] = {"dataset": trun}
|
||||
self.__setattr__(f"run{run_number:04d}", trun)
|
||||
return trun
|
||||
@@ -77,6 +82,9 @@ class RunData:
|
||||
# else:
|
||||
# return getattr(self, name)
|
||||
|
||||
def adjust_group(self,subdir_type='scratch/.escape_parse_result'):
|
||||
os.system("chgrp -R "+self.pgroup.get_current_value()[1:]+f" /sf/bernina/data/{self.pgroup.get_current_value()}/{subdir_type}")
|
||||
|
||||
def get_run(self, run_number, **kwargs):
|
||||
if run_number < 0:
|
||||
run_number = self.get_available_run_numbers()[run_number]
|
||||
|
||||
@@ -16,7 +16,9 @@ from ..elements.adjustable import (
|
||||
update_changes,
|
||||
value_property,
|
||||
AdjustableFS,
|
||||
AdjustableGetSet,
|
||||
)
|
||||
from ..elements.detector import DetectorGet
|
||||
from eco.devices_general.utilities import Changer
|
||||
import pylab as plt
|
||||
|
||||
@@ -36,6 +38,7 @@ class Att_usd(Assembly):
|
||||
self._append(AdjustableFS, f'/sf/bernina/config/eco/reference_values/{name}_limit_low.json', default_value=0, name="limit_low", is_setting=True)
|
||||
self._append(SmaractRecord, "SARES23-LIC:MOT_10", name="transl_2", is_setting=True, is_display=True)
|
||||
self._append(SmaractRecord, "SARES23-LIC:MOT_3", name="transl_1", is_setting=True, is_display=True)
|
||||
self._append(DetectorGet,self.get_current_value,name='readback',is_display=True)
|
||||
self.motor_configuration = {
|
||||
"transl_2": {
|
||||
"id": "SARES23-LIC10",
|
||||
|
||||
Reference in New Issue
Block a user