diff options
| author | Tobias Frust <tobiasfrust@gmail.com> | 2016-10-13 10:27:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 10:27:01 +0200 |
| commit | a38a5f1b646cdc992c3b602330a41036bc9bf7b1 (patch) | |
| tree | 7fc93e5f5c3729d0fa013946fe60fa881a53579c /src/Detector | |
| parent | 8af3d595e2856f81a46a91d67e96f53cb3b25d0f (diff) | |
| parent | cdab7a0b05f655a2f98f00f3fb8928e54b8c28d2 (diff) | |
| download | ods-a38a5f1b646cdc992c3b602330a41036bc9bf7b1.tar.gz ods-a38a5f1b646cdc992c3b602330a41036bc9bf7b1.tar.bz2 ods-a38a5f1b646cdc992c3b602330a41036bc9bf7b1.tar.xz ods-a38a5f1b646cdc992c3b602330a41036bc9bf7b1.zip | |
Merge pull request #2 from tobiasfrust/master
Merge of the DetectorSimulator
Diffstat (limited to 'src/Detector')
| -rw-r--r-- | src/Detector/Detector.cpp | 4 | ||||
| -rw-r--r-- | src/Detector/Detector.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Detector/Detector.cpp b/src/Detector/Detector.cpp index 5dde6d1..03abffe 100644 --- a/src/Detector/Detector.cpp +++ b/src/Detector/Detector.cpp @@ -10,12 +10,12 @@ #include "Detector.h" -Detector::Detector(const std::string& address, const std::string& configPath, const unsigned int timeIntervall) : +Detector::Detector(const std::string& address, const std::string& configPath, const unsigned int timeIntervall, const int packetSize) : timeIntervall_{timeIntervall}, numberOfDetectorModules_{27} { modules_.reserve(numberOfDetectorModules_); for(auto i = 0; i < numberOfDetectorModules_; i++){ - modules_.emplace_back(i, address, configPath); + modules_.emplace_back(i, address, configPath, packetSize); } } diff --git a/src/Detector/Detector.h b/src/Detector/Detector.h index 1969dbd..16f946a 100644 --- a/src/Detector/Detector.h +++ b/src/Detector/Detector.h @@ -17,7 +17,7 @@ class Detector { public: - Detector(const std::string& address, const std::string& configPath, const unsigned int timeIntervall); + Detector(const std::string& address, const std::string& configPath, const unsigned int timeIntervall, const int packetSize); auto run() -> void; private: |