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

put trimval should work also for MYTHEN

Browse Source
This commit is contained in:
bergamaschi
2017-11-21 12:09:52 +01:00
parent 7c9958db04
commit 45e0cf71eb
5 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 1fd03e9cdd01efd75e3ab8641be71d61b2e1aa10 Repsitory UUID: 73bad32c4ab2c8cfb2687547f7da6f932b358c1a
Revision: 1566 Revision: 1604
Branch: 3.0.1 Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Thattil
Last Changed Rev: 1571 Last Changed Rev: 1609
Last Changed Date: 2017-10-03 14:12:22.000000002 +0200 ./slsDetector/slsDetector.cpp Last Changed Date: 2017-11-07 09:50:45.000000002 +0100 ./threadFiles/ThreadPool.o

10
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "1fd03e9cdd01efd75e3ab8641be71d61b2e1aa10" #define SVNREPUUIDLIB "73bad32c4ab2c8cfb2687547f7da6f932b358c1a"
//#define SVNREV 0x1571 //#define SVNREV 0x1609
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Thattil"
#define SVNREVLIB 0x1571 #define SVNREVLIB 0x1609
#define SVNDATELIB 0x20171003 #define SVNDATELIB 0x20171107
// //

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -7526,7 +7526,12 @@ int slsDetector::setAllTrimbits(int val, int imod){
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "Setting all trimbits to "<< val << std::endl; std::cout<< "Setting all trimbits to "<< val << std::endl;
#endif #endif
if (getDetectorsType() == MYTHEN) {
if (val>=0) {
setChannel((val<<((int)TRIMBIT_OFF))|((int)COMPARATOR_ENABLE)); // trimbit scan
}
return val;
} else {
if (thisDetector->onlineFlag==ONLINE_FLAG) { if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){ if (connectControl() == OK){
controlSocket->SendDataOnly(&fnum,sizeof(fnum)); controlSocket->SendDataOnly(&fnum,sizeof(fnum));
@ -7544,6 +7549,7 @@ int slsDetector::setAllTrimbits(int val, int imod){
updateDetector(); updateDetector();
} }
} }
}
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "All trimbits were set to "<< retval << std::endl; std::cout<< "All trimbits were set to "<< retval << std::endl;