Ntuples93x

AnalysisFW/interface/QCDEvent.h

@@ -5,7 +5,6 @@
 #define QCDEvent_h
 #include "SMPJ/AnalysisFW/interface/QCDJet.h"
 #include "SMPJ/AnalysisFW/interface/QCDMET.h"
-#include "SMPJ/AnalysisFW/interface/QCDCaloJet.h"
 #include "SMPJ/AnalysisFW/interface/QCDPFJet.h"
 #include "SMPJ/AnalysisFW/interface/QCDEventHdr.h"
 #include "DataFormats/JetReco/interface/Jet.h"
@@ -20,99 +19,59 @@ class QCDEvent
       //------------ Destructor -------------------------------
       ~QCDEvent();
       //------------ Set methods ------------------------------
-      void setCaloMET(const QCDMET& fCaloMET)                     {CaloMet_ = fCaloMET;}
       void setPFMET(const QCDMET& fPFMET)                         {PFMet_ = fPFMET;}
       void setEvtHdr(const QCDEventHdr& fEvtHdr)                  {EvtHdr_ = fEvtHdr;}
-      void setCaloJets(const std::vector<QCDCaloJet>& fCaloJets);
-      void setPFJets(const std::vector<QCDPFJet>& fPFJets);
       void setPFJetsCHS(const std::vector<QCDPFJet>& fPFJetsCHS);
-      //void setFatJets(const std::vector<QCDJet>& fFatJets);
+
       void setGenJets(const std::vector<LorentzVector>& fGenJets);
-      void setL1Obj(const std::vector<std::vector<LorentzVector> >& fL1Obj);
       void setHLTObj(const std::vector<std::vector<LorentzVector> >& fHLTObj);
-      void setFilterId(const std::vector<std::vector<int> >& filterIdList) {filterIdList_ = filterIdList;}
       void setPrescales(const std::vector<int>& fPreL1, const std::vector<int>& fPreHLT) {L1Prescale_ = fPreL1; HLTPrescale_ = fPreHLT;}
       void setTrigDecision(const std::vector<int>& fTrigDecision) {TriggerDecision_ = fTrigDecision;}
-      void setTrigPathList(const std::vector<std::string>& trigPathList) {triggerList_ = trigPathList;}
 
       void setGenFlavour(const std::vector<float> GenFlavour){ genFlavour_= GenFlavour; }
       void setGenHadronFlavour(const std::vector<float> GenFlavourHadron){ genFlavourHadron_= GenFlavourHadron; }
 
       //------------ Get methods -------------------------------
       unsigned int nTriggers()                         const {return TriggerDecision_.size();}
-      unsigned int nL1Obj(int i)                       const {return L1Obj_[i].size();}
       unsigned int nHLTObj(int i)                      const {return HLTObj_[i].size();}
-      unsigned int nPFJets()                           const {return PFJets_.size();}
       unsigned int nPFJetsCHS()                        const {return PFJetsCHS_.size();}
-      //unsigned int nFatJets()                          const {return FatJets_.size();}
-      unsigned int nCaloJets()                         const {return CaloJets_.size();}
       unsigned int nGenJets()                          const {return GenJets_.size();}
       int nGoodJets(int unc, int id, float ymax, float ptmin, std::vector<QCDJet> jets);
       int fired(int i)                                 const {return TriggerDecision_[i];}
       int preL1(int i)                                 const {return L1Prescale_[i];}
       int preHLT(int i)                                const {return HLTPrescale_[i];}
-      float pfmjj();
 
       float GenJetFlavour(int i)                       const {return genFlavour_[i];}
       float GenHadronJetFlavour(int i)                       const {return genFlavourHadron_[i];}
 
-      float calomjj();
-      float genmjj();
-      float pfchsmjjcor(int unc);
-      float pfchsmjjcor(int unc,int src);
-      float pfmjjcor(int unc);
-      float pfmjjcor(int unc,int src);
-      //float fatmjjcor(int unc);
-      float calomjjcor(int unc);
-      float pfmjjgen();
-      float calomjjgen();
-      const QCDMET&        calomet()                   const {return CaloMet_;}
       const QCDMET&        pfmet()                     const {return PFMet_;}
       const LorentzVector& hltobj(int itrig, int iobj) const {return (HLTObj_[itrig])[iobj];}
