Skip to content
Snippets Groups Projects
Commit 0608efa4 authored by sutt's avatar sutt
Browse files

Push additional temporary debugging to ignore differenced with regex

The check on the difference is whether the output from the find	and the	regex_match
was different.

However, if a regex is passed in, ie ".*SomeContainer" then a find for this and
for the	 regex will be different, so we don't want to bother with this check for	regexs
parent cdcf2907
No related branches found
No related tags found
7 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!37019Enhance TDT feature retrieval by allowing regex matching,!36437Enhance TDT feature retrieval by allowing regex matching
...@@ -141,18 +141,23 @@ namespace TrigCompositeUtils { ...@@ -141,18 +141,23 @@ namespace TrigCompositeUtils {
} }
auto it = std::remove_if(vector.begin(), vector.end(), [&](const ElementLink<CONTAINER>& el) { auto it = std::remove_if(vector.begin(), vector.end(), [&](const ElementLink<CONTAINER>& el) {
bool oldmatch = ( el.dataID().find(containerSGKey) == std::string::npos);
bool newmatch = !std::regex_match( el.dataID(), std::regex(containerSGKey) ); bool newmatch = !std::regex_match( el.dataID(), std::regex(containerSGKey) );
// ANA_MSG_WARNING ( "Strict match violation" << el.dataID() << " : " << containerSGKey );
if ( oldmatch!=newmatch ) std::cerr << "SUTT:: Strict match violation" << el.dataID() << " : " << containerSGKey << std::endl;; if ( containerSGKey.find("*")==std::string::npos &&
containerSGKey.find(".")==std::string::npos ) {
bool oldmatch = ( el.dataID().find(containerSGKey) == std::string::npos);
// ANA_MSG_WARNING ( "Strict match violation" << el.dataID() << " : " << containerSGKey );
if ( oldmatch!=newmatch ) {
std::cerr << "SUTT:: Strict match violation " << el.dataID() << " : " << containerSGKey << std::endl;;
}
}
return !std::regex_match( el.dataID(), std::regex(containerSGKey) ); return !std::regex_match( el.dataID(), std::regex(containerSGKey) );
// return (el.dataID().find(containerSGKey) == std::string::npos); });
});
// Collection has been re-ordered to put the bad elements at the end // Collection has been re-ordered to put the bad elements at the end
vector.erase(it, vector.end()); vector.erase(it, vector.end());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment