Skip to content

[PWGJE] Addition of bins for vertex finding efficiency and vertex reconstruction corrections #12638

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

Closed
Archita-Dash wants to merge 6 commits into from
Closed

[PWGJE] Addition of bins for vertex finding efficiency and vertex reconstruction corrections #12638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4397f4c
added more event selection bins before and after VtxZ cut to estimate…
Archita-Dash Aug 15, 2025
f1c33ef
added missing bin label
Archita-Dash Aug 18, 2025
453bdf8
Merge branch 'AliceO2Group:master' into lumifixes
Archita-Dash Aug 18, 2025
007a41e
Merge branch 'AliceO2Group:master' into lumifixes
Archita-Dash Aug 19, 2025
55c1c52
Please consider the following formatting changes
alibuild Aug 19, 2025
7cac70c
Merge pull request #27 from alibuild/alibot-cleanup-12638
Archita-Dash Aug 19, 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
12 changes: 12 additions & 0 deletions PWGJE/DataModel/JetReducedData.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 PWGJE/DataModel/JetReducedData.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 @@ -12,7 +12,7 @@
///
/// \brief Table definitions for reduced data model for jets
///
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>

Check failure on line 15 in PWGJE/DataModel/JetReducedData.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.

#ifndef PWGJE_DATAMODEL_JETREDUCEDDATA_H_
#define PWGJE_DATAMODEL_JETREDUCEDDATA_H_
Expand All @@ -32,7 +32,7 @@

namespace jbc
{
DECLARE_SOA_INDEX_COLUMN(BC, bc);

Check failure on line 35 in PWGJE/DataModel/JetReducedData.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(RunNumber, runNumber, int);
DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t);
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t);
Expand Down Expand Up @@ -67,7 +67,7 @@
namespace jcollision
{
DECLARE_SOA_INDEX_COLUMN(Collision, collision);
DECLARE_SOA_INDEX_COLUMN(JBC, bc);

Check failure on line 70 in PWGJE/DataModel/JetReducedData.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(PosX, posX, float);
DECLARE_SOA_COLUMN(PosY, posY, float);
DECLARE_SOA_COLUMN(PosZ, posZ, float);
Expand Down Expand Up @@ -98,8 +98,14 @@
DECLARE_SOA_COLUMN(ChargedHFTriggerSel, chargedHFTriggerSel, uint8_t);
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8, readCountsWithTVXAndSel8, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV, readCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8Full, readCountsWithTVXAndSel8Full, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV, readCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8, readCountsWithTVXAndZVertexAndSel8, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV, readCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8Full, readCountsWithTVXAndZVertexAndSel8Full, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV, readCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8FullPbPb, readCountsWithTVXAndZVertexAndSel8FullPbPb, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMC, readCountsWithTVXAndZVertexAndSelMC, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMCFull, readCountsWithTVXAndZVertexAndSelMCFull, std::vector<int>);
Expand All @@ -110,7 +116,7 @@
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel7KINT7, readCountsWithTVXAndZVertexAndSel7KINT7, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithCustom, readCountsWithCustom, std::vector<int>);
DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool);
DECLARE_SOA_COLUMN(IsEMCALReadout, isEmcalReadout, bool);

Check failure on line 119 in PWGJE/DataModel/JetReducedData.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(IsOutlier, isOutlier, bool);
} // namespace jcollision

