[PWGCF] DptDpt - Filter and skimming framework fix MegaLinter issues

Author: Victor Gonzalez

PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx

@@ -48,39 +48,33 @@ EventSelectionConfigurable::EventSelectionConfigurable(const std::vector<std::st
                                                        std::vector<std::string> trigsel,
                                                        std::vector<std::string> zvtxsel,
                                                        std::vector<std::string> pileuprej)
-  : mBFiledSel(""),
-    mMultSel(""),
-    mTriggerSel(""),
-    mZVertexSel(""),
-    mPileUpRejection("")
+
 {
   auto storeCutString = [](auto& selvector, const std::string& selname) {
     if (selvector.size() != 0) {
       if (selvector.size() == 1) {
         if (selvector[0].size() != 0) {
           return TString::Format("%s{%s}", selname.c_str(), selvector[0].c_str());
-        } else {
-          return TString("");
         }
-      } else {
-        TString scut = selname + "{cwv{";
-        bool def = true;
-        bool firstvar = true;
-        for (const auto& cut : selvector) {
-          if (def) {
-            scut += cut + ':';
-            def = false;
-          } else {
-            if (not firstvar) {
-              scut += ',';
-            }
-            scut += cut;
-            firstvar = false;
+        return TString("");
+      }
+      TString scut = selname + "{cwv{";
+      bool def = true;
+      bool firstvar = true;
+      for (const auto& cut : selvector) {
+        if (def) {
+          scut += cut + ':';
+          def = false;
+        } else {
+          if (not firstvar) {
+            scut += ',';
           }
+          scut += cut;
+          firstvar = false;
         }
-        scut += "}}";
-        return scut;
       }
+      scut += "}}";
+      return scut;
     }
     return TString("");
   };
@@ -113,9 +107,7 @@ const char* multiplicityCorrelators[nNoOfPileUpCorrelators] = {"V0M_TPCOUT", "V0
 
 /// \brief Default constructor
 EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis()
-  : SelectionFilterAndAnalysis(),
-    mBFieldSelection{},
-    mMultiplicityClasses(nullptr),
+  : mMultiplicityClasses(nullptr),
     mTriggerSelection(nullptr),
     mZVertex(nullptr),
     mPileUpRejection(nullptr)
@@ -125,7 +117,7 @@ EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis()
 /// \brief Constructor from regular expression
 EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const TString& cutstr, Selmodes mode)
   : SelectionFilterAndAnalysis("", mode),
-    mBFieldSelection{},
+
     mMultiplicityClasses(nullptr),
     mTriggerSelection(nullptr),
     mZVertex(nullptr),
@@ -137,7 +129,7 @@ EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const TString&
 /// \brief Constructor from the event selection configurable
 EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const EventSelectionConfigurable& evtsel, Selmodes mode)
   : SelectionFilterAndAnalysis("", mode),
-    mBFieldSelection{},
+
     mMultiplicityClasses(nullptr),
     mTriggerSelection(nullptr),
     mZVertex(nullptr),
@@ -148,7 +140,7 @@ EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const EventSele
   constexpr int MaskMaxLength = 64;
 
   auto appendCut = [&cutString, &first](const std::string& str) {
-    if (str.size() > 0) {
+    if (!str.empty()) {
       if (first) {
         cutString += str;
         first = false;
@@ -246,7 +238,7 @@ void EventSelectionFilterAndAnalysis::MultiplicityBrick::initialize()
         }
       }
     }
-    if (mAlternateEstimatorIndex.size() != (uint)(varlst.GetEntries())) {
+    if (mAlternateEstimatorIndex.size() != static_cast<uint>(varlst.GetEntries())) {
       LOGF(fatal, "EventSelectionFilterAndAnalysis::InitializeMultiplicityFilter() variant multiplicity class estimators not all implemented");
     }
   }
@@ -303,7 +295,7 @@ void EventSelectionFilterAndAnalysis::PileUpRejBrick::initialize()
         }
       }
     }
-    if (mAlternateEstimatorIndex.size() != (uint)(varlst.GetEntries())) {
+    if (mAlternateEstimatorIndex.size() != static_cast<uint>(varlst.GetEntries())) {
       LOGF(fatal, "EventSelectionFilterAndAnalysis::InitializeMultiplicityFilter() variant pile-up correlator estimators not all implemented");
     }
   }
