Fix DCA histogramming part + cleanup

* Configuration of Propagator must be done outside the code (e.g. QC
  framework)
* map must use std::string as key, instead of std::string_view
* remove unnecessary DCAz
* simplify code
* remove unnecessary includes

Author: wiechula

Detectors/Base/include/DetectorsBase/Propagator.h

@@ -34,7 +34,7 @@ namespace parameters
 {
 class GRPObject;
 class GRPMagField;
-}
+} // namespace parameters
 
 namespace dataformats
 {
@@ -45,7 +45,7 @@ namespace field
 {
 class MagFieldFast;
 class MagneticField;
-}
+} // namespace field
 
 namespace gpu
 {
@@ -134,6 +134,7 @@ class PropagatorImpl
   GPUd() void setGPUField(const o2::gpu::GPUTPCGMPolynomialField* field) { mGPUField = field; }
   GPUd() const o2::gpu::GPUTPCGMPolynomialField* getGPUField() const { return mGPUField; }
   GPUd() void setBz(value_type bz) { mBz = bz; }
+  GPUd() bool hasMagFieldSet() const { return mField != nullptr; }
 
   GPUd() void estimateLTFast(o2::track::TrackLTIntegral& lt, const o2::track::TrackParametrization<value_type>& trc) const;
 

Detectors/TPC/qc/include/TPCQC/Helpers.h

@@ -22,6 +22,7 @@
 #include "TH2F.h"
 
 #include <vector>
+#include <string>
 #include "TPCBase/CalDet.h"
 
 namespace o2
@@ -58,6 +59,10 @@ void setStyleHistogram(TH1& histo);
 void setStyleHistogramsInMap(std::unordered_map<std::string_view, std::vector<std::unique_ptr<TH1>>>& mapOfvectors);
 // set nice style of histograms in a map
 void setStyleHistogramsInMap(std::unordered_map<std::string_view, std::unique_ptr<TH1>>& mapOfHisto);
+// set nice style of histograms in a map of vectors
+void setStyleHistogramsInMap(std::unordered_map<std::string, std::vector<std::unique_ptr<TH1>>>& mapOfvectors);
+// set nice style of histograms in a map
+void setStyleHistogramsInMap(std::unordered_map<std::string, std::unique_ptr<TH1>>& mapOfHisto);
 /// Check if at least one pad in refPedestal and pedestal differs by 3*refNoise to see if new ZS calibration data should be uploaded to the FECs.
 /// @param refPedestal
 /// @param refNoise
@@ -70,4 +75,4 @@ bool newZSCalib(const o2::tpc::CalDet<float>& refPedestal, const o2::tpc::CalDet
 } // namespace tpc
 } // namespace o2
 
-#endif
+#endif

Detectors/TPC/qc/include/TPCQC/Tracks.h

@@ -19,19 +19,15 @@
 
 #include <vector>
 #include <string_view>
+#include <string>
 #include <unordered_map>
 #include <memory>
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
 
 // root includes
 #include "TH1.h"
 #include "TH1F.h"
 #include "TH2F.h"
 
-// o2 includes
-#include "DataFormatsTPC/Defs.h"
-
 namespace o2
 {
 namespace tpc
@@ -80,12 +76,6 @@ class Tracks
     mCutMindEdxTot = dEdxTot;
   }
 
-  // To set the runNumber
-  void setRunNumber(int RunNumber)
-  {
-    runNumber = RunNumber;
-  }
-
   // Just for backward compatibility with crrent QC, temporary, will be removed in the next PR
   /// get 1D histograms
   std::vector<TH1F>& getHistograms1D() { return mHist1D; }
@@ -102,15 +92,14 @@ class Tracks
   const std::vector<TH1F>& getHistogramRatios1D() const { return mHistRatio1D; }
 
   /// get ratios of 1D histograms
-  std::unordered_map<std::string_view, std::unique_ptr<TH1>>& getMapHist() { return mMapHist; }
-  const std::unordered_map<std::string_view, std::unique_ptr<TH1>>& getMapHist() const { return mMapHist; }
+  std::unordered_map<std::string, std::unique_ptr<TH1>>& getMapHist() { return mMapHist; }
+  const std::unordered_map<std::string, std::unique_ptr<TH1>>& getMapHist() const { return mMapHist; }
 
  private:
   float mCutAbsEta = 1.f;      // Eta cut
   int mCutMinnCls = 60;        // minimum N clusters
   float mCutMindEdxTot = 20.f; // dEdxTot min value
