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

change in ifdef eigerreciver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@763 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-11 09:33:14 +00:00
parent c74f4787cf
commit bba0f46b58
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -30,7 +30,7 @@ using namespace std;
slsReceiverFunctionList::slsReceiverFunctionList(detectorType det): slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
eigerRxr(NULL), eigerRxr(NULL),
#endif #endif
myDetectorType(det), myDetectorType(det),
@ -101,7 +101,7 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
packetIndexMask = MOENCH_PACKET_INDEX_MASK; packetIndexMask = MOENCH_PACKET_INDEX_MASK;
} }
else if(myDetectorType == EIGER){ else if(myDetectorType == EIGER){
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
eigerRxr = new eigerReceiver(); eigerRxr = new eigerReceiver();
#endif #endif
} }
@ -219,7 +219,7 @@ uint32_t slsReceiverFunctionList::getAcquisitionIndex(){
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
int32_t slsReceiverFunctionList::setNumberOfFrames(int32_t fnum){ int32_t slsReceiverFunctionList::setNumberOfFrames(int32_t fnum){
if(fnum >= 0) if(fnum >= 0)
@ -244,13 +244,13 @@ int32_t slsReceiverFunctionList::setDynamicRange(int32_t dr){
char* slsReceiverFunctionList::setFileName(char c[]){ char* slsReceiverFunctionList::setFileName(char c[]){
if(strlen(c)){ if(strlen(c)){
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
eigerRxr->setFileName(c); eigerRxr->setFileName(c);
#else #else
strcpy(fileName,c); strcpy(fileName,c);
#endif #endif
} }
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
return eigerRxr->getFileName(); return eigerRxr->getFileName();
#else #else
return getFileName(); return getFileName();
@ -264,7 +264,7 @@ char* slsReceiverFunctionList::setFilePath(char c[]){
//check if filepath exists //check if filepath exists
struct stat st; struct stat st;
if(stat(c,&st) == 0){ if(stat(c,&st) == 0){
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
eigerRxr->setFileName(c); eigerRxr->setFileName(c);
#else #else
strcpy(filePath,c); strcpy(filePath,c);
@ -274,7 +274,7 @@ char* slsReceiverFunctionList::setFilePath(char c[]){
cout<<"FilePath does not exist:"<<filePath<<endl; cout<<"FilePath does not exist:"<<filePath<<endl;
} }
} }
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
return eigerRxr->getFilePath(); return eigerRxr->getFilePath();
#else #else
return getFilePath(); return getFilePath();
@ -293,13 +293,13 @@ int slsReceiverFunctionList::setFileIndex(int i){
int slsReceiverFunctionList::setEnableFileWrite(int i){ int slsReceiverFunctionList::setEnableFileWrite(int i){
if(i!=-1){ if(i!=-1){
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
eigerRxr->setEnableFileWrite(i); eigerRxr->setEnableFileWrite(i);
#else #else
enableFileWrite=i; enableFileWrite=i;
#endif #endif
} }
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
return eigerRxr->getEnableFileWrite(); return eigerRxr->getEnableFileWrite();
#else #else
return enableFileWrite; return enableFileWrite;

4
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -57,7 +57,7 @@ public:
*/ */
void setEthernetInterface(char* c); void setEthernetInterface(char* c);
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
/** set frame number if a positive number /** set frame number if a positive number
*/ */
int32_t setNumberOfFrames(int32_t fnum); int32_t setNumberOfFrames(int32_t fnum);
@ -326,7 +326,7 @@ private:
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
eigerReceiver eigerRxr; eigerReceiver eigerRxr;
#endif #endif

4
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -1452,7 +1452,7 @@ cout<<"index[0]"<<index[0]<<" index[1]:"<<index[1]<<endl;
else{ else{
if(index[0] == slsDetectorDefs::FRAME_PERIOD) if(index[0] == slsDetectorDefs::FRAME_PERIOD)
retval=slsReceiverList->setAcquisitionPeriod(index[1]); retval=slsReceiverList->setAcquisitionPeriod(index[1]);
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
else else
retval=slsReceiverList->setNumberOfFrames(index[1]); retval=slsReceiverList->setNumberOfFrames(index[1]);
#endif #endif
@ -1462,7 +1462,7 @@ cout<<"index[0]"<<index[0]<<" index[1]:"<<index[1]<<endl;
if(ret!=FAIL){ if(ret!=FAIL){
if(index[0] == slsDetectorDefs::FRAME_PERIOD) if(index[0] == slsDetectorDefs::FRAME_PERIOD)
cout << "acquisition period:" << retval << endl; cout << "acquisition period:" << retval << endl;
#ifdef EIGER_RECEIVER #ifdef EIGER_RECEIVER_H
cout << "frame number:" << retval << endl; cout << "frame number:" << retval << endl;
#endif #endif
}else }else