Skip to content

Commit 6832da3

Browse files
committed
Remove enum name all caps
1 parent 9fb5e75 commit 6832da3

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

PWGCF/JCorran/Core/JFFlucAnalysis.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ JFFlucAnalysis::JFFlucAnalysis() : fInputList(0),
4646
fh_vna(),
4747
fh_vn_vn()
4848
{
49-
subeventMask = SUBEVENT_A | SUBEVENT_B;
49+
subeventMask = kSubEvent_A | kSubEvent_B;
5050
flags = 0;
5151
fEta_min = 0;
5252
fEta_max = 0;
@@ -79,7 +79,7 @@ JFFlucAnalysis::JFFlucAnalysis(const char* name) : fInputList(0),
7979
{
8080
// cout << "analysis task created " << endl;
8181

82-
subeventMask = SUBEVENT_A | SUBEVENT_B;
82+
subeventMask = kSubEvent_A | kSubEvent_B;
8383
flags = 0;
8484
fEta_min = 0;
8585
fEta_max = 0;
@@ -187,7 +187,7 @@ void JFFlucAnalysis::UserCreateOutputObjects()
187187
<< TH1D("h_phi", "h_phi", 50, -TMath::Pi(), TMath::Pi())
188188
<< fHistCentBin << fBin_Subset
189189
<< "END";
190-
if (!(flags & FLUC_PHI_CORRECTION)) {
190+
if (!(flags & kFlucPhiCorrection)) {
191191
fh_phieta
192192
<< TH2D("h_phieta", "h_phieta", 50, -TMath::Pi(), TMath::Pi(), 40, -2.0, 2.0)
193193
<< fHistCentBin
@@ -384,7 +384,7 @@ void JFFlucAnalysis::UserExec(Option_t*)
384384
Double_t ebe_4p_weight = 1.0;
385385
Double_t ebe_4p_weightB = 1.0;
386386
Double_t ebe_6p_weight = 1.0;
387-
if (flags & FLUC_EBE_WEIGHTING) {
387+
if (flags & kFlucEbEWeighting) {
388388
ebe_2p_weight = ref_2p;
389389
ebe_3p_weight = ref_3p;
390390
ebe_4p_weight = ref_4p;
@@ -399,7 +399,7 @@ void JFFlucAnalysis::UserExec(Option_t*)
399399
ebe_2p_weight,
400400
ebe_4p_weight,
401401
ebe_6p_weight};
402-
if (flags & FLUC_EBE_WEIGHTING) {
402+
if (flags & kFlucEbEWeighting) {
403403
for (int ik = 3; ik < 2 * nKL; ik++) {
404404
double dk = (double)ik;
405405
ref_2Np[ik] = ref_2Np[ik - 1] * std::max(pQq[A][0][1].Re() - dk, 1.0) * std::max(pQq[B][0][1].Re() - dk, 1.0);
@@ -519,7 +519,7 @@ void JFFlucAnalysis::UserExec(Option_t*)
519519
Double_t event_weight_four = 1.0;
520520
Double_t event_weight_two = 1.0;
521521
Double_t event_weight_two_eta10 = 1.0;
522-
if (flags & FLUC_EBE_WEIGHTING) {
522+
if (flags & kFlucEbEWeighting) {
523523
event_weight_four = Four(0, 0, 0, 0).Re();
524524
event_weight_two = Two(0, 0).Re();
525525
event_weight_two_eta10 = (QvectorQCeta10[kSubA][0][1] * QvectorQCeta10[kSubB][0][1]).Re();
@@ -555,7 +555,7 @@ void JFFlucAnalysis::Fill_QA_plot(Double_t eta1, Double_t eta2)
555555
Double_t phi = track.Phi();
556556
Double_t pt = track.Pt();
557557

558-
if (!(flags & FLUC_PHI_CORRECTION)) {
558+
if (!(flags & kFlucPhiCorrection)) {
559559
fh_phieta[fCBin]->Fill(phi, eta);
560560
fh_phietaz[fCBin]->Fill(phi, eta, fVertex[2]);
561561
}

PWGCF/JCorran/Core/JFFlucAnalysis.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ class JFFlucAnalysis
132132
TComplex Two(int n1, int n2);
133133
TComplex Four(int n1, int n2, int n3, int n4);
134134

135-
enum SUBEVENT {
136-
SUBEVENT_A = 0x1,
137-
SUBEVENT_B = 0x2
135+
enum SubEvent {
136+
kSubEvent_A = 0x1,
137+
kSubEvent_B = 0x2
138138
};
139139
void SelectSubevents(UInt_t _subeventMask)
140140
{
@@ -146,8 +146,8 @@ class JFFlucAnalysis
146146
numBins = _numBins;
147147
}
148148
enum {
149-
FLUC_PHI_CORRECTION = 0x2,
150-
FLUC_EBE_WEIGHTING = 0x4
149+
kFlucPhiCorrection = 0x2,
150+
kFlucEbEWeighting = 0x4
151151
};
152152
void AddFlags(UInt_t _flags)
153153
{

PWGCF/JCorran/Tasks/jflucAnalysisTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ struct jflucAnalysisTask {
9999
//
100100
pcf = new JFFlucAnalysis("jflucAnalysis");
101101
pcf->SetNumBins(sizeof(jflucCentBins) / sizeof(jflucCentBins[0]));
102-
pcf->AddFlags(JFFlucAnalysis::FLUC_EBE_WEIGHTING);
102+
pcf->AddFlags(JFFlucAnalysis::kFlucEbEWeighting);
103103

104104
output->cd();
105105
pcf->UserCreateOutputObjects();

0 commit comments

Comments
 (0)