Skip to content

Please consider the following formatting changes to #6303 #302

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 28, 2024
Merged

Please consider the following formatting changes to #6303 #302

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: 10 additions & 10 deletions PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ struct lambdakzeroBuilder {
{
statisticsRegistry.exceptions = 0;
statisticsRegistry.eventCounter = 0;
for (Int_t ii = 0; ii < kNV0Steps; ii++){
for (Int_t ii = 0; ii < kNV0Steps; ii++) {
statisticsRegistry.v0stats[ii] = 0;
statisticsRegistry.v0statsUnassociated[ii] = 0;
}
Expand All @@ -423,7 +423,7 @@ struct lambdakzeroBuilder {
{
registry.fill(HIST("hEventCounter"), 0.0, statisticsRegistry.eventCounter);
registry.fill(HIST("hCaughtExceptions"), 0.0, statisticsRegistry.exceptions);
for (Int_t ii = 0; ii < kNV0Steps; ii++){
for (Int_t ii = 0; ii < kNV0Steps; ii++) {
registry.fill(HIST("hV0Criteria"), ii, statisticsRegistry.v0stats[ii]);
registry.fill(HIST("hV0CriteriaUnassociated"), ii, statisticsRegistry.v0statsUnassociated[ii]);
}
Expand Down Expand Up @@ -817,7 +817,7 @@ struct lambdakzeroBuilder {

// value 0.5: any considered V0
statisticsRegistry.v0stats[kV0All]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0All]++;

if (tpcrefit) {
Expand All @@ -831,7 +831,7 @@ struct lambdakzeroBuilder {

// Passes TPC refit
statisticsRegistry.v0stats[kV0TPCrefit]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0TPCrefit]++;

// Calculate DCA with respect to the collision associated to the V0, not individual tracks
Expand All @@ -855,7 +855,7 @@ struct lambdakzeroBuilder {

// passes DCAxy
statisticsRegistry.v0stats[kV0DCAxy]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0DCAxy]++;

// Change strangenessBuilder tracks
Expand Down Expand Up @@ -904,7 +904,7 @@ struct lambdakzeroBuilder {

// Passes DCA between daughters check
statisticsRegistry.v0stats[kV0DCADau]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0DCADau]++;

v0candidate.cosPA = RecoDecay::cpa(array{primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ()}, array{v0candidate.pos[0], v0candidate.pos[1], v0candidate.pos[2]}, array{v0candidate.posP[0] + v0candidate.negP[0], v0candidate.posP[1] + v0candidate.negP[1], v0candidate.posP[2] + v0candidate.negP[2]});
Expand All @@ -921,7 +921,7 @@ struct lambdakzeroBuilder {

// Passes CosPA check
statisticsRegistry.v0stats[kV0CosPA]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0CosPA]++;

v0candidate.V0radius = RecoDecay::sqrtSumOfSquares(v0candidate.pos[0], v0candidate.pos[1]);
Expand All @@ -931,7 +931,7 @@ struct lambdakzeroBuilder {

// Passes radius check
statisticsRegistry.v0stats[kV0Radius]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0Radius]++;
// Return OK: passed all v0 candidate selecton criteria

Expand Down Expand Up @@ -960,7 +960,7 @@ struct lambdakzeroBuilder {

// Passes momentum window check
statisticsRegistry.v0stats[kWithinMomentumRange]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kWithinMomentumRange]++;

// Calculate masses
Expand Down Expand Up @@ -1195,7 +1195,7 @@ struct lambdakzeroBuilder {

// populates the various tables for analysis
statisticsRegistry.v0stats[kCountStandardV0]++;
if(!V0.has_collision())
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kCountStandardV0]++;

v0indices(V0.posTrackId(), V0.negTrackId(),
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Strangeness/lambdakzeromcfinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ struct lambdakzeromcfinder {
const AxisSpec axisNTimesRecoed{static_cast<int>(10), -0.5f, +9.5f, ""};

histos.add("hNTimesCollRecoed", "hNTimesCollRecoed", kTH1F, {axisNTimesRecoed});

// store number of recoed V0s and number of recoed V0s with no collision association
histos.add("hNCollisionAssociation", "hNCollisionAssociation", kTH1F, {axisNTimesRecoed});

Expand Down Expand Up @@ -307,7 +307,7 @@ struct lambdakzeromcfinder {
// V0 list established, populate
for (auto ic : sortedIndices) {
histos.fill(HIST("hNCollisionAssociation"), 0.0f); // any correctly recoed
if(v0collisionId[ic] >= 0)
if (v0collisionId[ic] >= 0)
histos.fill(HIST("hNCollisionAssociation"), 1.0f); // reconstructed with a collision associated to it

if (v0collisionId[ic] < 0 && doUnassociatedV0s) {
Expand Down
13 changes: 6 additions & 7 deletions PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ struct derivedlambdakzeroanalysis {
Configurable<bool> doMCAssociation{"doMCAssociation", true, "if MC, do MC association"};
Configurable<bool> doCollisionAssociationQA{"doCollisionAssociationQA", true, "check collision association"};

// fast check on occupancy
// fast check on occupancy
Configurable<float> minOccupancy{"minOccupancy", -1, "minimum occupancy from neighbouring collisions"};
Configurable<float> maxOccupancy{"maxOccupancy", -1, "maximum occupancy from neighbouring collisions"};

Expand Down Expand Up @@ -1074,16 +1074,15 @@ struct derivedlambdakzeroanalysis {
}
histos.fill(HIST("hEventSelection"), 9 /* Not at same bunch pile-up */);

if ( minOccupancy > 0 && collision.trackOccupancyInTimeRange() < minOccupancy) {
return;
if (minOccupancy > 0 && collision.trackOccupancyInTimeRange() < minOccupancy) {
return;
}
histos.fill(HIST("hEventSelection"), 10 /* Below min occupancy */);
if ( maxOccupancy > 0 && collision.trackOccupancyInTimeRange() > maxOccupancy) {
return;
if (maxOccupancy > 0 && collision.trackOccupancyInTimeRange() > maxOccupancy) {
return;
}
histos.fill(HIST("hEventSelection"), 11 /* Above max occupancy */);


float centrality = collision.centFT0C();
if (qaCentrality) {
auto hRawCentrality = histos.get<TH1>(HIST("hRawCentrality"));
Expand All @@ -1100,7 +1099,7 @@ struct derivedlambdakzeroanalysis {
if (std::abs(v0.negativeeta()) > daughterEtaCut || std::abs(v0.positiveeta()) > daughterEtaCut)
continue; // remove acceptance that's badly reproduced by MC / superfluous in future

if(v0.v0Type() != v0TypeSelection && v0TypeSelection>-1)
if (v0.v0Type() != v0TypeSelection && v0TypeSelection > -1)
continue; // skip V0s that are not standard

// fill AP plot for all V0s
Expand Down