From 7fcac35549e44e3e6c49a5878a0d4a3cd6092198 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 17 Nov 2020 17:39:34 +0100 Subject: [PATCH 1/4] gui exception thrown from acquire caught properly in gui --- slsDetectorGui/include/qDrawPlot.h | 4 ++-- slsDetectorGui/include/qTabMeasurement.h | 2 +- slsDetectorGui/src/qDetectorMain.cpp | 3 ++- slsDetectorGui/src/qDrawPlot.cpp | 13 +++++-------- slsDetectorGui/src/qTabMeasurement.cpp | 5 ++++- slsDetectorSoftware/src/DetectorImpl.cpp | 8 ++++---- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index 205870d88..03277ff49 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -1,6 +1,6 @@ #pragma once -#include "sls/Detector.h" #include "qDefs.h" +#include "sls/Detector.h" #include "ui_form_plot.h" #include @@ -63,7 +63,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject { signals: void AcquireFinishedSignal(); - void AbortSignal(); + void AbortSignal(QString); void UpdateSignal(); private: diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index da04af85d..b1b1270a5 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -16,7 +16,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject { public slots: void AcquireFinished(); - void AbortAcquire(); + void AbortAcquire(QString exmsg); private slots: void SetTimingMode(int val); diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 7ac03002e..2ca2c1291 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -270,7 +270,8 @@ void qDetectorMain::Initialization() { // Plotting connect(plot, SIGNAL(AcquireFinishedSignal()), tabMeasurement, SLOT(AcquireFinished())); - connect(plot, SIGNAL(AbortSignal()), tabMeasurement, SLOT(AbortAcquire())); + connect(plot, SIGNAL(AbortSignal(QString)), tabMeasurement, + SLOT(AbortAcquire(QString))); // menubar // Modes Menu diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 386c09892..c10646a8b 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -672,18 +672,15 @@ void qDrawPlot::AcquireThread() { // handle it if (!mess.empty()) { LOG(logERROR) << "Acquisition Finished with an exception: " << mess; - qDefs::ExceptionMessage("Acquire unsuccessful.", mess, - "qDrawPlot::AcquireFinished"); + // qDefs::ExceptionMessage("Acquire unsuccessful.", mess, + // "qDrawPlot::AcquireFinished"); try { det->stopDetector(); - } - CATCH_DISPLAY("Could not stop detector acquisition.", - "qDrawPlot::AcquireFinished"); - try { det->stopReceiver(); + } catch (...) { + ; } - CATCH_DISPLAY("Could not stop receiver.", "qDrawPlot::AcquireFinished"); - emit AbortSignal(); + emit AbortSignal(QString(mess.c_str())); } LOG(logDEBUG) << "End of Acquisition Finished"; } diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 6e09c2ba0..f9510e0cd 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -948,8 +948,11 @@ void qTabMeasurement::AcquireFinished() { } } -void qTabMeasurement::AbortAcquire() { +void qTabMeasurement::AbortAcquire(QString exmsg) { LOG(logINFORED) << "Abort Acquire"; + qDefs::ExceptionMessage("Acquire unsuccessful.", + exmsg.toAscii().constData(), + "qDrawPlot::AcquireFinished"); isAcquisitionStopped = true; AcquireFinished(); } diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index daa81f997..925d95106 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1079,13 +1079,13 @@ int DetectorImpl::acquire() { } } - startProcessingThread(receiver); - // start receiver if (receiver) { Parallel(&Module::startReceiver, {}); } + startProcessingThread(receiver); + // start and read all try { Parallel(&Module::startAndReadAll, {}); @@ -1126,10 +1126,10 @@ int DetectorImpl::acquire() { (end.tv_nsec - begin.tv_nsec) / 1000000000.0) << " seconds"; } catch (...) { - if (dataProcessingThread.joinable()){ + if (dataProcessingThread.joinable()) { setJoinThreadFlag(true); dataProcessingThread.join(); - } + } setAcquiringFlag(false); throw; } From 8be579ea5327645cdda41e07dbf85240d04e4736 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 17 Nov 2020 18:41:18 +0100 Subject: [PATCH 2/4] binaries name changed --- ...ctorServer_developer => ctbDetectorServerv5.0.0} | Bin ...orServer_developer => eigerDetectorServerv5.0.0} | Bin ...rver_developer => gotthard2DetectorServerv5.0.0} | Bin ...erver_developer => gotthardDetectorServerv5.0.0} | Bin ...erver_developer => jungfrauDetectorServerv5.0.0} | Bin ...rServer_developer => moenchDetectorServerv5.0.0} | Bin ...Server_developer => mythen3DetectorServerv5.0.0} | Bin 7 files changed, 0 insertions(+), 0 deletions(-) rename slsDetectorServers/ctbDetectorServer/bin/{ctbDetectorServer_developer => ctbDetectorServerv5.0.0} (100%) rename slsDetectorServers/eigerDetectorServer/bin/{eigerDetectorServer_developer => eigerDetectorServerv5.0.0} (100%) rename slsDetectorServers/gotthard2DetectorServer/bin/{gotthard2DetectorServer_developer => gotthard2DetectorServerv5.0.0} (100%) rename slsDetectorServers/gotthardDetectorServer/bin/{gotthardDetectorServer_developer => gotthardDetectorServerv5.0.0} (100%) rename slsDetectorServers/jungfrauDetectorServer/bin/{jungfrauDetectorServer_developer => jungfrauDetectorServerv5.0.0} (100%) rename slsDetectorServers/moenchDetectorServer/bin/{moenchDetectorServer_developer => moenchDetectorServerv5.0.0} (100%) rename slsDetectorServers/mythen3DetectorServer/bin/{mythen3DetectorServer_developer => mythen3DetectorServerv5.0.0} (100%) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer rename to slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv5.0.0 diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer rename to slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv5.0.0 diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer rename to slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv5.0.0 diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer rename to slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv5.0.0 diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer rename to slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv5.0.0 diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer rename to slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv5.0.0 diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv5.0.0 similarity index 100% rename from slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer rename to slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv5.0.0 From cbf61ed05e447177e978eeb2b3772abdb19c7525 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 17 Nov 2020 18:43:45 +0100 Subject: [PATCH 3/4] binaries in serverbin --- serverBin/ctbDetectorServer_developer | 1 - serverBin/ctbDetectorServerv5.0.0 | 1 + serverBin/eigerDetectorServer_developer | 1 - serverBin/eigerDetectorServerv5.0.0 | 1 + serverBin/gotthard2DetectorServer_developer | 1 - serverBin/gotthard2DetectorServerv5.0.0 | 1 + serverBin/gotthardDetectorServer_developer | 1 - serverBin/gotthardDetectorServerv5.0.0 | 1 + serverBin/jungfrauDetectorServer_developer | 1 - serverBin/jungfrauDetectorServerv5.0.0 | 1 + serverBin/moenchDetectorServer_developer | 1 - serverBin/moenchDetectorServerv5.0.0 | 1 + serverBin/mythen3DetectorServer_developer | 1 - serverBin/mythen3DetectorServerv5.0.0 | 1 + 14 files changed, 7 insertions(+), 7 deletions(-) delete mode 120000 serverBin/ctbDetectorServer_developer create mode 120000 serverBin/ctbDetectorServerv5.0.0 delete mode 120000 serverBin/eigerDetectorServer_developer create mode 120000 serverBin/eigerDetectorServerv5.0.0 delete mode 120000 serverBin/gotthard2DetectorServer_developer create mode 120000 serverBin/gotthard2DetectorServerv5.0.0 delete mode 120000 serverBin/gotthardDetectorServer_developer create mode 120000 serverBin/gotthardDetectorServerv5.0.0 delete mode 120000 serverBin/jungfrauDetectorServer_developer create mode 120000 serverBin/jungfrauDetectorServerv5.0.0 delete mode 120000 serverBin/moenchDetectorServer_developer create mode 120000 serverBin/moenchDetectorServerv5.0.0 delete mode 120000 serverBin/mythen3DetectorServer_developer create mode 120000 serverBin/mythen3DetectorServerv5.0.0 diff --git a/serverBin/ctbDetectorServer_developer b/serverBin/ctbDetectorServer_developer deleted file mode 120000 index 2304a2043..000000000 --- a/serverBin/ctbDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer \ No newline at end of file diff --git a/serverBin/ctbDetectorServerv5.0.0 b/serverBin/ctbDetectorServerv5.0.0 new file mode 120000 index 000000000..0379a01d6 --- /dev/null +++ b/serverBin/ctbDetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv5.0.0 \ No newline at end of file diff --git a/serverBin/eigerDetectorServer_developer b/serverBin/eigerDetectorServer_developer deleted file mode 120000 index 117c94c37..000000000 --- a/serverBin/eigerDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv5.0.0 b/serverBin/eigerDetectorServerv5.0.0 new file mode 120000 index 000000000..968790c2f --- /dev/null +++ b/serverBin/eigerDetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv5.0.0 \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServer_developer b/serverBin/gotthard2DetectorServer_developer deleted file mode 120000 index 7c8e54bee..000000000 --- a/serverBin/gotthard2DetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServerv5.0.0 b/serverBin/gotthard2DetectorServerv5.0.0 new file mode 120000 index 000000000..50929897b --- /dev/null +++ b/serverBin/gotthard2DetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv5.0.0 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServer_developer b/serverBin/gotthardDetectorServer_developer deleted file mode 120000 index 28e8385e0..000000000 --- a/serverBin/gotthardDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv5.0.0 b/serverBin/gotthardDetectorServerv5.0.0 new file mode 120000 index 000000000..4bf2a1923 --- /dev/null +++ b/serverBin/gotthardDetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv5.0.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServer_developer b/serverBin/jungfrauDetectorServer_developer deleted file mode 120000 index 8ae22b591..000000000 --- a/serverBin/jungfrauDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv5.0.0 b/serverBin/jungfrauDetectorServerv5.0.0 new file mode 120000 index 000000000..ebc685cb2 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv5.0.0 \ No newline at end of file diff --git a/serverBin/moenchDetectorServer_developer b/serverBin/moenchDetectorServer_developer deleted file mode 120000 index 147ecfb53..000000000 --- a/serverBin/moenchDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv5.0.0 b/serverBin/moenchDetectorServerv5.0.0 new file mode 120000 index 000000000..7bd90c407 --- /dev/null +++ b/serverBin/moenchDetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv5.0.0 \ No newline at end of file diff --git a/serverBin/mythen3DetectorServer_developer b/serverBin/mythen3DetectorServer_developer deleted file mode 120000 index cc8b2c91f..000000000 --- a/serverBin/mythen3DetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer \ No newline at end of file diff --git a/serverBin/mythen3DetectorServerv5.0.0 b/serverBin/mythen3DetectorServerv5.0.0 new file mode 120000 index 000000000..dff40247e --- /dev/null +++ b/serverBin/mythen3DetectorServerv5.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv5.0.0 \ No newline at end of file From f7ecabdb5107973fdf9d2a4b43911714947ffcd1 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 17 Nov 2020 19:07:56 +0100 Subject: [PATCH 4/4] update release.txt --- RELEASE.txt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 5bf861e3c..73b73fd74 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -10,6 +10,7 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) 5. Download, Documentation & Support + 1. Topics Concerning ==================== @@ -41,8 +42,6 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) - - 2. New Features =============== @@ -93,7 +92,6 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) will only print and skip image to free it in memory. If address is incorrect after callback, expect undefined behavior. - 5. Scans One can do scans for dacs or trimbits. Trimbits are only for Eiger or Mythen3. Set it scan mode and then acquire using blocking or non blocking @@ -124,7 +122,7 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) is now sls_detector_get dac vcmp_ll - 10. UDP Configuration + 10. UDP Configuration Once all the udp details are set in the detector, the detector's destination is then configured automatically. If the detector is not configured, it will fail when acquiring. If any of these parameters @@ -213,7 +211,6 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) requested for the udp mac. This helps when changing pc and the receiver cannot find the udp ip to get the udp mac. - Gui --- @@ -226,11 +223,8 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) please ensure this is set back to default to get every zmq packet. Setting it to -1 sets it to library defaults. - 2. - - 3. Resolved Issues ================== @@ -242,6 +236,8 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) of server. This is due to both servers accessing the same link to get to FEB registers. Locking has been implemented in server shared memory to resolve. + + 4. Firmware Requirements ======================== @@ -269,11 +265,11 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release) Moench ====== - Compatible version : 10.05.2020 (v1.0) + Compatible version : 05.10.2020 (v1.0) Ctb === - Compatible version : 10.05.2019 (v1.0) + Compatible version : 05.10.2020 (v1.0) Detector Upgrade