diff --git a/slsDetectorSoftware/mythenDetectorServer/Makefile b/slsDetectorSoftware/mythenDetectorServer/Makefile index a03767745..108833b43 100755 --- a/slsDetectorSoftware/mythenDetectorServer/Makefile +++ b/slsDetectorSoftware/mythenDetectorServer/Makefile @@ -13,8 +13,7 @@ INSTMODE= 0777 SRCS= server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c OBJS= $(SRCS:%.c=%.o) -CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE -#-DDACS_INT +CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE -DDACS_INT #-DVERYVERBOSE #-Werror diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 9968ae2c9..401745614 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -1062,32 +1062,13 @@ int slsDetector::setTCPSocket(string const name, int const control_port, int con #endif } if (retval!=FAIL) { - if (controlSocket->Connect()<0) { - controlSocket->SetTimeOut(5); - thisDetector->onlineFlag=OFFLINE_FLAG; - delete controlSocket; - controlSocket=NULL; - retval=FAIL; -#ifdef VERBOSE - std::cout<< "offline!" << std::endl; -#endif - } else { - thisDetector->onlineFlag=ONLINE_FLAG; - controlSocket->SetTimeOut(100); - controlSocket->Disconnect(); -#ifdef VERBOSE - std::cout<< "online!" << std::endl; -#endif - } + checkOnline(); } else { thisDetector->onlineFlag=OFFLINE_FLAG; #ifdef VERBOSE std::cout<< "offline!" << std::endl; #endif - } - - return retval; }; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 69f36c78e..1353d7958 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -551,6 +551,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { i++; + descrToFuncMap[i].m_pFuncName="measurments"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; + i++; + /* read only timers */ descrToFuncMap[i].m_pFuncName="exptimel"; // @@ -2935,6 +2939,8 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) { index=CYCLES_NUMBER; else if (cmd=="probes") index=PROBES_NUMBER; + else if (cmd=="measurments") + index=MEASUREMENTS_NUMBER; else return string("could not decode timer ")+cmd; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 5ff82812a..04e732017 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -26,11 +26,11 @@ slsDetectorUtils::slsDetectorUtils() { registerGoToPositionNoWaitCallback(&defaultGoToPositionNoWait,NULL); registerGetI0Callback(&defaultGetI0,NULL); #ifdef VERBOSE + + registerAcquisitionFinishedCallback(&dummyAcquisitionFinished,this); cout << "done " << endl; #endif - - }; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h index f4d29656b..ead657c0d 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h @@ -560,7 +560,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing { */ int retrieveDetectorSetup(string const fname, int level=0); - + static int dummyAcquisitionFinished(double prog,int status,void* p){cout <<"Acquisition finished callback! " << prog << " " << status << endl; return 0;} protected: diff --git a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o index 0bc7d3b3d..7290b57ae 100644 Binary files a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o and b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o differ