Skip to content
Snippets Groups Projects
Commit a0cd53ac authored by Simone Vadilonga's avatar Simone Vadilonga
Browse files

update

parent 29be2ba3
No related branches found
No related tags found
No related merge requests found
from .base import *
from .beamline import *
from .derived_signals import *
from .plans import *
from .tools import *
from .baseline import *
......
......@@ -76,9 +76,10 @@ div_det1 = DivideByArgs(mca.ch1.roi0.count, [mca.ch1.lifetime], name="div_det1")
div_det2 = DivideByArgs(mca.ch1.roi0.count, [mca.ch1.lifetime, kth00.readback], name="div_det2")
div_det2l = DivideByArgs(mca.ch1.roi0.count, [mca.ch1.lifetime, kth00.readback], log=True, name="div_det2l")
from beamlinetools.devices.mca_derived import DerivedROI, DerivedMCA
from beamlinetools.devices.mca_derived import DerivedROI, DerivedMCA, DerivedSignals
dmca = DerivedMCA('',mca=mca, kth=kth00, name="dd")
# dmca = DerivedMCA('',mca=mca, kth=kth00, name="dd")
# dmca = DerivedSignals('',mca=mca, kth=kth00, name="dd")
# div_mca = DivideByArgs(derived_from=mca.ch1.roi0.count, divisors=[mca.ch1.lifetime, kth00.readback], log=True, name="div_det2l")
......
from beamlinetools.devices.mca_derived import DerivedROI, DerivedMCA, DerivedSignals
# dmca = DerivedMCA('',mca=mca, kth=kth00, name="dd")
dmca = DerivedSignals('', name="dd")
......@@ -78,24 +78,25 @@ class DivideByArgs(DerivedSignal):
# name=name, parent=parent, **kwargs)
class Tunnel():
def __init__(self, derived_from=None, divisors=None, log=False) -> None:
def __init__(self, **kwargs):#derived_from=None, divisors=None, log=False, **kwargs) -> None:
DivideByArgs(derived_from, divisors, log=log)
from beamlinetools.BEAMLINE_CONFIG.beamline import mca, kth00 as kth
class DerivedSignals(Device):
def __init__(self, prefix, *, mca_ch_roi=None, mca_ch_lifetime=None, kth=None, read_attrs=None, configuration_attrs=None,
lt = Cpt(Tunnel,'', derived_from=mca.ch1.roi0.count, divisors=[kth.readback])
# ltcur = Cpt(Tunnel,'', derived_from=mca.ch1.roi0.count, divisors=[mca.ch1.lifetime, kth.readback])
# ltcurlog = Cpt(Tunnel,'', derived_from=mca.ch1.roi0.count, divisors=[mca.ch1.lifetime, kth.readback], log=True)
def __init__(self, prefix, *, read_attrs=None, configuration_attrs=None,
name=None, parent=None, **kwargs):
self.lt = Cpt(Tunnel,'', derived_from=mca_ch_roi.count, divisors=[kth.readback])
self.ltcur = Cpt(Tunnel,'', derived_from=mca_ch_roi.count, divisors=[mca_ch_lifetime, kth.readback])
self.ltcurlog = Cpt(Tunnel,'', derived_from=mca_ch_roi.count, divisors=[mca_ch_lifetime, kth.readback], log=True)
super().__init__(prefix, read_attrs=read_attrs,
configuration_attrs=configuration_attrs,
name=name, parent=parent, **kwargs)
class DerivedROI(Device):
def __init__(self, prefix, *, mca_ch=None,kth=None, read_attrs=None, configuration_attrs=None,
name=None, parent=None, **kwargs):
self.roi0 = DerivedSignals('', mca_ch_roi=mca_ch.roi0, mca_ch_lifetime=mca_ch.lifetime, kth=kth)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment