Skip to content

Commit 68fa094

Browse files
nstrangmnstrangm
authored
PWGEM/PhotonMeson: Reduce size of derived skimmed photon AO2Ds (#7044)
* PWGEM/PhotonMeson: Reduce size of derived skimmed photon AO2Ds - Remove columns from skimmedCluster table that are not needed for analysis to reduce size of derived data - Remove index to collision table to avoid unbound indices - Absorb matched tracks in cluster table - Remove dedicated matched track arguments from GammaGamma task
1 parent 26f8585 commit 68fa094

7 files changed

Lines changed: 42 additions & 57 deletions

File tree

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ struct Pi0EtaToGammaGamma {
435435

436436
/// \brief Calculate background (using rotation background method only for EMCal!)
437437
template <typename TPhotons>
438-
void RotationBackground(const ROOT::Math::PtEtaPhiMVector& meson, ROOT::Math::PtEtaPhiMVector photon1, ROOT::Math::PtEtaPhiMVector photon2, TPhotons const& photons_coll, unsigned int ig1, unsigned int ig2, EMCPhotonCut const& cut, aod::SkimEMCMTs const&)
438+
void RotationBackground(const ROOT::Math::PtEtaPhiMVector& meson, ROOT::Math::PtEtaPhiMVector photon1, ROOT::Math::PtEtaPhiMVector photon2, TPhotons const& photons_coll, unsigned int ig1, unsigned int ig2)
439439
{
440440
// if less than 3 clusters are present skip event since we need at least 3 clusters
441441
if (photons_coll.size() < 3) {
@@ -452,9 +452,6 @@ struct Pi0EtaToGammaGamma {
452452
// only combine rotated photons with other photons
453453
continue;
454454
}
455-
if (!cut.template IsSelected<aod::SkimEMCMTs>(photon)) {
456-
continue;
457-
}
458455

459456
ROOT::Math::PtEtaPhiMVector photon3(photon.pt(), photon.eta(), photon.phi(), 0.);
460457
ROOT::Math::PtEtaPhiMVector mother1 = photon1 + photon3;
@@ -501,13 +498,12 @@ struct Pi0EtaToGammaGamma {
501498
std::vector<std::pair<int, int>> used_photonIds; // <ndf, trackId>
502499
std::vector<std::tuple<int, int, int, int>> used_dileptonIds; // <ndf, trackId>
503500

504-
template <typename TCollisions, typename TPhotons1, typename TPhotons2, typename TSubInfos1, typename TSubInfos2, typename TPreslice1, typename TPreslice2, typename TCut1, typename TCut2, typename TTracksMatchedWithEMC, typename TTracksMatchedWithPHOS>
501+
template <typename TCollisions, typename TPhotons1, typename TPhotons2, typename TSubInfos1, typename TSubInfos2, typename TPreslice1, typename TPreslice2, typename TCut1, typename TCut2>
505502
void runPairing(TCollisions const& collisions,
506503
TPhotons1 const& photons1, TPhotons2 const& photons2,
507504
TSubInfos1 const& /*subinfos1*/, TSubInfos2 const& /*subinfos2*/,
508505
TPreslice1 const& perCollision1, TPreslice2 const& perCollision2,
509-
TCut1 const& cut1, TCut2 const& cut2,
510-
TTracksMatchedWithEMC const& tracks_emc, TTracksMatchedWithPHOS const& /*tracks_phos*/)
506+
TCut1 const& cut1, TCut2 const& cut2)
511507
{
512508
for (auto& collision : collisions) {
513509
initCCDB(collision);
@@ -583,7 +579,7 @@ struct Pi0EtaToGammaGamma {
583579
fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt());
584580

585581
if constexpr (pairtype == PairType::kEMCEMC) {
586-
RotationBackground<MyEMCClusters>(v12, v1, v2, photons2_per_collision, g1.globalIndex(), g2.globalIndex(), cut1, tracks_emc);
582+
RotationBackground<MyEMCClusters>(v12, v1, v2, photons2_per_collision, g1.globalIndex(), g2.globalIndex());
587583
}
588584

589585
std::pair<int, int> pair_tmp_id1 = std::make_pair(ndf, g1.globalIndex());
@@ -795,20 +791,19 @@ struct Pi0EtaToGammaGamma {
795791
if constexpr (pairtype == PairType::kPCMPCM) {
796792
auto v0photons = std::get<0>(std::tie(args...));
797793
auto v0legs = std::get<1>(std::tie(args...));
798-
runPairing(collisions, v0photons, v0photons, v0legs, v0legs, perCollision_pcm, perCollision_pcm, fV0PhotonCut, fV0PhotonCut, nullptr, nullptr);
794+
runPairing(collisions, v0photons, v0photons, v0legs, v0legs, perCollision_pcm, perCollision_pcm, fV0PhotonCut, fV0PhotonCut);
799795
} else if constexpr (pairtype == PairType::kPCMDalitzEE) {
800796
auto v0photons = std::get<0>(std::tie(args...));
801797
auto v0legs = std::get<1>(std::tie(args...));
802798
auto emprimaryelectrons = std::get<2>(std::tie(args...));
803799
// LOGF(info, "electrons.size() = %d, positrons.size() = %d", electrons.size(), positrons.size());
804-
runPairing(collisions, v0photons, emprimaryelectrons, v0legs, emprimaryelectrons, perCollision_pcm, perCollision_electron, fV0PhotonCut, fDileptonCut, nullptr, nullptr);
800+
runPairing(collisions, v0photons, emprimaryelectrons, v0legs, emprimaryelectrons, perCollision_pcm, perCollision_electron, fV0PhotonCut, fDileptonCut);
805801
} else if constexpr (pairtype == PairType::kEMCEMC) {
806802
auto emcclusters = std::get<0>(std::tie(args...));
807-
auto emcmatchedtracks = std::get<1>(std::tie(args...));
808-
runPairing(collisions, emcclusters, emcclusters, nullptr, nullptr, perCollision_emc, perCollision_emc, fEMCCut, fEMCCut, emcmatchedtracks, nullptr);
803+
runPairing(collisions, emcclusters, emcclusters, nullptr, nullptr, perCollision_emc, perCollision_emc, fEMCCut, fEMCCut);
809804
} else if constexpr (pairtype == PairType::kPHOSPHOS) {
810805
auto phosclusters = std::get<0>(std::tie(args...));
811-
runPairing(collisions, phosclusters, phosclusters, nullptr, nullptr, perCollision_phos, perCollision_phos, fPHOSCut, fPHOSCut, nullptr, nullptr);
806+
runPairing(collisions, phosclusters, phosclusters, nullptr, nullptr, perCollision_phos, perCollision_phos, fPHOSCut, fPHOSCut);
812807
}
813808
// else if constexpr (pairtype == PairType::kPCMEMC) {
814809
// auto v0photons = std::get<0>(std::tie(args...));

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,13 +413,12 @@ struct Pi0EtaToGammaGammaMC {
413413
// Partition<MyMCMuons> muons_pos = o2::aod::emprimarymuon::sign > int8_t(0) && static_cast<float>(dileptoncuts.cfg_min_pt_track) < o2::aod::track::pt&& nabs(o2::aod::track::eta) < static_cast<float>(dileptoncuts.cfg_max_eta_track) && static_cast<float>(dileptoncuts.cfg_min_TPCNsigmaMu) < o2::aod::pidtpc::tpcNSigmaMu&& o2::aod::pidtpc::tpcNSigmaMu < static_cast<float>(dileptoncuts.cfg_max_TPCNsigmaMu);
414414
// Partition<MyMCMuons> muons_neg = o2::aod::emprimarymuon::sign < int8_t(0) && static_cast<float>(dileptoncuts.cfg_min_pt_track) < o2::aod::track::pt && nabs(o2::aod::track::eta) < static_cast<float>(dileptoncuts.cfg_max_eta_track) && static_cast<float>(dileptoncuts.cfg_min_TPCNsigmaMu) < o2::aod::pidtpc::tpcNSigmaMu && o2::aod::pidtpc::tpcNSigmaMu < static_cast<float>(dileptoncuts.cfg_max_TPCNsigmaMu);
415415

416-
template <typename TCollisions, typename TPhotons1, typename TPhotons2, typename TSubInfos1, typename TSubInfos2, typename TPreslice1, typename TPreslice2, typename TCut1, typename TCut2, typename TTracksMatchedWithEMC, typename TTracksMatchedWithPHOS, typename TMCCollisions, typename TMCParticles>
416+
template <typename TCollisions, typename TPhotons1, typename TPhotons2, typename TSubInfos1, typename TSubInfos2, typename TPreslice1, typename TPreslice2, typename TCut1, typename TCut2, typename TMCCollisions, typename TMCParticles>
417417
void runTruePairing(TCollisions const& collisions,
418418
TPhotons1 const& photons1, TPhotons2 const& photons2,
419419
TSubInfos1 const& /*subinfos1*/, TSubInfos2 const& /*subinfos2*/,
420420
TPreslice1 const& perCollision1, TPreslice2 const& perCollision2,
421421
TCut1 const& cut1, TCut2 const& cut2,
422-
TTracksMatchedWithEMC const& /*tracks_emc*/, TTracksMatchedWithPHOS const& /*tracks_phos*/,
423422
TMCCollisions const& mccollisions, TMCParticles const& mcparticles)
424423
{
425424
for (auto& collision : collisions) {
@@ -665,19 +664,18 @@ struct Pi0EtaToGammaGammaMC {
665664
if constexpr (pairtype == PairType::kPCMPCM) {
666665
auto v0photons = std::get<0>(std::tie(args...));
667666
auto v0legs = std::get<1>(std::tie(args...));
668-
runTruePairing(collisions, v0photons, v0photons, v0legs, v0legs, perCollision_pcm, perCollision_pcm, fV0PhotonCut, fV0PhotonCut, nullptr, nullptr, mccollisions, mcparticles);
667+
runTruePairing(collisions, v0photons, v0photons, v0legs, v0legs, perCollision_pcm, perCollision_pcm, fV0PhotonCut, fV0PhotonCut, mccollisions, mcparticles);
669668
runGenInfo(collisions, mccollisions, mcparticles);
670669
} else if constexpr (pairtype == PairType::kPCMDalitzEE) {
671670
auto v0photons = std::get<0>(std::tie(args...));
672671
auto v0legs = std::get<1>(std::tie(args...));
673672
auto emprimaryelectrons = std::get<2>(std::tie(args...));
674673
// LOGF(info, "electrons.size() = %d, positrons.size() = %d", electrons.size(), positrons.size());
675-
runTruePairing(collisions, v0photons, emprimaryelectrons, v0legs, emprimaryelectrons, perCollision_pcm, perCollision_electron, fV0PhotonCut, fDileptonCut, nullptr, nullptr, mccollisions, mcparticles);
674+
runTruePairing(collisions, v0photons, emprimaryelectrons, v0legs, emprimaryelectrons, perCollision_pcm, perCollision_electron, fV0PhotonCut, fDileptonCut, mccollisions, mcparticles);
676675
runGenInfo(collisions, mccollisions, mcparticles);
677676
} else if constexpr (pairtype == PairType::kEMCEMC) {
678677
auto emcclusters = std::get<0>(std::tie(args...));
679-
auto emcmatchedtracks = std::get<1>(std::tie(args...));
680-
runTruePairing(collisions, emcclusters, emcclusters, nullptr, nullptr, perCollision_emc, perCollision_emc, fEMCCut, fEMCCut, emcmatchedtracks, nullptr, mccollisions, mcparticles);
678+
runTruePairing(collisions, emcclusters, emcclusters, nullptr, nullptr, perCollision_emc, perCollision_emc, fEMCCut, fEMCCut, mccollisions, mcparticles);
681679
runGenInfo(collisions, mccollisions, mcparticles);
682680
}
683681

‎PWGEM/PhotonMeson/DataModel/gammaTables.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ DECLARE_SOA_TABLE(McGammasTrue, "AOD", "MCGATRUE",
411411

412412
namespace skimmedcluster
413413
{
414-
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! collisionID used as index for matched clusters
415-
DECLARE_SOA_INDEX_COLUMN(BC, bc); //! bunch crossing ID used as index for ambiguous clusters
414+
DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
415+
DECLARE_SOA_COLUMN(CollisionId, collisionId, int); //!
416416
DECLARE_SOA_COLUMN(ID, id, int); //! cluster ID identifying cluster in event
417417
DECLARE_SOA_COLUMN(E, e, float); //! cluster energy (GeV)
418418
DECLARE_SOA_COLUMN(Eta, eta, float); //! cluster pseudorapidity (calculated using vertex)
@@ -440,12 +440,9 @@ DECLARE_SOA_COLUMN(TrackPt, trackpt, std::vector<float>);
440440
DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, [](float e, float eta, float m = 0) -> float { return sqrt(e * e - m * m) / cosh(eta); }); //! cluster pt, mass to be given as argument when getter is called!
441441
} // namespace emccluster
442442
DECLARE_SOA_TABLE(SkimEMCClusters, "AOD", "SKIMEMCCLUSTERS", //! table of skimmed EMCal clusters
443-
o2::soa::Index<>, skimmedcluster::CollisionId, skimmedcluster::BCId, skimmedcluster::E, emccluster::CoreEnergy,
444-
skimmedcluster::Eta, skimmedcluster::Phi, skimmedcluster::M02, skimmedcluster::M20, skimmedcluster::NCells, skimmedcluster::Time,
445-
emccluster::IsExotic, skimmedcluster::DistanceToBadChannel, skimmedcluster::NLM, emccluster::Definition,
446-
emccluster::TrackIds, emccluster::TrackEta, emccluster::TrackPhi, emccluster::TrackP, emccluster::TrackPt,
447-
// dynamic column
448-
emccluster::Pt<skimmedcluster::E, skimmedcluster::Eta>);
443+
o2::soa::Index<>, skimmedcluster::CollisionId, skimmedcluster::E, skimmedcluster::Eta, skimmedcluster::Phi,
444+
skimmedcluster::M02, skimmedcluster::NCells, skimmedcluster::Time, emccluster::IsExotic, emccluster::TrackEta,
445+
emccluster::TrackPhi, emccluster::TrackP, emccluster::TrackPt, emccluster::Pt<skimmedcluster::E, skimmedcluster::Eta>);
449446
using SkimEMCCluster = SkimEMCClusters::iterator;
450447

451448
DECLARE_SOA_TABLE(EMCEMEventIds, "AOD", "EMCEMEVENTID", emccluster::EMEventId); // To be joined with SkimEMCClusters table at analysis level.

‎PWGEM/PhotonMeson/TableProducer/skimmerGammaCalo.cxx‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,26 @@ struct skimmerGammaCalo {
4444
Configurable<float> maxTime{"maxTime", +200., "Maximum cluster time for time cut"};
4545
Configurable<float> minM02{"minM02", 0.0, "Minimum M02 for M02 cut"};
4646
Configurable<float> maxM02{"maxM02", 1.0, "Maximum M02 for M02 cut"};
47+
Configurable<float> minE{"minE", 0.5, "Minimum energy for energy cut"};
4748
Configurable<bool> hasPropagatedTracks{"hasPropagatedTracks", false, "temporary flag, only set to true when running over data which has the tracks propagated to EMCal/PHOS!"};
4849

49-
HistogramRegistry historeg{
50-
"historeg",
51-
{},
52-
OutputObjHandlingPolicy::QAObject,
53-
false,
54-
true};
50+
HistogramRegistry historeg{"output", {}, OutputObjHandlingPolicy::AnalysisObject, false, false};
5551

5652
void init(o2::framework::InitContext&)
5753
{
5854
historeg.add("hCaloClusterEIn", "hCaloClusterEIn", gHistoSpec_clusterE);
5955
historeg.add("hCaloClusterEOut", "hCaloClusterEOut", gHistoSpec_clusterE);
60-
historeg.add("hMTEtaPhi", "hMTEtaPhi", gHistoSpec_EtaPhi);
61-
auto hCaloClusterFilter = historeg.add<TH1>("hCaloClusterFilter", "hCaloClusterFilter", kTH1I, {{4, 0, 4}});
56+
historeg.add("hMTEtaPhi", "hMTEtaPhi", gHistoSpec_clusterTM_dEtadPhi);
57+
auto hCaloClusterFilter = historeg.add<TH1>("hCaloClusterFilter", "hCaloClusterFilter", kTH1I, {{5, 0, 5}});
6258
hCaloClusterFilter->GetXaxis()->SetBinLabel(1, "in");
63-
hCaloClusterFilter->GetXaxis()->SetBinLabel(2, "time cut");
64-
hCaloClusterFilter->GetXaxis()->SetBinLabel(3, "M02 cut");
65-
hCaloClusterFilter->GetXaxis()->SetBinLabel(4, "out");
59+
hCaloClusterFilter->GetXaxis()->SetBinLabel(2, "E cut");
60+
hCaloClusterFilter->GetXaxis()->SetBinLabel(3, "time cut");
61+
hCaloClusterFilter->GetXaxis()->SetBinLabel(4, "M02 cut");
62+
hCaloClusterFilter->GetXaxis()->SetBinLabel(5, "out");
6663

6764
LOG(info) << "| Timing cut: " << minTime << " < t < " << maxTime << std::endl;
6865
LOG(info) << "| M02 cut: " << minM02 << " < M02 < " << maxM02 << std::endl;
66+
LOG(info) << "| E cut: E > " << minE << std::endl;
6967
}
7068

7169
void processRec(aod::Collision const&, aod::EMCALClusters const& emcclusters, aod::EMCALClusterCells const& emcclustercells, aod::EMCALMatchedTracks const& emcmatchedtracks, aod::FullTracks const&)
@@ -74,14 +72,19 @@ struct skimmerGammaCalo {
7472
historeg.fill(HIST("hCaloClusterEIn"), emccluster.energy());
7573
historeg.fill(HIST("hCaloClusterFilter"), 0);
7674

75+
// Energy cut
76+
if (emccluster.energy() < minE) {
77+
historeg.fill(HIST("hCaloClusterFilter"), 1);
78+
continue;
79+
}
7780
// timing cut
7881
if (emccluster.time() > maxTime || emccluster.time() < minTime) {
79-
historeg.fill(HIST("hCaloClusterFilter"), 1);
82+
historeg.fill(HIST("hCaloClusterFilter"), 2);
8083
continue;
8184
}
8285
// M02 cut
8386
if (emccluster.nCells() > 1 && (emccluster.m02() > maxM02 || emccluster.m02() < minM02)) {
84-
historeg.fill(HIST("hCaloClusterFilter"), 2);
87+
historeg.fill(HIST("hCaloClusterFilter"), 3);
8588
continue;
8689
}
8790

@@ -126,12 +129,10 @@ struct skimmerGammaCalo {
126129
}
127130

128131
historeg.fill(HIST("hCaloClusterEOut"), emccluster.energy());
129-
historeg.fill(HIST("hCaloClusterFilter"), 3);
132+
historeg.fill(HIST("hCaloClusterFilter"), 4);
130133

131-
tableGammaEMCReco(emccluster.collisionId(), emccluster.id(),
132-
emccluster.energy(), emccluster.coreEnergy(), emccluster.eta(), emccluster.phi(), emccluster.m02(),
133-
emccluster.m20(), emccluster.nCells(), emccluster.time(), emccluster.isExotic(), emccluster.distanceToBadChannel(), emccluster.nlm(),
134-
emccluster.definition(), vTrackIds, vEta, vPhi, vP, vPt);
134+
tableGammaEMCReco(emccluster.collisionId(), emccluster.energy(), emccluster.eta(), emccluster.phi(), emccluster.m02(),
135+
emccluster.nCells(), emccluster.time(), emccluster.isExotic(), vEta, vPhi, vP, vPt);
135136
}
136137
}
137138
void processMC(aod::Collision const&, soa::Join<aod::EMCALClusters, aod::EMCALMCClusters> const& emcclusters, aod::McParticles const&)
@@ -140,14 +141,16 @@ struct skimmerGammaCalo {
140141
historeg.fill(HIST("hCaloClusterEIn"), emccluster.energy());
141142
historeg.fill(HIST("hCaloClusterFilter"), 0);
142143

144+
// Energy cut
145+
if (emccluster.energy() < minE) {
146+
continue;
147+
}
143148
// timing cut
144149
if (emccluster.time() > maxTime || emccluster.time() < minTime) {
145-
historeg.fill(HIST("hCaloClusterFilter"), 1);
146150
continue;
147151
}
148152
// M02 cut
149153
if (emccluster.nCells() > 1 && (emccluster.m02() > maxM02 || emccluster.m02() < minM02)) {
150-
historeg.fill(HIST("hCaloClusterFilter"), 2);
151154
continue;
152155
}
153156
std::vector<int32_t> mcLabels;

‎PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaEMCEMC.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ using MyEMCCluster = MyEMCClusters::iterator;
3232
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
3333
{
3434
return WorkflowSpec{
35-
adaptAnalysisTask<Pi0EtaToGammaGamma<PairType::kEMCEMC, MyEMCClusters, aod::SkimEMCMTs>>(cfgc, TaskName{"pi0eta-to-gammagamma-emcemc"}),
35+
adaptAnalysisTask<Pi0EtaToGammaGamma<PairType::kEMCEMC, MyEMCClusters>>(cfgc, TaskName{"pi0eta-to-gammagamma-emcemc"}),
3636
};
3737
}

‎PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCEMCEMC.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ using MyEMCCluster = MyEMCClusters::iterator;
3232
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
3333
{
3434
return WorkflowSpec{
35-
adaptAnalysisTask<Pi0EtaToGammaGammaMC<PairType::kEMCEMC, MyEMCClusters, aod::SkimEMCMTs>>(cfgc, TaskName{"pi0eta-to-gammagamma-mc-emcemc"}),
35+
adaptAnalysisTask<Pi0EtaToGammaGammaMC<PairType::kEMCEMC, MyEMCClusters>>(cfgc, TaskName{"pi0eta-to-gammagamma-mc-emcemc"}),
3636
};
3737
}

0 commit comments

Comments
 (0)