[PWGEM] separate alias_raw from EMEvents

PWGEM/Dilepton/Core/DileptonProducer.h

@@ -61,14 +61,14 @@
 #include <utility>
 #include <vector>
 
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 using namespace o2::soa;
 using namespace o2::aod::pwgem::dilepton::utils;
 using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
 using namespace o2::aod::pwgem::dilepton::utils::pairutil;
 
 using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec>;
 using MyCollision = MyCollisions::iterator;
@@ -310,10 +310,10 @@
     }
 
     // In case override, don't proceed, please - no CCDB access required
     if (d_bz_input > -990) {
       d_bz = d_bz_input;
       o2::parameters::GRPMagField grpmag;
       if (std::fabs(d_bz) > 1e-5) {
         grpmag.setL3Current(30000.f / (d_bz / 5.0f));
       }
       o2::base::Propagator::initFieldFromGRP(&grpmag);
@@ -767,7 +767,7 @@
         continue;
       }
 
-      normTable(collision.alias_raw(), collision.selection_raw(), collision.rct_raw(), collision.posZ(), collision.centFT0C());
+      normTable(collision.selection_raw(), collision.rct_raw(), collision.posZ(), collision.centFT0C());
 
     } // end of collision loop
   }

PWGEM/Dilepton/DataModel/dileptonTables.h

@@ -66,7 +66,7 @@ const std::unordered_map<std::string, int> aliasLabels = {
 } // namespace pwgem::dilepton::swt
 
 DECLARE_SOA_TABLE(EMBCs, "AOD", "EMBC", //! bc information for normalization
-                  o2::soa::Index<>, evsel::Alias, evsel::Selection, evsel::Rct);
+                  o2::soa::Index<>, evsel::Selection, evsel::Rct);
 using EMBC = EMBCs::iterator;
 
 namespace emevent
@@ -174,9 +174,18 @@ DECLARE_SOA_TABLE_VERSIONED(EMEvents_003, "AOD", "EMEVENT", 3, //!   Main event
                             collision::PosZ,
                             collision::NumContrib, evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, emevent::Sel8<evsel::Selection>);
 
-using EMEvents = EMEvents_003;
+DECLARE_SOA_TABLE_VERSIONED(EMEvents_004, "AOD", "EMEVENT", 4, //!   Main event information table
+                            o2::soa::Index<>, emevent::CollisionId, bc::RunNumber, bc::GlobalBC, evsel::Selection, evsel::Rct, timestamp::Timestamp,
+                            collision::PosZ,
+                            collision::NumContrib, evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, emevent::Sel8<evsel::Selection>);
+
+using EMEvents = EMEvents_004;
 using EMEvent = EMEvents::iterator;
 
+DECLARE_SOA_TABLE_VERSIONED(EMEventsAlias_000, "AOD", "EMEVENTALIAS", 0, evsel::Alias) //! joinable to EMEvents
+using EMEventsAlias = EMEventsAlias_000;
+using EMEventAlias = EMEventsAlias::iterator;
+
 DECLARE_SOA_TABLE(EMEventsXY, "AOD", "EMEVENTXY", emevent::PosX, emevent::PosY); // joinable to EMEvents, only for treeCreatetorML.cxx
 using EMEventXY = EMEventsXY::iterator;
 
