use Service pdg instead of TDatabasePDG

Author: lubynets

PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx

@@ -53,6 +53,7 @@
 #include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
 #include <Framework/Logger.h>
+#include <Framework/O2DatabasePDGPlugin.h>
 #include <Framework/RunningWorkflowInfo.h>
 #include <Framework/runDataProcessing.h>
 #include <ReconstructionDataFormats/DCA.h>
@@ -144,6 +145,7 @@ struct HfCandidateCreatorXic0Omegac0 {
   HfEventSelection hfEvSel;        // event selection and monitoring
   o2::vertexing::DCAFitterN<2> df; // 2-prong vertex fitter to build the omegac/xic vertex
   Service<o2::ccdb::BasicCCDBManager> ccdb;
+  Service<o2::framework::O2DatabasePDG> pdgdb;
   o2::base::MatLayerCylSet* lut{};
   o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
   int runNumber{-1};
@@ -1124,7 +1126,7 @@ struct HfCandidateCreatorXic0Omegac0 {
       kfOmegac0Candidate.rapOmegac = kfOmegaC0.GetRapidity();
 
       // KF cosThetaStar
-      kfOmegac0Candidate.cosThetaStarPiFromOmegac = cosThetaStarFromKF(0, 4332, 211, 3312, kfBachPionToOmegaC, kfOmegaToOmegaC);
+      kfOmegac0Candidate.cosThetaStarPiFromOmegac = cosThetaStarFromKF(0, 4332, 211, 3312, kfBachPionToOmegaC, kfOmegaToOmegaC, pdgdb);
 
       // KF ct
       kfOmegac0Candidate.ctV0 = kfV0.GetLifeTime();
@@ -1588,7 +1590,7 @@ struct HfCandidateCreatorXic0Omegac0 {
       kfXic0Candidate.rapXic = kfXiC0.GetRapidity();
 
       // KF cosThetaStar
-      kfXic0Candidate.cosThetaStarPiFromXic = cosThetaStarFromKF(0, 4132, 211, 3312, kfCharmBachPionToXiC, kfXiToXiC);
+      kfXic0Candidate.cosThetaStarPiFromXic = cosThetaStarFromKF(0, 4132, 211, 3312, kfCharmBachPionToXiC, kfXiToXiC, pdgdb);
 
       // KF ct
       kfXic0Candidate.ctV0 = kfV0ToCasc.GetLifeTime();
@@ -1950,8 +1952,8 @@ struct HfCandidateCreatorXic0Omegac0 {
       float const ptOmega = kfOmega.GetPt();
 
       // KF cosThetaStar
-      float const cosThetaStarKaFromOmegac = cosThetaStarFromKF(0, 4332, 321, 3334, kfKaFromCharmToOmegaKa, kfOmegaToOmegaKa);
-      float const cosThetaStarKaFromXic = cosThetaStarFromKF(0, 4132, 321, 3334, kfKaFromCharmToOmegaKa, kfOmegaToOmegaKa);
+      float const cosThetaStarKaFromOmegac = cosThetaStarFromKF(0, 4332, 321, 3334, kfKaFromCharmToOmegaKa, kfOmegaToOmegaKa, pdgdb);
+      float const cosThetaStarKaFromXic = cosThetaStarFromKF(0, 4132, 321, 3334, kfKaFromCharmToOmegaKa, kfOmegaToOmegaKa, pdgdb);
 
       // KF ct
       float const ctV0 = kfV0ToOmega.GetLifeTime();

Tools/KFparticle/KFUtilities.h

@@ -25,13 +25,13 @@
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 
+#include <Framework/AnalysisHelpers.h>
 #include <Framework/Logger.h>
+#include <Framework/O2DatabasePDGPlugin.h>
 #include <ReconstructionDataFormats/PID.h>
 #include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/TrackParametrizationWithError.h>
 
-#include <TDatabasePDG.h> // FIXME
-
 #include <KFPTrack.h>
 #include <KFPVertex.h>
 #include <KFParticle.h>
@@ -241,8 +241,9 @@ float cpaXYFromKF(KFParticle kfp, KFParticle PV)
 /// @param kfpvtx KFPartice mother
 /// @param kfpprong0 KFParticle Prong 0
 /// @param kfpprong1 KFParticele Prong 1
+/// @param pdgdb Service PDG data base
 /// @return cos theta star
-float cosThetaStarFromKF(int iProng, int pdgvtx, int pdgprong0, int pdgprong1, KFParticle kfpprong0, KFParticle kfpprong1)
+float cosThetaStarFromKF(int iProng, int pdgvtx, int pdgprong0, int pdgprong1, KFParticle kfpprong0, KFParticle kfpprong1, const o2::framework::Service<o2::framework::O2DatabasePDG>& pdgdb)
 {
   float px0{}, py0{}, pz0{}, px1{}, py1{}, pz1{};
 
@@ -254,9 +255,9 @@ float cosThetaStarFromKF(int iProng, int pdgvtx, int pdgprong0, int pdgprong1, K
   py1 = kfpprong1.GetPy();
   pz1 = kfpprong1.GetPz();
   std::array<double, 2> m = {0., 0.};
-  m[0] = TDatabasePDG::Instance()->GetParticle(pdgprong0)->Mass();           // FIXME: Get from the PDG service of the common header
-  m[1] = TDatabasePDG::Instance()->GetParticle(pdgprong1)->Mass();           // FIXME: Get from the PDG service of the common header
-  const double mTot = TDatabasePDG::Instance()->GetParticle(pdgvtx)->Mass(); // FIXME: Get from the PDG service of the common header
+  m[0] = pdgdb->Mass(pdgprong0);
+  m[1] = pdgdb->Mass(pdgprong1);
+  const double mTot = pdgdb->Mass(pdgvtx);
 
   const float cosThetastar = static_cast<float>(RecoDecay::cosThetaStar(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m, mTot, iProng));
   return cosThetastar;

Tools/KFparticle/qaKFParticle.cxx

@@ -19,26 +19,6 @@
 
 #include "TableHelper.h"
 
-#include <CCDB/BasicCCDBManager.h>
-
-#include <TDatabasePDG.h>
-#include <TPDGCode.h>
-
-#include <string>
-
-/// includes O2
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/DCA.h"
-#include "ReconstructionDataFormats/Track.h"
-
-/// includes O2Physics
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -49,12 +29,30 @@
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
-/// includes KFParticle
-#include "KFPTrack.h"
-#include "KFPVertex.h"
-#include "KFParticle.h"
-#include "KFParticleBase.h"
-#include "KFVertex.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+#include <DetectorsBase/GeometryManager.h>
+#include <DetectorsBase/Propagator.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisHelpers.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/O2DatabasePDGPlugin.h>
+#include <Framework/runDataProcessing.h>
+#include <ReconstructionDataFormats/DCA.h>
+#include <ReconstructionDataFormats/Track.h>
+
+#include <TDatabasePDG.h>
+#include <TPDGCode.h>
+
+#include <KFPTrack.h>
+#include <KFPVertex.h>
+#include <KFParticle.h>
+#include <KFParticleBase.h>
+#include <KFVertex.h>
+
+#include <string>
 
 #ifndef HomogeneousField
 
@@ -76,6 +74,7 @@ struct qaKFParticle {
   Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
   Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
   Service<o2::ccdb::BasicCCDBManager> ccdb;
+  Service<o2::framework::O2DatabasePDG> pdgdb;
   o2::base::MatLayerCylSet* lut;
   o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
   int runNumber;
@@ -598,7 +597,7 @@ struct qaKFParticle {
     float chi2geo = KFDZero.GetChi2() / KFDZero.GetNDF();
     float normdecayLength = KFDZero_PV.GetDecayLength() / KFDZero_PV.GetErrDecayLength();
     float chi2topo = KFDZero_PV.GetChi2() / KFDZero_PV.GetNDF();
-    const double pseudoRndm = track1.pt() * 1000. - (int64_t)(track1.pt() * 1000);
+    const double pseudoRndm = track1.pt() * 1000. - static_cast<int64_t>((track1.pt() * 1000));
     if (pseudoRndm < d_DwnSmplFact) {
       if (writeTree) {
         /// Filling the D0 tree
@@ -800,7 +799,7 @@ struct qaKFParticle {
           continue;
         }
         /// Apply selection on geometrically reconstructed D0
-        cosThetaStar = cosThetaStarFromKF(1, 421, 211, 321, KFPosPion, KFNegKaon);
+        cosThetaStar = cosThetaStarFromKF(1, 421, 211, 321, KFPosPion, KFNegKaon, pdgdb);
         if (!isSelectedDoGeo(KFDZero, KFPV, cosThetaStar)) {
           continue;
         }
@@ -835,7 +834,7 @@ struct qaKFParticle {
           continue;
         }
         /// Apply selection on geometrically reconstructed D0
-        cosThetaStar = cosThetaStarFromKF(0, 421, 321, 211, KFPosKaon, KFNegPion);
+        cosThetaStar = cosThetaStarFromKF(0, 421, 321, 211, KFPosKaon, KFNegPion, pdgdb);
         if (!isSelectedDoGeo(KFDZeroBar, KFPV, cosThetaStar)) {
           continue;
         }
@@ -1107,7 +1106,7 @@ struct qaKFParticle {
           continue;
         }
         /// Apply selection on geometrically reconstructed D0
-        cosThetaStar = cosThetaStarFromKF(1, 421, 211, 321, KFPosPion, KFNegKaon);
+        cosThetaStar = cosThetaStarFromKF(1, 421, 211, 321, KFPosPion, KFNegKaon, pdgdb);
         if (!isSelectedDoGeo(KFDZero, KFPV, cosThetaStar)) {
           continue;
         }
@@ -1147,7 +1146,7 @@ struct qaKFParticle {
           continue;
         }
         /// Apply selection on geometrically reconstructed D0
-        cosThetaStar = cosThetaStarFromKF(0, 421, 321, 211, KFPosKaon, KFNegPion);
+        cosThetaStar = cosThetaStarFromKF(0, 421, 321, 211, KFPosKaon, KFNegPion, pdgdb);
         if (!isSelectedDoGeo(KFDZeroBar, KFPV, cosThetaStar)) {
           continue;
         }