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

almost done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-09 17:51:36 +02:00
parent f8b62bba64
commit 652d29f2d9
13 changed files with 441 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -7,6 +7,7 @@
#include "usersFunctions.h"
#endif
//#define VERBOSE
static void* startProcessData(void *n){
@ -461,12 +462,7 @@ void* postProcessing::processData(int delflag) {
}
/** IF detector acquisition is done, let the acquire() thread know to finish up and force join thread */
if(acquiringDone){
sem_post(&sem_queue);
// cout << "Sem posted" << endl;
} //else
// cout << "Sem not posted" << endl;
/* IF THERE ARE NO DATA look if acquisition is finished */
if (checkJoinThread()) {
if (dataQueueSize()==0) {
@ -488,6 +484,14 @@ void* postProcessing::processData(int delflag) {
else{
readFrameFromReceiver();
/*
int progress = 0;
char currentfName[MAX_STR_LENGTH]="";
int caught = -1;
@ -663,6 +667,8 @@ void* postProcessing::processData(int delflag) {
}
}
*/
}
return 0;

18
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -17,7 +17,7 @@
#include <sstream>
#include <queue>
#include <math.h>
#include <semaphore.h>
class postProcessingFuncs;
@ -300,11 +300,7 @@ s
/** data queue size */
int queuesize;
/** queue mutex */
sem_t sem_queue;
/** set when detector finishes acquiring */
int acquiringDone;
/**
@ -333,18 +329,23 @@ s
private:
double *fdata;
int (*dataReady)(detectorData*,int, int,void*);
void *pCallbackArg;
detectorData *thisData;
private:
// double *fdata;
// int (*dataReady)(detectorData*,int, int,void*);
// void *pCallbackArg;
int (*rawDataReady)(double*,int,void*);
void *pRawDataArg;
postProcessingFuncs *ppFun;
detectorData *thisData;
//detectorData *thisData;
double *ang;
@ -374,4 +375,5 @@ s
#endif