remove old HltANNSvc

Hlt/HltDAQ/tests/options/dump_decode_wipe_encode_split.py

@@ -64,6 +64,8 @@ for stage, t, (seq, at) in product((1, 2), bankTypes, ((decoders, "Decoder"),
         conf.setProp("OutputRawEvent",
                      "/Event/DAQ/Hlt{0}DecEvent".format(stage))
         conf.setProp("OutputView", "/Event/DAQ/Hlt{0}DecView".format(stage))
+        conf.setProp("EncodingKey", 0x010600a2)
+        conf.setProp("DecoderMapping", "TCKANNSvc/HltANNSvc")
 
     seq.Members.append(conf.getFullName())
 
@@ -77,10 +79,6 @@ for atype in bankTypes:
     dump.RawBanks.append(bank)
     killer.BankTypes.append(bank)
 
-from Configurables import HltANNSvc
-HltANNSvc().Hlt1SelectionID = {'PV3D': 10103, 'ProtoPV3D': 10117}
-HltANNSvc().Hlt2SelectionID = {'PV3D': 50103, 'ProtoPV3D': 50117}
-
 killer2.BankTypes = killer.BankTypes + ["ODIN"]
 killer2.DefaultIsKill = True
 

Hlt/HltServices/CMakeLists.txt

@@ -22,7 +22,6 @@ gaudi_add_module(HltServices
         src/ConfigStackAccessSvc.cpp
         src/ConfigTarFileAccessSvc.cpp
         src/ConfigZipFileAccessSvc.cpp
-        src/HltANNSvc.cpp
         src/HltConfigSvc.cpp
         src/HltGenConfig.cpp
         src/HltLinePersistenceSvc.cpp

Hlt/HltServices/src/HltANNSvc.cpp

-/*****************************************************************************\
-* (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration      *
-*                                                                             *
-* This software is distributed under the terms of the GNU General Public      *
-* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
-*                                                                             *
-* In applying this licence, CERN does not waive the privileges and immunities *
-* granted to it by virtue of its status as an Intergovernmental Organization  *
-* or submit itself to any jurisdiction.                                       *
-\*****************************************************************************/
-#include "ANNSvc.h"
-#include <functional>
-#include <string>
-
-class HltANNSvc : public ANNSvc {
-public:
-  HltANNSvc( const std::string& name, ISvcLocator* svcLocator )
-      : ANNSvc( name, svcLocator,
-                {{"Hlt1SelectionID"},
-                 {"Hlt2SelectionID"},
-                 {"SpruceSelectionID"},
-                 {"InfoID"},
-                 {"RoutingBits"},
-                 {"RelInfoLocations"},
-                 {"PackedObjectLocations"},
-                 {"PackedObjectTypes"}} ) {}
-  using ANNSvc::handleUndefined;
-  std::optional<minor_value_type> handleUndefined( const major_key_type& major,
-                                                   const std::string&    minor ) const override;
-
-private:
-  Gaudi::Property<bool> m_allowUndefined{this, "allowUndefined", true,
-                                         "do we allow undefined, on-demand generated, key/value pairs?"};
-};
-
-// DECLARE_COMPONENT( HltANNSvc )
-
-std::optional<IANNSvc::minor_value_type> HltANNSvc::handleUndefined( const major_key_type& major,
-                                                                     const std::string&    minor ) const {
-  if ( !m_allowUndefined ) return {};
-
-  static const std::hash<std::string> hasher;
-  debug() << "handleUndefined called for " << major << " : " << minor << " -->  " << hasher( minor ) << endmsg;
-  return minor_value_type( minor, hasher( minor ) );
-}