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

gui works

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-02-28 13:42:56 +01:00
parent 3aac30b8ee
commit 447c5bb8fe
10 changed files with 254 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -284,7 +284,9 @@ void DataProcessor::StopProcessing(char* buf) {
file->CloseCurrentFile();
StopRunning();
cprintf(BLUE,"%d: Processing Completed\n", index);
#ifdef VERBOSE
printf("%d: Processing Completed\n", index);
#endif
}

75
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -27,7 +27,7 @@ const char* DataStreamer::jsonHeaderFormat_part1 =
"{"
"\"htype\":[\"chunk-1.0\"], "
"\"type\":\"%s\", "
"\"shape\":%s, ";
"\"shape\":[%d, %d], ";
const char* DataStreamer::jsonHeaderFormat =
"%s"
@ -52,7 +52,6 @@ DataStreamer::DataStreamer(Fifo*& f, uint32_t* dr, uint32_t* freq, uint32_t* tim
firstAcquisitionIndex(0),
firstMeasurementIndex(0)
{
memset(timerBegin, 0xFF, sizeof(timespec));
if(ThreadObject::CreateThread()){
pthread_mutex_lock(&Mutex);
ErrorMask ^= (1<<index);
@ -62,11 +61,14 @@ DataStreamer::DataStreamer(Fifo*& f, uint32_t* dr, uint32_t* freq, uint32_t* tim
NumberofDataStreamers++;
FILE_LOG (logDEBUG) << "Number of DataStreamers: " << NumberofDataStreamers;
memset((void*)&timerBegin, 0, sizeof(timespec));
currentHeader = new char[255];
}
DataStreamer::~DataStreamer() {
CloseZmqSocket();
delete currentHeader;
ThreadObject::DestroyThread();
NumberofDataStreamers--;
}
@ -128,7 +130,7 @@ void DataStreamer::ResetParametersforNewMeasurement(){
void DataStreamer::CreateHeaderPart1() {
char *type;
char type[10] = "";
switch (*dynamicRange) {
case 4: strcpy(type, "uint8"); break;
case 8: strcpy(type, "uint8"); break;
@ -136,14 +138,15 @@ void DataStreamer::CreateHeaderPart1() {
case 32: strcpy(type, "uint32"); break;
default:
strcpy(type, "unknown");
cprintf(RED," Unknown datatype in json format\n");
cprintf(RED," Unknown datatype in json format %d\n", *dynamicRange);
break;
}
char *shape= "[%d, %d]";
sprintf(shape, shape, generalData->nPixelsX, generalData->nPixelsY);
sprintf(currentHeader, jsonHeaderFormat_part1, type, shape);
sprintf(currentHeader, jsonHeaderFormat_part1,
type, generalData->nPixelsX, generalData->nPixelsY);
#ifdef VERBOSE
cprintf(BLUE, "%d currentheader: %s\n", index, currentHeader);
#endif
}
@ -182,14 +185,13 @@ int DataStreamer::SetThreadPriority(int priority) {
int DataStreamer::CreateZmqSockets(int* dindex, int* nunits) {
uint32_t portnum = DEFAULT_ZMQ_PORTNO + ((*dindex) * (*nunits) + index);
printf("%d Streamer: Port number: %d\n", index, portnum);
zmqSocket = new ZmqSocket(portnum);
if (zmqSocket->GetErrorStatus()) {
if (zmqSocket->IsError()) {
cprintf(RED, "Error: Could not create Zmq socket on port %d for Streamer %d\n", portnum, index);
return FAIL;
}
printf("%d Streamer: Zmq Server started at %s\n",zmqSocket->GetZmqServerAddress());
printf("%d Streamer: Zmq Server started at %s\n",index, zmqSocket->GetZmqServerAddress());
return OK;
}
@ -226,9 +228,19 @@ void DataStreamer::ThreadExecution() {
void DataStreamer::StopProcessing(char* buf) {
//send dummy header and data
if (!SendHeader(0, true))
cprintf(RED,"Error: Could not send zmq dummy header for streamer %d\n", index);
if (!zmqSocket->SendData(DUMMY_MSG, DUMMY_MSG_SIZE))
cprintf(RED,"Error: Could not send zmq dummy message for streamer %d\n", index);
fifo->FreeAddress(buf);
StopRunning();
cprintf(MAGENTA,"%d: Streaming Completed\n", index);
#ifdef VERBOSE
printf("%d: Streaming Completed\n", index);
#endif
}
@ -258,14 +270,17 @@ void DataStreamer::ProcessAnImage(char* buf) {
return;
}
if(!SendHeader(fnum))
if (!SendHeader(fnum))
cprintf(RED,"Error: Could not send zmq header for fnum %lld and streamer %d\n",
(long long int) fnum, index);
Send Datat();
if (!zmqSocket->SendData(buf + FILE_FRAME_HEADER_SIZE, generalData->imageSize))
cprintf(RED,"Error: Could not send zmq data for fnum %lld and streamer %d\n",
(long long int) fnum, index);
}
bool DataStreamer::CheckTimer() {
struct timespec end;
clock_gettime(CLOCK_REALTIME, &end);
@ -273,7 +288,7 @@ bool DataStreamer::CheckTimer() {
cprintf(BLUE,"%d Timer elapsed time:%f seconds\n", index, ( end.tv_sec - timerBegin.tv_sec ) + ( end.tv_nsec - timerBegin.tv_nsec ) / 1000000000.0);
#endif
//still less than streaming timer, keep waiting
if((( end.tv_sec - timerBegin.tv_sec ) + ( end.tv_nsec - timerBegin.tv_nsec ) / 1000000000.0) < (streamingTimerInMs/1000))
if((( end.tv_sec - timerBegin.tv_sec ) + ( end.tv_nsec - timerBegin.tv_nsec ) / 1000000000.0) < (*streamingTimerInMs/1000))
return false;
//restart timer
@ -281,6 +296,7 @@ bool DataStreamer::CheckTimer() {
return true;
}
bool DataStreamer::CheckCount() {
if (currentFreqCount == *streamingFrequency ) {
currentFreqCount = 1;
@ -290,11 +306,24 @@ bool DataStreamer::CheckCount() {
return false;
}
int DataStreamer::SendHeader(uint64_t fnum) {
uint64_t frameIndex = fnum - firstMeasurementIndex;
uint64_t acquisitionIndex = fnum - firstAcquisitionIndex;
uint64_t subframeIndex = -1; /* subframe to be included in fifo buffer? */
char buf[1000];
int len = sprintf(buf, jsonHeaderFormat, jsonHeaderFormat_part1, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]);
return zmqSocket->SendDataOnly(buf, len);
int DataStreamer::SendHeader(uint64_t fnum, bool dummy) {
uint64_t frameIndex = -1;
uint64_t acquisitionIndex = -1;
uint64_t subframeIndex = -1;
char fname[MAX_STR_LENGTH] = "run";
char buf[1000] = "";
if (!dummy) {
frameIndex = fnum - firstMeasurementIndex;
acquisitionIndex = fnum - firstAcquisitionIndex;
subframeIndex = -1; /* subframe to be included in fifo buffer? */
/* fname to be included in fifo buffer? */
}
int len = sprintf(buf, jsonHeaderFormat, currentHeader, acquisitionIndex, frameIndex, subframeIndex,fname);
#ifdef VERBOSE
printf("%d Streamer: buf:%s\n", index, buf);
#endif
return zmqSocket->SendHeaderData(buf, len);
}

8
slsReceiverSoftware/src/Listener.cpp
View File

@ -164,7 +164,7 @@ void Listener::RecordFirstIndices(uint64_t fnum) {
acquisitionStartedFlag = true;
firstAcquisitionIndex = fnum;
}
if (!index) cprintf(GREEN,"%d First Acquisition Index:%lld\n"
if (!index) cprintf(BLUE,"%d First Acquisition Index:%lld\n"
"%d First Measurement Index:%lld\n",
index, (long long int)firstAcquisitionIndex,
index, (long long int)firstMeasurementIndex);
@ -205,7 +205,7 @@ int Listener::CreateUDPSockets() {
generalData->packetSize, (strlen(eth)?eth:NULL), generalData->headerPacketSize);
int iret = udpSocket->getErrorStatus();
if(!iret){
cout << "UDP port opened at port " << *udpPortNumber << endl;
cout << index << ": UDP port opened at port " << *udpPortNumber << endl;
}else{
FILE_LOG(logERROR) << "Could not create UDP socket on port " << *udpPortNumber << " error: " << iret;
return FAIL;
@ -218,7 +218,7 @@ int Listener::CreateUDPSockets() {
void Listener::ShutDownUDPSocket() {
if(udpSocket){
udpSocket->ShutDownSocket();
FILE_LOG(logINFO) << "Shut down UDP Socket " << index;
FILE_LOG(logINFO) << "Shut down of UDP port " << *udpPortNumber;
delete udpSocket;
udpSocket = 0;
}
@ -280,8 +280,8 @@ void Listener::StopListening(char* buf) {
StopRunning();
#ifdef VERBOSE
cprintf(GREEN,"%d: Listening Packets (%d) : %d\n", index, *udpPortNumber, numPacketsCaught);
printf("%d: Listening Completed\n", index);
#endif
cprintf(GREEN,"%d: Listening Completed\n", index);
}

2
slsReceiverSoftware/src/ThreadObject.cpp
View File

@ -61,7 +61,7 @@ int ThreadObject::CreateThread() {
return FAIL;
}
alive = true;
FILE_LOG (logINFO) << GetType() << " thread " << index << " created successfully.";
FILE_LOG (logDEBUG) << GetType() << " thread " << index << " created successfully.";
return OK;
}

36
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@ -254,7 +254,7 @@ void UDPBaseImplementation::setFileFormat(const fileFormat f){
break;
}
FILE_LOG(logINFO) << "File Format:" << getFileFormatType(fileFormatType);
FILE_LOG(logINFO) << "File Format: " << getFileFormatType(fileFormatType);
}
@ -263,7 +263,7 @@ void UDPBaseImplementation::setFileName(const char c[]){
if(strlen(c))
strcpy(fileName, c);
FILE_LOG(logINFO) << "File name:" << fileName;
FILE_LOG(logINFO) << "File name: " << fileName;
}
void UDPBaseImplementation::setFilePath(const char c[]){
@ -276,18 +276,18 @@ void UDPBaseImplementation::setFilePath(const char c[]){
strcpy(filePath,c);
else{
strcpy(filePath,"");
FILE_LOG(logWARNING) << "FilePath does not exist:" << filePath;
FILE_LOG(logWARNING) << "FilePath does not exist: " << filePath;
}
strcpy(filePath, c);
}
FILE_LOG(logDEBUG) << "Info: File path:" << filePath;
FILE_LOG(logDEBUG) << "Info: File path: " << filePath;
}
void UDPBaseImplementation::setFileIndex(const uint64_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
fileIndex = i;
FILE_LOG(logINFO) << "File Index:" << fileIndex;
FILE_LOG(logINFO) << "File Index: " << fileIndex;
}
//FIXME: needed?
@ -295,7 +295,7 @@ void UDPBaseImplementation::setScanTag(const int i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
scanTag = i;
FILE_LOG(logINFO) << "Scan Tag:" << scanTag;
FILE_LOG(logINFO) << "Scan Tag: " << scanTag;
}
@ -336,14 +336,14 @@ void UDPBaseImplementation::setUDPPortNumber(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
udpPortNum[0] = i;
FILE_LOG(logINFO) << "UDP Port Number[0]:" << udpPortNum[0];
FILE_LOG(logINFO) << "UDP Port Number[0]: " << udpPortNum[0];
}
void UDPBaseImplementation::setUDPPortNumber2(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
udpPortNum[1] = i;
FILE_LOG(logINFO) << "UDP Port Number[1]:" << udpPortNum[1];
FILE_LOG(logINFO) << "UDP Port Number[1]: " << udpPortNum[1];
}
void UDPBaseImplementation::setEthernetInterface(const char* c){
@ -368,7 +368,7 @@ int UDPBaseImplementation::setFrameToGuiFrequency(const uint32_t freq){
FILE_LOG(logDEBUG) << __AT__ << " starting";
frameToGuiFrequency = freq;
FILE_LOG(logINFO) << "Frame To Gui Frequency:" << frameToGuiFrequency;
FILE_LOG(logINFO) << "Frame To Gui Frequency: " << frameToGuiFrequency;
//overrridden child classes might return FAIL
return OK;
@ -378,7 +378,7 @@ void UDPBaseImplementation::setFrameToGuiTimer(const uint32_t time_in_ms){
FILE_LOG(logDEBUG) << __AT__ << " starting";
frameToGuiTimerinMS = time_in_ms;
FILE_LOG(logINFO) << "Frame To Gui Timer:" << frameToGuiTimerinMS;
FILE_LOG(logINFO) << "Frame To Gui Timer: " << frameToGuiTimerinMS;
}
@ -386,7 +386,7 @@ int UDPBaseImplementation::setDataStreamEnable(const bool enable){
FILE_LOG(logDEBUG) << __AT__ << " starting";
dataStreamEnable = enable;
FILE_LOG(logINFO) << "Streaming Data from Receiver:" << dataStreamEnable;
FILE_LOG(logINFO) << "Streaming Data from Receiver: " << dataStreamEnable;
//overrridden child classes might return FAIL
return OK;
@ -397,7 +397,7 @@ int UDPBaseImplementation::setAcquisitionPeriod(const uint64_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
acquisitionPeriod = i;
FILE_LOG(logINFO) << "Acquisition Period:" << (double)acquisitionPeriod/(1E9) << "s";
FILE_LOG(logINFO) << "Acquisition Period: " << (double)acquisitionPeriod/(1E9) << "s";
//overrridden child classes might return FAIL
return OK;
@ -407,7 +407,7 @@ int UDPBaseImplementation::setAcquisitionTime(const uint64_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
acquisitionTime = i;
FILE_LOG(logINFO) << "Acquisition Time:" << (double)acquisitionTime/(1E9) << "s";
FILE_LOG(logINFO) << "Acquisition Time: " << (double)acquisitionTime/(1E9) << "s";
//overrridden child classes might return FAIL
return OK;
@ -417,7 +417,7 @@ int UDPBaseImplementation::setNumberOfFrames(const uint64_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
numberOfFrames = i;
FILE_LOG(logINFO) << "Number of Frames:" << numberOfFrames;
FILE_LOG(logINFO) << "Number of Frames: " << numberOfFrames;
//overrridden child classes might return FAIL
return OK;
@ -427,7 +427,7 @@ int UDPBaseImplementation::setDynamicRange(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
dynamicRange = i;
FILE_LOG(logINFO) << "Dynamic Range:" << dynamicRange;
FILE_LOG(logINFO) << "Dynamic Range: " << dynamicRange;
//overrridden child classes might return FAIL
return OK;
@ -465,7 +465,7 @@ int UDPBaseImplementation::setDetectorType(const detectorType d){
myDetectorType = d;
//if eiger, set numberofListeningThreads = 2;
FILE_LOG(logINFO) << "Detector Type:" << getDetectorType(d);
FILE_LOG(logINFO) << "Detector Type: " << getDetectorType(d);
return OK;
}
@ -473,7 +473,7 @@ void UDPBaseImplementation::setDetectorPositionId(const int i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
detID = i;
FILE_LOG(logINFO) << "Detector Position Id:" << detID;
FILE_LOG(logINFO) << "Detector Position Id: " << detID;
}
void UDPBaseImplementation::initialize(const char *c){
@ -481,7 +481,7 @@ void UDPBaseImplementation::initialize(const char *c){
if(strlen(c))
strcpy(detHostname, c);
FILE_LOG(logINFO) << "Detector Hostname:" << detHostname;
FILE_LOG(logINFO) << "Detector Hostname: " << detHostname;
}

30
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -216,9 +216,9 @@ int UDPStandardImplementation::setDataStreamEnable(const bool enable) {
if (enable) {
bool error = false;
for ( int i = 0; i < numThreads; ++i ) {
dataStreamer.push_back(new DataStreamer(fifo[i], &frameToGuiFrequency, &frameToGuiTimerinMS, &dynamicRange));
dataStreamer.push_back(new DataStreamer(fifo[i], &dynamicRange, &frameToGuiFrequency, &frameToGuiTimerinMS));
dataStreamer[i]->SetGeneralData(generalData);
if (dataStreamer[i]->CreateZmqSockets() == FAIL) {
if (dataStreamer[i]->CreateZmqSockets(&detID, &numThreads) == FAIL) {
error = true;
break;
}
@ -478,6 +478,9 @@ int UDPStandardImplementation::VerifyCallBackAction() {
}
int UDPStandardImplementation::startReceiver(char *c) {
cout << endl << endl;
FILE_LOG(logINFO) << "Starting Receiver";
ResetParametersforNewMeasurement();
//listener
@ -486,7 +489,6 @@ int UDPStandardImplementation::startReceiver(char *c) {
FILE_LOG(logERROR) << c;
return FAIL;
}
cout << "Listener Ready ..." << endl;
//callbacks
callbackAction = DO_EVERYTHING;
@ -502,9 +504,9 @@ int UDPStandardImplementation::startReceiver(char *c) {
return FAIL;
}
} else
cout << "Data will not be saved" << endl;
cout << "Processor Ready ..." << endl;
cout << " Data will not be saved" << endl;
cout << "Ready ..." << endl;
//status
pthread_mutex_lock(&statusMutex);
@ -550,15 +552,15 @@ void UDPStandardImplementation::stopReceiver(){
tot += dataProcessor[i]->GetNumFramesCaught();
if (dataProcessor[i]->GetNumFramesCaught() < numberOfFrames) {
cprintf(RED, "\nPort %d\n",udpPortNum[i]);
cprintf(RED, "Missing Packets \t: %lld\n",(long long int)numberOfFrames*generalData->packetsPerFrame-listener[i]->GetTotalPacketsCaught());
cprintf(RED, "Frames Caught \t\t: %lld\n",(long long int)dataProcessor[i]->GetNumFramesCaught());
cprintf(RED, "Last Frame Number Caught :%lld\n",(long long int)listener[i]->GetLastFrameIndexCaught());
cprintf(RED, "\n[Port %d]\n",udpPortNum[i]);
cprintf(RED, "Missing Packets\t\t: %lld\n",(long long int)numberOfFrames*generalData->packetsPerFrame-listener[i]->GetTotalPacketsCaught());
cprintf(RED, "Frames Caught\t\t: %lld\n",(long long int)dataProcessor[i]->GetNumFramesCaught());
cprintf(RED, "Last Frame Caught\t: %lld\n",(long long int)listener[i]->GetLastFrameIndexCaught());
}else{
cprintf(GREEN, "\nPort %d\n",udpPortNum[i]);
cprintf(GREEN, "Missing Packets \t: %lld\n",(long long int)numberOfFrames*generalData->packetsPerFrame-listener[i]->GetTotalPacketsCaught());
cprintf(GREEN, "Frames Caught \t\t: %lld\n",(long long int)dataProcessor[i]->GetNumFramesCaught());
cprintf(GREEN, "Last Frame Number Caught :%lld\n",(long long int)listener[i]->GetLastFrameIndexCaught());
cprintf(GREEN, "\n[Port %d]\n",udpPortNum[i]);
cprintf(GREEN, "Missing Packets\t\t: %lld\n",(long long int)numberOfFrames*generalData->packetsPerFrame-listener[i]->GetTotalPacketsCaught());
cprintf(GREEN, "Frames Caught\t\t: %lld\n",(long long int)dataProcessor[i]->GetNumFramesCaught());
cprintf(GREEN, "Last Frame Caught\t: %lld\n",(long long int)listener[i]->GetLastFrameIndexCaught());
}
}
if(!activated)
@ -575,7 +577,6 @@ void UDPStandardImplementation::stopReceiver(){
FILE_LOG(logINFO) << "Receiver Stopped";
FILE_LOG(logINFO) << "Status: " << runStatusType(status);
cout << endl << endl;
}
@ -816,7 +817,6 @@ int UDPStandardImplementation::SetupWriter() {
return FAIL;
}
cout << "Writer Ready ..." << endl;
return OK;
}

1
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2339,6 +2339,7 @@ int slsReceiverTCPIPInterface::set_multi_detector_size() {
else if (receiverBase == NULL){
strcpy(mess,SET_RECEIVER_ERR_MESSAGE);
ret=FAIL;
cprintf(RED, "%s", mess);
}
else if(receiverBase->getStatus()!= IDLE){
strcpy(mess,"Can not set position file id while receiver not idle\n");