JetAnalyzer.cc, Run3ScoutingPFJetIDSelectionFunctor.h: minor changes after 'code-checks'

Author: etzovara

DQMOffline/JetMET/src/JetAnalyzer.cc

@@ -210,8 +210,9 @@ JetAnalyzer::JetAnalyzer(const edm::ParameterSet& pSet)
       if (verbose_)
         std::cout << "no Valid scouting Run3ScoutinPF JetID quality given" << std::endl;
     }
-    run3scoutingpfjetIDFunctor = Run3ScoutingPFJetIDSelectionFunctor(run3scoutingpfjetidversion, run3scoutingpfjetidquality);
-    }
+    run3scoutingpfjetIDFunctor =
+        Run3ScoutingPFJetIDSelectionFunctor(run3scoutingpfjetidversion, run3scoutingpfjetidquality);
+  }
 
   //check later if some of those are also needed for PFJets
   leadJetFlag_ = 0;
@@ -2927,8 +2928,9 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
     if (!scoutingJets.isValid())
       return;
   } else {
-  if (jetCleaningFlag_ && (!jetCollectionIsValid || !bPrimaryVertex || !dcsDecision))  // why "jetCleaningFlag_ &&" ???
-    return;
+    if (jetCleaningFlag_ &&
+        (!jetCollectionIsValid || !bPrimaryVertex || !dcsDecision))  // why "jetCleaningFlag_ &&" ???
+      return;
   }
 
   unsigned int collSize = -1;

PhysicsTools/SelectorUtils/interface/Run3ScoutingPFJetIDSelectionFunctor.h

