@@ -86,14 +86,14 @@ namespace TopSingleLepton {
8686 // select is optional; in case it's not found no
8787 // selection will be applied
8888 if (muonExtras.existsAs <std::string>(" select"
89- muonSelect_ = std::make_unique<StringCutObjectSelector<reco::Muon>>(
90- muonExtras.getParameter <std::string>(" select"
89+ muonSelect_ =
90+ std::make_unique<StringCutObjectSelector<reco::Muon>>( muonExtras.getParameter <std::string>(" select"
9191 }
9292 // isolation is optional; in case it's not found no
9393 // isolation will be applied
9494 if (muonExtras.existsAs <std::string>(" isolation"
95- muonIso_ = std::make_unique<StringCutObjectSelector<reco::Muon>>(
96- muonExtras.getParameter <std::string>(" isolation"
95+ muonIso_ =
96+ std::make_unique<StringCutObjectSelector<reco::Muon>>( muonExtras.getParameter <std::string>(" isolation"
9797 }
9898 }
9999
@@ -206,7 +206,7 @@ namespace TopSingleLepton {
206206 // multiplicity of jets with pt>30
207207 hists_[" jetMult_" book1D (" JetMult" " N_{30}(jet)" 10 , 0 ., 10 .);
208208 // multiplicity of loose jets with pt>30
209- hists_[" jetMultLoose_" book1D (" JetMultLoose" " N_{30, loose}(jet)" 10 , 0 ., 10 .);
209+ hists_[" jetMultLoose_" book1D (" JetMultLoose" " N_{30,loose}(jet)" 10 , 0 ., 10 .);
210210
211211 // trigger efficiency estimates for single lepton triggers
212212 // hists_["triggerEff_"] = ibooker.book1D("TriggerEff",
@@ -357,7 +357,6 @@ namespace TopSingleLepton {
357357 pvMult++;
358358 }
359359 fill (" pvMult_"
360-
361360 /*
362361 ------------------------------------------------------------
363362
@@ -376,10 +375,10 @@ namespace TopSingleLepton {
376375 // check availability of electron id
377376 edm::Handle<edm::ValueMap<float >> electronId;
378377 if (!electronId_.isUninitialized ()) {
379- if (!event.getByToken (electronId_, electronId))
378+ if (!event.getByToken (electronId_, electronId)) {
380379 return ;
380+ }
381381 }
382-
383382 // loop electron collection
384383 unsigned int eMult = 0 , eMultIso = 0 ;
385384 std::vector<const reco::GsfElectron*> isoElecs;
@@ -530,8 +529,9 @@ namespace TopSingleLepton {
530529 // check availability of the btaggers
531530 edm::Handle<reco::JetTagCollection> btagEff, btagPur, btagVtx, btagCSV;
532531 if (includeBTag_) {
533- if (!event.getByToken (btagCSV_, btagCSV))
532+ if (!event.getByToken (btagCSV_,btagCSV)){
534533 return ;
534+ }
535535 }
536536
537537 // loop jet collection
@@ -555,7 +555,6 @@ namespace TopSingleLepton {
555555 if (!(*jetSelection_)(sel))
556556 continue ;
557557 }
558-
559558 // prepare jet to fill monitor histograms
560559 reco::Jet monitorJet = *jet;
561560
@@ -616,8 +615,9 @@ namespace TopSingleLepton {
616615 continue ;
617616 if (met->begin () != met->end ()) { // If we ever have to use more than one type of met again
618617 unsigned int idx = met_ - mets_.begin ();
619- if (idx == 0 )
618+ if (idx == 0 ) {
620619 fill (" metPflow_" begin ()->et ());
620+ }
621621 }
622622 }
623623
@@ -630,7 +630,6 @@ namespace TopSingleLepton {
630630 */
631631
632632 // fill W boson and top mass estimates
633-
634633 Calculate eventKinematics (MAXJETS, WMASS);
635634 double wMass = eventKinematics.massWBoson (correctedJets);
636635 double topMass = eventKinematics.massTopQuark (correctedJets);
@@ -646,8 +645,9 @@ namespace TopSingleLepton {
646645 if (correctedJets.size () != JetTagValues.size ())
647646 return ;
648647 double btopMass = eventKinematics.massBTopQuark (correctedJets, JetTagValues, btagCSVWP_);
649- if (btopMass >= 0 )
648+ if (btopMass >= 0 ) {
650649 fill (" massBTop_"
650+ }
651651
652652 // fill plots for trigger monitoring
653653 if ((lowerEdge_ == -1 . && upperEdge_ == -1 .) || (lowerEdge_ < wMass && wMass < upperEdge_)) {
@@ -686,7 +686,9 @@ TopSingleLeptonDQM::TopSingleLeptonDQM(const edm::ParameterSet& cfg)
686686 JetSteps.clear ();
687687 CaloJetSteps.clear ();
688688 PFJetSteps.clear ();
689+
689690 // configure preselection
691+
690692 edm::ParameterSet presel = cfg.getParameter <edm::ParameterSet>(" preselection"
691693 if (presel.existsAs <edm::ParameterSet>(" trigger"
692694 edm::ParameterSet trigger = presel.getParameter <edm::ParameterSet>(" trigger"
@@ -748,19 +750,23 @@ void TopSingleLeptonDQM::bookHistograms(DQMStore::IBooker& ibooker, edm::Run con
748750void TopSingleLeptonDQM::analyze (const edm::Event& event, const edm::EventSetup& setup) {
749751 if (!triggerTable__.isUninitialized ()) {
750752 edm::Handle<edm::TriggerResults> triggerTable;
751- if (!event.getByToken (triggerTable__, triggerTable))
753+ if (!event.getByToken (triggerTable__, triggerTable)) {
752754 return ;
753- if (!accept (event, *triggerTable, triggerPaths_))
755+ }
756+ if (!accept (event, *triggerTable, triggerPaths_)) {
754757 return ;
758+ }
755759 }
756760 if (!beamspot__.isUninitialized ()) {
757761 edm::Handle<reco::BeamSpot> beamspot;
758- if (!event.getByToken (beamspot__, beamspot))
762+ if (!event.getByToken (beamspot__, beamspot)) {
759763 return ;
760- if (!(*beamspotSelect_)(*beamspot))
764+ }
765+ if (!(*beamspotSelect_)(*beamspot)) {
761766 return ;
767+ }
762768 }
763- // cout<<" apply selection steps"<<endl;
769+ // apply selection steps
764770 unsigned int nJetSteps = -1 ;
765771 unsigned int nPFJetSteps = -1 ;
766772 unsigned int nCaloJetSteps = -1 ;
@@ -773,65 +779,62 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup&
773779 }
774780 if (type == " muons" nullptr ) {
775781 if (MuonStep->select (event)) {
776- // cout<<"selected event! "<<selection_[key].second<<endl;
777782 selection_[key].second ->fill (event, setup);
778- } else
783+ } else {
779784 break ;
785+ }
780786 }
781- // cout<<" apply selection steps 2"<<endl;
782787 if (type == " elecs" nullptr ) {
783- // cout<<"In electrons ..."<<endl;
784788 if (ElectronStep->select (event, " electron"
785789 selection_[key].second ->fill (event, setup);
786- } else
790+ } else {
787791 break ;
792+ }
788793 }
789- // cout<<" apply selection steps 3"<<endl;
790794 if (type == " pvs" nullptr ) {
791795 if (PvStep->selectVertex (event)) {
792796 selection_[key].second ->fill (event, setup);
793- } else
797+ } else {
794798 break ;
799+ }
795800 }
796- // cout<<" apply selection steps 4"<<endl;
797801 if (type == " jets"
798802 nJetSteps++;
799803 if (JetSteps[nJetSteps] != nullptr ) {
800804 if (JetSteps[nJetSteps]->select (event, setup)) {
801805 selection_[key].second ->fill (event, setup);
802- } else
806+ } else {
803807 break ;
808+ }
804809 }
805810 }
806811 if (type == " jets/pf"
807812 nPFJetSteps++;
808813 if (PFJetSteps[nPFJetSteps] != nullptr ) {
809814 if (PFJetSteps[nPFJetSteps]->select (event, setup)) {
810815 selection_[key].second ->fill (event, setup);
811- } else
816+ } else {
812817 break ;
818+ }
813819 }
814820 }
815821 if (type == " jets/calo"
816822 nCaloJetSteps++;
817823 if (CaloJetSteps[nCaloJetSteps] != nullptr ) {
818824 if (CaloJetSteps[nCaloJetSteps]->select (event, setup)) {
819825 selection_[key].second ->fill (event, setup);
820- } else
826+ } else {
821827 break ;
828+ }
822829 }
823830 }
824831 if (type == " met" nullptr ) {
825832 if (METStep->select (event)) {
826833 selection_[key].second ->fill (event, setup);
827- } else
834+ } else {
828835 break ;
836+ }
829837 }
830838 }
831839 }
832840}
833-
834- // Local Variables:
835- // show-trailing-whitespace: t
836- // truncate-lines: t
837- // End:
0 commit comments