Merge branch 'dcraik_addAltFormatForLumiSchemaJson' into 'master'

Add secondary formatting string for lumi summary schema JSON lookups

See merge request !3839

Hlt/HltServices/src/GitANNSvc.cpp

@@ -99,6 +99,8 @@ class GitANNSvc : public ANNSvcBase {
   Gaudi::Property<std::map<unsigned int, std::string>> m_lumi_key2JSON{this, "LumiOverrule", {}};
   Gaudi::Property<std::string>                         m_lumi_fmt{this, "LumiRefFormatter",
                                           "{0}:luminosity_counters/json/{1:.2}/{1}.json"}; // 0=tag, 1=key, 2=version
+  Gaudi::Property<std::string>                         m_lumi_altfmt{this, "LumiAltRefFormatter",
+                                             "key-{1}:luminosity_counters/json/{1:.2}/{1}.json"};
 
   std::optional<std::string> fetch_from_repo( std::string const& repo, std::string const& name ) const {
     if ( repo.empty() ) error() << "no repo specified..." << endmsg;
@@ -177,6 +179,7 @@ class GitANNSvc : public ANNSvcBase {
       debug() << "fetch_lumi_json( " << key << " -> " << id << " ) from repo " << m_repo.value() << endmsg;
 
     auto s = fetch_from_repos( [&]( auto const& tag ) { return fmt::format( m_lumi_fmt.value(), tag, id ); } );
+    if ( !s ) s = fetch_from_repos( [&]( auto const& tag ) { return fmt::format( m_lumi_altfmt.value(), tag, id ); } );
     if ( !s ) return std::nullopt;
     auto json = nlohmann::json::parse( *s, nullptr, false );
     if ( json.is_discarded() ) return std::nullopt;