Merge branch 'master' into master

Author: miedema-11

ALICE3/DataModel/OTFMCParticle.h

@@ -21,6 +21,8 @@
 
 #include <Framework/AnalysisDataModel.h>
 
+#include <cstdint>
+
 namespace o2::aod
 {
 

ALICE3/Macros/drawFastTracker.C

@@ -14,16 +14,25 @@
 
 #include <DataFormatsParameters/GRPMagField.h>
 #include <DetectorsBase/Propagator.h>
+#include <Framework/Logger.h>
+#include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/Vertex.h>
 
 #include <TAxis.h>
 #include <TCanvas.h>
 #include <TDatabasePDG.h>
 #include <TEfficiency.h>
 #include <TGraph.h>
-#include <TH1F.h>
+#include <TH1.h>
 #include <TLatex.h>
 #include <TLorentzVector.h>
+#include <TParticlePDG.h>
+#include <TString.h>
+
+#include <RtypesCore.h>
+
+#include <cstddef>
+#include <vector>
 
 void drawFastTracker(float magneticField = 5.f, // in units of kGauss
                      const int nch = 100,       // number of charged particles per unit rapidity

ALICE3/Macros/testFastTracker.C

@@ -15,10 +15,10 @@
 
 #include "ALICE3/Core/FastTracker.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPLHCIFData.h>
 #include <Framework/Logger.h>
 
+#include <string>
+
 void testFastTracker(std::string geometryFile = "a3geo.ini")
 {
 

Common/CCDB/macros/ctpRateF.C

@@ -52,7 +52,7 @@ void ctpRateFetcher::getCTPconfig(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim
   if (runNumber == mRunNumber && mConfig != nullptr) {
     return;
   }
-  std::map<string, string> metadata;
+  std::map<std::string, std::string> metadata;
   metadata["runNumber"] = std::to_string(runNumber);
   mConfig = ccdb->getSpecific<o2::ctp::CTPConfiguration>("CTP/Config/Config", timeStamp, metadata);
   if (mConfig == nullptr) {
@@ -64,7 +64,7 @@ void ctpRateFetcher::getLHCIFdata(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim
   if (runNumber == mRunNumber && mLHCIFdata != nullptr) {
     return;
   }
-  std::map<string, string> metadata;
+  std::map<std::string, std::string> metadata;
   mLHCIFdata = ccdb->getSpecific<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp, metadata);
   if (mLHCIFdata == nullptr) {
     LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp;
@@ -75,7 +75,7 @@ void ctpRateFetcher::getCTPscalers(o2::ccdb::BasicCCDBManager* ccdb, uint64_t ti
   if (runNumber == mRunNumber && mScalers != nullptr) {
     return;
   }
-  std::map<string, string> metadata;
+  std::map<std::string, std::string> metadata;
   metadata["runNumber"] = std::to_string(runNumber);
   mScalers = ccdb->getSpecific<o2::ctp::CTPRunScalers>("CTP/Calib/Scalers", timeStamp, metadata);
   if (mScalers == nullptr) {

Common/CCDB/macros/upload_event_selection_params.C

@@ -84,14 +84,14 @@ void upload_event_selection_params()
   n++;
   period[n] = "lhc15f_isolated_bunches";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 225000;
   runLast[n] = 225719;
 
   n++;
   period[n] = "lhc15f_isolated_bunches2";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 226062;
   runLast[n] = 226500;
 
@@ -100,12 +100,12 @@ void upload_event_selection_params()
   par[n] = new EventSelectionParams(0);
   runFirst[n] = 225753;
   runLast[n] = 225768;
-  par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
+  par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
 
   n++;
   period[n] = "lhc15f_50ns_trains2_missing_V0C3";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
+  par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
   par[n]->fV0CasymA = 0;
   par[n]->fV0CasymB = 0;
   runFirst[n] = 226530;
@@ -114,42 +114,42 @@ void upload_event_selection_params()
   n++;
   period[n] = "lhc15h";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801);
+  par[n]->setOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801);
   runFirst[n] = 232914;
   runLast[n] = 233859;
 
   n++;
   period[n] = "lhc15h_isolated_bunches";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 233912;
   runLast[n] = 234050;
 
   n++;
   period[n] = "lhc15i";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201);
+  par[n]->setOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201);
   runFirst[n] = 235196;
   runLast[n] = 236866;
 
   n++;
   period[n] = "lhc15j";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165);
+  par[n]->setOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165);
   runFirst[n] = 236892;
   runLast[n] = 238621;
 
   n++;
   period[n] = "lhc15l";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245);
+  par[n]->setOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245);
   runFirst[n] = 239188;
   runLast[n] = 241544;
 
   n++;
   period[n] = "lhc15n";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104);
