Skip to content

Please consider the following formatting changes to #10973 #7

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
Apr 4, 2023
Merged

Please consider the following formatting changes to #10973 #7

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
6 changes: 3 additions & 3 deletions Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ using CPVCluster = CPVClusters::iterator;

namespace zdc // Original ZDC table elements (legacy/000)
{
DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index, to be used by both legacy and new table
DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index, to be used by both legacy and new table
DECLARE_SOA_COLUMN(EnergyZEM1, energyZEM1, float); //!
DECLARE_SOA_COLUMN(EnergyZEM2, energyZEM2, float); //!
DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float); //!
Expand All @@ -730,7 +730,7 @@ DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float); //!
DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float); //!
DECLARE_SOA_COLUMN(TimeZPA, timeZPA, float); //!
DECLARE_SOA_COLUMN(TimeZPC, timeZPC, float); //!
} // namespace zdc_000
} // namespace zdc
namespace zdc_001 // Revised table, required for dynamic in-place replacements
{
// New summarized table, minimal disk footprint, per channel like other detectors
Expand Down Expand Up @@ -1016,7 +1016,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZPC, amplitudeZPC, //! return ZPC amplitude
}
return thisamplitude;
});
} // namespace zdc
} // namespace zdc_001

DECLARE_SOA_TABLE(Zdcs_000, "AOD", "ZDC", //! ZDC information
o2::soa::Index<>, zdc::BCId, zdc::EnergyZEM1, zdc::EnergyZEM2,
Expand Down