Skip to content

Commit

Permalink
Merge pull request #96 from rsmith54/feature/outputGeV
Browse files Browse the repository at this point in the history 
Feature/output ge v
  • Loading branch information
@rsmith54
rsmith54 committed Mar 30, 2016
2 parents 7687d09 + 955d552 commit 114bd14
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 177 deletions.
5 changes: 3 additions & 2 deletions Root/RJigsawCalculator_compressed.cxx
View file
Expand Up @@ -184,13 +184,14 @@ EL::StatusCode RJigsawCalculator_compressed::doCalculate(std::map<std::string, d
float const m_RPT_HT1CM = m_temp_RPT_HT1CM ;
float const m_MS = m_temp_MS;

auto toGeV = [](float a){return a*.001;};

RJVars[ "HT1CM"] = m_HT1CM;
RJVars[ "HT1CM"] = toGeV(m_HT1CM);
RJVars[ "PIoHT1CM"] = m_PIoHT1CM;
RJVars[ "cosS"] = m_cosS;
RJVars[ "NVS"] = m_NVS;
RJVars[ "RPT_HT1CM"] = m_RPT_HT1CM;
RJVars[ "MS"] = m_MS;
RJVars[ "MS"] = toGeV(m_MS);


return EL::StatusCode::SUCCESS;
Expand Down
8 changes: 5 additions & 3 deletions Root/RJigsawCalculator_lvlv.cxx
View file
Expand Up @@ -183,8 +183,7 @@ EL::StatusCode RJigsawCalculator_lvlv::doCalculate(std::map<std::string, double>
double const MH = H_R->GetMass();
double const MW = Wa_R->GetMass();

RJVars["mH"] = MH;
RJVars["mW"] = MW;
auto toGeV = [](float a){return a*.001;};

TLorentzVector pll = vecParticles.at(0)+vecParticles.at(1);
pll.SetPz(0);
Expand All @@ -193,7 +192,10 @@ EL::StatusCode RJigsawCalculator_lvlv::doCalculate(std::map<std::string, double>
double secondterm = (pll.Vect()+vecMet).Mag() * (pll.Vect()+vecMet).Mag();
double MT = TMath::Sqrt( (Ell+pvv)*(Ell+pvv) - secondterm );

RJVars["mT"] = MT;

RJVars["mH"] = toGeV(MH);
RJVars["mW"] = toGeV(MW);
RJVars["mT"] = toGeV(MT);

return EL::StatusCode::SUCCESS;
}
80 changes: 39 additions & 41 deletions Root/RJigsawCalculator_tls.cxx
View file
Expand Up @@ -917,54 +917,53 @@ EL::StatusCode RJigsawCalculator_tls::doCalculate(std::map<std::string, double>&
int m_sameHemi_lep = 0;
if(temp_Nlep_a == 2||temp_Nlep_b ==2){m_sameHemi_lep = 1;}

auto toGeV = [](float a){return a*.001;};

RJVars[ "isSameHemi" ] = m_sameHemi_lep;
RJVars[ "NLepS" ] = m_temp_NLepS;
RJVars[ "NLepS" ] = m_temp_NLepS;

RJVars[ "HT1CM"] = m_HT1CM;
RJVars[ "HT1CM"] = toGeV(m_HT1CM);
RJVars[ "PIoHT1CM"] = m_PIoHT1CM;
RJVars[ "cosS"] = m_cosS;
RJVars[ "NVS"] = m_NVS;
RJVars[ "RPT_HT1CM"] = m_RPT_HT1CM;
RJVars[ "MS"] = m_MS;
RJVars[ "MS"] = toGeV(m_MS);
RJVars[ "dphiCMV"] = m_dphiCMV;

RJVars[ "dphiCML_0" ] = m_dphiCML_0 ;
RJVars[ "MTCM_L_0" ] = m_MTCM_L_0 ;
RJVars[ "MTCM_L_0" ] = toGeV(m_MTCM_L_0) ;
RJVars[ "cosLINV_0" ] = m_cosLINV_0 ;
RJVars[ "dphiCML_1" ] = m_dphiCML_1 ;
RJVars[ "MTCM_L_1" ] = m_MTCM_L_1 ;
RJVars[ "MTCM_L_1" ] = toGeV(m_MTCM_L_1) ;
RJVars[ "cosLINV_1" ] = m_cosLINV_1 ;



RJVars[ "ddphiP"] = m_ddphiP;
RJVars[ "ddphiP"] = m_ddphiP;
RJVars[ "sdphiP"] = m_sdphiP;

RJVars[ "pPP_Ia"] = m_pPP_Ia;
RJVars[ "pPP_Ib"] = m_pPP_Ib;

RJVars[ "pT_jet1a"] = m_pT_jet1a;
RJVars[ "pT_jet1b"] = m_pT_jet1b;
RJVars[ "pT_jet2a"] = m_pT_jet2a;
RJVars[ "pT_jet2b"] = m_pT_jet2b;
RJVars[ "pT_jet1a"] = toGeV(m_pT_jet1a);
RJVars[ "pT_jet1b"] = toGeV(m_pT_jet1b);
RJVars[ "pT_jet2a"] = toGeV(m_pT_jet2a);
RJVars[ "pT_jet2b"] = toGeV(m_pT_jet2b);

RJVars[ "pTPP_jet1"] = m_pTPP_jet1;
RJVars[ "pTPP_jet2"] = m_pTPP_jet2;
RJVars[ "pTPP_jet1"] = toGeV(m_pTPP_jet1);
RJVars[ "pTPP_jet2"] = toGeV(m_pTPP_jet2);

RJVars[ "pTPP_jet1a"] = m_pTPP_jet1a;
RJVars[ "pTPP_jet1b"] = m_pTPP_jet1b;
RJVars[ "pTPP_jet2a"] = m_pTPP_jet2a;
RJVars[ "pTPP_jet2b"] = m_pTPP_jet2b;
RJVars[ "pTPP_jet3a"] = m_pTPP_jet3a;
RJVars[ "pTPP_jet3b"] = m_pTPP_jet3b;
RJVars[ "pTPP_jet1a"] = toGeV(m_pTPP_jet1a);
RJVars[ "pTPP_jet1b"] = toGeV(m_pTPP_jet1b);
RJVars[ "pTPP_jet2a"] = toGeV(m_pTPP_jet2a);
RJVars[ "pTPP_jet2b"] = toGeV(m_pTPP_jet2b);
RJVars[ "pTPP_jet3a"] = toGeV(m_pTPP_jet3a);
RJVars[ "pTPP_jet3b"] = toGeV(m_pTPP_jet3b);

RJVars[ "pPP_jet1a"] = m_pPP_jet1a;
RJVars[ "pPP_jet1b"] = m_pPP_jet1b;
RJVars[ "pPP_jet2a"] = m_pPP_jet2a;
RJVars[ "pPP_jet2b"] = m_pPP_jet2b;
RJVars[ "pPP_jet3a"] = m_pPP_jet3a;
RJVars[ "pPP_jet3b"] = m_pPP_jet3b;
RJVars[ "pPP_jet1a"] = toGeV(m_pPP_jet1a);
RJVars[ "pPP_jet1b"] = toGeV(m_pPP_jet1b);
RJVars[ "pPP_jet2a"] = toGeV(m_pPP_jet2a);
RJVars[ "pPP_jet2b"] = toGeV(m_pPP_jet2b);
RJVars[ "pPP_jet3a"] = toGeV(m_pPP_jet3a);
RJVars[ "pPP_jet3b"] = toGeV(m_pPP_jet3b);

RJVars["R_H2PP_H3PP"] = m_R_H2PP_H3PP;
RJVars["R_pTj2_HT3PP"] = m_R_pTj2_HT3PP;
Expand All @@ -990,7 +989,7 @@ EL::StatusCode RJigsawCalculator_tls::doCalculate(std::map<std::string, double>&
RJVars[ "PP_CosTheta" ] = m_cosPP;
RJVars[ "PP_dPhiDecayAngle" ] = m_dphiVP ; // I think ...
RJVars[ "PP_VisShape" ] = m_PP_VisShape;
RJVars[ "PP_MDeltaR" ] = m_MDR;
RJVars[ "PP_MDeltaR" ] = toGeV(m_MDR);

// RJVars[ "P1_Mass" ] = Pa->GetMass();
RJVars[ "P1_CosTheta" ] = m_cosP; //same as Pa->GetCosDecayAngle(*Ia)
Expand All @@ -1014,23 +1013,23 @@ EL::StatusCode RJigsawCalculator_tls::doCalculate(std::map<std::string, double>&
// RJVars[ "DeltaBetaGG" ] = DeltaBetaGG;
RJVars[ "dphiVG" ] = PP->GetDeltaPhiDecayVisible();

RJVars[ "QCD_dPhiR" ] = -100;
//RJVars[ "QCD_dPhiR" ] = -100;
// RJVars[ "QCD_Rpt" ] = m_RPT;
RJVars[ "QCD_Rsib" ] = m_Rsib;
RJVars[ "QCD_Delta1" ] = m_deltaQCD;

RJVars["H2PP"] = m_H2PP ;
RJVars["H3PP"] = m_H3PP;
RJVars["H4PP"] = m_H4PP;
RJVars["H6PP"] = m_H6PP;
RJVars["H2PP"] = toGeV(m_H2PP);
RJVars["H3PP"] = toGeV(m_H3PP);
RJVars["H4PP"] = toGeV(m_H4PP);
RJVars["H6PP"] = toGeV(m_H6PP);
// RJVars["H10PP"] = m_H10PP;

// RJVars["HT10PP"] = m_HT10PP;

RJVars["H2Pa"] = m_H2Pa;
RJVars["H2Pb"] = m_H2Pb;
RJVars["H3Pa"] = m_H3Pa;
RJVars["H3Pb"] = m_H3Pb;
RJVars["H2Pa"] = toGeV(m_H2Pa);
RJVars["H2Pb"] = toGeV(m_H2Pb);
RJVars["H3Pa"] = toGeV(m_H3Pa);
RJVars["H3Pb"] = toGeV(m_H3Pb);
// RJVars["H4Pa"] = m_H4Pa;
// RJVars["H4Pb"] = m_H4Pb;
// RJVars["H5Pa"] = m_H5Pa;
Expand All @@ -1039,11 +1038,10 @@ EL::StatusCode RJigsawCalculator_tls::doCalculate(std::map<std::string, double>&
// RJVars["H2Cb"] = m_H2Cb;
// RJVars["H3Ca"] = m_H3Ca;
// RJVars["H3Cb"] = m_H3Cb;
RJVars["HT4PP"] = m_HT4PP; //m_HT4PP;
RJVars["HT6PP"] = m_HT6PP; //m_HT6PP;
// RJVars["minH3P"] = m_minH3P; //m_minH3P;
RJVars["sangle"] = m_sangle;
RJVars["dangle"] = m_dangle;
RJVars["HT4PP"] = toGeV(m_HT4PP); //m_HT4PP;
RJVars["HT6PP"] = toGeV(m_HT6PP); //m_HT6PP;
RJVars["sangle"] = toGeV(m_sangle);
RJVars["dangle"] = toGeV(m_dangle);

return EL::StatusCode::SUCCESS;
}
Expand Down
99 changes: 49 additions & 50 deletions Root/RJigsawCalculator_zl.cxx
View file
Expand Up @@ -753,40 +753,41 @@ EL::StatusCode RJigsawCalculator_zl::doCalculate(std::map<std::string, double>&
float const m_RPT_HT5PP = m_pTCM / (m_pTCM + m_HT5PP);
float const m_RPT_HT9PP = m_pTCM / (m_pTCM + m_HT9PP);

RJVars[ "HT1CM"] = m_HT1CM;
auto toGeV = [](float a){return a*.001;};

RJVars[ "HT1CM"] = toGeV(m_HT1CM);
RJVars[ "PIoHT1CM"] = m_PIoHT1CM;
RJVars[ "cosS"] = m_cosS;
RJVars[ "NVS"] = m_NVS;
RJVars[ "RPT_HT1CM"] = m_RPT_HT1CM;
RJVars[ "MS"] = m_MS;
RJVars[ "MS"] = toGeV(m_MS);

RJVars[ "ddphiP"] = m_ddphiP;
RJVars[ "sdphiP"] = m_sdphiP;

RJVars[ "pPP_Ia"] = m_pPP_Ia;
RJVars[ "pPP_Ib"] = m_pPP_Ib;

RJVars[ "pT_jet1a"] = m_pT_jet1a;
RJVars[ "pT_jet1b"] = m_pT_jet1b;
RJVars[ "pT_jet2a"] = m_pT_jet2a;
RJVars[ "pT_jet2b"] = m_pT_jet2b;

RJVars[ "pTPP_jet1"] = m_pTPP_jet1;
RJVars[ "pTPP_jet2"] = m_pTPP_jet2;

RJVars[ "pTPP_jet1a"] = m_pTPP_jet1a;
RJVars[ "pTPP_jet1b"] = m_pTPP_jet1b;
RJVars[ "pTPP_jet2a"] = m_pTPP_jet2a;
RJVars[ "pTPP_jet2b"] = m_pTPP_jet2b;
RJVars[ "pTPP_jet3a"] = m_pTPP_jet3a;
RJVars[ "pTPP_jet3b"] = m_pTPP_jet3b;

RJVars[ "pPP_jet1a"] = m_pPP_jet1a;
RJVars[ "pPP_jet1b"] = m_pPP_jet1b;
RJVars[ "pPP_jet2a"] = m_pPP_jet2a;
RJVars[ "pPP_jet2b"] = m_pPP_jet2b;
RJVars[ "pPP_jet3a"] = m_pPP_jet3a;
RJVars[ "pPP_jet3b"] = m_pPP_jet3b;
RJVars[ "pT_jet1a"] = toGeV(m_pT_jet1a);
RJVars[ "pT_jet1b"] = toGeV(m_pT_jet1b);
RJVars[ "pT_jet2a"] = toGeV(m_pT_jet2a);
RJVars[ "pT_jet2b"] = toGeV(m_pT_jet2b);
RJVars[ "pTPP_jet1"] = toGeV(m_pTPP_jet1);
RJVars[ "pTPP_jet2"] = toGeV(m_pTPP_jet2);

RJVars[ "pTPP_jet1a"] = toGeV(m_pTPP_jet1a);
RJVars[ "pTPP_jet1b"] = toGeV(m_pTPP_jet1b);
RJVars[ "pTPP_jet2a"] = toGeV(m_pTPP_jet2a);
RJVars[ "pTPP_jet2b"] = toGeV(m_pTPP_jet2b);
RJVars[ "pTPP_jet3a"] = toGeV(m_pTPP_jet3a);
RJVars[ "pTPP_jet3b"] = toGeV(m_pTPP_jet3b);

RJVars[ "pPP_jet1a"] = toGeV(m_pPP_jet1a);
RJVars[ "pPP_jet1b"] = toGeV(m_pPP_jet1b);
RJVars[ "pPP_jet2a"] = toGeV(m_pPP_jet2a);
RJVars[ "pPP_jet2b"] = toGeV(m_pPP_jet2b);
RJVars[ "pPP_jet3a"] = toGeV(m_pPP_jet3a);
RJVars[ "pPP_jet3b"] = toGeV(m_pPP_jet3b);

RJVars["R_H2PP_H3PP"] = m_R_H2PP_H3PP;
RJVars["R_pTj2_HT3PP"] = m_R_pTj2_HT3PP;
Expand All @@ -812,11 +813,11 @@ EL::StatusCode RJigsawCalculator_zl::doCalculate(std::map<std::string, double>&
RJVars[ "PP_CosTheta" ] = m_cosPP;
RJVars[ "PP_dPhiDecayAngle" ] = m_dphiVP ; // I think ...
RJVars[ "PP_VisShape" ] = m_PP_VisShape;
RJVars[ "PP_MDeltaR" ] = m_MDR;
RJVars[ "PP_MDeltaR" ] = toGeV(m_MDR);

RJVars[ "P1_Mass" ] = Pa->GetMass();
RJVars[ "P1_Mass" ] = toGeV(Pa->GetMass());
RJVars[ "P1_CosTheta" ] = m_cosP; //same as Pa->GetCosDecayAngle(*Ia)
RJVars[ "P2_Mass" ] = Pb->GetMass();
RJVars[ "P2_Mass" ] = toGeV(Pb->GetMass());
RJVars[ "P2_CosTheta" ] = Pb->GetCosDecayAngle(*Ib); //I think ...-100;
RJVars[ "I1_Depth" ] = Pa->GetFrameDepth (*Ia);
RJVars[ "I2_Depth" ] = Pb->GetFrameDepth (*Ib);
Expand All @@ -841,32 +842,30 @@ EL::StatusCode RJigsawCalculator_zl::doCalculate(std::map<std::string, double>&
RJVars[ "QCD_Rsib" ] = m_Rsib;
RJVars[ "QCD_Delta1" ] = m_deltaQCD;

RJVars["H2PP"] = m_H2PP ;
RJVars["H3PP"] = m_H3PP;
RJVars["H4PP"] = m_H4PP;
RJVars["H6PP"] = m_H6PP;
RJVars["H10PP"] = m_H10PP;

RJVars["HT10PP"] = m_HT10PP;

RJVars["H2Pa"] = m_H2Pa;
RJVars["H2Pb"] = m_H2Pb;
RJVars["H3Pa"] = m_H3Pa;
RJVars["H3Pb"] = m_H3Pb;
RJVars["H4Pa"] = m_H4Pa;
RJVars["H4Pb"] = m_H4Pb;
RJVars["H5Pa"] = m_H5Pa;
RJVars["H5Pb"] = m_H5Pb;
RJVars["H2Ca"] = m_H2Ca;
RJVars["H2Cb"] = m_H2Cb;
RJVars["H3Ca"] = m_H3Ca;
RJVars["H3Cb"] = m_H3Cb;
RJVars["HT4PP"] = m_HT4PP; //m_HT4PP;
RJVars["HT6PP"] = m_HT6PP; //m_HT6PP;
// RJVars["minH3P"] = m_minH3P; //m_minH3P;
RJVars["H2PP"] = toGeV(m_H2PP) ;
RJVars["H3PP"] = toGeV(m_H3PP);
RJVars["H4PP"] = toGeV(m_H4PP);
RJVars["H6PP"] = toGeV(m_H6PP);
RJVars["H10PP"] = toGeV(m_H10PP);
RJVars["HT10PP"] = toGeV(m_HT10PP);

RJVars["H2Pa"] = toGeV(m_H2Pa);
RJVars["H2Pb"] = toGeV(m_H2Pb);
RJVars["H3Pa"] = toGeV(m_H3Pa);
RJVars["H3Pb"] = toGeV(m_H3Pb);
RJVars["H4Pa"] = toGeV(m_H4Pa);
RJVars["H4Pb"] = toGeV(m_H4Pb);
RJVars["H5Pa"] = toGeV(m_H5Pa);
RJVars["H5Pb"] = toGeV(m_H5Pb);
RJVars["H2Ca"] = toGeV(m_H2Ca);
RJVars["H2Cb"] = toGeV(m_H2Cb);
RJVars["H3Ca"] = toGeV(m_H3Ca);
RJVars["H3Cb"] = toGeV(m_H3Cb);
RJVars["HT4PP"] = toGeV(m_HT4PP); //m_HT4PP;
RJVars["HT6PP"] = toGeV(m_HT6PP); //m_HT6PP;
// RJVars["minH3P"] toGeV( = m_minH3P; //m_minH3P;
RJVars["sangle"] = m_sangle;
RJVars["dangle"] = m_dangle;


return EL::StatusCode::SUCCESS;
}
12 changes: 7 additions & 5 deletions Root/RegionVarCalculator_b4j.cxx
View file
Expand Up @@ -3,7 +3,7 @@
#include "xAODRootAccess/TStore.h"

#include "SUSYTools/SUSYObjDef_xAOD.h"
#include "xAODParticleEvent/ParticleContainer.h"
//#include "xAODParticleEvent/ParticleContainer.h"
#include "xAODJet/JetAuxContainer.h"

#include "RJigsawTools/RegionVarCalculator_b4j.h"
Expand Down Expand Up @@ -64,6 +64,8 @@ EL::StatusCode RegionVarCalculator_b4j::doAllCalculations(std::map<std::string,

// Get relevant info from the vertex container //////////////////////
//
auto toGeV = [](float a){return a*.001;};


const xAOD::VertexContainer* vertices = nullptr;
STRONG_CHECK(event->retrieve( vertices, "PrimaryVertices"));
Expand All @@ -76,7 +78,7 @@ EL::StatusCode RegionVarCalculator_b4j::doAllCalculations(std::map<std::string,
STRONG_CHECK(store->retrieve(metcont, "STCalibMET"));

// std::cout << "MET : " << (*metcont)["Final"]->met() << std::endl;
RegionVars ["met"] = 1*(*metcont)["Final"]->met();
RegionVars ["met"] = toGeV((*metcont)["Final"]->met());

// xAOD::JetContainer* jets_nominal(nullptr);
// STRONG_CHECK(store->retrieve(jets_nominal, "STCalibAntiKt4EMTopoJets"));
Expand All @@ -97,7 +99,7 @@ EL::StatusCode RegionVarCalculator_b4j::doAllCalculations(std::map<std::string,
mJJ = (jet4MomVec.at(0)+jet4MomVec.at(1)).M();
}

RegionVars["mJJ"] = mJJ;
RegionVars["mJJ"] = toGeV(mJJ);



Expand All @@ -113,10 +115,10 @@ EL::StatusCode RegionVarCalculator_b4j::doAllCalculations(std::map<std::string,
std::vector<double> jetDip12Vec;

for( const auto& jet : *jets_nominal) {
jetPtVec.push_back( jet->pt());
jetPtVec.push_back( toGeV(jet->pt()));
jetEtaVec.push_back( jet->p4().Eta() );
jetPhiVec.push_back( jet->p4().Phi() );
jetEVec.push_back( jet->p4().E() );
jetEVec.push_back( toGeV(jet->p4().E()) );

jetTau1Vec.push_back( jet->getAttribute<double>("Tau1") );
jetTau2Vec.push_back( jet->getAttribute<double>("Tau2") );
Expand Down

0 comments on commit 114bd14

Please sign in to comment.