Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

little fixes, attenuator

Browse Source
This commit is contained in:
lemke_h
2019-04-30 21:02:32 +02:00
parent e790ecc550
commit 691cbf8e86
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eco/acquisition/dia.py
+2 -2
View File
@@ -211,8 +211,8 @@ class DIAClient:
except:
pass
if len(completepedestals)>0:
f = max(*completepedestals)[1][0]
#dtim,f = max((datetime.strptime(f.stem.split('pedestal_')[1].split('.')[0],"%Y%m%d_%H%M"),f) for f in p.glob('*.h5'))
#f = max(*completepedestals)[1][0]
dtim,f = max((datetime.strptime(f.stem.split('pedestal_')[1].split('.')[0],"%Y%m%d_%H%M"),f) for f in p.glob('*.h5'))
self.pede_file = (f.parent / Path(f.stem.split('.')[0])).as_posix()
def start(self):
eco/bernina/config.py
+2 -2
View File
@@ -22,7 +22,7 @@ from ..utilities.config import (
_eco_lazy_init = False
config = ExperimentConfiguration(
"/sf/bernina/config/exp/bernina_config_eco.json", name="bernina_config"
"/sf/bernina/config/eco/bernina_config_eco.json", name="bernina_config"
)
components = [
@@ -131,7 +131,7 @@ components = [
{
"name": "xp",
"args": [],
"kwargs": {"Id": "SAROP21-OPPI103", "evrout": "SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP"},
"kwargs": {"Id": "SAROP21-OPPI103", "IdCTA": "SAR-CCTA-ESB", "evrout": "SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP"},
"z_und": 103,
"desc": "X-ray pulse picker",
"type": "eco.xoptics.pp:Pulsepick"
eco/xoptics/pp.py
+5 -4
View File
@@ -15,15 +15,16 @@ def addMotorRecordToSelf(self, name=None, Id=None):
print("Warning! Could not find motor {name} (Id:{Id})")
class Pulsepick:
def __init__(self, Id=None, evrout=None, name=None):
def __init__(self, Id=None, IdCTA = None, evrout=None, name=None):
self.name = name
self.alias = Alias(name)
self.evrout = evrout
self.Id = Id
self._start = PV(Id + ":seq0Ctrl-Start-I")
self._stop = PV(Id + ":seq0Ctrl-Stop-I")
self._cycles = PV(Id + ":seq0Ctrl-Cycles-I")
self.IdCTA = IdCTA
self._start = PV(self.IdCTA + ":seq0Ctrl-Start-I")
self._stop = PV(self.IdCTA + ":seq0Ctrl-Stop-I")
self._cycles = PV(self.IdCTA + ":seq0Ctrl-Cycles-I")
self._openclose = PV(self.evrout)
addMotorRecordToSelf(self, Id=self.Id + ":MOTOR_X1", name="x")
addMotorRecordToSelf(self, Id=self.Id + ":MOTOR_Y1", name="y")