detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 08:10:02 +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

20
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

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