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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-10-28 16:48:13 +01:00
parent 8c279695de
commit 4155e301b8
7 changed files with 113 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -169,6 +169,28 @@ std::string CmdProxy::Hostname(int action) {
return os.str();
}
std::string CmdProxy::VirtualServer(int action) {
std::ostringstream os;
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
os << "[n_servers] [starting_port_number]\n\tConnecs to n virtual server at local host starting at specific control port." << '\n';
} else if (action == defs::GET_ACTION) {
throw sls::RuntimeError("cannot get");
} else if (action == defs::PUT_ACTION) {
if (args.size() != 2) {
WrongNumberOfParameters(2);
}
if (det_id != -1) {
throw sls::RuntimeError("Cannot execute this at module level");
}
det->setVirtualDetectorServers(std::stoi(args[0]), std::stoi(args[1]));
os << sls::ToString(args);
} else {
throw sls::RuntimeError("Unknown action");
}
return os.str();
}
std::string CmdProxy::FirmwareVersion(int action) {
std::ostringstream os;
os << cmd << ' ';
@ -482,6 +504,7 @@ std::string CmdProxy::ClockDivider(int action) {
}
/* dacs */
/* acquisition */
/* Network Configuration (Detector<->Receiver) */

76
slsDetectorSoftware/src/Detector.cpp
View File

@ -33,6 +33,10 @@ void Detector::setHostname(const std::vector<std::string> &value) {
pimpl->setHostname(value);
}
void Detector::setVirtualDetectorServers(int numServers, int startingPort) {
pimpl->setVirtualDetectorServers(numServers, startingPort);
}
int Detector::getShmId() const { return pimpl->getMultiId(); }
std::string Detector::getPackageVersion() const {
@ -201,6 +205,42 @@ void Detector::setADCPhaseInDegrees(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_PHASE, value, 1);
}
Result<int> Detector::getClockFrequency(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockFrequency, pos, clkIndex);
}
void Detector::setClockFrequency(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockFrequency, pos, clkIndex, value);
}
Result<int> Detector::getClockPhase(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockPhase, pos, clkIndex, false);
}
void Detector::setClockPhase(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockPhase, pos, clkIndex, value, false);
}
Result<int> Detector::getMaxClockPhaseShift(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getMaxClockPhaseShift, pos, clkIndex);
}
Result<int> Detector::getClockPhaseinDegrees(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockPhase, pos, clkIndex, true);
}
void Detector::setClockPhaseinDegrees(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockPhase, pos, clkIndex, value, true);
}
Result<int> Detector::getClockDivider(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockDivider, pos, clkIndex);
}
void Detector::setClockDivider(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockDivider, pos, clkIndex, value);
}
Result<int> Detector::getHighVoltage(Positions pos) const {
return pimpl->Parallel(&slsDetector::setDAC, pos, -1, defs::HIGH_VOLTAGE,
0);
@ -1576,42 +1616,6 @@ Result<uint64_t> Detector::getRxCurrentFrameIndex(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverCurrentFrameIndex, pos);
}
Result<int> Detector::getClockFrequency(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockFrequency, pos, clkIndex);
}
void Detector::setClockFrequency(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockFrequency, pos, clkIndex, value);
}
Result<int> Detector::getClockPhase(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockPhase, pos, clkIndex, false);
}
void Detector::setClockPhase(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockPhase, pos, clkIndex, value, false);
}
Result<int> Detector::getMaxClockPhaseShift(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getMaxClockPhaseShift, pos, clkIndex);
}
Result<int> Detector::getClockPhaseinDegrees(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockPhase, pos, clkIndex, true);
}
void Detector::setClockPhaseinDegrees(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockPhase, pos, clkIndex, value, true);
}
Result<int> Detector::getClockDivider(int clkIndex, Positions pos) {
return pimpl->Parallel(&slsDetector::getClockDivider, pos, clkIndex);
}
void Detector::setClockDivider(int clkIndex, int value, Positions pos) {
pimpl->Parallel(&slsDetector::setClockDivider, pos, clkIndex, value);
}
std::vector<int> Detector::getPortNumbers(int start_port) {
int num_sockets_per_detector = 1;
switch (getDetectorType({}).squash()) {

113
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -165,13 +165,6 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdFree;
++i;
/*! \page config
- <b>virtual [n] [p]</b> \c connects to n virtual detector servers at local host starting at port p \c Returns the list of the hostnames of the multi-detector structure. \c (string)
*/
descrToFuncMap[i].m_pFuncName = "virtual";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdHostname;
++i;
/*! \page config
\section configstatus Status
@ -284,20 +277,6 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
*/
/*! \page settings
- <b>trimbits [fname] </b> loads/stores the trimbits to/from the detector. If no extension is specified, the serial number of each module will be attached. \c Returns \c (string) fname
*/
descrToFuncMap[i].m_pFuncName = "trimbits";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdSettings;
++i;
/*! \page settings
- <b>trimval [i]</b> sets all trimbits to i. Used in EIGER only. \c Returns \c (int)
*/
descrToFuncMap[i].m_pFuncName = "trimval";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdSettings;
++i;
/* pots */
/*! \page settings
\section settingsdacs DACs
@ -790,13 +769,6 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdReceiver;
++i;
/*! \page receiver
- <b>frameindex [i]</b> gets the current frame index of receiver. Average of all for multi-detector command. Only get! \c Returns \c (int)
*/
descrToFuncMap[i].m_pFuncName = "frameindex";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdReceiver;
++i;
/* pattern generator */
@ -965,47 +937,6 @@ std::string slsDetectorCommand::helpFree(int action) {
return std::string("free \t frees the shared memory\n");
}
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
if (action == HELP_ACTION) {
return helpHostname(HELP_ACTION);
}
if (action == PUT_ACTION) {
if (detPos >= 0) {
return std::string("Wrong usage - setting hostname/virtual only from "
"multiDetector level");
}
if (cmd == "virtual") {
int port = -1;
int numDetectors = 0;
if (!sscanf(args[1], "%d", &numDetectors)) {
throw sls::RuntimeError("Cannot scan number of detector servers from virtual command\n");
}
if (!sscanf(args[2], "%d", &port)) {
throw sls::RuntimeError("Cannot scan port from virtual command\n");
}
myDet->setVirtualDetectorServers(numDetectors, port);
} else {
throw sls::RuntimeError("unknown command\n");
}
}
return myDet->getHostname(detPos);
}
std::string slsDetectorCommand::helpHostname(int action) {
std::ostringstream os;
if (action == PUT_ACTION || action == HELP_ACTION) {
os << std::string("virtual [n] [p]\t connects to n virtual detector servers at local host starting at port p \n");
}
return os.str();
}
std::string slsDetectorCommand::cmdHelp(int narg, const char * const args[], int action, int detPos) {
#ifdef VERBOSE
@ -1086,38 +1017,6 @@ std::string slsDetectorCommand::helpThreaded(int action) {
std::string slsDetectorCommand::cmdSettings(int narg, const char * const args[], int action, int detPos) {
if (action == HELP_ACTION)
return helpSettings(action);
int val = -1; //ret,
char ans[1000];
if (cmd == "trimval") {
if (action == PUT_ACTION) {
if (sscanf(args[1], "%d", &val))
myDet->setAllTrimbits(val, detPos);
else
return std::string("invalid trimbit value ") + cmd;
}
sprintf(ans, "%d", myDet->setAllTrimbits(-1, detPos));
return ans;
}
return std::string("unknown settings command ") + cmd;
}
std::string slsDetectorCommand::helpSettings(int action) {
std::ostringstream os;
if (action == PUT_ACTION || action == HELP_ACTION) {
os << "trimval i \n sets all the trimbits to i" << std::endl;
}
if (action == GET_ACTION || action == HELP_ACTION) {
os << "trimval \n returns the value all trimbits are set to. If they are different, returns -1." << std::endl;
}
return os.str();
}
std::string slsDetectorCommand::cmdSN(int narg, const char * const args[], int action, int detPos) {
@ -1576,14 +1475,6 @@ std::string slsDetectorCommand::cmdReceiver(int narg, const char * const args[],
}
}
else if (cmd == "frameindex") {
if (action == PUT_ACTION)
return std::string("cannot put");
else {
sprintf(answer, "%lu", myDet->getReceiverCurrentFrameIndex(detPos));
return std::string(answer);
}
}
return std::string("could not decode command");
@ -1595,10 +1486,6 @@ std::string slsDetectorCommand::helpReceiver(int action) {
if (action == PUT_ACTION || action == HELP_ACTION) {
os << "resetframescaught [any value] \t resets frames caught by receiver" << std::endl;
}
if (action == GET_ACTION || action == HELP_ACTION) {
os << "frameindex \t returns the current frame index of receiver(average for multi)" << std::endl;
}
return os.str();
}