Improvements for Flag Reasons and TRFCollections (#5941)

knopers8 · web-flow · commit 38ce5598e462 · 2021-04-19T08:57:52.000+02:00
* Provide a default FlagReason constructor for ROOT

* Name and Detector getters for TRFCollections
diff --git a/DataFormats/QualityControl/include/DataFormatsQualityControl/FlagReasons.h b/DataFormats/QualityControl/include/DataFormatsQualityControl/FlagReasons.h
@@ -43,6 +43,7 @@ class FlagReason
   FlagReason(uint16_t id, const char* name, bool bad) : mId(id), mName(name), mBad(bad) {}
 
  public:
+  FlagReason();
   FlagReason& operator=(const FlagReason&) = default;
   FlagReason(const FlagReason&) = default;
   bool operator==(const FlagReason& rhs) const;
diff --git a/DataFormats/QualityControl/include/DataFormatsQualityControl/TimeRangeFlagCollection.h b/DataFormats/QualityControl/include/DataFormatsQualityControl/TimeRangeFlagCollection.h
@@ -54,6 +54,9 @@ class TimeRangeFlagCollection
   collection_t::const_iterator begin() const;
   collection_t::const_iterator end() const;
 
+  const std::string& getName() const;
+  const std::string& getDetector() const;
+
   /// write data to ostream
   void streamTo(std::ostream& output) const;
 
diff --git a/DataFormats/QualityControl/src/FlagReasons.cxx b/DataFormats/QualityControl/src/FlagReasons.cxx
@@ -16,6 +16,11 @@
 namespace o2::quality_control
 {
 
+FlagReason::FlagReason()
+{
+  *this = FlagReasonFactory::Invalid();
+}
+
 std::ostream& operator<<(std::ostream& os, FlagReason const& my)
 {
   os << "Flag Reason: id - " << my.mId << ", name - " << my.mName << ", bad - " << (my.mBad ? "true" : "false");
diff --git a/DataFormats/QualityControl/src/TimeRangeFlagCollection.cxx b/DataFormats/QualityControl/src/TimeRangeFlagCollection.cxx
@@ -73,4 +73,13 @@ std::ostream& operator<<(std::ostream& output, const TimeRangeFlagCollection& da
   return output;
 }
 
+const std::string& TimeRangeFlagCollection::getName() const
+{
+  return mName;
+}
+const std::string& TimeRangeFlagCollection::getDetector() const
+{
+  return mDetID;
+}
+
 } // namespace o2::quality_control
diff --git a/DataFormats/QualityControl/test/testFlagReasons.cxx b/DataFormats/QualityControl/test/testFlagReasons.cxx
@@ -27,6 +27,9 @@ BOOST_AUTO_TEST_CASE(FlagReasons)
   static_assert(std::is_constructible<FlagReason, uint16_t, const char*, bool>::value == false,
                 "FlagReason should not be constructible outside of its static methods.");
 
+  FlagReason rDefault;
+  BOOST_CHECK_EQUAL(rDefault, FlagReasonFactory::Invalid());
+
   auto r1 = FlagReasonFactory::Unknown();
   BOOST_CHECK_EQUAL(r1.getID(), 1);
   BOOST_CHECK_EQUAL(r1.getName(), "Unknown");

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@`
`16`	`16`	`namespace o2::quality_control`
`17`	`17`	`{`
`18`	`18`
	`19`	`+FlagReason::FlagReason()`
	`20`	`+{`
	`21`	`+ *this = FlagReasonFactory::Invalid();`
	`22`	`+}`
	`23`	`+`
`19`	`24`	`std::ostream& operator<<(std::ostream& os, FlagReason const& my)`
`20`	`25`	`{`
`21`	`26`	`os << "Flag Reason: id - " << my.mId << ", name - " << my.mName << ", bad - " << (my.mBad ? "true" : "false");`