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

huge change in receiver in previous version, sortingand padding frames before movign into fifo; users small change in previous revision typecasting

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@676 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-10-02 14:28:37 +00:00
parent eba9bcf9ac
commit 9e08196677
8 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer
View File

Binary file not shown.

1
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -1,4 +1,3 @@
#include "slsDetectorUsers.h" #include "slsDetectorUsers.h"
#include "detectorData.h" #include "detectorData.h"
#include "multiSlsDetector.h" #include "multiSlsDetector.h"

2
slsDetectorSoftware/slsReceiver/Makefile
View File

@ -8,7 +8,7 @@ LIBS?= -L$(LIBDIR) -lSlsDetector
INCLUDES ?= -I ../MySocketTCP -I ../commonFiles -I -I ../slsDetectorAnalysis -I . INCLUDES ?= -I ../MySocketTCP -I ../commonFiles -I -I ../slsDetectorAnalysis -I .
SRC_CLNT = slsReceiver.cpp SRC_CLNT = slsReceiver.cpp
#../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp #../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp
DESTDIR ?= bin DESTDIR ?= bin
INSTMODE = 0777 INSTMODE = 0777

2
slsDetectorSoftware/slsReceiver/receiver_defs.h
View File

@ -13,7 +13,7 @@
#define BUF_SIZE (16*1024*1024) //16mb #define BUF_SIZE (16*1024*1024) //16mb
//all max frames defined in sls_detector_defs.h. 20000 gotthard, 100000 for short gotthard, 1000 for moench //all max frames defined in sls_detector_defs.h. 20000 gotthard, 100000 for short gotthard, 1000 for moench
#define GOTTHARD_FIFO_SIZE 25000 #define GOTTHARD_FIFO_SIZE 25000

10
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -644,7 +644,6 @@ int slsReceiverFunctionList::startWriting(){
int sleepnumber=0; int sleepnumber=0;
int frameFactor=0; int frameFactor=0;
int i; int i;
/*int i1,i2;*/
packetsInFile=0; packetsInFile=0;
framesCaught=0; framesCaught=0;
@ -801,10 +800,6 @@ int slsReceiverFunctionList::startWriting(){
strcpy(guiFileName,savefilename); strcpy(guiFileName,savefilename);
pthread_mutex_lock(&dataReadyMutex); pthread_mutex_lock(&dataReadyMutex);
guiDataReady=1; guiDataReady=1;
/* i1 = ((((uint32_t)(*((uint32_t*)latestData))) & (frameIndexMask)) >> frameIndexOffset);
i2 = ((((uint32_t)(*((uint32_t*)(latestData+oneBufferSize)))) & (frameIndexMask)) >> frameIndexOffset);
if ( i1 == (i2+1))
cout<<"222WEIRDDD:"<<i1<<":"<<i2<<endl;*/
pthread_mutex_unlock(&dataReadyMutex); pthread_mutex_unlock(&dataReadyMutex);
}else{ }else{
pthread_mutex_lock(&dataReadyMutex); pthread_mutex_lock(&dataReadyMutex);
@ -883,7 +878,6 @@ int slsReceiverFunctionList::startWriting(){
void slsReceiverFunctionList::readFrame(char* c,char** raw){ void slsReceiverFunctionList::readFrame(char* c,char** raw){
int i1,i2;
//point to gui data //point to gui data
if (guiData == NULL) if (guiData == NULL)
guiData = latestData; guiData = latestData;
@ -896,10 +890,6 @@ void slsReceiverFunctionList::readFrame(char* c,char** raw){
//data ready, set guidata to receive new data //data ready, set guidata to receive new data
else{ else{
*raw = guiData; *raw = guiData;
i1 = ((((uint32_t)(*((uint32_t*)guiData))) & (frameIndexMask)) >> frameIndexOffset);
i2 = ((((uint32_t)(*((uint32_t*)(guiData+oneBufferSize)))) & (frameIndexMask)) >> frameIndexOffset);
if ( i1 == (i2+1))
cout<<"WEIRDDD:"<<i1<<":"<<i2<<endl;
guiData = NULL; guiData = NULL;
pthread_mutex_lock(&dataReadyMutex); pthread_mutex_lock(&dataReadyMutex);
guiDataReady = 0; guiDataReady = 0;

2
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -360,7 +360,7 @@ private:
/** oen buffer size */ /** oen buffer size */
int oneBufferSize; int oneBufferSize;
/** semaphore to synchronize writer and guireader threads */ /** semaphore to synchronize writer and guireader threads */
sem_t smp; sem_t smp;
/** guiDataReady mutex */ /** guiDataReady mutex */

6
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -1116,7 +1116,7 @@ int slsReceiverFuncs::gotthard_read_frame(){
pindex = (bindex & GOTTHARD_SHORT_PACKET_INDEX_MASK); pindex = (bindex & GOTTHARD_SHORT_PACKET_INDEX_MASK);
index = ((bindex & GOTTHARD_SHORT_FRAME_INDEX_MASK) >> GOTTHARD_SHORT_FRAME_INDEX_OFFSET); index = ((bindex & GOTTHARD_SHORT_FRAME_INDEX_MASK) >> GOTTHARD_SHORT_FRAME_INDEX_OFFSET);
#ifdef VERBOSE #ifdef VERBOSE
cout<<"index:"<<hex<<index<<endl; cout << "index:" << hex << index << endl;
#endif #endif
}else{ }else{
bindex = (uint32_t)(*((uint32_t*)raw)); bindex = (uint32_t)(*((uint32_t*)raw));
@ -1126,8 +1126,8 @@ int slsReceiverFuncs::gotthard_read_frame(){
pindex2 =(bindex2 & GOTTHARD_PACKET_INDEX_MASK); pindex2 =(bindex2 & GOTTHARD_PACKET_INDEX_MASK);
index2 =((bindex2 & GOTTHARD_FRAME_INDEX_MASK) >> GOTTHARD_FRAME_INDEX_OFFSET); index2 =((bindex2 & GOTTHARD_FRAME_INDEX_MASK) >> GOTTHARD_FRAME_INDEX_OFFSET);
#ifdef VERBOSE #ifdef VERBOSE
cout<<"index1:"<<hex<<index<<endl; cout << "index1:" << hex << index << endl;
cout<<"index2:"<<hex<<index<<endl; cout << "index2:" << hex << index << endl;
#endif #endif
} }

2
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.h
View File

@ -197,7 +197,7 @@ public:
/** Short frame */ /** Short frame */
int shortFrame; int shortFrame;
/** Packets per frame */ /** Packets per frame */
int packetsPerFrame; int packetsPerFrame;
static int file_des; static int file_des;