Merge branch 'ElectronLikelihood_modify_for_new_ambi_type_7' into 'master'

Update Likelihood for new Ambiguity type from atlas/athena!35293

See merge request atlas/athena!36269

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx

@@ -102,10 +102,32 @@ bool ElectronSelectorHelpers::passBLayerRequirement(const xAOD::TrackParticle *t
 }
 
 
-// ==================================================================
 bool ElectronSelectorHelpers::passAmbiguity(xAOD::AmbiguityTool::AmbiguityType type, const uint8_t criterion){
 
   // helper to check if ambiguity type is one of several that are stored in a bitmask
-  return criterion & 0x1<<type;
+  //
+  // Christos Rel 22 new ambi.
+  //
+  // The issue is that the "criterion" encodes what should
+  // pass only.
+  // If it was not stored in the GroupData and need to keep compatibility
+  // this would have been trivial but ....
+  //
+  // We want reject types
+  //  ambiguousVertexEoverPBetterThanTrackEoverP=6,
+  //  photon=7,
+  //
+  // What pass is 0b11111 (31) e.g we do not specify explicitly the bit
+  // to cut on. Which of course now breaks.
+  // The magic 31 comes from config files which will be updated
+  // at some stage for new tunes.
+  // And the code below pass for types 0,1,2,3,4 (the 5 bits sets)
+  // 2^0 + 2^1  + 2^2 +2^3 +2^4 = 1+2+4+8+16 = 31
+  //
+  // For now solve ad-hoc and keep compatibility with existing config
+  // tooling in GroupArea/PHYS/Derivation etc by adding 32
+  //
+  //
+  return (32+criterion) & 0x1<<type;
 
 }

PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces/EgammaAnalysisInterfaces/IEGammaAmbiguityTool.h

@@ -36,10 +36,9 @@ namespace xAOD {
       ambiguousTrackLowPt=2,
       ambiguousTrackHighEoverP=3,
       ambiguousTrackNoPixel =4,
-      ambiguousVertexEoverPBetterThanTrackEoverP=5,
-      photon=6,
-      // this falls at the end to avoid problems in other tools (el ID) using bitwise operations
-      ambiguousNoInnermost=7,
+      ambiguousNoInnermost=5,
+      ambiguousVertexEoverPBetterThanTrackEoverP=6,
+      photon=7,
       unknown=8,
     };
   }