TPCQC: fix merge function for Clusters object

Author: tklemenz

Detectors/TPC/qc/include/TPCQC/Clusters.h

@@ -55,7 +55,7 @@ class Clusters
 
   void reset();
 
-  void merge(const Clusters& clusters);
+  void merge(Clusters& clusters);
 
   void dumpToFile(std::string filename, int type = 0);
 

Detectors/TPC/qc/src/Clusters.cxx

@@ -134,12 +134,17 @@ void Clusters::reset()
 }
 
 //______________________________________________________________________________
-void Clusters::merge(const Clusters& clusters)
+void Clusters::merge(Clusters& clusters)
 {
-  const bool isNormalized = mIsNormalized;
-  if (isNormalized) {
+  const bool isThisNormalized = mIsNormalized;
+  const bool isOtherNormalized = clusters.mIsNormalized;
+
+  if (isThisNormalized) {
     denormalize();
   }
+  if (isOtherNormalized) {
+    clusters.denormalize();
+  }
 
   mNClusters += clusters.mNClusters;
   mQMax += clusters.mQMax;
@@ -148,9 +153,12 @@ void Clusters::merge(const Clusters& clusters)
   mSigmaPad += clusters.mSigmaPad;
   mTimeBin += clusters.mTimeBin;
 
-  if (isNormalized) {
+  if (isThisNormalized) {
     normalize();
   }
+  if (isOtherNormalized) {
+    clusters.normalize();
+  }
 }
 
 //______________________________________________________________________________