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

looks done

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-06 13:49:40 +02:00
parent de2de6315c
commit c5e7d44b15
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5014,13 +5014,12 @@ int multiSlsDetector::createReceivingDataThreads(bool destroy){
#endif #endif
//reset current index //reset current index
currentThreadIndex = -1; currentThreadIndex = -1;
cout<<"numreadouts:"<<numReadouts<<endl; for(int i = 0; i < numReadouts; ++i){
for(int i = 0; i < 1;++i){//numReadouts; ++i){
sem_init(&sem_singlewait[i],1,0); sem_init(&sem_singlewait[i],1,0);
sem_init(&sem_singledone[i],1,0); sem_init(&sem_singledone[i],1,0);
threadStarted = false; threadStarted = false;
currentThreadIndex = i; currentThreadIndex = i;
if(pthread_create(&receivingDataThreads[i], NULL,startReceivingDataThread, (void*) this)){ if(pthread_create(&receivingDataThreads[i], NULL,staticstartReceivingDataThread, (void*) this)){
cprintf(RED, "Could not create receiving data thread with index %d\n",i); cprintf(RED, "Could not create receiving data thread with index %d\n",i);
return FAIL; return FAIL;
} }
@ -5037,9 +5036,9 @@ cout<<"numreadouts:"<<numReadouts<<endl;
void* multiSlsDetector::startReceivingDataThread(void* this_pointer){ void* multiSlsDetector::staticstartReceivingDataThread(void* this_pointer){
//((multiSlsDetector*)this_pointer)->startReceivingDataThread(); ((multiSlsDetector*)this_pointer)->startReceivingDataThread();
while(true); //while(true);
return this_pointer; return this_pointer;
} }
@ -5048,25 +5047,11 @@ void* multiSlsDetector::startReceivingDataThread(void* this_pointer){
void multiSlsDetector::startReceivingDataThread(){ void multiSlsDetector::startReceivingDataThread(){
int ithread = currentThreadIndex; //set current thread value index int ithread = currentThreadIndex; //set current thread value index
cprintf(BLUE,"thread created %d\n",ithread);
//number of readouts
int numReadoutPerDetector = 1;
bool jungfrau = false;
if(getDetectorsType() == EIGER){
numReadoutPerDetector = 2;
}else if(getDetectorsType() == JUNGFRAU)
jungfrau = true;
//server details //server details
char hostname[100]; char hostname[100] = "tcp://127.0.0.1:";
int portno; int portno = DEFAULT_ZMQ_PORTNO + ithread;
int singleDatabytes = detectors[ithread/numReadoutPerDetector]->getDataBytes(); sprintf(hostname,"%s%d",hostname,portno);
int nel=(singleDatabytes/numReadoutPerDetector)/sizeof(int);
portno = DEFAULT_ZMQ_PORTNO + (ithread);
sprintf(hostname, "%s%d", "tcp://127.0.0.1:",portno);
cout << "ZMQ Client of " << ithread << " at " << hostname << endl;
//socket details //socket details
zmq_msg_t message; zmq_msg_t message;
@ -5075,12 +5060,24 @@ void multiSlsDetector::startReceivingDataThread(){
context = zmq_ctx_new(); context = zmq_ctx_new();
zmqsocket = zmq_socket(context, ZMQ_PULL); zmqsocket = zmq_socket(context, ZMQ_PULL);
zmq_connect(zmqsocket, hostname); zmq_connect(zmqsocket, hostname);
threadStarted = true; //let calling function know thread started and obtained current cout << "ZMQ Client of " << ithread << " at " << hostname << endl;
cprintf(BLUE,"%d Created socket\n",ithread);
//initializations //initializations
int numReadoutPerDetector = 1;
bool jungfrau = false;
if(getDetectorsType() == EIGER){
numReadoutPerDetector = 2;
}else if(getDetectorsType() == JUNGFRAU)
jungfrau = true;
int singleDatabytes = detectors[ithread/numReadoutPerDetector]->getDataBytes();
int nel=(singleDatabytes/numReadoutPerDetector)/sizeof(int);
singleframe[ithread]=new int[nel]; singleframe[ithread]=new int[nel];
int len,idet = 0; int len,idet = 0;
threadStarted = true; //let calling function know thread started and obtained current
//infinite loop, exited only (if gui restarted/ enabledatastreaming called) //infinite loop, exited only (if gui restarted/ enabledatastreaming called)
while(true){ while(true){
@ -5151,33 +5148,33 @@ void multiSlsDetector::startReceivingDataThread(){
//#endif //#endif
zmq_msg_close(&message); zmq_msg_close(&message);
singleframe[ithread] = NULL; singleframe[ithread] = NULL;
sem_post(&sem_singledone[ithread]); //let multi know is ready //break;
break;
} }
//actual data if(singleframe[ithread]!= NULL){
//cout << ithread << "data " << endl; //actual data
memcpy((char*)(singleframe[ithread]),(char*)zmq_msg_data(&message),singleDatabytes/numReadoutPerDetector); //cout << ithread << "data " << endl;
memcpy((char*)(singleframe[ithread]),(char*)zmq_msg_data(&message),singleDatabytes/numReadoutPerDetector);
//jungfrau masking adcval //jungfrau masking adcval
if(jungfrau){ if(jungfrau){
for(unsigned int i=0;i<nel;i++){ for(unsigned int i=0;i<nel;i++){
singleframe[ithread][i] = (singleframe[ithread][i] & 0x3FFF3FFF); singleframe[ithread][i] = (singleframe[ithread][i] & 0x3FFF3FFF);
}
} }
} }
sem_post(&sem_singledone[ithread]);//let multi know is ready sem_post(&sem_singledone[ithread]);//let multi know is ready
zmq_msg_close(&message); // close the message zmq_msg_close(&message); // close the message
} }
cprintf(RED,"%d Closing socket\n",ithread);
//close socket //close socket
zmq_disconnect(zmqsocket, hostname); zmq_disconnect(zmqsocket, hostname);
zmq_close(zmqsocket); zmq_close(zmqsocket);
zmq_ctx_destroy(context); zmq_ctx_destroy(context);
#ifdef DEBUG #ifdef DEBUG
cprintf(MAGENTA,"Receiving Data Thread %d:Goodbye!\n",ithread); cprintf(MAGENTA,"Receiving Data Thread %d:Goodbye!\n",ithread);
#endif #endif
} }

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1377,7 +1377,7 @@ private:
* Static function - Starts Data Thread of this object * Static function - Starts Data Thread of this object
* @param this_pointer pointer to this object * @param this_pointer pointer to this object
*/ */
static void* startReceivingDataThread(void *this_pointer); static void* staticstartReceivingDataThread(void *this_pointer);
/** /**
* Thread that receives data packets from receiver * Thread that receives data packets from receiver