Skip to content

Common: interlink MC extras with reco coll info #7633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddobrigk merged 2 commits into from
Sep 10, 2024
Merged

Common: interlink MC extras with reco coll info #7633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d9e9da
Common: interlink MC extras with reco coll info
ddobrigk Sep 9, 2024
2dcabfc
Please consider the following formatting changes (#342)
alibuild Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ DECLARE_SOA_TABLE(MultsGlobal, "AOD", "MULTGLOBAL", //! counters that use Track
DECLARE_SOA_TABLE(MultSelections, "AOD", "MULTSELECTIONS", //!
evsel::Selection); // for derived data / QA studies
using MultExtra = MultsExtra::iterator;
DECLARE_SOA_TABLE(MultsExtraMC, "AOD", "MULTEXTRAMC", //! Table for the MC information

// mc collisions table - indexed to Mult
DECLARE_SOA_TABLE(MultMCExtras, "AOD", "MULTMCEXTRA", //! Table for the MC information
mult::MultMCFT0A,
mult::MultMCFT0C,
mult::MultMCNParticlesEta05,
Expand All @@ -140,7 +142,17 @@ DECLARE_SOA_TABLE(MultsExtraMC, "AOD", "MULTEXTRAMC", //! Table for the MC infor
mult::IsInelGt0<mult::MultMCNParticlesEta10>,
mult::IsInelGt1<mult::MultMCNParticlesEta10>,
o2::soa::Marker<1>);
using MultExtraMC = MultsExtraMC::iterator;
using MultMCExtra = MultMCExtras::iterator;
using MultsExtraMC = MultMCExtras; // for backwards compatibility with previous naming scheme

// crosslinks
namespace mult
{
DECLARE_SOA_INDEX_COLUMN(MultMCExtra, multMCExtra);
}

DECLARE_SOA_TABLE(MC2Mults, "AOD", "MC2MULTS", //! Relate BC -> mult
o2::soa::Index<>, mult::MultMCExtraId);

namespace multZeq
{
Expand Down
24 changes: 16 additions & 8 deletions Common/TableProducer/multiplicityTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static constexpr int kFV0MultZeqs = 9;
static constexpr int kFT0MultZeqs = 10;
static constexpr int kFDDMultZeqs = 11;
static constexpr int kPVMultZeqs = 12;
static constexpr int kMultsExtraMC = 13;
static constexpr int kMultMCExtras = 13;
static constexpr int nTables = 14;

// Checking that the Zeq tables are after the normal ones
Expand All @@ -66,7 +66,7 @@ static const std::vector<std::string> tableNames{"FV0Mults", // 0
"FT0MultZeqs", // 10
"FDDMultZeqs", // 11
"PVMultZeqs", // 12
"MultsExtraMC"}; // 13
"MultMCExtras"}; // 13
static const std::vector<std::string> parameterNames{"Enable"};
static const int defaultParameters[nTables][nParameters]{{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}};

Expand All @@ -85,7 +85,8 @@ struct MultiplicityTable {
Produces<aod::FT0MultZeqs> tableFT0Zeqs; // 10
Produces<aod::FDDMultZeqs> tableFDDZeqs; // 11
Produces<aod::PVMultZeqs> tablePVZeqs; // 12
Produces<aod::MultsExtraMC> tableExtraMc; // 13
Produces<aod::MultMCExtras> tableExtraMc; // 13
Produces<aod::MC2Mults> tableExtraMc2Mults;
Produces<aod::MultsGlobal> multsGlobal; // Not accounted for, produced based on process function processGlobalTrackingCounters

// For vertex-Z corrections in calibration
Expand Down Expand Up @@ -163,10 +164,11 @@ struct MultiplicityTable {
}
}
// Handle the custom cases.
if (tEnabled[kMultsExtraMC]) {
if (enabledTables->get(tableNames[kMultsExtraMC].c_str(), "Enable") == -1) {
if (tEnabled[kMultMCExtras]) {
if (enabledTables->get(tableNames[kMultMCExtras].c_str(), "Enable") == -1) {
doprocessMC.value = true;
LOG(info) << "Enabling MC processing due to " << tableNames[kMultsExtraMC] << " table being enabled.";
doprocessMC2Mults.value = true;
LOG(info) << "Enabling MC processing due to " << tableNames[kMultMCExtras] << " table being enabled.";
}
}

Expand Down Expand Up @@ -335,7 +337,7 @@ struct MultiplicityTable {
case kPVMultZeqs: // Equalized multiplicity for PV
tablePVZeqs.reserve(collisions.size());
break;
case kMultsExtraMC: // MC extra information (nothing to do in the data)
case kMultMCExtras: // MC extra information (nothing to do in the data)
break;
default:
LOG(fatal) << "Unknown table requested: " << i;
Expand Down Expand Up @@ -609,7 +611,7 @@ struct MultiplicityTable {
}
tablePVZeqs(multZeqNContribs);
} break;
case kMultsExtraMC: // MC only (nothing to do)
case kMultMCExtras: // MC only (nothing to do)
{
} break;
default: // Default
Expand Down Expand Up @@ -665,6 +667,11 @@ struct MultiplicityTable {
tableExtraMc(multFT0A, multFT0C, multBarrelEta05, multBarrelEta08, multBarrelEta10, mcCollision.posZ());
}

void processMC2Mults(soa::Join<aod::McCollisionLabels, aod::Collisions>::iterator const& collision)
{
tableExtraMc2Mults(collision.mcCollisionId()); // interlink
}

Configurable<float> min_pt_globaltrack{"min_pt_globaltrack", 0.15, "min. pT for global tracks"};
Configurable<float> max_pt_globaltrack{"max_pt_globaltrack", 1e+10, "max. pT for global tracks"};
Configurable<int> min_ncluster_its_globaltrack{"min_ncluster_its_globaltrack", 5, "min. number of ITS clusters for global tracks"};
Expand Down Expand Up @@ -715,6 +722,7 @@ struct MultiplicityTable {
PROCESS_SWITCH(MultiplicityTable, processRun3, "Produce Run 3 multiplicity tables", true);
PROCESS_SWITCH(MultiplicityTable, processGlobalTrackingCounters, "Produce Run 3 global counters", false);
PROCESS_SWITCH(MultiplicityTable, processMC, "Produce MC multiplicity tables", false);
PROCESS_SWITCH(MultiplicityTable, processMC2Mults, "Produce MC -> Mult map", false);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down