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

frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-05 11:23:46 +00:00
parent ed4aaa83ce
commit 7a55ed9a74
14 changed files with 196 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4557,6 +4557,10 @@ char* slsDetector::setReceiver(string receiverIP){
setFilePath(fileIO::getFilePath());
setFileName(fileIO::getFileName());
setFileIndex(fileIO::getFileIndex());
if ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1)
setFrameIndex(0);
else
setFrameIndex(-1);
enableWriteToFile(parentDet->enableWriteToFileMask());
setUDPConnection();
}
@ -5837,17 +5841,15 @@ int slsDetector::getReceiverCurrentFrameIndex(){
int slsDetector::resetFramesCaught(int index){
int slsDetector::resetFramesCaught(){
int fnum=F_RESET_FRAMES_CAUGHT;
int ret = FAIL;
int retval=-1;
int arg=index;
if (setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) {
#ifdef VERBOSE
std::cout << "Reset Frames Caught by Receiver:" << arg << std::endl;
std::cout << "Reset Frames Caught by Receiver" << std::endl;
#endif
ret=thisReceiver->sendInt(fnum,retval,arg);
ret=thisReceiver->executeFunction(fnum);
if(ret==FORCE_UPDATE)
ret=updateReceiver();
}
@ -6058,3 +6060,34 @@ int slsDetector::enableWriteToFile(int enable){
return parentDet->enableWriteToFileMask();
}
int slsDetector::setFrameIndex(int index){
int fnum=F_SET_FRAME_INDEX;
int ret = FAIL;
int retval=-1;
int arg = index;
if(thisDetector->receiverOnlineFlag==OFFLINE_FLAG){
fileIO::setFrameIndex(index);
}
else if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
#ifdef VERBOSE
std::cout << "Sending frame index to receiver " << arg << std::endl;
#endif
ret=thisReceiver->sendInt(fnum,retval,arg);
if(ret!=FAIL)
fileIO::setFrameIndex(retval);
if(ret==FORCE_UPDATE)
updateReceiver();
}
return fileIO::getFrameIndex();
}

11
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1465,9 +1465,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/**
* resets framescaught
* @param index frames caught by receiver
* @param index if frame index is needed
*/
int resetFramesCaught(int index=-1);
int resetFramesCaught();
/**
* Reads a frame from receiver
@ -1513,6 +1512,14 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int enableWriteToFile(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);

9
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -3187,6 +3187,15 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) {
else rval=ret;
//set frame index
if (index==FRAME_NUMBER || index==CYCLES_NUMBER ){
if ((myDet->setTimer(FRAME_NUMBER,-1)*myDet->setTimer(CYCLES_NUMBER,-1))>1)
myDet->setFrameIndex(0);
else
myDet->setFrameIndex(-1);
}
sprintf(answer,"%0.9f",rval);
return string(answer);

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -121,10 +121,8 @@ void slsDetectorUtils::acquire(int delflag){
//resets frames caught in receiver
if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1)
resetFramesCaught(1);
else
resetFramesCaught(0);
resetFramesCaught();
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
@ -234,7 +232,8 @@ void slsDetectorUtils::acquire(int delflag){
}
setCurrentFrameIndex(0);
if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1) {
//if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1) {
if ((setTimer(FRAME_NUMBER,-1)*setTimer(CYCLES_NUMBER,-1))>1){
setFrameIndex(0);
} else {
setFrameIndex(-1);

3
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -625,9 +625,8 @@ virtual int getReceiverCurrentFrameIndex()=0;
/**
* resets framescaught
* @param index frames caught by receiver
* @param index if frame index is needed
*/
virtual int resetFramesCaught(int index=-1)=0;
virtual int resetFramesCaught()=0;
/**
* Reads a frame from receiver