-  int runNumber = -999;        // runNumber
-  std::unordered_map<std::string_view, std::unique_ptr<TH1>> mMapHist;
+  std::unordered_map<std::string, std::unique_ptr<TH1>> mMapHist;
   std::vector<TH1F> mHist1D{};      ///< Initialize vector of 1D histograms
   std::vector<TH2F> mHist2D{};      ///< Initialize vector of 2D histograms
   std::vector<TH1F> mHistRatio1D{}; ///< Initialize vector of ratios of 1D histograms

Detectors/TPC/qc/src/Helpers.cxx

@@ -99,6 +99,25 @@ void helpers::setStyleHistogramsInMap(std::unordered_map<std::string_view, std::
     helpers::setStyleHistogram(*(keyValue.second));
   }
 }
+
+//______________________________________________________________________________
+void helpers::setStyleHistogramsInMap(std::unordered_map<std::string, std::vector<std::unique_ptr<TH1>>>& mapOfvectors)
+{
+  for (const auto& keyValue : mapOfvectors) {
+    for (auto& hist : keyValue.second) {
+      helpers::setStyleHistogram(*hist);
+    }
+  }
+}
+
+//______________________________________________________________________________
+void helpers::setStyleHistogramsInMap(std::unordered_map<std::string, std::unique_ptr<TH1>>& mapOfHisto)
+{
+  for (const auto& keyValue : mapOfHisto) {
+    helpers::setStyleHistogram(*(keyValue.second));
+  }
+}
+
 //______________________________________________________________________________
 bool helpers::newZSCalib(const o2::tpc::CalDet<float>& refPedestal, const o2::tpc::CalDet<float>& refNoise, const o2::tpc::CalDet<float>& pedestal)
 {
@@ -119,4 +138,4 @@ bool helpers::newZSCalib(const o2::tpc::CalDet<float>& refPedestal, const o2::tp
   }
 
   return false;
-}
+}

Detectors/TPC/qc/src/Tracks.cxx

@@ -16,15 +16,12 @@
 
 // root includes
 #include "TFile.h"
-#include "TMathBase.h"
 
 // o2 includes
 #include "DataFormatsTPC/TrackTPC.h"
 #include "DataFormatsTPC/dEdxInfo.h"
 #include "GPUCommonArray.h"
 #include "DetectorsBase/Propagator.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "TGeoManager.h"
 #include "TPCQC/Tracks.h"
 #include "TPCQC/Helpers.h"
 
@@ -86,8 +83,7 @@ void Tracks::initializeHistograms()
 
   // DCA Histograms
   for (const auto type : types) {
-  mMapHist[fmt::format("hDCAr_{}", type).data()] = std::make_unique<TH2F>(fmt::format("hDCAr_{}", type).data(), fmt::format("DCAr {};phi;DCAr (cm)", type).data(), 360, 0, o2::math_utils::twoPid(), 100, -3., 3.);
-  mMapHist[fmt::format("hDCAz_{}", type).data()] = std::make_unique<TH2F>(fmt::format("hDCAz_{}", type).data(), fmt::format("DCAz {};phi;DCAr (cm)", type).data(), 360, 0, o2::math_utils::twoPid(), 100, -3., 3.);
+    mMapHist[fmt::format("hDCAr_{}", type).data()] = std::make_unique<TH2F>(fmt::format("hDCAr_{}", type).data(), fmt::format("DCAr {};phi;DCAr (cm)", type).data(), 360, 0, o2::math_utils::twoPid(), 250, -10., 10.);
   }
 }
 //______________________________________________________________________________
@@ -111,7 +107,7 @@ bool Tracks::processTrack(const o2::tpc::TrackTPC& track)
   const auto hasASideOnly = track.hasASideClustersOnly();
   const auto hasCSideOnly = track.hasCSideClustersOnly();
 
-  double absEta = TMath::Abs(eta);
+  const auto absEta = std::abs(eta);
 
   // ===| histogram filling before cuts |===
   mMapHist["hNClustersBeforeCuts"]->Fill(nCls);
