Sweep IOV channel number fix to master

Tag: @ewelina @mnowak

This is a sweep of the fixes for EVNT-to-EVNT filtering introduced for 21.6 here: !39376 (merged)

There was an expected merge conflict due to changes in the linked libraries in 22.0. Here the commits from !39376 (merged) are cherry picked and the merge conflict on aa3e6759 is addressed by adopting the file from master and adding the necessary libraries for the fix, resulting in b8028e34.

Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h

@@ -114,6 +114,8 @@ public:
 
     /// channel number for index: (index = 0 to size-1)
     ChanNum              chanNum(unsigned int index) const;
+
+    bool                 fixChanNum(ChanNum oldChan, ChanNum newChan);
     
     /// attribute list for a given channel number
     const AttributeList& attributeList(ChanNum chanNum) const;
@@ -674,6 +676,26 @@ CondAttrListCollection::isSameButMinRange ( const CondAttrListCollection& rhs,
 }
 
     
+inline bool
+    CondAttrListCollection::fixChanNum(const ChanNum oldChan,
+                                       const ChanNum newChan) {
+      auto attrRet = m_attrMap.emplace(newChan, m_attrMap[oldChan]);
+      // if a new element was inserted, erase the old one
+      if (attrRet.second) m_attrMap.erase(oldChan);
+
+      auto iovRet = m_iovMap.emplace(newChan, m_iovMap[oldChan]);
+      // if a new element was inserted, erase the old one
+      if (iovRet.second) m_iovMap.erase(oldChan);
+
+      auto nameRet = m_nameMap.emplace(newChan, m_nameMap[oldChan]);
+      // if a new element was inserted, erase the old one
+      if (nameRet.second) m_nameMap.erase(oldChan);
+
+      return attrRet.first->first == newChan
+          && iovRet.first->first == newChan
+          && nameRet.first->first == newChan;
+    }
+    
     
 
 #endif // DBDATAOBJECTS_CONDATTRLISTCOLLECTION_H