Avoid short-circuiting ESWatchers in ElectronSeedGenerator

Be sure to call check for all ESWatchers for each event.
Sam-Harper · Dec 12, 2022 · 2b62829 · 2b62829
1 parent d2b40c9
commit 2b62829
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc b/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc
@@ -164,7 +164,9 @@ ElectronSeedGenerator::ElectronSeedGenerator(const edm::ParameterSet &pset,
                useRecoVertex_) {}
 
 void ElectronSeedGenerator::setupES(const edm::EventSetup &setup) {
-  if (magneticFieldWatcher_.check(setup) || trackerGeometryWatcher_.check(setup)) {
+  auto newMagField = magneticFieldWatcher_.check(setup);
+  auto newTrackerGeom = trackerGeometryWatcher_.check(setup);
+  if (newMagField || newTrackerGeom) {
     matcher_.setES(setup.getData(magFieldToken_), setup.getData(trackerGeometryToken_));
   }
 }