[PWGEM/Dilepton] update muon histograms (#13313)

Author: dsekihat

PWGEM/Dilepton/Core/SingleTrackQC.h

@@ -299,7 +299,7 @@ struct SingleTrackQC {
       // track info
       fRegistry.add("Track/positive/hs", "rec. single muon", kTHnSparseD, {axis_pt, axis_eta, axis_phi, axis_dca}, true);
       fRegistry.add("Track/positive/hEtaPhi_MatchMCHMID", "#eta vs. #varphi of matched MCHMID", kTH2F, {{180, 0, 2.f * M_PI}, {100, -6, -1}}, false);
-      fRegistry.add("Track/positive/hdEtadPhi", "#Delta#eta vs. #Delta#varphi between MFT-MCH-MID and MCH-MID;#varphi_{sa} - #varphi_{gl} (rad.);#eta_{sa} - #eta_{gl}", kTH2F, {{90, -M_PI / 4, M_PI / 4}, {100, -0.5, +0.5}}, false);
+      fRegistry.add("Track/positive/hsDelta", "diff. between GL and associated SA;p_{T}^{gl} (GeV/c);(p_{T}^{sa} - p_{T}^{gl})/p_{T}^{gl};#Delta#eta;#Delta#varphi (rad.);", kTHnSparseF, {axis_pt, {100, -0.5, +0.5}, {100, -0.5, +0.5}, {90, -M_PI / 4, M_PI / 4}}, false);
       fRegistry.add("Track/positive/hQoverPt", "q/pT;q/p_{T} (GeV/c)^{-1}", kTH1F, {{1000, -5, 5}}, false);
       fRegistry.add("Track/positive/hTrackType", "track type", kTH1F, {{6, -0.5f, 5.5}}, false);
       fRegistry.add("Track/positive/hDCAxy", "DCA x vs. y;DCA_{x} (cm);DCA_{y} (cm)", kTH2F, {{200, -0.5f, 0.5f}, {200, -0.5f, 0.5f}}, false);
@@ -636,14 +636,15 @@ struct SingleTrackQC {
     }
     float dca_xy = fwdDcaXYinSigma(track);
 
+    float reldpt = (track.ptMatchedMCHMID() - track.pt()) / track.pt();
     float deta = track.etaMatchedMCHMID() - track.eta();
     float dphi = track.phiMatchedMCHMID() - track.phi();
     o2::math_utils::bringToPMPi(dphi);
 
     if (track.sign() > 0) {
       fRegistry.fill(HIST("Track/positive/hs"), track.pt(), track.eta(), track.phi(), dca_xy, weight);
       fRegistry.fill(HIST("Track/positive/hEtaPhi_MatchMCHMID"), track.phiMatchedMCHMID(), track.etaMatchedMCHMID(), weight);
-      fRegistry.fill(HIST("Track/positive/hdEtadPhi"), dphi, deta, weight);
+      fRegistry.fill(HIST("Track/positive/hsDelta"), track.pt(), reldpt, deta, dphi, weight);
       fRegistry.fill(HIST("Track/positive/hQoverPt"), track.sign() / track.pt());
       fRegistry.fill(HIST("Track/positive/hTrackType"), track.trackType());
       fRegistry.fill(HIST("Track/positive/hDCAxy"), track.fwdDcaX(), track.fwdDcaY());
@@ -661,7 +662,7 @@ struct SingleTrackQC {
     } else {
       fRegistry.fill(HIST("Track/negative/hs"), track.pt(), track.eta(), track.phi(), dca_xy, weight);
       fRegistry.fill(HIST("Track/negative/hEtaPhi_MatchMCHMID"), track.phiMatchedMCHMID(), track.etaMatchedMCHMID(), weight);
-      fRegistry.fill(HIST("Track/negative/hdEtadPhi"), dphi, deta, weight);
+      fRegistry.fill(HIST("Track/negative/hsDelta"), track.pt(), reldpt, deta, dphi, weight);
       fRegistry.fill(HIST("Track/negative/hQoverPt"), track.sign() / track.pt());
       fRegistry.fill(HIST("Track/negative/hTrackType"), track.trackType());
       fRegistry.fill(HIST("Track/negative/hDCAxy"), track.fwdDcaX(), track.fwdDcaY());

PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronQC.cxx

@@ -85,10 +85,12 @@ struct skimmerPrimaryElectronQC {
     Configurable<float> max_frac_shared_clusters_tpc{"max_frac_shared_clusters_tpc", 999.f, "max fraction of shared clusters in TPC"};
     Configurable<float> maxchi2tpc{"maxchi2tpc", 5.0, "max. chi2/NclsTPC"};
     Configurable<float> maxchi2its{"maxchi2its", 36.0, "max. chi2/NclsITS"};
+    Configurable<float> minchi2its{"minchi2its", -1e+10, "min. chi2/NclsITS"};
     Configurable<float> minpt{"minpt", 0.05, "min pt for ITS-TPC track"};
     Configurable<float> maxeta{"maxeta", 0.9, "eta acceptance"};
     Configurable<float> dca_xy_max{"dca_xy_max", 1.0, "max DCAxy in cm"};
     Configurable<float> dca_z_max{"dca_z_max", 1.0, "max DCAz in cm"};
+    Configurable<bool> includeITSsa{"includeITSsa", false, "Flag to include ITSsa tracks"};
     Configurable<float> minTPCNsigmaEl{"minTPCNsigmaEl", -3.5, "min. TPC n sigma for electron inclusion"};
     Configurable<float> maxTPCNsigmaEl{"maxTPCNsigmaEl", +3.5, "max. TPC n sigma for electron inclusion"};
   } trackcut;
@@ -293,7 +295,7 @@ struct skimmerPrimaryElectronQC {
       return false;
     }
 
-    if (trackcut.maxchi2its < track.itsChi2NCl()) { // accept ITS afterburner (itsChi2NCl = -999)
+    if (track.itsChi2NCl() < trackcut.minchi2its || trackcut.maxchi2its < track.itsChi2NCl()) { // accept ITS afterburner (itsChi2NCl = -999)
       return false;
     }
     if (track.itsNCls() < trackcut.min_ncluster_its) {
@@ -303,6 +305,10 @@ struct skimmerPrimaryElectronQC {
       return false;
     }
 
+    if (!trackcut.includeITSsa && (!track.hasITS() || !track.hasTPC())) {
+      return false;
+    }
+
     if (track.hasTPC()) {
       if (track.tpcChi2NCl() < 0.f || trackcut.maxchi2tpc < track.tpcChi2NCl()) {
         return false;

PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

@@ -296,9 +296,11 @@ struct skimmerPrimaryMuon {
 
       if (refitGlobalMuon) {
         eta = mfttrack.eta();
-        phi = mfttrack.phi();
-        o2::math_utils::bringTo02Pi(phi);
+        // phi = mfttrack.phi();
+        // o2::math_utils::bringTo02Pi(phi);
         pt = propmuonAtPV_Matched.getP() * std::sin(2.f * std::atan(std::exp(-eta)));
+        phi = propmuonAtDCA.getPhi();
+        o2::math_utils::bringTo02Pi(phi);
 
         // x = mfttrack.x();
         // y = mfttrack.y();

PWGEM/Dilepton/Tasks/createResolutionMap.cxx

@@ -591,9 +591,11 @@ struct CreateResolutionMap {
       }
       if (muoncuts.refitGlobalMuon) {
         eta = mfttrack.eta();
-        phi = mfttrack.phi();
-        o2::math_utils::bringTo02Pi(phi);
+        // phi = mfttrack.phi();
+        // o2::math_utils::bringTo02Pi(phi);
         pt = propmuonAtPV_Matched.getP() * std::sin(2.f * std::atan(std::exp(-eta)));
+        phi = propmuonAtDCA.getPhi();
+        o2::math_utils::bringTo02Pi(phi);
       }
 
       float dpt = (ptMatchedMCHMID - pt) / pt;