Skip to content

[Common] Add ZDC & FIT time tables and kIsBBZPA && kIsBBZPC selections to centrality study #17347

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

Open
jesgum wants to merge 1 commit into
base: master
Choose a base branch
from
+157 −58
Open

[Common] Add ZDC & FIT time tables and kIsBBZPA && kIsBBZPC selections to centrality study #17347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
[](int multPveta1) -> bool { return multPveta1 > 1; });

// forward track counters
DECLARE_SOA_COLUMN(MFTNalltracks, mftNalltracks, int); //! overall counter, uses AO2D coll assoc

Check failure on line 58 in Common/DataModel/Multiplicity.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(MFTNtracks, mftNtracks, int); //! reassigned, uses mult group software

Check failure on line 59 in Common/DataModel/Multiplicity.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

// MC
DECLARE_SOA_COLUMN(MultMCFT0A, multMCFT0A, int); //!
Expand Down Expand Up @@ -100,10 +100,20 @@
DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //!

// Extra information from FIT detectors
DECLARE_SOA_COLUMN(FT0TriggerMask, ft0TriggerMask, uint8_t); //!

Check failure on line 103 in Common/DataModel/Multiplicity.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //! FV0 without innermost ring
DECLARE_SOA_COLUMN(MultFT0AOuter, multFT0AOuter, float); //! FT0A without innermost ring

// Timing information
DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float); //!
DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float); //!
DECLARE_SOA_COLUMN(TimeZPA, timeZPA, float); //!
DECLARE_SOA_COLUMN(TimeZPC, timeZPC, float); //!
DECLARE_SOA_COLUMN(TimeT0A, timeT0A, float); //!
DECLARE_SOA_COLUMN(TimeT0C, timeT0C, float); //!
DECLARE_SOA_COLUMN(TimeFDA, timeFDA, float); //!
DECLARE_SOA_COLUMN(TimeFDC, timeFDC, float); //!

} // namespace mult
DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector
mult::MultFV0A, mult::MultFV0C,
Expand Down Expand Up @@ -318,6 +328,16 @@
mult::MultTVX,
mult::MultFV0OrA);

DECLARE_SOA_TABLE(TimeBCs, "AOD", "TIMEBC", //!
mult::TimeT0A,
mult::TimeT0C,
mult::TimeFDA,
mult::TimeFDC,
mult::TimeZNA,
mult::TimeZNC,
mult::TimeZPA,
mult::TimeZPC)

using MultBCs = MultBCs_001;
using MultBcSel = MultBcSel_001;
using MultBC = MultBCs::iterator;
Expand All @@ -329,7 +349,7 @@
}
namespace multBC
{
DECLARE_SOA_INDEX_COLUMN(FT0Mult, ft0Mult);

Check failure on line 352 in Common/DataModel/Multiplicity.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
}

// for QA purposes
Expand Down
105 changes: 80 additions & 25 deletions Common/TableProducer/multiplicityExtraTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
// 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.

///
/// \file multiplicityExtraTable.cxx
/// \brief This tasks produces BC based multiplicity tables
/// \author David Dobrigkeit Chinellato and Jesper Karlsson Gumprecht
///

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"

Expand Down Expand Up @@ -43,6 +50,7 @@
Produces<aod::MultBCs> multBC;
Produces<aod::MultBcSel> multBcSel;
Produces<aod::MultNeighs> multNeigh;
Produces<aod::TimeBCs> timeBC;

Produces<aod::Mults2BC> mult2bc;
Produces<aod::BC2Mults> bc2mult;
Expand All @@ -59,17 +67,19 @@

float tru(float value)
{
if (bcTableFloatPrecision < 1e-4)
static constexpr float PrecisionThreshold = 1e-4;
if (bcTableFloatPrecision < PrecisionThreshold) {
return value; // make sure nothing bad happens in case zero (best precision)
}
return bcTableFloatPrecision * std::round(value / bcTableFloatPrecision) + 0.5f * bcTableFloatPrecision;
};

// needed for downscale
unsigned int randomSeed = 0;

o2::ccdb::CcdbApi ccdbApi;
Service<o2::ccdb::BasicCCDBManager> ccdb;
BCPattern CollidingBunch;
Service<o2::ccdb::BasicCCDBManager> ccdb{};
BCPattern collidingBunch;

int newRunNumber = -999;
int oldRunNumber = -999;
Expand Down Expand Up @@ -116,7 +126,7 @@
float multFT0C = 0.f;
if (bc.has_ft0()) {
auto ft0 = bc.ft0();
for (auto amplitude : ft0.amplitudeC()) {
for (const auto amplitude : ft0.amplitudeC()) {

Check failure on line 129 in Common/TableProducer/multiplicityExtraTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
multFT0C += amplitude;
}
} else {
Expand Down Expand Up @@ -148,7 +158,7 @@
continue; // don't keep if low mult or downsampled out
}

bool Tvx = false;
bool tvx = false;
bool isFV0OrA = false;
float multFT0C = 0.f;
float multFT0A = 0.f;
Expand All @@ -166,6 +176,16 @@
float multZPA = -1.f;
float multZPC = -1.f;

// FT0 and ZDC time
float timeFT0A = -1e+3;
float timeFT0C = -1e+3;
float timeFDDA = -1e+3;
float timeFDDC = -1e+3;
float timeZNA = -1e+3;
float timeZNC = -1e+3;
float timeZPA = -1e+3;
float timeZPC = -1e+3;

float posZFT0 = -1e+3;
bool posZFT0valid = false;

Expand All @@ -185,32 +205,37 @@
LOG(info) << " newRunNumber " << newRunNumber << " time stamp " << ts;
oldRunNumber = newRunNumber;
auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
CollidingBunch = grplhcif->getBunchFilling().getBCPattern();
collidingBunch = grplhcif->getBunchFilling().getBCPattern();
} // new run number

