Avoid magic numbers and minior changes

Author: amatyja

PWGUD/Core/SGSelector.h

@@ -41,7 +41,10 @@ enum TrueGap : int {
   NoGap = -1,
   SingleGapA = 0,
   SingleGapC = 1,
-  DoubleGap = 2
+  DoubleGap = 2,
+  NoUpc = 3,
+  TrkOutOfRange = 4,
+  BadDoubleGap = 5
 };
 }
 
@@ -65,7 +68,7 @@ class SGSelector
     SelectionResult<BC> result;
     result.bc = &oldbc;
     if (collision.numContrib() < diffCuts.minNTracks() || collision.numContrib() > diffCuts.maxNTracks()) {
-      result.value = 4;
+      result.value = o2::aod::sgselector::TrkOutOfRange; // 4
       return result;
     }
     auto newbc = oldbc;
@@ -91,9 +94,9 @@ class SGSelector
           newbc = bc;
         gC = false;
       }
-    }
+    } // end of loop over bc range
     if (!gA && !gC) {
-      result.value = 3;
+      result.value = o2::aod::sgselector::NoUpc; // gap = 3
       return result;
     }
     if (gA && gC) { // loop once again for so-called DG events to get the most active FT0 BC
@@ -120,7 +123,8 @@ class SGSelector
     result.bc = &newbc;
     // LOGF(info, "Old BC: %i, New BC: %i",oldbc.globalBC(), newbc.globalBC());
     result.bc = &newbc;
-    result.value = gA && gC ? 2 : (gA ? 0 : 1);
+    // result.value = gA && gC ? 2 : (gA ? 0 : 1);
+    result.value = gA && gC ? o2::aod::sgselector::DoubleGap : (gA ? o2::aod::sgselector::SingleGapA : o2::aod::sgselector::SingleGapC);
     return result;
   }
   template <typename TFwdTrack>
@@ -139,12 +143,12 @@ class SGSelector
     float fit_cut[3] = {fv0, ft0a, ft0c};
     int gap = collision.gapSide();
     int true_gap = gap;
-    float FV0A, FT0A, FT0C, ZNA, ZNC;
-    FV0A = collision.totalFV0AmplitudeA();
-    FT0A = collision.totalFT0AmplitudeA();
-    FT0C = collision.totalFT0AmplitudeC();
-    ZNA = collision.energyCommonZNA();
-    ZNC = collision.energyCommonZNC();
+    // float FV0A, FT0A, FT0C, ZNA, ZNC;
+    const float FV0A = collision.totalFV0AmplitudeA();
+    const float FT0A = collision.totalFT0AmplitudeA();
+    const float FT0C = collision.totalFT0AmplitudeC();
+    const float ZNA = collision.energyCommonZNA();
+    const float ZNC = collision.energyCommonZNC();
     if (gap == o2::aod::sgselector::SingleGapA) { // gap == 0
       if (FV0A > fit_cut[0] || FT0A > fit_cut[1] || ZNA > zdc_cut)
         true_gap = o2::aod::sgselector::NoGap;           // -1
@@ -160,8 +164,10 @@ class SGSelector
         true_gap = o2::aod::sgselector::SingleGapA; // 0
       else if (FV0A <= fit_cut[0] && FT0A <= fit_cut[1] && ZNA <= zdc_cut && FT0C <= fit_cut[2] && ZNC <= zdc_cut)
         true_gap = o2::aod::sgselector::DoubleGap; // 2
-      else
+      else {
         LOGF(info, "Something wrong with DG");
+        true_gap = o2::aod::sgselector::BadDoubleGap; // 5
+      }
     }
     return true_gap;
   }

PWGUD/TableProducer/SGCandProducer.cxx

@@ -217,8 +217,8 @@ struct SGCandProducer {
 
     // Cross sections in ub. Using dummy -1 if lumi estimator is not reliable
     float csTCE = 10.36e6;
-    float csZEM = 415.2e6; // see AN: https://alice-notes.web.cern.ch/node/1515
-    float csZNC = 214.5e6; // see AN: https://alice-notes.web.cern.ch/node/1515
+    const float csZEM = 415.2e6; // see AN: https://alice-notes.web.cern.ch/node/1515
+    const float csZNC = 214.5e6; // see AN: https://alice-notes.web.cern.ch/node/1515
     if (runNumber > 543437 && runNumber < 543514) {
       csTCE = 8.3e6;
     }
@@ -326,14 +326,14 @@ struct SGCandProducer {
     getHist(TH1, histdir + "/Stat")->Fill(8., 1.);
 
     //
-    int trs = collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ? 1 : 0;
-    int trofs = collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard) ? 1 : 0;
-    int hmpr = collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof) ? 1 : 0;
-    int tfb = collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) ? 1 : 0;
-    int itsROFb = collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) ? 1 : 0;
-    int sbp = collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup) ? 1 : 0;
-    int zVtxFT0vPv = collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV) ? 1 : 0;
-    int vtxITSTPC = collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC) ? 1 : 0;
+    const int trs = collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ? 1 : 0;
+    const int trofs = collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard) ? 1 : 0;
+    const int hmpr = collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof) ? 1 : 0;
+    const int tfb = collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) ? 1 : 0;
+    const int itsROFb = collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) ? 1 : 0;
+    const int sbp = collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup) ? 1 : 0;
+    const int zVtxFT0vPv = collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV) ? 1 : 0;
+    const int vtxITSTPC = collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC) ? 1 : 0;
     auto bc = collision.template foundBC_as<BCs>();
     double ir = 0.;
     const uint64_t ts = bc.timestamp();
@@ -363,14 +363,14 @@ struct SGCandProducer {
           return;
       }
       upchelpers::FITInfo fitInfo{};
-      uint8_t chFT0A = 0;
-      uint8_t chFT0C = 0;
-      uint8_t chFDDA = 0;
-      uint8_t chFDDC = 0;
-      uint8_t chFV0A = 0;
-      int occ = collision.trackOccupancyInTimeRange();
+      const uint8_t chFT0A = 0;
+      const uint8_t chFT0C = 0;
+      const uint8_t chFDDA = 0;
+      const uint8_t chFDDC = 0;
+      const uint8_t chFV0A = 0;
+      const int occ = collision.trackOccupancyInTimeRange();
       udhelpers::getFITinfo(fitInfo, newbc, bcs, ft0s, fv0as, fdds);
-      int upc_flag = (collision.flags() & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode) ? 1 : 0;
+      const int upc_flag = (collision.flags() & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode) ? 1 : 0;
       // update SG candidates tables
       outputCollisions(bc.globalBC(), bc.runNumber(),
                        collision.posX(), collision.posY(), collision.posZ(), upc_flag,