Refs #8385 Refactor code to sum spectra.

mantidproject · Nov 7, 2013 · 258dfb8 · 258dfb8
1 parent d37882b
commit 258dfb8
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadLLB.cpp b/Code/Mantid/Framework/DataHandling/src/LoadLLB.cpp
@@ -225,14 +225,24 @@ int LoadLLB::getDetectorElasticPeakPosition(const NeXus::NXFloat &data) {
 
 	std::vector<int> listOfFoundEPP;
 
+
 	std::vector<int> cumulatedSumOfSpectras(m_numberOfChannels, 0);
-	for (size_t i = 0; i < m_numberOfTubes; i++) {
+	for (size_t i = 0; i < m_numberOfTubes; i++) 
+	{
 		float* data_p = &data(static_cast<int>(i), 0);
-		std::vector<int> thisSpectrum(data_p, data_p + static_cast<int>(m_numberOfChannels));
-		// sum spectras
-		std::transform(thisSpectrum.begin(), thisSpectrum.end(),
-				cumulatedSumOfSpectras.begin(), cumulatedSumOfSpectras.begin(),
-				std::plus<int>());
+		float currentSpec = 0;
+
+		for (size_t j = 0; j  < m_numberOfChannels; ++j)
+			currentSpec += data_p[j];
+
+		if(i > 0)
+		{
+			cumulatedSumOfSpectras[i] = cumulatedSumOfSpectras[i-1] + static_cast<int>(currentSpec);
+		}
+		else
+		{
+			cumulatedSumOfSpectras[i] = static_cast<int>(currentSpec);
+		}
 	}
 	auto it = std::max_element(cumulatedSumOfSpectras.begin(),
 			cumulatedSumOfSpectras.end());