bool collidingBC = CollidingBunch.test(localBC);
bool collidingBC = collidingBunch.test(localBC);

if (bc.has_ft0()) {
const auto& ft0 = bc.ft0();
std::bitset<8> triggers = ft0.triggerMask();
Tvx = triggers[o2::fit::Triggers::bitVertex];
tvx = triggers[o2::fit::Triggers::bitVertex];
multFT0TriggerBits = static_cast<uint8_t>(triggers.to_ulong());

// calculate T0 charge
for (size_t ii = 0; ii < ft0.amplitudeA().size(); ++ii) {
multFT0A += ft0.amplitudeA()[ii];
if (ft0.channelA()[ii] > 31) {
static constexpr int MaxChannelIdInnerRingFT0A = 31;
if (ft0.channelA()[ii] > MaxChannelIdInnerRingFT0A) {
multFT0AOuter += ft0.amplitudeA()[ii];
}
}
for (auto amplitude : ft0.amplitudeC()) {
for (const auto amplitude : ft0.amplitudeC()) {

Check failure on line 227 in Common/TableProducer/multiplicityExtraTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
multFT0C += amplitude;
}
posZFT0 = ft0.posZ();
posZFT0valid = ft0.isValidTime();
timeFT0A = ft0.timeC();
timeFT0C = ft0.timeA();
} else {
multFT0A = -999.0f;
multFT0C = -999.0f;
timeFT0A = -999.0f;
timeFT0C = -999.0f;
}
if (bc.has_fv0a()) {
auto fv0 = bc.fv0a();
Expand All @@ -221,7 +246,8 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
multFV0A += amplitude;
if (channel > 7) {
static constexpr int MaxChannelIdInnerRingFV0 = 7;
if (channel > MaxChannelIdInnerRingFV0) {
multFV0AOuter += amplitude;
}
}
Expand All @@ -235,15 +261,20 @@
std::bitset<8> fFDDTriggers = fdd.triggerMask();
multFDDTriggerBits = static_cast<uint8_t>(fFDDTriggers.to_ulong());

for (auto amplitude : fdd.chargeA()) {
for (const auto amplitude : fdd.chargeA()) {

Check failure on line 264 in Common/TableProducer/multiplicityExtraTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
multFDDA += amplitude;
}
for (auto amplitude : fdd.chargeC()) {
for (const auto amplitude : fdd.chargeC()) {

Check failure on line 267 in Common/TableProducer/multiplicityExtraTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
multFDDC += amplitude;
}

timeFDDA = fdd.timeA();
timeFDDC = fdd.timeC();
} else {
multFDDA = -999.0f;
multFDDC = -999.0f;
timeFDDA = -999.0f;
timeFDDC = -999.0f;
}

if (bc.has_zdc()) {
Expand All @@ -253,13 +284,19 @@
multZEM2 = bc.zdc().amplitudeZEM2();
multZPA = bc.zdc().amplitudeZPA();
multZPC = bc.zdc().amplitudeZPC();
timeZPA = bc.zdc().timeZPA();
timeZPC = bc.zdc().timeZPC();
} else {
multZNA = -999.f;
multZNC = -999.f;
multZEM1 = -999.f;
multZEM2 = -999.f;
multZPA = -999.f;
multZPC = -999.f;
timeZNA = -999.f;
timeZNC = -999.f;
timeZPA = -999.f;
timeZPC = -999.f;
}

bc2mult(bc2multArray[bc.globalIndex()]);
Expand Down Expand Up @@ -290,8 +327,18 @@
multFDDTriggerBits,
multBCTriggerMask,
collidingBC,
Tvx,
tvx,
isFV0OrA);

timeBC(
timeFT0A,
timeFT0C,
timeFDDA,
timeFDDC,
timeZNA,
timeZNC,
timeZPA,
timeZPC);
}
}

Expand All @@ -307,16 +354,24 @@
float deltaPrevious = 1e+6, deltaPrePrevious = 1e+6;
float deltaNext = 1e+6, deltaNeNext = 1e+6;
for (const auto& collision : collisions) {
int ii = collision.globalIndex();

if (ii - 1 >= 0)
deltaPrevious = timeArray[ii] - timeArray[ii - 1];
if (ii - 2 >= 0)
deltaPrePrevious = timeArray[ii] - timeArray[ii - 2];
if (ii + 1 < collisions.size())
deltaNext = timeArray[ii + 1] - timeArray[ii];
if (ii + 2 < collisions.size())
deltaNeNext = timeArray[ii + 2] - timeArray[ii];
const int thisCollision = collision.globalIndex();
const int prevCollision = thisCollision - 1;
const int prevPrevCollision = thisCollision - 2;
const int nextCollision = thisCollision + 1;
const int nextNextCollision = thisCollision + 2;

if (prevCollision >= 0) {
deltaPrevious = timeArray[thisCollision] - timeArray[prevCollision];
}
if (prevPrevCollision >= 0) {
deltaPrePrevious = timeArray[thisCollision] - timeArray[prevPrevCollision];
}
if (nextCollision < collisions.size()) {
deltaNext = timeArray[nextCollision] - timeArray[thisCollision];
}
if (nextNextCollision < collisions.size()) {
deltaNeNext = timeArray[nextNextCollision] - timeArray[thisCollision];
}

multNeigh(deltaPrePrevious, deltaPrevious, deltaNext, deltaNeNext);
}
Expand All @@ -342,5 +397,5 @@

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{adaptAnalysisTask<MultiplicityExtraTable>(cfgc, TaskName{"multiplicity-extra-table"})};
return WorkflowSpec{adaptAnalysisTask<MultiplicityExtraTable>(cfgc)};
}
Loading
Loading