From 91394511274647d47806aba503592cf6ed9e649f Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 3 Aug 2016 10:34:10 +0200 Subject: [PATCH] added 2 gain settings to eigeR --- slsDetectorGui/forms/form_tab_settings.ui | 5 +++++ slsDetectorGui/include/qTabSettings.h | 2 +- slsDetectorGui/src/qTabSettings.cpp | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/slsDetectorGui/forms/form_tab_settings.ui b/slsDetectorGui/forms/form_tab_settings.ui index 797756a33..7c9f8f3ed 100644 --- a/slsDetectorGui/forms/form_tab_settings.ui +++ b/slsDetectorGui/forms/form_tab_settings.ui @@ -125,6 +125,11 @@ Force Switch G2 + + + Very Low Gain + + Undefined diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index 2c5127bec..ddb0d4da6 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -58,7 +58,7 @@ private: bool expertMode; enum{Standard,Fast,HighGain,DynamicGain,LowGain,MediumGain,VeryHighGain,LowNoise, - DynamicHG0,FixGain1,FixGain2,ForceSwitchG1,ForceSwitchG2, + DynamicHG0,FixGain1,FixGain2,ForceSwitchG1,ForceSwitchG2, VeryLowGain, Undefined,Uninitialized,NumSettings}; /** To be able to index items on a combo box */ diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 97401250e..bd943e162 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -128,6 +128,7 @@ void qTabSettings::SetupDetectorSettings(){ item[(int)FixGain2]->setEnabled(false); item[(int)ForceSwitchG1]->setEnabled(false); item[(int)ForceSwitchG2]->setEnabled(false); + item[(int)VeryLowGain]->setEnabled(false); break; case slsDetectorDefs::EIGER: item[(int)Standard]->setEnabled(true); @@ -136,13 +137,14 @@ void qTabSettings::SetupDetectorSettings(){ item[(int)DynamicGain]->setEnabled(false); item[(int)LowGain]->setEnabled(true); item[(int)MediumGain]->setEnabled(false); - item[(int)VeryHighGain]->setEnabled(false); + item[(int)VeryHighGain]->setEnabled(true); item[(int)LowNoise]->setEnabled(false); item[(int)DynamicHG0]->setEnabled(false); item[(int)FixGain1]->setEnabled(false); item[(int)FixGain2]->setEnabled(false); item[(int)ForceSwitchG1]->setEnabled(false); item[(int)ForceSwitchG2]->setEnabled(false); + item[(int)VeryLowGain]->setEnabled(true); break; case slsDetectorDefs::MOENCH: case slsDetectorDefs::PROPIX: @@ -160,6 +162,7 @@ void qTabSettings::SetupDetectorSettings(){ item[(int)FixGain2]->setEnabled(false); item[(int)ForceSwitchG1]->setEnabled(false); item[(int)ForceSwitchG2]->setEnabled(false); + item[(int)VeryLowGain]->setEnabled(false); break; case slsDetectorDefs::JUNGFRAU: item[(int)Standard]->setEnabled(false); @@ -175,6 +178,7 @@ void qTabSettings::SetupDetectorSettings(){ item[(int)FixGain2]->setEnabled(true); item[(int)ForceSwitchG1]->setEnabled(true); item[(int)ForceSwitchG2]->setEnabled(true); + item[(int)VeryLowGain]->setEnabled(false); break; default: cout << "Unknown detector type. Exiting GUI." << endl;