Dev/verify shm (#1276)

* removed verify, update, fixed getUser to be a free function, generated commands, python bindings yet to do

* python bindings

* fixed tests

* minor

* minor

* format

python/slsdet/__init__.py

@@ -15,7 +15,7 @@ from .gaincaps import Mythen3GainCapsWrapper
 from .PatternGenerator import PatternGenerator
 
 from . import _slsdet
-from ._slsdet import freeSharedMemory
+from ._slsdet import freeSharedMemory, getUserDetails
 
 xy = _slsdet.xy
 defs = _slsdet.slsDetectorDefs

python/slsdet/detector.py

@@ -15,7 +15,7 @@ defs = slsDetectorDefs
 
 from .utils import element_if_equal, all_equal, get_set_bits, list_to_bitmask
 from .utils import Geometry, to_geo, element, reduce_time, is_iterable, hostname_list
-from ._slsdet import xy, freeSharedMemory
+from ._slsdet import xy, freeSharedMemory, getUserDetails
 from .gaincaps import Mythen3GainCapsWrapper
 from . import utils as ut
 from .proxy import JsonProxy, SlowAdcProxy, ClkDivProxy, MaxPhaseProxy, ClkFreqProxy, PatLoopProxy, PatNLoopProxy, PatWaitProxy, PatWaitTimeProxy 
@@ -1537,7 +1537,7 @@ class Detector(CppDetectorApi):
         """
         Retrieve user details from shared memory (hostname, type, PID, User, Date)
         """
-        return self.getUserDetails()
+        return getUserDetails(self.getShmId())
 
     @property
     @element

python/src/detector.cpp

@@ -25,6 +25,9 @@ void init_det(py::module &m) {
           (void (*)(const int, const int)) & sls::freeSharedMemory,
           py::arg() = 0, py::arg() = -1);
 
+    m.def("getUserDetails", (std::string(*)(const int)) & sls::getUserDetails,
+          py::arg() = 0);
+
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi.def(py::init<int>());
 
@@ -2063,7 +2066,5 @@ void init_det(py::module &m) {
                        (Result<sls::ns>(Detector::*)(sls::Positions) const) &
                            Detector::getMeasurementTime,
                        py::arg() = Positions{});
-    CppDetectorApi.def("getUserDetails", (std::string(Detector::*)() const) &
-                                             Detector::getUserDetails);
     ;
 }

python/src/detector_in.cpp

@@ -19,6 +19,8 @@ void init_det(py::module &m) {
     using sls::Result;
 
     m.def("freeSharedMemory", (void (*)(const int, const int)) &sls::freeSharedMemory, py::arg() = 0, py::arg() = -1);
+
+    m.def("getUserDetails", (std::string (*)(const int)) &sls::getUserDetails, py::arg() = 0);
     
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi.def(py::init<int>());