femtoflow checked via o2 linter

Author: wenyaCern

PWGCF/Femto/Core/FemtoFlowAngularContainer.h

@@ -21,22 +21,24 @@
 #define PWGCF_FEMTOFLOW_CORE_FEMTOFLOWANGULARCONTAINER_H_
 
 #include "PWGCF/Femto/Core/FemtoFlowMath.h"
+#include "PWGCF/Femto/DataModel/FemtoDerived.h"
 
 #include "Common/Core/RecoDecay.h"
 
 #include "Framework/HistogramRegistry.h"
 
 #include "Math/Vector4D.h"
-#include "TDatabasePDG.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/O2DatabasePDGPlugin.h"
+#include "Framework/AnalysisTask.h"
+
 #include "TMath.h"
 
 #include <fairlogger/Logger.h>
 
 #include <string>
 #include <vector>
 
-using namespace o2::framework;
-
 namespace o2::analysis::femto_flow
 {
 
@@ -77,6 +79,8 @@ class FemtoFlowAngularContainer
   template <typename T>
   void initBase(std::string folderName, std::string /*femtoObs*/, T /*femtoObsAxis*/, T /*multAxis*/, T /*kTAxis*/, T /*mTAxis*/, T /*multAxis3D*/, T /*mTAxis3D*/, T etaAxis, T phiAxis, bool use3dplots)
   {
+    using namespace o2::framework;
+
     mHistogramRegistry->add((folderName + "/DeltaEtaDeltaPhi").c_str(), ";  #Delta#varphi (rad); #Delta#eta", kTH2F, {phiAxis, etaAxis});
     if (use3dplots) {
       // use 3d plots
@@ -106,28 +110,30 @@ class FemtoFlowAngularContainer
   /// \param phiBins phi binning for the histograms
   /// \param isMC add Monte Carlo truth histograms to the output file
   template <typename T, typename P>
-  void init(HistogramRegistry* registry, T& kstarBins, T& multBins, T& kTBins, T& mTBins, T& multBins3D, T& mTBins3D, P& etaBins, P& phiBins, bool isMC, bool use3dplots)
+  void init(o2::framework::HistogramRegistry* registry, T& kstarBins, T& multBins, T& kTBins, T& mTBins, T& multBins3D, T& mTBins3D, P& etaBins, P& phiBins, bool isMC, bool use3dplots)
   {
+    using namespace o2::framework;
+
     mHistogramRegistry = registry;
     std::string femtoObs;
     if constexpr (FemtoObs == femto_flow_angular_container::Observable::kstar) {
       femtoObs = "#it{k*} (GeV/#it{c})";
     }
 
     std::vector<double> tmpVecMult = multBins;
-    framework::AxisSpec multAxis = {tmpVecMult, "Multiplicity"};
-    framework::AxisSpec femtoObsAxis = {kstarBins, femtoObs.c_str()};
-    framework::AxisSpec kTAxis = {kTBins, "#it{k}_{T} (GeV/#it{c})"};
-    framework::AxisSpec mTAxis = {mTBins, "#it{m}_{T} (GeV/#it{c}^{2})"};
+    o2::framework::AxisSpec multAxis = {tmpVecMult, "Multiplicity"};
+    o2::framework::AxisSpec femtoObsAxis = {kstarBins, femtoObs.c_str()};
+    o2::framework::AxisSpec kTAxis = {kTBins, "#it{k}_{T} (GeV/#it{c})"};
+    o2::framework::AxisSpec mTAxis = {mTBins, "#it{m}_{T} (GeV/#it{c}^{2})"};
 
-    framework::AxisSpec multAxis3D = {multBins3D, "Multiplicity"};
-    framework::AxisSpec mTAxis3D = {mTBins3D, "#it{m}_{T} (GeV/#it{c})"};
+    o2::framework::AxisSpec multAxis3D = {multBins3D, "Multiplicity"};
+    o2::framework::AxisSpec mTAxis3D = {mTBins3D, "#it{m}_{T} (GeV/#it{c})"};
 
     // angular correlations
     mPhiLow = (-static_cast<int>(phiBins / 4) + 0.5) * o2::constants::math::TwoPI / phiBins;
     mPhiHigh = o2::constants::math::TwoPI + (-static_cast<int>(phiBins / 4) + 0.5) * o2::constants::math::TwoPI / phiBins;
-    framework::AxisSpec phiAxis = {phiBins, mPhiLow, mPhiHigh};
-    framework::AxisSpec etaAxis = {etaBins, -2.0, 2.0};
+    o2::framework::AxisSpec phiAxis = {phiBins, mPhiLow, mPhiHigh};
+    o2::framework::AxisSpec etaAxis = {etaBins, -2.0, 2.0};
 
     std::string folderName = static_cast<std::string>(FolderSuffix[EventType]) + static_cast<std::string>(o2::aod::femtoflow_mc_particle::MCTypeName[o2::aod::femtoflow_mc_particle::MCType::kRecon]);
 
@@ -140,16 +146,18 @@ class FemtoFlowAngularContainer
   }
 
   /// Set the PDG codes of the two particles involved
-  /// \param pdg1 PDG code of particle one
+  /// \param  PDG code of particle one
   /// \param pdg2 PDG code of particle two
-  void setPDGCodes(const int pdg1, const int pdg2)
+  void setPDGCodesMass(const int pdg1, const int pdg2, const double mass1, const int mass2)
   {
-    mMassOne = TDatabasePDG::Instance()->GetParticle(pdg1)->Mass();
-    mMassTwo = TDatabasePDG::Instance()->GetParticle(pdg2)->Mass();
+    mMassOne = mass1;
+    mMassTwo = mass2;
     mPDGOne = pdg1;
     mPDGTwo = pdg2;
   }
 
+
+
   /// Pass a pair to the container and compute all the relevant observables
   /// Called by setPair both in case of data/ and Monte Carlo reconstructed and for Monte Carlo truth
   /// \tparam T type of the femtoflowparticle
@@ -159,16 +167,20 @@ class FemtoFlowAngularContainer
   template <o2::aod::femtoflow_mc_particle::MCType mc, typename T>
   void setPairBase(const float /*femtoObs*/, const float /*mT*/, T const& part1, T const& part2, const int /*mult*/, bool use3dplots, float weight = 1.0f)
   {
+    using namespace o2::framework;
+
     deltaEta = part1.eta() - part2.eta();
 
     deltaPhi = part1.phi() - part2.phi();
 
-    while (deltaPhi < mPhiLow) {
-      deltaPhi += o2::constants::math::TwoPI;
-    }
-    while (deltaPhi > mPhiHigh) {
-      deltaPhi -= o2::constants::math::TwoPI;
-    }
+    deltaPhi = RecoDecay::constrainAngle(deltaPhi, mPhiLow, 1);
+    
+    // while (deltaPhi < mPhiLow) {
+    //   deltaPhi += o2::constants::math::TwoPI;
+    // }
+    // while (deltaPhi > mPhiHigh) {
+    //   deltaPhi -= o2::constants::math::TwoPI;
+    // }
 
     mHistogramRegistry->fill(HIST(FolderSuffix[EventType]) + HIST(o2::aod::femtoflow_mc_particle::MCTypeName[mc]) + HIST("/DeltaEtaDeltaPhi"), deltaPhi, deltaEta, weight);
     if (use3dplots) {
@@ -201,6 +213,8 @@ class FemtoFlowAngularContainer
   template <bool isMC, typename T>
   void setPair(T const& part1, T const& part2, const int mult, bool use3dplots, float weight = 1.0f)
   {
+    using namespace o2::framework;
+
     float femtoObs, femtoObsMC;
     // Calculate femto observable and the mT with reconstructed information
     if constexpr (FemtoObs == femto_flow_angular_container::Observable::kstar) {
@@ -232,7 +246,7 @@ class FemtoFlowAngularContainer
   }
 
  protected:
-  HistogramRegistry* mHistogramRegistry = nullptr;                                 ///< For QA output
+  o2::framework::HistogramRegistry* mHistogramRegistry = nullptr;                                 ///< For QA output
   static constexpr std::string_view FolderSuffix[2] = {"SameEvent", "MixedEvent"}; ///< Folder naming for the output according to EventType
   static constexpr femto_flow_angular_container::Observable FemtoObs = obs;        ///< Femtoscopic observable to be computed (according to femto_flow_angular_container::Observable)
   static constexpr int EventType = eventType;                                      ///< Type of the event (same/mixed, according to femto_flow_angular_container::EventType)