[HLT] Changes suggested by new llvm18 clang-format

HLTrigger/Egamma/plugins/HLTEgammaDoubleXGBoostCombFilter.cc

@@ -110,9 +110,9 @@ bool HLTEgammaDoubleXGBoostCombFilter::hltFilter(edm::Event& event,
                   (mvaScorej > leadCutHighMass3_[eta1] && mvaScorei > subCutHighMass3_[eta2]))) {
           accept = true;
         }  // if scoreJ > scoreI
-      }    //If high mass
-    }      //j loop
-  }        //i loop
+      }  //If high mass
+    }  //j loop
+  }  //i loop
   return accept;
 }  //Definition
 

HLTrigger/Egamma/plugins/HLTEgammaL1MatchFilterRegional.cc

@@ -154,7 +154,7 @@ bool HLTEgammaL1MatchFilterRegional::hltFilter(edm::Event& iEvent,
       }  //end endcap fiduical check
 
     }  //end loop over all isolated RecoEcalCandidates
-  }    //end doIsolatedCheck
+  }  //end doIsolatedCheck
 
   // filter decision
   bool accept(n >= ncandcut_);

HLTrigger/Egamma/plugins/HLTEgammaL1TMatchFilterRegional.cc

@@ -153,7 +153,7 @@ bool HLTEgammaL1TMatchFilterRegional::hltFilter(edm::Event& iEvent,
       }  //end endcap fiduical check
 
     }  //end loop over all isolated RecoEcalCandidates
-  }    //end doIsolatedCheck
+  }  //end doIsolatedCheck
 
   // filter decision
   bool accept(n >= ncandcut_);

HLTrigger/Egamma/plugins/HLTElectronEoverpFilterRegional.cc

@@ -115,7 +115,7 @@ bool HLTElectronEoverpFilterRegional::hltFilter(edm::Event& iEvent,
           }
         }
       }  //end of the if checking the matching of the SC from RecoCandidate and the one from Electrons
-    }    //end of loop over electrons
+    }  //end of loop over electrons
 
     if (!doIsolated_) {
       //loop over the electrons to find the matching one
@@ -144,7 +144,7 @@ bool HLTElectronEoverpFilterRegional::hltFilter(edm::Event& iEvent,
             }
           }
         }  //end of the if checking the matching of the SC from RecoCandidate and the one from Electrons
-      }    //end of loop over electrons
+      }  //end of loop over electrons
     }
   }  //end of loop ober candidates
 

HLTrigger/Egamma/plugins/HLTElectronOneOEMinusOneOPFilterRegional.cc

@@ -119,7 +119,7 @@ bool HLTElectronOneOEMinusOneOPFilterRegional::hltFilter(edm::Event& iEvent,
           }
         }
       }  //end of the if checking the matching of the SC from RecoCandidate and the one from Electrons
-    }    //end of loop over electrons
+    }  //end of loop over electrons
 
     if (!doIsolated_) {
       //loop over the electrons to find the matching one
@@ -148,7 +148,7 @@ bool HLTElectronOneOEMinusOneOPFilterRegional::hltFilter(edm::Event& iEvent,
             }
           }
         }  //end of the if checking the matching of the SC from RecoCandidate and the one from Electrons
-      }    //end of loop over electrons
+      }  //end of loop over electrons
     }
   }  //end of loop ober candidates
 

HLTrigger/Egamma/plugins/HLTElectronPixelMatchFilter.cc

@@ -176,7 +176,7 @@ int HLTElectronPixelMatchFilter::getNrOfMatches(edm::Handle<reco::ElectronSeedCo
       } else
         nrMatch++;
     }  //end sc ref match
-  }    //end loop over ele seeds
+  }  //end loop over ele seeds
   return nrMatch;
 }
 

HLTrigger/HLTcore/interface/TriggerSummaryProducerAOD.h

