Skip to content

[Common] Add FT0C variant 2 (Run 2 like truncation) #13239

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 3 commits into from
Oct 8, 2025
Merged

[Common] Add FT0C variant 2 (Run 2 like truncation) #13239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87b1fe5
[Common] Add FT0C variant 2
Oct 4, 2025
476d7e8
Please consider the following formatting changes (#486)
alibuild Oct 5, 2025
f72d594
Update MultModule.h
ddobrigk Oct 7, 2025
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
2 changes: 2 additions & 0 deletions Common/DataModel/Centrality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/DataModel/Centrality.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// 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.
#ifndef COMMON_DATAMODEL_CENTRALITY_H_

Check failure on line 11 in Common/DataModel/Centrality.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 11 in Common/DataModel/Centrality.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \brief is missing, incorrect or misplaced.

Check failure on line 11 in Common/DataModel/Centrality.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.
#define COMMON_DATAMODEL_CENTRALITY_H_

#include <Framework/AnalysisDataModel.h>
Expand All @@ -31,6 +31,7 @@
DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float); //! Run 3 cent. from FT0A multiplicity
DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); //! Run 3 cent. from FT0C multiplicity
DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float); //! Run 3 cent. from FT0C multiplicity
DECLARE_SOA_COLUMN(CentFT0CVariant2, centFT0CVariant2, float); //! Run 3 cent. from FT0C multiplicity, uses classical truncated Nancestors (NOT recommended, cross-check only!)
DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float); //! Run 3 cent. from FDDA+FDDC multiplicity
DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the
DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of tracks contributing to the PV
Expand Down Expand Up @@ -59,6 +60,7 @@

// Run 3 variant tables
DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVariant1); //! Run 3 FT0C variant 1
DECLARE_SOA_TABLE(CentFT0CVariant2s, "AOD", "CENTFT0Cvar2", cent::CentFT0CVariant2); //! Run 3 FT0C variant 1 - uses truncated Nancestors in glauber fit. Not recommended! for cross-checks only

// Run 3 centrality per BC (joinable with BC)
DECLARE_SOA_TABLE(BCCentFT0Ms, "AOD", "BCCENTFT0M", cent::CentFT0M, o2::soa::Marker<1>); //! Run 3 FT0M BC centrality table
Expand Down
16 changes: 14 additions & 2 deletions Common/Tools/Multiplicity/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"CentFT0As",
"CentFT0Cs",
"CentFT0CVariant1s",
"CentFT0CVariant2s",
"CentFDDMs",
"CentNTPVs",
"CentNGlobals",
Expand All @@ -98,7 +99,7 @@
"BCCentFT0As",
"BCCentFT0Cs"};

static constexpr int nTablesConst = 38;
static constexpr int nTablesConst = 39;

static const std::vector<std::string> parameterNames{"enable"};
static const int defaultParameters[nTablesConst][nParameters]{
Expand Down Expand Up @@ -139,6 +140,7 @@
{-1},
{-1},
{-1},
{-1},
{-1}};