+  par[n]->setOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104);
   runFirst[n] = 244340;
   runLast[n] = 244628;
 
@@ -176,7 +176,7 @@ void upload_event_selection_params()
   n++;
   period[n] = "lhc16do";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-65.42, 7.43, -5.62, 0.85);
+  par[n]->setOnVsOfParams(-65.42, 7.43, -5.62, 0.85);
   runFirst[n] = 252235;
   runLast[n] = 264035;
 
@@ -201,7 +201,7 @@ void upload_event_selection_params()
   n++;
   period[n] = "pp2017";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76);
+  par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76);
   runFirst[n] = 270531;
   runLast[n] = 280140;
 
@@ -214,21 +214,21 @@ void upload_event_selection_params()
   n++;
   period[n] = "pp2017pqr";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76);
+  par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76);
   runFirst[n] = 282008;
   runLast[n] = 282704;
 
   n++;
   period[n] = "lhc18b_isolated_bunches";
   par[n] = new EventSelectionParams(0);
-  par[n]->DisableOutOfBunchPileupCuts();
+  par[n]->disableOutOfBunchPileupCuts();
   runFirst[n] = 284706;
   runLast[n] = 285015;
 
   n++;
   period[n] = "lhc18b_trains";
   par[n] = new EventSelectionParams(0);
-  par[n]->SetOnVsOfParams(-65., 4.3, -5.62, 0.85);
+  par[n]->setOnVsOfParams(-65., 4.3, -5.62, 0.85);
   runFirst[n] = 285064;
   runLast[n] = 285203;
 

Common/Core/macros/testMetadataHelper.C

@@ -120,8 +120,9 @@ std::map<std::string, bool> buildMapForCommitHash(const std::string& hash)
   return results;
 }
 
-void populateCCDBWithCommitAvailability(std::map<string, bool> hasHashMap,
-                                        const std::string commitHash const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/")
+void populateCCDBWithCommitAvailability(std::map<std::string, bool> hasHashMap,
+                                        const std::string commitHash,
+                                        const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/")
 {
   // First, init the CCDB manager to test if the ccdb is already populated
   o2::ccdb::CcdbApi api;

Common/DataModel/Multiplicity.h

@@ -26,20 +26,19 @@ namespace o2::aod
 {
 namespace mult
 {
-DECLARE_SOA_COLUMN(MultFV0A, multFV0A, float);           //!
-DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //!
-DECLARE_SOA_COLUMN(MultFV0C, multFV0C, float);           //!
-DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float);           //!
-DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float);           //!
-DECLARE_SOA_COLUMN(MultFDDA, multFDDA, float);           //!
-DECLARE_SOA_COLUMN(MultFDDC, multFDDC, float);           //!
-DECLARE_SOA_COLUMN(MultZNA, multZNA, float);             //!
-DECLARE_SOA_COLUMN(MultZNC, multZNC, float);             //!
-DECLARE_SOA_COLUMN(MultZEM1, multZEM1, float);           //!
-DECLARE_SOA_COLUMN(MultZEM2, multZEM2, float);           //!
-DECLARE_SOA_COLUMN(MultZPA, multZPA, float);             //!
-DECLARE_SOA_COLUMN(MultZPC, multZPC, float);             //!
-DECLARE_SOA_DYNAMIC_COLUMN(MultFV0M, multFV0M,           //!
+DECLARE_SOA_COLUMN(MultFV0A, multFV0A, float); //!
+DECLARE_SOA_COLUMN(MultFV0C, multFV0C, float); //!
+DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); //!
+DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); //!
+DECLARE_SOA_COLUMN(MultFDDA, multFDDA, float); //!
+DECLARE_SOA_COLUMN(MultFDDC, multFDDC, float); //!
+DECLARE_SOA_COLUMN(MultZNA, multZNA, float);   //!
+DECLARE_SOA_COLUMN(MultZNC, multZNC, float);   //!
+DECLARE_SOA_COLUMN(MultZEM1, multZEM1, float); //!
+DECLARE_SOA_COLUMN(MultZEM2, multZEM2, float); //!
+DECLARE_SOA_COLUMN(MultZPA, multZPA, float);   //!
+DECLARE_SOA_COLUMN(MultZPC, multZPC, float);   //!
+DECLARE_SOA_DYNAMIC_COLUMN(MultFV0M, multFV0M, //!
                            [](float multFV0A, float multFV0C) -> float { return multFV0A + multFV0C; });
 DECLARE_SOA_DYNAMIC_COLUMN(MultFT0M, multFT0M, //!
                            [](float multFT0A, float multFT0C) -> float { return multFT0A + multFT0C; });
@@ -100,6 +99,10 @@ DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float);       //!
 DECLARE_SOA_COLUMN(TimeToNext, timeToNext, float);               //!
 DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float);           //!
 
