doing a rebase from master branch

Author: JosueMtzGar

PWGMM/Lumi/Tasks/lumiStability.cxx

@@ -299,7 +299,7 @@ struct LumiStabilityTask {
           }
         }
 
-        /*EventSelectionParams* par = ccdb->getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", ts);
+        EventSelectionParams* par = ccdb->getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", ts);
         // access orbit-reset timestamp
         auto ctpx = ccdb->getForTimeStamp<std::vector<int64_t>>("CTP/Calib/OrbitReset", ts);
         int64_t tsOrbitReset = (*ctpx)[0]; // us
@@ -330,7 +330,6 @@ struct LumiStabilityTask {
         hTsValues->GetXaxis()->SetBinLabel(2, "tsEOR");
         hTsValues->SetBinContent(1, tsSOR / 1000); // seconds
         hTsValues->SetBinContent(2, tsEOR / 1000); // seconds
-        std::cout << "<<<<<<<<<<<<<<<<<<<<<<<<< Orbits per second: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" << nOrbits << std::endl;*/
       }
 
       // create orbit-axis histograms on the fly with binning based on info from GRP if GRP is available
@@ -443,22 +442,6 @@ struct LumiStabilityTask {
             histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3);
         }
 
-        if (bcPatternB[localBC]) {
-          histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds
-          bool isLeadBC = true;
-          for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) {
-            int kbit = jbit;
-            if (kbit < 0)
-              kbit += nbin;
-            if (bcPatternB[kbit]) {
-              isLeadBC = false;
-              break;
-            }
-          }
-          if (isLeadBC)
-            histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3);
-        }
-
         int deltaIndex = 0; // backward move counts
         int deltaBC = 0;    // current difference wrt globalBC
         bool pastActivityFDDVertex = false;
@@ -541,21 +524,14 @@ struct LumiStabilityTask {
           }
         }
 
-          if (deltaBC < myMaxDeltaBCFDD) {
-            std::bitset<8> fddTriggersPast = fdd_past.triggerMask();
-            bool vertexPast = fddTriggersPast[o2::fdd::Triggers::bitVertex];
-            pastActivityFDDVertex |= (vertexPast);
-          }
-        }
-        deltaIndex = 0;
-        deltaBC = 0;
+        if (isCoinA && isCoinC) {
+          histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC);
+          histos.fill(HIST("FDD/hCounts"), 3);
+          histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit);
 
-        if (pastActivityFDDVertex == false) {
-          histos.fill(HIST("FDD/hCounts"), 2);
-          histos.fill(HIST("FDD/bcVertexTriggerPP"), localBC);
           if (bcPatternA[localBC]) {
-            histos.fill(HIST("FDD/timeACbcAVertex"), fdd.timeA(), fdd.timeC());
-            histos.fill(HIST("FDD/hBcAVertex"), localBC);
+            histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC());
+            histos.fill(HIST("FDD/hBcA"), localBC);
           }
           if (bcPatternC[localBC]) {
             histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC());
@@ -605,28 +581,6 @@ struct LumiStabilityTask {
               }
             }
           }
-        }
-
-
-        if (isCoinA && isCoinC) {
-          histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC);
-          histos.fill(HIST("FDD/hCounts"), 3);
-          histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit);
-
-          if (bcPatternA[localBC]) {
-            histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC());
-            histos.fill(HIST("FDD/hBcA"), localBC);
-          }
-          if (bcPatternC[localBC]) {
-            histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC());
-            histos.fill(HIST("FDD/hBcC"), localBC);
-          }
-          if (bcPatternB[localBC]) {
-            histos.fill(HIST("FDD/timeACbcB"), fdd.timeA(), fdd.timeC());
-            histos.fill(HIST("FDD/hBcB"), localBC);
-            histos.fill(HIST("FDD/hTimeACoinc"), fdd.timeA());
-            histos.fill(HIST("FDD/hTimeCCoinc"), fdd.timeC());
-          }
           if (bcPatternE[localBC]) {
             histos.fill(HIST("FDD/timeACbcE"), fdd.timeA(), fdd.timeC());
             histos.fill(HIST("FDD/hBcE"), localBC);
@@ -830,15 +784,6 @@ struct LumiStabilityTask {
           histos.fill(HIST("FT0/hCounts"), 3);
           histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC);
         }
-        if (pastActivityFT0Vertex == true) {
-          histos.fill(HIST("FT0/hCounts"), 3);
-        } else {
-          histos.fill(HIST("FT0/bcVertexTriggerPP"), localBC);
-        }
-        if (pastActivityFT0TriggerA == false || pastActivityFT0TriggerC == false) {
-          histos.fill(HIST("FT0/hCounts"), 3);
-          histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC);
-        }
       } // vertex true
 
       if (sCentral) {