@@ -97,7 +97,7 @@ class TriggerSummaryProducerAOD : public edm::global::EDProducer<> {
   /// InputTag ordering class
   struct OrderInputTag {
     bool ignoreProcess_;
-    OrderInputTag(bool ignoreProcess) : ignoreProcess_(ignoreProcess){};
+    OrderInputTag(bool ignoreProcess) : ignoreProcess_(ignoreProcess) {}
     inline bool operator()(const edm::InputTag& l, const edm::InputTag& r) const {
       int c = l.label().compare(r.label());
       if (0 == c) {

HLTrigger/JetMET/interface/HLTCATopTagFilter.h

@@ -98,8 +98,8 @@ inline reco::CATopJetProperties CATopJetHelperUser::operator()(reco::Jet const&
           properties.minMass = imw;
         }
       }  // end second loop over subjets
-    }    // end first loop over subjets
-  }      // endif 3 subjets
+    }  // end first loop over subjets
+  }  // endif 3 subjets
 
   if (properties.minMass == 999999)
     properties.minMass = -1;

HLTrigger/JetMET/src/HLTHcalLaserFilter.cc

@@ -138,8 +138,8 @@ bool HLTHcalLaserFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Ev
               return false;
             }
           }  //if (sumCharge > thresholdsfC_[thresh])
-        }    //for (unsigned int thresh=0;thresh<thresholdsfC_.size();++thresh)
-      }      // if HB or HE Calib
+        }  //for (unsigned int thresh=0;thresh<thresholdsfC_.size();++thresh)
+      }  // if HB or HE Calib
       else if (myid.hcalSubdet() == HcalForward && maxAllowedHFcalib_ >= 0) {
         ++numHFcalib;
         //std::cout <<"numHFcalib = "<<numHFcalib<<"  Max allowed = "<<maxAllowedHFcalib_<<std::endl;

HLTrigger/JetMET/src/HLTHcalTowerNoiseCleaner.cc

@@ -218,7 +218,7 @@ void HLTHcalTowerNoiseCleaner::produce(edm::Event& iEvent, const edm::EventSetup
         }
       }
     }  // done with noise loop
-  }    //if(severity_>0)
+  }  //if(severity_>0)
 
   //output collection
   std::unique_ptr<CaloTowerCollection> OutputTowers(new CaloTowerCollection());

HLTrigger/JetMET/src/HLTHcalTowerNoiseCleanerWithrechit.cc

@@ -233,7 +233,7 @@ void HLTHcalTowerNoiseCleanerWithrechit::produce(edm::Event& iEvent, const edm::
         }
       }
     }  // done with noise loop
-  }    //if(severity_>0)
+  }  //if(severity_>0)
 
   //output collection
   std::unique_ptr<CaloTowerCollection> OutputTowers(new CaloTowerCollection());

HLTrigger/JetMET/src/HLTJetCollectionsForBoostedLeptonPlusJets.cc

@@ -119,12 +119,12 @@ void HLTJetCollectionsForBoostedLeptonPlusJets<jetType>::produce(edm::Event& iEv
               usedCands.push_back(candNr);
               break;
             }  //if constituent matched
-          }    //for constituents
-        }      //if dR<min
-      }        //for cands
+          }  //for constituents
+        }  //if dR<min
+      }  //for cands
       allSelections->push_back(cleanedJet);
     }  //for jets
-  }    //if cands
+  }  //if cands
 
   if (!eleCands.empty()) {  // electrons
     for (jet = theJetCollectionHandle->begin(); jet != theJetCollectionHandle->end(); jet++) {
@@ -143,12 +143,12 @@ void HLTJetCollectionsForBoostedLeptonPlusJets<jetType>::produce(edm::Event& iEv
               usedCands.push_back(candNr);
               break;
             }  //if constituent matched
-          }    //for constituents
-        }      //if dR<min
-      }        //for cands
+          }  //for constituents
+        }  //if dR<min
+      }  //for cands
       allSelections->push_back(cleanedJet);
     }  //for jets
-  }    //if cands
+  }  //if cands
 
   if (!photonCands.empty()) {  // photons
     for (jet = theJetCollectionHandle->begin(); jet != theJetCollectionHandle->end(); jet++) {
@@ -167,12 +167,12 @@ void HLTJetCollectionsForBoostedLeptonPlusJets<jetType>::produce(edm::Event& iEv
               usedCands.push_back(candNr);
               break;
             }  //if constituent matched
-          }    //for constituents
-        }      //if dR<min
-      }        //for cands
+          }  //for constituents
+        }  //if dR<min
+      }  //for cands
       allSelections->push_back(cleanedJet);
     }  //for jets
