From fa7a8dac30087d63e0c99b46ed6b0370d86304a8 Mon Sep 17 00:00:00 2001 From: "Frust, Tobias (FWCC) - 111645" Date: Fri, 3 Nov 2017 08:46:48 +0100 Subject: bug fixes --- src/DetectorModule/DetectorModule.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/DetectorModule/DetectorModule.cpp') diff --git a/src/DetectorModule/DetectorModule.cpp b/src/DetectorModule/DetectorModule.cpp index 8193a03..169c5a5 100644 --- a/src/DetectorModule/DetectorModule.cpp +++ b/src/DetectorModule/DetectorModule.cpp @@ -25,12 +25,11 @@ void timer_start(std::function func, unsigned int interval){ }).detach(); } -DetectorModule::DetectorModule(const int detectorID, const std::string& address, const std::string& configPath, const int packetSize) : +DetectorModule::DetectorModule(const int detectorID, const std::string& address, const std::string& configPath) : detectorID_{detectorID}, numberOfDetectorsPerModule_{16}, index_{0u}, - client_{address, detectorID+4000}, - packetSize_{packetSize} { + client_{address, detectorID+4000}{ printf("Creating %d\n", detectorID); @@ -38,7 +37,7 @@ DetectorModule::DetectorModule(const int detectorID, const std::string& address, throw std::runtime_error("DetectorModule: Configuration file could not be loaded successfully. Please check!"); } - sendBuffer_.resize(numberOfProjectionsPerPacket_*numberOfDetectorsPerModule_+sizeof(std::size_t)+sizeof(unsigned short)); + sendBuffer_.resize(numberOfProjectionsPerPacket_*numberOfDetectorsPerModule_*sizeof(unsigned short)+sizeof(std::size_t)); //read the input data from the file corresponding to the detectorModuleID readInput(); @@ -109,7 +108,7 @@ auto DetectorModule::readConfig(const std::string& configFile) -> bool { && configReader.lookupValue("scanRate", scanRate) && configReader.lookupValue("numberOfDataFrames", numberOfFrames_) && configReader.lookupValue("numberOfProjectionsPerPacket", numberOfProjectionsPerPacket_) - && configReader.lookupValue("numberOfDetectorsPerModule", numberOfProjectionsPerPacket_)) { + && configReader.lookupValue("numberOfDetectorsPerModule", numberOfDetectorsPerModule_)) { numberOfProjections_ = samplingRate * 1000000 / scanRate; return EXIT_SUCCESS; } -- cgit v1.2.3