merge from 7.0.0

This commit is contained in:
2023-02-24 10:39:51 +01:00
101 changed files with 4009 additions and 2128 deletions

View File

@@ -306,6 +306,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
void getBadChannels(const std::string &fname, Positions pos) const;
void setBadChannels(const std::string &fname, Positions pos);
void setBadChannels(const std::vector<int> list, Positions pos);
std::vector<std::string> getCtbDacNames() const;
std::string getCtbDacName(defs::dacIndex i) const;
@@ -348,8 +349,8 @@ class DetectorImpl : public virtual slsDetectorDefs {
void updateDetectorSize();
int destroyReceivingDataSockets();
int createReceivingDataSockets();
void destroyReceivingDataSockets();
void createReceivingDataSockets();
/**
* Reads frames from receiver through a constant socket