Add the O2DatabasePDG::Mass function in the PDG tutorial

Author: vkucera

Tutorials/CMakeLists.txt

@@ -109,7 +109,7 @@ o2physics_add_dpl_workflow(event-mixing-validation
 
 o2physics_add_dpl_workflow(mc-histograms
                   SOURCES src/mcHistograms.cxx
-                  PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                  PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                   COMPONENT_NAME AnalysisTutorial)
 
 o2physics_add_dpl_workflow(ccdbaccess
@@ -196,7 +196,7 @@ o2physics_add_dpl_workflow(conditional-expressions
 
 o2physics_add_dpl_workflow(using-pdg
                   SOURCES src/usingPDGService.cxx
-                  PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
+                  PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                   COMPONENT_NAME AnalysisTutorial)
 
 o2physics_add_dpl_workflow(propagated-tracks
@@ -228,4 +228,3 @@ o2physics_add_dpl_workflow(consume
                   SOURCES src/consume.cxx
                   PUBLIC_LINK_LIBRARIES O2::Framework
                   COMPONENT_NAME AnalysisTutorial)
-

Tutorials/src/mcHistograms.cxx

@@ -17,7 +17,6 @@
 #include "Framework/AnalysisTask.h"
 #include "CommonConstants/MathConstants.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -42,15 +41,15 @@ struct VertexDistribution {
 // Simple analysis of PhysicalPrimary particles
 struct PhysicalPrimaryCharge {
   OutputObj<TH1F> charge{TH1F("charge_prim", "charge_prim", 100, -5, 5)};
-  Service<O2DatabasePDG> pdgDB;
+  Service<o2::framework::O2DatabasePDG> pdg;
 
   void process(aod::McParticles const& mcParticles)
   {
     for (auto& particle : mcParticles) {
       if (!particle.isPhysicalPrimary()) {
         continue;
       }
-      auto pdgParticle = pdgDB->GetParticle(particle.pdgCode());
+      auto pdgParticle = pdg->GetParticle(particle.pdgCode());
       if (!pdgParticle) {
         continue;
       }

Tutorials/src/usingPDGService.cxx

@@ -11,24 +11,31 @@
 
 #include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "TDatabasePDG.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
 
 struct UsePdgDatabase {
-  Service<O2DatabasePDG> pdg;
+  Service<o2::framework::O2DatabasePDG> pdg;
   OutputObj<TH1F> particleCharges{TH1F("charges", ";charge;entries", 201, -10.1, 10.1)};
+  OutputObj<TH1F> particleMasses{TH1F("masses", ";mass (GeV/#it{c}^{2});entries", 1000, 0., 10.)};
 
   void process(aod::McCollision const&, aod::McParticles const& particles)
   {
-    for (auto& particle : particles) {
-      auto pdgInfo = pdg->GetParticle(particle.pdgCode());
+    for (auto const& particle : particles) {
+      auto pdgCode = particle.pdgCode();
+      auto mass = pdg->Mass(pdgCode);
+      if (mass < 0.) {
+        continue;
+      }
+      particleMasses->Fill(mass);
+      // LOGF(info, "PDG: %d %g", pdgCode, mass);
+      auto pdgInfo = pdg->GetParticle(pdgCode);
       if (pdgInfo != nullptr) {
         particleCharges->Fill(pdgInfo->Charge());
       } else {
-        LOGF(warn, "[%d] unknown particle with PDG code %d", particle.globalIndex(), particle.pdgCode());
+        LOGF(warn, "[%d] unknown particle with PDG code %d", particle.globalIndex(), pdgCode);
       }
     }
   }