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

format

Browse Source
This commit is contained in:
maliakal_d
2023-02-03 11:23:19 +01:00
parent 55bf73f3b7
commit e172df79f3
3 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1920,8 +1920,7 @@ int acquire(int blocking, int file_des) {
uint64_t sourcemac = getDetectorMAC();
char src_mac[MAC_ADDRESS_SIZE];
getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
sprintf(
mess,
sprintf(mess,
"Invalid udp source mac address for this detector. Must be "
"same as hardware detector mac address %s\n",
src_mac);
@ -1932,8 +1931,7 @@ int acquire(int blocking, int file_des) {
uint32_t sourceip = getDetectorIP();
char src_ip[INET_ADDRSTRLEN];
getIpAddressinString(src_ip, sourceip);
sprintf(
mess,
sprintf(mess,
"Invalid udp source ip address for this detector. Must be "
"same as hardware detector ip address %s in 1G readout "
"mode \n",

4
slsDetectorSoftware/src/DetectorImpl.h
View File

@ -84,9 +84,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
*/
virtual ~DetectorImpl();
template <class CT> struct NonDeduced {
using type = CT;
};
template <class CT> struct NonDeduced { using type = CT; };
template <typename RT, typename... CT>
Result<RT> Parallel(RT (Module::*somefunc)(CT...),
std::vector<int> positions,

1
slsSupportLib/tests/test-container_utils.cpp
View File

@ -150,5 +150,4 @@ TEST_CASE("remove duplicated empty vector"){
CHECK(v == std::vector<int>{});
}
} // namespace sls