Fix normalisation calculation

Author: mpuccio

Common/Core/ZorroSummary.cxx

@@ -56,19 +56,26 @@ Long64_t ZorroSummary::Merge(TCollection* list)
   return n;
 }
 
-double ZorroSummary::getNormalisationFactor(int toiId) const
+std::unordered_map<int, std::vector<double>> ZorroSummary::getPerRunNormalisationFactors() const
 {
-  double totalTOI{0.}, totalTVX{0.};
-  ULong64_t totalAnalysedTOI{0};
-  for (const auto& [runNumber, toiCounters] : mTOIcounters) {
-    totalTOI += toiCounters.at(toiId);
-  }
-  for (const auto& [runNumber, tvxCounters] : mTVXcounters) {
-    totalTVX += tvxCounters;
-  }
+  std::unordered_map<int, std::vector<double>> runNormalisations;
   for (const auto& [runNumber, analysedTOIcounters] : mAnalysedTOIcounters) {
-    totalAnalysedTOI += analysedTOIcounters.at(toiId);
+    const double tvxCount = mTVXcounters.at(runNumber);
+    for (int toiId = 0; toiId < mNtois; ++toiId) {
+      double toiCount = mTOIcounters.at(runNumber).at(toiId);
+      ULong64_t analysedTOI = analysedTOIcounters.at(toiId);
+      runNormalisations[runNumber].push_back(tvxCount * analysedTOI / toiCount);
+    }
   }
+  return runNormalisations;
+}
 
-  return totalTVX * totalAnalysedTOI / totalTOI;
+double ZorroSummary::getNormalisationFactor(int toiId) const
+{
+  double normalisationFactor{0.};
+  auto runNormalisations = getPerRunNormalisationFactors();
+  for (const auto& [runNumber, normalisations] : runNormalisations) {
+    normalisationFactor += normalisations.at(toiId);
+  }
+  return normalisationFactor;
 }

Common/Core/ZorroSummary.h

@@ -54,6 +54,8 @@ class ZorroSummary : public TNamed
     mCurrentAnalysedTOIcounters = &mAnalysedTOIcounters[runNumber];
   }
   double getNormalisationFactor(int toiId) const;
+  std::unordered_map<int, std::vector<double>> getPerRunNormalisationFactors() const;
+
   void increaseTOIcounter(int runNumber, int toiId)
   {
     if (runNumber != mRunNumber) {