Skip to content

Please consider the following formatting changes to #5956 #287

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 1 commit into from
May 2, 2024
Merged

Please consider the following formatting changes to #5956 #287

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
8 changes: 4 additions & 4 deletions Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ DECLARE_SOA_COLUMN(BCNumber, bcNumber, int); //!

// even further QA: timing information for neighboring events
DECLARE_SOA_COLUMN(TimeToPrePrevious, timeToPrePrevious, float); //!
DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float); //!
DECLARE_SOA_COLUMN(TimeToNext, timeToNext, float); //!
DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //!
DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float); //!
DECLARE_SOA_COLUMN(TimeToNext, timeToNext, float); //!
DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //!

} // namespace mult
DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector
Expand Down Expand Up @@ -116,7 +116,7 @@ DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //!
mult::BCNumber);

DECLARE_SOA_TABLE(MultNeighs, "AOD", "MULTNEIGH", //!
mult::TimeToPrePrevious, mult::TimeToPrevious,
mult::TimeToPrePrevious, mult::TimeToPrevious,
mult::TimeToNext, mult::TimeToNeNext);

// for QA purposes
Expand Down
18 changes: 11 additions & 7 deletions Common/TableProducer/multiplicityExtraTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,22 @@ struct MultiplicityExtraTable {
timeArray.resize(collisions.size(), 1e+3);

for (const auto& collision : collisions) {
timeArray[collision.globalIndex()] = collision.collisionTime();
timeArray[collision.globalIndex()] = collision.collisionTime();
}

float deltaPrevious = 1e+6, deltaPrePrevious = 1e+6;
float deltaNext = 1e+6, deltaNeNext = 1e+6;
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];
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];

multNeigh(deltaPrePrevious, deltaPrevious, deltaNext, deltaNeNext);
}
Expand Down
7 changes: 3 additions & 4 deletions Common/Tasks/centralityStudy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,13 @@ struct centralityStudy {
}
histos.fill(HIST("hCollisionSelection"), 9 /* Not at same bunch pile-up */);

//do this only if information is available
// do this only if information is available
if constexpr (requires { collision.timeToNext(); }) {
float timeToNeighbour = TMath::Min(
std::abs(collision.timeToNext()),
std::abs(collision.timeToPrevious())
);
std::abs(collision.timeToPrevious()));
histos.fill(HIST("hDeltaTimeVsCentrality"), collision.centFT0C(), timeToNeighbour);
if(timeToNeighbour<minTimeDelta){
if (timeToNeighbour < minTimeDelta) {
return;
}
histos.fill(HIST("hCollisionSelection"), 10 /* has suspicious neighbour */);
Expand Down