This commit is contained in:
Erik Frojdh
2020-05-28 09:28:53 +02:00
parent 6c753f3b50
commit e2eb1598d3
8 changed files with 68 additions and 9 deletions

View File

@ -0,0 +1,27 @@
import pytest
import datetime as dt
@pytest.fixture
def jf():
from slsdet import Jungfrau
return Jungfrau()
def test_storagecells(jf):
for i in range(16):
jf.storagecells = i
assert jf.storagecells == i
jf.storagecells = 0 #default
def test_storagecell_start(jf):
for i in range(16):
jf.storagecell_start = i
assert jf.storagecell_start == i
jf.storagecells = 15 #default
def test_storagecell_delay(jf):
for t in [0.001, 0.0002, 0.0013]:
jf.storagecell_delay = t
assert jf.storagecell_delay == t
jf.storagecell_delay = 0 #default

View File

@ -748,6 +748,38 @@ class Detector(CppDetectorApi):
def storeinram(self, value):
self.setStoreInRamMode(value)
"""
Jungfrau specific
"""
@property
@element
def storagecells(self):
return self.getNumberOfAdditionalStorageCells()
@storagecells.setter
def storagecells(self, n_cells):
self.setNumberOfAdditionalStorageCells(n_cells)
@property
@element
def storagecell_start(self):
return self.getStorageCellStart()
@storagecell_start.setter
def storagecell_start(self, value):
self.setStorageCellStart(value)
@property
@element
def storagecell_delay(self):
return ut.reduce_time(self.getStorageCellDelay())
@storagecell_delay.setter
def storagecell_delay(self, t):
self.setStorageCellDelay(ut.make_timedelta(t))
"""
Gotthard2
"""

View File

@ -880,9 +880,9 @@ void init_det(py::module &m) {
(Result<int>(Detector::*)(sls::Positions) const) &
Detector::getStorageCellStart,
py::arg() = Positions{})
.def("setStoragecellStart",
.def("setStorageCellStart",
(void (Detector::*)(int, sls::Positions)) &
Detector::setStoragecellStart,
Detector::setStorageCellStart,
py::arg(), py::arg() = Positions{})
.def("getStorageCellDelay",
(Result<sls::ns>(Detector::*)(sls::Positions) const) &