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

changed jungfrau temperature conversion

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-07-03 14:45:29 +02:00
parent bd9f19f6c7
commit 539ab79e99
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: 0da39fb3680d6eb9d8a9871cb9e6a152ee638046 Repsitory UUID: 194053eb7bbb12b485d9fa4e77530520f4f6cd7e
Revision: 399 Revision: 400
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 399 Last Changed Rev: 400
Last Changed Date: 2017-06-29 17:09:46 +0200 Last Changed Date: 2017-06-30 12:20:42 +0200

8
slsDetectorGui/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "0da39fb3680d6eb9d8a9871cb9e6a152ee638046" #define SVNREPUUID "194053eb7bbb12b485d9fa4e77530520f4f6cd7e"
//#define SVNREV 0x399 //#define SVNREV 0x400
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x399 #define SVNREV 0x400
#define SVNDATE 0x20170629 #define SVNDATE 0x20170630
// //

4
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -540,7 +540,7 @@ void qTabDeveloper::RefreshAdcs(){
for(int i=0;i<NUM_ADC_WIDGETS;i++){ for(int i=0;i<NUM_ADC_WIDGETS;i++){
//all detectors //all detectors
if(!detid){ if(!detid){
if(detType == slsDetectorDefs::EIGER){ if(detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::JUNGFRAU){
double value = (double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS),-1); double value = (double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS),-1);
if(value == -1) if(value == -1)
spinAdcs[i]->setValue(value); spinAdcs[i]->setValue(value);
@ -553,7 +553,7 @@ void qTabDeveloper::RefreshAdcs(){
} }
//specific detector //specific detector
else{ else{
if(detType == slsDetectorDefs::EIGER) if(detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::JUNGFRAU)
spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))/1000.00); spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))/1000.00);
else else
spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))); spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));