From ec5e779225a50f894ecda51e4bb923724689917f Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 8 Mar 2018 15:19:11 +0100 Subject: [PATCH 1/2] added binary --- serverBin/jungfrauDetectorServerv3.1.0.0 | 1 - serverBin/jungfrauDetectorServerv3.1.0.1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 serverBin/jungfrauDetectorServerv3.1.0.0 create mode 120000 serverBin/jungfrauDetectorServerv3.1.0.1 diff --git a/serverBin/jungfrauDetectorServerv3.1.0.0 b/serverBin/jungfrauDetectorServerv3.1.0.0 deleted file mode 120000 index 1b1f3001f..000000000 --- a/serverBin/jungfrauDetectorServerv3.1.0.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv3.1.0.1 b/serverBin/jungfrauDetectorServerv3.1.0.1 new file mode 120000 index 000000000..5cb20c34f --- /dev/null +++ b/serverBin/jungfrauDetectorServerv3.1.0.1 @@ -0,0 +1 @@ +../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1 \ No newline at end of file From deb59530ab44ed76e4d91d3028520a1907184dfe Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 8 Mar 2018 15:49:01 +0100 Subject: [PATCH 2/2] eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau --- slsDetectorGui/src/qTabMeasurement.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index c75a98b97..4fab6c825 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -842,10 +842,12 @@ void qTabMeasurement::Refresh(){ cout << "Getting delay after trigger, number of triggers and number of gates" << endl; #endif //delay - time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9)))); + if (detType != slsDetectorDefs::EIGER) + time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9)))); //gates - spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1)); + if ((detType != slsDetectorDefs::EIGER) && (detType != slsDetectorDefs::JUNGFRAU)) + spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1)); //Number of Triggers spinNumTriggers->setValue((int)myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,-1));