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

incl eiger argument for reciver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@750 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-03-07 14:44:31 +00:00
parent 583281b903
commit 274f8ec5b2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -97,6 +97,7 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det):
frameIndexOffset = MOENCH_FRAME_INDEX_OFFSET; frameIndexOffset = MOENCH_FRAME_INDEX_OFFSET;
packetIndexMask = MOENCH_PACKET_INDEX_MASK; packetIndexMask = MOENCH_PACKET_INDEX_MASK;
} }
/*else if(myDetectorType == EIGER){???}*/
//variable initialization //variable initialization
onePacketSize = bufferSize/packetsPerFrame; onePacketSize = bufferSize/packetsPerFrame;

10
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -105,6 +105,8 @@ slsReceiverFuncs::slsReceiverFuncs(int argc, char *argv[], int &success):
slsReceiverFuncs::myDetectorType = GOTTHARD; slsReceiverFuncs::myDetectorType = GOTTHARD;
else if(!strcasecmp(sargname.c_str(),"moench")) else if(!strcasecmp(sargname.c_str(),"moench"))
slsReceiverFuncs::myDetectorType = MOENCH; slsReceiverFuncs::myDetectorType = MOENCH;
else if(!strcasecmp(sargname.c_str(),"eiger"))
slsReceiverFuncs::myDetectorType = EIGER;
else{ else{
cout << "could not decode detector type in config file.\nOptions are:\ngotthard\nmoench.\n\nExiting." << endl; cout << "could not decode detector type in config file.\nOptions are:\ngotthard\nmoench.\n\nExiting." << endl;
success=FAIL; success=FAIL;
@ -150,6 +152,9 @@ slsReceiverFuncs::slsReceiverFuncs(int argc, char *argv[], int &success):
}else if(!strcasecmp(argv[iarg+1],"moench")){ }else if(!strcasecmp(argv[iarg+1],"moench")){
slsReceiverFuncs::myDetectorType = MOENCH; slsReceiverFuncs::myDetectorType = MOENCH;
iarg++; iarg++;
}else if(!strcasecmp(argv[iarg+1],"eiger")){
slsReceiverFuncs::myDetectorType = EIGER;
iarg++;
}else{ }else{
cout << "could not decode detector type in command line. \nOptions are:\ngotthard\nmoench.\n\nExiting." << endl; cout << "could not decode detector type in command line. \nOptions are:\ngotthard\nmoench.\n\nExiting." << endl;
success=FAIL; success=FAIL;
@ -204,6 +209,9 @@ slsReceiverFuncs::slsReceiverFuncs(int argc, char *argv[], int &success):
case MOENCH: case MOENCH:
cout << "This is a MOENCH Receiver" << endl; cout << "This is a MOENCH Receiver" << endl;
break; break;
case EIGER:
cout << "This is a EIGER Receiver" << endl;
break;
default: default:
cout << "Unknown Receiver" << endl; cout << "Unknown Receiver" << endl;
success=FAIL; success=FAIL;
@ -213,7 +221,7 @@ slsReceiverFuncs::slsReceiverFuncs(int argc, char *argv[], int &success):
//help //help
else{ else{
cout << "Help Commands " << endl; cout << "Help Commands " << endl;
cout << "type:\t\t Type of receiver. Default: Gotthard. Options: Moench" << endl; cout << "type:\t\t Type of receiver. Default: Gotthard. Options: Gotthard, Moench, Eiger" << endl;
cout << "rx_tcpport:\t TCP Communication Port with the client. Default:1954. " << endl; cout << "rx_tcpport:\t TCP Communication Port with the client. Default:1954. " << endl;
cout << "compression:\t Data Compression. Saving only hits. Option:yes, no" << endl << endl;; cout << "compression:\t Data Compression. Saving only hits. Option:yes, no" << endl << endl;;
} }