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

rxr sls namespace (#457)

Browse Source 
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
This commit is contained in:
Dhanya Thattil
2022-05-18 11:48:38 +02:00
committed by GitHub
parent fcc7f7aef8
commit 4259363169
88 changed files with 1200 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/src/GeneralData.h
View File

@ -16,6 +16,8 @@
#include <cmath> //ceil
#include <vector>
namespace sls {
class GeneralData {
public:
@ -71,7 +73,7 @@ class GeneralData {
float GetPixelDepth() { return float(dynamicRange) / 8; }
void ThrowGenericError(std::string msg) const {
throw sls::RuntimeError(
throw RuntimeError(
msg + std::string("This is a generic function that should be "
"overloaded by a derived class"));
}
@ -393,7 +395,7 @@ class Mythen3Data : public GeneralData {
virtual void SetCounterMask(const int mask) {
int n = __builtin_popcount(mask);
if (n < 1 || n > 3) {
throw sls::RuntimeError("Invalid number of counters " +
throw RuntimeError("Invalid number of counters " +
std::to_string(n) + ". Expected 1-3.");
}
counterMask = mask;
@ -642,3 +644,5 @@ class MoenchData : public GeneralData {
LOG(logDEBUG) << "Databytes: " << imageSize;
};
};
} // namespace sls