diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 1bd8c10f0..bf3e61b89 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -10,7 +10,7 @@ DOCDIR ?= docs CFLAGS= -g -DC_ONLY -fPIC #FLAGS+= #-DVERBOSE -DVERYVERBOSE -DFLAGS= -g -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST $(shell root-config --cflags --glibs) #-DALLFILE_DEBUG #-DMYROOT1 -DALLFILE #-DMYROOT1 `root-config --cflags --glibs` +DFLAGS= -g -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST #$(shell root-config --cflags --glibs) -DMYROOT1 #-DALLFILE_DEBUG #-DMYROOT1 -DALLFILE #-DMYROOT1 `root-config --cflags --glibs` INCLUDES?= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -IslsReceiver -I../slsDetectorCalibration -I$(ASM) @@ -67,7 +67,11 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC) %.o : %.cpp %.h Makefile ifeq ($(EIGERSLS),yes) $(CXX) -DEIGERSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(EIGERFLAGS) -fPIC $(EPICSFLAGS) -L/usr/lib64/ #$(FLAGS) +else ifeq ($(ROOTSLS),yes) + echo "with root" + $(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(ROOTFLAGS) -fPIC $(EPICSFLAGS) -L/usr/lib64/ #$(FLAGS) else + echo "without root" $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS) endif diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 1b794fa56..03df0e38d 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -4669,7 +4669,6 @@ string multiSlsDetector::getErrorMessage(int &critical){ char sNumber[100]; critical=0; - static int count = 0; multiMask = getErrorMask(); if(multiMask){ for (int idet=0; idetnumberOfDetectors; idet++) { @@ -4696,23 +4695,6 @@ string multiSlsDetector::getErrorMessage(int &critical){ } } } - - char output[255]; - FILE* sysFile = popen("whoami", "r"); - fgets(output, sizeof(output), sysFile); - pclose(sysFile); - sysFile = popen("whoami", "r"); - fgets(output, sizeof(output), sysFile); - pclose(sysFile); - sysFile= NULL; - if((strstr (output, "l_cartier") !=NULL)|| (strstr (output, "cartier_s") !=NULL)){ - count++; - if(!(count%30)){ - critical = 1; - retval.append("\n\n GET A CAKE!"); - } - } - return retval; } diff --git a/slsDetectorSoftware/slsReceiver/Makefile b/slsDetectorSoftware/slsReceiver/Makefile index a078a279e..7028cee60 100644 --- a/slsDetectorSoftware/slsReceiver/Makefile +++ b/slsDetectorSoftware/slsReceiver/Makefile @@ -49,10 +49,14 @@ eigerReceiver: $(CXX) $(FLAGS) $(CFLAGS) -fPIC -c -o eigerReceiverTest.o eigerReceiverTest.cpp $(EIGERFLAGS) $(CXX) $(FLAGS) $(CFLAGS) -fPIC -c -o eigerReceiver.o eigerReceiver.cpp $(EIGERFLAGS) $(CXX) eigerReceiverTest.o eigerReceiver.o -o eigerReceiverTest $(EIGERFLAGS) +else ifeq ($(ROOTSLS), yes) +eigerReceiver: eigerReceiverDummy.cpp + echo "Compiling dummy EigerReceiver with root" + $(CXX) $(FLAGS) $(CFLAGS) -fPIC -c -o eigerReceiver.o eigerReceiverDummy.cpp $(ROOTFLAGS) else eigerReceiver: eigerReceiverDummy.cpp echo "Compiling dummy EigerReceiver" - $(CXX) $(FLAGS) $(CFLAGS) -fPIC -c -o eigerReceiver.o eigerReceiverDummy.cpp + $(CXX) $(FLAGS) $(CFLAGS) -fPIC -c -o eigerReceiver.o eigerReceiverDummy.cpp endif lib: diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp index 4af8e1e86..7b96c0498 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp +++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp @@ -553,6 +553,11 @@ int slsReceiverFunctionList::enableDataCompression(bool enable){ cout << "enabled" << endl; else cout << "disabled" << endl; +#ifdef MYROOT1 + cout << " WITH ROOT" << endl; +#else + cout << " WITHOUT ROOT" << endl; +#endif //delete filter for the current number of threads deleteFilter();