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

ll

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@146 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-03-16 13:05:38 +00:00
parent 794ab4fdfc
commit 2076fb75f5
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -143,7 +143,6 @@ slsDetector::slsDetector(int id) :slsDetectorUtils(),
{ {
detectorType type=(detectorType)getDetectorType(id); detectorType type=(detectorType)getDetectorType(id);
while (shmId<0) { while (shmId<0) {
/**Initlializes shared memory \sa initSharedMemory /**Initlializes shared memory \sa initSharedMemory
@ -2780,18 +2779,17 @@ int slsDetector::updateDetectorNoWait() {
// int it; // int it;
int64_t retval;// tns=-1; int64_t retval;// tns=-1;
char lastClientIP[INET_ADDRSTRLEN]; char lastClientIP[INET_ADDRSTRLEN];
switch(thisDetector->myDetectorType){ switch(thisDetector->myDetectorType){
case GOTTHARD: case GOTTHARD:
n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP)); n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));
#ifdef VERBOSE #ifdef VERBOSE
cout << "Updating detector last modified by " << lastClientIP << endl;// commented out by dhanya for now cout << "Updating detector last modighfied by " << lastClientIP << std::endl;// commented out by dhanya for now
#endif #endif
break; break;
default: default:
n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP)); n = controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));
#ifdef VERBOSE #ifdef VERBOSE
cout << "Updating detector last modified by " << lastClientIP << endl; cout << "Updating detector last modified by " << lastClientIP << std::endl;
#endif #endif
n = controlSocket->ReceiveDataOnly(&nm,sizeof(nm)); n = controlSocket->ReceiveDataOnly(&nm,sizeof(nm));
thisDetector->nMod[X]=nm; thisDetector->nMod[X]=nm;