Merge branch 'sponce_fixDD4hep' into 'master'

Fix DD4hep build

See merge request !2567

CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp

@@ -22,6 +22,11 @@
 #include "Relations/RelationWeighted2D.h"
 #include "SelectiveMatchUtils.h"
 
+#ifdef USE_DD4HEP
+#  include <DD4hep/Grammar.h>
+#  include <DD4hep/GrammarUnparsed.h>
+#endif
+
 /** @class SelectiveElectronMatchAlg SelectiveElectronMatchAlg.h
  *
  *  Matches tracks with local electron hypos in and around calo cell
@@ -70,6 +75,7 @@ namespace LHCb::Calo {
       std::array<double, 4> alphaNInn;
 
     public:
+      electronXcorrections() = default; // needed by DD4hep even if unused !
       electronXcorrections( Condition const& c )
           : alphaPOut{toarray<double, 4>( c.paramAsDoubleVect( "alphaPOut" ) )}
           , alphaNOut{toarray<double, 4>( c.paramAsDoubleVect( "alphaNOut" ) )}

CaloFuture/CaloFuturePIDs/src/SelectiveMatchUtils.h

@@ -23,6 +23,11 @@
 #include "TrackKernel/TrackFunctors.h"
 #include <array>
 
+#ifdef USE_DD4HEP
+#  include <DD4hep/Grammar.h>
+#  include <DD4hep/GrammarUnparsed.h>
+#endif
+
 /** @file
  *
  *  Implementation file for helper functions and classes for
@@ -44,6 +49,7 @@ namespace LHCb::Calo {
       std::array<Match2D::Matrix, 3> m_covariances;
 
     public:
+      cellSizeCovariances() = default; // needed by DD4hep even if unused !
       // constructor
       cellSizeCovariances( DeCalorimeter const& calo ) {
         // get cell sizes

Pr/PrKernel/include/PrKernel/FTMatsCache.h

@@ -14,6 +14,11 @@
 #include "FTDet/DeFTDetector.h"
 #include <array>
 
+#ifdef USE_DD4HEP
+#  include <DD4hep/Grammar.h>
+#  include <DD4hep/GrammarUnparsed.h>
+#endif
+
 namespace FTMatsCache {
 
   struct MatsCache {
@@ -32,6 +37,7 @@ namespace FTMatsCache {
     float dieGap{};
     float sipmPitch{};
 
+    MatsCache() = default; // Needed by DD4hep even if unsed !
     MatsCache( const DeFTDetector& ftDet ) {
       const auto* first_mat =
           ftDet.stations().at( 0 )->layers().at( 0 )->quarters().at( 0 )->modules().at( 0 )->mats().at( 0 );

Pr/PrKernel/include/PrKernel/PrFTZoneHandler.h

@@ -16,6 +16,11 @@
 #include "Kernel/DetectorSegment.h"
 #include "PrKernel/PrHitZone.h"
 
+#ifdef USE_DD4HEP
+#  include <DD4hep/Grammar.h>
+#  include <DD4hep/GrammarUnparsed.h>
+#endif
+
 namespace FTZoneCache {
 
   /** @class PrFTZoneHandler PrFTZoneHandler.h
@@ -96,6 +101,7 @@ namespace FTZoneCache {
     std::array<float, PrFTInfo::NFTZones> zoneDxDy{std::numeric_limits<float>::signaling_NaN()};
     std::array<float, PrFTInfo::NFTZones> zoneDzDy{std::numeric_limits<float>::signaling_NaN()};
     std::array<float, PrFTInfo::NFTZones> zoneZPos{std::numeric_limits<float>::signaling_NaN()};
+    ZoneCache() = default; // Needed by DD4hep even if unused !
     ZoneCache( const DeFTDetector& ftDet ) : handler( ftDet ) {
       for ( int i{0}; i < PrFTInfo::NFTLayers; ++i ) {
         zoneZPos[2 * i]     = handler.zone( 2 * i ).z();

Tr/TrackTools/src/VeloMuonBuilder.cpp

@@ -9,8 +9,8 @@
  * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
 
+#include "DetDesc/DetectorElement.h"
 #include "DetDesc/GenericConditionAccessorHolder.h"
-#include "DetDesc/IDetectorElement.h"
 #include "Event/Track.h"
 #include "Event/TrackFitResult.h"
 #include "Event/TrackTags.h"