detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-03 10:28:39 +01:00
Code Issues Actions Packages Releases Activity

fixed clang compiler warnings (#586)

Browse Source
This commit is contained in:
Dhanya Thattil
2022-11-25 11:00:02 +01:00
committed by GitHub
parent 255a75a646
commit a2f41c13b7
5 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@@ -50,7 +50,7 @@ void DetectorImpl::setupDetector(bool verify, bool update) {
ctb_shm.openSharedMemory(verify); ctb_shm.openSharedMemory(verify);
} }
bool DetectorImpl::isAllPositions(const Positions pos) const { bool DetectorImpl::isAllPositions(Positions pos) const {
return (pos.empty() || (pos.size() == 1 && pos[0] == -1) || return (pos.empty() || (pos.size() == 1 && pos[0] == -1) ||
(pos.size() == modules.size())); (pos.size() == modules.size()));
} }

2
slsDetectorSoftware/src/DetectorImpl.h
View File

@@ -190,7 +190,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
} }
} }
bool isAllPositions(const Positions pos) const; bool isAllPositions(Positions pos) const;
/** set acquiring flag in shared memory */ /** set acquiring flag in shared memory */
void setAcquiringFlag(bool flag); void setAcquiringFlag(bool flag);

2
slsReceiverSoftware/src/DataProcessor.h
View File

@@ -24,7 +24,7 @@ class GeneralData;
class Fifo; class Fifo;
class File; class File;
class DataStreamer; class DataStreamer;
struct MasterAttributes; class MasterAttributes;
class DataProcessor : private virtual slsDetectorDefs, public ThreadObject { class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {

2
slsReceiverSoftware/src/File.h
View File

@@ -13,8 +13,6 @@
namespace sls { namespace sls {
struct MasterAttributes;
class File : private virtual slsDetectorDefs { class File : private virtual slsDetectorDefs {
public: public:

1
slsReceiverSoftware/src/Implementation.h
View File

@@ -366,7 +366,6 @@ class Implementation : private virtual slsDetectorDefs {
bool activated{true}; bool activated{true};
std::array<bool, 2> detectorDataStream = {{true, true}}; std::array<bool, 2> detectorDataStream = {{true, true}};
std::array<bool, 2> detectorDataStream10GbE = {{true, true}}; std::array<bool, 2> detectorDataStream10GbE = {{true, true}};
std::array<bool, 2> portStream = {{true, true}};
int readNRows{0}; int readNRows{0};
int thresholdEnergyeV{-1}; int thresholdEnergyeV{-1};
std::array<int, 3> thresholdAllEnergyeV = {{-1, -1, -1}}; std::array<int, 3> thresholdAllEnergyeV = {{-1, -1, -1}};