detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-03 11:20:03 +02:00
Code Issues Actions Packages Releases Activity

receiver works without index

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@278 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-10-03 08:08:36 +00:00
parent 7e374abc27
commit 8fa7e97470
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3595,7 +3595,7 @@ string multiSlsDetector::setReceiverFileName(string fileName) {
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) { for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) { if (detectors[idet]) {
ret1=detectors[idet]->setReceiverFileName(fileName); ret1=detectors[idet]->setReceiverFileName(fileName);
if (ret1=="error") if (ret=="error")
ret=ret1; ret=ret1;
else if (ret!=ret1) else if (ret!=ret1)
ret=""; ret="";
@ -3611,7 +3611,7 @@ string multiSlsDetector::setReceiverFileDir(string fileDir) {
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) { for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) { if (detectors[idet]) {
ret1=detectors[idet]->setReceiverFileDir(fileDir); ret1=detectors[idet]->setReceiverFileDir(fileDir);
if (ret1=="error") if (ret=="error")
ret=ret1; ret=ret1;
else if (ret!=ret1) else if (ret!=ret1)
ret=""; ret="";
@ -3628,7 +3628,7 @@ int multiSlsDetector::setReceiverFileIndex(int fileIndex) {
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) { for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) { if (detectors[idet]) {
ret1=detectors[idet]->setReceiverFileIndex(fileIndex); ret1=detectors[idet]->setReceiverFileIndex(fileIndex);
if (ret1==-100) if (ret==-100)
ret=ret1; ret=ret1;
else if (ret!=ret1) else if (ret!=ret1)
ret=-1; ret=-1;

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5511,7 +5511,6 @@ string slsDetector::setReceiverFileDir(string fileDir) {
updateReceiver();*/ updateReceiver();*/
} }
} }
return string(retval); return string(retval);
} }
@ -5634,7 +5633,7 @@ slsDetectorDefs::runStatus slsDetector::getReceiverStatus(){
dataSocket->ReceiveDataOnly(mess,sizeof(mess)); dataSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Receiver returned error: " << mess << std::endl; std::cout<< "Receiver returned error: " << mess << std::endl;
}else }else
stopSocket->ReceiveDataOnly(&retval,sizeof(retval)); dataSocket->ReceiveDataOnly(&retval,sizeof(retval));
dataSocket->Disconnect(); dataSocket->Disconnect();
} }

18
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1303,8 +1303,7 @@ string slsDetectorCommand::cmdOutDir(int narg, char *args[], int action){
return helpOutDir(narg, args, action); return helpOutDir(narg, args, action);
} }
if(myDet->getNetworkParameter(RECEIVER_IP)!="none") if(myDet->setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG)
if(myDet->setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG)
receiver = true; receiver = true;
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
@ -1342,8 +1341,7 @@ string slsDetectorCommand::cmdFileName(int narg, char *args[], int action){
return helpFileName(narg, args, action); return helpFileName(narg, args, action);
} }
if(myDet->getNetworkParameter(RECEIVER_IP)!="none") if(myDet->setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG)
if(myDet->setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG)
receiver = true; receiver = true;
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
@ -1413,8 +1411,7 @@ string slsDetectorCommand::cmdFileIndex(int narg, char *args[], int action){
return helpFileName(narg, args, action); return helpFileName(narg, args, action);
} }
if(myDet->getNetworkParameter(RECEIVER_IP)!="none") if(myDet->setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG)
if(myDet->setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG)
receiver = true; receiver = true;
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
@ -2152,10 +2149,10 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
if(myDet->setReceiverOnline(ONLINE_FLAG)!=ONLINE_FLAG) if(myDet->setReceiverOnline(ONLINE_FLAG)!=ONLINE_FLAG)
return string("receiver not online"); return string("receiver not online");
//outdir //outdir
if(myDet->setReceiverFileDir(myDet->getFilePath())!=myDet->getFilePath()) if(myDet->setReceiverFileDir(myDet->getFilePath()).compare(myDet->getFilePath()))
return string("could not set up receiver file outdir"); return string("could not set up receiver file outdir");
//fname //fname
if(myDet->setReceiverFileName(myDet->getFileName())!=myDet->getFileName()) if(myDet->setReceiverFileName(myDet->getFileName()).compare(myDet->getFileName()))
return string("could not set up receiver file name"); return string("could not set up receiver file name");
//index //index
if(myDet->setReceiverFileIndex(myDet->getFileIndex())!=myDet->getFileIndex()) if(myDet->setReceiverFileIndex(myDet->getFileIndex())!=myDet->getFileIndex())
@ -3482,15 +3479,14 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
return string("receiver not online"); return string("receiver not online");
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if(!strcasecmp(args[1],"start")){
if(strcasecmp(args[1],"start")){
//update receiver index //update receiver index
if(myDet->setReceiverFileIndex(myDet->getFileIndex())==-1) if(myDet->setReceiverFileIndex(myDet->getFileIndex())==-1)
return string("could not set receiver file index"); return string("could not set receiver file index");
myDet->startReceiver(); myDet->startReceiver();
} }
else if(strcasecmp(args[1],"stop")){ else if(!strcasecmp(args[1],"stop")){
if(myDet->stopReceiver()!=FAIL){ if(myDet->stopReceiver()!=FAIL){
//update index //update index
int index = myDet->setReceiverFileIndex(); int index = myDet->setReceiverFileIndex();