diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index cca862bb8..ac1b86964 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -850,8 +850,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 19355ba50..5df599ff1 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1243,17 +1243,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/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index c40908ff3..a12eaadab 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -2,12 +2,12 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package /** API versions */ #define RELEASE "7.0.3" -#define APILIB "7.0.3 0x231024" -#define APIRECEIVER "7.0.3 0x231024" -#define APICTB "7.0.3 0x231107" -#define APIGOTTHARD "7.0.3 0x231107" +#define APICTB "7.0.3 0x231107" +#define APIGOTTHARD "7.0.3 0x231107" #define APIGOTTHARD2 "7.0.3 0x231107" -#define APIJUNGFRAU "7.0.3 0x231107" -#define APIMYTHEN3 "7.0.3 0x231107" -#define APIMOENCH "7.0.3 0x231107" -#define APIEIGER "7.0.3 0x231107" +#define APIJUNGFRAU "7.0.3 0x231107" +#define APIMYTHEN3 "7.0.3 0x231107" +#define APIMOENCH "7.0.3 0x231107" +#define APIEIGER "7.0.3 0x231107" +#define APILIB "7.0.3 0x231108" +#define APIRECEIVER "7.0.3 0x231108"