Merge branch 'AliceO2Group:master' into master

Author: prottayCMT

ALICE3/Macros/drawFastTracker.C

@@ -75,7 +75,7 @@ void drawFastTracker(float magneticField = 5.f, // in units of kGauss
     fastTracker.AddLayer("B11", 100., 250, x0OB, xrhoOB, resRPhiOB, resZOB, eff, 1);
   } else {
     std::vector<float> pixelRes{0.025, 0.025, 0.01, 0.01};
-    fastTracker.AddSiliconALICE3v4(pixelRes);
+    // fastTracker.AddSiliconALICE3v4(pixelRes); // FIXME
   }
 
   fastTracker.Print();

ALICE3/Macros/testFastTracker.C

@@ -27,7 +27,7 @@ void testFastTracker(std::string geometryFile = "a3geo.ini")
   // auto& ccdb = o2::ccdb::BasicCCDBManager::instance();
   // ccdb.setURL("http://alice-ccdb.cern.ch");
   o2::fastsim::FastTracker fastTracker;
-  fastTracker.AddGenericDetector(geometryFile);
+  // fastTracker.AddGenericDetector(geometryFile); // FIXME
   // fastTracker.AddGenericDetector(geometryFile, &ccdb);
   fastTracker.Print();
 }

ALICE3/TableProducer/alice3-decayfinder.cxx

@@ -66,7 +66,8 @@ using std::array;
 // #define bitcheck(var, nbit) ((var) & (static_cast<uint32_t>(1) << (nbit)))
 
 // For MC association in pre-selection
-using Alice3TracksWPid = soa::Join<aod::Tracks, aod::TracksCov, aod::Alice3DecayMaps, aod::McTrackLabels, aod::TracksDCA, aod::UpgradeTrkPids, aod::UpgradeTofs, aod::UpgradeRichs>;
+using Alice3TracksWPid = soa::Join<aod::Tracks, aod::TracksCov, aod::Alice3DecayMaps, aod::McTrackLabels, aod::TracksDCA, aod::UpgradeTofs, aod::UpgradeRichs>;
+using Alice3TracksWTrkPid = soa::Join<Alice3TracksWPid, aod::UpgradeTrkPids>;
 
 struct alice3decayFinder {
   SliceCache cache;
@@ -185,18 +186,17 @@ struct alice3decayFinder {
     ((aod::a3DecayMap::decayMap & trackSelectionKaMinusFromD) == trackSelectionKaMinusFromD) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > kaFromD_dcaXYconstant + kaFromD_dcaXYpTdep* nabs(aod::track::signed1Pt);
 
   // partitions for Lc baryons
-  Partition<Alice3TracksWPid> tracksPiPlusFromLc =
+  Partition<Alice3TracksWTrkPid> tracksPiPlusFromLc =
     ((aod::a3DecayMap::decayMap & trackSelectionPiPlusFromLc) == trackSelectionPiPlusFromLc) && aod::track::signed1Pt > 0.0f && nabs(aod::track::dcaXY) > piFromLc_dcaXYconstant + piFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
-  Partition<Alice3TracksWPid> tracksKaPlusFromLc =
+  Partition<Alice3TracksWTrkPid> tracksKaPlusFromLc =
     ((aod::a3DecayMap::decayMap & trackSelectionKaPlusFromLc) == trackSelectionKaPlusFromLc) && aod::track::signed1Pt > 0.0f && nabs(aod::track::dcaXY) > kaFromLc_dcaXYconstant + kaFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
-  Partition<Alice3TracksWPid> tracksPrPlusFromLc =
+  Partition<Alice3TracksWTrkPid> tracksPrPlusFromLc =
     ((aod::a3DecayMap::decayMap & trackSelectionPrPlusFromLc) == trackSelectionPrPlusFromLc) && aod::track::signed1Pt > 0.0f && nabs(aod::track::dcaXY) > prFromLc_dcaXYconstant + prFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
-  // partitions for Lc baryons
-  Partition<Alice3TracksWPid> tracksPiMinusFromLc =
+  Partition<Alice3TracksWTrkPid> tracksPiMinusFromLc =
     ((aod::a3DecayMap::decayMap & trackSelectionPiMinusFromLc) == trackSelectionPiMinusFromLc) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > piFromLc_dcaXYconstant + piFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
-  Partition<Alice3TracksWPid> tracksKaMinusFromLc =
+  Partition<Alice3TracksWTrkPid> tracksKaMinusFromLc =
     ((aod::a3DecayMap::decayMap & trackSelectionKaMinusFromLc) == trackSelectionKaMinusFromLc) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > kaFromLc_dcaXYconstant + kaFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
-  Partition<Alice3TracksWPid> tracksPrMinusFromLc =
+  Partition<Alice3TracksWTrkPid> tracksPrMinusFromLc =
     ((aod::a3DecayMap::decayMap & trackSelectionPrMinusFromLc) == trackSelectionPrMinusFromLc) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > prFromLc_dcaXYconstant + prFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
 
   // Helper struct to pass candidate information
@@ -1068,7 +1068,7 @@ struct alice3decayFinder {
 
   void processFindLc(aod::Collision const& collision,
                      aod::McParticles const& mcParticles,
-                     Alice3TracksWPid const& tracks)
+                     Alice3TracksWTrkPid const& tracks)
   {
     LOG(debug) << "Processing Lc candidates for collision " << collision.globalIndex() << " with " << tracks.size() << " tracks";
     for (auto const& track : tracks) {

CODEOWNERS

@@ -50,9 +50,9 @@
 /PWGCF/Tutorial @alibuild @ariedel-cern @victor-gonzalez @otonvd @shouqiye
 
 /PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93 @XiaozhiBai
-/PWGEM @alibuild @feisenhu @dsekihat @ivorobye @jokonig
-/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid @jokonig
-/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat @jokonig
+/PWGEM @alibuild @feisenhu @dsekihat @jokonig @hscheid
+/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @feisenhu @hscheid @jokonig
+/PWGEM/PhotonMeson @alibuild @mhemmer-cern @dsekihat @jokonig @hscheid @amaringarcia
 /PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano @xinyepeng @singhra1994
 # PWG-LF
 /PWGLF @alibuild @omvazque @skundu692 @mpuccio

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>;