mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-29 09:30:02 +02:00
huge change in receiver in previous version, sortingand padding frames before movign into fifo; users small change in previous revision typecasting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@676 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
parent
eba9bcf9ac
commit
9e08196677
Binary file not shown.
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#include "slsDetectorUsers.h"
|
#include "slsDetectorUsers.h"
|
||||||
#include "detectorData.h"
|
#include "detectorData.h"
|
||||||
#include "multiSlsDetector.h"
|
#include "multiSlsDetector.h"
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user