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

changed jungfrau temperature conversion but binary to follow

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-03 14:45:44 +02:00
parent da4ffb235c
commit b4309a9f60
6 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "5d22df1c472895035fdb21ec1104e749aaa41167"
//#define SVNREV 0x1436
#define SVNREPUUIDLIB "788060fd5a954e42fea270b25b8a398293013e96"
//#define SVNREV 0x1437
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1436
#define SVNDATELIB 0x20170629
#define SVNREVLIB 0x1437
#define SVNDATELIB 0x20170703
//

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -886,7 +886,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
set dacs value
\param index ADC index
\param imod module number
\returns current ADC value
\returns current ADC value (temperature for eiger and jungfrau in millidegrees)
*/
dacs_t getADC(dacIndex index, int imod=0);

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4204,7 +4204,7 @@ string slsDetectorCommand::cmdADC(int narg, char *args[], int action) {
myDet->setOnline(ONLINE_FLAG);
#ifdef DACS_INT
if (myDet->getDetectorsType() == EIGER)
if (myDet->getDetectorsType() == EIGER || myDet->getDetectorsType() == JUNGFRAU)
sprintf(answer,"%.2f",(double)myDet->getADC(adc)/1000.00);
else sprintf(answer,"%d",myDet->getADC(adc));
#else