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

Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

Browse Source
This commit is contained in:
bergamaschi 2015-02-04 09:28:09 +01:00
commit 4f84bb19da
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -102,6 +102,9 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
} }
id--; id--;
for (int id=0; id<MAXDET; id++) {
detectors[id]=NULL;
}
if (thisMultiDetector->alreadyExisting==0) { if (thisMultiDetector->alreadyExisting==0) {
@ -250,8 +253,8 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
// setAngularConversionPointer(detectors[i]->getAngularConversionPointer(),detectors[i]->getNModsPointer(),detectors[i]->getNChans()*detectors[i]->getNChips(), i); // setAngularConversionPointer(detectors[i]->getAngularConversionPointer(),detectors[i]->getNModsPointer(),detectors[i]->getNChans()*detectors[i]->getNChips(), i);
} }
for (int i=thisMultiDetector->numberOfDetectors; i<MAXDET; i++) // for (int i=thisMultiDetector->numberOfDetectors; i<MAXDET; i++)
detectors[i]=NULL; // detectors[i]=NULL;
@ -363,7 +366,7 @@ void multiSlsDetector::updateOffsets(){
thisMultiDetector->maxNumberOfChannel[Y] = 0; thisMultiDetector->maxNumberOfChannel[Y] = 0;
//0th position //0th position
if (detectors[0]){ if ((detectors[0]) && (thisMultiDetector->numberOfDetectors > 0)){
offsetX = thisMultiDetector->offsetX[0] = 0; offsetX = thisMultiDetector->offsetX[0] = 0;
offsetY = thisMultiDetector->offsetY[0] = 0; offsetY = thisMultiDetector->offsetY[0] = 0;
numX = thisMultiDetector->numberOfChannel[X] = detectors[0]->getTotalNumberOfChannels(X); numX = thisMultiDetector->numberOfChannel[X] = detectors[0]->getTotalNumberOfChannels(X);
@ -774,7 +777,6 @@ int multiSlsDetector::removeSlsDetector(int pos) {
return thisMultiDetector->numberOfDetectors; return thisMultiDetector->numberOfDetectors;
//j=pos; //j=pos;
for (j=mi; j<ma; j++) { for (j=mi; j<ma; j++) {
if (detectors[j]) { if (detectors[j]) {
@ -784,9 +786,9 @@ int multiSlsDetector::removeSlsDetector(int pos) {
thisMultiDetector->maxNumberOfChannels-=detectors[j]->getMaxNumberOfChannels(); thisMultiDetector->maxNumberOfChannels-=detectors[j]->getMaxNumberOfChannels();
delete detectors[j]; delete detectors[j];
detectors[j]=0;
thisMultiDetector->numberOfDetectors--; thisMultiDetector->numberOfDetectors--;
if (single) { if (single) {
for (int i=j+1; i<thisMultiDetector->numberOfDetectors+1; i++) { for (int i=j+1; i<thisMultiDetector->numberOfDetectors+1; i++) {
@ -1521,8 +1523,7 @@ int multiSlsDetector::startAndReadAllNoWait(){
*/ */
slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() { slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() {
runStatus s,s1; runStatus s = IDLE,s1 = IDLE;
if (thisMultiDetector->masterPosition>=0) if (thisMultiDetector->masterPosition>=0)
if (detectors[thisMultiDetector->masterPosition]){ if (detectors[thisMultiDetector->masterPosition]){
s = detectors[thisMultiDetector->masterPosition]->getRunStatus(); s = detectors[thisMultiDetector->masterPosition]->getRunStatus();
@ -3943,11 +3944,11 @@ int multiSlsDetector::readConfigurationFile(string const fname){
//} //}
} }
#ifdef VERBOSE #ifdef VERBOSE
cout << endl; cout << endl;
for (int ia=0; ia<iargval; ia++) cout << args[ia] << " ??????? "; for (int ia=0; ia<iargval; ia++) cout << args[ia] << " ??????? ";
cout << endl; cout << endl;
#endif #endif
cmd=new multiSlsDetectorClient(iargval, args, PUT_ACTION, this); cmd=new multiSlsDetectorClient(iargval, args, PUT_ACTION, this);
delete cmd; delete cmd;
} }
@ -4418,7 +4419,7 @@ int multiSlsDetector::stopReceiver(){
slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){ slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){
int i=0; int i=0;
runStatus s,s1; runStatus s = IDLE,s1 = IDLE;
i=thisMultiDetector->masterPosition; i=thisMultiDetector->masterPosition;
if (thisMultiDetector->masterPosition>=0) { if (thisMultiDetector->masterPosition>=0) {
if (detectors[i]) { if (detectors[i]) {
@ -4435,18 +4436,20 @@ slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){
setErrorMask(getErrorMask()|(1<<i)); setErrorMask(getErrorMask()|(1<<i));
if(s == ERROR) if(s == ERROR)
s1 = ERROR; s1 = ERROR;
if(s1 != s) /*if(s1 != s)
s1 = ERROR; s1 = ERROR;*/
if(s != IDLE)
s1 = s;
} }
} }
/**stoppedFlag=1;*/ /**stoppedFlag=1;*/
return s; return s1;
} }
slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
runStatus s,s1; runStatus s = IDLE,s1 = IDLE;
if (thisMultiDetector->masterPosition>=0) if (thisMultiDetector->masterPosition>=0)
if (detectors[thisMultiDetector->masterPosition]){ if (detectors[thisMultiDetector->masterPosition]){

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3287,14 +3287,14 @@ slsDetectorDefs::runStatus slsDetector::getRunStatus(){
stopSocket->SendDataOnly(&fnum,sizeof(fnum)); stopSocket->SendDataOnly(&fnum,sizeof(fnum));
stopSocket->ReceiveDataOnly(&ret,sizeof(ret)); stopSocket->ReceiveDataOnly(&ret,sizeof(ret));
// cout << "________:::____________" << ret << endl; //cout << "________:::____________" << ret << endl;
if (ret==FAIL) { if (ret==FAIL) {
stopSocket->ReceiveDataOnly(mess,sizeof(mess)); stopSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl; std::cout<< "Detector returned error: " << mess << std::endl;
} else { } else {
stopSocket->ReceiveDataOnly(&retval,sizeof(retval)); stopSocket->ReceiveDataOnly(&retval,sizeof(retval));
// cout << "____________________" << retval << endl; //cout << "____________________" << retval << endl;
} }
stopSocket->Disconnect(); stopSocket->Disconnect();
} }

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1193,7 +1193,7 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
} else if (action==HELP_ACTION) { } else if (action==HELP_ACTION) {
return helpStatus(narg,args,HELP_ACTION); return helpStatus(narg,args,HELP_ACTION);
} }
runStatus s=myDet->getRunStatus(); runStatus s=myDet->getRunStatus();
return myDet->runStatusType(s); return myDet->runStatusType(s);
} }