Expand Down Expand Up @@ -171,8 +177,14 @@
DECLARE_SOA_TABLE_STAGED(CollisionCounts, "COLLCOUNT",
jcollision::ReadCounts,
jcollision::ReadCountsWithTVX,
jcollision::ReadCountsWithTVXAndSel8,
jcollision::ReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV,
jcollision::ReadCountsWithTVXAndSel8Full,
jcollision::ReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV,
jcollision::ReadCountsWithTVXAndZVertexAndSel8,
jcollision::ReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV,
jcollision::ReadCountsWithTVXAndZVertexAndSel8Full,
jcollision::ReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV,
jcollision::ReadCountsWithTVXAndZVertexAndSel8FullPbPb,
jcollision::ReadCountsWithTVXAndZVertexAndSelMC,
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFull,
Expand Down Expand Up @@ -233,7 +245,7 @@

namespace jmccollisionlb
{
DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);

Check failure on line 248 in PWGJE/DataModel/JetReducedData.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_TABLE_STAGED(JMcCollisionLbs, "JMCCOLLISIONLB",
Expand All @@ -244,14 +256,14 @@

namespace jtrack
{
DECLARE_SOA_INDEX_COLUMN(JCollision, collision);

Check failure on line 259 in PWGJE/DataModel/JetReducedData.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_INDEX_COLUMN(Track, track);
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);
DECLARE_SOA_COLUMN(Phi, phi, float);
DECLARE_SOA_COLUMN(DCAX, dcaX, float);

Check failure on line 264 in PWGJE/DataModel/JetReducedData.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(DCAY, dcaY, float);

Check failure on line 265 in PWGJE/DataModel/JetReducedData.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(DCAZ, dcaZ, float);

Check failure on line 266 in PWGJE/DataModel/JetReducedData.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(DCAXY, dcaXY, float);
DECLARE_SOA_COLUMN(DCAXYZ, dcaXYZ, float);
DECLARE_SOA_COLUMN(SigmaDCAZ, sigmadcaZ, float);
Expand Down
42 changes: 30 additions & 12 deletions PWGJE/TableProducer/luminosityCalculator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct LuminosityCalculator {
void init(InitContext&)
{

std::vector<std::string> histLabels = {"BC", "BC+TVX", "BC+TVX+NoTFB", "BC+TVX+NoTFB+NoITSROFB", "Coll", "Coll+TVX", "Coll+TVX+VtxZ+Sel8", "Coll+TVX+VtxZ+Sel8Full", "Coll+TVX+VtxZ+Sel8FullPbPb", "Coll+TVX+VtxZ+SelMC", "Coll+TVX+VtxZ+SelMCFull", "Coll+TVX+VtxZ+SelMCFullPbPb", "Coll+TVX+VtxZ+SelUnanchoredMC", "Coll+TVX+VtxZ+SelTVX", "Coll+TVX+VtxZ+Sel7", "Coll+TVX+VtxZ+Sel7KINT7", "custom"};
std::vector<std::string> histLabels = {"BC", "BC+TVX", "BC+TVX+NoTFB", "BC+TVX+NoTFB+NoITSROFB", "Coll", "Coll+TVX", "Coll+TVX+Sel8", "Coll+TVX+Sel8+IsGoodZvtx", "Coll+TVX+Sel8Full", "Coll+TVX+Sel8Full+IsGoodZvtx", "Coll+TVX+VtxZ+Sel8", "Coll+TVX+VtxZ+Sel8+IsGoodZvtx", "Coll+TVX+VtxZ+Sel8Full", "Coll+TVX+VtxZ+Sel8Full+IsGoodZvtx", "Coll+TVX+VtxZ+Sel8FullPbPb", "Coll+TVX+VtxZ+SelMC", "Coll+TVX+VtxZ+SelMCFull", "Coll+TVX+VtxZ+SelMCFullPbPb", "Coll+TVX+VtxZ+SelUnanchoredMC", "Coll+TVX+VtxZ+SelTVX", "Coll+TVX+VtxZ+Sel7", "Coll+TVX+VtxZ+Sel7KINT7", "custom"};
registry.add("counter", "BCs and Collisions", HistType::kTH1D, {{static_cast<int>(histLabels.size()), -0.5, static_cast<double>(histLabels.size()) - 0.5}});
auto counter = registry.get<TH1>(HIST("counter"));
for (std::vector<std::string>::size_type iCounter = 0; iCounter < histLabels.size(); iCounter++) {
Expand All @@ -64,8 +64,14 @@ struct LuminosityCalculator {

int readCollision = 0;
int readCollisionWithTVXCounter = 0;
int readCollisionWithTVXAndSel8Counter = 0;
int readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter = 0;
int readCollisionWithTVXAndSel8FullCounter = 0;
int readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter = 0;
int readCollisionWithTVXAndZVertexAndSel8Counter = 0;
int readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter = 0;
int readCollisionWithTVXAndZVertexAndSel8FullCounter = 0;
int readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter = 0;
int readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter = 0;
int readCollisionWithTVXAndZVertexAndSelMCCounter = 0;
int readCollisionWithTVXAndZVertexAndSelMCFullCounter = 0;
Expand All @@ -79,8 +85,14 @@ struct LuminosityCalculator {
for (const auto& collisionCount : collisionCounts) {
readCollision += collisionCount.readCounts().front();
readCollisionWithTVXCounter += collisionCount.readCountsWithTVX().front();
readCollisionWithTVXAndSel8Counter += collisionCount.readCountsWithTVXAndSel8().front();
readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV().front();
readCollisionWithTVXAndSel8FullCounter += collisionCount.readCountsWithTVXAndSel8Full().front();
readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV().front();
readCollisionWithTVXAndZVertexAndSel8Counter += collisionCount.readCountsWithTVXAndZVertexAndSel8().front();
readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV().front();
readCollisionWithTVXAndZVertexAndSel8FullCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8Full().front();
readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV().front();
readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8FullPbPb().front();
readCollisionWithTVXAndZVertexAndSelMCCounter += collisionCount.readCountsWithTVXAndZVertexAndSelMC().front();
readCollisionWithTVXAndZVertexAndSelMCFullCounter += collisionCount.readCountsWithTVXAndZVertexAndSelMCFull().front();
Expand All @@ -98,17 +110,23 @@ struct LuminosityCalculator {
registry.get<TH1>(HIST("counter"))->SetBinContent(4, registry.get<TH1>(HIST("counter"))->GetBinContent(4) + readBCWithTVXAndNoTFBAndNoITSROFB);
registry.get<TH1>(HIST("counter"))->SetBinContent(5, registry.get<TH1>(HIST("counter"))->GetBinContent(5) + readCollision);
registry.get<TH1>(HIST("counter"))->SetBinContent(6, registry.get<TH1>(HIST("counter"))->GetBinContent(6) + readCollisionWithTVXCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(7, registry.get<TH1>(HIST("counter"))->GetBinContent(7) + readCollisionWithTVXAndZVertexAndSel8Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(8, registry.get<TH1>(HIST("counter"))->GetBinContent(8) + readCollisionWithTVXAndZVertexAndSel8FullCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(9, registry.get<TH1>(HIST("counter"))->GetBinContent(9) + readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(10, registry.get<TH1>(HIST("counter"))->GetBinContent(10) + readCollisionWithTVXAndZVertexAndSelMCCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(11, registry.get<TH1>(HIST("counter"))->GetBinContent(11) + readCollisionWithTVXAndZVertexAndSelMCFullCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(12, registry.get<TH1>(HIST("counter"))->GetBinContent(12) + readCollisionWithTVXAndZVertexAndSelMCFullPbPbCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(13, registry.get<TH1>(HIST("counter"))->GetBinContent(13) + readCollisionWithTVXAndZVertexAndSelUnanchoredMCCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(14, registry.get<TH1>(HIST("counter"))->GetBinContent(14) + readCollisionWithTVXAndZVertexAndSelTVXCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(15, registry.get<TH1>(HIST("counter"))->GetBinContent(15) + readCollisionWithTVXAndZVertexAndSel7Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(16, registry.get<TH1>(HIST("counter"))->GetBinContent(16) + readCollisionWithTVXAndZVertexAndSel7KINT7Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(16, registry.get<TH1>(HIST("counter"))->GetBinContent(17) + readCollisionWithCustomCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(7, registry.get<TH1>(HIST("counter"))->GetBinContent(7) + readCollisionWithTVXAndSel8Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(8, registry.get<TH1>(HIST("counter"))->GetBinContent(8) + readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(9, registry.get<TH1>(HIST("counter"))->GetBinContent(9) + readCollisionWithTVXAndSel8FullCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(10, registry.get<TH1>(HIST("counter"))->GetBinContent(10) + readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(11, registry.get<TH1>(HIST("counter"))->GetBinContent(11) + readCollisionWithTVXAndZVertexAndSel8Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(12, registry.get<TH1>(HIST("counter"))->GetBinContent(12) + readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(13, registry.get<TH1>(HIST("counter"))->GetBinContent(13) + readCollisionWithTVXAndZVertexAndSel8FullCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(14, registry.get<TH1>(HIST("counter"))->GetBinContent(14) + readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(15, registry.get<TH1>(HIST("counter"))->GetBinContent(15) + readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(16, registry.get<TH1>(HIST("counter"))->GetBinContent(16) + readCollisionWithTVXAndZVertexAndSelMCCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(17, registry.get<TH1>(HIST("counter"))->GetBinContent(17) + readCollisionWithTVXAndZVertexAndSelMCFullCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(18, registry.get<TH1>(HIST("counter"))->GetBinContent(18) + readCollisionWithTVXAndZVertexAndSelMCFullPbPbCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(19, registry.get<TH1>(HIST("counter"))->GetBinContent(19) + readCollisionWithTVXAndZVertexAndSelUnanchoredMCCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(20, registry.get<TH1>(HIST("counter"))->GetBinContent(20) + readCollisionWithTVXAndZVertexAndSelTVXCounter);
registry.get<TH1>(HIST("counter"))->SetBinContent(21, registry.get<TH1>(HIST("counter"))->GetBinContent(21) + readCollisionWithTVXAndZVertexAndSel7Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(22, registry.get<TH1>(HIST("counter"))->GetBinContent(22) + readCollisionWithTVXAndZVertexAndSel7KINT7Counter);
registry.get<TH1>(HIST("counter"))->SetBinContent(23, registry.get<TH1>(HIST("counter"))->GetBinContent(23) + readCollisionWithCustomCounter);
}
PROCESS_SWITCH(LuminosityCalculator, processCalculateLuminosity, "calculate ingredients for luminosity and fill a histogram", true);
};
Expand Down
Loading
Loading