From de2de6315c328c7713185849a17f291b052cf04c Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 6 Oct 2016 08:44:00 +0200 Subject: [PATCH] somewhere --- .../multiSlsDetector/multiSlsDetector.cpp | 14 ++++++++++---- .../slsDetectorAnalysis/postProcessing.cpp | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 5d50eb644..6a88bbb51 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -4974,11 +4974,15 @@ int multiSlsDetector::resetFramesCaught() { int multiSlsDetector::createReceivingDataThreads(bool destroy){ + if(!destroy) cprintf(MAGENTA,"Going to create data threads\n"); + else cprintf(MAGENTA,"Going to destroy data threads\n"); + int numReadouts = thisMultiDetector->numberOfDetectors; if(getDetectorsType() == EIGER) numReadouts *= 2; + //reset masks killAllReceivingDataThreads = false; @@ -5010,8 +5014,8 @@ int multiSlsDetector::createReceivingDataThreads(bool destroy){ #endif //reset current index currentThreadIndex = -1; - - for(int i = 0; i < numReadouts; ++i){ +cout<<"numreadouts:"<startReceivingDataThread(); + //((multiSlsDetector*)this_pointer)->startReceivingDataThread(); + while(true); + return this_pointer; } @@ -5042,7 +5048,7 @@ void* multiSlsDetector::startReceivingDataThread(void* this_pointer){ void multiSlsDetector::startReceivingDataThread(){ int ithread = currentThreadIndex; //set current thread value index - //cout << ithread << " thread created" << endl; + cprintf(BLUE,"thread created %d\n",ithread); //number of readouts int numReadoutPerDetector = 1; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index 40f8029c1..5229ce89f 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -481,7 +481,7 @@ void* postProcessing::processData(int delflag) { } } //receiver - else{ + else{cprintf(RED,"In post processing threads\n"); if(dataReady){ @@ -517,7 +517,7 @@ void* postProcessing::processData(int delflag) { //cout<<"exiting from proccessing thread"<