Merge branch 'AliceO2Group:dev' into tpc_cmc

Author: rmunzer

CCDB/include/CCDB/BasicCCDBManager.h

@@ -55,6 +55,7 @@ class CCDBManagerInstance
     long endvalidity = -1;
     long cacheValidFrom = 0;   // time for which the object was cached
     long cacheValidUntil = -1; // object is guaranteed to be valid till this time (modulo new updates)
+    size_t size = 0;
     size_t minSize = -1ULL;
     size_t maxSize = 0;
     int queries = 0;
@@ -229,6 +230,7 @@ class CCDBManagerInstance
   long mCreatedNotBefore = 0;                           // lower limit for object creation timestamp (TimeMachine mode) - If-Not-Before HTTP header
   long mTimerMS = 0;                                    // timer for queries
   size_t mFetchedSize = 0;                              // total fetched size
+  size_t mRequestedSize = 0;                            // total requested size (fetched + served from cache)
   int mQueries = 0;                                     // total number of object queries
   int mFetches = 0;                                     // total number of succesful fetches from CCDB
   int mFailures = 0;                                    // total number of failed fetches
@@ -258,6 +260,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
       if (sh != mHeaders.end()) {
         size_t s = atol(sh->second.c_str());
         mFetchedSize += s;
+        mRequestedSize += s;
       }
     }
 
@@ -272,6 +275,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
       if (headers) {
         *headers = cached.cacheOfHeaders;
       }
+      mRequestedSize += cached.size;
       return reinterpret_cast<T*>(cached.noCleanupPtr ? cached.noCleanupPtr : cached.objPtr.get());
     }
     ptr = mCCDBAccessor.retrieveFromTFileAny<T>(path, mMetaData, timestamp, &mHeaders, cached.uuid,
@@ -318,6 +322,8 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
       if (sh != mHeaders.end()) {
         size_t s = atol(sh->second.c_str());
         mFetchedSize += s;
+        mRequestedSize += s;
+        cached.size = s;
         cached.minSize = std::min(s, cached.minSize);
         cached.maxSize = std::max(s, cached.minSize);
       }
@@ -342,12 +348,14 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
   }
   auto end = std::chrono::system_clock::now();
   mTimerMS += std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
-  auto *ref = o2::framework::ServiceRegistryRef::globalDeviceRef();
+  auto* ref = o2::framework::ServiceRegistryRef::globalDeviceRef();
   if (ref && ref->active<framework::DataProcessingStats>()) {
     auto& stats = ref->get<o2::framework::DataProcessingStats>();
     stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_HIT, o2::framework::DataProcessingStats::Op::Set, (int64_t)mQueries - mFailures - mFetches});
     stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_MISS, o2::framework::DataProcessingStats::Op::Set, (int64_t)mFetches});
     stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_FAILURE, o2::framework::DataProcessingStats::Op::Set, (int64_t)mFailures});
+    stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_FETCHED_BYTES, o2::framework::DataProcessingStats::Op::Set, (int64_t)mFetchedSize});
+    stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_REQUESTED_BYTES, o2::framework::DataProcessingStats::Op::Set, (int64_t)mRequestedSize});
   }
   return ptr;
 }

CCDB/src/BasicCCDBManager.cxx

