detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 00:42:26 +01:00
Code Issues Actions Packages Releases Activity

almost done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-15 10:17:16 +02:00
parent 33807b7fac
commit 0f9a841c4a
5 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -3955,9 +3955,9 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
if (index!=MEASUREMENTS_NUMBER) {
//#ifdef VERBOSE
#ifdef VERBOSE
std::cout<< "Setting timer "<< index << " to " << t << "ns/value" << std::endl;
//#endif
#endif
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
@@ -7181,7 +7181,7 @@ void slsDetector::readFrameFromReceiver(){
runningMask|=(1<<(i));
}
cout<<detId<<" started"<<endl;
//receive msgs and let multi know
zmq_msg_t message;
@@ -7211,14 +7211,16 @@ void slsDetector::readFrameFromReceiver(){
//int size = zmq_msg_size (&message);
if (len <= 3 ) {
if(!len) cprintf(RED,"Received no data in socket for %d\n", readoutId+idet);
cout<<readoutId+idet <<" sls Received end data"<<endl;
//cout<<readoutId+idet <<" sls Received end data"<<endl;
parentDet->slsframe[readoutId+idet] = NULL;
sem_post(&parentDet->sem_slsdone[readoutId+idet]);//let multi know is ready
runningMask^=(1<<idet);
cout<<detId<<" " << idet << " finished"<<endl;
//all done, get out
if(!runningMask){
cout<<detId<<" all done"<<endl;
break;
}
continue;

7
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@@ -156,8 +156,8 @@ int slsDetectorUtils::acquire(int delflag){
}
if (*threadedProcessing) {
sem_init(&dataThreadStartedSemaphore,1,0);
startThread(delflag);
}
#ifdef VERBOSE
@@ -169,6 +169,8 @@ int slsDetectorUtils::acquire(int delflag){
resetFramesCaught();
}
if(*threadedProcessing && dataReady)
sem_wait(&dataThreadStartedSemaphore);
for(int im=0;im<nm;im++) {
#ifdef VERBOSE
@@ -346,6 +348,7 @@ int slsDetectorUtils::acquire(int delflag){
pthread_mutex_lock(&mg);
stopReceiver();
pthread_mutex_unlock(&mg);
cout<<"receiver stopped"<<endl;
}
@@ -468,6 +471,8 @@ int slsDetectorUtils::acquire(int delflag){
#ifdef VERBOSE
cout << "data processing thread joined" << endl;
#endif
if(dataReady)
sem_destroy(&dataThreadStartedSemaphore);
}