-  }    //if cands
+  }  //if cands
 
   if (!clusCands.empty()) {  // trigger clusters
     for (jet = theJetCollectionHandle->begin(); jet != theJetCollectionHandle->end(); jet++) {
@@ -191,12 +191,12 @@ void HLTJetCollectionsForBoostedLeptonPlusJets<jetType>::produce(edm::Event& iEv
               usedCands.push_back(candNr);
               break;
             }  //if constituent matched
-          }    //for constituents
-        }      //if dR<min
-      }        //for cands
+          }  //for constituents
+        }  //if dR<min
+      }  //for cands
       allSelections->push_back(cleanedJet);
     }  //for jets
-  }    //if cands
+  }  //if cands
 
   NumericSafeGreaterByPt<jetType> compJets;
   // reorder cleaned jets

HLTrigger/JetMET/src/HLTJetVBFFilter.cc

@@ -153,11 +153,11 @@ bool HLTJetVBFFilter<T>::hltFilter(edm::Event& iEvent,
           filterproduct.addObject(triggerType_, ref1);
           filterproduct.addObject(triggerType_, ref2);
         }  // VBF cuts
-           //if(n>=1) break; //Store all possible pairs
+        //if(n>=1) break; //Store all possible pairs
       }
       //if(n>=1) break; //Store all possible pairs
     }  // loop on all jets
-  }    // events with two or more jets
+  }  // events with two or more jets
 
   // filter decision
   bool accept(n >= 1);

HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc

@@ -306,7 +306,7 @@ bool HLTMuonDimuonL3Filter::hltFilter(edm::Event& iEvent,
         }
       }
     }  //RCC loop
-  }    //end of using normal TrajectorySeeds
+  }  //end of using normal TrajectorySeeds
 
   // Needed for DCA calculation
   auto const& bFieldHandle = iSetup.getHandle(idealMagneticFieldRecordToken_);

HLTrigger/Muon/plugins/HLTMuonL3PreFilter.cc

@@ -257,7 +257,7 @@ bool HLTMuonL3PreFilter::hltFilter(Event& iEvent,
         }
       }
     }  //RCC loop
-  }    //end of using normal TrajectorySeeds
+  }  //end of using normal TrajectorySeeds
 
   // look at all mucands,  check cuts and add to filter object
   LogDebug("HLTMuonL3PreFilter") << "looking at: " << L2toL3s.size() << " L2->L3s from: " << mucands->size();

HLTrigger/Muon/plugins/HLTMuonTrimuonL3Filter.cc

@@ -174,8 +174,8 @@ bool HLTMuonTrimuonL3Filter::hltFilter(edm::Event& iEvent,
           L2toL3s[staTrack].push_back(RecoChargedCandidateRef(cand));
         }
       }  //MTL loop
-    }    //RCC loop
-  }      //end of using normal TrajectorySeeds
+    }  //RCC loop
+  }  //end of using normal TrajectorySeeds
 
   Handle<TriggerFilterObjectWithRefs> previousLevelCands;
   iEvent.getByToken(previousCandToken_, previousLevelCands);
@@ -498,7 +498,7 @@ bool HLTMuonTrimuonL3Filter::hltFilter(edm::Event& iEvent,
             if (atLeastOneTriplet && fast_Accept_)
               break;
           }  //loop on the third L2
-        }    //loop on the track of the second L2
+        }  //loop on the track of the second L2
         //break the loop if fast accept.
         if (atLeastOneTriplet && fast_Accept_)
           break;

HLTrigger/Tools/bin/hltDiff.cc