-      const LorentzVector& l1obj(int itrig, int iobj)  const {return (L1Obj_[itrig])[iobj];}
       const LorentzVector& genjet(int i)               const {return GenJets_[i];}
-      const QCDPFJet&      pfjet(int i)                const {return PFJets_[i];}
       const QCDPFJet&      pfjetchs(int i)             const {return PFJetsCHS_[i];}
-      //const QCDJet&        fatjet(int i)               const {return FatJets_[i];}
-      const QCDCaloJet&    calojet(int i)              const {return CaloJets_[i];}
       const QCDEventHdr&   evtHdr()                    const {return EvtHdr_;}
 
       const std::vector<std::vector<LorentzVector>>& HLTObj() const {return HLTObj_;}
-      const std::vector<std::string>& trigPathList() const {return triggerList_;}
-      const std::vector<std::vector<int>>& filterIdList() const {return filterIdList_;}
       const std::vector<LorentzVector>& hltObjsForPath(int i) const {return HLTObj_[i];}
-      const std::vector<int>& filterIdsForPath(int i) const {return filterIdList_[i];}
 
     private:
-      std::vector<std::vector<int> > filterIdList_;
 
       //---- event header (contains all the event info) --------------
       QCDEventHdr                              EvtHdr_;
-      //---- CALO met object -----------------------------------------
-      QCDMET                                   CaloMet_;
-      //---- PF met object -------------------------------------------
+      //---- PF met object -----------------------------------------
       QCDMET                                   PFMet_;
       //---- trigger decision vector ---------------------------------
       std::vector<int>                         TriggerDecision_;
-      std::vector<std::string>                 triggerList_;
       //---- L1 prescale vector --------------------------------------
       std::vector<int>                         L1Prescale_;
       //---- HLT prescale vector -------------------------------------
       std::vector<int>                         HLTPrescale_;
       //---- HLT objects ---------------------------------------------
       std::vector<std::vector<LorentzVector> > HLTObj_;
-      //---- L1 objects ----------------------------------------------
-      std::vector<std::vector<LorentzVector> > L1Obj_;
       //---- Genjets -------------------------------------------------
       std::vector<LorentzVector>               GenJets_;
-      //---- CaloJets ------------------------------------------------
-      std::vector<QCDCaloJet>                  CaloJets_;
-      //---- PFJets --------------------------------------------------
-      std::vector<QCDPFJet>                    PFJets_;
       //---- PFJetsCHS -----------------------------------------------
       std::vector<QCDPFJet>                    PFJetsCHS_;
-      //---- FatJets -------------------------------------------------
-      //std::vector<QCDJet>                      FatJets_;
+
       std::vector<float>  genFlavour_;
       std::vector<float>  genFlavourHadron_;
 

AnalysisFW/interface/QCDEventHdr.h

@@ -2,6 +2,9 @@
 //Modified by: S. Ganguly
 #ifndef QCDEventHdr_h
 #define QCDEventHdr_h
