detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

some more changes

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-10-08 12:19:07 +02:00
parent 92b73e0e88
commit a3e88f96d6
10 changed files with 1436 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@ -4,25 +4,12 @@
* @short does all the functions for a receiver, set/get parameters, start/stop etc.
***********************************************/
#include "UDPBaseImplementation.h"
#include "moench02ModuleData.h"
#include "gotthardModuleData.h"
#include "gotthardShortModuleData.h"
#include <signal.h> // SIGINT
#include <sys/stat.h> // stat
#include <sys/socket.h> // socket(), bind(), listen(), accept(), shut down
#include <arpa/inet.h> // sock_addr_in, htonl, INADDR_ANY
#include <stdlib.h> // exit()
#include <iomanip> //set precision
#include <sys/mman.h> //munmap
#include <string.h>
#include <iostream>
#include <string.h>
using namespace std;
@ -32,7 +19,11 @@ using namespace std;
* They access local cache of configuration or detector parameters *******
*************************************************************************/
UDPBaseImplementation::UDPBaseImplementation(){
FILE_LOG(logDEBUG) << __AT__ << " starting";
cout << "Info: Initializing base members" << endl;
//**detector parameters***
myDetectorType = GENERIC;
strcpy(detHostname,"");
packetsPerFrame = 0;
acquisitionPeriod = 0;
@ -51,7 +42,7 @@ UDPBaseImplementation::UDPBaseImplementation(){
}
//***file parameters***
strcpy(fileName,"");
strcpy(fileName,"run");
strcpy(filePath,"");
fileIndex = 0;
scanTag = 0;
@ -78,9 +69,17 @@ UDPBaseImplementation::UDPBaseImplementation(){
pAcquisitionFinished = NULL;
rawDataReadyCallBack = NULL;
pRawDataReady = NULL;
};
}
UDPBaseImplementation::~UDPBaseImplementation(){};
UDPBaseImplementation::~UDPBaseImplementation(){
FILE_LOG(logDEBUG) << __AT__ << " starting";
cout << "Info: Deleting base member pointers" << endl;
if(detHostname) {delete [] detHostname; detHostname = NULL;}
if(eth) {delete [] eth; eth = NULL;}
if(fileName) {delete [] fileName; fileName = NULL;}
if(filePath) {delete [] filePath; filePath = NULL;}
}
/*************************************************************************
@ -157,9 +156,9 @@ int64_t UDPBaseImplementation::getAcquisitionIndex() const{
/***connection parameters***/
uint32_t UDPBaseImplementation::getUDPPortNo() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return udpPortNum[0];}
uint32_t UDPBaseImplementation::getUDPPortNumber() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return udpPortNum[0];}
uint32_t UDPBaseImplementation::getUDPPortNo2() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return udpPortNum[1];}
uint32_t UDPBaseImplementation::getUDPPortNumber2() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return udpPortNum[1];}
char *UDPBaseImplementation::getEthernetInterface() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
@ -205,7 +204,7 @@ void UDPBaseImplementation::setBottomEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting";
bottomEnable = b;
FILE_LOG(logINFO) << "Bottom Enable:" << bottomEnable;
FILE_LOG(logINFO) << "Bottom Enable: " << stringEnable(bottomEnable);
}
@ -255,41 +254,46 @@ void UDPBaseImplementation::setFrameIndexEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting";
frameIndexEnable = b;
FILE_LOG(logINFO) << "Frame Index Enable:" << frameIndexEnable;
FILE_LOG(logINFO) << "Frame Index Enable: " << stringEnable(frameIndexEnable);
}
void UDPBaseImplementation::setFileWriteEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting";
fileWriteEnable = b;
FILE_LOG(logINFO) << "File Write Enable:" << fileWriteEnable;
FILE_LOG(logINFO) << "File Write Enable: " << stringEnable(fileWriteEnable);
}
void UDPBaseImplementation::setOverwriteEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting";
overwriteEnable = b;
FILE_LOG(logINFO) << "Overwrite Enable:" << overwriteEnable;
FILE_LOG(logINFO) << "Overwrite Enable: " << stringEnable(overwriteEnable);
}
void UDPBaseImplementation::setDataCompressionEnable(const bool b){
int UDPBaseImplementation::setDataCompressionEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting";
dataCompressionEnable = b;
FILE_LOG(logINFO) << "Data Compression Enable:" << dataCompressionEnable;
}
FILE_LOG(logINFO) << "Data Compression Enable: " << stringEnable(dataCompressionEnable);
//overridden methods might return FAIL
return OK;
}
/***connection parameters***/
void UDPBaseImplementation::setUDPPortNo(const uint32_t i){
void UDPBaseImplementation::setUDPPortNumber(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
udpPortNum[0] = i;
if(bottomEnable)
udpPortNum[1] = i;
else
udpPortNum[0] = i;
FILE_LOG(logINFO) << "udpPortNum[0]:" << udpPortNum[0];
}
void UDPBaseImplementation::setUDPPortNo2(const uint32_t i){
void UDPBaseImplementation::setUDPPortNumber2(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
udpPortNum[1] = i;
@ -304,26 +308,32 @@ void UDPBaseImplementation::setEthernetInterface(const char* c){
}
/***connection parameters***/
/***acquisition parameters***/
void UDPBaseImplementation::setShortFrameEnable(const int i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
shortFrameEnable = i;
FILE_LOG(logINFO) << "Short Frame Enable:" << shortFrameEnable;
FILE_LOG(logINFO) << "Short Frame Enable: " << stringEnable(shortFrameEnable);
}
void UDPBaseImplementation::setFrameToGuiFrequency(const uint32_t i){
int UDPBaseImplementation::setFrameToGuiFrequency(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
FrameToGuiFrequency = i;
FILE_LOG(logINFO) << "Frame To Gui Frequency:" << FrameToGuiFrequency;
//overrridden child classes might return FAIL
return OK;
}
void UDPBaseImplementation::setAcquisitionPeriod(const uint64_t i){
int UDPBaseImplementation::setAcquisitionPeriod(const uint64_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
acquisitionPeriod = i;
FILE_LOG(logINFO) << "Acquisition Period:" << acquisitionPeriod;
//overrridden child classes might return FAIL
return OK;
}
void UDPBaseImplementation::setNumberOfFrames(const uint64_t i){
@ -333,20 +343,25 @@ void UDPBaseImplementation::setNumberOfFrames(const uint64_t i){
FILE_LOG(logINFO) << "Number of Frames:" << numberOfFrames;
}
void UDPBaseImplementation::setDynamicRange(const uint32_t i){
int UDPBaseImplementation::setDynamicRange(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
dynamicRange = i;
FILE_LOG(logINFO) << "Dynamic Range:" << dynamicRange;
//overrridden child classes might return FAIL
return OK;
}
void UDPBaseImplementation::setTenGigaEnable(const bool b){
int UDPBaseImplementation::setTenGigaEnable(const bool b){
FILE_LOG(logDEBUG) << __AT__ << " starting";
tengigaEnable = b;
FILE_LOG(logINFO) << "Ten Giga Enable:" << tengigaEnable;
}
FILE_LOG(logINFO) << "Ten Giga Enable: " << stringEnable(tengigaEnable);
//overridden functions might return FAIL
return OK;
}
/*************************************************************************
@ -354,11 +369,13 @@ void UDPBaseImplementation::setTenGigaEnable(const bool b){
* They may modify the status of the receiver ****************************
*************************************************************************/
/***initial functions***/
int UDPBaseImplementation::setDetectorType(const slsReceiverDefs::detectorType d){
FILE_LOG(logDEBUG) << __AT__ << " starting";
myDetectorType = d;
//if eiger, set numberofListeningThreads = 2;
FILE_LOG(logINFO) << "Detector Type:" << slsDetectorBase::getDetectorType(d);
return OK;
}

4
slsReceiverSoftware/src/UDPInterface.cpp
View File

@ -5,11 +5,11 @@
***********************************************/
#include <string.h>
#include <iostream>
#include <string.h>
using namespace std;
#include "UDPInterface.h"
#include "UDPBaseImplementation.h"
#include "UDPStandardImplementation.h"

1838
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

File diff suppressed because it is too large Load Diff

43
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -1922,8 +1922,11 @@ int slsReceiverTCPIPInterface::set_read_frequency(){
strcpy(mess,"cannot set up receiver mode when receiver is running\n");
}*/
else{
if(index >= 0)
receiverBase->setFrameToGuiFrequency(index);
if(index >= 0){
ret = receiverBase->setFrameToGuiFrequency(index);
if(ret == FAIL)
strcpy(mess, "Could not allocate memory for listening fifo\n");
}
retval=receiverBase->getFrameToGuiFrequency();
if(index>=0 && retval!=index)
ret = FAIL;
@ -2107,8 +2110,11 @@ int slsReceiverTCPIPInterface::set_timer() {
}
else{
if(index[0] == slsReceiverDefs::FRAME_PERIOD){
if(index[1]>=0)
receiverBase->setAcquisitionPeriod(index[1]);
if(index[1]>=0){
ret = receiverBase->setAcquisitionPeriod(index[1]);
if(ret == FAIL)
strcpy(mess,"Could not allocate memory for listening fifo\n")
}
retval=receiverBase->getAcquisitionPeriod();
}else{
if(index[1]>=0)
@ -2183,17 +2189,19 @@ int slsReceiverTCPIPInterface::enable_compression() {
}
else{
if(enable >= 0)
receiverBase->setDataCompressionEnable(enable);
ret = receiverBase->setDataCompressionEnable(enable);
}
}
if (receiverBase == NULL){
strcpy(mess,"Receiver not set up\n");
ret=FAIL;
}else{
retval = receiverBase->getDataCompressionEnable();
if(enable >= 0 && retval != enable)
ret = FAIL;
if(ret != FAIL){
if (receiverBase == NULL){
strcpy(mess,"Receiver not set up\n");
ret=FAIL;
}else{
retval = receiverBase->getDataCompressionEnable();
if(enable >= 0 && retval != enable)
ret = FAIL;
}
}
}
@ -2324,8 +2332,11 @@ int slsReceiverTCPIPInterface::set_dynamic_range() {
strcpy(mess,"Receiver not set up\n");
ret=FAIL;
}else{
if(dr > 0)
receiverBase->setDynamicRange(dr);
if(dr > 0){
ret = receiverBase->setDynamicRange(dr);
if(ret == FAIL)
strcpy(mess, "Could not allocate memory for fifo or could not start listening/writing threads\n");
}
retval = receiverBase->getDynamicRange();
if(dr > 0 && retval != dr)
ret = FAIL;
@ -2461,8 +2472,8 @@ int slsReceiverTCPIPInterface::enable_tengiga() {
}
else{
if(val >= 0)
receiverBase->setDataCompressionEnable(val);
retval=receiverBase->getDataCompressionEnable();
ret = receiverBase->setTenGigaEnable(val);
retval=receiverBase->getTenGigaEnable();
if((val >= 0) && (val != retval))
ret = FAIL;
else