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

help fixed

Browse Source
This commit is contained in:
maliakal_d 2021-10-19 09:59:49 +02:00
parent 318a5fd9d5
commit 9b521ade27
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/include/sls/Detector.h
View File

@ -1719,10 +1719,11 @@ class Detector {
* * * *
* ************************************************/ * ************************************************/
/** Advanced user Function! /** [Jungfrau][Gotthard][CTB][Moench][Mythen3][Gotthard2]
* [Jungfrau][CTB][Moench] fname is a pof file, rebooting the controller is * Advanced user Function!
* recommended \n [Mythen3][Gotthard2] fname is an rbf file, power cycling * Program firmware from command line, after which detector controller is
* the detector is recommended * rebooted. [Jungfrau][CTB][Moench] fname is a pof file (full path) \n
* [Mythen3][Gotthard2] fname is an rbf file (full path)
*/ */
void programFPGA(const std::string &fname, Positions pos = {}); void programFPGA(const std::string &fname, Positions pos = {});
@ -1732,7 +1733,8 @@ class Detector {
/** [Jungfrau][Eiger][Gotthard][CTB][Moench][Mythen3][Gotthard2] /** [Jungfrau][Eiger][Gotthard][CTB][Moench][Mythen3][Gotthard2]
* Advanced user Function! \n * Advanced user Function! \n
* Copy detector server fname from tftp folder of hostname to detector. Also * Copy detector server fname from tftp folder of hostname to detector. Also
* creates a symbolic link to a shorter name (without vx.x.x) \n * creates a symbolic link to a shorter name (without vx.x.x). Then the
* detector controller reboots (except eiger) \n
* [Jungfrau][Gotthard][CTB][Moench] Also changes respawn server (to the * [Jungfrau][Gotthard][CTB][Moench] Also changes respawn server (to the
* link), which is effective after a reboot. * link), which is effective after a reboot.
*/ */
@ -1745,11 +1747,11 @@ class Detector {
/** /**
* Advanced user Function!\n [Jungfrau][Gotthard][CTB][Moench] Updates the * Advanced user Function!\n [Jungfrau][Gotthard][CTB][Moench] Updates the
* firmware, detector server and then reboots detector controller blackfin. * firmware, detector server, make a soft link and then reboots detector
* \n [Mythen3][Gotthard2] Will still have old server starting up as the new * controller. \n [Mythen3][Gotthard2] Will require a script to start up the
* server is not respawned \n sname is name of detector server binary found * shorter namedf server link at start up \n sname is name of detector
* on tftp folder of host pc \n hostname is name of pc to tftp from \n fname * server binary found on tftp folder of host pc \n hostname is name of pc
* is programming file name * to tftp from \n fname is programming file name with full path to it
*/ */
void updateFirmwareAndServer(const std::string &sname, void updateFirmwareAndServer(const std::string &sname,
const std::string &hostname, const std::string &hostname,

34
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -2819,10 +2819,11 @@ std::string CmdProxy::ProgramFpga(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[fname.pof | fname.rbf]\n\t[Jungfrau][Ctb][Moench] Programs " os << "[fname.pof | fname.rbf (full path)]\n\t[Jungfrau][Ctb][Moench] "
"FPGA from pof file. Rebooting controller is recommended. " "Programs FPGA from pof file (full path). Then, detector "
"\n\t[Mythen3][Gotthard2] Programs FPGA from rbf file. Power " "controller is rebooted \n\t[Mythen3][Gotthard2] Programs FPGA "
"cycling the detector is recommended. " "from rbf file (full path). Then, detector controller is "
"rebooted."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
throw sls::RuntimeError("Cannot get"); throw sls::RuntimeError("Cannot get");
@ -2842,11 +2843,12 @@ std::string CmdProxy::CopyDetectorServer(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[server_name] " os << "[server_name (in tftp folder)] "
"[pc_host_name]\n\t[Jungfrau][Eiger][Ctb][Moench][Mythen3][" "[pc_host_name]\n\t[Jungfrau][Eiger][Ctb][Moench][Mythen3]["
"Gotthard2] Copies detector server via tftp from pc. Makes a " "Gotthard2] Copies detector server via tftp from pc. Ensure that "
"symbolic link witha shorter name (without " "server is in the pc's tftp folder. Makes a symbolic link with a "
"vx.x.x).\n\t[Jungfrau][Ctb][Moench]Also changes respawn server " "shorter name (without vx.x.x). Then, detector reboots (except "
"Eiger).\n\t[Jungfrau][Ctb][Moench]Also changes respawn server "
"to the link, which is effective after a reboot." "to the link, which is effective after a reboot."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
@ -2867,14 +2869,14 @@ std::string CmdProxy::UpdateFirmwareAndDetectorServer(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[server_name] [pc_host_name] " os << "[server_name (in tftp folder)] [pc_host_name] [fname.pof (incl "
"[fname.pof]\n\t[Jungfrau][Gotthard][CTB][Moench] Updates the " "full path)]\n\t[Jungfrau][Gotthard][CTB][Moench] Updates the "
"firmware, detector server and then reboots detector controller " "firmware, detector server, creates teh symbolic link and then "
"blackfin. \n\t[Mythen3][Gotthard2] Will still have old server " "reboots detector controller. \n\t[Mythen3][Gotthard2] will "
"starting up as the new server is not respawned \n\tsname is " "require a script to start up the shorter named server link at "
"name of detector server binary found on tftp folder of host pc " "start up. \n\tsname is name of detector server binary found on "
"\n\thostname is name of pc to tftp from \n\tfname is " "tftp folder of host pc \n\thostname is name of pc to tftp from "
"programming file name" "\n\tfname is programming file name"
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
throw sls::RuntimeError("Cannot get"); throw sls::RuntimeError("Cannot get");