more python funcs

python/sls_detector/experimental.py

@@ -215,39 +215,6 @@ class ExperimentalDetector(CppDetectorApi):
     # Configuration
     
   
-    # File
-    @property
-    def fname(self):
-        return element_if_equal(self.getFileNamePrefix())
-
-    @fname.setter
-    def fname(self, file_name):
-        self.setFileNamePrefix(file_name)
-
-    @property
-    def fpath(self):
-        return element_if_equal(self.getFilePath())
-
-    @fpath.setter
-    def fpath(self, path):
-        self.setFilePath(path)
-
-    @property
-    def fwrite(self):
-        return element_if_equal(self.getFileWrite())
-
-    @fwrite.setter
-    def fwrite(self, value):
-        self.setFileWrite(value)
-
-    @property
-    def foverwrite(self):
-        return element_if_equal(self.getFileOverWrite())
-
-    @foverwrite.setter
-    def foverwrite(self, value):
-        self.setFileOverWrite(value)
-
     # Time
     @property
     def rx_status(self):
@@ -354,3 +321,70 @@ class ExperimentalDetector(CppDetectorApi):
     @property
     def rx_lastclient(self):
         return element_if_equal(self.getRxLastClientIP())
+
+
+    #FILE
+
+    @property
+    def fformat(self):
+        return element_if_equal(self.getFileFormat())
+    
+    @fformat.setter
+    def fformat(self, format):
+        self.setFileFormat(format)
+
+    @property
+    def findex(self):
+        return element_if_equal(self.getAcquisitionIndex())
+
+    @findex.setter
+    def findex(self, index):
+        self.setAcquisitionIndex(index)
+
+    @property
+    def fname(self):
+        return element_if_equal(self.getFileNamePrefix())
+
+    @fname.setter
+    def fname(self, file_name):
+        self.setFileNamePrefix(file_name)
+
+    @property
+    def fpath(self):
+        return element_if_equal(self.getFilePath())
+
+    @fpath.setter
+    def fpath(self, path):
+        self.setFilePath(path)
+
+    @property
+    def fwrite(self):
+        return element_if_equal(self.getFileWrite())
+
+    @fwrite.setter
+    def fwrite(self, value):
+        self.setFileWrite(value)
+
+    @property
+    def foverwrite(self):
+        return element_if_equal(self.getFileOverWrite())
+
+    @foverwrite.setter
+    def foverwrite(self, value):
+        self.setFileOverWrite(value)
+
+    @property
+    def fmaster(self):
+        return element_if_equal(self.getMasterFileWrite())
+
+    @fmaster.setter
+    def fmaster(self, enable):
+        self.setMasterFileWrite(enable)
+
+    @property
+    def rx_framesperfile(self):
+        return element_if_equal(self.getFramesPerFile())
+
+    @rx_framesperfile.setter
+    def rx_framesperfile(self, n_frames):
+        self.setFramesPerFile(n_frames)

python/src/experimental.cpp

@@ -278,6 +278,41 @@ void init_experimental(py::module &m) {
         .def("getRxLastClientIP", &Detector::getRxLastClientIP,
              py::arg() = Positions{})
 
+        // FILE
+        .def("getFileFormat", &Detector::getFileFormat, py::arg() = Positions{})
+        .def("setFileFormat", &Detector::setFileFormat, py::arg(),
+             py::arg() = Positions{})
+        .def("getFilePath", &Detector::getFilePath, py::arg() = Positions{})
+        .def("setFilePath", &Detector::setFilePath, py::arg(),
+             py::arg() = Positions{})
+        .def("getFileNamePrefix", &Detector::getFileNamePrefix,
+             py::arg() = Positions{})
+        .def("setFileNamePrefix", &Detector::setFileNamePrefix, py::arg(),
+             py::arg() = Positions{})
+        .def("getFilePath", &Detector::getFilePath)
+        .def("setFilePath", &Detector::setFilePath, py::arg(),
+             py::arg() = Positions{})
+
+        .def("getAcquisitionIndex", &Detector::getAcquisitionIndex,
+             py::arg() = Positions{})
+        .def("setAcquisitionIndex", &Detector::setAcquisitionIndex, py::arg(),
+             py::arg() = Positions{})
+        .def("setFileWrite", &Detector::setFileWrite, py::arg(),
+             py::arg() = Positions{})
+        .def("getFileWrite", &Detector::getFileWrite, py::arg() = Positions{})
+        .def("setFileOverWrite", &Detector::setFileOverWrite, py::arg(),
+             py::arg() = Positions{})
+        .def("getFileOverWrite", &Detector::getFileOverWrite,
+             py::arg() = Positions{})
+        .def("setMasterFileWrite", &Detector::setMasterFileWrite, py::arg(),
+             py::arg() = Positions{})
+        .def("getMasterFileWrite", &Detector::getMasterFileWrite,
+             py::arg() = Positions{})
+        .def("setFramesPerFile", &Detector::setFramesPerFile, py::arg(),
+             py::arg() = Positions{})
+        .def("getFramesPerFile", &Detector::getFramesPerFile,
+             py::arg() = Positions{})
+
         // Bits and registers
         .def("setBit", &Detector::setBit, py::arg(), py::arg(),
              py::arg() = Positions{})
@@ -292,19 +327,6 @@ void init_experimental(py::module &m) {
              py::arg(), py::arg() = Positions{})
 
         // File
-        .def("getFileNamePrefix", &Detector::getFileNamePrefix)
-        .def("setFileNamePrefix", &Detector::setFileNamePrefix, py::arg(),
-             py::arg() = Positions{})
-        .def("getFilePath", &Detector::getFilePath)
-        .def("setFilePath", &Detector::setFilePath, py::arg(),
-             py::arg() = Positions{})
-        .def("setFileWrite", &Detector::setFileWrite, py::arg(),
-             py::arg() = Positions{})
-        .def("getFileWrite", &Detector::getFileWrite, py::arg() = Positions{})
-        .def("setFileOverWrite", &Detector::setFileOverWrite, py::arg(),
-             py::arg() = Positions{})
-        .def("getFileOverWrite", &Detector::getFileOverWrite,
-             py::arg() = Positions{})
 
         // Time