+// Extra information from FIT detectors
+DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float);     //! FV0 without innermost ring
+DECLARE_SOA_COLUMN(FT0TriggerMask, ft0TriggerMask, uint8_t); //!
+
 } // namespace mult
 DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector
                   mult::MultFV0A, mult::MultFV0C,
@@ -126,6 +129,11 @@ DECLARE_SOA_TABLE(PVMults, "AOD", "PVMULT", //! Multiplicity from the PV contrib
                   mult::IsInelGt1<mult::MultNTracksPVeta1>);
 DECLARE_SOA_TABLE(MFTMults, "AOD", "MFTMULT", //! Multiplicity with MFT
                   mult::MFTNalltracks, mult::MFTNtracks);
+
+DECLARE_SOA_TABLE(FITExtraMults, "AOD", "FITEXTRAMULT", //! Extra information from FIT detectors
+                  mult::MultFV0AOuter,
+                  mult::FT0TriggerMask);
+
 using BarrelMults = soa::Join<TrackletMults, TPCMults, PVMults>;
 using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
 using MultsRun3 = soa::Join<TPCMults, PVMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;

Common/Tasks/centralityStudy.cxx

@@ -20,6 +20,7 @@
 #include "Common/DataModel/Multiplicity.h"
 
 #include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsFIT/Triggers.h>
 #include <DataFormatsParameters/GRPECSObject.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -91,6 +92,7 @@ struct centralityStudy {
   Configurable<bool> requireIsVertexTOFmatched{"requireIsVertexTOFmatched", false, "require events with at least one of vertex contributors matched to TOF"};
   Configurable<bool> requireIsVertexTRDmatched{"requireIsVertexTRDmatched", false, "require events with at least one of vertex contributors matched to TRD"};
   Configurable<bool> rejectSameBunchPileup{"rejectSameBunchPileup", true, "reject collisions in case of pileup with another collision in the same foundBC"};
+  Configurable<bool> rejectIsFlangeEvent{"rejectIsFlangeEvent", false, "At least one channel with -350 TDC < time < -450 TDC"};
 
   Configurable<bool> rejectITSinROFpileupStandard{"rejectITSinROFpileupStandard", false, "reject collisions in case of in-ROF ITS pileup (standard)"};
   Configurable<bool> rejectITSinROFpileupStrict{"rejectITSinROFpileupStrict", false, "reject collisions in case of in-ROF ITS pileup (strict)"};
