TPC: add operator= for pad calibration classes

wiechula · davidrohr · commit e966db8d0cea · 2021-10-07T10:00:39.000+02:00
diff --git a/Detectors/TPC/base/include/TPCBase/CalArray.h b/Detectors/TPC/base/include/TPCBase/CalArray.h
@@ -12,6 +12,7 @@
 #ifndef ALICEO2_TPC_CALARRAY_H_
 #define ALICEO2_TPC_CALARRAY_H_
 
+#include <algorithm>
 #include <memory>
 #include <vector>
 #include <string>
@@ -133,6 +134,13 @@ class CalArray
   /// Divide value on all channels
   const CalArray& operator/=(const T& val);
 
+  /// assigment to all channls
+  const CalArray& operator=(const T& val)
+  {
+    std::fill(mData.begin(), mData.end(), val);
+    return *this;
+  }
+
  private:
   std::string mName;
   // better to use std::array?
diff --git a/Detectors/TPC/base/include/TPCBase/CalDet.h b/Detectors/TPC/base/include/TPCBase/CalDet.h
@@ -88,6 +88,8 @@ class CalDet
   const CalDet& operator*=(const T& val);
   const CalDet& operator/=(const T& val);
 
+  const CalDet& operator=(const T& val);
+
   template <class U>
   friend CalDet<U> operator+(const CalDet<U>&, const CalDet<U>&);
 
@@ -339,6 +341,16 @@ inline const CalDet<T>& CalDet<T>::operator/=(const T& val)
   return *this;
 }
 
+//______________________________________________________________________________
+template <class T>
+inline const CalDet<T>& CalDet<T>::operator=(const T& val)
+{
+  for (auto& cal : mData) {
+    cal = val;
+  }
+  return *this;
+}
+
 //______________________________________________________________________________
 template <class T>
 CalDet<T> operator+(const CalDet<T>& c1, const CalDet<T>& c2)
diff --git a/Detectors/TPC/base/test/testTPCCalDet.cxx b/Detectors/TPC/base/test/testTPCCalDet.cxx
@@ -9,6 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include <algorithm>
 #define BOOST_TEST_MODULE Test TPC CalDet class
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
@@ -302,6 +303,13 @@ BOOST_AUTO_TEST_CASE(CalDet_Arithmetics)
     }
   }
   BOOST_CHECK_EQUAL(isEqual, true);
+
+  // = operator
+  isEqual = true;
+  padCmp = 10.f;
+  for (const auto& calArr : padCmp.getData()) {
+    isEqual &= std::all_of(calArr.getData().begin(), calArr.getData().end(), [](const auto val) { return isEqualAbs(val, 10.f); });
+  }
 }
 
 } // namespace tpc
diff --git a/Detectors/TPC/qc/src/Clusters.cxx b/Detectors/TPC/qc/src/Clusters.cxx
@@ -123,12 +123,12 @@ void Clusters::denormalize()
 //______________________________________________________________________________
 void Clusters::reset()
 {
-  mNClusters *= 0;
-  mQMax *= 0;
-  mQTot *= 0;
-  mSigmaTime *= 0;
-  mSigmaPad *= 0;
-  mTimeBin *= 0;
+  mNClusters = 0;
+  mQMax = 0;
+  mQTot = 0;
+  mSigmaTime = 0;
+  mSigmaPad = 0;
+  mTimeBin = 0;
 }
 
 //______________________________________________________________________________
diff --git a/Detectors/TPC/workflow/src/CalDetMergerPublisherSpec.cxx b/Detectors/TPC/workflow/src/CalDetMergerPublisherSpec.cxx
@@ -98,7 +98,7 @@ class CalDetMergerPublisherSpec : public o2::framework::Task
         sendOutput(pc.outputs());
         // reset calibration objects
         for (auto& [type, object] : mMergedCalDets) {
-          object *= 0;
+          object = 0;
         }
         mCalibDumped = false;
       }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`// granted to it by virtue of its status as an Intergovernmental Organization`
`10`	`10`	`// or submit itself to any jurisdiction.`
`11`	`11`
	`12`	`+#include <algorithm>`
`12`	`13`	`#define BOOST_TEST_MODULE Test TPC CalDet class`
`13`	`14`	`#define BOOST_TEST_MAIN`
`14`	`15`	`#define BOOST_TEST_DYN_LINK`
`@@ -302,6 +303,13 @@ BOOST_AUTO_TEST_CASE(CalDet_Arithmetics)`
`302`	`303`	`}`
`303`	`304`	`}`
`304`	`305`	`BOOST_CHECK_EQUAL(isEqual, true);`
	`306`	`+`
	`307`	`+ // = operator`
	`308`	`+ isEqual = true;`
	`309`	`+ padCmp = 10.f;`
	`310`	`+ for (const auto& calArr : padCmp.getData()) {`
	`311`	`+ isEqual &= std::all_of(calArr.getData().begin(), calArr.getData().end(), [](const auto val) { return isEqualAbs(val, 10.f); });`
	`312`	`+ }`
`305`	`313`	`}`
`306`	`314`
`307`	`315`	`} // namespace tpc`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class CalDetMergerPublisherSpec : public o2::framework::Task`
`98`	`98`	`sendOutput(pc.outputs());`
`99`	`99`	`// reset calibration objects`
`100`	`100`	`for (auto& [type, object] : mMergedCalDets) {`
`101`		`- object *= 0;`
	`101`	`+ object = 0;`
`102`	`102`	`}`
`103`	`103`	`mCalibDumped = false;`
`104`	`104`	`}`