@@ -814,16 +814,16 @@ class SummaryOutputProducer {
     double v;
     double e;
 
-    Pair(double _v, double _e) : v(_v), e(_e){};
-    Pair(int _v, int _e) : v(_v), e(_e){};
+    Pair(double _v, double _e) : v(_v), e(_e) {}
+    Pair(int _v, int _e) : v(_v), e(_e) {}
   };
 
   struct Event {
     int run;
     int lumi;
     int event;
 
-    Event(int _run, int _lumi, int _event) : run(_run), lumi(_lumi), event(_event){};
+    Event(int _run, int _lumi, int _event) : run(_run), lumi(_lumi), event(_event) {}
     bool operator<(const Event& b) const { return std::tie(run, lumi, event) < std::tie(b.run, b.lumi, b.event); }
   };
 

HLTrigger/special/plugins/HLTCSCOverlapFilter.cc

@@ -73,7 +73,7 @@ bool HLTCSCOverlapFilter::hltFilter(edm::Event& iEvent,
       }
       chamber_tohit[chamber_id].push_back(&hit);
     }  // end if this ring is selected
-  }    // end loop over hits
+  }  // end loop over hits
 
   bool keep = false;
   unsigned int minHitsSquared = m_minHits * m_minHits;
@@ -125,15 +125,15 @@ bool HLTCSCOverlapFilter::hltFilter(edm::Event& iEvent,
                 return true;
             }
           }  // end loop over hits in chamber 2
-        }    // end loop over hits in chamber 1
+        }  // end loop over hits in chamber 1
 
         if (m_fillHists) {
           m_pairsWithWindowCut->Fill(pairs_in_window);
         }
 
       }  // end if chamber 2 has enough hits
-    }    // end if chamber 1 has enough hits
-  }      // end loop over chambers
+    }  // end if chamber 1 has enough hits
+  }  // end loop over chambers
 
   return keep;
 }

HLTrigger/special/plugins/HLTCSCRing2or3Filter.cc

@@ -53,7 +53,7 @@ bool HLTCSCRing2or3Filter::hltFilter(edm::Event& iEvent,
       }
       chamber_tohit[chamber_id].push_back(&hit);
     }  // end if this ring is selected
-  }    // end loop over hits
+  }  // end loop over hits
 
   unsigned int minHitsAlmostSquared = (m_minHits - 1) * (m_minHits - 2);
   for (std::map<int, std::vector<const CSCRecHit2D*> >::const_iterator chamber_iter = chamber_tohit.begin();
@@ -79,10 +79,10 @@ bool HLTCSCRing2or3Filter::hltFilter(edm::Event& iEvent,
           if (pairs_in_window >= minHitsAlmostSquared)
             return true;
         }  // end loop over hits
-      }    // end loop over hits
+      }  // end loop over hits
 
     }  // end if chamber has enough hits
-  }    // end loop over chambers
+  }  // end loop over chambers
 
   return false;
 }

RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTCaloTowerProducer.cc

@@ -31,7 +31,7 @@
 class EgammaHLTCaloTowerProducer : public edm::global::EDProducer<> {
 public:
   EgammaHLTCaloTowerProducer(const edm::ParameterSet&);
-  ~EgammaHLTCaloTowerProducer() override{};
+  ~EgammaHLTCaloTowerProducer() override {}
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const final;
 

RecoEgamma/EgammaHLTProducers/plugins/HLTRecHitInAllL1RegionsProducer.cc

@@ -252,7 +252,7 @@ void HLTRecHitInAllL1RegionsProducer<RecHitType>::produce(edm::Event& event, con
           }
         }
       }  //end check of empty regions
-    }    //end check of empty rec-hits
+    }  //end check of empty rec-hits
     //   std::cout <<"putting fileter coll in "<<filteredRecHits->size()<<std::endl;
     event.put(std::move(filteredRecHits), productLabels_[recHitCollNr]);
   }  //end loop over all rec hit collections

RecoTauTag/HLTProducers/interface/L2TauPixelIsoTagProducer.h

@@ -25,7 +25,7 @@ class L2TauPixelIsoTagProducer : public edm::global::EDProducer<> {
 public:
   explicit L2TauPixelIsoTagProducer(const edm::ParameterSet&);
 
-  ~L2TauPixelIsoTagProducer() override{};
+  ~L2TauPixelIsoTagProducer() override {}
 
   void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;