diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index c5c46d896..9fd8de0f4 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -111,7 +111,7 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, int& ret, + "Usage: " + string(argv[0]) + " [arguments]\n" + "Possible arguments are:\n" + "\t-d, --developer : Enables the developer tab\n" - + "\t-f, --f, --config : Loads config from file\n" + + "\t-f, --config : Loads config from file\n" + "\t-i, --id : Sets the multi detector id to i. Default: 0. Required \n" + "\t only when more than one multi detector object is needed.\n\n"; cout << help_message << endl; diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 50c0d2497..c75a98b97 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -842,28 +842,11 @@ void qTabMeasurement::Refresh(){ cout << "Getting delay after trigger, number of triggers and number of gates" << endl; #endif //delay - //delay - if (detType == slsDetectorDefs::EIGER) { - lblDelay->setEnabled(false); - spinDelay->setEnabled(false); - comboDelayUnit->setEnabled(false); - } else { - lblDelay->setEnabled(true); - spinDelay->setEnabled(true); - comboDelayUnit->setEnabled(true); - time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9)))); - spinDelay->setValue(time); - comboDelayUnit->setCurrentIndex((int)unit); - } + time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9)))); + //gates - if ((detType == slsDetectorDefs::EIGER) || (detType == slsDetectorDefs::JUNGFRAU)) { - lblNumGates->setEnabled(false); - spinNumGates->setEnabled(false); - } else { - lblNumGates->setEnabled(true); - spinNumGates->setEnabled(true); - spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1)); - } + spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1)); + //Number of Triggers spinNumTriggers->setValue((int)myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,-1));