fix3

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

Common/Utils/include/CommonUtils/EnumFlags.h

@@ -24,6 +24,7 @@
 #include <string>
 #include <sstream>
 #include <limits>
+#include <bit>
 #include <bitset>
 #include <initializer_list>
 #include <cstdint>
@@ -34,7 +35,15 @@
 #include <iostream>
 #include <iomanip>
 
+#if !defined(__CUDACC__) && !defined(__HIPCC__)
+#define O2_ENUMFLAGS_ENABLE_REFLECTION 1
+#else
+#define O2_ENUMFLAGS_ENABLE_REFLECTION 0
+#endif
+
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
 #include "CommonUtils/StringUtils.h"
+#endif
 
 namespace o2::utils
 {
@@ -55,6 +64,7 @@ concept EnumFlagHelper = requires {
 // This is very much inspired by much more extensive libraries like magic_enum.
 // Inspiration by its c++20 version (https://github.com/fix8mt/conjure_enum).
 // NOTE: Cannot detect if bit values past the underlying type are defined.
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
 template <EnumFlagHelper E>
 struct FlagsHelper final {
   using U = std::underlying_type_t<E>;
@@ -317,10 +327,12 @@ struct FlagsHelper final {
     return false;
   }
 };
+#endif
 
 } // namespace details::enum_flags
 
 // Require an enum to fullfil what one would except from a bitset.
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
 template <typename E>
 concept EnumFlag = requires {
   // range checks
@@ -332,6 +344,10 @@ concept EnumFlag = requires {
   requires !details::enum_flags::FlagsHelper<E>::hasNone(); // added automatically
   requires !details::enum_flags::FlagsHelper<E>::hasAll();  // added automatically
 };
+#else
+template <typename E>
+concept EnumFlag = details::enum_flags::EnumFlagHelper<E>;
+#endif
 
 /**
  * \brief Class to aggregate and manage enum-based on-off flags.
@@ -358,7 +374,9 @@ template <EnumFlag E>
 class EnumFlags
 {
   static constexpr int DefaultBase{2};
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
   using H = details::enum_flags::FlagsHelper<E>;
+#endif
   using U = std::underlying_type_t<E>;
   U mBits{0};
 
@@ -388,18 +406,21 @@ class EnumFlags
   // Initialize with a list of flags.
   constexpr EnumFlags(std::initializer_list<E> flags) noexcept
   {
-    std::for_each(flags.begin(), flags.end(), [this](const E f) noexcept { mBits |= to_bit(f); });
+    for (const E f : flags) {
+      mBits |= to_bit(f);
+    }
   }
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
   // Init from a string.
   //
   explicit EnumFlags(const std::string& str, int base = DefaultBase)
   {
     set(str, base);
   }
-  // Destructor.
-  constexpr ~EnumFlags() = default;
+#endif
 
-  static constexpr U None{0};        // Represents no flags set.
+  static constexpr U None{0}; // Represents no flags set.
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
   static constexpr U All{H::MaxRep}; // Represents all flags set.
 
   // Return list of all enum values
@@ -432,6 +453,7 @@ class EnumFlags
       throw;
     }
   }
+#endif
   // Returns the raw bitset value.
   [[nodiscard]] constexpr auto value() const noexcept
   {
@@ -493,6 +515,7 @@ class EnumFlags
   }
 
   // Checks if all flags are set.
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
   [[nodiscard]] constexpr bool all() const noexcept
   {
     return mBits == All;
@@ -537,6 +560,7 @@ class EnumFlags
     }
     return oss.str();
   }
+#endif
 
   // Checks if any flag is set (Boolean context).
   [[nodiscard]] constexpr explicit operator bool() const noexcept
@@ -645,6 +669,7 @@ class EnumFlags
   }
 
   // Serializes the flag set to a string.
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
   [[nodiscard]] std::string serialize() const
   {
     return std::to_string(mBits);
@@ -659,6 +684,7 @@ class EnumFlags
     }
     mBits = static_cast<U>(v);
   }
+#endif
 
   // Counts the number of set bits (active flags).
   [[nodiscard]] constexpr size_t count() const noexcept
@@ -686,6 +712,7 @@ class EnumFlags
 
  private:
   // Set implementation, bits was zeroed before.
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
   void setImpl(const std::string& s, int base = 2)
   {
     // Helper to check if character is valid for given base
@@ -782,15 +809,20 @@ class EnumFlags
       throw std::invalid_argument("Cannot parse string!");
     }
   }
+#endif
 };
 
+#if O2_ENUMFLAGS_ENABLE_REFLECTION
 template <EnumFlag E>
 std::ostream& operator<<(std::ostream& os, const EnumFlags<E>& f)
 {
   os << f.pstring(true);
   return os;
 }
+#endif
 
 } // namespace o2::utils
 
+#undef O2_ENUMFLAGS_ENABLE_REFLECTION
+
 #endif

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Configuration.h

@@ -23,9 +23,7 @@
 #include <vector>
 #endif
 
-#if !defined(__CUDACC__) && !defined(__HIPCC__)
 #include "CommonUtils/EnumFlags.h"
-#endif
 #include "DetectorsBase/Propagator.h"
 #include "ITStracking/Constants.h"
 
@@ -43,12 +41,7 @@ enum class IterationStep : uint8_t {
   MarkVerticesAsUPC,
 };
 
-#if !defined(__CUDACC__) && !defined(__HIPCC__)
 using IterationSteps = o2::utils::EnumFlags<IterationStep>;
-#else
-struct IterationSteps {
-};
-#endif
 
 struct TrackingParameters {
   int CellMinimumLevel() const noexcept { return MinTrackLength - constants::ClustersPerCell + 1; }
@@ -57,7 +50,7 @@ struct TrackingParameters {
   int TrackletsPerRoad() const noexcept { return NLayers - 1; }
   std::string asString() const;
 
-  IterationSteps PassFlags;
+  IterationSteps PassFlags{IterationStep::FirstPass, IterationStep::RebuildClusterLUT};
   int NLayers = 7;
   std::vector<uint32_t> AddTimeError = {0, 0, 0, 0, 0, 0, 0};
   std::vector<float> LayerZ = {16.333f + 1, 16.333f + 1, 16.333f + 1, 42.140f + 1, 42.140f + 1, 73.745f + 1, 73.745f + 1};
@@ -104,7 +97,7 @@ struct TrackingParameters {
 struct VertexingParameters {
   std::string asString() const;
 
-  IterationSteps PassFlags;
+  IterationSteps PassFlags{IterationStep::FirstPass, IterationStep::ResetVertices};
   std::vector<float> LayerZ = {16.333f + 1, 16.333f + 1, 16.333f + 1, 42.140f + 1, 42.140f + 1, 73.745f + 1, 73.745f + 1};
   std::vector<float> LayerRadii = {2.33959f, 3.14076f, 3.91924f, 19.6213f, 24.5597f, 34.388f, 39.3329f};
   int vertPerRofThreshold = 0; // Maximum number of vertices per ROF to trigger second a round

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackerTraits.h

@@ -18,7 +18,6 @@
 
 #include <oneapi/tbb.h>
 
-#include "DetectorsBase/Propagator.h"
 #include "ITStracking/Configuration.h"
 #include "ITStracking/IndexTableUtils.h"
 #include "ITStracking/TimeFrame.h"