From 573177203bd1bf6cc98450902108ae4d03d88395 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 7 Nov 2023 14:51:15 +0100 Subject: [PATCH] formatting --- slsDetectorGui/src/qTabMeasurement.cpp | 4 ++-- slsDetectorSoftware/src/DetectorImpl.cpp | 8 ++++---- slsDetectorSoftware/tests/test-CmdProxy-moench.cpp | 12 ++++++------ slsSupportLib/include/sls/versionAPI.h | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 0bcfb7111..dc97903bb 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -804,8 +804,8 @@ void qTabMeasurement::GetNextFrameNumber() { spinNextFrameNumber->setValue(retval); } CATCH_HANDLE("Could not get starting frame number.", - "qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber, - &QSpinBox::setValue, -1) + "qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber, + &QSpinBox::setValue, -1) connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this, SLOT(SetNextFrameNumber(int))); } diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index e22f58fc8..2db04f1f2 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1229,17 +1229,17 @@ int DetectorImpl::acquire() { // handle jf sync issue (master idle, slaves stopped) if (statusList.contains_only(IDLE, STOPPED)) { status = STOPPED; - } - else + } else status = statusList.squash(RUNNING); } // progress auto a = Parallel(&Module::getReceiverProgress, {}); double progress = (*std::max_element(a.begin(), a.end())); - + // callback - acquisition_finished(progress, static_cast(status), acqFinished_p); + acquisition_finished(progress, static_cast(status), + acqFinished_p); } clock_gettime(CLOCK_REALTIME, &end); diff --git a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp index fdcbaff24..e56e0d99f 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp @@ -19,17 +19,18 @@ using test::PUT; /* dacs */ TEST_CASE("Setting and reading back moench dacs", "[.cmd][.dacs]") { - // vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds, ibias_sfp + // vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds, + // ibias_sfp Detector det; CmdProxy proxy(&det); auto det_type = det.getDetectorType().squash(); if (det_type == defs::MOENCH) { - SECTION("vbp_colbuf") { test_dac(defs::VBP_COLBUF, "vbp_colbuf", 1300); } + SECTION("vbp_colbuf") { + test_dac(defs::VBP_COLBUF, "vbp_colbuf", 1300); + } SECTION("vipre") { test_dac(defs::VIPRE, "vipre", 1000); } SECTION("vin_cm") { test_dac(defs::VIN_CM, "vin_cm", 1400); } - SECTION("vb_sda") { - test_dac(defs::VB_SDA, "vb_sda", 680); - } + SECTION("vb_sda") { test_dac(defs::VB_SDA, "vb_sda", 680); } SECTION("vcasc_sfp") { test_dac(defs::VCASC_SFP, "vcasc_sfp", 1428); } SECTION("vout_cm") { test_dac(defs::VOUT_CM, "vout_cm", 1200); } SECTION("vipre_cds") { test_dac(defs::VIPRE_CDS, "vipre_cds", 800); } @@ -105,5 +106,4 @@ TEST_CASE("Setting and reading back moench dacs", "[.cmd][.dacs]") { } } - } // namespace sls diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 7665d69bd..0475e34ef 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define RELEASE "8.0.0" #define APILIB "8.0.0 0x231025" #define APIRECEIVER "8.0.0 0x231025" -#define APICTB "8.0.0 0x231031" -#define APIGOTTHARD "8.0.0 0x231031" +#define APICTB "8.0.0 0x231031" +#define APIGOTTHARD "8.0.0 0x231031" #define APIGOTTHARD2 "8.0.0 0x231031" -#define APIJUNGFRAU "8.0.0 0x231031" -#define APIMYTHEN3 "8.0.0 0x231031" -#define APIMOENCH "8.0.0 0x231031" -#define APIEIGER "8.0.0 0x231031" +#define APIJUNGFRAU "8.0.0 0x231031" +#define APIMYTHEN3 "8.0.0 0x231031" +#define APIMOENCH "8.0.0 0x231031" +#define APIEIGER "8.0.0 0x231031"