diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
index 6ea4204fb7e44ae14eda33cf13c6f5d23c24b516..68c19d6552bd107b3fc419517c0a0f6bb1b31b2b 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
@@ -548,6 +548,12 @@ namespace MissingEtDQA {
{
ATH_MSG_INFO ("Filling hists " << name() << "...");
+ //Beamspot weight
+ const xAOD::EventInfo* eventInfo(0);
+ ATH_CHECK(evtStore()->retrieve(eventInfo, "EventInfo"));
+
+ float weight = eventInfo->beamSpotWeight();
+
//Retrieve MET Truth
const xAOD::MissingETContainer* met_Truth = 0;
if(m_doTruth) {
@@ -784,67 +790,67 @@ namespace MissingEtDQA {
for(const auto& it : *met_Ref) {
std::string name = it->name();
if(name == "RefEle"){
- (m_MET_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(0)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(0)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(0)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(0)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(0)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(0)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(0)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(0)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "RefGamma"){
- (m_MET_Ref[type]).at(1)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(1)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(1)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(1)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(1)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(1)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(1)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(1)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(1)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(1)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "RefTau"){
- (m_MET_Ref[type]).at(2)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(2)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(2)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(2)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(2)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(2)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(2)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(2)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(2)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(2)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "Muons"){
- (m_MET_Ref[type]).at(3)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(3)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(3)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(3)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(3)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(3)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(3)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(3)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(3)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(3)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "RefJet"){
- (m_MET_Ref[type]).at(4)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(4)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(4)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(4)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(4)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(4)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(4)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(4)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(4)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(4)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "SoftClus"){
- (m_MET_Ref[type]).at(5)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(5)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(5)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(5)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(5)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(5)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(5)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(5)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(5)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(5)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "PVSoftTrk"){
- (m_MET_Ref[type]).at(6)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(6)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(6)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(6)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(6)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(6)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(6)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(6)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(6)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(6)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "FinalTrk"){
- (m_MET_Ref[type]).at(7)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(7)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(7)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(7)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(7)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(7)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(7)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(7)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(7)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(7)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
if(name == "FinalClus"){
- (m_MET_Ref[type]).at(8)->Fill((*met_Ref)[name.c_str()]->met()/1000., 1.);
- (m_MET_Ref_x[type]).at(8)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Ref_y[type]).at(8)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Ref_phi[type]).at(8)->Fill((*met_Ref)[name.c_str()]->phi(), 1.);
- (m_MET_Ref_sum[type]).at(8)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Ref[type]).at(8)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
+ (m_MET_Ref_x[type]).at(8)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Ref_y[type]).at(8)->Fill((*met_Ref)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Ref_phi[type]).at(8)->Fill((*met_Ref)[name.c_str()]->phi(), weight);
+ (m_MET_Ref_sum[type]).at(8)->Fill((*met_Ref)[name.c_str()]->sumet()/1000., weight);
}
}
@@ -923,67 +929,67 @@ namespace MissingEtDQA {
for(const auto& it : *met_Reb) {
std::string name = it->name();
if(name == "RefEle"){
- (m_MET_Reb[type]).at(0)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(0)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(0)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(0)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(0)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(0)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(0)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(0)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(0)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(0)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "RefGamma"){
- (m_MET_Reb[type]).at(1)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(1)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(1)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(1)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(1)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(1)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(1)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(1)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(1)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(1)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "RefTau"){
- (m_MET_Reb[type]).at(2)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(2)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(2)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(2)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(2)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(2)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(2)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(2)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(2)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(2)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "Muons"){
- (m_MET_Reb[type]).at(3)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(3)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(3)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(3)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(3)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(3)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(3)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(3)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(3)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(3)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "RefJet"){
- (m_MET_Reb[type]).at(4)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(4)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(4)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(4)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(4)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(4)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(4)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(4)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(4)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(4)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "SoftClus"){
- (m_MET_Reb[type]).at(5)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(5)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(5)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(5)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(5)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(5)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(5)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(5)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(5)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(5)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "PVSoftTrk"){
- (m_MET_Reb[type]).at(6)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(6)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(6)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(6)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(6)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(6)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(6)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(6)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(6)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(6)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "FinalTrk"){
- (m_MET_Reb[type]).at(7)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(7)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(7)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(7)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(7)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(7)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(7)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(7)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(7)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(7)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
if(name == "FinalClus"){
- (m_MET_Reb[type]).at(8)->Fill((*met_Reb)[name.c_str()]->met()/1000., 1.);
- (m_MET_Reb_x[type]).at(8)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., 1.);
- (m_MET_Reb_y[type]).at(8)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., 1.);
- (m_MET_Reb_phi[type]).at(8)->Fill((*met_Reb)[name.c_str()]->phi(), 1.);
- (m_MET_Reb_sum[type]).at(8)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., 1.);
+ (m_MET_Reb[type]).at(8)->Fill((*met_Reb)[name.c_str()]->met()/1000., weight);
+ (m_MET_Reb_x[type]).at(8)->Fill((*met_Reb)[name.c_str()]->mpx()/1000., weight);
+ (m_MET_Reb_y[type]).at(8)->Fill((*met_Reb)[name.c_str()]->mpy()/1000., weight);
+ (m_MET_Reb_phi[type]).at(8)->Fill((*met_Reb)[name.c_str()]->phi(), weight);
+ (m_MET_Reb_sum[type]).at(8)->Fill((*met_Reb)[name.c_str()]->sumet()/1000., weight);
}
}
@@ -1010,15 +1016,15 @@ namespace MissingEtDQA {
}
}
- (m_MET_dPhi_Ref[type]).at(0)->Fill( -remainder( leadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Ref[type]).at(1)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Ref[type]).at(3)->Fill( -remainder( leadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Ref[type]).at(4)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ) );
+ (m_MET_dPhi_Ref[type]).at(0)->Fill( -remainder( leadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Ref[type]).at(1)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Ref[type]).at(3)->Fill( -remainder( leadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Ref[type]).at(4)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ), weight );
- (m_MET_dPhi_Reb[type]).at(0)->Fill( -remainder( leadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Reb[type]).at(1)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Reb[type]).at(3)->Fill( -remainder( leadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Reb[type]).at(4)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ) );
+ (m_MET_dPhi_Reb[type]).at(0)->Fill( -remainder( leadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Reb[type]).at(1)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Reb[type]).at(3)->Fill( -remainder( leadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Reb[type]).at(4)->Fill( -remainder( subleadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ), weight );
leadPt = 0.; leadPhi = 0.;
@@ -1043,10 +1049,10 @@ namespace MissingEtDQA {
}
}
- (m_MET_dPhi_Ref[type]).at(2)->Fill( -remainder( leadPhi - (*met_Ref)["FinalClus"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Ref[type]).at(5)->Fill( -remainder( leadPhi - (*met_Ref)["FinalTrk"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Reb[type]).at(2)->Fill( -remainder( leadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ) );
- (m_MET_dPhi_Reb[type]).at(5)->Fill( -remainder( leadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ) );
+ (m_MET_dPhi_Ref[type]).at(2)->Fill( -remainder( leadPhi - (*met_Ref)["FinalClus"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Ref[type]).at(5)->Fill( -remainder( leadPhi - (*met_Ref)["FinalTrk"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Reb[type]).at(2)->Fill( -remainder( leadPhi - (*met_Reb)["FinalClus"]->phi(), 2*M_PI ), weight );
+ (m_MET_dPhi_Reb[type]).at(5)->Fill( -remainder( leadPhi - (*met_Reb)["FinalTrk"]->phi(), 2*M_PI ), weight );
//Fill Correlation Plots
@@ -1054,30 +1060,30 @@ namespace MissingEtDQA {
for(const auto& it : *met_Ref) {
std::string name = it->name();
if(name == "RefEle"){
- (m_MET_CorrFinalTrk_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
}
if(name == "RefGamma"){
- (m_MET_CorrFinalTrk_Ref[type]).at(1)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Ref[type]).at(1)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Ref[type]).at(1)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Ref[type]).at(1)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
}
if(name == "RefTau"){
- (m_MET_CorrFinalTrk_Ref[type]).at(2)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Ref[type]).at(2)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Ref[type]).at(2)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Ref[type]).at(2)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
}
if(name == "Muons"){
- (m_MET_CorrFinalTrk_Ref[type]).at(3)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Ref[type]).at(3)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Ref[type]).at(3)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Ref[type]).at(3)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
}
if(name == "RefJet"){
- (m_MET_CorrFinalTrk_Ref[type]).at(4)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Ref[type]).at(4)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Ref[type]).at(4)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Ref[type]).at(4)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
}
if(name == "PVSoftTrk"){
- (m_MET_CorrFinalTrk_Ref[type]).at(5)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Ref[type]).at(5)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
}
if(name == "SoftClus"){
- (m_MET_CorrFinalClus_Ref[type]).at(5)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalClus_Ref[type]).at(5)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
}
}
@@ -1085,30 +1091,30 @@ namespace MissingEtDQA {
for(const auto& it : *met_Reb) {
std::string name = it->name();
if(name == "RefEle"){
- (m_MET_CorrFinalTrk_Reb[type]).at(0)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Reb[type]).at(0)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Reb[type]).at(0)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Reb[type]).at(0)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., weight);
}
if(name == "RefGamma"){
- (m_MET_CorrFinalTrk_Reb[type]).at(1)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Reb[type]).at(1)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Reb[type]).at(1)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Reb[type]).at(1)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., weight);
}
if(name == "RefTau"){
- (m_MET_CorrFinalTrk_Reb[type]).at(2)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Reb[type]).at(2)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Reb[type]).at(2)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Reb[type]).at(2)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., weight);
}
if(name == "Muons"){
- (m_MET_CorrFinalTrk_Reb[type]).at(3)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Reb[type]).at(3)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Reb[type]).at(3)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Reb[type]).at(3)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., weight);
}
if(name == "RefJet"){
- (m_MET_CorrFinalTrk_Reb[type]).at(4)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., 1.);
- (m_MET_CorrFinalClus_Reb[type]).at(4)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Reb[type]).at(4)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., weight);
+ (m_MET_CorrFinalClus_Reb[type]).at(4)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., weight);
}
if(name == "PVSoftTrk"){
- (m_MET_CorrFinalTrk_Reb[type]).at(5)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., 1.);
+ (m_MET_CorrFinalTrk_Reb[type]).at(5)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalTrk"]->met()/1000., weight);
}
if(name == "SoftClus"){
- (m_MET_CorrFinalClus_Reb[type]).at(5)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., 1.);
+ (m_MET_CorrFinalClus_Reb[type]).at(5)->Fill((*met_Reb)[name.c_str()]->met()/1000.,(*met_Reb)["FinalClus"]->met()/1000., weight);
}
}
@@ -1116,22 +1122,22 @@ namespace MissingEtDQA {
if(m_doTruth)
{
ATH_MSG_INFO( " Resolution:" );
- (m_MET_Resolution_Ref[type]).at(0)->Fill(((*met_Ref)["FinalClus"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., 1.);
- (m_MET_Resolution_Ref[type]).at(1)->Fill(((*met_Ref)["FinalClus"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., 1.);
- (m_MET_Resolution_Ref[type]).at(2)->Fill(((*met_Ref)["FinalTrk"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., 1.);
- (m_MET_Resolution_Ref[type]).at(3)->Fill(((*met_Ref)["FinalTrk"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., 1.);
- (m_MET_Resolution_Reb[type]).at(0)->Fill(((*met_Reb)["FinalClus"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., 1.);
- (m_MET_Resolution_Reb[type]).at(1)->Fill(((*met_Reb)["FinalClus"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., 1.);
- (m_MET_Resolution_Reb[type]).at(2)->Fill(((*met_Reb)["FinalTrk"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., 1.);
- (m_MET_Resolution_Reb[type]).at(3)->Fill(((*met_Reb)["FinalTrk"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., 1.);
+ (m_MET_Resolution_Ref[type]).at(0)->Fill(((*met_Ref)["FinalClus"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., weight);
+ (m_MET_Resolution_Ref[type]).at(1)->Fill(((*met_Ref)["FinalClus"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., weight);
+ (m_MET_Resolution_Ref[type]).at(2)->Fill(((*met_Ref)["FinalTrk"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., weight);
+ (m_MET_Resolution_Ref[type]).at(3)->Fill(((*met_Ref)["FinalTrk"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., weight);
+ (m_MET_Resolution_Reb[type]).at(0)->Fill(((*met_Reb)["FinalClus"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., weight);
+ (m_MET_Resolution_Reb[type]).at(1)->Fill(((*met_Reb)["FinalClus"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., weight);
+ (m_MET_Resolution_Reb[type]).at(2)->Fill(((*met_Reb)["FinalTrk"]->mpx()-(*met_Truth)["NonInt"]->mpx())/1000., weight);
+ (m_MET_Resolution_Reb[type]).at(3)->Fill(((*met_Reb)["FinalTrk"]->mpy()-(*met_Truth)["NonInt"]->mpy())/1000., weight);
}
//Fill MET Significance
ATH_MSG_INFO( " MET_significance:" );
- if( (*met_Ref)["FinalClus"]->sumet() != 0) (m_MET_Significance_Ref[type]).at(0)->Fill((*met_Ref)["FinalClus"]->met()/sqrt((*met_Ref)["FinalClus"]->sumet()*1000.), 1.);
- if( (*met_Ref)["FinalTrk"]->sumet() != 0) (m_MET_Significance_Ref[type]).at(1)->Fill((*met_Ref)["FinalTrk"]->met()/sqrt((*met_Ref)["FinalTrk"]->sumet()*1000.), 1.);
- if( (*met_Reb)["FinalClus"]->sumet() != 0) (m_MET_Significance_Reb[type]).at(0)->Fill((*met_Reb)["FinalClus"]->met()/sqrt((*met_Reb)["FinalClus"]->sumet()*1000.), 1.);
- if( (*met_Reb)["FinalTrk"]->sumet() != 0) (m_MET_Significance_Reb[type]).at(1)->Fill((*met_Reb)["FinalTrk"]->met()/sqrt((*met_Reb)["FinalTrk"]->sumet()*1000.), 1.);
+ if( (*met_Ref)["FinalClus"]->sumet() != 0) (m_MET_Significance_Ref[type]).at(0)->Fill((*met_Ref)["FinalClus"]->met()/sqrt((*met_Ref)["FinalClus"]->sumet()*1000.), weight);
+ if( (*met_Ref)["FinalTrk"]->sumet() != 0) (m_MET_Significance_Ref[type]).at(1)->Fill((*met_Ref)["FinalTrk"]->met()/sqrt((*met_Ref)["FinalTrk"]->sumet()*1000.), weight);
+ if( (*met_Reb)["FinalClus"]->sumet() != 0) (m_MET_Significance_Reb[type]).at(0)->Fill((*met_Reb)["FinalClus"]->met()/sqrt((*met_Reb)["FinalClus"]->sumet()*1000.), weight);
+ if( (*met_Reb)["FinalTrk"]->sumet() != 0) (m_MET_Significance_Reb[type]).at(1)->Fill((*met_Reb)["FinalTrk"]->met()/sqrt((*met_Reb)["FinalTrk"]->sumet()*1000.), weight);
//Fill Diff histograms
TLorentzVector target_tlv;
@@ -1139,51 +1145,51 @@ namespace MissingEtDQA {
if(it->name() == "RefEle"){
if(is_electron or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Ref[type]).at(0)->Fill((target_tlv.Pt() - el_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Ref_x[type]).at(0)->Fill((target_tlv.Px() - el_tlv.Px())/1000., 1.);
- (m_MET_Diff_Ref_y[type]).at(0)->Fill((target_tlv.Py() - el_tlv.Py())/1000., 1.);
- (m_MET_Diff_Ref_phi[type]).at(0)->Fill(el_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Ref_sum[type]).at(0)->Fill((it->sumet() - sum_el)/1000., 1.);
+ (m_MET_Diff_Ref[type]).at(0)->Fill((target_tlv.Pt() - el_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Ref_x[type]).at(0)->Fill((target_tlv.Px() - el_tlv.Px())/1000., weight);
+ (m_MET_Diff_Ref_y[type]).at(0)->Fill((target_tlv.Py() - el_tlv.Py())/1000., weight);
+ (m_MET_Diff_Ref_phi[type]).at(0)->Fill(el_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Ref_sum[type]).at(0)->Fill((it->sumet() - sum_el)/1000., weight);
}
}
if(it->name() == "RefGamma"){
if(is_photon or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Ref[type]).at(1)->Fill((target_tlv.Pt() - photon_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Ref_x[type]).at(1)->Fill((target_tlv.Px() - photon_tlv.Px())/1000., 1.);
- (m_MET_Diff_Ref_y[type]).at(1)->Fill((target_tlv.Py() - photon_tlv.Py())/1000., 1.);
- (m_MET_Diff_Ref_phi[type]).at(1)->Fill(photon_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Ref_sum[type]).at(1)->Fill((it->sumet() - sum_photon)/1000., 1.);
+ (m_MET_Diff_Ref[type]).at(1)->Fill((target_tlv.Pt() - photon_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Ref_x[type]).at(1)->Fill((target_tlv.Px() - photon_tlv.Px())/1000., weight);
+ (m_MET_Diff_Ref_y[type]).at(1)->Fill((target_tlv.Py() - photon_tlv.Py())/1000., weight);
+ (m_MET_Diff_Ref_phi[type]).at(1)->Fill(photon_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Ref_sum[type]).at(1)->Fill((it->sumet() - sum_photon)/1000., weight);
}
}
if(it->name() == "RefTau"){
if(is_tau or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Ref[type]).at(2)->Fill((target_tlv.Pt() - tau_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Ref_x[type]).at(2)->Fill((target_tlv.Px() - tau_tlv.Px())/1000., 1.);
- (m_MET_Diff_Ref_y[type]).at(2)->Fill((target_tlv.Py() - tau_tlv.Py())/1000., 1.);
- (m_MET_Diff_Ref_phi[type]).at(2)->Fill(tau_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Ref_sum[type]).at(2)->Fill((it->sumet() - sum_tau)/1000., 1.);
+ (m_MET_Diff_Ref[type]).at(2)->Fill((target_tlv.Pt() - tau_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Ref_x[type]).at(2)->Fill((target_tlv.Px() - tau_tlv.Px())/1000., weight);
+ (m_MET_Diff_Ref_y[type]).at(2)->Fill((target_tlv.Py() - tau_tlv.Py())/1000., weight);
+ (m_MET_Diff_Ref_phi[type]).at(2)->Fill(tau_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Ref_sum[type]).at(2)->Fill((it->sumet() - sum_tau)/1000., weight);
}
}
if(it->name() == "Muons"){
if(is_muon or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Ref[type]).at(3)->Fill((target_tlv.Pt() - mu_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Ref_x[type]).at(3)->Fill((target_tlv.Px() - mu_tlv.Px())/1000., 1.);
- (m_MET_Diff_Ref_y[type]).at(3)->Fill((target_tlv.Py() - mu_tlv.Py())/1000., 1.);
- (m_MET_Diff_Ref_phi[type]).at(3)->Fill(mu_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Ref_sum[type]).at(3)->Fill((it->sumet() - sum_mu)/1000., 1.);
+ (m_MET_Diff_Ref[type]).at(3)->Fill((target_tlv.Pt() - mu_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Ref_x[type]).at(3)->Fill((target_tlv.Px() - mu_tlv.Px())/1000., weight);
+ (m_MET_Diff_Ref_y[type]).at(3)->Fill((target_tlv.Py() - mu_tlv.Py())/1000., weight);
+ (m_MET_Diff_Ref_phi[type]).at(3)->Fill(mu_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Ref_sum[type]).at(3)->Fill((it->sumet() - sum_mu)/1000., weight);
}
}
if(it->name() == "RefJet"){
if(is_jet or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Ref[type]).at(4)->Fill((target_tlv.Pt() - jet_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Ref_x[type]).at(4)->Fill((target_tlv.Px() - jet_tlv.Px())/1000., 1.);
- (m_MET_Diff_Ref_y[type]).at(4)->Fill((target_tlv.Py() - jet_tlv.Py())/1000., 1.);
- (m_MET_Diff_Ref_phi[type]).at(4)->Fill(jet_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Ref_sum[type]).at(4)->Fill((it->sumet() - sum_jet)/1000., 1.);
+ (m_MET_Diff_Ref[type]).at(4)->Fill((target_tlv.Pt() - jet_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Ref_x[type]).at(4)->Fill((target_tlv.Px() - jet_tlv.Px())/1000., weight);
+ (m_MET_Diff_Ref_y[type]).at(4)->Fill((target_tlv.Py() - jet_tlv.Py())/1000., weight);
+ (m_MET_Diff_Ref_phi[type]).at(4)->Fill(jet_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Ref_sum[type]).at(4)->Fill((it->sumet() - sum_jet)/1000., weight);
}
}
}
@@ -1202,51 +1208,51 @@ namespace MissingEtDQA {
if(it->name() == "RefEle"){
if(is_electron or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Reb[type]).at(0)->Fill((target_tlv.Pt() - el_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Reb_x[type]).at(0)->Fill((target_tlv.Px() - el_tlv.Px())/1000., 1.);
- (m_MET_Diff_Reb_y[type]).at(0)->Fill((target_tlv.Py() - el_tlv.Py())/1000., 1.);
- (m_MET_Diff_Reb_phi[type]).at(0)->Fill(el_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Reb_sum[type]).at(0)->Fill((it->sumet() - sum_el)/1000., 1.);
+ (m_MET_Diff_Reb[type]).at(0)->Fill((target_tlv.Pt() - el_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Reb_x[type]).at(0)->Fill((target_tlv.Px() - el_tlv.Px())/1000., weight);
+ (m_MET_Diff_Reb_y[type]).at(0)->Fill((target_tlv.Py() - el_tlv.Py())/1000., weight);
+ (m_MET_Diff_Reb_phi[type]).at(0)->Fill(el_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Reb_sum[type]).at(0)->Fill((it->sumet() - sum_el)/1000., weight);
}
}
if(it->name() == "RefGamma"){
if(is_photon or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Reb[type]).at(1)->Fill((target_tlv.Pt() - photon_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Reb_x[type]).at(1)->Fill((target_tlv.Px() - photon_tlv.Px())/1000., 1.);
- (m_MET_Diff_Reb_y[type]).at(1)->Fill((target_tlv.Py() - photon_tlv.Py())/1000., 1.);
- (m_MET_Diff_Reb_phi[type]).at(1)->Fill(photon_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Reb_sum[type]).at(1)->Fill((it->sumet() - sum_photon)/1000., 1.);
+ (m_MET_Diff_Reb[type]).at(1)->Fill((target_tlv.Pt() - photon_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Reb_x[type]).at(1)->Fill((target_tlv.Px() - photon_tlv.Px())/1000., weight);
+ (m_MET_Diff_Reb_y[type]).at(1)->Fill((target_tlv.Py() - photon_tlv.Py())/1000., weight);
+ (m_MET_Diff_Reb_phi[type]).at(1)->Fill(photon_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Reb_sum[type]).at(1)->Fill((it->sumet() - sum_photon)/1000., weight);
}
}
if(it->name() == "RefTau"){
if(is_tau or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Reb[type]).at(2)->Fill((target_tlv.Pt() - tau_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Reb_x[type]).at(2)->Fill((target_tlv.Px() - tau_tlv.Px())/1000., 1.);
- (m_MET_Diff_Reb_y[type]).at(2)->Fill((target_tlv.Py() - tau_tlv.Py())/1000., 1.);
- (m_MET_Diff_Reb_phi[type]).at(2)->Fill(tau_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Reb_sum[type]).at(2)->Fill((it->sumet() - sum_tau)/1000., 1.);
+ (m_MET_Diff_Reb[type]).at(2)->Fill((target_tlv.Pt() - tau_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Reb_x[type]).at(2)->Fill((target_tlv.Px() - tau_tlv.Px())/1000., weight);
+ (m_MET_Diff_Reb_y[type]).at(2)->Fill((target_tlv.Py() - tau_tlv.Py())/1000., weight);
+ (m_MET_Diff_Reb_phi[type]).at(2)->Fill(tau_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Reb_sum[type]).at(2)->Fill((it->sumet() - sum_tau)/1000., weight);
}
}
if(it->name() == "Muons"){
if(is_muon or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Reb[type]).at(3)->Fill((target_tlv.Pt() - mu_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Reb_x[type]).at(3)->Fill((target_tlv.Px() - mu_tlv.Px())/1000., 1.);
- (m_MET_Diff_Reb_y[type]).at(3)->Fill((target_tlv.Py() - mu_tlv.Py())/1000., 1.);
- (m_MET_Diff_Reb_phi[type]).at(3)->Fill(mu_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Reb_sum[type]).at(3)->Fill((it->sumet() - sum_mu)/1000., 1.);
+ (m_MET_Diff_Reb[type]).at(3)->Fill((target_tlv.Pt() - mu_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Reb_x[type]).at(3)->Fill((target_tlv.Px() - mu_tlv.Px())/1000., weight);
+ (m_MET_Diff_Reb_y[type]).at(3)->Fill((target_tlv.Py() - mu_tlv.Py())/1000., weight);
+ (m_MET_Diff_Reb_phi[type]).at(3)->Fill(mu_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Reb_sum[type]).at(3)->Fill((it->sumet() - sum_mu)/1000., weight);
}
}
if(it->name() == "RefJet"){
if(is_jet or (it->sumet() > 0)){
target_tlv.SetPxPyPzE(-it->mpx(), -it->mpy(), 0, it->met());
- (m_MET_Diff_Reb[type]).at(4)->Fill((target_tlv.Pt() - jetReb_tlv.Pt())/1000., 1.);
- (m_MET_Diff_Reb_x[type]).at(4)->Fill((target_tlv.Px() - jetReb_tlv.Px())/1000., 1.);
- (m_MET_Diff_Reb_y[type]).at(4)->Fill((target_tlv.Py() - jetReb_tlv.Py())/1000., 1.);
- (m_MET_Diff_Reb_phi[type]).at(4)->Fill(jetReb_tlv.DeltaPhi(target_tlv), 1.);
- (m_MET_Diff_Reb_sum[type]).at(4)->Fill((it->sumet() - sum_jetReb)/1000., 1.);
+ (m_MET_Diff_Reb[type]).at(4)->Fill((target_tlv.Pt() - jetReb_tlv.Pt())/1000., weight);
+ (m_MET_Diff_Reb_x[type]).at(4)->Fill((target_tlv.Px() - jetReb_tlv.Px())/1000., weight);
+ (m_MET_Diff_Reb_y[type]).at(4)->Fill((target_tlv.Py() - jetReb_tlv.Py())/1000., weight);
+ (m_MET_Diff_Reb_phi[type]).at(4)->Fill(jetReb_tlv.DeltaPhi(target_tlv), weight);
+ (m_MET_Diff_Reb_sum[type]).at(4)->Fill((it->sumet() - sum_jetReb)/1000., weight);
}
}
}
@@ -1276,11 +1282,11 @@ namespace MissingEtDQA {
ATH_MSG_WARNING("Building MET FinalClus sum failed.");
}
- m_MET_Calo->Fill((*met_Calo)["FinalClus"]->met()/1000., 1.);
- m_MET_Calo_x->Fill((*met_Calo)["FinalClus"]->mpx()/1000., 1.);
- m_MET_Calo_y->Fill((*met_Calo)["FinalClus"]->mpy()/1000., 1.);
- m_MET_Calo_phi->Fill((*met_Calo)["FinalClus"]->phi(), 1.);
- m_MET_Calo_sum->Fill((*met_Calo)["FinalClus"]->sumet()/1000., 1.);
+ m_MET_Calo->Fill((*met_Calo)["FinalClus"]->met()/1000., weight);
+ m_MET_Calo_x->Fill((*met_Calo)["FinalClus"]->mpx()/1000., weight);
+ m_MET_Calo_y->Fill((*met_Calo)["FinalClus"]->mpy()/1000., weight);
+ m_MET_Calo_phi->Fill((*met_Calo)["FinalClus"]->phi(), weight);
+ m_MET_Calo_sum->Fill((*met_Calo)["FinalClus"]->sumet()/1000., weight);
}
@@ -1289,11 +1295,11 @@ namespace MissingEtDQA {
// Fill MET Track
ATH_MSG_INFO( " MET_Track:" );
- m_MET_Track->Fill((*met_Track)["Track"]->met()/1000., 1.);
- m_MET_Track_x->Fill((*met_Track)["Track"]->mpx()/1000., 1.);
- m_MET_Track_y->Fill((*met_Track)["Track"]->mpy()/1000., 1.);
- m_MET_Track_phi->Fill((*met_Track)["Track"]->phi(), 1.);
- m_MET_Track_sum->Fill((*met_Track)["Track"]->sumet()/1000., 1.);
+ m_MET_Track->Fill((*met_Track)["Track"]->met()/1000., weight);
+ m_MET_Track_x->Fill((*met_Track)["Track"]->mpx()/1000., weight);
+ m_MET_Track_y->Fill((*met_Track)["Track"]->mpy()/1000., weight);
+ m_MET_Track_phi->Fill((*met_Track)["Track"]->phi(), weight);
+ m_MET_Track_sum->Fill((*met_Track)["Track"]->sumet()/1000., weight);
const xAOD::VertexContainer *vxCont = 0;
ATH_CHECK( evtStore()->retrieve(vxCont, "PrimaryVertices") );
@@ -1302,17 +1308,17 @@ namespace MissingEtDQA {
const std::string name = "PVTrack_vx"+std::to_string(N);
if(vx->vertexType()!=xAOD::VxType::NoVtx) {
if(vx->vertexType()==xAOD::VxType::PriVtx) {
- m_MET_PVTrack_Nominal->Fill((*met_Track)[name]->met()/1000., 1.);
- m_MET_PVTrack_Nominal_x->Fill((*met_Track)[name]->mpx()/1000., 1.);
- m_MET_PVTrack_Nominal_y->Fill((*met_Track)[name]->mpy()/1000., 1.);
- m_MET_PVTrack_Nominal_phi->Fill((*met_Track)[name]->phi(), 1.);
- m_MET_PVTrack_Nominal_sum->Fill((*met_Track)[name]->sumet()/1000., 1.);
+ m_MET_PVTrack_Nominal->Fill((*met_Track)[name]->met()/1000., weight);
+ m_MET_PVTrack_Nominal_x->Fill((*met_Track)[name]->mpx()/1000., weight);
+ m_MET_PVTrack_Nominal_y->Fill((*met_Track)[name]->mpy()/1000., weight);
+ m_MET_PVTrack_Nominal_phi->Fill((*met_Track)[name]->phi(), weight);
+ m_MET_PVTrack_Nominal_sum->Fill((*met_Track)[name]->sumet()/1000., weight);
} else {
- m_MET_PVTrack_Pileup->Fill((*met_Track)[name]->met()/1000., 1.);
- m_MET_PVTrack_Pileup_x->Fill((*met_Track)[name]->mpx()/1000., 1.);
- m_MET_PVTrack_Pileup_y->Fill((*met_Track)[name]->mpy()/1000., 1.);
- m_MET_PVTrack_Pileup_phi->Fill((*met_Track)[name]->phi(), 1.);
- m_MET_PVTrack_Pileup_sum->Fill((*met_Track)[name]->sumet()/1000., 1.);
+ m_MET_PVTrack_Pileup->Fill((*met_Track)[name]->met()/1000., weight);
+ m_MET_PVTrack_Pileup_x->Fill((*met_Track)[name]->mpx()/1000., weight);
+ m_MET_PVTrack_Pileup_y->Fill((*met_Track)[name]->mpy()/1000., weight);
+ m_MET_PVTrack_Pileup_phi->Fill((*met_Track)[name]->phi(), weight);
+ m_MET_PVTrack_Pileup_sum->Fill((*met_Track)[name]->sumet()/1000., weight);
}
}
}
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/EfficiencyResponseHistos.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/EfficiencyResponseHistos.h
index d05bc65e1abc380392e56becc48be0552317c4e3..5dbadef0e7002712a0cb23a461c731edc3db87d0 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/EfficiencyResponseHistos.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/EfficiencyResponseHistos.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_EFFICIENCYRESPONSEHISTOS_H
@@ -22,7 +22,7 @@ public:
virtual StatusCode initialize() ;
virtual int buildHistos();
- virtual int fillHistosFromContainer(const xAOD::JetContainer &cont);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer &cont, float weight);
protected:
ToolHandleArray<HistoDefinitionTool> m_histoDef;
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIEfficiencyResponseHistos.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIEfficiencyResponseHistos.h
index f576206e48df02a929a6d42742ca4031f2d76854..e97f8ec9478c88f12f488312429dcfe5f17c4c6b 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIEfficiencyResponseHistos.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIEfficiencyResponseHistos.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_EFFICIENCYRESPONSEHISTOSHI_H
@@ -24,7 +24,7 @@ public:
virtual StatusCode initialize() ;
virtual int buildHistos();
- virtual int fillHistosFromContainer(const xAOD::JetContainer &cont);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer &cont, float weight);
///HI
private:
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h
index b234e92615e782d78f477f204b99ccff8624b773..dee42ca28cb2d1daa183500a57350ab92f91f476 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HIJetUEMonitoring.h
@@ -25,7 +25,7 @@ class HIJetUEMonitoring : public JetHistoBase {
~HIJetUEMonitoring(){};
virtual StatusCode initialize() ;
virtual int buildHistos();
- virtual int fillHistosFromJet(const xAOD::Jet &j);
+ virtual int fillHistosFromJet(const xAOD::Jet &j, float weight);
// virtual int getEventShape();
private:
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HistosForJetSelection.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HistosForJetSelection.h
index 19b4644146290ab944c4962d19630e501ca98d49..a32b864a5592c503ccbe2c1ac8c2921fe4f0a48e 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/HistosForJetSelection.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/HistosForJetSelection.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_HISTOFORJETSELECTION_H
@@ -35,7 +35,7 @@ public:
virtual StatusCode initialize() ;
virtual int buildHistos();
- virtual int fillHistosFromContainer(const xAOD::JetContainer & cont);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer & cont, float weight);
virtual int finalizeHistos();
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetAttributeHisto.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetAttributeHisto.h
index 06b54f33d6db39c4fc3c2af258d6492f3d05b14e..e2fa4a461ccc7037c8fab3d92b22e3bbc55df288 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetAttributeHisto.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetAttributeHisto.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_JETATTRIBUTEHISTOS_H
@@ -43,8 +43,8 @@ public:
virtual StatusCode initialize() ;
virtual int buildHistos();
- virtual int fillHistosFromJet(const xAOD::Jet &j);
- virtual int fillHistosFromContainer(const xAOD::JetContainer & cont);
+ virtual int fillHistosFromJet(const xAOD::Jet &j, float weight);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer & cont, float weight);
protected:
/// Rename an histo according to the tool's path. redefine here to take m_selectedIndex into account.
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoBase.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoBase.h
index 5f1f5b8020551c2cbfc4da2df946a7ae84844a55..c8d3b6342503c9ccbc5e03778f2a05cd8ba7917d 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoBase.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoBase.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_JETHISTOGROUP_H
@@ -36,8 +36,8 @@ class JetHistoBase : public HistoGroupBase {
virtual StatusCode initialize() ;
- virtual int fillHistosFromContainer(const xAOD::JetContainer & cont);
- virtual int fillHistosFromJet(const xAOD::Jet &j);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer & cont, float weight);
+ virtual int fillHistosFromJet(const xAOD::Jet &j, float /*weight*/);
virtual int finalizeHistos();
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetKinematicHistos.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetKinematicHistos.h
index 52827d7946fcc2122bf2a2056aa9b7a667f63136..ce1b35b0501c701a993462e399f1241476c52473 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetKinematicHistos.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetKinematicHistos.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_JETKINEMATICHISTOS_H
@@ -28,8 +28,8 @@ public:
virtual int buildHistos();
- virtual int fillHistosFromContainer(const xAOD::JetContainer & cont);
- virtual int fillHistosFromJet(const xAOD::Jet &j);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer & cont, float weight);
+ virtual int fillHistosFromJet(const xAOD::Jet &j, float weight);
protected:
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetSubStructureHistos.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetSubStructureHistos.h
index 782e68927e55df53878d16747aea87622b5d7794..257c3a5af8f3d8bac1e294b220a7387a4039a55f 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetSubStructureHistos.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetSubStructureHistos.h
@@ -26,7 +26,7 @@ public:
virtual int buildHistos();
- virtual int fillHistosFromJet(const xAOD::Jet &j);
+ virtual int fillHistosFromJet(const xAOD::Jet &j, float weight);
protected:
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/LeadingJetsRelations.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/LeadingJetsRelations.h
index efe82bdc783a431e7fde01ed36b95a5b33f6fac6..baeaf8944a7d29147ffaf849806e8e91006401b8 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/LeadingJetsRelations.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/LeadingJetsRelations.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETMONITORING_LEADINGJETRELATION_H
@@ -23,7 +23,7 @@ public:
virtual StatusCode initialize() ;
virtual int buildHistos();
- virtual int fillHistosFromContainer(const xAOD::JetContainer &cont);
+ virtual int fillHistosFromContainer(const xAOD::JetContainer &cont, float weight);
protected:
ToolHandleArray<HistoDefinitionTool> m_histoDef;
diff --git a/Reconstruction/Jet/JetMonitoring/Root/EfficiencyResponseHistos.cxx b/Reconstruction/Jet/JetMonitoring/Root/EfficiencyResponseHistos.cxx
index 1fbc305e44a78897718c619d01d2493eca66fc93..a726531b04d6e430373578b5675bed3d0f25b984 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/EfficiencyResponseHistos.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/EfficiencyResponseHistos.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/EfficiencyResponseHistos.h"
@@ -53,7 +53,7 @@ int EfficiencyResponseHistos::buildHistos(){
}
-int EfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer &cont){
+int EfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer &cont, float weight){
const xAOD::JetContainer* refContainer = 0;
CHECK( evtStore()->retrieve( refContainer, m_refContainerName), 1 );
@@ -77,17 +77,17 @@ int EfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer &
double dr = sqrt(dr2min);
double refPt = refjet->pt() * toGeV;
- m_eff1->Fill(refPt, dr<0.1 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff2->Fill(refPt, dr<0.2 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff3->Fill(refPt, dr<0.3 ? 1 : 0 ); // 0 weight if not matching close enough
+ m_eff1->Fill(refPt, dr<0.1 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff2->Fill(refPt, dr<0.2 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff3->Fill(refPt, dr<0.3 ? weight : 0 ); // 0 weight if not matching close enough
- m_deltaRclosest->Fill( dr );
+ m_deltaRclosest->Fill( dr, weight );
if( dr < 0.3) {
double relDiff = ( matched->pt()* toGeV - refPt )/refPt;
- m_etres->Fill( relDiff );
- m_etres_eta->Fill( refjet->eta(), relDiff);
- m_etres_pt->Fill( refPt, relDiff);
+ m_etres->Fill( relDiff, weight );
+ m_etres_eta->Fill( refjet->eta(), relDiff, weight);
+ m_etres_pt->Fill( refPt, relDiff, weight);
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/HIEfficiencyResponseHistos.cxx b/Reconstruction/Jet/JetMonitoring/Root/HIEfficiencyResponseHistos.cxx
index 4f64c32fe5f52aeae24e7f6e8c85fc6b2ba5af48..8ae1ca6c0fd852bf1b8148f1a281b8f9e1460cae 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/HIEfficiencyResponseHistos.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/HIEfficiencyResponseHistos.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/HIEfficiencyResponseHistos.h"
@@ -96,7 +96,7 @@ int HIEfficiencyResponseHistos::buildHistos(){
}
-int HIEfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer &cont){
+int HIEfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer &cont, float weight){
m_n=2;
m_harmonic=m_n-1;
m_eventShape=nullptr;
@@ -141,29 +141,29 @@ int HIEfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer
if (fabs(refjet->eta()) > 2.1 ) continue;
// if (refPt<100 ) continue;
- m_eff1->Fill(refPt, dr<0.1 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff2->Fill(refPt, dr<0.2 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff3->Fill(refPt, dr<0.3 ? 1 : 0 ); // 0 weight if not matching close enough
+ m_eff1->Fill(refPt, dr<0.1 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff2->Fill(refPt, dr<0.2 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff3->Fill(refPt, dr<0.3 ? weight : 0 ); // 0 weight if not matching close enough
if (m_FCalET > 2.7){
- m_eff1_0_10->Fill(refPt, dr<0.1 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff2_0_10->Fill(refPt, dr<0.2 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff3_0_10->Fill(refPt, dr<0.3 ? 1 : 0 ); // 0 weight if not matching close enough
+ m_eff1_0_10->Fill(refPt, dr<0.1 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff2_0_10->Fill(refPt, dr<0.2 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff3_0_10->Fill(refPt, dr<0.3 ? weight : 0 ); // 0 weight if not matching close enough
}
if (m_FCalET < 2.7 && m_FCalET > 1.75 ){//10-20%
- m_eff1_10_20->Fill(refPt, dr<0.1 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff2_10_20->Fill(refPt, dr<0.2 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff3_10_20->Fill(refPt, dr<0.3 ? 1 : 0 ); // 0 weight if not matching close enough
+ m_eff1_10_20->Fill(refPt, dr<0.1 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff2_10_20->Fill(refPt, dr<0.2 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff3_10_20->Fill(refPt, dr<0.3 ? weight : 0 ); // 0 weight if not matching close enough
}
if (m_FCalET < 1.75 && m_FCalET > 0.65 ){//20-40%
- m_eff1_20_40->Fill(refPt, dr<0.1 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff2_20_40->Fill(refPt, dr<0.2 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff3_20_40->Fill(refPt, dr<0.3 ? 1 : 0 ); // 0 weight if not matching close enough
+ m_eff1_20_40->Fill(refPt, dr<0.1 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff2_20_40->Fill(refPt, dr<0.2 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff3_20_40->Fill(refPt, dr<0.3 ? weight : 0 ); // 0 weight if not matching close enough
}
if (m_FCalET < 0.20 ){//60-100%
- m_eff1_60_100->Fill(refPt, dr<0.1 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff2_60_100->Fill(refPt, dr<0.2 ? 1 : 0 ); // 0 weight if not matching close enough
- m_eff3_60_100->Fill(refPt, dr<0.3 ? 1 : 0 ); // 0 weight if not matching close enough
+ m_eff1_60_100->Fill(refPt, dr<0.1 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff2_60_100->Fill(refPt, dr<0.2 ? weight : 0 ); // 0 weight if not matching close enough
+ m_eff3_60_100->Fill(refPt, dr<0.3 ? weight : 0 ); // 0 weight if not matching close enough
}
m_deltaRclosest->Fill( dr );
float Acos = std::acos(std::cos(2*(matched->getAttribute<float>("JetEtaJESScaleMomentum_phi") - m_psiN_FCal)));
@@ -172,39 +172,39 @@ int HIEfficiencyResponseHistos::fillHistosFromContainer(const xAOD::JetContainer
if( dr < 0.2) {
double relDiff = ( matched->pt()* toGeV - refPt )/refPt;
- m_etres->Fill( relDiff );
+ m_etres->Fill( relDiff, weight );
m_etres_eta->Fill( refjet->eta(), relDiff);
if (matched->pt()* toGeV > 100) {
- m_etres_eta_hpt->Fill( refjet->eta(), relDiff);
- m_etres_pt_hpt_RP->Fill( m_psiN_FCal, relDiff );
- m_etres_pt_hpt_2Dphi->Fill( Acos, relDiff );
+ m_etres_eta_hpt->Fill( refjet->eta(), relDiff, weight);
+ m_etres_pt_hpt_RP->Fill( m_psiN_FCal, relDiff, weight );
+ m_etres_pt_hpt_2Dphi->Fill( Acos, relDiff, weight );
}
- m_etres_pt->Fill( refPt, relDiff);
- m_etres_pt_2Dphi->Fill( Acos, relDiff );
- m_etres_pt_RP->Fill( m_psiN_FCal, relDiff );
+ m_etres_pt->Fill( refPt, relDiff, weight);
+ m_etres_pt_2Dphi->Fill( Acos, relDiff, weight );
+ m_etres_pt_RP->Fill( m_psiN_FCal, relDiff, weight );
if (m_FCalET > 2.7){
- m_etres_0_10->Fill( relDiff );
- m_etres_eta_0_10->Fill( refjet->eta(), relDiff);
- if (matched->pt()* toGeV > 100) m_etres_eta_hpt_0_10->Fill( refjet->eta(), relDiff);
- m_etres_pt_0_10->Fill( refPt, relDiff);
+ m_etres_0_10->Fill( relDiff, weight );
+ m_etres_eta_0_10->Fill( refjet->eta(), relDiff, weight);
+ if (matched->pt()* toGeV > 100) m_etres_eta_hpt_0_10->Fill( refjet->eta(), relDiff, weight);
+ m_etres_pt_0_10->Fill( refPt, relDiff, weight);
}
if (m_FCalET < 2.7 && m_FCalET > 1.75 ){//10-20%
- m_etres_10_20->Fill( relDiff );
- m_etres_eta_10_20->Fill( refjet->eta(), relDiff);
- if (matched->pt()* toGeV > 100) m_etres_eta_hpt_10_20->Fill( refjet->eta(), relDiff);
- m_etres_pt_10_20->Fill( refPt, relDiff);
+ m_etres_10_20->Fill( relDiff, weight );
+ m_etres_eta_10_20->Fill( refjet->eta(), relDiff, weight);
+ if (matched->pt()* toGeV > 100) m_etres_eta_hpt_10_20->Fill( refjet->eta(), relDiff, weight);
+ m_etres_pt_10_20->Fill( refPt, relDiff, weight);
}
if (m_FCalET < 1.75 && m_FCalET > 0.65 ){//20-40%
- m_etres_20_40->Fill( relDiff );
- m_etres_eta_20_40->Fill( refjet->eta(), relDiff);
- if (matched->pt()* toGeV > 100) m_etres_eta_hpt_20_40->Fill( refjet->eta(), relDiff);
- m_etres_pt_20_40->Fill( refPt, relDiff);
+ m_etres_20_40->Fill( relDiff, weight );
+ m_etres_eta_20_40->Fill( refjet->eta(), relDiff, weight);
+ if (matched->pt()* toGeV > 100) m_etres_eta_hpt_20_40->Fill( refjet->eta(), relDiff, weight);
+ m_etres_pt_20_40->Fill( refPt, relDiff, weight);
}
if (m_FCalET < 0.20 ){//60-100%
- m_etres_60_100->Fill( relDiff );
- m_etres_eta_60_100->Fill( refjet->eta(), relDiff);
- if (matched->pt()* toGeV > 100) m_etres_eta_hpt_60_100->Fill( refjet->eta(), relDiff);
- m_etres_pt_60_100->Fill( refPt, relDiff);
+ m_etres_60_100->Fill( relDiff, weight );
+ m_etres_eta_60_100->Fill( refjet->eta(), relDiff, weight);
+ if (matched->pt()* toGeV > 100) m_etres_eta_hpt_60_100->Fill( refjet->eta(), relDiff, weight);
+ m_etres_pt_60_100->Fill( refPt, relDiff, weight);
}
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx b/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx
index 825f245f74373f7c835887ee4837e013fae1ab5f..d875297ee5b844e5ac7933f410671bd3b9bcc356 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/HIJetUEMonitoring.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//HIJetUEMonitoring.cxx
@@ -134,7 +134,7 @@ int HIJetUEMonitoring::buildHistos(){
return 0;
}
-int HIJetUEMonitoring::fillHistosFromJet(const xAOD::Jet &j){
+int HIJetUEMonitoring::fillHistosFromJet(const xAOD::Jet &j, float weight){
const xAOD::EventInfo* evtInfo;
CHECK(evtStore()->retrieve( evtInfo ), 1);
@@ -165,7 +165,7 @@ int HIJetUEMonitoring::fillHistosFromJet(const xAOD::Jet &j){
}
}
- m_FCALET->Fill(m_FCalET);
+ m_FCALET->Fill(m_FCalET, weight);
// m_jetScale is a property of the base tool
//const xAOD::JetFourMom_t p4 = j.jetP4( (xAOD::JetScale) m_jetScale);
@@ -178,104 +178,104 @@ int HIJetUEMonitoring::fillHistosFromJet(const xAOD::Jet &j){
if (fabs(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"))<2.8){
if (m_FCalET > 2.7){//0-10%
- m_SubtractedET_pt_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET );
+ m_SubtractedET_pt_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET, weight );
}
if (m_FCalET < 2.7 && m_FCalET > 1.75 ){//10-20%
- m_SubtractedET_pt_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET );
+ m_SubtractedET_pt_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET, weight );
}
if (m_FCalET < 1.75 && m_FCalET > 0.65 ){//20-40%
- m_SubtractedET_pt_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET );
+ m_SubtractedET_pt_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET, weight );
}
if (m_FCalET < 0.20 ){//60-100%
- m_SubtractedET_pt_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET );
+ m_SubtractedET_pt_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET, weight );
}
}
if (j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV > m_ptcut){
// ATH_MSG_INFO(" FCal ET: "<< m_FCalET<<" SubtractedE:, "<<SubtractedET<<" m_psiN_FCal: "<<m_psiN_FCal<<" Acos: "<<Acos <<" m_vN_fcal: "<<m_vN_fcal<<" ptcut: "<<m_ptcut);
- m_2dSubtractedET_pT->Fill( j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV, SubtractedET);
+ m_2dSubtractedET_pT->Fill( j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV, SubtractedET, weight);
- m_SubtractedET_Centrality->Fill( m_FCalET, SubtractedET);
- m_2dSubtractedET_Centrality->Fill( m_FCalET, SubtractedET);
- m_2dSubtractedET_Expected_Centrality->Fill( m_FCalET, (SubtractedET/m_FCalET)*0.025);
+ m_SubtractedET_Centrality->Fill( m_FCalET, SubtractedET, weight);
+ m_2dSubtractedET_Centrality->Fill( m_FCalET, SubtractedET, weight);
+ m_2dSubtractedET_Expected_Centrality->Fill( m_FCalET, (SubtractedET/m_FCalET)*0.025, weight);
- m_2dSubtractedET_Expected_eta->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
- m_SubtractedET_Expected_eta->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
- m_2dSubtractedET_2Dphi->Fill( Acos,SubtractedET);
- m_SubtractedET_eta->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET );
- m_SubtractedET_pt->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET );
- m_SubtractedET_2Dphi->Fill( Acos,SubtractedET);
+ m_2dSubtractedET_Expected_eta->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+ m_SubtractedET_Expected_eta->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+ m_2dSubtractedET_2Dphi->Fill( Acos,SubtractedET, weight);
+ m_SubtractedET_eta->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET, weight);
+ m_SubtractedET_pt->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_pt")*toGeV,SubtractedET, weight );
+ m_SubtractedET_2Dphi->Fill( Acos,SubtractedET, weight);
if (m_FCalET > 2.7){//0-10%
- m_JetUnsubtractedScaleMomentum_pt_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV );
- m_JetUnsubtractedScaleMomentum_eta_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta") );
- m_JetUnsubtractedScaleMomentum_phi_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi") );
- m_JetUnsubtractedScaleMomentum_m_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV );
- m_JetSubtractedScaleMomentum_pt_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV );
- m_JetSubtractedScaleMomentum_eta_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta") );
- m_JetSubtractedScaleMomentum_phi_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi") );
- m_JetSubtractedScaleMomentum_m_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV );
- m_2dSubtractedET_Expected_eta_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
- m_SubtractedET_Expected_eta_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
-
- m_2dSubtractedET_2Dphi_0_10->Fill( Acos,SubtractedET);
- m_SubtractedET_eta_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET );
- m_SubtractedET_2Dphi_0_10->Fill( Acos,SubtractedET);
+ m_JetUnsubtractedScaleMomentum_pt_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetUnsubtractedScaleMomentum_eta_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta"), weight );
+ m_JetUnsubtractedScaleMomentum_phi_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi"), weight );
+ m_JetUnsubtractedScaleMomentum_m_0_10->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_pt_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_eta_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta"), weight );
+ m_JetSubtractedScaleMomentum_phi_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi"), weight );
+ m_JetSubtractedScaleMomentum_m_0_10->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV, weight );
+ m_2dSubtractedET_Expected_eta_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+ m_SubtractedET_Expected_eta_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+
+ m_2dSubtractedET_2Dphi_0_10->Fill( Acos,SubtractedET, weight);
+ m_SubtractedET_eta_0_10->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET, weight );
+ m_SubtractedET_2Dphi_0_10->Fill( Acos,SubtractedET, weight);
}
if (m_FCalET < 2.7 && m_FCalET > 1.75 ){//10-20%
- m_JetUnsubtractedScaleMomentum_pt_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV );
- m_JetUnsubtractedScaleMomentum_eta_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta") );
- m_JetUnsubtractedScaleMomentum_phi_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi") );
- m_JetUnsubtractedScaleMomentum_m_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV );
- m_JetSubtractedScaleMomentum_pt_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV );
- m_JetSubtractedScaleMomentum_eta_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta") );
- m_JetSubtractedScaleMomentum_phi_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi") );
- m_JetSubtractedScaleMomentum_m_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV );
-
- m_2dSubtractedET_Expected_eta_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
- m_SubtractedET_Expected_eta_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
-
- m_2dSubtractedET_2Dphi_10_20->Fill( Acos,SubtractedET);
-
- m_SubtractedET_eta_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET );
- m_SubtractedET_2Dphi_10_20->Fill( Acos,SubtractedET);
+ m_JetUnsubtractedScaleMomentum_pt_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetUnsubtractedScaleMomentum_eta_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta"), weight );
+ m_JetUnsubtractedScaleMomentum_phi_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi"), weight );
+ m_JetUnsubtractedScaleMomentum_m_10_20->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_pt_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_eta_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta"), weight );
+ m_JetSubtractedScaleMomentum_phi_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi"), weight );
+ m_JetSubtractedScaleMomentum_m_10_20->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV, weight );
+
+ m_2dSubtractedET_Expected_eta_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+ m_SubtractedET_Expected_eta_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+
+ m_2dSubtractedET_2Dphi_10_20->Fill( Acos,SubtractedET, weight);
+
+ m_SubtractedET_eta_10_20->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET, weight );
+ m_SubtractedET_2Dphi_10_20->Fill( Acos,SubtractedET, weight);
}
if (m_FCalET < 1.75 && m_FCalET > 0.65 ){//20-40%
- m_JetUnsubtractedScaleMomentum_pt_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV );
- m_JetUnsubtractedScaleMomentum_eta_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta") );
- m_JetUnsubtractedScaleMomentum_phi_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi") );
- m_JetUnsubtractedScaleMomentum_m_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV );
- m_JetSubtractedScaleMomentum_pt_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV );
- m_JetSubtractedScaleMomentum_eta_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta") );
- m_JetSubtractedScaleMomentum_phi_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi") );
- m_JetSubtractedScaleMomentum_m_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV );
-
- m_2dSubtractedET_Expected_eta_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
- m_SubtractedET_Expected_eta_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
-
- m_2dSubtractedET_2Dphi_20_40->Fill( Acos,SubtractedET);
-
- m_SubtractedET_eta_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET );
- m_SubtractedET_2Dphi_20_40->Fill( Acos,SubtractedET);
+ m_JetUnsubtractedScaleMomentum_pt_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetUnsubtractedScaleMomentum_eta_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta"), weight );
+ m_JetUnsubtractedScaleMomentum_phi_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi"), weight );
+ m_JetUnsubtractedScaleMomentum_m_20_40->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_pt_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_eta_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta"), weight );
+ m_JetSubtractedScaleMomentum_phi_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi"), weight );
+ m_JetSubtractedScaleMomentum_m_20_40->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV, weight );
+
+ m_2dSubtractedET_Expected_eta_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+ m_SubtractedET_Expected_eta_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+
+ m_2dSubtractedET_2Dphi_20_40->Fill( Acos,SubtractedET, weight);
+
+ m_SubtractedET_eta_20_40->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET, weight );
+ m_SubtractedET_2Dphi_20_40->Fill( Acos,SubtractedET, weight);
}
if (m_FCalET < 0.20 ){//60-100%
- m_JetUnsubtractedScaleMomentum_pt_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV );
- m_JetUnsubtractedScaleMomentum_eta_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta") );
- m_JetUnsubtractedScaleMomentum_phi_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi") );
- m_JetUnsubtractedScaleMomentum_m_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV );
- m_JetSubtractedScaleMomentum_pt_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV );
- m_JetSubtractedScaleMomentum_eta_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta") );
- m_JetSubtractedScaleMomentum_phi_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi") );
- m_JetSubtractedScaleMomentum_m_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV );
-
- m_2dSubtractedET_Expected_eta_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
- m_SubtractedET_Expected_eta_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025);
-
- m_2dSubtractedET_2Dphi_60_100->Fill( Acos,SubtractedET);
-
- m_SubtractedET_eta_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET );
- m_SubtractedET_2Dphi_60_100->Fill( Acos,SubtractedET);
+ m_JetUnsubtractedScaleMomentum_pt_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetUnsubtractedScaleMomentum_eta_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_eta"), weight );
+ m_JetUnsubtractedScaleMomentum_phi_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_phi"), weight );
+ m_JetUnsubtractedScaleMomentum_m_60_100->Fill( j.getAttribute<float>("JetUnsubtractedScaleMomentum_m")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_pt_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_pt")*toGeV, weight );
+ m_JetSubtractedScaleMomentum_eta_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_eta"), weight );
+ m_JetSubtractedScaleMomentum_phi_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_phi"), weight );
+ m_JetSubtractedScaleMomentum_m_60_100->Fill( j.getAttribute<float>("JetSubtractedScaleMomentum_m")*toGeV, weight );
+
+ m_2dSubtractedET_Expected_eta_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+ m_SubtractedET_Expected_eta_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta") , (SubtractedET/m_FCalET)*0.025, weight);
+
+ m_2dSubtractedET_2Dphi_60_100->Fill( Acos,SubtractedET, weight);
+
+ m_SubtractedET_eta_60_100->Fill(j.getAttribute<float>("JetEtaJESScaleMomentum_eta"),SubtractedET, weight );
+ m_SubtractedET_2Dphi_60_100->Fill( Acos,SubtractedET, weight);
}
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/HistosForJetSelection.cxx b/Reconstruction/Jet/JetMonitoring/Root/HistosForJetSelection.cxx
index c825629812dc2e0e6a32ad102d5b2c0dff90dcfd..8cbd94f191306fd1d4a0b916a182a2c958f7232c 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/HistosForJetSelection.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/HistosForJetSelection.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/HistosForJetSelection.h"
@@ -77,7 +77,7 @@ int HistosForJetSelection::buildHistos(){
-int HistosForJetSelection::fillHistosFromContainer(const xAOD::JetContainer & cont){
+int HistosForJetSelection::fillHistosFromContainer(const xAOD::JetContainer & cont, float weight){
ConstDataVector< xAOD::JetContainer > tmpCont(SG::VIEW_ELEMENTS);
const xAOD::JetContainer * contPtr = NULL;
@@ -132,7 +132,7 @@ int HistosForJetSelection::fillHistosFromContainer(const xAOD::JetContainer & co
// then fill histos
for( auto jtool : m_histoTools){
ATH_MSG_DEBUG (" Filling " << jtool->name() << "..." );
- jtool->fillHistosFromContainer(*contPtr);
+ jtool->fillHistosFromContainer(*contPtr, weight);
}
return 0;
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/JetAttributeHisto.cxx b/Reconstruction/Jet/JetMonitoring/Root/JetAttributeHisto.cxx
index 49cc74ee1da0cfa81f7f7aa631b59f7c9ad484dc..57259b3c9967c82dbdf79e20a814b94c15b4d164 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/JetAttributeHisto.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/JetAttributeHisto.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/JetAttributeHisto.h"
@@ -12,7 +12,7 @@ namespace jet {
class HistoFiller {
public:
virtual ~HistoFiller() {}
- virtual void fill(const xAOD::Jet & ){};
+ virtual void fill(const xAOD::Jet &, float /*weight*/ ){};
// allows to avoid invalid attribute
virtual bool isValid(const xAOD::Jet &){return false;}
};
@@ -47,7 +47,7 @@ namespace jet {
struct AttFiller : public HistoFiller, public AccessorAndHisto<T, TH1F> {
AttFiller(const std::string & attname, TH1F* h, bool gev1) : AccessorAndHisto<T, TH1F>(attname, h, gev1) {}
- virtual void fill(const xAOD::Jet & j){this->m_h->Fill( this->m_accessor(j)*scale1 ); };
+ virtual void fill(const xAOD::Jet & j, float weight){this->m_h->Fill( this->m_accessor(j)*scale1, weight ); };
virtual bool isValid(const xAOD::Jet &j){return this->m_accessor.isAvailable(j);}
};
@@ -56,9 +56,9 @@ namespace jet {
struct VecAttFiller : public HistoFiller, public AccessorAndHisto<std::vector<T>, TH1F> {
VecAttFiller(const std::string & attname, TH1F* h, bool gev1) : AccessorAndHisto<std::vector<T>, TH1F>(attname, h, gev1) {}
- virtual void fill(const xAOD::Jet & j){
+ virtual void fill(const xAOD::Jet & j, float weight){
const std::vector<T> & vec = this->m_accessor( j);
- for(const T& v : vec ) this->m_h->Fill( v *scale1 );
+ for(const T& v : vec ) this->m_h->Fill( v *scale1, weight );
}
virtual bool isValid(const xAOD::Jet & j){return this->m_accessor.isAvailable(j);}
@@ -68,9 +68,9 @@ namespace jet {
struct VecAttIndexFiller : public HistoFiller, public AccessorAndHisto<std::vector<T>, TH1F> {
VecAttIndexFiller(const std::string & attname, TH1F* h, size_t index, bool gev1) : AccessorAndHisto<std::vector<T>,TH1F>(attname,h, gev1), m_index(index) {}
- virtual void fill(const xAOD::Jet & j){
+ virtual void fill(const xAOD::Jet & j, float weight){
const std::vector<T> & vec = this->m_accessor( j);
- if( vec.size() > m_index) this->m_h->Fill( vec[m_index]*scale1 );
+ if( vec.size() > m_index) this->m_h->Fill( vec[m_index]*scale1, weight );
}
virtual bool isValid(const xAOD::Jet & j){return this->m_accessor.isAvailable(j);}
@@ -85,7 +85,7 @@ namespace jet {
struct AttvsAttFiller : public HistoFiller, public AccessorAndHisto2<T,T, HTYPE> {
AttvsAttFiller(const std::string & att1,const std::string & att2 , HTYPE* h, bool gev1, bool gev2) : AccessorAndHisto2<T,T, HTYPE>(att1,att2,h, gev1, gev2) {}
- virtual void fill(const xAOD::Jet & j){this->m_h->Fill( this->m_accessor(j)*scale1, this->m_accessor2(j)*scale2 ); };
+ virtual void fill(const xAOD::Jet & j, float weight){this->m_h->Fill( this->m_accessor(j)*scale1, this->m_accessor2(j)*scale2, weight ); };
virtual bool isValid(const xAOD::Jet &j){return (this->m_accessor.isAvailable(j))&&(this->m_accessor2.isAvailable(j));}
};
@@ -94,11 +94,11 @@ namespace jet {
struct AttvsVecAttIndexFiller : public HistoFiller, public AccessorAndHisto2<std::vector<T>,T, HTYPE> {
AttvsVecAttIndexFiller(const std::string & att1,const std::string & att2 , HTYPE* h, size_t index , bool gev1, bool gev2, bool swapAxis=false) : AccessorAndHisto2<std::vector<T>,T, HTYPE>(att1,att2,h, gev1, gev2) , m_index(index), m_swap(swapAxis){}
- virtual void fill(const xAOD::Jet & j){
+ virtual void fill(const xAOD::Jet & j, float weight){
const std::vector<T> & vec = this->m_accessor( j);
if( vec.size() > m_index) {
- if( m_swap) this->m_h->Fill( this->m_accessor2(j)*scale2, vec[m_index]*scale1 ) ;
- else this->m_h->Fill( vec[m_index] *scale1, this->m_accessor2(j)*scale2) ;
+ if( m_swap) this->m_h->Fill( this->m_accessor2(j)*scale2, vec[m_index]*scale1, weight ) ;
+ else this->m_h->Fill( vec[m_index] *scale1, this->m_accessor2(j)*scale2, weight) ;
}
}
@@ -296,18 +296,18 @@ int JetAttributeHisto::buildHistos(){
return 0;
}
-int JetAttributeHisto::fillHistosFromJet(const xAOD::Jet &j){
- m_histoFiller->fill(j);
+int JetAttributeHisto::fillHistosFromJet(const xAOD::Jet &j, float weight){
+ m_histoFiller->fill(j, weight);
return 0;
}
-int JetAttributeHisto::fillHistosFromContainer(const xAOD::JetContainer & cont){
+int JetAttributeHisto::fillHistosFromContainer(const xAOD::JetContainer & cont, float weight){
if (cont.empty() ) return 0;
const xAOD::Jet * j0 = cont[0];
if ( !m_histoFiller->isValid(*j0) ){
return 0;
}
- return JetHistoBase::fillHistosFromContainer(cont);
+ return JetHistoBase::fillHistosFromContainer(cont, weight);
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/JetContainerHistoFiller.cxx b/Reconstruction/Jet/JetMonitoring/Root/JetContainerHistoFiller.cxx
index b5ac8f10e60a9e03364f951a0f38b9729957dd63..d5d664bf202a5bd247dbc714838ba583ce7d5cc4 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/JetContainerHistoFiller.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/JetContainerHistoFiller.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/JetContainerHistoFiller.h"
@@ -52,13 +52,14 @@ int JetContainerHistoFiller::fillHistos(){
return 0;
}
+ float weight = evtInfo->beamSpotWeight();
/// simply call fillHistosFromContainer() for each tool...
int count = 0;
for( auto jtool : m_histoTools){
ATH_MSG_DEBUG ("Filling hists " << jtool->name() << "..." << jCont);
- count += jtool->fillHistosFromContainer(*jCont);
+ count += jtool->fillHistosFromContainer(*jCont, weight);
}
return count;
diff --git a/Reconstruction/Jet/JetMonitoring/Root/JetHistoBase.cxx b/Reconstruction/Jet/JetMonitoring/Root/JetHistoBase.cxx
index aba0dc46256ef454642306cab84dcbb021697d9e..76b0de5e8141eb11b9e654762dd42764d121a70d 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/JetHistoBase.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/JetHistoBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/JetHistoBase.h"
@@ -21,13 +21,13 @@ StatusCode JetHistoBase::initialize() {
-int JetHistoBase::fillHistosFromContainer(const xAOD::JetContainer & cont){
+int JetHistoBase::fillHistosFromContainer(const xAOD::JetContainer & cont, float weight){
int count=0;
- for( const xAOD::Jet* jet : cont ){ count+=fillHistosFromJet( *jet );}
+ for( const xAOD::Jet* jet : cont ){ count+=fillHistosFromJet( *jet, weight );}
return count;
}
-int JetHistoBase::fillHistosFromJet(const xAOD::Jet &) { return 0;}
+int JetHistoBase::fillHistosFromJet(const xAOD::Jet &, float /*weight*/) { return 0;}
int JetHistoBase::finalizeHistos() {return 0;}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/JetKinematicHistos.cxx b/Reconstruction/Jet/JetMonitoring/Root/JetKinematicHistos.cxx
index a69451cdc4ec78f3a71329c7ce84d9a4f6f72b94..3cce6af5dcbdbc425fa238bb256968da83330958 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/JetKinematicHistos.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/JetKinematicHistos.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/JetKinematicHistos.h"
@@ -96,42 +96,42 @@ int JetKinematicHistos::buildHistos(){
-int JetKinematicHistos::fillHistosFromContainer(const xAOD::JetContainer & cont){
+int JetKinematicHistos::fillHistosFromContainer(const xAOD::JetContainer & cont, float weight){
// fill the N if needed.
- if (m_doN) m_njet->Fill( cont.size() );
+ if (m_doN) m_njet->Fill( cont.size(), weight );
// Perform the loop over jets in the base class :
- return JetHistoBase::fillHistosFromContainer(cont);
+ return JetHistoBase::fillHistosFromContainer(cont, weight);
}
-int JetKinematicHistos::fillHistosFromJet(const xAOD::Jet &j){
+int JetKinematicHistos::fillHistosFromJet(const xAOD::Jet &j, float weight){
if(m_jetScale != "JetAssignedScaleMomentum" && !j.isAvailable<float>(m_jetScale+"_pt")){
- if(m_doNConstit) m_nConstit->Fill( j.numConstituents() );
+ if(m_doNConstit) m_nConstit->Fill( j.numConstituents(), weight );
return 0;
}
// m_jetScale is a property of the base tool
const xAOD::JetFourMom_t p4 = j.jetP4(m_jetScale);
- m_pt->Fill( p4.Pt()*toGeV );
- m_eta->Fill( p4.Eta() );
- m_phi->Fill( p4.Phi() );
+ m_pt->Fill( p4.Pt()*toGeV, weight );
+ m_eta->Fill( p4.Eta(), weight );
+ m_phi->Fill( p4.Phi(), weight );
if (p4.Pt()*toGeV > 200.0){ // high eta
- m_pt_high->Fill( p4.Pt()*toGeV );
- m_eta_high->Fill( p4.Eta() );
- if(m_doE) m_e_high->Fill( p4.E()*toGeV );
- if(m_doM) m_m_high->Fill( p4.M()*toGeV );
- if(m_doNConstit) m_nConstit_high->Fill( j.numConstituents() );
+ m_pt_high->Fill( p4.Pt()*toGeV, weight );
+ m_eta_high->Fill( p4.Eta(), weight );
+ if(m_doE) m_e_high->Fill( p4.E()*toGeV, weight );
+ if(m_doM) m_m_high->Fill( p4.M()*toGeV, weight );
+ if(m_doNConstit) m_nConstit_high->Fill( j.numConstituents(), weight );
}
- if(m_doE) m_e->Fill( p4.E()*toGeV );
- if(m_doM) m_m->Fill( p4.M()*toGeV );
+ if(m_doE) m_e->Fill( p4.E()*toGeV, weight );
+ if(m_doM) m_m->Fill( p4.M()*toGeV, weight );
- if(m_doOccupancy) m_occupancyEtaPhi->Fill( p4.Eta(), p4.Phi() );
- if(m_doAveragePt) m_averagePtEtaPhi->Fill( p4.Eta(), p4.Phi() , p4.Pt()*toGeV);
- if(m_doAverageE) m_averageE_EtaPhi->Fill( p4.Eta(), p4.Phi() , p4.E()*toGeV);
+ if(m_doOccupancy) m_occupancyEtaPhi->Fill( p4.Eta(), p4.Phi(), weight );
+ if(m_doAveragePt) m_averagePtEtaPhi->Fill( p4.Eta(), p4.Phi() , p4.Pt()*toGeV, weight);
+ if(m_doAverageE) m_averageE_EtaPhi->Fill( p4.Eta(), p4.Phi() , p4.E()*toGeV, weight);
- if(m_doNConstit) m_nConstit->Fill( j.numConstituents() );
+ if(m_doNConstit) m_nConstit->Fill( j.numConstituents(), weight );
return 0;
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/JetSubStructureHistos.cxx b/Reconstruction/Jet/JetMonitoring/Root/JetSubStructureHistos.cxx
index 7b44b80acf01be013c2949696fff3c8156ccb1fa..404eed0b58631e0ba8c04524c84c26172e262c7a 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/JetSubStructureHistos.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/JetSubStructureHistos.cxx
@@ -63,17 +63,17 @@ int JetSubStructureHistos::buildHistos(){
-int JetSubStructureHistos::fillHistosFromJet(const xAOD::Jet &j){
+int JetSubStructureHistos::fillHistosFromJet(const xAOD::Jet &j, float weight){
//For definitions see JetSubStructureMomentTools
- if( j.getAttribute<float>("Tau1") > 1e-8 ) m_tau21->Fill( j.getAttribute<float>("Tau2") / j.getAttribute<float>("Tau1") );
- if( j.getAttribute<float>("Tau2") > 1e-8 ) m_tau32->Fill( j.getAttribute<float>("Tau3") / j.getAttribute<float>("Tau2") );
- if( j.getAttribute<float>("Tau1_wta") > 1e-8 ) m_tau21_wta->Fill( j.getAttribute<float>("Tau2_wta") / j.getAttribute<float>("Tau1_wta") );
- if( j.getAttribute<float>("Tau2_wta") > 1e-8 ) m_tau32_wta->Fill( j.getAttribute<float>("Tau3_wta") / j.getAttribute<float>("Tau2_wta") );
-
- if( j.getAttribute<float>("ECF1") > 1e-8 ) m_C1->Fill( j.getAttribute<float>("ECF2") / pow( j.getAttribute<float>("ECF1"), 2.0) );
- if( j.getAttribute<float>("ECF2") > 1e-8 ) m_C2->Fill( ( j.getAttribute<float>("ECF3") * j.getAttribute<float>("ECF1") ) / pow( j.getAttribute<float>("ECF2"), 2.0) );
- if( j.getAttribute<float>("ECF2") > 1e-8 ) m_D2->Fill( ( j.getAttribute<float>("ECF3") * pow( j.getAttribute<float>("ECF1"), 3.0 ) ) / pow( j.getAttribute<float>("ECF2"), 3.0) );
+ if( j.getAttribute<float>("Tau1") > 1e-8 ) m_tau21->Fill( j.getAttribute<float>("Tau2") / j.getAttribute<float>("Tau1"), weight );
+ if( j.getAttribute<float>("Tau2") > 1e-8 ) m_tau32->Fill( j.getAttribute<float>("Tau3") / j.getAttribute<float>("Tau2"), weight );
+ if( j.getAttribute<float>("Tau1_wta") > 1e-8 ) m_tau21_wta->Fill( j.getAttribute<float>("Tau2_wta") / j.getAttribute<float>("Tau1_wta"), weight );
+ if( j.getAttribute<float>("Tau2_wta") > 1e-8 ) m_tau32_wta->Fill( j.getAttribute<float>("Tau3_wta") / j.getAttribute<float>("Tau2_wta"), weight );
+
+ if( j.getAttribute<float>("ECF1") > 1e-8 ) m_C1->Fill( j.getAttribute<float>("ECF2") / pow( j.getAttribute<float>("ECF1"), 2.0), weight );
+ if( j.getAttribute<float>("ECF2") > 1e-8 ) m_C2->Fill( ( j.getAttribute<float>("ECF3") * j.getAttribute<float>("ECF1") ) / pow( j.getAttribute<float>("ECF2"), 2.0), weight );
+ if( j.getAttribute<float>("ECF2") > 1e-8 ) m_D2->Fill( ( j.getAttribute<float>("ECF3") * pow( j.getAttribute<float>("ECF1"), 3.0 ) ) / pow( j.getAttribute<float>("ECF2"), 3.0), weight );
return 0;
}
diff --git a/Reconstruction/Jet/JetMonitoring/Root/LeadingJetsRelations.cxx b/Reconstruction/Jet/JetMonitoring/Root/LeadingJetsRelations.cxx
index 7097095eae0e352bc1891ed813d93b02c4c16587..4ff6d2bfc86bc52387d1da2dbdc24c3acb603d23 100644
--- a/Reconstruction/Jet/JetMonitoring/Root/LeadingJetsRelations.cxx
+++ b/Reconstruction/Jet/JetMonitoring/Root/LeadingJetsRelations.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "JetMonitoring/LeadingJetsRelations.h"
@@ -44,7 +44,7 @@ int LeadingJetsRelations::buildHistos(){
}
-int LeadingJetsRelations::fillHistosFromContainer(const xAOD::JetContainer &cont){
+int LeadingJetsRelations::fillHistosFromContainer(const xAOD::JetContainer &cont, float weight){
if( cont.size()<2) return 0;
const xAOD::Jet * j1 = cont[0];
@@ -55,13 +55,13 @@ int LeadingJetsRelations::fillHistosFromContainer(const xAOD::JetContainer &cont
if(dPhi > 2*3.14159) dPhi -= 2*3.14159;
double dR = sqrt( dPhi*dPhi + dEta*dEta);
- if(m_histDeltaEta) m_histDeltaEta->Fill( dEta);
- if(m_histDeltaPhi) m_histDeltaPhi->Fill( dPhi);
- if(m_histDeltaR) m_histDeltaR->Fill( dR);
+ if(m_histDeltaEta) m_histDeltaEta->Fill( dEta, weight);
+ if(m_histDeltaPhi) m_histDeltaPhi->Fill( dPhi, weight);
+ if(m_histDeltaR) m_histDeltaR->Fill( dR, weight);
- if(m_histFrac) m_histFrac->Fill( j2->pt() / j1->pt());
+ if(m_histFrac) m_histFrac->Fill( j2->pt() / j1->pt(), weight);
- if(m_histEta1Eta2) m_histEta1Eta2->Fill( j1->eta(), j2->eta() );
+ if(m_histEta1Eta2) m_histEta1Eta2->Fill( j1->eta(), j2->eta(), weight );
return 0;
}