Setting pattern from memory (#218)

* ToString accepts c-style arrays

* added patternParameters to python

* fixed patwait time bug in validation

* moved load from file function to patterParameters

* server using patternparamters structure to get pattern

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>

python/CMakeLists.txt

@@ -28,6 +28,7 @@ set( PYTHON_FILES
     enums.py
     errors.py
     gotthard.py
+    pattern.py
     gotthard2.py
     moench.py
     proxy.py

python/examples/manipulate_pattern.py

@@ -0,0 +1,14 @@
+
+
+from slsdet import Detector, patternParameters
+
+d = Detector()
+pat = patternParameters()
+
+#Access to memers of the structure using numpy arrays
+pat.patlimits = 0x0, 0xa
+
+d.setPattern(pat)
+
+#Load pattern from file
+pat.load("/some/dir/some.pat")

python/examples/use_enum.py

@@ -6,7 +6,7 @@ d = Detector()
 d.fformat = fileFormat.BINARY
 
 # Altough not recommended for convenience all enums 
-# and some other things can be impored using *
+# and some other things can be imported using *
 
 from slsdet import *
 d.speed = speedLevel.FULL_SPEED 
@@ -15,6 +15,6 @@ d.speed = speedLevel.FULL_SPEED
 
 import slsdet.enums
 for enum in dir(slsdet.enums):
-    # filter out special memebers
+    # filter out special members
     if not enum.startswith('_'):
         print(enum)

python/scripts/basic.py

@@ -10,6 +10,8 @@ from slsdet.lookup import view, find
 import slsdet
 
 
+
+
 d = Detector()
 e = Eiger()
 c = Ctb()

python/scripts/generate_enums.py

@@ -55,7 +55,7 @@ def generate_enum_string(enums):
         data.append('.export_values();\n\n')
     return ''.join(data)
 
-with open('../../slsSupportLib/include/sls_detector_defs.h') as f:
+with open('../../slsSupportLib/include/sls/sls_detector_defs.h') as f:
     data = f.read()
 
 data = remove_comments(data)

python/slsdet/__init__.py

@@ -8,6 +8,7 @@ from .mythen3 import Mythen3
 from .gotthard2 import Gotthard2
 from .gotthard import Gotthard
 from .moench import Moench
+from .pattern import patternParameters
 
 import _slsdet
 xy = _slsdet.xy

python/slsdet/pattern.py

@@ -0,0 +1,25 @@
+import _slsdet
+
+class patternParameters(_slsdet.patternParameters):
+    def __init__(self):
+        super().__init__()
+        self.view = self.numpy_view()
+        self.names = self.view.dtype.names
+
+    def __getattr__(self, name):
+        if name in self.names:
+            return self.view[name][0]
+        else:
+            raise KeyError(f"Key: {name} not found")
+
+    def __setattr__(self, name, value):
+        if name in ['view', 'names']:
+            self.__dict__[name] = value
+        elif name in self.names:
+            self.view[name] = value
+        else: 
+            raise KeyError(f"Key: {name} not found")
+
+    #Provide custom dir for tab completion
+    def __dir__(self):
+        return self.names

python/src/detector.cpp

@@ -1271,6 +1271,11 @@ void init_det(py::module &m) {
              (void (Detector::*)(const std::string &, sls::Positions)) &
                  Detector::setPattern,
              py::arg(), py::arg() = Positions{})
+        .def("setPattern",
+             (void (Detector::*)(const defs::patternParameters *,
+                                 sls::Positions)) &
+                 Detector::setPattern,
+             py::arg(), py::arg() = Positions{})
         .def("savePattern",
              (void (Detector::*)(const std::string &)) & Detector::savePattern,
              py::arg())

python/src/enums.cpp

@@ -2,6 +2,7 @@
  * warning */
 
 #include <pybind11/chrono.h>
+#include <pybind11/numpy.h>
 #include <pybind11/operators.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
@@ -16,6 +17,20 @@ void init_enums(py::module &m) {
     xy.def_readwrite("x", &slsDetectorDefs::xy::x);
     xy.def_readwrite("y", &slsDetectorDefs::xy::y);
 
+    py::class_<slsDetectorDefs::patternParameters> patternParameters(
+        m, "patternParameters");
+
+    using pat = slsDetectorDefs::patternParameters;
+    PYBIND11_NUMPY_DTYPE(pat, word, patioctrl, patlimits, patloop, patnloop,
+                         patwait, patwaittime);
+
+    patternParameters.def(py::init());
+    patternParameters.def("numpy_view", [](py::object &obj) {
+        pat &o = obj.cast<pat &>();
+        return py::array_t<pat>(1, &o, obj);
+    });
+    patternParameters.def("load", &pat::load);
+
     py::enum_<slsDetectorDefs::detectorType>(Defs, "detectorType")
         .value("GENERIC", slsDetectorDefs::detectorType::GENERIC)
         .value("EIGER", slsDetectorDefs::detectorType::EIGER)

python/src/enums_in.cpp

@@ -1,4 +1,5 @@
 #include <pybind11/chrono.h>
+#include <pybind11/numpy.h>
 #include <pybind11/operators.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
@@ -9,10 +10,22 @@ void init_enums(py::module &m) {
     py::class_<slsDetectorDefs> Defs(m, "slsDetectorDefs");
     py::class_<slsDetectorDefs::xy> xy(m, "xy");
     xy.def(py::init());
-	xy.def(py::init<int,int>());
+    xy.def(py::init<int, int>());
     xy.def_readwrite("x", &slsDetectorDefs::xy::x);
     xy.def_readwrite("y", &slsDetectorDefs::xy::y);
 
-[[ENUMS]]
+    py::class_<slsDetectorDefs::patternParameters> patternParameters(
+        m, "patternParameters");
 
+    using pat = slsDetectorDefs::patternParameters;
+    PYBIND11_NUMPY_DTYPE(pat, word, patioctrl, patlimits, patloop, patnloop,
+                         patwait, patwaittime);
+
+    patternParameters.def(py::init());
+    patternParameters.def("numpy_view", [](py::object &obj) { 
+        pat& o = obj.cast<pat&>();
+        return py::array_t<pat>(1, &o, obj); });
+    patternParameters.def("load", &pat::load);
+
+    [[ENUMS]]
 }