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

included svninfo header file which gets populated when exportSoftware from newMythenSoftware is executed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@384 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-12-14 12:55:34 +00:00
parent 3422686e51
commit c43fe9b10e
3 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -8,6 +8,8 @@
#include <arpa/inet.h>
#include <bitset>
#include <cstdlib>
#include "svnInfo.h"
int slsDetector::initSharedMemory(detectorType type, int id) {
@ -1572,13 +1574,9 @@ slsDetectorDefs::externalCommunicationMode slsDetector::setExternalCommunication
int64_t slsDetector::getId( idMode mode, int imod){
int64_t retval=-1;
int fnum=F_GET_ID;
int ret=FAIL;
int64_t rev=0;
int rev1;
char mess[100];
#ifdef VERBOSE
@ -1590,10 +1588,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
#endif
if (mode==THIS_SOFTWARE_VERSION) {
ret=OK;
sscanf(THIS_REVISION,"$Rev : %x",&rev1);
rev=((int64_t)rev1);
retval=(thisSoftwareVersion<<32) | rev;
svnInfo* s = new svnInfo(THIS_PATH);
retval=(thisSoftwareVersion<<32) | (s->getRevision());
} else {
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {