|
24 | 24 | #include "PWGEM/PhotonMeson/Core/V0PhotonCut.h" |
25 | 25 | #include "PWGEM/PhotonMeson/DataModel/EventTables.h" |
26 | 26 | #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" |
| 27 | +#include "PWGEM/PhotonMeson/Utils/EMPhoton.h" |
27 | 28 | #include "PWGEM/PhotonMeson/Utils/EventHistograms.h" |
28 | 29 | #include "PWGEM/PhotonMeson/Utils/NMHistograms.h" |
29 | 30 | #include "PWGEM/PhotonMeson/Utils/PairUtilities.h" |
30 | 31 | // Dilepton headers |
31 | | -#include "PWGEM/Dilepton/Utils/EMTrack.h" |
32 | 32 | #include "PWGEM/Dilepton/Utils/EventMixingHandler.h" |
33 | 33 |
|
34 | 34 | #include "Common/CCDB/TriggerAliases.h" |
@@ -249,8 +249,8 @@ struct Pi0EtaToGammaGamma { |
249 | 249 | o2::framework::Partition<o2::soa::Filtered<o2::soa::Join<o2::aod::EMPrimaryElectronsFromDalitz, o2::aod::EMPrimaryElectronDaEMEventIds, o2::aod::EMPrimaryElectronsPrefilterBitDerived>>> positrons = o2::aod::emprimaryelectron::sign > int8_t(0) && dileptoncuts.cfg_min_pt_track < o2::aod::track::pt&& nabs(o2::aod::track::eta) < dileptoncuts.cfg_max_eta_track; |
250 | 250 | o2::framework::Partition<o2::soa::Filtered<o2::soa::Join<o2::aod::EMPrimaryElectronsFromDalitz, o2::aod::EMPrimaryElectronDaEMEventIds, o2::aod::EMPrimaryElectronsPrefilterBitDerived>>> electrons = o2::aod::emprimaryelectron::sign < int8_t(0) && dileptoncuts.cfg_min_pt_track < o2::aod::track::pt && nabs(o2::aod::track::eta) < dileptoncuts.cfg_max_eta_track; |
251 | 251 |
|
252 | | - o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::dilepton::utils::EMTrack>* emh1 = nullptr; |
253 | | - o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::dilepton::utils::EMTrack>* emh2 = nullptr; |
| 252 | + o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::photonmeson::utils::EMPhoton>* emh1 = nullptr; |
| 253 | + o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::photonmeson::utils::EMPhoton>* emh2 = nullptr; |
254 | 254 | //--------------------------------------------------------------------------- |
255 | 255 |
|
256 | 256 | std::vector<int> used_photonIds_per_col; // <ndf, trackId> |
@@ -383,8 +383,8 @@ struct Pi0EtaToGammaGamma { |
383 | 383 | occ_bin_edges = std::vector<float>(ConfOccupancyBins.value.begin(), ConfOccupancyBins.value.end()); |
384 | 384 | occ_bin_edges.erase(occ_bin_edges.begin()); |
385 | 385 |
|
386 | | - emh1 = new o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::dilepton::utils::EMTrack>(ndepth); |
387 | | - emh2 = new o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::dilepton::utils::EMTrack>(ndepth); |
| 386 | + emh1 = new o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::photonmeson::utils::EMPhoton>(ndepth); |
| 387 | + emh2 = new o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::photonmeson::utils::EMPhoton>(ndepth); |
388 | 388 |
|
389 | 389 | o2::aod::pwgem::photonmeson::utils::eventhistogram::addEventHistograms(&fRegistry); |
390 | 390 | if constexpr (pairtype == o2::aod::pwgem::photonmeson::photonpair::PairType::kPCMDalitzEE) { |
@@ -843,11 +843,11 @@ struct Pi0EtaToGammaGamma { |
843 | 843 |
|
844 | 844 | std::pair<int, int> tuple_tmp_id2 = std::make_pair(pos2.trackId(), ele2.trackId()); |
845 | 845 | if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) { |
846 | | - emh1->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::dilepton::utils::EMTrack(g1.pt(), g1.eta(), g1.phi(), 0)); |
| 846 | + emh1->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::photonmeson::utils::EMPhoton(g1.pt(), g1.eta(), g1.phi(), 0)); |
847 | 847 | used_photonIds_per_col.emplace_back(g1.globalIndex()); |
848 | 848 | } |
849 | 849 | if (std::find(used_dileptonIds_per_col.begin(), used_dileptonIds_per_col.end(), tuple_tmp_id2) == used_dileptonIds_per_col.end()) { |
850 | | - emh2->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::dilepton::utils::EMTrack(v_ee.Pt(), v_ee.Eta(), v_ee.Phi(), v_ee.M())); |
| 850 | + emh2->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::photonmeson::utils::EMPhoton(v_ee.Pt(), v_ee.Eta(), v_ee.Phi(), v_ee.M())); |
851 | 851 | used_dileptonIds_per_col.emplace_back(tuple_tmp_id2); |
852 | 852 | } |
853 | 853 | ndiphoton++; |
@@ -922,11 +922,11 @@ struct Pi0EtaToGammaGamma { |
922 | 922 | fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), wpair); |
923 | 923 |
|
924 | 924 | if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) { |
925 | | - emh1->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::dilepton::utils::EMTrack(g1.pt(), g1.eta(), g1.phi(), 0)); |
| 925 | + emh1->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::photonmeson::utils::EMPhoton(g1.pt(), g1.eta(), g1.phi(), 0)); |
926 | 926 | used_photonIds_per_col.emplace_back(g1.globalIndex()); |
927 | 927 | } |
928 | 928 | if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g2.globalIndex()) == used_photonIds_per_col.end()) { |
929 | | - emh2->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::dilepton::utils::EMTrack(g2.pt(), g2.eta(), g2.phi(), 0)); |
| 929 | + emh2->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::photonmeson::utils::EMPhoton(g2.pt(), g2.eta(), g2.phi(), 0)); |
930 | 930 | used_photonIds_per_col.emplace_back(g2.globalIndex()); |
931 | 931 | } |
932 | 932 | ndiphoton++; |
|
0 commit comments