@@ -348,15 +340,13 @@ void EventSelectionFilterAndAnalysis::constructCutFromString(const TString& cuts
       }
       LOGF(info, "Captured %s", m[1].str().c_str());
       auto storeIntCut = [&m, &allowed](CutBrick<int>*& brickvar) {
-        if (brickvar != nullptr) {
-          delete brickvar;
-        }
+        delete brickvar;
+
         brickvar = CutBrick<int>::constructBrick(m[1].str().c_str(), m[2].str().c_str(), allowed);
       };
       auto storeFloatCut = [&m, &allowed](CutBrick<float>*& brickvar) {
-        if (brickvar != nullptr) {
-          delete brickvar;
-        }
+        delete brickvar;
+
         brickvar = CutBrick<float>::constructBrick(m[1].str().c_str(), m[2].str().c_str(), allowed);
       };
       /* b-field requires speciat treatment */
@@ -423,7 +413,7 @@ void EventSelectionFilterAndAnalysis::ComplexBrickHelper::armedBrick(uint64_t& a
     }
   };
 
-  if (mAlternateEstimatorIndex.size() > 0) {
+  if (!mAlternateEstimatorIndex.empty()) {
     /* we have alternative estimators so our brick is of kind cwv */
     if (mBrick->IsA() != CutWithVariations<float>::Class()) {
       LOGF(fatal, "EventSelectionFilterAndAnalysis::filter() expected class with variations cut but it is not there");
@@ -433,11 +423,11 @@ void EventSelectionFilterAndAnalysis::ComplexBrickHelper::armedBrick(uint64_t& a
     if (deflst.GetEntries() > 1) {
       LOGF(fatal, "EventSelectionFilterAndAnalysis::filter() expected only one default multiplicity class estimator");
     }
-    armedBrick((CutBrick<float>*)deflst.At(0), true);
+    armedBrick(dynamic_cast<CutBrick<float>*>(deflst.At(0)), true);
     /* and now the variants */
     TList& varlst = dynamic_cast<CutWithVariations<float>*>(mBrick)->getVariantBricks();
     for (int i = 0; i < varlst.GetEntries(); ++i) {
-      armedBrick((CutBrick<float>*)varlst.At(i), true);
+      armedBrick(dynamic_cast<CutBrick<float>*>(varlst.At(i)), true);
     }
   } else {
     /* no alternative estimators, just the default */

PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h

@@ -32,11 +32,7 @@
 #include <utility>
 #include <vector>
 
-namespace o2
-{
-namespace analysis
-{
-namespace pwgcf
+namespace o2::analysis::pwgcf
 {
 /* forward declaration */
 class EventSelectionFilterAndAnalysis;
@@ -62,13 +58,12 @@ class EventSelectionConfigurable
                              std::vector<std::string> pileuprej);
 
  private:
-  std::string mBFiledSel = "";       //! the magnetic field selection cuts
-  std::string mMultSel = "";         //! the multiplicity selection cuts
-  std::string mTriggerSel = "";      //! the trigger selection cuts
-  std::string mZVertexSel = "";      //! the z vertex selection cuts
-  std::string mPileUpRejection = ""; //! the pile-up rejection criteria
+  std::string mBFiledSel;       //! the magnetic field selection cuts
+  std::string mMultSel;         //! the multiplicity selection cuts
+  std::string mTriggerSel;      //! the trigger selection cuts
+  std::string mZVertexSel;      //! the z vertex selection cuts
+  std::string mPileUpRejection; //! the pile-up rejection criteria
 
- private:
   ClassDefNV(EventSelectionConfigurable, 1);
 };
 
@@ -91,8 +86,8 @@ class EventSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
     virtual ~ComplexBrickHelper() = default;
     CutBrick<float>* mBrick = nullptr;
     int mDefaultEstimatorIndex = -1;
-    std::vector<int> mAlternateEstimatorIndex = std::vector<int>{};
-    std::vector<float> mValues = std::vector<float>{};
+    std::vector<int> mAlternateEstimatorIndex;
+    std::vector<float> mValues;
     int length() { return mBrick->length(); }
     virtual void initialize() = 0;
     virtual bool filter(uint64_t& mask, int& bit, CutBrick<float>* brick, int index) = 0;
@@ -107,16 +102,16 @@ class EventSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
   };
   struct PileUpRejBrick : public ComplexBrickHelper {
     void initialize() override;
-    std::vector<float> mIndepVar = std::vector<float>{};
+    std::vector<float> mIndepVar;
     bool filter(uint64_t& mask, int& bit, CutBrick<float>* brick, int index) override;
   };
 
   static bool filterBrickValue(uint64_t& mask, int& bit, CutBrick<float>* brick, float value);
   void constructCutFromString(const TString&);
   template <typename CollisionToFilter, typename AssociatedTracks>
   void storeMultiplicities(CollisionToFilter const&, AssociatedTracks const&);
-  int calculateMaskLength() override;
-  void storeArmedMask() override;
+  int calculateMaskLength() final;
+  void storeArmedMask() final;
 
   std::vector<CutBrick<float>*> mBFieldSelection; //! the magnetic field selection cuts
   MultiplicityBrick* mMultiplicityClasses;        //! the multiplicity classes cuts
@@ -180,19 +175,19 @@ inline bool EventSelectionFilterAndAnalysis::filterBrickValue(uint64_t& mask, in
 inline bool EventSelectionFilterAndAnalysis::ComplexBrickHelper::filter(uint64_t& mask, int& bit)
 {
   bool acceptcollision = true;
-  if (mAlternateEstimatorIndex.size() > 0) {
+  if (!mAlternateEstimatorIndex.empty()) {
     bool atleastonealternative = false;
     /*   if (mBrick->IsA() != CutWithVariations<float>::Class()) {
           LOGF(fatal, "EventSelectionFilterAndAnalysis::filter() expected class with variations cut but it is not there");
         } */
     /* first the default */
     TList& deflst = dynamic_cast<CutWithVariations<float>*>(mBrick)->getDefaultBricks();
-    bool acc = filter(mask, bit, (CutBrick<float>*)deflst.At(0), mDefaultEstimatorIndex);
+    bool acc = filter(mask, bit, dynamic_cast<CutBrick<float>*>(deflst.At(0)), mDefaultEstimatorIndex);
     atleastonealternative = atleastonealternative || acc;
     /* and now the variants */
     TList& varlst = dynamic_cast<CutWithVariations<float>*>(mBrick)->getVariantBricks();
     for (int i = 0; i < varlst.GetEntries(); ++i) {
-      bool acc = filter(mask, bit, (CutBrick<float>*)varlst.At(i), mAlternateEstimatorIndex[i]);
+      bool acc = filter(mask, bit, dynamic_cast<CutBrick<float>*>(varlst.At(i)), mAlternateEstimatorIndex[i]);
       atleastonealternative = atleastonealternative || acc;
     }
     acceptcollision = acceptcollision && atleastonealternative;
@@ -226,7 +221,7 @@ inline uint64_t EventSelectionFilterAndAnalysis::filter(CollisionToFilter const&
 
   /* we require the collision be accepted by the whole set of filters */
   bool acceptcollision = true;
-  if (mBFieldSelection.size() > 0) {
+  if (!mBFieldSelection.empty()) {
     bool oneatleast = false;
     for (const auto& brick : mBFieldSelection) {
       bool acc = filterBrickValue(selectedMask, bit, brick, bfield);
@@ -258,7 +253,7 @@ inline std::vector<float> EventSelectionFilterAndAnalysis::MultiplicityBrick::ge
 {
   std::vector<float> res;
 
-  if (mAlternateEstimatorIndex.size() > 0) {
+  if (!mAlternateEstimatorIndex.empty()) {
     /* first the default */
     res.push_back(mValues[mDefaultEstimatorIndex]);
     /* and now the variants */
@@ -273,8 +268,6 @@ inline std::vector<float> EventSelectionFilterAndAnalysis::MultiplicityBrick::ge
   return res;
 }
 
-} // namespace pwgcf
-} // namespace analysis
-} // namespace o2
+} // namespace o2::analysis::pwgcf
 
 #endif // PWGCF_TWOPARTICLECORRELATIONS_CORE_EVENTSELECTIONFILTERANDANALYSIS_H_

PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.cxx

@@ -26,7 +26,6 @@
 #include <Framework/Logger.h>
 
 #include <TList.h>
-#include <TNamed.h>
 #include <TObjString.h>
 
 #include <Rtypes.h>
@@ -45,19 +44,8 @@ ClassImp(FilterAndAnalysisFramework);
 
 /// \brief Default constructor
 FilterAndAnalysisFramework::FilterAndAnalysisFramework()
-  : TNamed(),
-    ccdburl(""),
-    ccdbpath(""),
-    filterdate(""),
-    forceupdate(false),
-    fTrackFilter(nullptr),
-    fEventFilter(nullptr),
-    fPIDFilter(nullptr),
-    tmpTrackFilter(nullptr),
-    tmpEventFilter(nullptr),
-    tmpPIDFilter(nullptr)
-{
-}
+
+  = default;
 
 /// \brief Named constructor for a concrete operating mode
 void FilterAndAnalysisFramework::setConfiguration(EventSelectionConfigurable& evtf, TrackSelectionConfigurable& trkf, PIDSelectionConfigurable& pidf, SelectionFilterAndAnalysis::Selmodes mode)
@@ -96,15 +84,15 @@ void FilterAndAnalysisFramework::registerConfiguration()
   uint64_t eot = timestamp + (12 * 60 * 60 * 1000 - 1000); /* one second before the end of the day */
 
   /* get access to the CCDB */
-  o2::ccdb::CcdbApi* ccdb = new o2::ccdb::CcdbApi();
+  auto* ccdb = new o2::ccdb::CcdbApi();
   ccdb->init(ccdburl);
   o2::ccdb::BasicCCDBManager* ccdbm = &o2::ccdb::BasicCCDBManager::instance();
   ccdbm->setFatalWhenNull(false); /* we need to check the availability of objects */
   ccdbm->setURL(ccdburl);
   signatures = ccdbm->getForTimeStamp<TList>(ccdbpath, timestamp);
 
   auto storesignatures = [&]() {
-    TList* siglst = new TList();
+    auto* siglst = new TList();
     siglst->SetOwner();
     siglst->SetName("Skimming signatures");
     siglst->Add(new TObjString(tmpEventFilter->getCutStringSignature().Data()));

PWGCF/TwoParticleCorrelations/Core/FilterAndAnalysisFramework.h

@@ -30,11 +30,7 @@
 #include <string>
 #include <vector>
 
-namespace o2
-{
-namespace analysis
-{
-namespace pwgcf
+namespace o2::analysis::pwgcf
 {
 
 /// \brief Base class for filter and selection once filetered
@@ -68,9 +64,9 @@ class FilterAndAnalysisFramework : public TNamed
   std::vector<uint64_t>& getTrackOptMask() { return fTrackFilter->getOptMask(); }
   std::vector<uint64_t>& getPIDOptMask() { return fPIDFilter->getOptMask(); }
   /// \brief provides the optional part mask of the different objects in a printable shape
-  TString printCollisionOptionalMasks() const { return fEventFilter->printOptionalMasks(); }
-  TString printTrackOptionalMasks() const { return fTrackFilter->printOptionalMasks(); }
-  TString printPIDOptionalMasks() const { return fPIDFilter->printOptionalMasks(); }
+  [[nodiscard]] TString printCollisionOptionalMasks() const { return fEventFilter->printOptionalMasks(); }
+  [[nodiscard]] TString printTrackOptionalMasks() const { return fTrackFilter->printOptionalMasks(); }
+  [[nodiscard]] TString printPIDOptionalMasks() const { return fPIDFilter->printOptionalMasks(); }
   /// \brief get the valid (armed) mandatory part mask associated to the configuration of the different objects
   /// \return the corresponding armed forced mask
   /// A clear example of the mandatory part mask is the mask of the zvertex and their
@@ -105,9 +101,9 @@ class FilterAndAnalysisFramework : public TNamed
   const TString& getPIDFilterCutStringSignature() { return fPIDFilter->getCutStringSignature(); }
 
  private:
-  std::string ccdburl = "";
-  std::string ccdbpath = "";
-  std::string filterdate = "";
+  std::string ccdburl;
+  std::string ccdbpath;
+  std::string filterdate;
   bool forceupdate = false;
   pwgcf::TrackSelectionFilterAndAnalysis* fTrackFilter = nullptr;   /// the track filter
   pwgcf::EventSelectionFilterAndAnalysis* fEventFilter = nullptr;   /// the event filter
@@ -121,8 +117,6 @@ class FilterAndAnalysisFramework : public TNamed
 
 extern void registerConfiguration(o2::analysis::pwgcf::FilterAndAnalysisFramework*);
 
-} // namespace pwgcf
-} // namespace analysis
-} // namespace o2
+} // namespace o2::analysis::pwgcf
 
 #endif // PWGCF_TWOPARTICLECORRELATIONS_CORE_FILTERANDANALYSISFRAMEWORK_H_