Skip to content

Please consider the following formatting changes to #11457 #60

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
cnkoster merged 1 commit into from
Jun 3, 2025
Merged

Please consider the following formatting changes to #11457 #60

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
32 changes: 16 additions & 16 deletions Common/DataModel/ZDCInterCalib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
{
namespace znoutput
{
DECLARE_SOA_COLUMN(ZNApmc, commonPMZNA, float); //! PMC ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNApm1, ZNAPM1, float); //! PM1 ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNApm2, ZNAPM2, float); //! PM2 ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNApm3, ZNAPM3, float); //! PM3 ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNApm4, ZNAPM4, float); //! PM4 ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNAtdc, ZNATDC, float); //! TDC ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCpmc, commonPMZNC, float); //! PMC ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCpm1, ZNCPM1, float); //! PM1 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCpm2, ZNCPM2, float); //! PM2 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCpm3, ZNCPM3, float); //! PM3 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCpm4, ZNCPM4, float); //! PM4 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCtdc, ZNCTDC, float); //! TDC ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(Centrality, centrality, float); //! Centrality ZN // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t); //! Timestamp // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNApmc, commonPMZNA, float); //! PMC ZNA // o2-linter: disable=name/o2-column

Check failure on line 25 in Common/DataModel/ZDCInterCalib.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(ZNApm1, ZNAPM1, float); //! PM1 ZNA // o2-linter: disable=name/o2-column

Check failure on line 26 in Common/DataModel/ZDCInterCalib.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(ZNApm2, ZNAPM2, float); //! PM2 ZNA // o2-linter: disable=name/o2-column

Check failure on line 27 in Common/DataModel/ZDCInterCalib.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(ZNApm3, ZNAPM3, float); //! PM3 ZNA // o2-linter: disable=name/o2-column

Check failure on line 28 in Common/DataModel/ZDCInterCalib.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(ZNApm4, ZNAPM4, float); //! PM4 ZNA // o2-linter: disable=name/o2-column

Check failure on line 29 in Common/DataModel/ZDCInterCalib.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(ZNAtdc, ZNATDC, float); //! TDC ZNA // o2-linter: disable=name/o2-column

Check failure on line 30 in Common/DataModel/ZDCInterCalib.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(ZNCpmc, commonPMZNC, float); //! PMC ZNC // o2-linter: disable=name/o2-column

Check failure on line 31 in Common/DataModel/ZDCInterCalib.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(ZNCpm1, ZNCPM1, float); //! PM1 ZNC // o2-linter: disable=name/o2-column

Check failure on line 32 in Common/DataModel/ZDCInterCalib.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(ZNCpm2, ZNCPM2, float); //! PM2 ZNC // o2-linter: disable=name/o2-column

Check failure on line 33 in Common/DataModel/ZDCInterCalib.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(ZNCpm3, ZNCPM3, float); //! PM3 ZNC // o2-linter: disable=name/o2-column

Check failure on line 34 in Common/DataModel/ZDCInterCalib.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(ZNCpm4, ZNCPM4, float); //! PM4 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZNCtdc, ZNCTDC, float); //! TDC ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(Centrality, centrality, float); //! Centrality ZN // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t); //! Timestamp // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags // o2-linter: disable=name/o2-column
} // namespace znoutput

DECLARE_SOA_TABLE(ZDCInterCalib, "AOD", "ZDCIC", o2::soa::Index<>,
Expand All @@ -51,7 +51,7 @@
znoutput::ZNCpm2,
znoutput::ZNCpm3,
znoutput::ZNCpm4,
znoutput::ZNCtdc,
znoutput::ZNCtdc,
znoutput::Centrality,
znoutput::Timestamp,
znoutput::SelectionBits);
Expand Down
6 changes: 3 additions & 3 deletions Common/TableProducer/zdc-task-intercalib.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayersAll + 1, "kkIsGoodITSLayersAll");
}


template <typename TCollision>
uint8_t eventSelected(TCollision collision)
{
Expand Down Expand Up @@ -226,7 +225,7 @@
registry.get<TH1>(HIST("ZNCpm3"))->Fill(pmqZNC[2]);
registry.get<TH1>(HIST("ZNCpm4"))->Fill(pmqZNC[3]);
registry.get<TH1>(HIST("ZNCsumq"))->Fill(sumZNC);
}
}
if (isZNAhit) {
for (int it = 0; it < 4; it++) {
pmqZNA[it] = (zdc.energySectorZNA())[it];
Expand All @@ -251,4 +250,5 @@
{
return WorkflowSpec{
adaptAnalysisTask<ZDCCalibTower>(cfgc)};
}
}

Check failure on line 254 in Common/TableProducer/zdc-task-intercalib.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Trailing spaces 

Remove the trailing spaces at the end of the line.
Loading