diff --git a/python/src/detector.cpp b/python/src/detector.cpp index 50d81c7d8..82acb1eef 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -1520,9 +1520,11 @@ void init_det(py::module &m) { (void (Detector::*)(const std::string &, const std::string &, sls::Positions)) & Detector::copyDetectorServer, + py::arg(), py::arg(), py::arg() = Positions{}) .def("updateDetectorServer", (void (Detector::*)(const std::string &, sls::Positions)) & Detector::updateDetectorServer, + py::arg(), py::arg() = Positions{}) .def("updateKernel", (void (Detector::*)(const std::string &, sls::Positions)) & Detector::updateKernel, @@ -1535,6 +1537,11 @@ void init_det(py::module &m) { const std::string &, sls::Positions)) & Detector::updateFirmwareAndServer, py::arg(), py::arg(), py::arg(), py::arg() = Positions{}) + .def("updateFirmwareAndServer", + (void (Detector::*)(const std::string &, const std::string &, + sls::Positions)) & + Detector::updateFirmwareAndServer, + py::arg(), py::arg(), py::arg() = Positions{}) .def("readRegister", (Result(Detector::*)(uint32_t, sls::Positions) const) & Detector::readRegister, diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index c88634648..a8f999713 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -2190,7 +2190,7 @@ void Detector::updateFirmwareAndServer(const std::string &sname, LOG(logINFO) << "Updating Firmware and Detector Server (no tftp)..."; LOG(logINFO) << "Updating Detector Server (no tftp)..."; std::vector buffer = readBinaryFile(fname, "Update Detector Server"); - std::string filename = sls::getFileNameFromFilePath(fname); + std::string filename = sls::getFileNameFromFilePath(sname); pimpl->Parallel(&Module::updateDetectorServer, pos, buffer, filename); programFPGA(fname, pos); } diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 44b25d1c2..c2c17a8e9 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -2520,7 +2520,7 @@ void Module::copyDetectorServer(const std::string &fname, throw DetectorError(os.str()); } LOG(logINFO) << "Module " << moduleIndex << " (" << shm()->hostname - << "): detector server copied"; + << "): Detector server copied"; } void Module::updateDetectorServer(std::vector buffer,