diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index eb8065664..9d4e3df94 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui 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 -Repsitory UUID: 0da39fb3680d6eb9d8a9871cb9e6a152ee638046 -Revision: 399 +Repsitory UUID: 194053eb7bbb12b485d9fa4e77530520f4f6cd7e +Revision: 400 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 399 -Last Changed Date: 2017-06-29 17:09:46 +0200 +Last Changed Rev: 400 +Last Changed Date: 2017-06-30 12:20:42 +0200 diff --git a/slsDetectorGui/gitInfoGui.h b/slsDetectorGui/gitInfoGui.h index 0a8696884..390a54485 100644 --- a/slsDetectorGui/gitInfoGui.h +++ b/slsDetectorGui/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "0da39fb3680d6eb9d8a9871cb9e6a152ee638046" -//#define SVNREV 0x399 +#define SVNREPUUID "194053eb7bbb12b485d9fa4e77530520f4f6cd7e" +//#define SVNREV 0x400 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x399 -#define SVNDATE 0x20170629 +#define SVNREV 0x400 +#define SVNDATE 0x20170630 // diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index 8b45b0e94..ea30fcfe2 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -540,7 +540,7 @@ void qTabDeveloper::RefreshAdcs(){ for(int i=0;igetADC(getSLSIndex(i+NUM_DAC_WIDGETS),-1); if(value == -1) spinAdcs[i]->setValue(value); @@ -553,7 +553,7 @@ void qTabDeveloper::RefreshAdcs(){ } //specific detector 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); else spinAdcs[i]->setValue((double)det->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));