detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 23:37:14 +02:00
Code Issues Actions Packages Releases Activity

solving merging conflicts from 3.1.0 to developer

Browse Source
This commit is contained in:
maliakal_d
2018-03-14 15:45:35 +01:00
parent 06cdf8ad92 85aa47b835
commit b58c3e8951
129 changed files with 1120 additions and 8750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -843,28 +843,14 @@ 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);
}
if (detType != slsDetectorDefs::EIGER)
time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9))));
//gates
if ((detType == slsDetectorDefs::EIGER) || (detType == slsDetectorDefs::JUNGFRAU) || (detType == slsDetectorDefs::JUNGFRAUCTB)) {
lblNumGates->setEnabled(false);
spinNumGates->setEnabled(false);
} else {
lblNumGates->setEnabled(true);
spinNumGates->setEnabled(true);
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
}
if ((detType != slsDetectorDefs::EIGER) && (detType != slsDetectorDefs::JUNGFRAU) && (detType != slsDetectorDefs::JUNGFRAUCTB) )
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
//Number of Triggers
spinNumTriggers->setValue((int)myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,-1));