mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 12:27:14 +02:00
Commandline (#66)
* WIP * WIP * removed status to string from defs * WIP * WIP * WIP removed unused functions in multi * WIP * print hex in a terrible way * WIP, loadconfig error * WIP, type to string * WIP * fix to conversion * WIP, hostname doesnt work * WIP * WIP * WIP * WIP, threshold * WIP, threshold * WIP * WIP, triggers * WIP, cycles to triggers * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * rx_udsocksize fx, WIP * WIP * WIP * WIP * file index (64 bit), WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * merge * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * New python mod
This commit is contained in:
Dhanya Thattil
File diff suppressed because it is too large
Load Diff
@ -52,14 +52,17 @@ class Detector {
|
||||
/** Gets shared memory ID */
|
||||
int getShmId() const;
|
||||
|
||||
/** package git branch */
|
||||
std::string getPackageVersion() const;
|
||||
|
||||
int64_t getClientVersion() const;
|
||||
|
||||
Result<int64_t> getFirmwareVersion(Positions pos = {}) const;
|
||||
|
||||
Result<int64_t> getDetectorServerVersion(Positions pos = {}) const;
|
||||
|
||||
Result<int64_t> getSerialNumber(Positions pos = {}) const;
|
||||
|
||||
int64_t getClientVersion() const;
|
||||
|
||||
Result<int64_t> getReceiverVersion(Positions pos = {}) const;
|
||||
|
||||
Result<defs::detectorType> getDetectorType(Positions pos = {}) const;
|
||||
@ -197,7 +200,7 @@ class Detector {
|
||||
|
||||
Result<int> getDAC(defs::dacIndex index, bool mV, Positions pos = {}) const;
|
||||
|
||||
void setDAC(int value, defs::dacIndex index, bool mV, Positions pos = {});
|
||||
void setDAC(defs::dacIndex index, int value, bool mV, Positions pos = {});
|
||||
|
||||
Result<defs::timingMode> getTimingMode(Positions pos = {}) const;
|
||||
|
||||
@ -213,33 +216,33 @@ class Detector {
|
||||
* *
|
||||
* ************************************************/
|
||||
/**
|
||||
* Blocking call, starts the receiver and detector.
|
||||
* Increments file index if file write enabled.
|
||||
* Acquired the number of frames set.
|
||||
* Blocking call: Acquire the number of frames set
|
||||
* - sets acquiring flag
|
||||
* - starts the receiver listener
|
||||
* - starts detector acquisition for number of frames set
|
||||
* - monitors detector status from running to idle
|
||||
* - stops the receiver listener
|
||||
* - increments file index if file write enabled
|
||||
* - resets acquiring flag
|
||||
*/
|
||||
void acquire();
|
||||
|
||||
/** Non blocking
|
||||
* Starts the reciever (if enabled) and then the detector
|
||||
* You have to check detector status until it is idle before you call
|
||||
* stopACquisition
|
||||
*
|
||||
*/
|
||||
void startAcquisition();
|
||||
|
||||
/**
|
||||
* Stops detector acquisition and then receiver (if enabled)
|
||||
* If no receiver enabled, you can skip this for normal acquisition (no
|
||||
* abort)
|
||||
*/
|
||||
void stopAcquisition();
|
||||
|
||||
/** TODO: initially was getting acq flag, if set, check if detctor idle, then set, else exception & abort
|
||||
* Clears the acquiring flag. This has to be done manually
|
||||
* after an acquisition was aborted.
|
||||
*/
|
||||
|
||||
/** If acquisition aborted, use this to clear before starting next acquisition */
|
||||
void clearAcquiringFlag();
|
||||
|
||||
/** Non Blocking: Start receiver listener*/
|
||||
void startReceiver();
|
||||
|
||||
/** Non Blocking: Stop receiver listener */
|
||||
void stopReceiver();
|
||||
|
||||
/** Non blocking: start detector acquisition
|
||||
* detector status changes from RUNNING to IDLE when finished */
|
||||
void startDetector();
|
||||
|
||||
/** Non blocking: abort detector acquisition */
|
||||
void stopDetector();
|
||||
|
||||
Result<defs::runStatus> getDetectorStatus(Positions pos = {}) const;
|
||||
|
||||
Result<defs::runStatus> getReceiverStatus(Positions pos = {}) const;
|
||||
@ -337,8 +340,6 @@ class Detector {
|
||||
|
||||
/** module_id is -1 for all detectors, ports for each module is calculated
|
||||
* (increments) */
|
||||
// TODO if Parallel takes a vector, can send multiple vaues to set in
|
||||
// slsdetector.cp
|
||||
void setDestinationUDPPort(int port, int module_id = -1);
|
||||
|
||||
/** [Eiger right port][Jungfrau bottom half] */
|
||||
@ -397,7 +398,7 @@ class Detector {
|
||||
|
||||
/**************************************************
|
||||
* *
|
||||
* RECEIVER CONFIG *
|
||||
* Receiver Config *
|
||||
* *
|
||||
* ************************************************/
|
||||
|
||||
@ -416,8 +417,10 @@ class Detector {
|
||||
|
||||
Result<int> getRxPort(Positions pos = {}) const;
|
||||
|
||||
/** Receiver TCP port (for client communication with Receiver) */
|
||||
void setRxPort(int value, Positions pos = {});
|
||||
/** Receiver TCP port (for client communication with Receiver)
|
||||
* module_id is -1 for all detectors, ports for each module is calculated
|
||||
* (increments) */
|
||||
void setRxPort(int port, int module_id = -1);
|
||||
|
||||
Result<int> getRxFifoDepth(Positions pos = {}) const;
|
||||
|
||||
@ -458,11 +461,11 @@ class Detector {
|
||||
/** locks receiver server to client IP */
|
||||
void setRxLock(bool value, Positions pos = {});
|
||||
|
||||
Result<std::string> getRxLastClientIP(Positions pos = {}) const;
|
||||
Result<sls::IpAddr> getRxLastClientIP(Positions pos = {}) const;
|
||||
|
||||
/**************************************************
|
||||
* *
|
||||
* FILE *
|
||||
* File *
|
||||
* *
|
||||
* ************************************************/
|
||||
Result<defs::fileFormat> getFileFormat(Positions pos = {}) const;
|
||||
@ -483,9 +486,9 @@ class Detector {
|
||||
*/
|
||||
void setFileNamePrefix(const std::string &fname, Positions pos = {});
|
||||
|
||||
Result<int> getAcquisitionIndex(Positions pos = {}) const;
|
||||
Result<int64_t> getAcquisitionIndex(Positions pos = {}) const;
|
||||
|
||||
void setAcquisitionIndex(int i, Positions pos = {});
|
||||
void setAcquisitionIndex(int64_t i, Positions pos = {});
|
||||
|
||||
Result<bool> getFileWrite(Positions pos = {}) const;
|
||||
|
||||
@ -545,23 +548,23 @@ class Detector {
|
||||
*/
|
||||
void setRxZmqPort(int port, int module_id = -1);
|
||||
|
||||
Result<std::string> getRxZmqIP(Positions pos = {}) const;
|
||||
Result<IpAddr> getRxZmqIP(Positions pos = {}) const;
|
||||
|
||||
void setRxZmqIP(const std::string &ip, Positions pos = {});
|
||||
void setRxZmqIP(const IpAddr ip, Positions pos = {});
|
||||
|
||||
Result<int> getClientZmqPort(Positions pos = {}) const;
|
||||
|
||||
/**
|
||||
* Needed only when using the client call back to get reconstructed data
|
||||
* from multi modules module_id is -1 for all detectors, ports for each
|
||||
* module is calculated (increments) Restarts client zmq sockets oonly if it
|
||||
* Modified only when using an intermediate process between receiver and gui/client.
|
||||
* Module_id is -1 for all detectors, ports for each
|
||||
* module is calculated (increments) Restarts client zmq sockets only if it
|
||||
* was already enabled
|
||||
*/
|
||||
void setClientZmqPort(int port, int module_id = -1);
|
||||
|
||||
Result<std::string> getClientZmqIp(Positions pos = {}) const;
|
||||
Result<IpAddr> getClientZmqIp(Positions pos = {}) const;
|
||||
|
||||
void setClientZmqIp(const std::string &ip, Positions pos = {});
|
||||
void setClientZmqIp(const IpAddr ip, Positions pos = {});
|
||||
|
||||
/**************************************************
|
||||
* *
|
||||
@ -599,10 +602,10 @@ class Detector {
|
||||
bool trimbits = true, Positions pos = {});
|
||||
|
||||
/** [Eiger] */
|
||||
Result<std::string> getSettingsDir(Positions pos = {}) const;
|
||||
Result<std::string> getSettingsPath(Positions pos = {}) const;
|
||||
|
||||
/** [Eiger] */
|
||||
void setSettingsDir(const std::string &value, Positions pos = {});
|
||||
void setSettingsPath(const std::string &value, Positions pos = {});
|
||||
|
||||
/** [Eiger] */
|
||||
void loadTrimbits(const std::string &fname, Positions pos = {});
|
||||
@ -808,13 +811,15 @@ class Detector {
|
||||
* Can set only a single ROI at a time
|
||||
* @param module position index
|
||||
*/
|
||||
void setROI(defs::ROI value, int moduleId);
|
||||
void setROI(defs::ROI value, int module_id);
|
||||
|
||||
/** [Gotthard] TODO: check with jiaguo if he needs any of these functions //
|
||||
* TODO remove */
|
||||
/** [Gotthard] Clear ROI */
|
||||
void clearROI(Positions pos = {});
|
||||
|
||||
/** [Gotthard] */
|
||||
Result<ns> getExptimeLeft(Positions pos = {}) const;
|
||||
|
||||
/** [Gotthard] TODO remove */
|
||||
/** [Gotthard] */
|
||||
Result<ns> getPeriodLeft(Positions pos = {}) const;
|
||||
|
||||
/** [Gotthard] */
|
||||
@ -904,12 +909,6 @@ class Detector {
|
||||
/** [CTB] */
|
||||
void setDBITPipeline(int value, Positions pos = {});
|
||||
|
||||
/** [CTB] */
|
||||
Result<int> getVrefVoltage(bool mV, Positions pos = {}) const;
|
||||
|
||||
/** [CTB] */
|
||||
void setVrefVoltage(int value, bool mV, Positions pos = {});
|
||||
|
||||
/** [CTB] */
|
||||
Result<int> getVoltage(defs::dacIndex index, Positions pos = {}) const;
|
||||
|
||||
@ -918,20 +917,17 @@ class Detector {
|
||||
* Options: V_LIMIT, V_POWER_A, V_POWER_B, V_POWER_C,
|
||||
* V_POWER_D, V_POWER_IO, V_POWER_CHIP
|
||||
*/
|
||||
void setVoltage(int value, defs::dacIndex index, Positions pos = {});
|
||||
void setVoltage(defs::dacIndex index, int value, Positions pos = {});
|
||||
|
||||
/**
|
||||
* [CTB] mV
|
||||
* Options: V_POWER_A, V_POWER_B, V_POWER_C, V_POWER_D, V_POWER_IO,
|
||||
* V_POWER_CHIP
|
||||
*/
|
||||
* Options: V_POWER_A, V_POWER_B, V_POWER_C, V_POWER_D, V_POWER_IO */
|
||||
Result<int> getMeasuredVoltage(defs::dacIndex index,
|
||||
Positions pos = {}) const;
|
||||
|
||||
/**
|
||||
* [CTB] mA
|
||||
* Options: I_POWER_A, I_POWER_B, I_POWER_C, I_POWER_D, I_POWER_IO
|
||||
*/
|
||||
* Options: I_POWER_A, I_POWER_B, I_POWER_C, I_POWER_D, I_POWER_IO */
|
||||
Result<int> getMeasuredCurrent(defs::dacIndex index,
|
||||
Positions pos = {}) const;
|
||||
|
||||
@ -990,7 +986,7 @@ class Detector {
|
||||
|
||||
/**************************************************
|
||||
* *
|
||||
* PATTERN *
|
||||
* Pattern *
|
||||
* *
|
||||
* ************************************************/
|
||||
|
||||
@ -1012,6 +1008,9 @@ class Detector {
|
||||
/** [CTB] */
|
||||
void setPatternClockControl(uint64_t word, Positions pos = {});
|
||||
|
||||
/** [CTB] same as executing */
|
||||
Result<uint64_t> getPatternWord(int addr, Positions pos = {});
|
||||
|
||||
/** [CTB] Caution: If word is -1 reads the addr (same as
|
||||
* executing the pattern) */
|
||||
void setPatternWord(int addr, uint64_t word, Positions pos = {});
|
||||
@ -1178,7 +1177,7 @@ class Detector {
|
||||
void setDetectorLock(bool lock, Positions pos = {});
|
||||
|
||||
/** Get last client IP saved on detector server */
|
||||
Result<std::string> getLastClientIP(Positions pos = {}) const;
|
||||
Result<sls::IpAddr> getLastClientIP(Positions pos = {}) const;
|
||||
|
||||
/** Execute a command on the detector server console */
|
||||
void executeCommand(const std::string &value, Positions pos = {});
|
||||
|
||||
@ -261,6 +261,12 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
|
||||
int getMultiId() const { return multiId; } // part of multi also
|
||||
|
||||
/**
|
||||
* Get package version (git branch)
|
||||
* @returns package version
|
||||
*/
|
||||
std::string getPackageVersion() const;
|
||||
|
||||
/**
|
||||
* Get Client Software version
|
||||
* @returns client software version
|
||||
@ -453,13 +459,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
int lockServer(int p = -1, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Get last client IP saved on detector server
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns last client IP saved on detector server
|
||||
*/
|
||||
std::string getLastClientIP(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Exit detector server
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
@ -553,31 +552,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
void saveSettingsFile(const std::string &fname, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Get Detector run status
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns status
|
||||
*/
|
||||
runStatus getRunStatus(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Start detector acquisition (Non blocking)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void startAcquisition(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Stop detector acquisition
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void stopAcquisition(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Give an internal software trigger to the detector (Eiger only)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void sendSoftwareTrigger(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Configures in detector the destination for UDP packets
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
@ -669,12 +643,12 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
int64_t setNumberOfFrames(int64_t t = -1, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Set/get number of cycles
|
||||
* @param t number of cycles (-1 gets)
|
||||
* Set/get number of triggers
|
||||
* @param t number of triggers (-1 gets)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns number of cycles
|
||||
* @returns number of triggers
|
||||
*/
|
||||
int64_t setNumberOfCycles(int64_t t = -1, int detPos = -1); //
|
||||
int64_t setNumberOfTriggers(int64_t t = -1, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Set/get number of additional storage cells (Jungfrau)
|
||||
@ -929,45 +903,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
int getReceiverStreamingPort(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* (advanced users)
|
||||
* Set/Get client streaming in ZMQ IP and restarts client sockets
|
||||
* @param i sets, empty string gets
|
||||
* By default, it is the IP of receiver hostname
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void setClientDataStreamingInIP(const std::string &ip = "",
|
||||
int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Returns the client zmq ip
|
||||
* If detPos is -1(multi module), ip returns concatenation of all client
|
||||
* streaming ip
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns the client zmq ip
|
||||
*/
|
||||
std::string getClientStreamingIP(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* (advanced users)
|
||||
* Set/Get receiver streaming out ZMQ IP and restarts receiver sockets
|
||||
* @param i sets, empty string gets
|
||||
* By default, it is the IP of receiver hostname
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void setReceiverDataStreamingOutIP(const std::string &ip = "",
|
||||
int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Returns the receiver zmq ip
|
||||
* If detPos is -1(multi module), ip returns concatenation of all receiver
|
||||
* streaming ip
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns the receiver zmq ip
|
||||
*/
|
||||
std::string getReceiverStreamingIP(int detPos = -1); //
|
||||
|
||||
/**
|
||||
/**
|
||||
* Sets the transmission delay for left, right or entire frame
|
||||
* (Eiger, Jungfrau(only entire frame))
|
||||
* @param index type of delay
|
||||
@ -1435,13 +1371,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
int lockReceiver(int lock = -1, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Returns the IP of the last client connecting to the receiver
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns IP of last client connecting to receiver
|
||||
*/
|
||||
std::string getReceiverLastClientIP(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Turns off the receiver server!
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
@ -1541,7 +1470,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns file index
|
||||
*/
|
||||
int setFileIndex(int i, int detPos = -1); //
|
||||
int64_t setFileIndex(int64_t i, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Get File index
|
||||
@ -1549,26 +1478,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
* position
|
||||
* @returns file index
|
||||
*/
|
||||
int getFileIndex(int detPos = -1) const; //
|
||||
|
||||
/**
|
||||
* Receiver starts listening to packets
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void startReceiver(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Stops the listening mode of receiver
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void stopReceiver(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Gets the status of the listening mode of receiver
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns status
|
||||
*/
|
||||
runStatus getReceiverStatus(int detPos = -1); //
|
||||
int64_t getFileIndex(int detPos = -1) const; //
|
||||
|
||||
/**
|
||||
* Gets the number of frames caught by receiver
|
||||
@ -1820,21 +1730,8 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
/**
|
||||
* Loads the detector setup from file
|
||||
* @param fname file to read from
|
||||
* @param level if 2 reads also reads trimbits, angular conversion
|
||||
* coefficients etc. from files with default extensions as generated by
|
||||
* dumpDetectorSetup
|
||||
* @returns OK or FAIL
|
||||
*/
|
||||
int retrieveDetectorSetup(const std::string &fname, int level = 0);
|
||||
|
||||
/**
|
||||
* Saves the detector setup to file
|
||||
* @param fname file to write to
|
||||
* @param level if 2 reads also trimbits, flat field, angular correction
|
||||
* etc. and writes them to files with automatically added extension
|
||||
* @returns OK or FAIL
|
||||
*/
|
||||
int dumpDetectorSetup(const std::string &fname, int level = 0);
|
||||
void loadParameters(const std::string &fname);
|
||||
|
||||
/**
|
||||
* register callback for accessing acquisition final data
|
||||
@ -1916,12 +1813,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
void updateUserdetails();
|
||||
|
||||
/**
|
||||
* Prepares detector for acquisition (Eiger)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void prepareAcquisition(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Check if acquiring flag is set, set error if set
|
||||
* @returns FAIL if not ready, OK if ready
|
||||
@ -1935,14 +1826,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
std::string exec(const char *cmd);
|
||||
|
||||
/**
|
||||
* Appends detectors to the end of the list in shared memory
|
||||
* Connects to them
|
||||
* @param name concatenated hostname of the sls detectors to be appended to
|
||||
* the list
|
||||
*/
|
||||
void addMultipleDetectors(const char *name); //
|
||||
|
||||
/**
|
||||
* Add sls detector
|
||||
* @param s hostname of the single detector
|
||||
@ -1960,7 +1843,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns the file index
|
||||
*/
|
||||
int incrementFileIndex(int detPos = -1);
|
||||
int64_t incrementFileIndex(int detPos = -1);
|
||||
|
||||
/**
|
||||
* add gap pixels to the image (only for Eiger in 4 bit mode)
|
||||
@ -2013,26 +1896,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
void startProcessingThread();
|
||||
|
||||
/**
|
||||
* Start detector acquisition and read all data (Blocking until end of
|
||||
* acquisition)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void startAndReadAll(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Start readout (without exposure or interrupting exposure) (Eiger store in
|
||||
* ram)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void startReadOut(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Requests and receives all data from the detector (Eiger store in ram)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void readAll(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Check if processing thread is ready to join main thread
|
||||
* @returns true if ready, else false
|
||||
|
||||
@ -148,7 +148,7 @@ struct sharedSlsDetector {
|
||||
char rxFileName[MAX_STR_LENGTH];
|
||||
|
||||
/** file index */
|
||||
int rxFileIndex;
|
||||
int64_t rxFileIndex;
|
||||
|
||||
/** file format */
|
||||
slsDetectorDefs::fileFormat rxFileFormat;
|
||||
@ -350,7 +350,7 @@ class slsDetector : public virtual slsDetectorDefs {
|
||||
* Get last client IP saved on detector server
|
||||
* @returns last client IP saved on detector server
|
||||
*/
|
||||
std::string getLastClientIP();
|
||||
sls::IpAddr getLastClientIP();
|
||||
|
||||
/**
|
||||
* Exit detector server
|
||||
@ -896,29 +896,32 @@ class slsDetector : public virtual slsDetectorDefs {
|
||||
|
||||
/**
|
||||
* Sets the client zmq ip\sa sharedSlsDetector
|
||||
* @param sourceIP client zmq ip
|
||||
* @param ip client zmq ip
|
||||
*/
|
||||
void setClientStreamingIP(const std::string &sourceIP);
|
||||
void setClientStreamingIP(const sls::IpAddr ip);
|
||||
|
||||
/**
|
||||
* Returns the client zmq ip \sa sharedSlsDetector
|
||||
* @returns the client zmq ip, returns "none" if default setting and no
|
||||
* custom ip set
|
||||
* @returns the client zmq ip
|
||||
*/
|
||||
std::string getClientStreamingIP();
|
||||
sls::IpAddr getClientStreamingIP();
|
||||
|
||||
/**
|
||||
* Sets the receiver zmq ip\sa sharedSlsDetector
|
||||
* @param sourceIP receiver zmq ip. If empty, uses rx_hostname
|
||||
* @param ip receiver zmq ip
|
||||
*/
|
||||
void setReceiverStreamingIP(std::string sourceIP);
|
||||
void setReceiverStreamingIP(const sls::IpAddr ip);
|
||||
|
||||
/**
|
||||
* Returns the receiver zmq ip \sa sharedSlsDetector
|
||||
* @returns the receiver zmq ip, returns "none" if default setting and no
|
||||
* custom ip set
|
||||
* @returns the receiver zmq ip
|
||||
*/
|
||||
std::string getReceiverStreamingIP();
|
||||
sls::IpAddr getReceiverStreamingIP();
|
||||
|
||||
/** update receiver stremaing ip from shm to receiver
|
||||
* if empty, use rx_hostname ip
|
||||
*/
|
||||
void updateReceiverStreamingIP();
|
||||
|
||||
/**
|
||||
* Sets the transmission delay for left, right or entire frame
|
||||
@ -1333,7 +1336,7 @@ class slsDetector : public virtual slsDetectorDefs {
|
||||
* Returns the IP of the last client connecting to the receiver
|
||||
* @returns the IP of the last client connecting to the receiver
|
||||
*/
|
||||
std::string getReceiverLastClientIP() const;
|
||||
sls::IpAddr getReceiverLastClientIP() const;
|
||||
|
||||
/**
|
||||
* Exits the receiver TCP server
|
||||
@ -1440,19 +1443,19 @@ class slsDetector : public virtual slsDetectorDefs {
|
||||
* @param i file index
|
||||
* @returns file index
|
||||
*/
|
||||
int setFileIndex(int file_index);
|
||||
int64_t setFileIndex(int64_t file_index);
|
||||
|
||||
/**
|
||||
* Gets the file index
|
||||
* @returns file index
|
||||
*/
|
||||
|
||||
int getFileIndex() const;
|
||||
int64_t getFileIndex() const;
|
||||
/**
|
||||
* increments file index
|
||||
* @returns the file index
|
||||
*/
|
||||
int incrementFileIndex();
|
||||
int64_t incrementFileIndex();
|
||||
|
||||
/**
|
||||
* Receiver starts listening to packets
|
||||
|
||||
@ -42,40 +42,22 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
|
||||
std::string helpLine(int narg, const char * const args[], int action=HELP_ACTION, int detPos = -1);
|
||||
static std::string helpAcquire(int action);
|
||||
static std::string helpData(int action);
|
||||
static std::string helpStatus(int action);
|
||||
static std::string helpDataStream(int action);
|
||||
static std::string helpFree(int action);
|
||||
static std::string helpHostname(int action);
|
||||
static std::string helpUser(int action);
|
||||
static std::string helpExitServer(int action);
|
||||
static std::string helpSettingsDir(int action);
|
||||
static std::string helpTrimEn(int action);
|
||||
static std::string helpOutDir(int action);
|
||||
static std::string helpFileName(int action);
|
||||
static std::string helpRateCorr(int action);
|
||||
static std::string helpThreaded(int action);
|
||||
static std::string helpNetworkParameter(int action);
|
||||
static std::string helpPort(int action);
|
||||
static std::string helpLastClient(int action);
|
||||
static std::string helpOnline(int action);
|
||||
static std::string helpDetectorSize(int action);
|
||||
static std::string helpSettings(int action);
|
||||
static std::string helpSN(int action);
|
||||
static std::string helpDigiTest(int action);
|
||||
static std::string helpRegister(int action);
|
||||
static std::string helpDAC(int action);
|
||||
static std::string helpTimer(int action);
|
||||
static std::string helpTiming(int action);
|
||||
static std::string helpTimeLeft(int action);
|
||||
static std::string helpSpeed(int action);
|
||||
static std::string helpAdvanced(int action);
|
||||
static std::string helpConfiguration(int action);
|
||||
static std::string helpCounter(int action);
|
||||
static std::string helpADC(int action);
|
||||
static std::string helpTempControl(int action);
|
||||
static std::string helpReceiver(int action);
|
||||
static std::string helpPattern(int action);
|
||||
static std::string helpPulse(int action);
|
||||
static std::string helpProcessor(int action);
|
||||
|
||||
private:
|
||||
@ -85,40 +67,22 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
|
||||
std::string cmdUnknown(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdAcquire(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdData(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdStatus(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdDataStream(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdFree(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdHostname(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdUser(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdHelp(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdExitServer(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdSettingsDir(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdTrimEn(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdOutDir(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdFileName(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdRateCorr(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdNetworkParameter(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdPort(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdLastClient(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdOnline(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdDetectorSize(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdSettings(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdSN(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdDigiTest(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdRegister(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdDAC(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdTiming(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdTimer(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdTimeLeft(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdSpeed(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdAdvanced(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdConfiguration(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdCounter(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdADC(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdTempControl(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdReceiver(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdPattern(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdPulse(int narg, const char * const args[], int action, int detPos = -1);
|
||||
std::string cmdProcessor(int narg, const char * const args[], int action, int detPos = -1);
|
||||
|
||||
int numberOfCommands;
|
||||
|
||||
@ -340,12 +340,12 @@ public:
|
||||
int64_t setNumberOfFrames(int64_t t = -1, int detPos = -1);
|
||||
|
||||
/**
|
||||
* Set/get number of cycles
|
||||
* @param t number of cycles (-1 gets)
|
||||
* Set/get number of triggers
|
||||
* @param t number of triggers (-1 gets)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
* @returns number of cycles
|
||||
* @returns number of triggers
|
||||
*/
|
||||
int64_t setNumberOfCycles(int64_t t = -1, int detPos = -1);
|
||||
int64_t setNumberOfTriggers(int64_t t = -1, int detPos = -1);
|
||||
|
||||
/**
|
||||
* Set/get number of additional storage cells (Jungfrau)
|
||||
|
||||
Reference in New Issue
Block a user