@@ -101,7 +101,7 @@ std::pair<int64_t, int64_t> CCDBManagerInstance::getRunDuration(int runnumber, b
 
 std::string CCDBManagerInstance::getSummaryString() const
 {
-  std::string res = fmt::format("{} queries, {} bytes", mQueries, fmt::group_digits(mFetchedSize));
+  std::string res = fmt::format("{} queries, {} fetched / {} requested bytes", mQueries, fmt::group_digits(mFetchedSize), fmt::group_digits(mRequestedSize));
   if (mCachingEnabled) {
     res += fmt::format(" for {} objects", mCache.size());
   }

Common/Field/src/MagFieldFast.cxx

@@ -16,12 +16,10 @@
 #include "Field/MagFieldFast.h"
 #include <GPUCommonLogger.h>
 
-#ifndef GPUCA_GPUCODE_DEVICE
 #include <cmath>
 #include <fstream>
 #include <sstream>
 using namespace std;
-#endif
 
 using namespace o2::field;
 

Common/MathUtils/include/MathUtils/detail/Bracket.h

@@ -17,7 +17,7 @@
 #define ALICEO2_BRACKET_H
 
 #include <GPUCommonRtypes.h>
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 #include <string>
 #include <sstream>
 #endif
@@ -76,7 +76,7 @@ class Bracket
   Relation isOutside(T t, T tErr) const;
   Relation isOutside(T t) const;
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
   std::string asString() const;
 #endif
 
@@ -247,7 +247,7 @@ inline typename Bracket<T>::Relation Bracket<T>::isOutside(T t) const
   return t < mMin ? Below : (t > mMax ? Above : Inside);
 }
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 template <typename T>
 std::string Bracket<T>::asString() const
 {

Common/Utils/src/DebugStreamer.cxx

@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "CommonUtils/DebugStreamer.h"
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
 #include <thread>
 #include <fmt/format.h>
 #include "TROOT.h"
 #include "TKey.h"
 #include <random>
 #include "Framework/Logger.h"
-#endif
 
 O2ParamImpl(o2::utils::ParameterDebugStreamer);
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) && defined(DEBUG_STREAMER)
+#if defined(DEBUG_STREAMER)
 
 o2::utils::DebugStreamer::DebugStreamer()
 {

DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxCorrection.h

@@ -42,14 +42,12 @@ class CalibdEdxCorrection
   static constexpr int FitSize = 288; ///< Number of fitted corrections
   static constexpr int ParamSize = 8; ///< Number of params per fit
 
-#if !defined(GPUCA_ALIGPUCODE)
+#if !defined(GPUCA_GPUCODE)
   CalibdEdxCorrection()
   {
     clear();
   }
   CalibdEdxCorrection(std::string_view fileName) { loadFromFile(fileName); }
-#else
-  CalibdEdxCorrection() = default;
 #endif
   ~CalibdEdxCorrection() = default;
 

DataFormats/Detectors/TPC/include/DataFormatsTPC/Constants.h

@@ -28,7 +28,7 @@ namespace constants
 constexpr int MAXSECTOR = 36;
 
 // the number of global pad rows
-#if defined(GPUCA_STANDALONE) && !defined(GPUCA_O2_LIB) && !defined(GPUCA_TPC_GEOMETRY_O2)
+#if defined(GPUCA_STANDALONE) && defined(GPUCA_RUN2)
 constexpr int MAXGLOBALPADROW = 159; // Number of pad rows in Run 2, used for GPU TPC tests with Run 2 data
 #else
 constexpr int MAXGLOBALPADROW = 152; // Correct number of pad rows in Run 3

DataFormats/Detectors/TPC/src/CalibdEdxCorrection.cxx

@@ -14,13 +14,15 @@
 #include <algorithm>
 #include <string_view>
 
+#ifndef GPUCA_STANDALONE
 // o2 includes
 #include "Framework/Logger.h"
 #include "DataFormatsTPC/Defs.h"
 #include "CommonUtils/TreeStreamRedirector.h"
 
 // root includes
 #include "TFile.h"
+#endif
 
 using namespace o2::tpc;
 
@@ -37,6 +39,8 @@ void CalibdEdxCorrection::clear()
   mDims = -1;
 }
 
+#ifndef GPUCA_STANDALONE
+
 void CalibdEdxCorrection::writeToFile(std::string_view fileName, std::string_view objName) const
 {
   std::unique_ptr<TFile> file(TFile::Open(fileName.data(), "recreate"));
@@ -181,3 +185,5 @@ void CalibdEdxCorrection::setUnity()
   }
   mDims = 0;
 }
+
+#endif // GPUCA_STANDALONE

DataFormats/Detectors/TRD/include/DataFormatsTRD/TrackTRD.h

@@ -16,6 +16,7 @@
 #define O2_DATAFORMATS_TRACK_TRD_H
 
 #include "GPUTRDTrack.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 namespace o2
 {

DataFormats/Detectors/TRD/src/Tracklet64.cxx

@@ -25,7 +25,6 @@ void Tracklet64::print() const
        HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getROB(), getMCM(), getPadRow(), getPadCol(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2(), getFormat());
 }
 
-#ifndef GPUCA_GPUCODE_DEVICE
 void Tracklet64::printStream(std::ostream& stream) const
 {
   stream << "Tracklet64 : 0x" << std::hex << getTrackletWord();
@@ -50,7 +49,5 @@ bool operator<(const Tracklet64& lhs, const Tracklet64& rhs)
          (lhs.getDetector() == rhs.getDetector() && lhs.getROB() == rhs.getROB() && lhs.getMCM() == rhs.getMCM() && lhs.getPadRow() == rhs.getPadRow() && lhs.getPadCol() < rhs.getPadCol());
 }
 
-#endif // GPUCA_GPUCODE_DEVICE
-
 } // namespace trd
 } // namespace o2