Merge branch 'fix-lcg-101' into 'master'

Fix lcg-101 compilation with gcc10

See merge request !2542

Rich/RichFutureRecTrackAlgorithms/src/RichRayTraceCherenkovCones.cpp

@@ -9,15 +9,8 @@
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
 
-// STL
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <sstream>
-#include <type_traits>
-#include <utility>
-
 // Gaudi
+#include "GaudiAlg/Transformer.h"
 #include "GaudiKernel/ParsersFactory.h"
 #include "GaudiKernel/PhysicalConstants.h"
 #include "GaudiKernel/StdArrayAsProperty.h"
@@ -25,9 +18,6 @@
 // Base class
 #include "RichFutureRecBase/RichRecAlgBase.h"
 
-// Gaudi
-#include "GaudiAlg/Transformer.h"
-
 // Event Model
 #include "RichFutureRecEvent/RichRecCherenkovAngles.h"
 #include "RichFutureRecEvent/RichRecMassHypoRings.h"
@@ -52,6 +42,16 @@
 // boost
 #include <boost/container/static_vector.hpp>
 
+// STL
+#include <algorithm>
+#include <array>
+#include <cassert>
+#include <iterator>
+#include <sstream>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 namespace Rich::Future::Rec {
 
   // Use the functional framework
@@ -82,7 +82,11 @@ namespace Rich::Future::Rec {
     class CosSinPhi final : public Vc::AlignedBase<Vc::VectorAlignment> {
     public:
       /// Container type
-      using Vector = boost::container::static_vector<CosSinPhi<TYPE>, AbsMaxRingPointsSIMD>;
+      // Appears to be some issue between ranges and boost static vectors in LCG 101
+      // https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2542
+      // For now just use std::vector. Allocated once during initialise so likely not a performance issue.
+      // using Vector = boost::container::static_vector<CosSinPhi<TYPE>, AbsMaxRingPointsSIMD>;
+      using Vector = std::vector<CosSinPhi<TYPE>>;
 
     public:
       /// Contructor from a phi value