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

revision in version number in getId

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@378 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2012-12-13 09:28:06 +00:00
parent 00e9c69bed
commit 806df32efb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1576,6 +1576,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
int64_t retval=-1; int64_t retval=-1;
int fnum=F_GET_ID; int fnum=F_GET_ID;
int ret=FAIL; int ret=FAIL;
int64_t rev=0;
char mess[100]; char mess[100];
@ -1588,7 +1590,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
#endif #endif
if (mode==THIS_SOFTWARE_VERSION) { if (mode==THIS_SOFTWARE_VERSION) {
ret=OK; ret=OK;
retval=thisSoftwareVersion; sscanf(THIS_REVISION,"$Rev : %x",&rev);
retval=thisSoftwareVersion & rev << 32;
} else { } else {
if (thisDetector->onlineFlag==ONLINE_FLAG) { if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) { if (controlSocket) {

5
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -43,7 +43,7 @@ using namespace std;
#define DEFAULT_HOSTNAME "localhost" #define DEFAULT_HOSTNAME "localhost"
#define DEFAULT_SHM_KEY 5678 #define DEFAULT_SHM_KEY 5678
#define THIS_REVISION "$Rev$"
/** /**
@short class containing all the possible detector functionalities @short class containing all the possible detector functionalities
@ -642,7 +642,8 @@ virtual int exitReceiver()=0;
protected: protected:
static const int64_t thisSoftwareVersion=0x$Rev$20120124;
static const int64_t thisSoftwareVersion=0x20120124;