Merge branch 'master' into fixes-Common

Author: vkucera

PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h

@@ -105,11 +105,11 @@ class FemtoUniverseParticleHisto
       mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaComb_p").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{comb}^{p}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
       mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaComb_d").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{comb}^{d}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
       if (isFillITSNsigma) {
-        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_el").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{e}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
-        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_pi").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{#pi}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
-        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_K").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{K}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
-        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_p").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{p}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
-        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_d").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{d}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
+        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_el").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{e}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {200, -4.975, 5.025}});
+        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_pi").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{#pi}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {200, -4.975, 5.025}});
+        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_K").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{K}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {200, -4.975, 5.025}});
+        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_p").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{p}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {200, -4.975, 5.025}});
+        mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_d").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITS}^{d}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {200, -4.975, 5.025}});
         mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaCombITSTPC_el").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITSTPC}^{e}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
         mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaCombITSTPC_pi").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITSTPC}^{#pi}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});
         mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaCombITSTPC_K").c_str(), "; #it{p} (GeV/#it{c}); n#sigma_{ITSTPC}^{K}", o2::framework::HistType::kTH2F, {{tempFitVarMomAxis}, {100, 0, 5}});

PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx

@@ -206,6 +206,8 @@ struct skimmerPrimaryMuon {
     fRegistry.add("MFTMCHMID/hDCAy_PosZ", "DCAy vs. posZ;Z_{vtx} (cm);DCA_{y} (cm)", kTH2F, {{200, -10, +10}, {400, -0.2, +0.2}}, false);
     fRegistry.add("MFTMCHMID/hDCAx_Phi", "DCAx vs. #varphi;#varphi (rad.);DCA_{x} (cm)", kTH2F, {{90, 0, 2 * M_PI}, {400, -0.2, +0.2}}, false);
     fRegistry.add("MFTMCHMID/hDCAy_Phi", "DCAy vs. #varphi;#varphi (rad.);DCA_{y} (cm)", kTH2F, {{90, 0, 2 * M_PI}, {400, -0.2, +0.2}}, false);
+    fRegistry.add("MFTMCHMID/hMeanDCAx", "<DCAy>;X_{IU} (cm);Y_IU} (cm);<DCA_{x}> (cm)", kTProfile2D, {{240, -12, +12}, {240, -12, +12}}, false);
+    fRegistry.add("MFTMCHMID/hMeanDCAy", "<DCAy>;X_{IU} (cm);Y_IU} (cm);<DCA_{y}> (cm)", kTProfile2D, {{240, -12, +12}, {240, -12, +12}}, false);
     fRegistry.add("MFTMCHMID/hNmu", "#mu multiplicity;N_{#mu} per collision", kTH1F, {{21, -0.5, 20.5}}, false);
 
     fRegistry.addClone("MFTMCHMID/", "MCHMID/");
@@ -518,6 +520,8 @@ struct skimmerPrimaryMuon {
           fRegistry.fill(HIST("MFTMCHMID/hDCAy_PosZ"), collision.posZ(), dcaY);
           fRegistry.fill(HIST("MFTMCHMID/hDCAx_Phi"), phi, dcaX);
           fRegistry.fill(HIST("MFTMCHMID/hDCAy_Phi"), phi, dcaY);
+          fRegistry.fill(HIST("MFTMCHMID/hMeanDCAx"), fwdtrack.x(), fwdtrack.y(), dcaX);
+          fRegistry.fill(HIST("MFTMCHMID/hMeanDCAy"), fwdtrack.x(), fwdtrack.y(), dcaY);
         } else if (fwdtrack.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
           fRegistry.fill(HIST("MCHMID/hPt"), pt);
           fRegistry.fill(HIST("MCHMID/hEtaPhi"), phi, eta);