cmkuo · jainshilpi · Sep 9, 2017 · Sep 9, 2017 · Sep 9, 2017 · Sep 9, 2017
diff --git a/README.md b/README.md
@@ -1,61 +1,20 @@
-#### Current production tag : V08_00_26_03
+#### Current production tag : 
 #### Newest tag for testing : 
-#### Note that the current head version can be run with CMSSW_8_0_26_patch1
+#### Note that the current head version can be run with CMSSW_9_4_9
 
-##### To work with CMSSW_8_0_26_patch1 and head version, you do :
-cd CMSSW_8_0_26_patch1/src <br>
+##### To work with CMSSW_9_4_9 and head version, you do :
+cmsrel CMSSW_9_4_9_cand2 <br>
+cd CMSSW_9_4_9_cand2/src <br>
 cmsenv <br>
-setenv CMSSW_GIT_REFERENCE /cvmfs/cms.cern.ch/cmssw.git.daily <br>
 git cms-init <br>
-git remote add btv-cmssw https://github.com/cms-btv-pog/cmssw.git <br>
-git fetch --tags btv-cmssw <br>
-git cms-merge-topic -u cms-btv-pog:BoostedDoubleSVTaggerV4-WithWeightFiles-v1_from-CMSSW_8_0_21 <br>
-git cms-merge-topic rafaellopesdesa:RegressionCheckNegEnergy <br>
-git cms-merge-topic cms-egamma:EGM_gain_v1 <br>
-cd EgammaAnalysis/ElectronTools/data <br>
-git clone -b Moriond17_gainSwitch_unc https://github.com/ECALELFS/ScalesSmearings.git <br>
+git cms-merge-topic cms-egamma:EgammaPostRecoTools_940 <br>
+scram b -j 8 <br>
+git cms-merge-topic cms-met:METFixEE2017_949 <br>
+scram b -j 8 <br>
 cd $CMSSW_BASE/src <br>
-git cms-merge-topic cms-met:METRecipe_8020 -u <br>
-git cms-merge-topic cms-met:METRecipe_80X_part2 -u <br>
-git cms-merge-topic Sam-Harper:HEEPV70VID_8010_ReducedCheckout <br>
-git cms-merge-topic Sam-Harper:PackedCandNoPuppi <br>
-git cms-merge-topic ikrav:egm_id_80X_v2 <br>
-git cms-merge-topic ikrav:egm_id_80X_v3_photons <br>
 git clone https://github.com/cmkuo/HiggsAnalysis.git <br>
-git clone -b V08_00_26_03 https://github.com/cmkuo/ggAnalysis.git <br>
-
-scram b -j 10 <br>
-
-##### To work with CMSSW_8_0_26_patch1 and V08_00_26_01, you do :
-cd CMSSW_8_0_26_patch1/src <br>
-cmsenv <br>
-setenv CMSSW_GIT_REFERENCE /cvmfs/cms.cern.ch/cmssw.git.daily <br>
-git cms-init <br>
-git remote add btv-cmssw https://github.com/cms-btv-pog/cmssw.git <br>
-git fetch --tags btv-cmssw <br>
-git cms-merge-topic -u cms-btv-pog:BoostedDoubleSVTaggerV4-WithWeightFiles-v1_from-CMSSW_8_0_21 <br>
-git cms-merge-topic rafaellopesdesa:EgammaAnalysis80_EGMSmearer_Moriond17_23Jan <br>
-cd EgammaAnalysis/ElectronTools/data <br>
-git clone git@github.com:ECALELFS/ScalesSmearings.git <br>
-cd ../../../ <br>
-git cms-merge-topic cms-met:METRecipe_8020 -u <br>
-git cms-merge-topic cms-met:METRecipe_80X_part2 -u <br>
-git cms-merge-topic Sam-Harper:HEEPV70VID_8010_ReducedCheckout <br>
-git cms-merge-topic Sam-Harper:PackedCandNoPuppi <br>
-git cms-merge-topic ikrav:egm_id_80X_v2 <br>
-git cms-merge-topic ikrav:egm_id_80X_v3_photons <br>
-git clone https://github.com/cmkuo/HiggsAnalysis.git <br>
-git clone -b V08_00_26_01 https://github.com/cmkuo/ggAnalysis.git <br>
-
-scram b -j 10 <br>
-
-##### To work with CMSSW_7_6_3_patch2, you do:
-cd CMSSW_7_6_3_patch2/src <br>
-cmsenv <br>
-git cms-merge-topic -u matteosan1:smearer_76X <br>
-git clone https://github.com/cmkuo/HiggsAnalysis.git <br>
-git clone -b V07_06_03_01 https://github.com/cmkuo/ggAnalysis.git <br>
-scram b -j 10 <br>
+git clone -b 94X https://github.com/cmkuo/ggAnalysis.git <br>
+scram b -j8 <br>
 
 The above code stores the decision in 64 integer. Each bit represents a decision<br>
 for ELECRON ID: 5 IDs (Veto, Loose, Medium, Tight and HEEP) so only 5 bits are imp for us (59 bits of this integer  we are not using so may be we can change that to 16 bit integer later)<br>

