Skip to content

Commit

Permalink
Merge pull request #1 from cms-analysis/dev_legacy_runII
Browse files Browse the repository at this point in the history
Pull
  • Loading branch information
alesauva authored Jan 11, 2021
2 parents 79db64e + ec4ff1e commit d092b53
Show file tree
Hide file tree
Showing 69 changed files with 1,676,385 additions and 615,368 deletions.
107 changes: 107 additions & 0 deletions DataFormats/interface/GluGluHMVAResult.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
#ifndef FLASHgg_GluGluHMVAResult_h
#define FLASHgg_GluGluHMVAResult_h

#include "DataFormats/Common/interface/Ptr.h"
#include "flashgg/DataFormats/interface/DiPhotonCandidate.h"
#include "flashgg/DataFormats/interface/Jet.h"

namespace flashgg {

class GluGluHMVAResult
{

public:
GluGluHMVAResult();
GluGluHMVAResult( edm::Ptr<GluGluHMVAResult> );
virtual ~GluGluHMVAResult() {}
// diJet Info
//flashgg::Jet leadJet;
//flashgg::Jet subleadJet;
// 3rd jet
//flashgg::Jet subsubleadJet;
reco::Candidate::LorentzVector leadJet;
reco::Candidate::LorentzVector subleadJet;
reco::Candidate::LorentzVector subsubleadJet;

edm::Ptr<flashgg::Jet> leadJet_ptr;
edm::Ptr<flashgg::Jet> subleadJet_ptr;
// 3rd jet
edm::Ptr<flashgg::Jet> subsubleadJet_ptr;
// 4-vec of the 3 jets


// di-photon info
// flashgg::DiPhotonCandidate diphoton;


// Input variables - jets
int n_rec_jets;
int dijet_Mjj;
float dijet_leadEta;
float dijet_subleadEta;
float dijet_subsubleadEta;
float dijet_leadJPt;
float dijet_SubleadJPt;
float dijet_SubsubleadJPt;
float dijet_leadPUMVA;
float dijet_subleadPUMVA;
float dijet_subsubleadPUMVA;
float dijet_leadDeltaPhi;
float dijet_subleadDeltaPhi;
float dijet_subsubleadDeltaPhi;
float dijet_leadDeltaEta;
float dijet_subleadDeltaEta;
float dijet_subsubleadDeltaEta;

// Input variables - diphoton
float dipho_leadIDMVA;
float dipho_subleadIDMVA;
float dipho_lead_ptoM;
float dipho_sublead_ptoM;
float dipho_leadEta;
float dipho_subleadEta;
float CosPhi;
float vtxprob;
float sigmarv;
float sigmawv;
float diphopt;

//getter fns
float prob_0J_PTH_0_10() const {return ggHMVAResult_prob_0J_PTH_0_10;}
float prob_0J_PTH_GT10() const {return ggHMVAResult_prob_0J_PTH_GT10;}
float prob_1J_PTH_0_60() const {return ggHMVAResult_prob_1J_PTH_0_60;}
float prob_1J_PTH_60_120() const {return ggHMVAResult_prob_1J_PTH_60_120;}
float prob_1J_PTH_120_200() const {return ggHMVAResult_prob_1J_PTH_120_200;}
float prob_GE2J_MJJ_0_350_PTH_0_60() const {return ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_0_60;}
float prob_GE2J_MJJ_0_350_PTH_60_120() const {return ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_60_120;}
float prob_GE2J_MJJ_0_350_PTH_120_200() const {return ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_120_200;}
float prob_PTH_GT200() const {return ggHMVAResult_prob_PTH_GT200;}

float transformedMvaValue(float result) const {return 1. / ( 1. + exp( 0.5*log( 2./(result+1.) - 1 ) ) );}

// Output
float ggHMVAResult_prob_0J_PTH_0_10;
float ggHMVAResult_prob_0J_PTH_GT10;
float ggHMVAResult_prob_1J_PTH_0_60;
float ggHMVAResult_prob_1J_PTH_60_120;
float ggHMVAResult_prob_1J_PTH_120_200;
float ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_0_60;
float ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_60_120;
float ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_120_200;
float ggHMVAResult_prob_PTH_GT200;

};

typedef std::map<edm::Ptr<DiPhotonCandidate>, GluGluHMVAResult> GluGluHMVAResultMap;

}

