detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences

Browse Source
This commit is contained in:
maliakal_d 2018-08-08 15:43:29 +02:00
parent f1333c7a90
commit ab7e63c20f
10 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/CMakeLists.txt
View File

@ -59,7 +59,6 @@ set(PUBLICHEADERS
commonFiles/sls_detector_defs.h commonFiles/sls_detector_defs.h
commonFiles/sls_detector_funcs.h commonFiles/sls_detector_funcs.h
commonFiles/error_defs.h commonFiles/error_defs.h
commonFiles/sls_detector_exceptions.h
commonFiles/versionAPI.h commonFiles/versionAPI.h
sharedMemory/SharedMemory.h sharedMemory/SharedMemory.h
slsDetector/slsDetectorUtils.h slsDetector/slsDetectorUtils.h
@ -78,7 +77,7 @@ set(PUBLICHEADERS
slsDetectorAnalysis/fileIOStatic.h slsDetectorAnalysis/fileIOStatic.h
multiSlsDetector/multiSlsDetector.h multiSlsDetector/multiSlsDetector.h
slsReceiverInterface/receiverInterface.h slsReceiverInterface/receiverInterface.h
../slsReceiverSoftware/include/sls_receiver_exceptions.h
) )
set_target_properties(slsDetectorShared PROPERTIES set_target_properties(slsDetectorShared PROPERTIES
LIBRARY_OUTPUT_NAME SlsDetector LIBRARY_OUTPUT_NAME SlsDetector

2
slsDetectorSoftware/Makefile
View File

@ -17,7 +17,7 @@ LIBZMQDIR = ../slsReceiverSoftware/include
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
SRC_CLNT=slsDetectorAnalysis/fileIO.cpp usersFunctions/usersFunctions.cpp slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/angularConversion.cpp slsDetectorAnalysis/angularConversionStatic.cpp slsDetectorAnalysis/energyConversion.cpp slsDetector/slsDetectorActions.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsDetectorAnalysis/postProcessingFuncs.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp sharedMemory/SharedMemory.cpp #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp SRC_CLNT=slsDetectorAnalysis/fileIO.cpp usersFunctions/usersFunctions.cpp slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/angularConversion.cpp slsDetectorAnalysis/angularConversionStatic.cpp slsDetectorAnalysis/energyConversion.cpp slsDetector/slsDetectorActions.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsDetectorAnalysis/postProcessingFuncs.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp sharedMemory/SharedMemory.cpp #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp
DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h commonFiles/sls_detector_defs.h commonFiles/sls_detector_funcs.h commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h slsDetectorAnalysis/badChannelCorrections.h slsDetectorAnalysis/detectorData.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/fileIOStatic.h slsDetectorAnalysis/movingStat.h slsDetectorAnalysis/runningStat.h slsDetectorAnalysis/single_photon_hit.h threadFiles/Global.h threadFiles/Task.h usersFunctions/angleFunction.h sharedMemory/SharedMemory.h commonFiles/sls_detector_exceptions.h commonFiles/versionAPI.h DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h commonFiles/sls_detector_defs.h commonFiles/sls_detector_funcs.h commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h slsDetectorAnalysis/badChannelCorrections.h slsDetectorAnalysis/detectorData.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/fileIOStatic.h slsDetectorAnalysis/movingStat.h slsDetectorAnalysis/runningStat.h slsDetectorAnalysis/single_photon_hit.h threadFiles/Global.h threadFiles/Task.h usersFunctions/angleFunction.h sharedMemory/SharedMemory.h $(LIBZMQDIR)/sls_receiver_exceptions.h commonFiles/versionAPI.h

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -11,7 +11,7 @@ ID: $Id$
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
#include "SharedMemory.h" #include "SharedMemory.h"
#include "slsDetector.h" #include "slsDetector.h"
#include "sls_detector_exceptions.h" #include "sls_receiver_exceptions.h"
#include "ThreadPool.h" #include "ThreadPool.h"
#include "ZmqSocket.h" #include "ZmqSocket.h"
#include "multiSlsDetectorClient.h" #include "multiSlsDetectorClient.h"

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
View File

@ -4,7 +4,7 @@
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
#include "multiSlsDetectorCommand.h" #include "multiSlsDetectorCommand.h"
#include "sls_detector_exceptions.h" #include "sls_receiver_exceptions.h"
#include <stdlib.h> #include <stdlib.h>

6
slsDetectorSoftware/sharedMemory/SharedMemory.cpp
View File

@ -1,5 +1,5 @@
#include "SharedMemory.h" #include "SharedMemory.h"
#include "sls_detector_exceptions.h" #include "sls_receiver_exceptions.h"
#include "ansi.h" #include "ansi.h"
#include <iostream> #include <iostream>
@ -122,14 +122,14 @@ void* SharedMemory::MapSharedMemory(size_t sz) {
std::string SharedMemory::ConstructSharedMemoryName(int multiId, int slsId) { std::string SharedMemory::ConstructSharedMemoryName(int multiId, int slsId) {
// using environment path // using environment path
string sEnvPath = ""; std::string sEnvPath = "";
char* envpath = getenv(SHM_ENV_NAME); char* envpath = getenv(SHM_ENV_NAME);
if (envpath != NULL) { if (envpath != NULL) {
sEnvPath.assign(envpath); sEnvPath.assign(envpath);
sEnvPath.insert(0,"_"); sEnvPath.insert(0,"_");
} }
stringstream ss; std::stringstream ss;
if (slsId < 0) if (slsId < 0)
ss << SHM_MULTI_PREFIX << multiId << sEnvPath; ss << SHM_MULTI_PREFIX << multiId << sEnvPath;
else else

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1,6 +1,6 @@
#include "slsDetector.h" #include "slsDetector.h"
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
#include "sls_detector_exceptions.h" #include "sls_receiver_exceptions.h"
#include "SharedMemory.h" #include "SharedMemory.h"
#include "receiverInterface.h" #include "receiverInterface.h"
#include "gitInfoLib.h" #include "gitInfoLib.h"

2
slsReceiverSoftware/CMakeLists.txt
View File

@ -69,7 +69,7 @@ set(PUBLICHEADERS
include/MySocketTCP.h include/MySocketTCP.h
include/genericSocket.h include/genericSocket.h
include/logger.h include/logger.h
include/sls_receiver_exceptions.h
) )

2
slsReceiverSoftware/Makefile
View File

@ -26,7 +26,7 @@ LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
SRC_CLNT = MySocketTCP.cpp ThreadObject.cpp Listener.cpp DataProcessor.cpp DataStreamer.cpp Fifo.cpp File.cpp BinaryFile.cpp UDPInterface.cpp UDPBaseImplementation.cpp UDPStandardImplementation.cpp slsReceiverTCPIPInterface.cpp slsReceiver.cpp slsReceiverUsers.cpp utilities.cpp SRC_CLNT = MySocketTCP.cpp ThreadObject.cpp Listener.cpp DataProcessor.cpp DataStreamer.cpp Fifo.cpp File.cpp BinaryFile.cpp UDPInterface.cpp UDPBaseImplementation.cpp UDPStandardImplementation.cpp slsReceiverTCPIPInterface.cpp slsReceiver.cpp slsReceiverUsers.cpp utilities.cpp
DEPSINCLUDES = $(INCDIR)/ansi.h $(INCDIR)/sls_receiver_defs.h $(INCDIR)/sls_receiver_funcs.h $(INCDIR)/GeneralData.h $(INCDIR)/circularFifo.h $(INCDIR)/genericSocket.h $(INCDIR)/logger.h $(INCDIR)/receiver_defs.h $(INCDIR)/UDPInterface.h $(INCDIR)/utilities.h $(INCDIR)/ZmqSocket.h $(INCDIR)/BinaryFileStatic.h $(INCDIR)/HDF5FileStatic.h DEPSINCLUDES = $(INCDIR)/ansi.h $(INCDIR)/sls_receiver_defs.h $(INCDIR)/sls_receiver_funcs.h $(INCDIR)/GeneralData.h $(INCDIR)/circularFifo.h $(INCDIR)/genericSocket.h $(INCDIR)/logger.h $(INCDIR)/receiver_defs.h $(INCDIR)/UDPInterface.h $(INCDIR)/utilities.h $(INCDIR)/ZmqSocket.h $(INCDIR)/BinaryFileStatic.h $(INCDIR)/HDF5FileStatic.h $(INCDIR)/sls_receiver_exceptions.h
ifeq ($(HDF5),yes) ifeq ($(HDF5),yes)

2
slsReceiverSoftware/include/MySocketTCP.h
View File

@ -43,7 +43,7 @@ class MySocketTCP: public genericSocket {
public: public:
MySocketTCP(const char* const host_ip_or_name, unsigned short int const port_number): genericSocket(host_ip_or_name, port_number,TCP), last_keep_connection_open_action_was_a_send(0){setPacketSize(TCP_PACKET_SIZE);}; // sender (client): where to? ip MySocketTCP(const char* const host_ip_or_name, unsigned short int const port_number): genericSocket(host_ip_or_name, port_number,TCP), last_keep_connection_open_action_was_a_send(0){setPacketSize(TCP_PACKET_SIZE);}; // sender (client): where to? ip
MySocketTCP(unsigned short int const port_number):genericSocket(port_number,TCP), last_keep_connection_open_action_was_a_send(0) {setPacketSize(TCP_PACKET_SIZE);}; // receiver (server) local no need for ip MySocketTCP(unsigned short int const port_number):genericSocket(port_number,TCP), last_keep_connection_open_action_was_a_send(0) {setPacketSize(TCP_PACKET_SIZE);}; // receiver (server) local no need for ip
virtual ~MySocketTCP(){};
//The following two functions will connectioned->send/receive->disconnect //The following two functions will connectioned->send/receive->disconnect
int SendData(void* buf,int length);//length in characters int SendData(void* buf,int length);//length in characters

16
slsDetectorSoftware/commonFiles/sls_detector_exceptions.h → slsReceiverSoftware/include/sls_receiver_exceptions.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
/************************************************ /************************************************
* @file sls_detector_exceptions.h * @file sls_receiver_exceptions.h
* @short exceptions defined * @short exceptions defined
***********************************************/ ***********************************************/
/** /**
@ -23,3 +23,17 @@ public:
ThreadpoolException() {} ThreadpoolException() {}
string GetMessage() const { return "Threadpool Failed";}; string GetMessage() const { return "Threadpool Failed";};
}; };
struct SocketException : public std::exception {
public:
SocketException() {}
std::string GetMessage() const { return "Socket Failed";};
};
struct SamePortSocketException : public SocketException {
public:
SamePortSocketException() {}
std::string GetMessage() const { return "Socket Failed";};
};