diff --git a/ggNtuplizer/interface/ggNtuplizer.h b/ggNtuplizer/interface/ggNtuplizer.h
@@ -2,6 +2,10 @@
 #define ggNtuplizer_h
 
 #include "TTree.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -24,10 +28,11 @@
 #include "DataFormats/PatCandidates/interface/Jet.h"
 #include "DataFormats/PatCandidates/interface/Tau.h"
 #include "CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h"
-#include "EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h"
+//#include "EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h"
 #include "HiggsAnalysis/HiggsTo2photons/interface/CiCPhotonID.h"
 #include "JetMETCorrections/Modules/interface/JetResolution.h"
 //#include "PhysicsTools/SelectorUtils/interface/PFJetIDSelectionFunctor.h"
+#include "HLTrigger/HLTcore/interface/HLTPrescaleProvider.h"
 
 using namespace std;
 
@@ -48,13 +53,14 @@ class ggNtuplizer : public edm::EDAnalyzer {
   //   virtual void endJob() {};
 
   void initTriggerFilters(const edm::Event&);
-  UInt_t matchSingleElectronTriggerFilters(double pt, double eta, double phi);
-  UInt_t matchDoubleElectronTriggerFilters(double pt, double eta, double phi);
-  UInt_t matchSinglePhotonTriggerFilters(double pt, double eta, double phi);
-  UInt_t matchDoublePhotonTriggerFilters(double pt, double eta, double phi);
-  UInt_t matchMuonTriggerFilters(double pt, double eta, double phi);
-  UInt_t matchJetTriggerFilters(double pt, double eta, double phi);
-  UInt_t matchL1TriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchSingleElectronTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchDoubleElectronTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchSinglePhotonTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchDoublePhotonTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchTriplePhotonTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchMuonTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchJetTriggerFilters(double pt, double eta, double phi);
+  ULong64_t matchL1TriggerFilters(double pt, double eta, double phi);
   Double_t deltaPhi(Double_t phi1, Double_t phi2);
   Double_t deltaR(Double_t eta1, Double_t phi1, Double_t eta2, Double_t phi2);
   Double_t getMiniIsolation(edm::Handle<pat::PackedCandidateCollection> pfcands, const reco::Candidate* ptcl,  
@@ -71,6 +77,8 @@ class ggNtuplizer : public edm::EDAnalyzer {
   void branchesMuons      (TTree*);
   void branchesTaus       (TTree*);
   void branchesJets       (TTree*);
+  void branchesAK8Jets    (TTree*);
+  void branchesGenJetPart    (TTree*);
 
   void fillGlobalEvent(const edm::Event&, const edm::EventSetup&);
   void fillGenInfo    (const edm::Event&);
@@ -83,25 +91,30 @@ class ggNtuplizer : public edm::EDAnalyzer {
   void fillMuons      (const edm::Event&, math::XYZPoint&, const reco::Vertex);
   void fillTaus       (const edm::Event&);
   void fillJets       (const edm::Event&, const edm::EventSetup&);
+  void fillAK8Jets    (const edm::Event&, const edm::EventSetup&);
 
+  void fillGenJetInfo    (const edm::Event&);
+
   void cleanupPhotons();
 
   bool development_;
   bool addFilterInfoAOD_;  
   bool addFilterInfoMINIAOD_;  
   bool doNoHFMET_;
   bool doGenParticles_;
+
+  bool doGenJets_;
+
   bool runOnParticleGun_;
   bool runOnSherpa_;
-  bool dumpPhotons_;
+  bool dumpPFPhotons_;
   bool dumpTaus_;
   bool dumpJets_;
-  bool dumpSubJets_;
+  bool dumpAK8Jets_;
   bool dumpSoftDrop_;
   bool dumpPDFSystWeight_;
-
-  bool isAOD_;
-  bool runHFElectrons_;
+  bool dumpHFElectrons_;
+  int  year_;
 
   vector<int> newparticles_;
 
@@ -123,9 +136,7 @@ class ggNtuplizer : public edm::EDAnalyzer {
   edm::EDGetTokenT<vector<reco::GenParticle> >     genParticlesCollection_;
   edm::EDGetTokenT<edm::View<pat::MET> >           pfMETlabel_;
   edm::EDGetTokenT<edm::View<pat::Electron> >      electronCollection_;
-  edm::EDGetTokenT<edm::View<pat::Electron> >      calibelectronCollection_;
   edm::EDGetTokenT<edm::View<pat::Photon> >        photonCollection_;
-  edm::EDGetTokenT<edm::View<pat::Photon> >        calibphotonCollection_;
   edm::EDGetTokenT<edm::View<pat::Muon> >          muonCollection_;
   edm::EDGetTokenT<vector<pat::Tau> >              tauCollection_;
   edm::EDGetTokenT<EcalRecHitCollection>           ebReducedRecHitCollection_;
@@ -143,40 +154,12 @@ class ggNtuplizer : public edm::EDAnalyzer {
   edm::EDGetTokenT<reco::JetTagCollection>         boostedDoubleSVLabel_;
   edm::EDGetTokenT<pat::PackedCandidateCollection> pckPFCandidateCollection_;
 
+  edm::EDGetTokenT<std::vector<reco::GenJet> >      GenJetLabel_;
+
   // for MET filters
   edm::EDGetTokenT<bool> BadChCandFilterToken_;
   edm::EDGetTokenT<bool> BadPFMuonFilterToken_;
 
-  ///Photon ID in VID framework - 11th May, 2015
-  // photon ID decision objects and isolations
-  edm::EDGetTokenT<edm::ValueMap<bool> >  phoLooseIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  phoMediumIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  phoTightIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoMVAValuesMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedIsolationToken_; 
-  edm::EDGetTokenT<edm::ValueMap<float> > phoNeutralHadronIsolationToken_; 
-  edm::EDGetTokenT<edm::ValueMap<float> > phoPhotonIsolationToken_; 
-  edm::EDGetTokenT<edm::ValueMap<float> > phoWorstChargedIsolationToken_; 
-  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedIsolationToken_CITK_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoNeutralHadronIsolationToken_CITK_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoPhotonIsolationToken_CITK_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedIsolationToken_PUPPI_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoNeutralHadronIsolationToken_PUPPI_;
-  edm::EDGetTokenT<edm::ValueMap<float> > phoPhotonIsolationToken_PUPPI_;
-
-  // elecontr ID decisions objects
-  edm::EDGetTokenT<edm::ValueMap<bool> >  eleVetoIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  eleLooseIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  eleMediumIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  eleTightIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  eleHLTIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<bool> >  eleHEEPIdMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<float> > eleMVAValuesMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<float> > eleMVAHZZValuesMapToken_;
-  edm::EDGetTokenT<edm::ValueMap<float> > elePFClusEcalIsoToken_;
-  edm::EDGetTokenT<edm::ValueMap<float> > elePFClusHcalIsoToken_;
-  edm::EDGetTokenT<reco::PFCandidateCollection> pfCandidateCollection_;
-
   //check
   edm::EDGetToken gsfEle_;
 
@@ -188,17 +171,18 @@ class ggNtuplizer : public edm::EDAnalyzer {
   TH1F    *hSumGenWeight_;
 
   CiCPhotonID                 *cicPhotonId_;
-  EnergyScaleCorrection_class *egmScaler_;
+  //EnergyScaleCorrection_class *egmScaler_;
 
   JME::JetResolution            jetResolution_;
   JME::JetResolutionScaleFactor jetResolutionSF_;
   JME::JetResolution            AK8jetResolution_;
   JME::JetResolutionScaleFactor AK8jetResolutionSF_;
 
   //PFJetIDSelectionFunctor pfLooseId_;
-  boost::shared_ptr<FactorizedJetCorrector> jecAK8_;
-  boost::shared_ptr<FactorizedJetCorrector> jecAK8pSD_;
-  std::vector<std::string> jecAK8PayloadNames_;
+  //boost::shared_ptr<FactorizedJetCorrector> jecAK8_;
+  //boost::shared_ptr<FactorizedJetCorrector> jecAK8pSD_;
+  //std::vector<std::string> jecAK8PayloadNames_;
+  HLTPrescaleProvider hltPrescaleProvider_;
 };
 
 #endif
diff --git a/ggNtuplizer/plugins/BuildFile.xml b/ggNtuplizer/plugins/BuildFile.xml
@@ -12,6 +12,7 @@
 <use name="HiggsAnalysis/HiggsTo2photons"/>
 <use name="RecoEcal/EgammaCoreTools"/>
 <use name="RecoEgamma/PhotonIdentification"/>
+<use name="RecoParticleFlow/PFClusterTools"/>
 <use name="CondFormats/JetMETObjects"/>
 <use name="JetMETCorrections/Objects"/>
 <use name="JetMETCorrections/Modules"/>