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

formatting

Browse Source
This commit is contained in:
maliakal_d
2023-02-14 15:08:31 +01:00
parent 0251aa9e63
commit cb8e4365e3
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -527,7 +527,8 @@ TEST_CASE("gappixels", "[.cmd]") {
bool quad = det.getQuad().squash(false); bool quad = det.getQuad().squash(false);
bool fullModule = (det.getModuleGeometry().y % 2 == 0); bool fullModule = (det.getModuleGeometry().y % 2 == 0);
if (det_type == defs::JUNGFRAU || (det_type == defs::EIGER && (quad || fullModule))) { if (det_type == defs::JUNGFRAU ||
(det_type == defs::EIGER && (quad || fullModule))) {
auto prev_val = det.getGapPixelsinCallback(); auto prev_val = det.getGapPixelsinCallback();
{ {
std::ostringstream oss; std::ostringstream oss;

3
slsDetectorSoftware/tests/test-SharedMemory.cpp
View File

@ -101,7 +101,8 @@ TEST_CASE("Move SharedMemory", "[detector]") {
shm2 = std::move(shm); // shm is now a moved from object! shm2 = std::move(shm); // shm is now a moved from object!
CHECK(shm2()->x == 9); CHECK(shm2()->x == 9);
REQUIRE_THROWS(shm()); // trying to access should throw instead of returning a nullptr REQUIRE_THROWS(
shm()); // trying to access should throw instead of returning a nullptr
CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") + CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id)); std::to_string(shm_id));
shm2.removeSharedMemory(); shm2.removeSharedMemory();

4
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,5 +9,5 @@
#define APIMYTHEN3 "7.0.0.rc3 0x230130" #define APIMYTHEN3 "7.0.0.rc3 0x230130"
#define APIMOENCH "7.0.0.rc3 0x230130" #define APIMOENCH "7.0.0.rc3 0x230130"
#define APIEIGER "7.0.0.rc3 0x230130" #define APIEIGER "7.0.0.rc3 0x230130"
#define APILIB "7.0.0.rc4 0x230214" #define APILIB "7.0.0.rc4 0x230214"
#define APIRECEIVER "7.0.0.rc4 0x230214" #define APIRECEIVER "7.0.0.rc4 0x230214"