@@ -201,8 +203,12 @@ struct centralityStudy {
       histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(11, "Neighbour rejection");
       histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(12, "no ITS in-ROF pileup (standard)");
       histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(13, "no ITS in-ROF pileup (strict)");
+      histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(14, "is UPC event");
+      histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(15, "rejectCollInTimeRangeNarrow");
+      histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(16, "em/upc rejection");
+      histos.get<TH1>(HIST("hCollisionSelection"))->GetXaxis()->SetBinLabel(17, "isFlangeEvent");
 
-      histos.add("hFT0A_Collisions", "hFT0C_Collisions", kTH1D, {axisMultUltraFineFT0A});
+      histos.add("hFT0A_Collisions", "hFT0A_Collisions", kTH1D, {axisMultUltraFineFT0A});
       histos.add("hFT0C_Collisions", "hFT0C_Collisions", kTH1D, {axisMultUltraFineFT0C});
       histos.add("hFT0M_Collisions", "hFT0M_Collisions", kTH1D, {axisMultUltraFineFT0M});
       histos.add("hFV0A_Collisions", "hFV0A_Collisions", kTH1D, {axisMultUltraFineFV0A});
@@ -372,6 +378,10 @@ struct centralityStudy {
       getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(11, "Neighbour rejection");
       getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(12, "no ITS in-ROF pileup (standard)");
       getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(13, "no ITS in-ROF pileup (strict)");
+      getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(14, "is UPC event");
+      getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(15, "rejectCollInTimeRangeNarrow");
+      getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(16, "em/upc rejection");
+      getHist(TH1, histPath + "hCollisionSelection")->GetXaxis()->SetBinLabel(17, "isFlangeEvent");
 
       histPointers.insert({histPath + "hFT0C_Collisions", histos.add((histPath + "hFT0C_Collisions").c_str(), "hFT0C_Collisions", {kTH1D, {{axisMultUltraFineFT0C}}})});
       histPointers.insert({histPath + "hFT0A_Collisions", histos.add((histPath + "hFT0A_Collisions").c_str(), "hFT0A_Collisions", {kTH1D, {{axisMultUltraFineFT0A}}})});
@@ -608,7 +618,7 @@ struct centralityStudy {
     if (!passRejectCollInTimeRangeNarrow) {
       return;
     }
-    histos.fill(HIST("hCollisionSelection"), 14 /* Not ITS ROF pileup (strict) */);
+    histos.fill(HIST("hCollisionSelection"), 14 /* Reject collision in narrow time range */);
     getHist(TH1, histPath + "hCollisionSelection")->Fill(14);
 
     if (collision.multFT0C() < upcRejection.maxFT0CforZNACselection &&
@@ -627,6 +637,18 @@ struct centralityStudy {
     histos.fill(HIST("hCollisionSelection"), 15 /* pass em/upc rejection */);
     getHist(TH1, histPath + "hCollisionSelection")->Fill(15);
 
+    if (rejectIsFlangeEvent) {
+      if constexpr (requires { collision.ft0TriggerMask(); }) {
+        constexpr int IsFlangeEventId = 7;
+        std::bitset<8> ft0TriggerMask = collision.ft0TriggerMask();
+        if (ft0TriggerMask[IsFlangeEventId]) {
+          return;
+        }
+      }
+    }
+    histos.fill(HIST("hCollisionSelection"), 16 /* reject flange events */);
+    getHist(TH1, histPath + "hCollisionSelection")->Fill(16);
+
     // if we got here, we also finally fill the FT0C histogram, please
     histos.fill(HIST("hNPVContributors"), collision.multNTracksPV());
     histos.fill(HIST("hFT0A_Collisions"), collision.multFT0A() * scaleSignalFT0C);
@@ -789,22 +811,22 @@ struct centralityStudy {
     }
   }
 
-  void processCollisions(soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultsGlobal, aod::MultSelections, aod::Mults2BC, aod::FV0AOuterMults>::iterator const& collision, aod::MultBCs const&)
+  void processCollisions(soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultsGlobal, aod::MultSelections, aod::Mults2BC, aod::FITExtraMults>::iterator const& collision, aod::MultBCs const&)
   {
     genericProcessCollision(collision);
   }
 
-  void processCollisionsWithResolutionStudy(soa::Join<aod::MultsRun3, aod::MFTMults, aod::Mult2MCExtras, aod::MultsExtra, aod::MultsGlobal, aod::MultSelections, aod::Mults2BC, aod::FV0AOuterMults>::iterator const& collision, soa::Join<aod::MultMCExtras, aod::MultHepMCHIs> const&)
+  void processCollisionsWithResolutionStudy(soa::Join<aod::MultsRun3, aod::MFTMults, aod::Mult2MCExtras, aod::MultsExtra, aod::MultsGlobal, aod::MultSelections, aod::Mults2BC, aod::FITExtraMults>::iterator const& collision, soa::Join<aod::MultMCExtras, aod::MultHepMCHIs> const&)
   {
     genericProcessCollision(collision);
   }
 
-  void processCollisionsWithCentrality(soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal, aod::Mults2BC, aod::FV0AOuterMults>::iterator const& collision, aod::MultBCs const&)
+  void processCollisionsWithCentrality(soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal, aod::Mults2BC, aod::FITExtraMults>::iterator const& collision, aod::MultBCs const&)
   {
     genericProcessCollision(collision);
   }
 
-  void processCollisionsWithCentralityWithNeighbours(soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal, aod::MultNeighs, aod::FV0AOuterMults>::iterator const& collision)
+  void processCollisionsWithCentralityWithNeighbours(soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal, aod::MultNeighs, aod::FITExtraMults>::iterator const& collision)
   {
     genericProcessCollision(collision);
   }