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

should not update filename, dir or index when receiver cannot update

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@277 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-02 15:38:09 +00:00
parent d5a092c2e8
commit 7e374abc27
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1308,9 +1308,11 @@ string slsDetectorCommand::cmdOutDir(int narg, char *args[], int action){
receiver = true; receiver = true;
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
myDet->setFilePath(string(args[1])); if(receiver){
if(receiver) if(myDet->setReceiverFileDir(string(args[1]))==string(args[1]))
myDet->setReceiverFileDir(string(args[1])); myDet->setFilePath(string(args[1]));
}else
myDet->setFilePath(string(args[1]));
} }
if(receiver) if(receiver)
@ -1345,9 +1347,11 @@ string slsDetectorCommand::cmdFileName(int narg, char *args[], int action){
receiver = true; receiver = true;
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
myDet->setFileName(string(args[1])); if(receiver){
if(receiver) if(myDet->setReceiverFileName(string(args[1]))==string(args[1]))
myDet->setReceiverFileName(string(args[1])); myDet->setFileName(string(args[1]));
}else
myDet->setFileName(string(args[1]));
} }
if(receiver) if(receiver)
@ -1415,9 +1419,11 @@ string slsDetectorCommand::cmdFileIndex(int narg, char *args[], int action){
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if (sscanf(args[1],"%d",&i)){ if (sscanf(args[1],"%d",&i)){
myDet->setFileIndex(i); if(receiver){
if(receiver) if(myDet->setReceiverFileIndex(i)==i)
myDet->setReceiverFileIndex(i); myDet->setFileIndex(i);
}else
myDet->setFileIndex(i);
} }
} }