Skip to content

Commit 05cd33a

Browse files
jmunozmejmunozme
authored
Merge branch 'AliceO2Group:master' into master
2 parents bc25f42 + ff905f9 commit 05cd33a

File tree

11 files changed

+1497
-1249
lines changed

11 files changed

+1497
-1249
lines changed

‎DPG/Tasks/AOTTrack/PID/TOF/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ o2physics_add_dpl_workflow(pid-tof-qa
1515
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
1616
COMPONENT_NAME Analysis)
1717

18+
o2physics_add_dpl_workflow(pid-tof-qa-dynamic
19+
SOURCES qaPIDTOFDynamic.cxx
20+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
21+
COMPONENT_NAME Analysis)
22+
1823
o2physics_add_dpl_workflow(pid-tof-qa-beta
1924
SOURCES qaPIDTOFBeta.cxx
2025
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore

‎DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFDynamic.cxx‎

Lines changed: 807 additions & 0 deletions
Large diffs are not rendered by default.

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,11 +641,11 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
641641
}
642642
} else {
643643
if (twotracksconfigs.confIsCPRkT) {
644-
if (pairCloseRejection.isClosePairkT(p1, p2, femto_universe_container::EventType::same, kT, twotracksconfigs.confIsCircularCut, twotracksconfigs.confCPRDphiAvgOrDist, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax, twotracksconfigs.confIsfilldEtadPhiTPCcls, pairFractionTPCsCls)) {
644+
if (pairCloseRejection.isClosePairkT(part1, part2, femto_universe_container::EventType::same, kT, twotracksconfigs.confIsCircularCut, twotracksconfigs.confCPRDphiAvgOrDist, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax, twotracksconfigs.confIsfilldEtadPhiTPCcls, pairFractionTPCsCls)) {
645645
continue;
646646
}
647647
if (twotracksconfigs.confIsCPRFraction) {
648-
if (pairCloseRejection.isClosePairFractionkT(p1, p2, femto_universe_container::EventType::same, kT, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax)) {
648+
if (pairCloseRejection.isClosePairFractionkT(part1, part2, femto_universe_container::EventType::same, kT, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax)) {
649649
continue;
650650
}
651651
}
@@ -1009,11 +1009,11 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
10091009
}
10101010
} else {
10111011
if (twotracksconfigs.confIsCPRkT) {
1012-
if (pairCloseRejection.isClosePairkT(p1, p2, femto_universe_container::EventType::mixed, kT, twotracksconfigs.confIsCircularCut, twotracksconfigs.confCPRDphiAvgOrDist, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax, twotracksconfigs.confIsfilldEtadPhiTPCcls, pairFractionTPCsCls)) {
1012+
if (pairCloseRejection.isClosePairkT(part1, part2, femto_universe_container::EventType::mixed, kT, twotracksconfigs.confIsCircularCut, twotracksconfigs.confCPRDphiAvgOrDist, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax, twotracksconfigs.confIsfilldEtadPhiTPCcls, pairFractionTPCsCls)) {
10131013
continue;
10141014
}
10151015
if (twotracksconfigs.confIsCPRFraction) {
1016-
if (pairCloseRejection.isClosePairFractionkT(p1, p2, femto_universe_container::EventType::mixed, kT, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax)) {
1016+
if (pairCloseRejection.isClosePairFractionkT(part1, part2, femto_universe_container::EventType::mixed, kT, magFieldTesla, twotracksconfigs.confCPRDistMax, twotracksconfigs.confCPRFracMax)) {
10171017
continue;
10181018
}
10191019
}

‎PWGEM/Dilepton/Core/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ o2physics_add_library(PWGEMDileptonCore
1414
DielectronCut.cxx
1515
DimuonCut.cxx
1616
EMTrackCut.cxx
17-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::MLCore)
17+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
1818

1919
o2physics_target_root_dictionary(PWGEMDileptonCore
2020
HEADERS EMEventCut.h

‎PWGEM/Dilepton/Core/DileptonProducer.h‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "PWGEM/Dilepton/Core/EMEventCut.h"
2323
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
2424
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
25-
#include "PWGEM/Dilepton/Utils/MlResponseDielectronSingleTrack.h"
2625
#include "PWGEM/Dilepton/Utils/PairUtilities.h"
2726

2827
#include "Common/CCDB/RCTSelectionFlags.h"
@@ -65,15 +64,15 @@
6564
#include <utility>
6665
#include <vector>
6766

68-
using MyCollisions = o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec2, o2::aod::EMEventsQvec3>;
67+
using MyCollisions = o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec2>;
6968
using MyCollision = MyCollisions::iterator;
7069

7170
using MyElectrons = o2::soa::Join<o2::aod::EMPrimaryElectrons, o2::aod::EMPrimaryElectronEMEventIds, o2::aod::EMAmbiguousElectronSelfIds, o2::aod::EMPrimaryElectronsPrefilterBit, o2::aod::EMPrimaryElectronsPrefilterBitDerived>;
7271
using MyElectron = MyElectrons::iterator;
7372
using FilteredMyElectrons = o2::soa::Filtered<MyElectrons>;
7473
using FilteredMyElectron = FilteredMyElectrons::iterator;
7574

76-
using MyMuons = o2::soa::Join<o2::aod::EMPrimaryMuons, o2::aod::EMPrimaryMuonEMEventIds, o2::aod::EMAmbiguousMuonSelfIds, o2::aod::EMGlobalMuonSelfIds>;
75+
using MyMuons = o2::soa::Join<o2::aod::EMPrimaryMuons, o2::aod::EMPrimaryMuonEMEventIds, o2::aod::EMAmbiguousMuonSelfIds, o2::aod::EMGlobalMuonSelfIds, o2::aod::EMPrimaryMuonsPrefilterBitDerived>;
7776
using MyMuon = MyMuons::iterator;
7877
using FilteredMyMuons = o2::soa::Filtered<MyMuons>;
7978
using FilteredMyMuon = FilteredMyMuons::iterator;
@@ -251,7 +250,10 @@ struct DileptonProducer {
251250
o2::framework::Configurable<int> cfg_min_ncluster_mch{"cfg_min_ncluster_mch", 5, "min ncluster MCH"};
252251
o2::framework::Configurable<float> cfg_max_chi2{"cfg_max_chi2", 1e+6, "max chi2/ndf"};
253252
o2::framework::Configurable<float> cfg_max_chi2mft{"cfg_max_chi2mft", 1e+6, "max chi2/ndf"};
254-
o2::framework::Configurable<float> cfg_max_matching_chi2_mftmch{"cfg_max_matching_chi2_mftmch", 40, "max chi2 for MFT-MCH matching"};
253+
// o2::framework::Configurable<float> cfg_max_matching_chi2_mftmch{"cfg_max_matching_chi2_mftmch", 40, "max chi2 for MFT-MCH matching"};
254+
o2::framework::Configurable<float> cfg_border_pt_for_chi2mchmft{"cfg_border_pt_for_chi2mchmft", 0, "border pt for different max chi2 for MFT-MCH matching"};
255+
o2::framework::Configurable<float> cfg_max_matching_chi2_mftmch_lowPt{"cfg_max_matching_chi2_mftmch_lowPt", 8, "max chi2 for MFT-MCH matching for low pT"};
256+
o2::framework::Configurable<float> cfg_max_matching_chi2_mftmch_highPt{"cfg_max_matching_chi2_mftmch_highPt", 40, "max chi2 for MFT-MCH matching for high pT"};
255257
o2::framework::Configurable<float> cfg_max_matching_chi2_mchmid{"cfg_max_matching_chi2_mchmid", 1e+10, "max chi2 for MCH-MID matching"};
256258
o2::framework::Configurable<float> cfg_max_dcaxy{"cfg_max_dcaxy", 1e+10, "max dca XY for single track in cm"};
257259
o2::framework::Configurable<float> cfg_min_rabs{"cfg_min_rabs", 17.6, "min Radius at the absorber end"};
@@ -291,7 +293,6 @@ struct DileptonProducer {
291293
engine = std::mt19937(seed_gen());
292294

293295
DefineEMEventCut();
294-
addhistograms();
295296
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
296297
DefineDielectronCut();
297298
leptonM1 = o2::constants::physics::MassElectron;
@@ -346,13 +347,7 @@ struct DileptonProducer {
346347
fDielectronCut.SetTrackPhiPositionRange(dielectroncuts.cfg_min_phiposition_track, dielectroncuts.cfg_max_phiposition_track, dielectroncuts.cfgRefR, d_bz, dielectroncuts.cfg_mirror_phi_track);
347348
}
348349

349-
~DileptonProducer()
350-
{
351-
}
352-
353-
void addhistograms()
354-
{
355-
}
350+
~DileptonProducer() {}
356351

357352
void DefineEMEventCut()
358353
{
@@ -376,7 +371,6 @@ struct DileptonProducer {
376371
fEMEventCut.SetRequireGoodITSLayersAll(eventcuts.cfgRequireGoodITSLayersAll);
377372
}
378373

379-
o2::analysis::MlResponseDielectronSingleTrack<float> mlResponseSingleTrack;
380374
void DefineDielectronCut()
381375
{
382376
fDielectronCut = DielectronCut("fDielectronCut", "fDielectronCut");
@@ -456,7 +450,8 @@ struct DileptonProducer {
456450
fDimuonCut.SetNClustersMCHMID(dimuoncuts.cfg_min_ncluster_mch, 20);
457451
fDimuonCut.SetChi2(0.f, dimuoncuts.cfg_max_chi2);
458452
fDimuonCut.SetChi2MFT(0.f, dimuoncuts.cfg_max_chi2mft);
459-
fDimuonCut.SetMatchingChi2MCHMFT(0.f, dimuoncuts.cfg_max_matching_chi2_mftmch);
453+
// fDimuonCut.SetMatchingChi2MCHMFT(0.f, dimuoncuts.cfg_max_matching_chi2_mftmch);
454+
fDimuonCut.SetMaxMatchingChi2MCHMFTPtDep([&](float pt) { return (pt < dimuoncuts.cfg_border_pt_for_chi2mchmft ? dimuoncuts.cfg_max_matching_chi2_mftmch_lowPt : dimuoncuts.cfg_max_matching_chi2_mftmch_highPt); });
460455
fDimuonCut.SetMatchingChi2MCHMID(0.f, dimuoncuts.cfg_max_matching_chi2_mchmid);
461456
fDimuonCut.SetDCAxy(0.f, dimuoncuts.cfg_max_dcaxy);
462457
fDimuonCut.SetRabs(dimuoncuts.cfg_min_rabs, dimuoncuts.cfg_max_rabs);
@@ -588,7 +583,7 @@ struct DileptonProducer {
588583
continue;
589584
}
590585

591-
float eventplanes_2_for_mix[6] = {collision.ep2ft0m(), collision.ep2ft0a(), collision.ep2ft0c(), collision.ep2btot(), collision.ep2bpos(), collision.ep2bneg()};
586+
float eventplanes_2_for_mix[7] = {collision.ep2ft0m(), collision.ep2ft0a(), collision.ep2ft0c(), collision.ep2btot(), collision.ep2bpos(), collision.ep2bneg(), collision.ep2fv0a()};
592587
float ep2 = eventplanes_2_for_mix[cfgEP2Estimator_for_Mix];
593588

594589
if (!fEMEventCut.IsSelected(collision)) {
@@ -627,7 +622,7 @@ struct DileptonProducer {
627622
}
628623

629624
if (nuls > 0 || nlspp > 0 || nlsmm > 0) {
630-
eventTable(collision.runNumber(), collision.globalBC(), collision.timestamp(), collision.posZ(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange(), collision.centFT0C(), ep2);
625+
eventTable(collision.runNumber(), collision.globalBC(), collision.timestamp(), collision.posZ(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange(), centralities[cfgCentEstimator], ep2);
631626
}
632627
} // end of collision loop
633628
} // end of DF

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,10 +1222,11 @@ using EMPrimaryTrackEMEventIdTMP = EMPrimaryTrackEMEventIdsTMP::iterator;
12221222
namespace emthinevent
12231223
{
12241224
DECLARE_SOA_COLUMN(EP2, ep2, float); //!
1225+
DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
12251226
} // namespace emthinevent
12261227
DECLARE_SOA_TABLE_VERSIONED(EMThinEvents_000, "AOD", "EMTHINEVENT", 0, //! Thin event information table
12271228
o2::soa::Index<>, bc::RunNumber, bc::GlobalBC, timestamp::Timestamp, collision::PosZ,
1228-
evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, cent::CentFT0C, emthinevent::EP2);
1229+
evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, emthinevent::Centrality, emthinevent::EP2);
12291230
using EMThinEvents = EMThinEvents_000;
12301231
using EMThinEvent = EMThinEvents::iterator;
12311232

‎PWGEM/Dilepton/Tasks/dileptonPolarization.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ struct DileptonPolarization {
490490
} // end of pair1 loop
491491
}
492492

493-
Filter collisionFilter_centrality = eventcuts.cfgCentMin < o2::aod::cent::centFT0C && o2::aod::cent::centFT0C < eventcuts.cfgCentMax;
493+
Filter collisionFilter_centrality = eventcuts.cfgCentMin < o2::aod::emthinevent::centrality && o2::aod::emthinevent::centrality < eventcuts.cfgCentMax;
494494
Filter collisionFilter_occupancy_track = eventcuts.cfgTrackOccupancyMin <= o2::aod::evsel::trackOccupancyInTimeRange && o2::aod::evsel::trackOccupancyInTimeRange < eventcuts.cfgTrackOccupancyMax;
495495
Filter collisionFilter_occupancy_ft0c = eventcuts.cfgFT0COccupancyMin <= o2::aod::evsel::ft0cOccupancyInTimeRange && o2::aod::evsel::ft0cOccupancyInTimeRange < eventcuts.cfgFT0COccupancyMax;
496496
using filteredCollisions = soa::Filtered<aod::EMThinEvents>;
@@ -516,7 +516,7 @@ struct DileptonPolarization {
516516
{
517517
for (const auto& collision : collisions) {
518518
initCCDB(collision);
519-
float centrality = collision.centFT0C();
519+
float centrality = collision.centrality();
520520
if (centrality < eventcuts.cfgCentMin || eventcuts.cfgCentMax < centrality) {
521521
continue;
522522
}
@@ -525,7 +525,7 @@ struct DileptonPolarization {
525525
fRegistry.fill(HIST("Event/after/hZvtx"), collision.posZ());
526526
fRegistry.fill(HIST("Event/after/hCollisionCounter"), 9);
527527
fRegistry.fill(HIST("Event/after/hCorrOccupancy"), collision.ft0cOccupancyInTimeRange(), collision.trackOccupancyInTimeRange());
528-
fRegistry.fill(HIST("Event/after/hEP2_CentFT0C_forMix"), collision.centFT0C(), ep2);
528+
fRegistry.fill(HIST("Event/after/hEP2_CentFT0C_forMix"), centrality, ep2);
529529

530530
// event mixing
531531
int zbin = lower_bound(zvtx_bin_edges.begin(), zvtx_bin_edges.end(), collision.posZ()) - zvtx_bin_edges.begin() - 1;

0 commit comments

Comments
 (0)