PWGEM: separate alias_raw from EMEvents

Author: dsekihat

PWGEM/Dilepton/Core/DileptonProducer.h

@@ -767,7 +767,7 @@ struct DileptonProducer {
         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

…Dilepton/Tasks/Converters/CMakeLists.txt …/TableProducer/Converters/CMakeLists.txtPWGEM/Dilepton/Tasks/Converters/CMakeLists.txt renamed to PWGEM/Dilepton/TableProducer/Converters/CMakeLists.txt PWGEM/Dilepton/Tasks/Converters/CMakeLists.txt renamed to 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)
+

…/Tasks/Converters/electronConverter2.cxx …oducer/Converters/electronConverter2.cxxPWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx renamed to PWGEM/Dilepton/TableProducer/Converters/electronConverter2.cxx PWGEM/Dilepton/Tasks/Converters/electronConverter2.cxx renamed to 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(),

…/Tasks/Converters/electronConverter3.cxx …oducer/Converters/electronConverter3.cxxPWGEM/Dilepton/Tasks/Converters/electronConverter3.cxx renamed to PWGEM/Dilepton/TableProducer/Converters/electronConverter3.cxx PWGEM/Dilepton/Tasks/Converters/electronConverter3.cxx renamed to 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(),

…/Tasks/Converters/electronConverter4.cxx …oducer/Converters/electronConverter4.cxxPWGEM/Dilepton/Tasks/Converters/electronConverter4.cxx renamed to PWGEM/Dilepton/TableProducer/Converters/electronConverter4.cxx PWGEM/Dilepton/Tasks/Converters/electronConverter4.cxx renamed to PWGEM/Dilepton/TableProducer/Converters/electronConverter4.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(),

…/Tasks/Converters/electronConverter5.cxx …oducer/Converters/electronConverter5.cxxPWGEM/Dilepton/Tasks/Converters/electronConverter5.cxx renamed to PWGEM/Dilepton/TableProducer/Converters/electronConverter5.cxx PWGEM/Dilepton/Tasks/Converters/electronConverter5.cxx renamed to PWGEM/Dilepton/TableProducer/Converters/electronConverter5.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(),