@@ -201,8 +210,6 @@ DECLARE_SOA_TABLE_VERSIONED(EMEventsQvec_000, "AOD", "EMEVENTQVEC", 0, //!   eve
                             emevent::Q2xBPos, emevent::Q2yBPos, emevent::Q2xBNeg, emevent::Q2yBNeg, emevent::Q2xBTot, emevent::Q2yBTot,
                             emevent::Q3xFT0M, emevent::Q3yFT0M, emevent::Q3xFT0A, emevent::Q3yFT0A, emevent::Q3xFT0C, emevent::Q3yFT0C,
                             emevent::Q3xBPos, emevent::Q3yBPos, emevent::Q3xBNeg, emevent::Q3yBNeg, emevent::Q3xBTot, emevent::Q3yBTot,
-                            // emevent::Q4xFT0M, emevent::Q4yFT0M, emevent::Q4xFT0A, emevent::Q4yFT0A, emevent::Q4xFT0C, emevent::Q4yFT0C,
-                            // emevent::Q4xBPos, emevent::Q4yBPos, emevent::Q4xBNeg, emevent::Q4yBNeg, emevent::Q4xBTot, emevent::Q4yBTot,
 
                             // Dynamic columns
                             emevent::EP2FT0M<emevent::Q2xFT0M, emevent::Q2yFT0M>,
@@ -217,12 +224,6 @@ DECLARE_SOA_TABLE_VERSIONED(EMEventsQvec_000, "AOD", "EMEVENTQVEC", 0, //!   eve
                             emevent::EP3BPos<emevent::Q3xBPos, emevent::Q3yBPos>,
                             emevent::EP3BNeg<emevent::Q3xBNeg, emevent::Q3yBNeg>,
                             emevent::EP3BTot<emevent::Q3xBTot, emevent::Q3yBTot>);
-// emevent::EP4FT0M<emevent::Q4xFT0M, emevent::Q4yFT0M>,
-// emevent::EP4FT0A<emevent::Q4xFT0A, emevent::Q4yFT0A>,
-// emevent::EP4FT0C<emevent::Q4xFT0C, emevent::Q4yFT0C>,
-// emevent::EP4BPos<emevent::Q4xBPos, emevent::Q4yBPos>,
-// emevent::EP4BNeg<emevent::Q4xBNeg, emevent::Q4yBNeg>,
-// emevent::EP4BTot<emevent::Q4xBTot, emevent::Q4yBTot>
 
 DECLARE_SOA_TABLE_VERSIONED(EMEventsQvec_001, "AOD", "EMEVENTQVEC", 1, //!   Main event information table
                             emevent::Q2xFT0M, emevent::Q2yFT0M, emevent::Q2xFT0A, emevent::Q2yFT0A, emevent::Q2xFT0C, emevent::Q2yFT0C,
@@ -231,8 +232,6 @@ DECLARE_SOA_TABLE_VERSIONED(EMEventsQvec_001, "AOD", "EMEVENTQVEC", 1, //!   Mai
                             emevent::Q3xFT0M, emevent::Q3yFT0M, emevent::Q3xFT0A, emevent::Q3yFT0A, emevent::Q3xFT0C, emevent::Q3yFT0C,
                             emevent::Q3xFV0A, emevent::Q3yFV0A,
                             emevent::Q3xBPos, emevent::Q3yBPos, emevent::Q3xBNeg, emevent::Q3yBNeg, emevent::Q3xBTot, emevent::Q3yBTot,
-                            // emevent::Q4xFT0M, emevent::Q4yFT0M, emevent::Q4xFT0A, emevent::Q4yFT0A, emevent::Q4xFT0C, emevent::Q4yFT0C,
-                            // emevent::Q4xBPos, emevent::Q4yBPos, emevent::Q4xBNeg, emevent::Q4yBNeg, emevent::Q4xBTot, emevent::Q4yBTot,
 
                             // Dynamic columns
                             emevent::EP2FT0M<emevent::Q2xFT0M, emevent::Q2yFT0M>,
@@ -292,8 +291,12 @@ DECLARE_SOA_TABLE(EMEoIs, "AOD", "EMEOI", //! joinable to aod::Collisions in cre
                   emevent::IsEoI);
 using EMEoI = EMEoIs::iterator;
 
-DECLARE_SOA_TABLE(EMEventNormInfos, "AOD", "EMEVENTNORMINFO", //! event information for normalization
-                  o2::soa::Index<>, evsel::Alias, evsel::Selection, evsel::Rct, emevent::PosZint16, cent::CentFT0C, emevent::PosZ<emevent::PosZint16>, emevent::Sel8<evsel::Selection>, o2::soa::Marker<1>);
+DECLARE_SOA_TABLE_VERSIONED(EMEventNormInfos_000, "AOD", "EMEVENTNORMINFO", 0, //! event information for normalization
+                            o2::soa::Index<>, evsel::Alias, evsel::Selection, evsel::Rct, emevent::PosZint16, cent::CentFT0C, emevent::PosZ<emevent::PosZint16>, emevent::Sel8<evsel::Selection>);
+
+DECLARE_SOA_TABLE_VERSIONED(EMEventNormInfos_001, "AOD", "EMEVENTNORMINFO", 1, //! event information for normalization
+                            o2::soa::Index<>, evsel::Selection, evsel::Rct, collision::PosZ, cent::CentFT0C, emevent::Sel8<evsel::Selection>);
+using EMEventNormInfos = EMEventNormInfos_001;
 using EMEventNormInfo = EMEventNormInfos::iterator;
 
 namespace emmcevent
@@ -948,7 +951,7 @@ using EMThinEvents = EMThinEvents_000;
 using EMThinEvent = EMThinEvents::iterator;
 
 DECLARE_SOA_TABLE(EMThinEventNormInfos, "AOD", "EMTHINEVENTNORM", //! event information for normalization
-                  o2::soa::Index<>, evsel::Alias, evsel::Selection, evsel::Rct, collision::PosZ, cent::CentFT0C, emevent::Sel8<evsel::Selection>, o2::soa::Marker<2>);
+                  o2::soa::Index<>, evsel::Selection, evsel::Rct, collision::PosZ, cent::CentFT0C, emevent::Sel8<evsel::Selection>, o2::soa::Marker<2>);
 using EMThinEventNormInfo = EMThinEventNormInfos::iterator;
 
 namespace emdilepton

PWGEM/Dilepton/TableProducer/CMakeLists.txt

@@ -9,6 +9,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
+add_subdirectory(Converters)
 
 o2physics_add_dpl_workflow(tree-creator-electron-ml
                     SOURCES treeCreatorElectronML.cxx

PWGEM/Dilepton/Tasks/Converters/CMakeLists.txt → PWGEM/Dilepton/TableProducer/Converters/CMakeLists.txt

@@ -20,6 +20,11 @@ o2physics_add_dpl_workflow(event-converter3
                   PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
                   COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(event-converter4
+                  SOURCES eventConverter4.cxx
+                  PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
+                  COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(electron-converter2
                   SOURCES electronConverter2.cxx
                   PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
@@ -59,3 +64,9 @@ o2physics_add_dpl_workflow(qvec-converter
                     SOURCES qvecConverter.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(event-norm-converter1
+                  SOURCES eventNormConverter1.cxx
+                  PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
+                  COMPONENT_NAME Analysis)
+

PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx → PWGEM/Dilepton/TableProducer/Converters/electronConverter2.cxx

@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
@@ -30,7 +31,7 @@ struct electronConverter2 {
 
   void process(aod::EMPrimaryElectrons_001 const& tracks)
   {
-    for (auto& track : tracks) {
+    for (const auto& track : tracks) {
       track_002(track.collisionId(),
                 track.trackId(),
                 track.sign(),

PWGEM/Dilepton/Tasks/Converters/electronConverter3.cxx → PWGEM/Dilepton/TableProducer/Converters/electronConverter3.cxx

@@ -31,7 +31,7 @@ struct electronConverter3 {
 
   void process(aod::EMPrimaryElectrons_002 const& tracks)
   {
-    for (auto& track : tracks) {
+    for (const auto& track : tracks) {
       track_003(track.collisionId(),
                 track.trackId(),
                 track.sign(),

PWGEM/Dilepton/Tasks/Converters/eventConverter2.cxx → PWGEM/Dilepton/TableProducer/Converters/eventConverter2.cxx

@@ -14,11 +14,12 @@
 // This code runs loop over ULS ee pars for virtual photon QC.
 //    Please write to: daiki.sekihata@cern.ch
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::aod;
 using namespace o2::framework;
@@ -30,7 +31,7 @@ struct eventConverter2 {
 
   void process(aod::EMEvents_001 const& collisions)
   {
-    for (auto& collision : collisions) {
+    for (const auto& collision : collisions) {
       event_002(
         collision.globalIndex(),
         collision.runNumber(),

PWGEM/Dilepton/Tasks/Converters/eventConverter3.cxx → PWGEM/Dilepton/TableProducer/Converters/eventConverter3.cxx

@@ -31,7 +31,7 @@ struct eventConverter3 {
 
   void process(aod::EMEvents_002 const& collisions)
   {
-    for (auto& collision : collisions) {
+    for (const auto& collision : collisions) {
       event_003(
         collision.globalIndex(),
         collision.runNumber(),

PWGEM/Dilepton/TableProducer/Converters/eventConverter4.cxx

@@ -0,0 +1,64 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+//
+// ========================
+//
+// This code runs loop over ULS ee pars for virtual photon QC.
+//    Please write to: daiki.sekihata@cern.ch
+
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+using namespace o2;
+using namespace o2::aod;
+using namespace o2::framework;
+using namespace o2::framework::expressions;
+using namespace o2::soa;
+
+struct eventConverter4 {
+  Produces<aod::EMEvents_004> event_004;
+  Produces<aod::EMEventsAlias_000> eventalias_000;
+
+  void process003to004(aod::EMEvents_003 const& collisions)
+  {
+    for (const auto& collision : collisions) {
+      event_004(
+        collision.globalIndex(),
+        collision.runNumber(),
+        collision.globalBC(),
+        collision.selection_raw(),
+        collision.rct_raw(),
+        collision.timestamp(),
+        collision.posZ(),
+        collision.numContrib(),
+        collision.trackOccupancyInTimeRange(),
+        collision.ft0cOccupancyInTimeRange());
+    } // end of collision loop
+  }
+  PROCESS_SWITCH(eventConverter4, process003to004, "convert from 003 into 004", true);
+
+  void processAlias(aod::EMEvents_003 const& collisions)
+  {
+    for (const auto& collision : collisions) {
+      eventalias_000(
+        collision.alias_raw());
+    } // end of collision loop
+  }
+  PROCESS_SWITCH(eventConverter4, processAlias, "convert from 003 into alias", false); // only for photon PAG.
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{adaptAnalysisTask<eventConverter4>(cfgc, TaskName{"event-converter4"})};
+}

PWGEM/Dilepton/TableProducer/Converters/eventNormConverter1.cxx

@@ -0,0 +1,47 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+//
+// ========================
+//
+// This code runs loop over ULS ee pars for virtual photon QC.
+//    Please write to: daiki.sekihata@cern.ch
+
+#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+using namespace o2;
+using namespace o2::aod;
+using namespace o2::framework;
+using namespace o2::framework::expressions;
+using namespace o2::soa;
+
+struct eventNormConverter1 {
+  Produces<aod::EMEventNormInfos_001> event_001;
+
+  void process(aod::EMEventNormInfos_000 const& collisions)
+  {
+    for (const auto& collision : collisions) {
+      event_001(
+        collision.selection_raw(),
+        collision.rct_raw(),
+        collision.posZ(),
+        collision.centFT0C());
+    } // end of collision loop
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{adaptAnalysisTask<eventNormConverter1>(cfgc, TaskName{"event-norm-converter1"})};
+}

PWGEM/Dilepton/TableProducer/createEMEventDilepton.cxx

@@ -108,7 +108,7 @@ struct CreateEMEventDilepton {
       if (bc.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
         // const auto& collisions_perBC = collisions.sliceBy(perBC, bc.globalIndex());
         // embc(bc.selection_bit(o2::aod::evsel::kIsTriggerTVX), bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder), bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder), static_cast<bool>(collisions_perBC.size() > 0)); // TVX is fired.
-        embc(bc.alias_raw(), bc.selection_raw(), bc.rct_raw()); // TVX is fired.
+        embc(bc.selection_raw(), bc.rct_raw()); // TVX is fired.
       }
     } // end of bc loop
 
@@ -124,11 +124,11 @@ struct CreateEMEventDilepton {
 
       if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
         if constexpr (eventtype == EMEventType::kEvent) {
-          event_norm_info(collision.alias_raw(), collision.selection_raw(), collision.rct_raw(), static_cast<int16_t>(10.f * collision.posZ()), 105.f);
+          event_norm_info(collision.selection_raw(), collision.rct_raw(), collision.posZ(), 105.f);
         } else if constexpr (eventtype == EMEventType::kEvent_Cent || eventtype == EMEventType::kEvent_Cent_Qvec) {
-          event_norm_info(collision.alias_raw(), collision.selection_raw(), collision.rct_raw(), static_cast<int16_t>(10.f * collision.posZ()), collision.centFT0C());
+          event_norm_info(collision.selection_raw(), collision.rct_raw(), collision.posZ(), collision.centFT0C());
         } else {
-          event_norm_info(collision.alias_raw(), collision.selection_raw(), collision.rct_raw(), static_cast<int16_t>(10.f * collision.posZ()), 105.f);
+          event_norm_info(collision.selection_raw(), collision.rct_raw(), collision.posZ(), 105.f);
         }
       }
 
@@ -150,7 +150,7 @@ struct CreateEMEventDilepton {
 
       registry.fill(HIST("hEventCounter"), 2);
 
-      event(collision.globalIndex(), bc.runNumber(), bc.globalBC(), collision.alias_raw(), collision.selection_raw(), collision.rct_raw(), bc.timestamp(),
+      event(collision.globalIndex(), bc.runNumber(), bc.globalBC(), collision.selection_raw(), collision.rct_raw(), bc.timestamp(),
             collision.posZ(),
             collision.numContrib(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
 

PWGEM/Dilepton/Tasks/CMakeLists.txt

@@ -9,7 +9,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-add_subdirectory(Converters)
 
 o2physics_add_dpl_workflow(efficiency-ee
                     SOURCES emEfficiencyEE.cxx

PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

@@ -66,10 +66,10 @@ using namespace o2::aod::pwgem::photon;
 using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
 using namespace o2::aod::pwgem::dilepton::utils;
 
-using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent>;
+using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsAlias, aod::EMEventsMult, aod::EMEventsCent>;
 using MyCollision = MyCollisions::iterator;
 
-using MyCollisionsWithSWT = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMSWTriggerBits>;
+using MyCollisionsWithSWT = soa::Join<aod::EMEvents, aod::EMEventsAlias, aod::EMEventsMult, aod::EMEventsCent, aod::EMSWTriggerBits>;
 using MyCollisionWithSWT = MyCollisionsWithSWT::iterator;
 
 using MyV0Photons = soa::Filtered<soa::Join<aod::V0PhotonsKF, aod::V0KFEMEventIds, aod::V0PhotonsKFPrefilterBitDerived>>;

PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h

@@ -543,7 +543,7 @@ struct Pi0EtaToGammaGamma {
       }
 
       float weight = 1.f;
-      if constexpr (std::is_same_v<std::decay_t<TCollisions>, o2::soa::Filtered<o2::soa::Join<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>, o2::aod::EMEventsWeight>>>) {
+      if constexpr (std::is_same_v<std::decay_t<TCollisions>, o2::soa::Filtered<o2::soa::Join<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsAlias, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>, o2::aod::EMEventsWeight>>>) {
         weight = collision.weight();
       }
 
@@ -864,7 +864,7 @@ struct Pi0EtaToGammaGamma {
   o2::framework::expressions::Filter prefilter_primaryelectron = ifnode(dileptoncuts.cfg_apply_cuts_from_prefilter_derived.node(), o2::aod::emprimaryelectron::pfbderived == static_cast<uint16_t>(0), true);
 
   int ndf = 0;
-  void processAnalysis(o2::soa::Filtered<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>> const& collisions, Types const&... args)
+  void processAnalysis(o2::soa::Filtered<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsAlias, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>> const& collisions, Types const&... args)
   {
     // LOGF(info, "ndf = %d", ndf);
     if constexpr (pairtype == o2::aod::pwgem::photonmeson::photonpair::PairType::kPCMPCM) {
@@ -901,7 +901,7 @@ struct Pi0EtaToGammaGamma {
   PROCESS_SWITCH(Pi0EtaToGammaGamma, processAnalysis, "process pair analysis", true);
 
   // using FilteredMyCollisionsWithJJMC = o2::soa::Filtered<o2::soa::Join<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>, o2::aod::EMEventsWeight>>;
-  void processAnalysisJJMC(o2::soa::Filtered<o2::soa::Join<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>, o2::aod::EMEventsWeight>> const& collisions, Types const&... args)
+  void processAnalysisJJMC(o2::soa::Filtered<o2::soa::Join<o2::soa::Join<o2::aod::EMEvents, o2::aod::EMEventsAlias, o2::aod::EMEventsMult, o2::aod::EMEventsCent, o2::aod::EMEventsQvec>, o2::aod::EMEventsWeight>> const& collisions, Types const&... args)
   {
     // LOGF(info, "ndf = %d", ndf);
     if constexpr (pairtype == o2::aod::pwgem::photonmeson::photonpair::PairType::kPCMPCM) {