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

revision added to mythen Server

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@379 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-12-13 09:57:40 +00:00
parent 806df32efb
commit 68e06a5203
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/mythenDetectorServer/server_defs.h
View File

@ -39,4 +39,5 @@
#define THIS_SOFTWARE_VERSION 0x20120419 #define THIS_SOFTWARE_VERSION 0x20120419
#define THIS_REVISION "$Rev$"
#endif #endif

11
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -528,10 +528,11 @@ enum externalCommunicationMode{
int get_id(int file_des) { int get_id(int file_des) {
// sends back 64 bits! // sends back 64 bits!
int64_t retval; int64_t retval, rev;
int ret=OK; int ret=OK;
int imod=-1; int imod=-1;
int n=0; int n=0;
int rev1;
enum idMode arg; enum idMode arg;
sprintf(mess,"Can't return id\n"); sprintf(mess,"Can't return id\n");
@ -579,7 +580,13 @@ int get_id(int file_des) {
retval=getMcsVersion(); retval=getMcsVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval=THIS_SOFTWARE_VERSION;
sscanf(THIS_REVISION,"$Rev : %x",&rev1);
rev=((int64_t)rev1);
retval=(THIS_SOFTWARE_VERSION<<32) | rev;
break; break;
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

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