Update HMPID qa (#3991)

Author: njacazio

DPG/Tasks/AOTTrack/PID/CMakeLists.txt

@@ -55,8 +55,8 @@ o2physics_add_dpl_workflow(pid-tpc-qa-mc
                            COMPONENT_NAME Analysis)
 
 ## HMPID
-#o2physics_add_dpl_workflow(pid-hmpid-qa
-#                           SOURCES qaHMPID.cxx
-#                           PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
-#                           COMPONENT_NAME Analysis)
+o2physics_add_dpl_workflow(pid-hmpid-qa
+                           SOURCES qaHMPID.cxx
+                           PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                           COMPONENT_NAME Analysis)
 

DPG/Tasks/AOTTrack/PID/qaHMPID.cxx

@@ -33,41 +33,43 @@ struct pidHmpidQa {
   void init(o2::framework::InitContext&)
   {
     AxisSpec momAxis{nBinsP, minP, maxP};
-    histos.add("qa/signalvsP", ";#it{p} (GeV/#it{c});Cherenkov angle (rad)", kTH2F, {momAxis, {1000, 0, 1}});
-    histos.add("distance/selected", ";HMPID distance", kTH1F, {{100, 0, 20}});
-    histos.add("distance/nonselected", ";HMPID distance", kTH1F, {{100, 0, 20}});
-    histos.add("qmip/selected", ";HMPID mip charge (ADC)", kTH1F, {{100, 0, 4000}});
-    histos.add("qmip/nonselected", ";HMPID mip charge (ADC)", kTH1F, {{100, 0, 4000}});
-    histos.add("nphotons/selected", ";HMPID number of detected photons", kTH1F, {{100, 0, 1000}});
-    histos.add("nphotons/nonselected", ";HMPID number of detected photons", kTH1F, {{100, 0, 1000}});
+    histos.add("hmpidSignal", "hmpidSignal", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidXTrack", "hmpidXTrack", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidYTrack", "hmpidYTrack", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidXMip", "hmpidXMip", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidYMip", "hmpidYMip", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidNPhotons", "hmpidNPhotons", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidQMip", "hmpidQMip", kTH1F, {{300, 200, 3200}});
+    histos.add("hmpidClusSize", "hmpidClusSize", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidMom", "hmpidMom", kTH1F, {{300, 0, 3000}});
+    histos.add("hmpidPhotsCharge", "hmpidPhotsCharge", kTH2F, {{300, 0, 3000}, {300, 0, 3000}});
   }
 
   using TrackCandidates = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>;
-  void process(const TrackCandidates& tracks,
-               const aod::HMPIDs& hmpids,
+  void process(const aod::HMPIDs& hmpids,
+               const TrackCandidates& tracks,
                const aod::Collisions& colls)
   {
     for (const auto& t : hmpids) {
-
       if (t.track_as<TrackCandidates>().isGlobalTrack() != (uint8_t) true) {
         continue;
       }
       if (abs(t.track_as<TrackCandidates>().dcaXY()) > maxDCA) {
         continue;
       }
-      histos.fill(HIST("distance/nonselected"), t.hmpidDistance());
-      histos.fill(HIST("qmip/nonselected"), t.hmpidQMip());
-      histos.fill(HIST("nphotons/nonselected"), t.hmpidNPhotons());
-      if (t.hmpidDistance() > maxDistance) {
-        continue;
-      }
-      if (t.hmpidQMip() < minCharge) {
-        continue;
+
+      histos.fill(HIST("hmpidSignal"), t.hmpidSignal());
+      histos.fill(HIST("hmpidXTrack"), t.hmpidXTrack());
+      histos.fill(HIST("hmpidYTrack"), t.hmpidYTrack());
+      histos.fill(HIST("hmpidXMip"), t.hmpidXMip());
+      histos.fill(HIST("hmpidYMip"), t.hmpidYMip());
+      histos.fill(HIST("hmpidNPhotons"), t.hmpidNPhotons());
+      histos.fill(HIST("hmpidQMip"), t.hmpidQMip());
+      histos.fill(HIST("hmpidClusSize"), t.hmpidClusSize());
+      histos.fill(HIST("hmpidMom"), t.hmpidMom());
+      for (int i = 0; i < 10; i++) {
+        histos.fill(HIST("hmpidPhotsCharge"), t.hmpidMom(), i);
       }
-      histos.fill(HIST("distance/selected"), t.hmpidDistance());
-      histos.fill(HIST("qmip/selected"), t.hmpidQMip());
-      histos.fill(HIST("nphotons/selected"), t.hmpidNPhotons());
-      histos.fill(HIST("qa/signalvsP"), t.track_as<TrackCandidates>().p(), t.hmpidSignal());
     }
   }
 };

DPG/Tasks/AOTTrack/qaEfficiency.cxx

@@ -894,6 +894,8 @@ struct QaEfficiency {
 
     // HMPID
     if (doprocessHmpid) {
+      histos.add("Data/pos/hmpidMomDiff", "HMPID Positive Momentum difference", kTH1F, {{100, -10, 10, "#it{p} - #it{p}_{HMPID} (GeV/#it{c})"}});
+      histos.add("Data/neg/hmpidMomDiff", "HMPID Negative Momentum difference", kTH1F, {{100, -10, 10, "#it{p} - #it{p}_{HMPID} (GeV/#it{c})"}});
       histos.add("Data/pos/pt/hmpid", "HMPID Positive " + tagPt, kTH1F, {axisPt});
       histos.add("Data/neg/pt/hmpid", "HMPID Negative " + tagPt, kTH1F, {axisPt});
 
@@ -1386,8 +1388,7 @@ struct QaEfficiency {
 
   // Global process
   using TrackCandidates = o2::soa::Join<o2::aod::Tracks, o2::aod::TracksExtra, o2::aod::TrackSelection, o2::aod::TrackSelectionExtension, o2::aod::TracksDCA>;
-  void process(o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels>::iterator const& collision,
-               TrackCandidates const& tracks)
+  void process(o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels>::iterator const& collision)
   {
     isCollisionSelected<true>(collision);
   }
@@ -1858,11 +1859,13 @@ struct QaEfficiency {
       }
 
       if (track.sign() > 0) {
+        histos.fill(HIST("Data/pos/hmpidMomDiff"), track.p() - hmpid.hmpidMom());
         histos.fill(HIST("Data/pos/pt/hmpid"), track.pt());
         histos.fill(HIST("Data/pos/eta/hmpid"), track.eta());
         histos.fill(HIST("Data/pos/phi/hmpid"), track.phi());
         histos.fill(HIST("Data/pos/etaphi/hmpid"), track.eta(), track.phi());
       } else {
+        histos.fill(HIST("Data/neg/hmpidMomDiff"), track.p() - hmpid.hmpidMom());
         histos.fill(HIST("Data/neg/pt/hmpid"), track.pt());
         histos.fill(HIST("Data/neg/eta/hmpid"), track.eta());
         histos.fill(HIST("Data/neg/phi/hmpid"), track.phi());