// table index : match order above
Expand Down Expand Up @@ -175,6 +177,7 @@
kCentFT0As, // standard Run 3
kCentFT0Cs, // standard Run 3
kCentFT0CVariant1s, // standard Run 3
kCentFT0CVariant2s, // standard Run 3
kCentFDDMs, // standard Run 3
kCentNTPVs, // standard Run 3
kCentNGlobals, // requires track selection task
Expand Down Expand Up @@ -221,6 +224,7 @@
o2::framework::Produces<aod::CentFT0As> centFT0A;
o2::framework::Produces<aod::CentFT0Cs> centFT0C;
o2::framework::Produces<aod::CentFT0CVariant1s> centFT0CVariant1;
o2::framework::Produces<aod::CentFT0CVariant2s> centFT0CVariant2;
o2::framework::Produces<aod::CentFDDMs> centFDDM;
o2::framework::Produces<aod::CentNTPVs> centNTPV;
o2::framework::Produces<aod::CentNGlobals> centNGlobals;
Expand Down Expand Up @@ -432,6 +436,7 @@
CalibrationInfo ft0aInfo = CalibrationInfo("FT0A");
CalibrationInfo ft0cInfo = CalibrationInfo("FT0C");
CalibrationInfo ft0cVariant1Info = CalibrationInfo("FT0Cvar1");
CalibrationInfo ft0cVariant2Info = CalibrationInfo("FT0Cvar2");
CalibrationInfo fddmInfo = CalibrationInfo("FDD");
CalibrationInfo ntpvInfo = CalibrationInfo("NTracksPV");
CalibrationInfo nGlobalInfo = CalibrationInfo("NGlobal");
Expand Down Expand Up @@ -584,9 +589,9 @@
if (internalOpts.mEnabledTables[kPVMults]) {
if (std::abs(track.eta()) < 1.0) {
mults.multNContribsEta1++; // pvmults
if (std::abs(track.eta()) < 0.8) {

Check failure on line 592 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribs++; // pvmults
if (std::abs(track.eta()) < 0.5) {

Check failure on line 594 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribsEtaHalf++; // pvmults
}
}
Expand Down Expand Up @@ -690,7 +695,7 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
mults.multFV0A += amplitude;
if (channel > 7) {

Check failure on line 698 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFV0AOuter += amplitude;
}
}
Expand Down Expand Up @@ -767,7 +772,7 @@
//_______________________________________________________________________
// vertex-Z equalized signals
if (internalOpts.mEnabledTables[kFV0MultZeqs]) {
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 775 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFV0AZeq = hVtxZFV0A->Interpolate(0.0) * mults.multFV0A / hVtxZFV0A->Interpolate(collision.posZ());
} else {
mults.multFV0AZeq = 0.0f;
Expand All @@ -775,7 +780,7 @@
cursors.tableFV0Zeqs(mults.multFV0AZeq);
}
if (internalOpts.mEnabledTables[kFT0MultZeqs]) {
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 783 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFT0AZeq = hVtxZFT0A->Interpolate(0.0) * mults.multFT0A / hVtxZFT0A->Interpolate(collision.posZ());
mults.multFT0CZeq = hVtxZFT0C->Interpolate(0.0) * mults.multFT0C / hVtxZFT0C->Interpolate(collision.posZ());
} else {
Expand All @@ -785,7 +790,7 @@
cursors.tableFT0Zeqs(mults.multFT0AZeq, mults.multFT0CZeq);
}
if (internalOpts.mEnabledTables[kFDDMultZeqs]) {
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 793 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFDDAZeq = hVtxZFDDA->Interpolate(0.0) * mults.multFDDA / hVtxZFDDA->Interpolate(collision.posZ());
mults.multFDDCZeq = hVtxZFDDC->Interpolate(0.0) * mults.multFDDC / hVtxZFDDC->Interpolate(collision.posZ());
} else {
Expand Down Expand Up @@ -1186,6 +1191,7 @@
ft0aInfo.mCalibrationStored = false;
ft0cInfo.mCalibrationStored = false;
ft0cVariant1Info.mCalibrationStored = false;
ft0cVariant2Info.mCalibrationStored = false;
fddmInfo.mCalibrationStored = false;
ntpvInfo.mCalibrationStored = false;
nGlobalInfo.mCalibrationStored = false;
Expand Down Expand Up @@ -1225,6 +1231,8 @@
getccdb(ft0cInfo, internalOpts.generatorName);
if (internalOpts.mEnabledTables[kCentFT0CVariant1s])
getccdb(ft0cVariant1Info, internalOpts.generatorName);
if (internalOpts.mEnabledTables[kCentFT0CVariant2s])
getccdb(ft0cVariant2Info, internalOpts.generatorName);
if (internalOpts.mEnabledTables[kCentFDDMs])
getccdb(fddmInfo, internalOpts.generatorName);
if (internalOpts.mEnabledTables[kCentNTPVs])
Expand All @@ -1249,7 +1257,9 @@
if (
internalOpts.mEnabledTables[kCentFV0As] || internalOpts.mEnabledTables[kCentFT0Ms] ||
internalOpts.mEnabledTables[kCentFT0As] || internalOpts.mEnabledTables[kCentFT0Cs] ||
internalOpts.mEnabledTables[kCentFT0CVariant1s] || internalOpts.mEnabledTables[kCentFDDMs] ||
internalOpts.mEnabledTables[kCentFT0CVariant1s] ||
internalOpts.mEnabledTables[kCentFT0CVariant2s] ||
internalOpts.mEnabledTables[kCentFDDMs] ||
internalOpts.mEnabledTables[kCentNTPVs] || internalOpts.mEnabledTables[kCentNGlobals] ||
internalOpts.mEnabledTables[kCentMFTs] || internalOpts.mEnabledTables[kBCCentFT0Ms] ||
internalOpts.mEnabledTables[kBCCentFT0As] || internalOpts.mEnabledTables[kBCCentFT0Cs]) {
Expand Down Expand Up @@ -1304,6 +1314,8 @@
populateTable(cursors.centFT0C, ft0cInfo, mults[iEv].multFT0CZeq, isInelGt0);
if (internalOpts.mEnabledTables[kCentFT0CVariant1s])
populateTable(cursors.centFT0CVariant1, ft0cVariant1Info, mults[iEv].multFT0CZeq, isInelGt0);
if (internalOpts.mEnabledTables[kCentFT0CVariant2s])
populateTable(cursors.centFT0CVariant2, ft0cVariant2Info, mults[iEv].multFT0CZeq, isInelGt0);
if (internalOpts.mEnabledTables[kCentFDDMs])
populateTable(cursors.centFDDM, fddmInfo, mults[iEv].multFDDAZeq + mults[iEv].multFDDCZeq, isInelGt0);
if (internalOpts.mEnabledTables[kCentNTPVs])
Expand Down
Loading