detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 18:10:40 +02:00
Code Issues Actions Packages Releases Activity

python fix, server copy wrong filename

Browse Source
This commit is contained in:
maliakal_d 2021-11-10 16:40:14 +01:00
parent 5190e2ab30
commit 4b46091be2
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/src/detector.cpp
View File

@ -1520,9 +1520,11 @@ void init_det(py::module &m) {
(void (Detector::*)(const std::string &, const std::string &, (void (Detector::*)(const std::string &, const std::string &,
sls::Positions)) & sls::Positions)) &
Detector::copyDetectorServer, Detector::copyDetectorServer,
py::arg(), py::arg(), py::arg() = Positions{})
.def("updateDetectorServer", .def("updateDetectorServer",
(void (Detector::*)(const std::string &, sls::Positions)) & (void (Detector::*)(const std::string &, sls::Positions)) &
Detector::updateDetectorServer, Detector::updateDetectorServer,
py::arg(), py::arg() = Positions{})
.def("updateKernel", .def("updateKernel",
(void (Detector::*)(const std::string &, sls::Positions)) & (void (Detector::*)(const std::string &, sls::Positions)) &
Detector::updateKernel, Detector::updateKernel,
@ -1535,6 +1537,11 @@ void init_det(py::module &m) {
const std::string &, sls::Positions)) & const std::string &, sls::Positions)) &
Detector::updateFirmwareAndServer, Detector::updateFirmwareAndServer,
py::arg(), py::arg(), py::arg(), py::arg() = Positions{}) 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", .def("readRegister",
(Result<uint32_t>(Detector::*)(uint32_t, sls::Positions) const) & (Result<uint32_t>(Detector::*)(uint32_t, sls::Positions) const) &
Detector::readRegister, Detector::readRegister,

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -2190,7 +2190,7 @@ void Detector::updateFirmwareAndServer(const std::string &sname,
LOG(logINFO) << "Updating Firmware and Detector Server (no tftp)..."; LOG(logINFO) << "Updating Firmware and Detector Server (no tftp)...";
LOG(logINFO) << "Updating Detector Server (no tftp)..."; LOG(logINFO) << "Updating Detector Server (no tftp)...";
std::vector<char> buffer = readBinaryFile(fname, "Update Detector Server"); std::vector<char> 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); pimpl->Parallel(&Module::updateDetectorServer, pos, buffer, filename);
programFPGA(fname, pos); programFPGA(fname, pos);
} }

2
slsDetectorSoftware/src/Module.cpp
View File

@ -2520,7 +2520,7 @@ void Module::copyDetectorServer(const std::string &fname,
throw DetectorError(os.str()); throw DetectorError(os.str());
} }
LOG(logINFO) << "Module " << moduleIndex << " (" << shm()->hostname LOG(logINFO) << "Module " << moduleIndex << " (" << shm()->hostname
<< "): detector server copied"; << "): Detector server copied";
} }
void Module::updateDetectorServer(std::vector<char> buffer, void Module::updateDetectorServer(std::vector<char> buffer,