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

making gui work temporarily for jctb

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-22 09:27:01 +01:00
parent 7f58b77dfb
commit 4159e83fd6
11 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -148,6 +148,7 @@ void qTabDeveloper::SetupWidgetWindow() {
case slsDetectorDefs::JUNGFRAU:
case slsDetectorDefs::JUNGFRAUCTB:
NUM_DAC_WIDGETS = 8;
NUM_ADC_WIDGETS = 1;
dacNames.push_back("v vb comp:");
@ -474,6 +475,8 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){
}
break;
case slsDetectorDefs::JUNGFRAU:
case slsDetectorDefs::JUNGFRAUCTB:
switch(index){
case 0:
case 1:
@ -522,7 +525,7 @@ void qTabDeveloper::RefreshAdcs(){
for(int i=0;i<NUM_ADC_WIDGETS;i++){
//all detectors
if(!detid){
if(detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::JUNGFRAU){
if(detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::JUNGFRAU || detType == slsDetectorDefs::JUNGFRAUCTB){
double value = (double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS),-1);
if(value == -1)
spinAdcs[i]->setValue(value);
@ -537,7 +540,7 @@ void qTabDeveloper::RefreshAdcs(){
}
//specific detector
else{
if(detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::JUNGFRAU)
if(detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::JUNGFRAU || detType == slsDetectorDefs::JUNGFRAUCTB)
spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))/1000.00);
else
spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));