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

calling eiger class functions, default filename run

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@794 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-03-18 16:28:13 +00:00
parent ec88d57127
commit ecab716f0a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -115,7 +115,10 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
strcpy(latestData,""); strcpy(latestData,"");
strcpy(savefilename,""); strcpy(savefilename,"");
strcpy(filePath,""); strcpy(filePath,"");
strcpy(fileName,"run"); strcpy(fileName,"run");
if(myDetectorType == EIGER)
receiver->setFileName(fileName);
cmSub = NULL; cmSub = NULL;
for(int i=0;i<numWriterThreads;i++){ for(int i=0;i<numWriterThreads;i++){
@ -241,6 +244,9 @@ void slsReceiverFunctionList::resetTotalFramesCaught(){
/*file parameters*/ /*file parameters*/
char* slsReceiverFunctionList::getFilePath(){ char* slsReceiverFunctionList::getFilePath(){
if(myDetectorType == EIGER)
return receiver->getFilePath();
else
return filePath; return filePath;
} }
@ -250,7 +256,7 @@ char* slsReceiverFunctionList::setFilePath(char c[]){
struct stat st; struct stat st;
if(stat(c,&st) == 0){ if(stat(c,&st) == 0){
if(myDetectorType == EIGER) if(myDetectorType == EIGER)
receiver->setFileName(c); receiver->setFilePath(c);
else else
strcpy(filePath,c); strcpy(filePath,c);
}else{ }else{
@ -258,9 +264,6 @@ char* slsReceiverFunctionList::setFilePath(char c[]){
cout<<"FilePath does not exist:"<<filePath<<endl; cout<<"FilePath does not exist:"<<filePath<<endl;
} }
} }
if(myDetectorType == EIGER)
return receiver->getFilePath();
else
return getFilePath(); return getFilePath();
} }
@ -280,9 +283,6 @@ char* slsReceiverFunctionList::setFileName(char c[]){
strcpy(fileName,c); strcpy(fileName,c);
} }
if(myDetectorType == EIGER)
return receiver->getFileName();
else
return getFileName(); return getFileName();
} }

2
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -1775,7 +1775,7 @@ int slsReceiverFuncs::send_update() {
//index //index
#ifdef SLS_RECEIVER_FUNCTION_LIST #ifdef SLS_RECEIVER_FUNCTION_LIST
if(myDetectorType != EIGER) /*if(myDetectorType != EIGER)*/
ind=slsReceiverList->getFileIndex(); ind=slsReceiverList->getFileIndex();
socket->SendDataOnly(&ind,sizeof(ind)); socket->SendDataOnly(&ind,sizeof(ind));