mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-13 13:27:14 +02:00
Merge branch 'developer' into jungfrauv0.8
This commit is contained in:
@ -2123,7 +2123,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
|
||||
|
||||
//-----------------------------------------------------------
|
||||
|
||||
std::string slsDetectorCommand::executeLine(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::executeLine(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == READOUT_ACTION)
|
||||
return cmdAcquire(narg, args, action, detPos);
|
||||
@ -2154,14 +2154,14 @@ std::string slsDetectorCommand::executeLine(int narg, char *args[], int action,
|
||||
return cmdUnknown(narg, args, action, detPos);
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdUnknown(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdUnknown(int narg, const char * const args[], int action, int detPos) {
|
||||
return std::string("Unknown command ") + std::string(args[0]) + std::string("\n") + helpLine(0, args, action, detPos);
|
||||
}
|
||||
std::string slsDetectorCommand::cmdUnderDevelopment(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdUnderDevelopment(int narg, const char * const args[], int action, int detPos) {
|
||||
return std::string("Must still develop ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::helpLine(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::helpLine(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
@ -2180,7 +2180,7 @@ std::string slsDetectorCommand::helpLine(int narg, char *args[], int action, int
|
||||
return executeLine(narg, args, HELP_ACTION, detPos);
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdAcquire(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -2225,7 +2225,7 @@ std::string slsDetectorCommand::helpAcquire(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdData(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdData(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
@ -2257,7 +2257,7 @@ std::string slsDetectorCommand::helpData(int action) {
|
||||
return std::string("data \t gets all data from the detector (if any) processes them and writes them to file according to the preferences already setup\n");
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdStatus(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdStatus(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
@ -2310,7 +2310,7 @@ std::string slsDetectorCommand::helpStatus(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdDataStream(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdDataStream(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
@ -2344,7 +2344,7 @@ std::string slsDetectorCommand::helpDataStream(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdFree(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdFree(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
@ -2360,7 +2360,7 @@ std::string slsDetectorCommand::helpFree(int action) {
|
||||
return std::string("free \t frees the shared memory\n");
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdHostname(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdHostname(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -2422,7 +2422,7 @@ std::string slsDetectorCommand::helpHostname(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdUser(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdUser(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -2452,7 +2452,7 @@ std::string slsDetectorCommand::helpUser(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdHelp(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdHelp(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -2465,7 +2465,7 @@ std::string slsDetectorCommand::cmdHelp(int narg, char *args[], int action, int
|
||||
return helpLine(0, args, action, detPos);
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdExitServer(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdExitServer(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -2513,7 +2513,7 @@ std::string slsDetectorCommand::helpExitServer(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdSettingsDir(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdSettingsDir(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -2541,7 +2541,7 @@ std::string slsDetectorCommand::helpSettingsDir(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdTrimEn(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdTrimEn(int narg, const char * const args[], int action, int detPos) {
|
||||
std::vector<int> energies;
|
||||
if (action == HELP_ACTION)
|
||||
return helpTrimEn(action);
|
||||
@ -2572,7 +2572,7 @@ std::string slsDetectorCommand::helpTrimEn(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdOutDir(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdOutDir(int narg, const char * const args[], int action, int detPos) {
|
||||
myDet->setReceiverOnline(ONLINE_FLAG, detPos);
|
||||
if (action == HELP_ACTION)
|
||||
return helpOutDir(action);
|
||||
@ -2592,7 +2592,7 @@ std::string slsDetectorCommand::helpOutDir(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdFileName(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdFileName(int narg, const char * const args[], int action, int detPos) {
|
||||
myDet->setReceiverOnline(ONLINE_FLAG, detPos);
|
||||
if (action == HELP_ACTION)
|
||||
return helpFileName(action);
|
||||
@ -2628,7 +2628,7 @@ std::string slsDetectorCommand::helpFileName(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdEnablefwrite(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdEnablefwrite(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
int i;
|
||||
char ans[100];
|
||||
@ -2674,7 +2674,7 @@ std::string slsDetectorCommand::helpEnablefwrite(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdOverwrite(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdOverwrite(int narg, const char * const args[], int action, int detPos) {
|
||||
int i;
|
||||
char ans[100];
|
||||
myDet->setReceiverOnline(ONLINE_FLAG, detPos);
|
||||
@ -2700,7 +2700,7 @@ std::string slsDetectorCommand::helpOverwrite(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdFileIndex(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdFileIndex(int narg, const char * const args[], int action, int detPos) {
|
||||
myDet->setReceiverOnline(ONLINE_FLAG, detPos);
|
||||
if (action == HELP_ACTION) {
|
||||
return helpFileName(action);
|
||||
@ -2720,7 +2720,7 @@ std::string slsDetectorCommand::helpFileIndex(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdRateCorr(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdRateCorr(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION) {
|
||||
return helpRateCorr(action);
|
||||
@ -2747,7 +2747,7 @@ std::string slsDetectorCommand::helpRateCorr(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
// std::string slsDetectorCommand::cmdThreaded(int narg, char *args[], int action, int detPos){
|
||||
// std::string slsDetectorCommand::cmdThreaded(int narg, const char * const args[], int action, int detPos){
|
||||
// int ival;
|
||||
// char answer[1000];
|
||||
|
||||
@ -2773,7 +2773,7 @@ std::string slsDetectorCommand::helpThreaded(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdImage(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdImage(int narg, const char * const args[], int action, int detPos) {
|
||||
std::string sval;
|
||||
int retval = FAIL;
|
||||
if (action == HELP_ACTION)
|
||||
@ -2808,7 +2808,7 @@ std::string slsDetectorCommand::helpImage(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdCounter(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdCounter(int narg, const char * const args[], int action, int detPos) {
|
||||
int ival;
|
||||
char answer[100];
|
||||
std::string sval;
|
||||
@ -2869,7 +2869,7 @@ std::string slsDetectorCommand::helpCounter(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdNetworkParameter(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
char ans[100] = {0};
|
||||
int i;
|
||||
@ -3120,7 +3120,7 @@ std::string slsDetectorCommand::helpNetworkParameter(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdPort(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdPort(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpPort(action);
|
||||
@ -3168,7 +3168,7 @@ std::string slsDetectorCommand::helpPort(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdLock(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdLock(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpLock(action);
|
||||
@ -3219,7 +3219,7 @@ std::string slsDetectorCommand::helpLock(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdLastClient(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdLastClient(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpLastClient(action);
|
||||
@ -3250,7 +3250,7 @@ std::string slsDetectorCommand::helpLastClient(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdOnline(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdOnline(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION) {
|
||||
return helpOnline(action);
|
||||
@ -3334,7 +3334,7 @@ std::string slsDetectorCommand::helpOnline(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdConfigureMac(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdConfigureMac(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION) {
|
||||
return helpConfigureMac(action);
|
||||
@ -3365,7 +3365,7 @@ std::string slsDetectorCommand::helpConfigureMac(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdDetectorSize(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpDetectorSize(action);
|
||||
@ -3482,7 +3482,7 @@ std::string slsDetectorCommand::helpDetectorSize(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdSettings(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdSettings(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpSettings(action);
|
||||
@ -3600,7 +3600,7 @@ std::string slsDetectorCommand::helpSettings(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdSN(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdSN(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
char answer[1000];
|
||||
|
||||
@ -3693,7 +3693,7 @@ std::string slsDetectorCommand::helpSN(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdDigiTest(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdDigiTest(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
char answer[1000];
|
||||
|
||||
@ -3744,7 +3744,7 @@ std::string slsDetectorCommand::helpDigiTest(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdRegister(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdRegister(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpRegister(action);
|
||||
@ -3862,7 +3862,7 @@ std::string slsDetectorCommand::helpRegister(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdDAC(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdDAC(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpDAC(action);
|
||||
@ -4208,7 +4208,7 @@ std::string slsDetectorCommand::helpDAC(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdADC(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdADC(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
dacIndex adc;
|
||||
int idac;
|
||||
@ -4335,7 +4335,7 @@ std::string slsDetectorCommand::helpADC(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdTempControl(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdTempControl(int narg, const char * const args[], int action, int detPos) {
|
||||
char answer[1000] = "";
|
||||
int val = -1;
|
||||
|
||||
@ -4402,7 +4402,7 @@ std::string slsDetectorCommand::helpTempControl(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdTiming(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdTiming(int narg, const char * const args[], int action, int detPos) {
|
||||
#ifdef VERBOSE
|
||||
std::cout << std::string("Executing command ") + std::string(args[0]) + std::string(" ( ") + cmd + std::string(" )\n");
|
||||
#endif
|
||||
@ -4428,7 +4428,7 @@ std::string slsDetectorCommand::helpTiming(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdTimer(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdTimer(int narg, const char * const args[], int action, int detPos) {
|
||||
timerIndex index;
|
||||
int64_t t = -1, ret;
|
||||
double val, rval;
|
||||
@ -4558,7 +4558,7 @@ std::string slsDetectorCommand::helpTimer(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdTimeLeft(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdTimeLeft(int narg, const char * const args[], int action, int detPos) {
|
||||
timerIndex index;
|
||||
int64_t ret;
|
||||
double rval;
|
||||
@ -4626,7 +4626,7 @@ std::string slsDetectorCommand::helpTimeLeft(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdSpeed(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdSpeed(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
speedVariable index;
|
||||
int t = -1, ret = 0, mode = 0;
|
||||
@ -4723,7 +4723,7 @@ std::string slsDetectorCommand::helpSpeed(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdAdvanced(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdAdvanced(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
|
||||
char answer[1000] = "";
|
||||
@ -4961,7 +4961,7 @@ std::string slsDetectorCommand::helpAdvanced(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdConfiguration(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdConfiguration(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpConfiguration(action);
|
||||
@ -5031,7 +5031,7 @@ std::string slsDetectorCommand::helpConfiguration(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdReceiver(int narg, const char * const args[], int action, int detPos) {
|
||||
char answer[100];
|
||||
int ival = -1;
|
||||
|
||||
@ -5279,7 +5279,7 @@ std::string slsDetectorCommand::helpPattern(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdPattern(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdPattern(int narg, const char * const args[], int action, int detPos) {
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
return helpPattern(action);
|
||||
@ -5749,7 +5749,7 @@ std::string slsDetectorCommand::helpPulse(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdPulse(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdPulse(int narg, const char * const args[], int action, int detPos) {
|
||||
int retval = FAIL;
|
||||
|
||||
if (action == HELP_ACTION)
|
||||
@ -5811,7 +5811,7 @@ std::string slsDetectorCommand::helpProcessor(int action) {
|
||||
return os.str();
|
||||
}
|
||||
|
||||
std::string slsDetectorCommand::cmdProcessor(int narg, char *args[], int action, int detPos) {
|
||||
std::string slsDetectorCommand::cmdProcessor(int narg, const char * const args[], int action, int detPos) {
|
||||
if (action == HELP_ACTION)
|
||||
return helpProcessor(action);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user