@@ -25,10 +25,7 @@
 
 class Run3ScoutingPFJetIDSelectionFunctor {
 public:  // interface
-  enum Version_t {
-    RUN3Scouting,
-    N_VERSIONS
-  };
+  enum Version_t { RUN3Scouting, N_VERSIONS };
   enum Quality_t { TIGHT, TIGHTLEPVETO, N_QUALITY };
 
   Run3ScoutingPFJetIDSelectionFunctor() {}
@@ -45,17 +42,19 @@ class Run3ScoutingPFJetIDSelectionFunctor {
     if (versionStr == "RUN3Scouting")
       version_ = RUN3Scouting;
     else {
-      std::cout <<  "JetID version not specified -- setting default to RUN3Scouting" << std::endl;
-      version_ = RUN3Scouting;    //set RUN3Scouting as default //this is extremely unsafe --> similarly it's done in PFJetIDSelectionFunctor.h
+      edm::LogWarning("BadJetIDQuality") << "JetID quality not specified -- setting default to RUN3Scouting";
+      version_ =
+          RUN3Scouting;  //set RUN3Scouting as default //this is extremely unsafe --> similarly it's done in PFJetIDSelectionFunctor.h
     }
-          
+
     if (qualityStr == "TIGHT")
       quality_ = TIGHT;
     else if (qualityStr == "TIGHTLEPVETO")
       quality_ = TIGHTLEPVETO;
     else {
-      edm::LogWarning("BadJetIDQuality") << "JetID quality not specified -- setting default to RUN3Scouting";
-      quality_ = TIGHT;       //set TIGHT as default //this is extremely unsafe --> similarly it's done in PFJetIDSelectionFunctor.h
+      edm::LogWarning("BadJetIDQuality") << "JetID quality not specified -- setting default to TIGHT";
+      quality_ =
+          TIGHT;  //set TIGHT as default //this is extremely unsafe --> similarly it's done in PFJetIDSelectionFunctor.h
     }
 
     initCuts();
@@ -72,18 +71,17 @@ class Run3ScoutingPFJetIDSelectionFunctor {
     edm::ParameterSetDescription desc;
 
     desc.ifValue(
-        edm::ParameterDescription<std::string>("version", "RUN3Scouting", true, edm::Comment("")), //default "version"
-        edm::allowedValues<std::string>("RUN3Scouting")); //more options about "version"
-    desc.ifValue(edm::ParameterDescription<std::string>("quality", "TIGHT", true, edm::Comment("")), //default "quality"
-                 edm::allowedValues<std::string>("TIGHT", "TIGHTLEPVETO")); //more options about "quality"
+        edm::ParameterDescription<std::string>("version", "RUN3Scouting", true, edm::Comment("")),  //default "version"
+        edm::allowedValues<std::string>("RUN3Scouting"));  //more options about "version"
+    desc.ifValue(
+        edm::ParameterDescription<std::string>("quality", "TIGHT", true, edm::Comment("")),  //default "quality"
+        edm::allowedValues<std::string>("TIGHT", "TIGHTLEPVETO"));  //more options about "quality"
     desc.addOptional<std::vector<std::string>>("cutsToIgnore")->setComment("");
 
     return desc;
   }
 
- 
   bool operator()(const Run3ScoutingPFJet &jet) {
-
     // cache some variables
     //float pt = 0.0;
     float eta = 0.0;
@@ -107,18 +105,20 @@ class Run3ScoutingPFJetIDSelectionFunctor {
       eta = scoutingpfjet->eta();
       //phi = scoutingpfjet->phi();
       double jetEnergyUncorrected = scoutingpfjet->chargedHadronEnergy() + scoutingpfjet->neutralHadronEnergy() +
-                                    scoutingpfjet->photonEnergy() + scoutingpfjet->electronEnergy() + scoutingpfjet->muonEnergy() +
-                                    scoutingpfjet->HFEMEnergy();
+                                    scoutingpfjet->photonEnergy() + scoutingpfjet->electronEnergy() +
+                                    scoutingpfjet->muonEnergy() + scoutingpfjet->HFEMEnergy();
       if (jetEnergyUncorrected > 0.) {
         chf = scoutingpfjet->chargedHadronEnergy() / jetEnergyUncorrected;
         nhf = scoutingpfjet->neutralHadronEnergy() / jetEnergyUncorrected;
         //cef= scoutingpfjet->electronEnergy() / jetEnergyUncorrected;  // for now: electron energy is 0, since HLT scouting jets by construction don't contain electrons
         nef = (scoutingpfjet->photonEnergy() + scoutingpfjet->HFEMEnergy()) / jetEnergyUncorrected;
         muf = scoutingpfjet->muonEnergy() / jetEnergyUncorrected;
       }
-      
+
       nch = scoutingpfjet->chargedHadronMultiplicity() + scoutingpfjet->electronMultiplicity();
-      nconstituents = scoutingpfjet->chargedHadronMultiplicity() + scoutingpfjet->electronMultiplicity() + scoutingpfjet->neutralHadronMultiplicity() + scoutingpfjet->photonMultiplicity() + scoutingpfjet->HFEMMultiplicity();
+      nconstituents = scoutingpfjet->chargedHadronMultiplicity() + scoutingpfjet->electronMultiplicity() +
+                      scoutingpfjet->neutralHadronMultiplicity() + scoutingpfjet->photonMultiplicity() +
+                      scoutingpfjet->HFEMMultiplicity();
       //nneutrals = scoutingpfjet->neutralHadronMultiplicity() + scoutingpfjet->photonMultiplicity() + scoutingpfjet->HFEMMultiplicity();
     }
 
@@ -159,7 +159,6 @@ class Run3ScoutingPFJetIDSelectionFunctor {
   }
 
 private:  // member variables
-
   int nConstituents_ = 0;
   double CHF_ = 0.0;
   double NHF_ = 0.0;
@@ -170,7 +169,7 @@ class Run3ScoutingPFJetIDSelectionFunctor {
   double MUF_TR_ = 0.0;
   double NEF_EC_ = 0.0;
   double NEF_FW_ = 0.0;
-  
+
   void initCuts() {
     if (quality_ == TIGHT) {
       if (version_ == RUN3Scouting) {
@@ -200,10 +199,8 @@ class Run3ScoutingPFJetIDSelectionFunctor {
     }
   }
 
-
   Version_t version_;
   Quality_t quality_;
-
 };
 
 #endif