diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index bba768899..8e027bb2e 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -922,8 +922,7 @@ class Detector(CppDetectorApi): Also restarts client zmq streaming if enabled. \n Default connects to receiver zmq streaming out port (30001). \n Must be different for every detector (and udp port). \n - Multi command will automatically increment for individual modules, use setClientZmqPort. \n - + Multi command will automatically increment for individual modules, use setClientZmqPort. Example -------- >>> d.zmqport @@ -1504,14 +1503,13 @@ class Detector(CppDetectorApi): @property def virtual(self): """ - Setup with n virtual servers running on localhost - starting with port p - + Setup with n virtual servers running on localhost starting with control port p + Note + ---- + Every virtual server will have a stop port (control port + 1) Example --------- - >>> d.virtual = n, p - """ raise NotImplementedError('Virtual is set only') @@ -2223,12 +2221,9 @@ class Detector(CppDetectorApi): def vetoref(self): """ [Gotthard2] Set veto reference for all 128 channels for all chips. - Example ---------- - >>> d.vetoref = chip, value - """ raise NotImplementedError('vetoref is set only') diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index f84fab015..93e7d4ed7 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -61,7 +61,8 @@ class Detector { /**Frees shared memory, adds detectors to the list. */ void setHostname(const std::vector &hostname); - /** connects to n servers at local host starting at specific control port */ + /** connects to n servers at local host starting at specific control port. + * Every virtual server will have a stop port (control port + 1) */ void setVirtualDetectorServers(int numServers, int startingPort); /** Gets shared memory ID */ @@ -1157,7 +1158,7 @@ class Detector { const int energy, const std::string &fname, Positions pos = {}); - /** [Gotthard2] */ + /** [Gotthard2] for all chips */ void setVetoReference(const int gainIndex, const int value, Positions pos = {}); diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 1a4db9526..e59c05756 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -161,7 +161,8 @@ std::string CmdProxy::VirtualServer(int action) { 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." + "server at local host starting at specific control port. Every " + "virtual server will have a stop port (control port + 1)" << '\n'; } else if (action == defs::GET_ACTION) { throw sls::RuntimeError("cannot get");