Skip to content

Commit 28b1255

Browse files
committed
[PWGHF] Fix linting errors: struct member order and naming
- Move HfHelper, HfEventSelection, and ccdb declarations after all Configurable members in taskD0 and taskDplus (PWGHF struct member order) - Rename UpcQaHistoConfig to HfUpcQaHistoConfig to comply with PWGHF naming convention (structs must start with Hf)
1 parent 358885d commit 28b1255

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

PWGHF/D2H/Tasks/taskD0.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,6 @@ struct HfTaskD0 {
9898
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
9999
Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
100100

101-
HfEventSelection hfEvSel; // event selection and monitoring
102-
103-
HfHelper hfHelper;
104-
ctpRateFetcher mRateFetcher;
105-
106-
SliceCache cache;
107-
Service<o2::ccdb::BasicCCDBManager> ccdb;
108-
109101
using D0Candidates = soa::Join<aod::HfCand2Prong, aod::HfSelD0>;
110102
using D0CandidatesMc = soa::Join<D0Candidates, aod::HfCand2ProngMcRec>;
111103
using D0CandidatesKF = soa::Join<D0Candidates, aod::HfCand2ProngKF>;
@@ -163,6 +155,14 @@ struct HfTaskD0 {
163155
Configurable<float> upcFT0CThreshold{"upcFT0CThreshold", hf_upc::defaults::FT0CThreshold, "FT0-C amplitude threshold for UPC gap determination (a.u.)"};
164156
Configurable<float> upcZDCThreshold{"upcZDCThreshold", hf_upc::defaults::ZDCThreshold, "ZDC energy threshold for UPC gap determination (a.u.)"};
165157

158+
HfEventSelection hfEvSel; // event selection and monitoring
159+
160+
HfHelper hfHelper;
161+
ctpRateFetcher mRateFetcher;
162+
163+
SliceCache cache;
164+
Service<o2::ccdb::BasicCCDBManager> ccdb;
165+
166166
HistogramRegistry registry{
167167
"registry",
168168
{{"hPtCand", "2-prong candidates;candidate #it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{360, 0., 36.}}}},

PWGHF/D2H/Tasks/taskDplus.cxx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ struct HfTaskDplus {
8484
Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
8585
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
8686

87-
HfEventSelection hfEvSel; // event selection and monitoring
88-
89-
HfHelper hfHelper;
90-
Service<o2::ccdb::BasicCCDBManager> ccdb;
91-
9287
using CandDplusData = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi>>;
9388
using CandDplusDataWithMl = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
9489
using CandDplusMcReco = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfCand3ProngMcRec>>;
@@ -134,6 +129,11 @@ struct HfTaskDplus {
134129
Configurable<float> upcFT0CThreshold{"upcFT0CThreshold", hf_upc::defaults::FT0CThreshold, "FT0-C amplitude threshold for UPC gap determination (a.u.)"};
135130
Configurable<float> upcZDCThreshold{"upcZDCThreshold", hf_upc::defaults::ZDCThreshold, "ZDC energy threshold for UPC gap determination (a.u.)"};
136131

132+
HfEventSelection hfEvSel; // event selection and monitoring
133+
134+
HfHelper hfHelper;
135+
Service<o2::ccdb::BasicCCDBManager> ccdb;
136+
137137
HistogramRegistry registry{
138138
"registry",
139139
{{"hPt", "3-prong candidates;candidate #it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{360, 0., 36.}}}},

PWGHF/Utils/utilsUpcHf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ inline int gapTypeToInt(GapType gap)
101101
}
102102

103103
/// \brief Struct to hold UPC QA histogram configuration
104-
struct UpcQaHistoConfig {
104+
struct HfUpcQaHistoConfig {
105105
// FT0 histogram configuration
106106
int ft0Nbins = 1500;
107107
float ft0Min = 0.f;

0 commit comments

Comments
 (0)