Merge branch 'AliceO2Group:master' into master

Author: PaolaVT

Common/CCDB/macros/ctpRateF.C

@@ -52,7 +52,7 @@ void ctpRateFetcher::getCTPconfig(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim
   if (runNumber == mRunNumber && mConfig != nullptr) {
     return;
   }
-  std::map<string, string> metadata;
+  std::map<std::string, std::string> metadata;
   metadata["runNumber"] = std::to_string(runNumber);
   mConfig = ccdb->getSpecific<o2::ctp::CTPConfiguration>("CTP/Config/Config", timeStamp, metadata);
   if (mConfig == nullptr) {
@@ -64,7 +64,7 @@ void ctpRateFetcher::getLHCIFdata(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim
   if (runNumber == mRunNumber && mLHCIFdata != nullptr) {
     return;
   }
-  std::map<string, string> metadata;
+  std::map<std::string, std::string> metadata;
   mLHCIFdata = ccdb->getSpecific<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp, metadata);
   if (mLHCIFdata == nullptr) {
     LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp;
@@ -75,7 +75,7 @@ void ctpRateFetcher::getCTPscalers(o2::ccdb::BasicCCDBManager* ccdb, uint64_t ti
   if (runNumber == mRunNumber && mScalers != nullptr) {
     return;
   }
-  std::map<string, string> metadata;
+  std::map<std::string, std::string> metadata;
   metadata["runNumber"] = std::to_string(runNumber);
   mScalers = ccdb->getSpecific<o2::ctp::CTPRunScalers>("CTP/Calib/Scalers", timeStamp, metadata);
   if (mScalers == nullptr) {

Common/CCDB/macros/upload_event_selection_params.C

@@ -84,14 +84,14 @@ void upload_event_selection_params()
   n++;
   period[n] = "lhc15f_isolated_bunches";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 225000;
   runLast[n] = 225719;
 
   n++;
   period[n] = "lhc15f_isolated_bunches2";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 226062;
   runLast[n] = 226500;
 
@@ -100,12 +100,12 @@ void upload_event_selection_params()
   par[n] = new EventSelectionParams(0);
   runFirst[n] = 225753;
   runLast[n] = 225768;
-  par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
+  par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
 
   n++;
   period[n] = "lhc15f_50ns_trains2_missing_V0C3";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
+  par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
   par[n]->fV0CasymA = 0;
   par[n]->fV0CasymB = 0;
   runFirst[n] = 226530;
@@ -114,42 +114,42 @@ void upload_event_selection_params()
   n++;
   period[n] = "lhc15h";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801);
+  par[n]->setOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801);
   runFirst[n] = 232914;
   runLast[n] = 233859;
 
   n++;
   period[n] = "lhc15h_isolated_bunches";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 233912;
   runLast[n] = 234050;
 
   n++;
   period[n] = "lhc15i";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201);
+  par[n]->setOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201);
   runFirst[n] = 235196;
   runLast[n] = 236866;
 
   n++;
   period[n] = "lhc15j";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165);
+  par[n]->setOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165);
   runFirst[n] = 236892;
   runLast[n] = 238621;
 
   n++;
   period[n] = "lhc15l";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245);
+  par[n]->setOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245);
   runFirst[n] = 239188;
   runLast[n] = 241544;
 
   n++;
   period[n] = "lhc15n";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104);
+  par[n]->setOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104);
   runFirst[n] = 244340;
   runLast[n] = 244628;
 
@@ -176,7 +176,7 @@ void upload_event_selection_params()
   n++;
   period[n] = "lhc16do";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-65.42, 7.43, -5.62, 0.85);
+  par[n]->setOnVsOfParams(-65.42, 7.43, -5.62, 0.85);
   runFirst[n] = 252235;
   runLast[n] = 264035;
 
@@ -201,7 +201,7 @@ void upload_event_selection_params()
   n++;
   period[n] = "pp2017";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76);
+  par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76);
   runFirst[n] = 270531;
   runLast[n] = 280140;
 
@@ -214,21 +214,21 @@ void upload_event_selection_params()
   n++;
   period[n] = "pp2017pqr";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76);
+  par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76);
   runFirst[n] = 282008;
   runLast[n] = 282704;
 
   n++;
   period[n] = "lhc18b_isolated_bunches";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 284706;
   runLast[n] = 285015;
 
   n++;
   period[n] = "lhc18b_trains";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-65., 4.3, -5.62, 0.85);
