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

jungfrau dacs named

Browse Source
This commit is contained in:
maliakal_d
2019-10-29 18:11:16 +01:00
parent 925a750f9a
commit fe467cdf70
27 changed files with 702 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorGui/include/qDefs.h
View File

@ -130,6 +130,17 @@ class qDefs : public QWidget {
NUM_GUI_FUNCS
};
/** returns string from enabled/disabled
@param b true or false
@returns string enabled, disabled
*/
static std::string stringEnable(bool b) {
if (b)
return std::string("enabled");
else
return std::string("disabled");
};
/**
* returns the unit in words
* @param unit is the time unit

6
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -312,7 +312,7 @@ void qDetectorMain::EnableModes(QAction *action) {
enable = actionDebug->isChecked();
tabs->setTabEnabled(DEBUGGING, enable);
FILE_LOG(logINFO) << "Debug Mode: "
<< sls::ToString(enable);
<< qDefs::stringEnable(enable);
}
@ -323,7 +323,7 @@ void qDetectorMain::EnableModes(QAction *action) {
tabs->setTabEnabled(ADVANCED, enable);
actionLoadTrimbits->setVisible(enable && detType == slsDetectorDefs::EIGER);
FILE_LOG(logINFO) << "Expert Mode: "
<< sls::ToString(enable);
<< qDefs::stringEnable(enable);
}
// Set DockableMode
@ -336,7 +336,7 @@ void qDetectorMain::EnableModes(QAction *action) {
dockWidgetPlot->setFeatures(QDockWidget::NoDockWidgetFeatures);
}
FILE_LOG(logINFO) << "Dockable Mode: "
<< sls::ToString(enable);
<< qDefs::stringEnable(enable);
}
}

48
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -199,37 +199,37 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(slsDetectorDefs::detectorTy
case slsDetectorDefs::EIGER:
switch (index) {
case 0:
return slsDetectorDefs::E_SvP;
return slsDetectorDefs::SVP;
case 1:
return slsDetectorDefs::E_SvN;
return slsDetectorDefs::SVN;
case 2:
return slsDetectorDefs::E_Vrf;
return slsDetectorDefs::VRF;
case 3:
return slsDetectorDefs::E_Vrs;
return slsDetectorDefs::VRS;
case 4:
return slsDetectorDefs::E_Vtr;
return slsDetectorDefs::VTR;
case 5:
return slsDetectorDefs::E_Vtgstv;
return slsDetectorDefs::VTGSTV;
case 6:
return slsDetectorDefs::E_cal;
return slsDetectorDefs::CAL;
case 7:
return slsDetectorDefs::E_Vcp;
return slsDetectorDefs::VCP;
case 8:
return slsDetectorDefs::E_Vcn;
return slsDetectorDefs::VCN;
case 9:
return slsDetectorDefs::E_Vis;
return slsDetectorDefs::VIS;
case 10:
return slsDetectorDefs::E_rxb_lb;
return slsDetectorDefs::RXB_LB;
case 11:
return slsDetectorDefs::E_rxb_rb;
return slsDetectorDefs::RXB_RB;
case 12:
return slsDetectorDefs::E_Vcmp_ll;
return slsDetectorDefs::VCMP_LL;
case 13:
return slsDetectorDefs::E_Vcmp_lr;
return slsDetectorDefs::VCMP_LR;
case 14:
return slsDetectorDefs::E_Vcmp_rl;
return slsDetectorDefs::VCMP_RL;
case 15:
return slsDetectorDefs::E_Vcmp_rr;
return slsDetectorDefs::VCMP_RR;
case 16:
return slsDetectorDefs::THRESHOLD;
case 17:
@ -251,21 +251,21 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(slsDetectorDefs::detectorTy
case slsDetectorDefs::GOTTHARD:
switch (index) {
case 0:
return slsDetectorDefs::G_VREF_DS;
return slsDetectorDefs::VREF_DS;
case 1:
return slsDetectorDefs::G_VCASCN_PB;
return slsDetectorDefs::VCASCN_PB;
case 2:
return slsDetectorDefs::G_VCASCP_PB;
return slsDetectorDefs::VCASCP_PB;
case 3:
return slsDetectorDefs::G_VOUT_CM;
return slsDetectorDefs::VOUT_CM;
case 4:
return slsDetectorDefs::G_VCASC_OUT;
return slsDetectorDefs::VCASC_OUT;
case 5:
return slsDetectorDefs::G_VIN_CM;
return slsDetectorDefs::VIN_CM;
case 6:
return slsDetectorDefs::G_VREF_COMP;
return slsDetectorDefs::VREF_COMP;
case 7:
return slsDetectorDefs::G_IB_TESTC;
return slsDetectorDefs::IB_TESTC;
case 8:
return slsDetectorDefs::TEMPERATURE_ADC;
case 9: