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

WIP

Browse Source
This commit is contained in:
Erik Frojdh 2019-08-08 14:30:02 +02:00
parent f0e106f94f
commit 79d6ea614a
3 changed files with 204 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
slsDetectorSoftware/include/Detector.h
View File

@ -210,10 +210,54 @@ class Detector {
Result<std::string> getDetectorTypeAsString(Positions pos = {}) const; Result<std::string> getDetectorTypeAsString(Positions pos = {}) const;
// Erik // Erik
Result<bool> getReceiverSilentMode(Positions pos = {}) const;
Result<int> getFramesCaughtByReceiver(Positions pos = {}) const;
Result<uint64_t> getReceiverCurrentFrameIndex(Positions pos = {}) const;
void resetFramesCaught(Positions pos = {});
//TODO!
// int createReceivingDataSockets(const bool destroy = false);
// void readFrameFromReceiver();
void setMasterFileWrite(bool value, Positions pos = {});
Result<bool> getMasterFileWrite(Positions pos = {}) const;
void setReceiverStreamingFrequency(int freq = -1, int detPos = -1);
/**
* [All] If receiver streaming frequency is 0, then this timer between each
* data stream is set. Default is 500 ms.
*/
void setReceiverStreamingTimer(int time_in_ms = 500, Positions pos = {});
/** [All] */
Result<int> getReceiverStreamingTimer(Positions pos = {}) const;
// TODO!
// int enableDataStreamingToClient(int enable = -1);
// int enableDataStreamingFromReceiver(int enable = -1, int detPos = -1)
/** [TODO! All?] */
void setTenGigaEnabled(bool value, Positions pos = {});
/** [TODO! All?] */
Result<bool> getTenGigaEnabled(Positions pos = {}) const;
/** [All] */
void setReceiverFifoDepth(int nframes, Positions pos = {});
/** [All] */
Result<int> getReceiverFifoDepth(Positions pos = {}) const;
/** [All] */
void setReceiverSilentMode(bool value, Positions pos = {}); void setReceiverSilentMode(bool value, Positions pos = {});
/** [All] */
Result<bool> getReceiverSilentMode(Positions pos = {}) const;
/** [CTB] */ /** [CTB] */
void setPattern(const std::string &fname, Positions pos = {}); void setPattern(const std::string &fname, Positions pos = {});

199
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -20,7 +20,6 @@ class detectorData;
#define SHORT_STRING_LENGTH 50 #define SHORT_STRING_LENGTH 50
#define DATE_LENGTH 30 #define DATE_LENGTH 30
#include <future> #include <future>
#include <numeric> #include <numeric>
/** /**
@ -118,7 +117,8 @@ class multiSlsDetector : public virtual slsDetectorDefs {
std::vector<int> positions, std::vector<int> positions,
typename NonDeduced<CT>::type... Args) { typename NonDeduced<CT>::type... Args) {
if (positions.empty() || (positions.size() == 1 && positions[0] == -1 )) { if (positions.empty() ||
(positions.size() == 1 && positions[0] == -1)) {
positions.resize(detectors.size()); positions.resize(detectors.size());
std::iota(begin(positions), end(positions), 0); std::iota(begin(positions), end(positions), 0);
} }
@ -141,9 +141,10 @@ class multiSlsDetector : public virtual slsDetectorDefs {
template <typename RT, typename... CT> template <typename RT, typename... CT>
std::vector<RT> Parallel(RT (slsDetector::*somefunc)(CT...) const, std::vector<RT> Parallel(RT (slsDetector::*somefunc)(CT...) const,
std::vector<int> positions, std::vector<int> positions,
typename NonDeduced<CT>::type... Args) const{ typename NonDeduced<CT>::type... Args) const {
if (positions.empty() || (positions.size() == 1 && positions[0] == -1 )) { if (positions.empty() ||
(positions.size() == 1 && positions[0] == -1)) {
positions.resize(detectors.size()); positions.resize(detectors.size());
std::iota(begin(positions), end(positions), 0); std::iota(begin(positions), end(positions), 0);
} }
@ -165,10 +166,11 @@ class multiSlsDetector : public virtual slsDetectorDefs {
template <typename... CT> template <typename... CT>
void Parallel(void (slsDetector::*somefunc)(CT...), void Parallel(void (slsDetector::*somefunc)(CT...),
std::vector<int> positions, std::vector<int> positions,
typename NonDeduced<CT>::type... Args) { typename NonDeduced<CT>::type... Args) {
if (positions.empty() || (positions.size() == 1 && positions[0] == -1 )) { if (positions.empty() ||
(positions.size() == 1 && positions[0] == -1)) {
positions.resize(detectors.size()); positions.resize(detectors.size());
std::iota(begin(positions), end(positions), 0); std::iota(begin(positions), end(positions), 0);
} }
@ -187,10 +189,11 @@ class multiSlsDetector : public virtual slsDetectorDefs {
template <typename... CT> template <typename... CT>
void Parallel(void (slsDetector::*somefunc)(CT...) const, void Parallel(void (slsDetector::*somefunc)(CT...) const,
std::vector<int> positions, std::vector<int> positions,
typename NonDeduced<CT>::type... Args) const{ typename NonDeduced<CT>::type... Args) const {
if (positions.empty() || (positions.size() == 1 && positions[0] == -1 )) { if (positions.empty() ||
(positions.size() == 1 && positions[0] == -1)) {
positions.resize(detectors.size()); positions.resize(detectors.size());
std::iota(begin(positions), end(positions), 0); std::iota(begin(positions), end(positions), 0);
} }
@ -250,13 +253,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* Set acquiring flag in shared memory * Set acquiring flag in shared memory
* @param b acquiring flag * @param b acquiring flag
*/ */
void setAcquiringFlag(bool flag);// void setAcquiringFlag(bool flag); //
/** /**
* Get acquiring flag from shared memory * Get acquiring flag from shared memory
* @returns acquiring flag * @returns acquiring flag
*/ */
bool getAcquiringFlag() const;// bool getAcquiringFlag() const; //
/** /**
* Check version compatibility with detector software * Check version compatibility with detector software
@ -264,7 +267,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param p port type control port or receiver port * @param p port type control port or receiver port
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void checkDetectorVersionCompatibility(int detPos = -1);// void checkDetectorVersionCompatibility(int detPos = -1); //
/** /**
* Check version compatibility with receiver software * Check version compatibility with receiver software
@ -272,7 +275,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param p port type control port or receiver port * @param p port type control port or receiver port
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void checkReceiverVersionCompatibility(int detPos = -1);// void checkReceiverVersionCompatibility(int detPos = -1); //
/** /**
* Get ID or version numbers * Get ID or version numbers
@ -280,34 +283,38 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns Id or version number of that type * @returns Id or version number of that type
*/ */
int64_t getId(idMode mode, int detPos = -1);//not needed anymore (later remove this_software_version from enum) int64_t getId(idMode mode,
int detPos = -1); // not needed anymore (later remove
// this_software_version from enum)
int getMultiId()const{return multiId;} //part of multi also int getMultiId() const { return multiId; } // part of multi also
/** /**
* Get Client Software version * Get Client Software version
* @returns client software version * @returns client software version
*/ */
int64_t getClientSoftwareVersion() const;// int64_t getClientSoftwareVersion() const; //
/** /**
* Get Receiver software version * Get Receiver software version
* @return receiver software version * @return receiver software version
*/ */
int64_t getReceiverSoftwareVersion(int detPos = -1);// int64_t getReceiverSoftwareVersion(int detPos = -1); //
/** /**
* Get Detector Number * Get Detector Number
* @returns vector of detector number * @returns vector of detector number
*/ */
std::vector<int64_t> getDetectorNumber(); // renamed to getDetectorSerialNumber std::vector<int64_t>
getDetectorNumber(); // renamed to getDetectorSerialNumber
/** /**
* Free shared memory from the command line * Free shared memory from the command line
* avoiding creating the constructor classes and mapping * avoiding creating the constructor classes and mapping
* @param multiId multi detector Id * @param multiId multi detector Id
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
static void freeSharedMemory(int multiId, int detPos = -1);// private or not needed static void freeSharedMemory(int multiId,
int detPos = -1); // private or not needed
/** /**
* Free shared memory and delete shared memory structure * Free shared memory and delete shared memory structure
@ -316,19 +323,21 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* object back to state before object creation amap * object back to state before object creation amap
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void freeSharedMemory(int detPos = -1);// void freeSharedMemory(int detPos = -1); //
/** /**
* Get user details of shared memory * Get user details of shared memory
* @returns string with user details * @returns string with user details
*/ */
std::string getUserDetails();// part of multi std::string getUserDetails(); // part of multi
/** /**
* Sets the hostname of all sls detectors in shared memory and updates local cache * Sets the hostname of all sls detectors in shared memory and updates local
* cache
* @param name hostname of all the sls detectors * @param name hostname of all the sls detectors
*/ */
void setHostname(const std::vector<std::string> &name);//cannot set individually void setHostname(
const std::vector<std::string> &name); // cannot set individually
/** /**
* Sets the hostname of all sls detectors in shared memory * Sets the hostname of all sls detectors in shared memory
@ -336,7 +345,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param name concatenated hostname of all the sls detectors * @param name concatenated hostname of all the sls detectors
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void setHostname(const char *name, int detPos = -1);// not needed void setHostname(const char *name, int detPos = -1); // not needed
/** /**
* Gets the hostname of detector at particular position * Gets the hostname of detector at particular position
@ -345,7 +354,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns concatenated hostnames of all detectors or hostname of specific * @returns concatenated hostnames of all detectors or hostname of specific
* one * one
*/ */
std::string getHostname(int detPos = -1) const;// std::string getHostname(int detPos = -1) const; //
/** /**
* Appends detectors to the end of the list in shared memory * Appends detectors to the end of the list in shared memory
@ -353,7 +362,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param name concatenated hostname of the sls detectors to be appended to * @param name concatenated hostname of the sls detectors to be appended to
* the list * the list
*/ */
void addMultipleDetectors(const char *name);// ???? void addMultipleDetectors(const char *name); // ????
/** /**
* Get Detector type as an enum * Get Detector type as an enum
@ -367,7 +376,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns detector type of sls detector in position pos, if -1, returns * @returns detector type of sls detector in position pos, if -1, returns
* the first det type * the first det type
*/ */
detectorType getDetectorTypeAsEnum(int detPos);//?? detectorType getDetectorTypeAsEnum(int detPos); //??
/** /**
* Concatenates string types of all sls detectors or * Concatenates string types of all sls detectors or
@ -453,12 +462,12 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/ */
int getQuad(int detPos = -1); int getQuad(int detPos = -1);
/** /**
* Set Quad Type (Only for Eiger Quad detector hardware) * Set Quad Type (Only for Eiger Quad detector hardware)
* @param enable true if quad type set, else false * @param enable true if quad type set, else false
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void setQuad(const bool enable, int detPos = -1); void setQuad(const bool enable, int detPos = -1);
/** /**
* Set number of rows to read out (Only for Eiger) * Set number of rows to read out (Only for Eiger)
@ -529,11 +538,11 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/ */
int setReceiverPort(int port_number = -1, int detPos = -1); int setReceiverPort(int port_number = -1, int detPos = -1);
/** /**
* Get Receiver port * Get Receiver port
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns vector of receiver port * @returns vector of receiver port
*/ */
int getReceiverPort(int detPos = -1) const; int getReceiverPort(int detPos = -1) const;
/** /**
@ -568,7 +577,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* Load configuration from a configuration File * Load configuration from a configuration File
* @param fname configuration file name * @param fname configuration file name
*/ */
void readConfigurationFile(const std::string &fname);// void readConfigurationFile(const std::string &fname); //
/** /**
* Write current configuration to a file * Write current configuration to a file
@ -700,19 +709,19 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/ */
void configureMAC(int detPos = -1); void configureMAC(int detPos = -1);
/** /**
* Set starting frame number for the next acquisition * Set starting frame number for the next acquisition
* @param val starting frame number * @param val starting frame number
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void setStartingFrameNumber(const uint64_t value, int detPos = -1);// void setStartingFrameNumber(const uint64_t value, int detPos = -1); //
/** /**
* Get starting frame number for the next acquisition * Get starting frame number for the next acquisition
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns starting frame number * @returns starting frame number
*/ */
uint64_t getStartingFrameNumber(int detPos = -1);// uint64_t getStartingFrameNumber(int detPos = -1); //
/** /**
* Set/get timer value (not all implemented for all detectors) * Set/get timer value (not all implemented for all detectors)
@ -732,7 +741,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns exposure time in ns, or s if specified * @returns exposure time in ns, or s if specified
*/ */
double setExposureTime(double t = -1, bool inseconds = false, double setExposureTime(double t = -1, bool inseconds = false,
int detPos = -1);// int detPos = -1); //
/** /**
* Set/get exposure period * Set/get exposure period
@ -742,7 +751,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns exposure period in ns, or s if specified * @returns exposure period in ns, or s if specified
*/ */
double setExposurePeriod(double t = -1, bool inseconds = false, double setExposurePeriod(double t = -1, bool inseconds = false,
int detPos = -1);// int detPos = -1); //
/** /**
* Set/get delay after trigger (Gotthard, Jungfrau(not for this release)) * Set/get delay after trigger (Gotthard, Jungfrau(not for this release))
@ -763,7 +772,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns sub frame exposure time in ns, or s if specified * @returns sub frame exposure time in ns, or s if specified
*/ */
double setSubFrameExposureTime(double t = -1, bool inseconds = false, double setSubFrameExposureTime(double t = -1, bool inseconds = false,
int detPos = -1);// int detPos = -1); //
/** /**
* (Advanced users) * (Advanced users)
@ -843,7 +852,8 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* adcphase for Gotthard, others for CTB & Moench) * adcphase for Gotthard, others for CTB & Moench)
* @param value (clkdivider 0,1,2 for full, half and quarter speed). Other * @param value (clkdivider 0,1,2 for full, half and quarter speed). Other
* values check manual * values check manual
* @param mode 0 for shift, 1 for degrees. relevant only for speed type adcphase and dbit phase * @param mode 0 for shift, 1 for degrees. relevant only for speed type
* adcphase and dbit phase
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns value of speed set * @returns value of speed set
*/ */
@ -949,7 +959,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns value read from register * @returns value read from register
*/ */
uint32_t readRegister(uint32_t addr, int detPos = -1);// uint32_t readRegister(uint32_t addr, int detPos = -1); //
/** /**
* Set bit in a register. For Advanced users * Set bit in a register. For Advanced users
@ -958,7 +968,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns value read from register * @returns value read from register
*/ */
uint32_t setBit(uint32_t addr, int n, int detPos = -1);// uint32_t setBit(uint32_t addr, int n, int detPos = -1); //
/** /**
* Clear bit in a register. For Advanced users * Clear bit in a register. For Advanced users
@ -967,7 +977,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns value read from register * @returns value read from register
*/ */
uint32_t clearBit(uint32_t addr, int n, int detPos = -1);// uint32_t clearBit(uint32_t addr, int n, int detPos = -1); //
/** /**
* Validates the format of the detector MAC address and sets it * Validates the format of the detector MAC address and sets it
@ -1380,7 +1390,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void loadImageToDetector(imageType index, const std::string &fname, void loadImageToDetector(imageType index, const std::string &fname,
int detPos = -1); int detPos = -1);
/** /**
* Writes the counter memory block from the detector (Gotthard) * Writes the counter memory block from the detector (Gotthard)
@ -1389,7 +1399,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void writeCounterBlockFile(const std::string &fname, int startACQ = 0, void writeCounterBlockFile(const std::string &fname, int startACQ = 0,
int detPos = -1); int detPos = -1);
/** /**
* Resets counter in detector (Gotthard) * Resets counter in detector (Gotthard)
@ -1671,7 +1681,8 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param hostname name of pc to tftp from * @param hostname name of pc to tftp from
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void copyDetectorServer(const std::string &fname, const std::string &hostname, int detPos = -1); void copyDetectorServer(const std::string &fname,
const std::string &hostname, int detPos = -1);
/** /**
* Reboot detector controller (Not Eiger) * Reboot detector controller (Not Eiger)
@ -1687,7 +1698,8 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param fname programming file name * @param fname programming file name
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void update(const std::string &sname, const std::string &hostname, const std::string &fname, int detPos = -1); void update(const std::string &sname, const std::string &hostname,
const std::string &fname, int detPos = -1);
/** /**
* Power on/off Chip (Jungfrau) * Power on/off Chip (Jungfrau)
@ -1706,12 +1718,12 @@ class multiSlsDetector : public virtual slsDetectorDefs {
int setAutoComparatorDisableMode(int ival = -1, int detPos = -1); int setAutoComparatorDisableMode(int ival = -1, int detPos = -1);
/** /**
* Set Rate correction ( Eiger) * Set Rate correction ( Eiger)
* @param t dead time in ns - if 0 disable correction, * @param t dead time in ns - if 0 disable correction,
* if >0 set dead time to t, if < 0 set deadtime to default dead time * if >0 set dead time to t, if < 0 set deadtime to default dead time
* for current settings * for current settings
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void setRateCorrection(int64_t t = 0, int detPos = -1); void setRateCorrection(int64_t t = 0, int detPos = -1);
/** /**
@ -1777,7 +1789,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns output file directory * @returns output file directory
*/ */
std::string getFilePath(int detPos = -1);// std::string getFilePath(int detPos = -1); //
/** /**
* Sets up the file directory * Sets up the file directory
@ -1785,14 +1797,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param s file directory * @param s file directory
* @returns file dir * @returns file dir
*/ */
std::string setFilePath(const std::string &path, int detPos = -1);// std::string setFilePath(const std::string &path, int detPos = -1); //
/** /**
* Returns file name prefix * Returns file name prefix
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns file name prefix * @returns file name prefix
*/ */
std::string getFileName(int detPos = -1);// std::string getFileName(int detPos = -1); //
/** /**
* Sets up the file name prefix * Sets up the file name prefix
@ -1800,7 +1812,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param s file name prefix * @param s file name prefix
* @returns file name prefix * @returns file name prefix
*/ */
std::string setFileName(const std::string &fname, int detPos = -1);// std::string setFileName(const std::string &fname, int detPos = -1); //
/** /**
* Sets the max frames per file in receiver * Sets the max frames per file in receiver
@ -1861,57 +1873,51 @@ class multiSlsDetector : public virtual slsDetectorDefs {
/** /**
* Get File index * Get File index
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector
* position
* @returns file index * @returns file index
*/ */
int getFileIndex(int detPos = -1) const; int getFileIndex(int detPos = -1) const;
/**
* increments file index
* @param detPos -1 for all detectors in list or specific detector position
* @returns the file index
*/
int incrementFileIndex(int detPos = -1);
/** /**
* Receiver starts listening to packets * Receiver starts listening to packets
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void startReceiver(int detPos = -1);// void startReceiver(int detPos = -1); //
/** /**
* Stops the listening mode of receiver * Stops the listening mode of receiver
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void stopReceiver(int detPos = -1);// void stopReceiver(int detPos = -1); //
/** /**
* Gets the status of the listening mode of receiver * Gets the status of the listening mode of receiver
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns status * @returns status
*/ */
runStatus getReceiverStatus(int detPos = -1);// runStatus getReceiverStatus(int detPos = -1); //
/** /**
* Gets the number of frames caught by receiver * Gets the number of frames caught by receiver
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns number of frames caught by receiver * @returns number of frames caught by receiver
*/ */
int getFramesCaughtByReceiver(int detPos = -1); int getFramesCaughtByReceiver(int detPos = -1); //
/** /**
* Gets the current frame index of receiver * Gets the current frame index of receiver
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns average of all current frame index of receiver * @returns average of all current frame index of receiver
*/ */
uint64_t getReceiverCurrentFrameIndex(int detPos = -1); uint64_t getReceiverCurrentFrameIndex(int detPos = -1); //
/** /**
* Resets framescaught in receiver * Resets framescaught in receiver
* Use this when using startAcquisition instead of acquire * Use this when using startAcquisition instead of acquire
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void resetFramesCaught(int detPos = -1); void resetFramesCaught(int detPos = -1); //
/** /**
* Create Receiving Data Sockets * Create Receiving Data Sockets
@ -1932,13 +1938,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns file write enable * @returns file write enable
*/ */
int setFileWrite(bool value, int detPos = -1);// int setFileWrite(bool value, int detPos = -1); //
/** /**
* Gets file write enable * Gets file write enable
* @returns file write enable * @returns file write enable
*/ */
int getFileWrite(int detPos = -1) const;// int getFileWrite(int detPos = -1) const; //
/** /**
* Sets/Gets receiver master file write enable * Sets/Gets receiver master file write enable
@ -1946,14 +1952,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns master file write enable * @returns master file write enable
*/ */
int setMasterFileWrite(bool value, int detPos = -1); int setMasterFileWrite(bool value, int detPos = -1); //
/** /**
* Gets master file write enable * Gets master file write enable
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns master file write enable * @returns master file write enable
*/ */
int getMasterFileWrite(int detPos = -1) const; int getMasterFileWrite(int detPos = -1) const; //
/** /**
* Sets/Gets file overwrite enable * Sets/Gets file overwrite enable
@ -1961,14 +1967,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns file overwrite enable * @returns file overwrite enable
*/ */
int setFileOverWrite(bool enable, int detPos = -1);// int setFileOverWrite(bool enable, int detPos = -1); //
/** /**
* Gets file over write enable * Gets file over write enable
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns file over write enable * @returns file over write enable
*/ */
int getFileOverWrite(int detPos = -1) const;// int getFileOverWrite(int detPos = -1) const; //
/** /**
* (previously setReadReceiverFrequency) * (previously setReadReceiverFrequency)
@ -1989,7 +1995,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns receiver streaming timer in ms * @returns receiver streaming timer in ms
*/ */
int setReceiverStreamingTimer(int time_in_ms = 500, int detPos = -1); int setReceiverStreamingTimer(int time_in_ms = 500, int detPos = -1); //
/** /**
* Enable data streaming to client * Enable data streaming to client
@ -2012,7 +2018,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns if 10Gbe is enabled * @returns if 10Gbe is enabled
*/ */
int enableTenGigabitEthernet(int i = -1, int detPos = -1); int enableTenGigabitEthernet(int i = -1, int detPos = -1); //
/** /**
* Set/get receiver fifo depth * Set/get receiver fifo depth
@ -2020,7 +2026,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns the receiver fifo depth * @returns the receiver fifo depth
*/ */
int setReceiverFifoDepth(int i = -1, int detPos = -1); int setReceiverFifoDepth(int i = -1, int detPos = -1); //
/** /**
* Set/get receiver silent mode * Set/get receiver silent mode
@ -2044,7 +2050,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns actual value * @returns actual value
*/ */
uint64_t setPatternIOControl(uint64_t word = -1, int detPos = -1);// uint64_t setPatternIOControl(uint64_t word = -1, int detPos = -1); //
/** /**
* Sets pattern clock control (CTB/ Moench) * Sets pattern clock control (CTB/ Moench)
@ -2121,7 +2127,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param mask mask to select bits * @param mask mask to select bits
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void setPatternBitMask(uint64_t mask, int detPos = -1);// void setPatternBitMask(uint64_t mask, int detPos = -1); //
/** /**
* Gets the bits that the mask will be applied to for every pattern (CTB/ * Gets the bits that the mask will be applied to for every pattern (CTB/
@ -2129,7 +2135,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns mask of bits selected * @returns mask of bits selected
*/ */
uint64_t getPatternBitMask(int detPos = -1);// uint64_t getPatternBitMask(int detPos = -1); //
/** /**
* Set LED Enable (Moench, CTB only) * Set LED Enable (Moench, CTB only)
@ -2191,8 +2197,8 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* s is for subframe number for eiger for 32 bit mode * s is for subframe number for eiger for 32 bit mode
* @param pArg argument * @param pArg argument
*/ */
void registerDataCallback(void (*userCallback)(detectorData *, uint64_t, uint32_t, void registerDataCallback(void (*userCallback)(detectorData *, uint64_t,
void *), uint32_t, void *),
void *pArg); void *pArg);
/** /**
@ -2202,7 +2208,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* index, loops for measurements, calls required call backs. * index, loops for measurements, calls required call backs.
* @returns OK or FAIL depending on if it already started * @returns OK or FAIL depending on if it already started
*/ */
int acquire();// int acquire(); //
/** /**
* Combines data from all readouts and gives it to the gui * Combines data from all readouts and gives it to the gui
@ -2210,8 +2216,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/ */
void processData(); void processData();
private: private:
/**
* increments file index
* @param detPos -1 for all detectors in list or specific detector position
* @returns the file index
*/
int incrementFileIndex(int detPos = -1);
/** /**
* Creates/open shared memory, initializes detector structure and members * Creates/open shared memory, initializes detector structure and members
* Called by constructor/ set hostname / read config file * Called by constructor/ set hostname / read config file

47
slsDetectorSoftware/src/Detector.cpp
View File

@ -171,7 +171,52 @@ Result<std::string> Detector::getDetectorTypeAsString(Positions pos) const {
// Erik // Erik
Result<bool> Detector::getReceiverSilentMode(Positions pos){ Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const{
return pimpl->Parallel(&slsDetector::getFramesCaughtByReceiver, pos);
}
Result<uint64_t> Detector::getReceiverCurrentFrameIndex(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverCurrentFrameIndex, pos);
}
void Detector::resetFramesCaught(Positions pos) {
pimpl->Parallel(&slsDetector::resetFramesCaught, pos);
}
void Detector::setMasterFileWrite(bool value, Positions pos) {
pimpl->Parallel(&slsDetector::setMasterFileWrite, pos, value);
}
Result<bool> Detector::getMasterFileWrite(Positions pos) const {
return pimpl->Parallel(&slsDetector::getMasterFileWrite, pos);
}
void Detector::setReceiverStreamingTimer(int time_in_ms, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverStreamingTimer, pos, time_in_ms);
}
Result<int> Detector::getReceiverStreamingTimer(Positions pos) const {
return pimpl->Parallel(&slsDetector::setReceiverStreamingTimer, pos, -1);
}
void Detector::setTenGigaEnabled(bool value, Positions pos) {
pimpl->Parallel(&slsDetector::enableTenGigabitEthernet, pos,
static_cast<int>(value));
}
Result<bool> Detector::getTenGigaEnabled(Positions pos) const {
return pimpl->Parallel(&slsDetector::enableTenGigabitEthernet, pos, -1);
}
Result<int> Detector::getReceiverFifoDepth(Positions pos) const {
return pimpl->Parallel(&slsDetector::setReceiverFifoDepth, pos, -1);
}
void Detector::setReceiverFifoDepth(int nframes, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverFifoDepth, pos, nframes);
}
Result<bool> Detector::getReceiverSilentMode(Positions pos) const {
return pimpl->Parallel(&slsDetector::setReceiverSilentMode, pos, -1); return pimpl->Parallel(&slsDetector::setReceiverSilentMode, pos, -1);
} }