Merge branch 'jzhuo_FixAllenUT' into 'master'

Fix Allen UT geometry

See merge request !4395

Det/UTDet/include/UTDet/DeUTDetector.h

@@ -229,11 +229,6 @@ public:
     for ( auto* sector : m_sectors ) { func( *sector ); }
   }
 
-  /// apply given callable to all layers
-  void applyToAllSectorsAllen( const std::function<void( DeUTSector const& )>& func ) const {
-    for ( auto* sector : m_sectorsAllen ) { func( *sector ); }
-  }
-
   /** flat vector of sectors in single full layer
    * @return vector of sectors
    */
@@ -463,7 +458,6 @@ private:
 
   Sides                                                  m_sides;
   Sectors                                                m_sectors;
-  Sectors                                                m_sectorsAllen;
   std::vector<const DeUTLayer*>                          m_layers;
   GaudiUtils::VectorMap<unsigned int, const DeUTSector*> m_sMap;
 

Det/UTDet/src/Lib/DeUTDetector.cpp

@@ -174,15 +174,11 @@ const DeUTSector* DeUTDetector::findSector( const Gaudi::XYZPoint& aPoint ) cons
 
 void DeUTDetector::flatten() {
   m_sectors.reserve( 1200 );
-  m_sectorsAllen.reserve( 1200 );
 
   for ( auto ptrs : m_sides ) {
     for ( auto ptrlayer : ptrs->layers() ) {
       m_layers.push_back( ptrlayer );
-      ptrlayer->applyToAllSectors( [this]( DeUTSector const& utSector ) {
-        m_sectors.push_back( &utSector );
-        m_sectorsAllen.push_back( &utSector );
-      } );
+      ptrlayer->applyToAllSectors( [this]( DeUTSector const& utSector ) { m_sectors.push_back( &utSector ); } );
     }
   }
   if ( m_version == GeoVersion::v0 ) { // for old geo, sectors need to be sorted by new ids