modified following o2 linter and code-check

Author: Luzhiyongg

PWGUD/Tasks/flowCorrelationsUpc.cxx

@@ -314,7 +314,7 @@ struct FlowCorrelationsUpc {
       if (mEfficiency == nullptr) {
         LOGF(fatal, "Could not load efficiency histogram for trigger particles from %s", cfgEfficiency.value.c_str());
       }
-      LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), (void*)mEfficiency);
+      LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), static_cast<void*>(mEfficiency));
     }
     correctionsLoaded = true;
   }
@@ -385,10 +385,10 @@ struct FlowCorrelationsUpc {
       if (!trackSelected(track1))
         continue;
 
-      auto momentum = std::array<double, 3>{track1.px(), track1.py(), track1.pz()};
-      double pt1 = RecoDecay::pt(momentum);
-      double phi1 = RecoDecay::phi(momentum);
-      double eta1 = RecoDecay::eta(momentum);
+      auto momentum1 = std::array<double, 3>{track1.px(), track1.py(), track1.pz()};
+      double pt1 = RecoDecay::pt(momentum1);
+      double phi1 = RecoDecay::phi(momentum1);
+      double eta1 = RecoDecay::eta(momentum1);
 
       // 计算track1的权重
       float weff1 = 1., wacc1 = 1.;
@@ -407,10 +407,10 @@ struct FlowCorrelationsUpc {
         if (system == MixedEvent && cfgUsePtOrderInMixEvent && pt1 <= track2.pt())
           continue;
 
-        auto momentum = std::array<double, 3>{track2.px(), track2.py(), track2.pz()};
-        double pt2 = RecoDecay::pt(momentum);
-        double phi2 = RecoDecay::phi(momentum);
-        double eta2 = RecoDecay::eta(momentum);
+        auto momentum2 = std::array<double, 3>{track2.px(), track2.py(), track2.pz()};
+        double pt2 = RecoDecay::pt(momentum2);
+        double phi2 = RecoDecay::phi(momentum2);
+        double eta2 = RecoDecay::eta(momentum2);
 
         float weff2 = 1., wacc2 = 1.;
         if (mEfficiency) {

PWGUD/Tasks/flowCumulantsUpc.cxx

@@ -147,7 +147,7 @@ struct FlowCumulantsUpc {
   GFW* fGFWMC = new GFW();
   std::vector<GFW::CorrConfig> corrconfigs;
   std::vector<GFW::CorrConfig> corrconfigsmc;
-  TAxis* fPtAxis;
+  TAxis* fPtAxis = nullptr;
   TRandom3* fRndm = new TRandom3(0);
   TRandom3* fRndmMc = new TRandom3(0);
   int lastRunNumber = -1;
@@ -543,17 +543,17 @@ struct FlowCumulantsUpc {
     if (cfgAcceptance.value.empty() == false) {
       mAcceptance = ccdb->getForTimeStamp<GFWWeights>(cfgAcceptance, timestamp);
       if (mAcceptance) {
-        LOGF(info, "Loaded acceptance weights from %s (%p)", cfgAcceptance.value.c_str(), (void*)mAcceptance);
+        LOGF(info, "Loaded acceptance weights from %s (%p)", cfgAcceptance.value.c_str(), static_cast<void*>(mAcceptance));
       } else {
-        LOGF(warning, "Could not load acceptance weights from %s (%p)", cfgAcceptance.value.c_str(), (void*)mAcceptance);
+        LOGF(warning, "Could not load acceptance weights from %s (%p)", cfgAcceptance.value.c_str(), static_cast<void*>(mAcceptance));
       }
     }
     if (cfgEfficiency.value.empty() == false) {
       mEfficiency = ccdb->getForTimeStamp<TH1D>(cfgEfficiency, timestamp);
       if (mEfficiency == nullptr) {
         LOGF(fatal, "Could not load efficiency histogram for trigger particles from %s", cfgEfficiency.value.c_str());
       }
-      LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), (void*)mEfficiency);
+      LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), static_cast<void*>(mEfficiency));
     }
     correctionsLoaded = true;
   }
@@ -672,7 +672,6 @@ struct FlowCumulantsUpc {
 
     // zdc time cut
     int neutronClass = -1;
-    bool xnxn = false, onon = false, xnon = false, onxn = false;
     float energyCommonZNA = collision.energyCommonZNA(), energyCommonZNC = collision.energyCommonZNC();
     float timeZNA = collision.timeZNA(), timeZNC = collision.timeZNC();
     if (std::isinf(energyCommonZNA))
@@ -686,34 +685,29 @@ struct FlowCumulantsUpc {
     registry.fill(HIST("ZDCEnergy"), energyCommonZNC, energyCommonZNA);
     registry.fill(HIST("ZDCTime"), timeZNC, timeZNA);
     if (std::abs(timeZNA) > cfgZdcTimeCut && std::abs(timeZNC) > cfgZdcTimeCut) {
-      onon = true;
       neutronClass = 0;
       registry.fill(HIST("neutronClass"), 0, 0);
     }
     if (std::abs(timeZNA) <= cfgZdcTimeCut && std::abs(timeZNC) > cfgZdcTimeCut) {
-      xnon = true;
       neutronClass = 1;
       registry.fill(HIST("neutronClass"), 0, 1);
     }
     if (std::abs(timeZNA) > cfgZdcTimeCut && std::abs(timeZNC) <= cfgZdcTimeCut) {
-      onxn = true;
       neutronClass = 2;
       registry.fill(HIST("neutronClass"), 1, 0);
     }
     if (std::abs(timeZNA) <= cfgZdcTimeCut && std::abs(timeZNC) <= cfgZdcTimeCut) {
-      xnxn = true;
       neutronClass = 3;
       registry.fill(HIST("neutronClass"), 1, 1);
     }
     if (cfgZdcTime) {
       // reject 0n0n and XnXn
-      if (neutronClass == 0 || neutronClass == 3) {
+      if (neutronClass == 0 || neutronClass == 3) { // o2-linter: disable=magic-number
         return;
       }
       // if A or C gap is requested, keep corresponding neutron class
       if (cfgGapSideA || cfgGapSideC) {
-        if ((cfgGapSideA && neutronClass == 1) ||
-            (cfgGapSideC && neutronClass == 2)) {
+        if ((cfgGapSideA && neutronClass == 1) || (cfgGapSideC && neutronClass == 2)) { // o2-linter: disable=magic-number
           // accepted
         } else {
           return;
@@ -836,8 +830,6 @@ struct FlowCumulantsUpc {
         registry.fill(HIST("hDCAxy"), track.dcaXY(), track.pt());
         nTracksRaw += 1.;
         nTracksCorrected += weff;
-      }
-      if (withinPtRef) {
         fGFW->Fill(eta, fPtAxis->FindBin(pt) - 1, phi, wacc * weff, 1);
       }
       if (withinPtPOI) {
@@ -942,8 +934,6 @@ struct FlowCumulantsUpc {
         registry.fill(HIST("hEtaMC"), eta);
         registry.fill(HIST("hPtRefMC"), pt);
         nTracksCorrected += weff;
-      }
-      if (withinPtRef) {
         fGFWMC->Fill(eta, fPtAxis->FindBin(pt) - 1, phi, wacc * weff, 1);
       }
       if (withinPtPOI) {