+#include <vector>
+
+using namespace std;
 
 class QCDEventHdr 
 {
@@ -17,12 +20,12 @@ class QCDEventHdr
       void setBunch(int fBunch)                              {mBunch = fBunch;}
       void setPthat(float fPthat)                            {mPthat = fPthat;}
       void setWeight(float fWeight)                          {mWeight = fWeight;} 
+      void setScaleWeight(const std::vector<double> fWeightScale)       {mScaleWeight = fWeightScale;} 
+      void setPDFWeight(const std::vector<double> fWeightPDF)       {mPDFWeight = fWeightPDF;} 
       void setRho(float fCaloRho, float fPFRho)              {mCaloRho = fCaloRho; mPFRho = fPFRho;}
       void setVertices(int fNVtx, int fNVtxGood)             {mNVtx = fNVtx; mNVtxGood = fNVtxGood;}
       void setPV(bool fIsPVgood, float fndof, float fx, float fy, float fz) {mIsPVgood = fIsPVgood; mPVndof = fndof; mPVx = fx; mPVy = fy; mPVz = fz;}
       void setBS(float fBSx, float fBSy, float fBSz) {mBSx = fBSx; mBSy = fBSy; mBSz = fBSz;}
-      void setHCALNoise(bool fNoise) {mHCALNoise = fNoise;}
-      void setHCALNoiseNoMinZ(bool fNoise) {mHCALNoiseNoMinZ = fNoise;}
       void setPU(int fNBX, int fOOTPUEarly, int fOOTPULate, int fINTPU) {mNBX = fNBX; mOOTPUEarly = fOOTPUEarly; mOOTPULate = fOOTPULate; mINTPU = fINTPU;}
       void setTrPu(float fTrPu) {mTrPu = fTrPu;} // setting the true PU 
       //------------ Get methods ------------------------------
@@ -39,8 +42,6 @@ class QCDEventHdr
       int pu()              const {return mOOTPUEarly+mOOTPULate+mINTPU;}
       float trpu()          const {return mTrPu;} // get method for True number of interaction
       bool isPVgood()       const {return mIsPVgood;}
-      bool hcalNoise()      const {return mHCALNoise;}
-      bool hcalNoiseNoMinZ()      const {return mHCALNoiseNoMinZ;}
       float PVndof()        const {return mPVndof;} 
       float PVx()           const {return mPVx;}
       float PVy()           const {return mPVy;}
@@ -50,6 +51,8 @@ class QCDEventHdr
       float BSz()           const {return mBSz;}
       float pthat()         const {return mPthat;}
       float weight()        const {return mWeight;}
+      float weightPDF(int i)        const {return mScaleWeight[i];}
+      float weightScale(int i)        const {return mPDFWeight[i];}
       float caloRho()       const {return mCaloRho;} 
       float pfRho()         const {return mPFRho;} 
       private:
@@ -95,6 +98,8 @@ class QCDEventHdr
         float mPthat;
         //---- simulation weight ----------------------
         float mWeight;
+	std::vector<double> mScaleWeight;
+	std::vector<double> mPDFWeight;
         //---- median CALO pt density -----------------
         float mCaloRho;
         //---- median PF pt density -------------------

AnalysisFW/interface/QCDJet.h

@@ -46,9 +46,7 @@ class QCDJet
      float area()                 const {return area_;} 
      bool  looseID()              const {return looseID_;}
      bool  tightID()              const {return tightID_;}
-  //   int  nParticles()            const {return pfParticles_.size();}
-  //   const LorentzVector& getPFParticles(int i) const {return pfParticles_[i];}
-   private:
+ private:
      //------ jet 4-momentum vector------------------
      LorentzVector P4_;
      //------ matched genjet 4-momentum vector-------
@@ -69,7 +67,6 @@ class QCDJet
      bool  looseID_;
      //------ tight ID flag -------------------------
      bool  tightID_;
-     //------ LorentzVector For PF PARTICLES
-  //   std::vector<LorentzVector> pfParticles_;
+
  };
 #endif

AnalysisFW/interface/QCDMET.h

@@ -13,18 +13,15 @@ class QCDMET
      ~QCDMET() {}
      //------- Set method ------------------------------------
      void setVar(float fEt, float fSumEt, float fPhi) {et_ = fEt; sumEt_ = fSumEt; phi_ = fPhi;} 
-     void setCaloMet(float fCaloMetPt) {CaloMetPt_ = fCaloMetPt;}
      //------- Get methods -----------------------------------
      float met()         const {return et_;}
-     float calometpt()         const {return CaloMetPt_;}
      float phi()         const {return phi_;}
      float sumet()       const {return sumEt_;}
      float met_o_sumet() const {return et_/sumEt_;}
 
    private:
      //---- size of MET vector ----------
      float et_;
-     float CaloMetPt_;
      //---- sumET -----------------------
      float sumEt_;
      //---- phi of MET vector -----------

AnalysisFW/interface/QCDPFJet.h

@@ -4,9 +4,8 @@
 #ifndef QCDPFJet_h
 #define QCDPFJet_h
 #include "SMPJ/AnalysisFW/interface/QCDJet.h"
-#include "SMPJ/AnalysisFW/interface/QCDPFJetBTag.h"
 #include "TLorentzVector.h"