@@ -128,44 +124,30 @@ bool Tracks::processTrack(const o2::tpc::TrackTPC& track)
     mMapHist["hNClustersAfterCuts"]->Fill(nCls);
     mMapHist["hEta"]->Fill(eta);
 
-  auto& ccdbmgr = o2::ccdb::BasicCCDBManager::instance();
-  ccdbmgr.setURL("https://alice-ccdb.cern.ch");
-  auto runDuration = ccdbmgr.getRunDuration(runNumber);
-  auto tRun = runDuration.first + (runDuration.second - runDuration.first) / 2; // time stamp for the middle of the run duration
-  ccdbmgr.setTimestamp(tRun);
-
-  // CTP orbit reset time
-  auto orbitResetTimeNS = ccdbmgr.get<std::vector<int64_t>>("CTP/Calib/OrbitReset");
-  int64_t orbitResetTimeMS = (*orbitResetTimeNS)[0] * 1e-3;
-  LOGP(info, "Orbit reset time in MS is {}", orbitResetTimeMS);
-
-    auto geoAligned = ccdbmgr.get<TGeoManager>("GLO/Config/GeometryAligned");
-    auto magField = ccdbmgr.get<o2::parameters::GRPMagField>("GLO/Config/GRPMagField");
-    const o2::base::MatLayerCylSet* matLut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdbmgr.get<o2::base::MatLayerCylSet>("GLO/Param/MatLUT"));
-    auto propagator = o2::base::Propagator::Instance();
-    propagator->setMatLUT(matLut);
-      //---| propagate to 0,0,0 |---
+    //---| propagate to 0,0,0 |---
+    //
+    // propagator instance must be configured before (LUT, MagField)
+    auto propagator = o2::base::Propagator::Instance(true);
+    const int type = (track.getQ2Pt() < 0) + 2 * track.hasCSideClustersOnly();
+    auto dcaHist = mMapHist[fmt::format("hDCAr_{}", types[type]).data()].get();
+
+    if (propagator->getMatLUT() && propagator->hasMagFieldSet()) {
+      // ---| fill DCA histos |---
       o2::gpu::gpustd::array<float, 2> dca;
       const o2::math_utils::Point3D<float> refPoint{0, 0, 0};
-      //auto propTrack = TrackTPC(track);
-      o2::track::TrackPar propTrack(track); // Should be cheaper than the one above
-      bool useThisTrack = true;
-      if (!propagator->propagateToDCABxByBz(refPoint, propTrack, 0.5, o2::base::Propagator::MatCorrType::USEMatCorrLUT, &dca)) {
-        useThisTrack = false;
-      }
-     ///fine grained propagation most probably not needed
-       if (!propagator->propagateToDCABxByBz(refPoint, propTrack, 0.005, o2::base::Propagator::MatCorrType::USEMatCorrLUT, &dca)) {
-        useThisTrack = false;
+      o2::track::TrackPar propTrack(track);
+      if (propagator->propagateToDCABxByBz(refPoint, propTrack, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrLUT, &dca)) {
+        const auto phi = o2::math_utils::to02PiGen(track.getPhi());
+        dcaHist->Fill(phi, dca[0]);
       }
-
-      if (useThisTrack)
-      {
-      // ---| fill histos |---
-      const int type = (track.getQ2Pt() < 0) + 2 * track.hasCSideClustersOnly();
-      const auto phi = o2::math_utils::to02PiGen(track.getPhi());
-      mMapHist[fmt::format("hDCAr_{}", types[type]).data()]->Fill(phi, dca[0]);
-      mMapHist[fmt::format("hDCAz_{}", types[type]).data()]->Fill(phi, dca[1]);
+    } else {
+      static bool reported = false;
+      if (!reported) {
+        LOGP(error, "o2::base::Propagator not properly initialized, MatLUT ({}) and / or Field ({}) missing, will not fill DCA histograms", (void*)propagator->getMatLUT(), (void*)propagator->hasMagFieldSet());
+        reported = true;
       }
+      dcaHist->SetTitle(fmt::format("DCAr {} o2::base::Propagator not properly initialized", types[type]).data());
+    }
 
     if (hasASideOnly == 1) {
       mMapHist["hPhiAside"]->Fill(phi);