#endif
// Local Variables:
// mode:c++
// indent-tabs-mode:nil
// tab-width:4
// c-basic-offset:4
// End:
// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

7 changes: 5 additions & 2 deletions DataFormats/interface/StageOneCombinedTag.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "flashgg/DataFormats/interface/DiPhotonMVAResult.h"
#include "flashgg/DataFormats/interface/VBFMVAResult.h"
#include "flashgg/DataFormats/interface/VHhadMVAResult.h"
#include "flashgg/DataFormats/interface/GluGluHMVAResult.h"
#include "flashgg/DataFormats/interface/Jet.h"

namespace flashgg {
Expand All @@ -17,18 +18,20 @@ namespace flashgg {

StageOneCombinedTag( edm::Ptr<DiPhotonCandidate>, edm::Ptr<DiPhotonMVAResult> );
StageOneCombinedTag( edm::Ptr<DiPhotonCandidate>, DiPhotonMVAResult );
StageOneCombinedTag( edm::Ptr<DiPhotonCandidate>, edm::Ptr<DiPhotonMVAResult>, edm::Ptr<VBFMVAResult>, edm::Ptr<VHhadMVAResult> );
StageOneCombinedTag( edm::Ptr<DiPhotonCandidate>, DiPhotonMVAResult, VBFMVAResult, VHhadMVAResult );
StageOneCombinedTag( edm::Ptr<DiPhotonCandidate>, edm::Ptr<DiPhotonMVAResult>, edm::Ptr<VBFMVAResult>, edm::Ptr<VHhadMVAResult>, edm::Ptr<GluGluHMVAResult> );
StageOneCombinedTag( edm::Ptr<DiPhotonCandidate>, DiPhotonMVAResult, VBFMVAResult, VHhadMVAResult, GluGluHMVAResult );

StageOneCombinedTag *clone() const override { return ( new StageOneCombinedTag( *this ) ); }

DiPhotonTagBase::tag_t tagEnum() const override {return DiPhotonTagBase::kStageOneCombined; }

const VBFMVAResult VBFMVA() const;
const VHhadMVAResult VHhadMVA() const;
const GluGluHMVAResult GluGluHMVA() const;
private:
VBFMVAResult vbfmva_result_;
VHhadMVAResult vhhadmva_result_;
GluGluHMVAResult gghmva_result_;

};

Expand Down
113 changes: 113 additions & 0 deletions DataFormats/src/GluGluHMVAResult.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
#include "flashgg/DataFormats/interface/GluGluHMVAResult.h"


namespace flashgg {
GluGluHMVAResult::GluGluHMVAResult () :
leadJet (),
subleadJet (),
subsubleadJet (),
leadJet_ptr (),
subleadJet_ptr (),
subsubleadJet_ptr (),

n_rec_jets (-1.),
dijet_Mjj (-999.),
dijet_leadEta (-999.),
dijet_subleadEta (-999.),
dijet_subsubleadEta (-999.),
dijet_leadJPt (-999.),
dijet_SubleadJPt (-999.),
dijet_SubsubleadJPt (-999.),
dijet_leadPUMVA (-999.),
dijet_subleadPUMVA (-999.),
dijet_subsubleadPUMVA (-999.),
dijet_leadDeltaPhi (-999.),
dijet_subleadDeltaPhi (-999.),
dijet_subsubleadDeltaPhi (-999.),
dijet_leadDeltaEta (-999.),
dijet_subleadDeltaEta (-999.),
dijet_subsubleadDeltaEta (-999.),

dipho_leadIDMVA (-999.),
dipho_subleadIDMVA (-999.),
dipho_lead_ptoM (-999.),
dipho_sublead_ptoM (-999.),
dipho_leadEta (-999.),
dipho_subleadEta (-999.),
CosPhi (-999.),
vtxprob (-999.),
sigmarv (-999.),
sigmawv (-999.),
diphopt (-999.),

ggHMVAResult_prob_0J_PTH_0_10 (-999.),
ggHMVAResult_prob_0J_PTH_GT10 (-999.),
ggHMVAResult_prob_1J_PTH_0_60 (-999.),
ggHMVAResult_prob_1J_PTH_60_120 (-999.),
ggHMVAResult_prob_1J_PTH_120_200 (-999.),
ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_0_60 (-999.),
ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_60_120 (-999.),
ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_120_200 (-999.),
ggHMVAResult_prob_PTH_GT200 (-999.)

{}

GluGluHMVAResult::GluGluHMVAResult( edm::Ptr<GluGluHMVAResult> x )
{
leadJet = x->leadJet;
subleadJet = x->subleadJet;

leadJet_ptr = x->leadJet_ptr;
subleadJet_ptr = x->subleadJet_ptr;

n_rec_jets = x->n_rec_jets;
dijet_Mjj = x->dijet_Mjj;
dijet_leadEta = x->dijet_leadEta;
dijet_subleadEta = x->dijet_subleadEta;
dijet_subsubleadEta = x->dijet_subsubleadEta;
dijet_leadJPt = x->dijet_leadJPt;
dijet_SubleadJPt = x->dijet_SubleadJPt;
dijet_SubsubleadJPt = x->dijet_SubsubleadJPt;
dijet_leadPUMVA = x->dijet_leadPUMVA;
dijet_subleadPUMVA = x->dijet_subleadPUMVA;
dijet_subsubleadPUMVA = x->dijet_subsubleadPUMVA;
dijet_leadDeltaPhi = x->dijet_leadDeltaPhi;
dijet_subleadDeltaPhi = x->dijet_subleadDeltaPhi;
dijet_subsubleadDeltaPhi = x->dijet_subsubleadDeltaPhi;
dijet_leadDeltaEta = x->dijet_leadDeltaEta;
dijet_subleadDeltaEta = x->dijet_subleadDeltaEta;
dijet_subsubleadDeltaEta = x->dijet_subsubleadDeltaEta;

dipho_leadIDMVA = x->dipho_leadIDMVA;
dipho_subleadIDMVA = x->dipho_subleadIDMVA;
dipho_lead_ptoM = x->dipho_lead_ptoM;
dipho_sublead_ptoM = x->dipho_sublead_ptoM;
dipho_leadEta = x->dipho_leadEta;
dipho_subleadEta = x->dipho_subleadEta;
CosPhi = x->CosPhi;
vtxprob = x->vtxprob;
sigmarv = x->sigmarv;
sigmawv = x->sigmawv;
diphopt = x->diphopt;

ggHMVAResult_prob_0J_PTH_0_10 = x->ggHMVAResult_prob_0J_PTH_0_10;
ggHMVAResult_prob_0J_PTH_GT10 = x->ggHMVAResult_prob_0J_PTH_GT10;
ggHMVAResult_prob_1J_PTH_0_60 = x->ggHMVAResult_prob_1J_PTH_0_60;
ggHMVAResult_prob_1J_PTH_60_120 = x->ggHMVAResult_prob_1J_PTH_60_120;
ggHMVAResult_prob_1J_PTH_120_200 = x->ggHMVAResult_prob_1J_PTH_120_200;
ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_0_60 = x->ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_0_60;
ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_60_120 = x->ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_60_120;
ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_120_200 = x->ggHMVAResult_prob_GE2J_MJJ_0_350_PTH_120_200;
ggHMVAResult_prob_PTH_GT200 = x->ggHMVAResult_prob_PTH_GT200;


}
}
// Local Variables:
// mode:c++
// indent-tabs-mode:nil
// tab-width:4
// c-basic-offset:4
// End:
// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

12 changes: 9 additions & 3 deletions DataFormats/src/StageOneCombinedTag.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ StageOneCombinedTag::StageOneCombinedTag( edm::Ptr<DiPhotonCandidate> dipho, DiP
DiPhotonTagBase::DiPhotonTagBase( dipho, mvares ) {
}

StageOneCombinedTag::StageOneCombinedTag( edm::Ptr<flashgg::DiPhotonCandidate> diPho, edm::Ptr<DiPhotonMVAResult> mvaRes, edm::Ptr<VBFMVAResult> vbf_mvaRes, edm::Ptr<VHhadMVAResult> vhHad_mvaRes ) :
StageOneCombinedTag::StageOneCombinedTag( diPho, *mvaRes, *vbf_mvaRes, *vhHad_mvaRes ) {}
StageOneCombinedTag::StageOneCombinedTag( edm::Ptr<flashgg::DiPhotonCandidate> diPho, edm::Ptr<DiPhotonMVAResult> mvaRes, edm::Ptr<VBFMVAResult> vbf_mvaRes, edm::Ptr<VHhadMVAResult> vhHad_mvaRes, edm::Ptr<GluGluHMVAResult> ggh_mvaRes ) :
StageOneCombinedTag::StageOneCombinedTag( diPho, *mvaRes, *vbf_mvaRes, *vhHad_mvaRes, *ggh_mvaRes ) {}

StageOneCombinedTag::StageOneCombinedTag( edm::Ptr<DiPhotonCandidate> dipho, DiPhotonMVAResult mvares, VBFMVAResult vbf_mvaRes, VHhadMVAResult vhHad_mvaRes ) :
StageOneCombinedTag::StageOneCombinedTag( edm::Ptr<DiPhotonCandidate> dipho, DiPhotonMVAResult mvares, VBFMVAResult vbf_mvaRes, VHhadMVAResult vhHad_mvaRes, GluGluHMVAResult ggh_mvaRes ) :
StageOneCombinedTag::StageOneCombinedTag( dipho, mvares )
{
vbfmva_result_ = vbf_mvaRes;
vhhadmva_result_ = vhHad_mvaRes;
gghmva_result_ = ggh_mvaRes;
}

const VBFMVAResult StageOneCombinedTag::VBFMVA() const
Expand All @@ -36,6 +37,11 @@ const VHhadMVAResult StageOneCombinedTag::VHhadMVA() const
return vhhadmva_result_;
}

const GluGluHMVAResult StageOneCombinedTag::GluGluHMVA() const
{
return gghmva_result_;
}


// Local Variables:
// mode:c++
Expand Down
5 changes: 5 additions & 0 deletions DataFormats/src/classes.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "flashgg/DataFormats/interface/VBFMVAResult.h"
#include "flashgg/DataFormats/interface/VBFTag.h"
#include "flashgg/DataFormats/interface/VHhadMVAResult.h"
#include "flashgg/DataFormats/interface/GluGluHMVAResult.h"
#include "flashgg/DataFormats/interface/VHHadronicTag.h"
#include "flashgg/DataFormats/interface/VHLooseTag.h"
#include "flashgg/DataFormats/interface/VHTightTag.h"
Expand Down Expand Up @@ -187,6 +188,10 @@ namespace {
std::vector<flashgg::VHhadMVAResult> vec_vhHad_res;
edm::Wrapper<std::vector<flashgg::VHhadMVAResult> > wrp_vec_vhHad_res;

flashgg::GluGluHMVAResult ggh_res;
std::vector<flashgg::GluGluHMVAResult> vec_ggh_res;
edm::Wrapper<std::vector<flashgg::GluGluHMVAResult> > wrp_vec_ggh_res;

flashgg::ZPlusJetTag zpj_res;
std::vector<flashgg::ZPlusJetTag> vec_zpj_res;
edm::Wrapper<std::vector<flashgg::ZPlusJetTag> > wrp_vec_zpj_res;
Expand Down
3 changes: 3 additions & 0 deletions DataFormats/src/classes_def.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
<class name="flashgg::VHhadMVAResult"/>
<class name="std::vector<flashgg::VHhadMVAResult>"/>
<class name="edm::Wrapper<std::vector<flashgg::VHhadMVAResult> >"/>
<class name="flashgg::GluGluHMVAResult"/>
<class name="std::vector<flashgg::GluGluHMVAResult>"/>
<class name="edm::Wrapper<std::vector<flashgg::GluGluHMVAResult> >"/>
<class name="std::vector<flashgg::DiPhotonTagBase>"/>
<class name="edm::Wrapper<std::vector<flashgg::DiPhotonTagBase> >"/>
<class name="flashgg::UntaggedTag" ClassVersion="13">
Expand Down
Loading

0 comments on commit d092b53

Please sign in to comment.