-class QCDPFJet : public QCDPFJetBTag {
+class QCDPFJet : public QCDJet {
    public:
      //------------ Constructor ------------------------------
      QCDPFJet() {chf_=0;nhf_=0;nemf_=0;cemf_=0;muf_=0;chm_=0;nhm_=0;phm_=0;elm_=0;mum_=0;
@@ -24,17 +23,24 @@ class QCDPFJet : public QCDPFJetBTag {
      void setVtxInfo(int mpuTrk, int mlvTrk, int mjtTrk) { mpuTrk_ = mpuTrk; mlvTrk_ = mlvTrk; mjtTrk_ = mjtTrk;} // Juska
      void setHO(float hof) {hof_ = hof;} // Juska
      void SetPUJetId(float pujid) { pujid_ = pujid; }
-     void SetCaloJetPt(float calojetpt) { calojetpt_ = calojetpt; }
-     void SetCaloJetEf(float calojetef) { calojetef_ = calojetef; }   
-
-    /*
-     void setPFParticles(std::vector<LorentzVector>& fpfFParticles) {
-      for(unsigned i=0; i<fpfFParticles.size(); i++)
-       {
-        pfParticles_.push_back(fpfFParticles[i]);
-      }
-     } // setPFParticles
-     */
+
+     void setTagRecommended(float recommend1, float recommend2, float recommend3) { recommend1_ = recommend1; recommend2_ = recommend2; recommend3_ = recommend3; }
+
+     void setFlavour(float fpartonflavour, float fhadronflavour) {partonFlavour_ = fpartonflavour; hadronFlavour_ = fhadronflavour;}
+
+     void setQGTagger(float fQGTagger) {QGtagger_ = fQGTagger;}
+
+     //------------ Get methods ------------------------------                                                                                                                                           
+
+     float partonflavour()      const {return partonFlavour_;}
+     float hadronflavour()      const {return hadronFlavour_;}
+
+     float qgtagger()      const {return QGtagger_;}
+
+     float pfJetProbabilityBJetTags() const {return recommend1_;}
+     float pfCombinedInclusiveSecondaryVertexV2BJetTags() const {return recommend2_;}
+     float pfCombinedMVAV2BJetTags() const {return recommend2_;}
+
 
      //------------ Get methods ------------------------------
      float beta()     const {return beta_;}
@@ -54,10 +60,6 @@ class QCDPFJet : public QCDPFJetBTag {
      int hf_hm()      const {return hf_hm_;}
      int hf_phm()     const {return hf_phm_;}
      int ncand()      const {return ncand_;}
-     float CaloJetPt() const {return calojetpt_;}
-     float CaloJetEf() const {return calojetef_;}
- //    int nParticles() const {return pfParticles_.size();}
- //    const LorentzVector& getPFParticles(int i) const {return pfParticles_[i];}
 
      int mpuTrk()     const {return mpuTrk_;} // Juska
      int mlvTrk()     const {return mlvTrk_;} //
@@ -113,8 +115,14 @@ class QCDPFJet : public QCDPFJetBTag {
 
      float pujid_;
 
-     float calojetpt_;
-     float calojetef_;
+     //from B-tag
+     float QGtagger_;
+
+     float partonFlavour_;
+     float hadronFlavour_;
+     float recommend1_;
+     float recommend2_;
+     float recommend3_;
 
     };
 #endif

AnalysisFW/interface/QCDPFJetBTag.h

@@ -19,6 +19,8 @@ class QCDPFJetBTag : public QCDJet {
 
      void setPositiveNegativeCSV(float fcsvpfpositive, float fcsvpfnegative) { CSVpfPositive_ = fcsvpfpositive; CSVpfNegative_ = fcsvpfnegative;}
 
+     void setTagRecommended(float recommend1, float recommend2, float recommend3) { recommend1_ = recommend1; recommend2_ = recommend2; recommend3_ = recommend3; } 
+
      void setFlavour(float fpartonflavour, float fhadronflavour) {partonFlavour_ = fpartonflavour; hadronFlavour_ = fhadronflavour;}
 
      //------------ Get methods ------------------------------
@@ -46,6 +48,10 @@ class QCDPFJetBTag : public QCDJet {
      float partonflavour()      const {return partonFlavour_;}
      float hadronflavour()      const {return hadronFlavour_;}
 
+     float pfJetProbabilityBJetTags() const {return recommend1_;}
+     float pfCombinedInclusiveSecondaryVertexV2BJetTags() const {return recommend2_;}
+     float pfCombinedMVAV2BJetTags() const {return recommend2_;}
+
    private:
      float TCHE_;
      float TCHP_;
@@ -69,6 +75,9 @@ class QCDPFJetBTag : public QCDJet {
 
      float partonFlavour_;
      float hadronFlavour_;
+     float recommend1_;
+     float recommend2_;
+     float recommend3_;
 
     };
 #endif