+  par[n]->setOnVsOfParams(-65., 4.3, -5.62, 0.85);
   runFirst[n] = 285064;
   runLast[n] = 285203;
 

Common/Core/macros/testMetadataHelper.C

@@ -120,8 +120,9 @@ std::map<std::string, bool> buildMapForCommitHash(const std::string& hash)
   return results;
 }
 
-void populateCCDBWithCommitAvailability(std::map<string, bool> hasHashMap,
-                                        const std::string commitHash const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/")
+void populateCCDBWithCommitAvailability(std::map<std::string, bool> hasHashMap,
+                                        const std::string commitHash,
+                                        const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/")
 {
   // First, init the CCDB manager to test if the ccdb is already populated
   o2::ccdb::CcdbApi api;

PWGDQ/Core/VarManager.h

@@ -2085,6 +2085,9 @@ void VarManager::FillEvent(T const& event, float* values)
     if (fgUsedVars[kIsNoSameBunch]) {
       values[kIsNoSameBunch] = (event.selection_bit(o2::aod::evsel::kNoSameBunchPileup) > 0);
     }
+    if (fgUsedVars[kIsTriggerZNAZNC]) {
+      values[kIsTriggerZNAZNC] = event.selection_bit(o2::aod::evsel::kIsBBZNA) && event.selection_bit(o2::aod::evsel::kIsBBZNC);
+    }
     if (fgUsedVars[kIsGoodZvtxFT0vsPV]) {
       values[kIsGoodZvtxFT0vsPV] = (event.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV) > 0);
     }

PWGEM/Dilepton/Core/DileptonProducer.h

@@ -27,6 +27,7 @@
 #include "Common/CCDB/RCTSelectionFlags.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include <CCDB/BasicCCDBManager.h>
@@ -57,10 +58,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <map>
-#include <random>
 #include <string>
-#include <string_view>
-#include <tuple>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -272,9 +271,7 @@ struct DileptonProducer {
   float d_bz;
 
   o2::framework::HistogramRegistry fRegistry{"output", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject, false, false};
-  static constexpr std::string_view event_pair_types[2] = {"same/", "mix/"};
 
-  std::mt19937 engine;
   float leptonM1 = 0.f;
   float leptonM2 = 0.f;
 
@@ -289,9 +286,6 @@ struct DileptonProducer {
     ccdb->setFatalWhenNull(false);
     rctChecker.init(eventcuts.cfgRCTLabel.value, eventcuts.cfgCheckZDC.value, eventcuts.cfgTreatLimitedAcceptanceAsBad.value);
 
-    std::random_device seed_gen;
-    engine = std::mt19937(seed_gen());
-
     DefineEMEventCut();
     if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
       DefineDielectronCut();
@@ -461,7 +455,7 @@ struct DileptonProducer {
   }
 
   template <typename TCollision, typename TTrack1, typename TTrack2, typename TCut, typename TAllTracks>
-  bool fillPairInfo(TCollision const&, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const& tracks)
+  bool fillPairInfo(TCollision const&, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const&)
   {
     if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
       if (dielectroncuts.cfg_pid_scheme == static_cast<int>(DielectronCut::PIDSchemes::kPIDML)) {
@@ -477,13 +471,16 @@ struct DileptonProducer {
       if (!cut.template IsSelectedTrack<false>(t1) || !cut.template IsSelectedTrack<false>(t2)) {
         return false;
       }
-
-      if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t1, cut, tracks)) {
-        return false;
-      }
-      if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t2, cut, tracks)) {
+      if (!map_best_match_globalmuon[t1.globalIndex()] || !map_best_match_globalmuon[t2.globalIndex()]) {
         return false;
       }
+
+      // if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t1, cut, tracks)) {
+      //   return false;
+      // }
+      // if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t2, cut, tracks)) {
+      //   return false;
+      // }
     }
 
     if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
@@ -539,6 +536,7 @@ struct DileptonProducer {
   o2::framework::SliceCache cache;
   o2::framework::Preslice<MyElectrons> perCollision_electron = o2::aod::emprimaryelectron::emeventId;
   o2::framework::expressions::Filter trackFilter_electron = dielectroncuts.cfg_min_pt_track < o2::aod::track::pt && dielectroncuts.cfg_min_eta_track < o2::aod::track::eta && o2::aod::track::eta < dielectroncuts.cfg_max_eta_track && nabs(o2::aod::track::dcaXY) < dielectroncuts.cfg_max_dcaxy && nabs(o2::aod::track::dcaZ) < dielectroncuts.cfg_max_dcaz;
+  o2::framework::expressions::Filter pidFilter_electron = dielectroncuts.cfg_min_TPCNsigmaEl < o2::aod::pidtpc::tpcNSigmaEl && o2::aod::pidtpc::tpcNSigmaEl < dielectroncuts.cfg_max_TPCNsigmaEl;
   o2::framework::expressions::Filter ttcaFilter_electron = ifnode(dielectroncuts.enableTTCA.node(), o2::aod::emprimaryelectron::isAssociatedToMPC == true || o2::aod::emprimaryelectron::isAssociatedToMPC == false, o2::aod::emprimaryelectron::isAssociatedToMPC == true);
   o2::framework::expressions::Filter prefilter_derived_electron = ifnode(dielectroncuts.cfg_apply_cuts_from_prefilter_derived.node() && dielectroncuts.cfg_prefilter_bits_derived.node() >= static_cast<uint16_t>(1),
                                                                          ifnode((dielectroncuts.cfg_prefilter_bits_derived.node() & static_cast<uint16_t>(1 << int(o2::aod::pwgem::dilepton::utils::pairutil::DileptonPrefilterBitDerived::kMee))) > static_cast<uint16_t>(0), (o2::aod::emprimaryelectron::pfbderived & static_cast<uint16_t>(1 << int(o2::aod::pwgem::dilepton::utils::pairutil::DileptonPrefilterBitDerived::kMee))) <= static_cast<uint16_t>(0), true) &&
@@ -571,7 +569,6 @@ struct DileptonProducer {
   o2::framework::Partition<FilteredMyMuons> positive_muons = o2::aod::emprimarymuon::sign > int8_t(0);
   o2::framework::Partition<FilteredMyMuons> negative_muons = o2::aod::emprimarymuon::sign < int8_t(0);
 
-  int ndf = 0;
   template <bool isTriggerAnalysis, typename TCollisions, typename TLeptons, typename TPresilce, typename TCut, typename TAllTracks>
   void runPairing(TCollisions const& collisions, TLeptons const& posTracks, TLeptons const& negTracks, TPresilce const& perCollision, TCut const& cut, TAllTracks const& tracks)
   {
@@ -628,7 +625,7 @@ struct DileptonProducer {
   } // end of DF
 
   template <typename TTrack1, typename TTrack2, typename TCut, typename TAllTracks>
-  bool isPairOK(TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const& tracks)
+  bool isPairOK(TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const&)
   {
     if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
       if (dielectroncuts.cfg_pid_scheme == static_cast<int>(DielectronCut::PIDSchemes::kPIDML)) {
@@ -644,13 +641,16 @@ struct DileptonProducer {
       if (!cut.IsSelectedTrack(t1) || !cut.IsSelectedTrack(t2)) {
         return false;
       }
-
-      if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t1, cut, tracks)) {
-        return false;
-      }
-      if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t2, cut, tracks)) {
+      if (!map_best_match_globalmuon[t1.globalIndex()] || !map_best_match_globalmuon[t2.globalIndex()]) {
         return false;
       }
+
+      // if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t1, cut, tracks)) {
+      //   return false;
+      // }
+      // if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t2, cut, tracks)) {
+      //   return false;
+      // }
     }
 
     if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
@@ -742,6 +742,8 @@ struct DileptonProducer {
     passed_pairIds.shrink_to_fit();
   }
 
+  std::unordered_map<int, bool> map_best_match_globalmuon;
+
   void processAnalysis(FilteredMyCollisions const& collisions, Types const&... args)
   {
     if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
@@ -752,13 +754,14 @@ struct DileptonProducer {
       runPairing<false>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut, electrons);
     } else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
       auto muons = std::get<0>(std::tie(args...));
+      map_best_match_globalmuon = o2::aod::pwgem::dilepton::utils::emtrackutil::findBestMatchMap(muons, fDimuonCut);
       if (cfgApplyWeightTTCA) {
         fillPairWeightMap<false>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut, muons);
       }
       runPairing<false>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut, muons);
     }
     map_weight.clear();
-    ndf++;
+    map_best_match_globalmuon.clear();
   }
   PROCESS_SWITCH(DileptonProducer, processAnalysis, "run dilepton analysis", true);
 

PWGEM/Dilepton/Utils/EMTrackUtilities.h

@@ -162,7 +162,7 @@ bool isBestMatch(TTrack const& track, TCut const& cut, TTracks const& tracks)
     for (const auto& glmuonId : track.globalMuonsWithSameMFTIds()) {
       auto candidate = tracks.rawIteratorAt(glmuonId);
       if (candidate.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack && candidate.emeventId() == track.emeventId() && candidate.mchtrackId() != track.mchtrackId()) {
-        if (cut.template IsSelectedTrack<true>(candidate)) {
+        if (cut.template IsSelectedTrack<false>(candidate)) {
           map_chi2MCHMFT[candidate.globalIndex()] = candidate.chi2MatchMCHMFT();
         }
       }
@@ -181,7 +181,7 @@ bool isBestMatch(TTrack const& track, TCut const& cut, TTracks const& tracks)
     for (const auto& glmuonId : track.globalMuonsWithSameMCHMIDIds()) {
       auto candidate = tracks.rawIteratorAt(glmuonId);
       if (candidate.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack && candidate.emeventId() == track.emeventId() && candidate.mfttrackId() != track.mfttrackId()) {
-        if (cut.template IsSelectedTrack<true>(candidate)) {
+        if (cut.template IsSelectedTrack<false>(candidate)) {
           map_chi2MCHMFT[candidate.globalIndex()] = candidate.chi2MatchMCHMFT();
         }
       }
@@ -211,36 +211,5 @@ std::unordered_map<int, bool> findBestMatchMap(TTracks const& tracks, TCut const
   return map;
 }
 //_______________________________________________________________________
-// template <typename T>
-// float sigmaPt(T const& track)
-// {
-//   return std::sqrt(track.c1Pt21Pt2()) / std::pow(track.signed1Pt(), 2); // pT resolution
-// }
-// //_______________________________________________________________________
-// template <typename T>
-// float sigmaPhi(T const& track)
-// {
-//   return std::sqrt(track.cSnpSnp()) / std::sqrt(1.f - std::pow(track.snp(), 2)); // phi resolution
-// }
-// //_______________________________________________________________________
-// template <typename T>
-// float sigmaTheta(T const& track)
-// {
-//   return std::sqrt(track.cTglTgl()) / (1.f + std::pow(track.tgl(), 2)); // theta resolution = lambda resolution. // lambda = pi/2 - theta. theta is polar angle.
-// }
-// //_______________________________________________________________________
-// template <typename T>
-// float sigmaEta(T const& track)
-// {
-//   return std::sqrt(track.cTglTgl()) / std::sqrt(1.f + std::pow(track.tgl(), 2));
-// }
-// //_______________________________________________________________________
-// template <typename T>
-// float sigmaP(T const& track)
-// {
-//   // p = 1/1/pT x 1/cos(lambda);
-//   return std::sqrt(std::pow(1.f / track.signed1Pt(), 4) * ((1.f + std::pow(track.tgl(), 2)) * track.c1Pt21Pt2() + 1.f / (1.f + std::pow(track.tgl(), 2)) * std::pow(track.signed1Pt() * track.tgl(), 2) * track.cTglTgl() - 2.f * track.signed1Pt() * track.tgl() * track.c1PtTgl()));
-// }
-//_______________________________________________________________________
 } // namespace o2::aod::pwgem::dilepton::utils::emtrackutil
 #endif // PWGEM_DILEPTON_UTILS_EMTRACKUTILITIES_H_

PWGJE/Tasks/jetFinderQA.cxx

@@ -1493,7 +1493,7 @@ struct JetFinderQATask {
 
   void processQcMultCutCheck(soa::Filtered<soa::Join<aod::JetCollisions, aod::BkgChargedRhos, aod::JMcCollisionLbs>>::iterator const& collision,
                              soa::Join<aod::JetMcCollisions, aod::JMcCollisionPIs> const&,
-                             //  soa::Join<aod::McCollisions, aod::HepMCXSections> const& aodMcCollisions,
+                             soa::Join<aod::McCollisions, aod::HepMCXSections> const&,
                              soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents> const& mcdjets,
                              soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& tracks,
                              soa::Filtered<aod::JetParticles> const& mcparticles)