From 3e0f618fbe85b8cd855714ed594a28f5b6cf10b7 Mon Sep 17 00:00:00 2001 From: Sala Leonardo Date: Wed, 10 Sep 2014 10:09:29 +0200 Subject: [PATCH] cleaning --- slsReceiverSoftware/slsReceiver/Makefile | 68 ----- .../eigerReceiver/eigerReceiver.cpp | 259 ------------------ .../eigerReceiver/eigerReceiverDummy.cpp | 101 ------- .../eigerReceiver/eigerReceiverTest.cpp | 97 ------- 4 files changed, 525 deletions(-) delete mode 100644 slsReceiverSoftware/slsReceiver/Makefile delete mode 100644 slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.cpp delete mode 100644 slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverDummy.cpp delete mode 100644 slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverTest.cpp diff --git a/slsReceiverSoftware/slsReceiver/Makefile b/slsReceiverSoftware/slsReceiver/Makefile deleted file mode 100644 index c94528eeb..000000000 --- a/slsReceiverSoftware/slsReceiver/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -include ../../Makefile.include - -DESTDIR ?= ../../bin -LIBDIR ?= $(DESTDIR) -PROGS = $(DESTDIR)/slsReceiver - - -CFLAGS += -DSLS_RECEIVER_UDP_FUNCTIONS -O3 -CPPFLAGS = ${CFLAGS} # for MAC - - -LDFLAGRXR ?= -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread -LDFLAGRXR += -lm -lstdc++ - - -INCLUDES ?= -I ../MySocketTCP -I ../slsDetectorCalibration -I ../includes -I eigerReceiver -I . -I ../slsDetectorSoftware/commonFiles -SRC_CLNT = main.cpp - - -INSTMODE = 0777 -OBJS = $(SRC_CLNT:.cpp=.o) - - -.PHONY: all receiver clean static_receiver boot eigerReceiver lib - -all: receiver - -receiver: $(DESTDIR)/slsReceiver - -static_receiver: $(DESTDIR)/sslsReceiver - -boot: $(OBJS) - -$(DESTDIR)/sslsReceiver: lib - echo $(OBJS) - echo $(LDFLAGRXR) - echo $(LIBS) - mkdir -p $(DESTDIR) - $(CXX) -static -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) - - -$(DESTDIR)/slsReceiver: eigerReceiver lib - $(CXX) -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC -#$(EIGERFLAGS) - - -ifeq ($(EIGERSLS), yes) -eigerReceiver: - $(CXX) $(FLAGS) $(CFLAGS) $(INCLUDES) -fPIC -c -o eigerReceiverTest.o eigerReceiver/eigerReceiverTest.cpp $(EIGERFLAGS) - $(CXX) $(FLAGS) $(CFLAGS) $(INCLUDES) -fPIC -c -o eigerReceiver.o eigerReceiver/eigerReceiver.cpp $(EIGERFLAGS) - $(CXX) eigerReceiverTest.o eigerReceiver.o -o eigerReceiver/eigerReceiverTest $(EIGERFLAGS) -else ifeq ($(ROOTSLS), yes) -eigerReceiver: eigerReceiver/eigerReceiverDummy.cpp - echo "Compiling with root" - $(CXX) $(FLAGS) $(CFLAGS) $(INCLUDES) -fPIC -c -o eigerReceiver.o eigerReceiver/eigerReceiverDummy.cpp $(ROOTFLAGS) -else -eigerReceiver: eigerReceiver/eigerReceiverDummy.cpp - $(CXX) $(FLAGS) $(CFLAGS) $(INCLUDES) -fPIC -c -o eigerReceiver.o eigerReceiver/eigerReceiverDummy.cpp -endif - -lib: - cd ../ && $(MAKE) DESTDIR=../bin LIBDIR=../bin - -clean: - rm -rf $(PROGS) *.o eigerReceiverTest $(DESTDIR)/libSlsReceiver.a $(DESTDIR)/libSlsReceiver.so core - - - diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.cpp b/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.cpp deleted file mode 100644 index 48024c5d0..000000000 --- a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiver.cpp +++ /dev/null @@ -1,259 +0,0 @@ -/* - * eigerReceiver.cpp - * - * Created on: Mar 11, 2014 - * Author: billich - */ - -#include -#include -#include "eigerReceiver.h" - - -/* uncomment next line to enable debug output */ -#define EIGER_DEBUG - -/* macro for debug output http://stackoverflow.com/a/14256296 */ -#ifdef EIGER_DEBUG -#define DEBUG(x) do { std::cerr << x << std::endl; } while (0) -#else -#define DEBUG(x) -#endif - - -using namespace std; - -struct EigerReceiverInitializationConfiguration { - - string detectorHostname; -}; - -struct EigerReceiverScanConfiguration { - - string fileName; - string filePath; - int dynamicRange; - int scanTag; - int numberOfFrames; - bool doFileWrite; - bool doFileOverWrite; - - EigerReceiverScanConfiguration(): - dynamicRange(-1), - scanTag(-1), - numberOfFrames(-1), - doFileWrite(false), - doFileOverWrite(false){}; -}; - -class EigerReceiverImplementation: public EigerReceiver { - -public: - - EigerReceiverImplementation() : isInitialized(false), status(slsReceiverDefs::ERROR) {}; - - void initialize(const char *detectorHostname) { - - string name; - if (detectorHostname != NULL) { - name = detectorHostname; - } - - if (name.empty()) { - DEBUG("initialize(): can't initialize with empty string or NULL for detectorHostname"); - } else if (isInitialized == true) { - DEBUG("initialize(): already initialized, can't initialize several times"); - } else { - DEBUG("initialize(): initialize() with: detectorHostName=" << name << "."); - init_config.detectorHostname = name; - isInitialized = true; - status = slsReceiverDefs::IDLE; - } - -#ifdef SALA - //REST call - hardcoded - RestHelper rest ; - rest.init("localhost",8080); - std::string answer; - std::cout << "---- REST test 1: true, string "<< std::endl; - int code = rest.get_json("status", &answer); - std::cout << "Answer: " << answer << std::d::endl; - - std::cout << "---- REST test 2: 404, string "<< std::endl; - code = rest.get_json("statuss", &answer); - if (code != 0){ - //throw -1; - std::cout << "I SHOULD THROW AN EXCEPTION!!!" << std::endl; - } - - std::cout << "---- REST test 3: true, json object "<< std::endl; - JsonBox::Value json_value; - code = rest.get_json("status", &json_value); - std::cout << "JSON " << json_value["status"] << std::endl; - - answer = ""; - std::cout << "---- REST test 4: POST, string "<< std::endl; - code = rest.post_json("recipes/cassoela", &answer); - std::cout << "POST answer: " << answer << std::endl; - if (code != 0){ - //throw -1; - std::cout << "I SHOULD THROW AN EXCEPTION!!!" << std::endl; - } - - RestHelper rest2 ; - rest2.init("reallyfake",8080); - std::cout << "---- REST test 4: host not found, json object "<< std::endl; - JsonBox::Value json_value2; - code = rest2.get_json("status", &json_value2); - if (code != 0){ - //throw -1; - std::cout << "I SHOULD THROW AN EXCEPTION!!!" << std::endl; - } - -#endif - } - - - char *getDetectorHostname() const { - string name = init_config.detectorHostname; - if (name.empty()) { - DEBUG("getDetectorHostname(): Return NULL"); - return(NULL); - } - char *c = new char[name.length()+1]; - name.copy(c, name.length()); - c[name.length()] = '\0'; - DEBUG("getDetectorHostname(): Return " << c << "."); - return(c); - } - - char *getFileName() const { - string name = scan_config.fileName; - - char *c = new char[name.length()+1]; - name.copy(c, name.length()); - c[name.length()] = '\0'; - DEBUG("getFileName(): Return " << c); - return(c); - } - - char *getFilePath() const { - string name = scan_config.filePath; - - char *c = new char[name.length()+1]; - name.copy(c, name.length()); - c[name.length()] = '\0'; - DEBUG("getFilePath(): Return " << c); - return(c); - } - - int getDynamicRange() const { - DEBUG("getDynamicRange(): Return " << scan_config.dynamicRange); - return(scan_config.dynamicRange); - } - - int getScanTag() const { - DEBUG("getScanTag(): returns " << scan_config.scanTag); - return(scan_config.scanTag); - } - - int getNumberOfFrames() const { - DEBUG("getNumberOfFrames(): return " << scan_config.numberOfFrames); - return(scan_config.numberOfFrames); - } - - int getEnableFileWrite() const { - DEBUG("getEnableFileWrite() returns " << scan_config.doFileWrite); - return(scan_config.doFileWrite); - } - - int getEnableOverwrite() const { - DEBUG("getEnableOverwrite() returns " << scan_config.doFileOverWrite); - return(scan_config.doFileOverWrite); - } - - slsReceiverDefs::runStatus getStatus() const { - DEBUG("getStatus(): return " <getFileName()); - } - - char *setFilePath(const char c[]) { - DEBUG("setFilePath() called with " << c << "."); - scan_config.filePath = c; - return(this->getFilePath()); - } - - int setDynamicRange (const int dr) { - DEBUG("setDynamicRange() called with " << dr << '.'); - scan_config.dynamicRange = dr; - return(getDynamicRange()); - } - - int setScanTag (const int tag) { - DEBUG("setScanTag() called with " << tag); - scan_config.scanTag = tag; - return(getScanTag()); - } - - int setNumberOfFrames (const int fnum) { - DEBUG("setNumberOfFrames() called with " << fnum); - scan_config.numberOfFrames = fnum; - return(getNumberOfFrames()); - } - - int setEnableFileWrite(const int i) { - DEBUG("enableFileWrite() called with " << i); - scan_config.doFileWrite = i; - return(getEnableFileWrite()); - } - - int setEnableOverwrite(const int i) { - DEBUG("setEnableOverwrite() called with " << i); - scan_config.doFileOverWrite = i; - return(getEnableOverwrite()); - } - - int startReceiver(char message[]) { - DEBUG("startReceiver(): return 0."); - status = slsReceiverDefs::RUNNING; - message = NULL; - return(0); - } - - int stopReceiver() { - DEBUG("stopReceiver(): return 0."); - status = slsReceiverDefs::IDLE; - return(0); - } - - void abort() { - DEBUG("abort(): return 0."); - status = slsReceiverDefs::IDLE; - } - - // Temporary workaround - int setDetectorType(slsReceiverDefs::detectorType det){ - return 0; - } - -private: - EigerReceiverScanConfiguration scan_config; - EigerReceiverInitializationConfiguration init_config; - bool isInitialized; - slsReceiverDefs::runStatus status; -}; - -EigerReceiver *EigerReceiver::create(void) { - DEBUG("create(): Return new EigerReceiverImplementation instance."); - return new EigerReceiverImplementation(); -} - - - - diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverDummy.cpp b/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverDummy.cpp deleted file mode 100644 index ad8139cd8..000000000 --- a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverDummy.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/* - * eigerReceiver.cpp - * - * Created on: Mar 11, 2014 - * Author: billich - */ - -#include -#include -#include "eigerReceiver.h" - - -using namespace std; - -struct EigerReceiverInitializationConfiguration { - string detectorHostname; -}; - -struct EigerReceiverScanConfiguration { - - string fileName; - string filePath; - int dynamicRange; - int scanTag; - int numberOfFrames; - bool doFileWrite; - bool doFileOverWrite; - - EigerReceiverScanConfiguration(): - dynamicRange(-1), - scanTag(-1), - numberOfFrames(-1), - doFileWrite(false), - doFileOverWrite(false){}; -}; - -class EigerReceiverImplementation: public EigerReceiver { - -public: - - EigerReceiverImplementation(){}; - - ~EigerReceiverImplementation(){}; - - void initialize(const char *detectorHostname) {} - - char *getDetectorHostname() const { return (char*)"";} - - char *getFileName() const {return (char*)"";} - - char *getFilePath() const {return (char*)"";} - - int getFileIndex() const {return 0;} - - int getDynamicRange() const { return 0;} - - int getScanTag() const {return 0;} - - int getNumberOfFrames() const {return 0;} - - int getEnableFileWrite() const {return 0;} - - int getEnableOverwrite() const {return 0;} - - slsReceiverDefs::runStatus getStatus() const { return slsReceiverDefs::IDLE;} - - char *setFileName(const char c[]) {return (char*)"";} - - char *setFilePath(const char c[]) {return (char*)"";} - - int setDynamicRange (const int dr) {return 0;} - - int setScanTag (const int tag) {return 0;} - - int setNumberOfFrames (const int fnum) {return 0;} - - int setEnableFileWrite(const int i) {return 0;} - - int setEnableOverwrite(const int i) {return 0;} - - int startReceiver(char message[]) {return 0;} - - int stopReceiver() {return 0;} - - void abort() {} - -private: - EigerReceiverScanConfiguration scan_config; - EigerReceiverInitializationConfiguration init_config; - bool isInitialized; - slsReceiverDefs::runStatus status; - -}; - -EigerReceiver *EigerReceiver::create(void) { - return new EigerReceiverImplementation(); -} - - - - diff --git a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverTest.cpp b/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverTest.cpp deleted file mode 100644 index 7eb80f690..000000000 --- a/slsReceiverSoftware/slsReceiver/eigerReceiver/eigerReceiverTest.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * eigerReceiverTest.cpp - - * - * Created on: Mar 11, 2014 - * Author: billich - */ - -#include -#include -#include "eigerReceiver.h" - -using namespace std; - -int main(int argc, char *argv[]){ - - const char *name = "detectors_host_name"; - const char *empty = ""; - std::string prefix = "main: "; - cout <getStatus(); - char *c0 = receiver->getDetectorHostname(); - if (c0 == NULL) { - cout <initialize(empty); - status = receiver->getStatus(); - receiver->initialize(name); - status = receiver->getStatus(); - receiver->initialize(name); - status = receiver->getStatus(); - receiver->initialize((char *)NULL); - - cout << endl; - - status = receiver->getStatus(); - char *c6 = receiver->getDetectorHostname(); - cout <getFileName(); - cout <." << endl; - delete[] c1; - - char *c2 = receiver->getFilePath(); - cout <." << endl; - delete[]c2; - - int range = receiver->getDynamicRange(); - cout <getScanTag(); - cout <setFileName( "some_other_name"); - cout < after setting to " << endl << endl; - delete[] c3; - - char *c4 = receiver->setFilePath( "some_other_path"); - cout < after setting to " << endl << endl; - delete[] c4; - - range = receiver->setDynamicRange(8); - cout <setScanTag(99); - cout << "got scan tag " << tag << " after setting to 99." << endl << endl; - - int n = receiver->setNumberOfFrames(11); - cout << "got number of frames " << n << " after setting to 11." << endl << endl; - - int w = receiver->setEnableFileWrite(1); - cout << "got enable file write " << w << " after setting to 1." << endl << endl; - - char *c5; - status = receiver->getStatus(); - receiver->startReceiver(c5); - status = receiver->getStatus(); - receiver->stopReceiver(); - status = receiver->getStatus(); - receiver->abort(); - status = receiver->getStatus(); - -} - - - -