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

removed setframeindexenable from going to the receiver, it can figure it out on its own now

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-22 11:55:35 +02:00
parent c2f6e5b20c
commit ab27437604
4 changed files with 0 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -6011,44 +6011,6 @@ int multiSlsDetector::overwriteFile(int enable){
} }
int multiSlsDetector::setFrameIndex(int index){
int ret=-100;
int posmax = thisMultiDetector->numberOfDetectors;
fileIO::setFrameIndex(index);
if(!threadpool){
cout << "Error in creating threadpool. Exiting" << endl;
return -1;
}else{
//return storage values
int* iret[thisMultiDetector->numberOfDetectors];
for(int idet=0; idet<posmax; ++idet){
if(detectors[idet]){
iret[idet]= new int(-1);
Task* task = new Task(new func1_t<int,int>(&slsDetector::setFrameIndex,
detectors[idet],index,iret[idet]));
threadpool->add_task(task);
}
}
threadpool->startExecuting();
threadpool->wait_for_tasks_to_complete();
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if(detectors[idet]){
if(iret[idet] != NULL){
if (ret==-100)
ret=*iret[idet];
else if (ret!=*iret[idet])
ret=-1;
delete iret[idet];
}else ret=-1;
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
}
}
}
return ret;
}
string multiSlsDetector::getErrorMessage(int &critical){ string multiSlsDetector::getErrorMessage(int &critical){

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1294,15 +1294,6 @@ class multiSlsDetector : public slsDetectorUtils {
*/ */
int overwriteFile(int enable=-1); int overwriteFile(int enable=-1);
/**
* set frame index to 0 or -1
* @param index is the frame index
*/
int setFrameIndex(int index=-1);
int fillModuleMask(int *mM); int fillModuleMask(int *mM);
/**checks error mask and returns error message if it exists /**checks error mask and returns error message if it exists

40
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6091,12 +6091,6 @@ string slsDetector::setReceiver(string receiverIP){
imask = parentDet->enableOverwriteMask(); imask = parentDet->enableOverwriteMask();
pthread_mutex_unlock(&ms); pthread_mutex_unlock(&ms);
overwriteFile(imask); overwriteFile(imask);
if ((thisDetector->timerValue[FRAME_NUMBER]*thisDetector->timerValue[CYCLES_NUMBER])>1)
setFrameIndex(0);
else
setFrameIndex(-1);
setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]); setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]);
setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]); setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]);
setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]); setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]);
@ -8444,40 +8438,6 @@ int slsDetector::overwriteFile(int enable){
int slsDetector::setFrameIndex(int index){
int fnum=F_SET_RECEIVER_FRAME_INDEX;
int ret = FAIL;
int retval=-1;
int arg = index;
if(thisDetector->receiverOnlineFlag==OFFLINE_FLAG){
pthread_mutex_lock(&ms);
fileIO::setFrameIndex(index);
pthread_mutex_unlock(&ms);
}
else if(thisDetector->receiverOnlineFlag==ONLINE_FLAG){
#ifdef VERBOSE
std::cout << "Sending frame index to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->sendInt(fnum,retval,arg);
disconnectData();
}
if(ret!=FAIL){
pthread_mutex_lock(&ms);
fileIO::setFrameIndex(retval);
pthread_mutex_unlock(&ms);
}
if(ret==FORCE_UPDATE)
updateReceiver();
}
pthread_mutex_lock(&ms);
retval = fileIO::getFrameIndex();
pthread_mutex_unlock(&ms);
return retval;
}
int slsDetector::calibratePedestal(int frames){ int slsDetector::calibratePedestal(int frames){

7
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1698,13 +1698,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int overwriteFile(int enable=-1); int overwriteFile(int enable=-1);
/**
* set frame index to 0 or -1
* @param index is the frame index
*/
int setFrameIndex(int index=-1);
int fillModuleMask(int *mM); int fillModuleMask(int *mM);