From ac0aecbad9c34fa15beeb6beca146e46a03cc843 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Tue, 20 Feb 2018 14:16:04 +0000
Subject: [PATCH] Merge branch '21.0-PFlow' into '21.0'
TopoCluster validation changes
See merge request atlas/athena!8106
(cherry picked from commit d714cba5d505fb5544c6755e3c9a673882009adf)
ee634d08 add new histogram
efb9f965 add new histograms
0306ae45 change histogram range
52577d43 add new histogram
7300dff0 add new histogram
---
.../share/LUT_mc12.root | Bin
.../PFOHistUtils/PFOHistUtils/ClusterPlots.h | 7 +++++
.../PFOHistUtils/src/ClusterPlots.cxx | 24 ++++++++++++++++++
3 files changed, 31 insertions(+)
mode change 100755 => 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100755
new mode 100644
diff --git a/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/PFOHistUtils/ClusterPlots.h b/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/PFOHistUtils/ClusterPlots.h
index 56826083ad6..d027299d7ae 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/PFOHistUtils/ClusterPlots.h
+++ b/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/PFOHistUtils/ClusterPlots.h
@@ -32,6 +32,13 @@ namespace PFO {
TH1* m_Cluster_time;
TH1* m_Cluster_clusterSize;
+ TH1* m_Cluster_eta_lowpt;
+ TH1* m_Cluster_pt_interval;
+ TH1* m_Cluster_pt_zoom;
+
+ TH1* m_Cluster_eSample_EM;
+ TH1* m_Cluster_eSample_HAD;
+
void initializePlots();
std::string m_sClusterContainerName;
diff --git a/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/src/ClusterPlots.cxx b/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/src/ClusterPlots.cxx
index 78fe3abf69a..b6f5202340d 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/src/ClusterPlots.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/src/ClusterPlots.cxx
@@ -4,6 +4,7 @@
#include "PFOHistUtils/ClusterPlots.h"
+
namespace PFO {
ClusterPlots::ClusterPlots(PlotBase* pParent, std::string sDir, std::string sClusterContainerName) : PlotBase(pParent, sDir), m_sClusterContainerName(sClusterContainerName){}
@@ -23,6 +24,13 @@ namespace PFO {
m_Cluster_time = Book1D("Cluster_time",m_sClusterContainerName + "_time (Entries)",30,-200.0,100.0);
m_Cluster_clusterSize = Book1D("Cluster_clusterSize",m_sClusterContainerName + "_clusterSize (Entries)",20,0.0,20.0);
+ m_Cluster_eta_lowpt = Book1D("Cluster_Eta_lowPt",m_sClusterContainerName + "_Eta_lowPt (Entries/0.1)",100,-5.0,5.0);
+ m_Cluster_pt_interval = Book1D("Cluster_Pt_interval",m_sClusterContainerName + "_Pt_interval (Entries/1 GeV)", 980, 20.0, 1000.0);
+ m_Cluster_pt_zoom = Book1D("Cluster_Pt_zoom",m_sClusterContainerName + "_Pt_zomm (Entries/0.1 GeV)",3000,-100.0,200.0);
+
+ m_Cluster_eSample_EM = Book1D("Cluster_eSample_EM",m_sClusterContainerName +"_eSample_EM (Entries/1 GeV) ",300,-100.0,200.0);
+ m_Cluster_eSample_HAD = Book1D("Cluster_eSample_HAD",m_sClusterContainerName +"_eSample_HAD (Entries/1 GeV) ",300,-100.0,200.0);
+
}
void ClusterPlots::fill(const xAOD::CaloCluster& Cluster){
@@ -39,6 +47,22 @@ namespace PFO {
m_Cluster_time->Fill(Cluster.time());
m_Cluster_clusterSize->Fill(Cluster.clusterSize());
+ if (Cluster.pt()/1000.0 > -20 && Cluster.pt()/1000.0 < 20){
+ m_Cluster_eta_lowpt->Fill(Cluster.eta());
+ }
+ m_Cluster_pt_interval->Fill(Cluster.pt()/1000.0);
+ m_Cluster_pt_zoom->Fill(Cluster.pt()/1000.0);
+
+ float eSample_EM;
+ eSample_EM = Cluster.eSample(CaloSampling::PreSamplerB) + Cluster.eSample(CaloSampling::EMB1) + Cluster.eSample(CaloSampling::EMB2) + Cluster.eSample(CaloSampling::EMB3) + Cluster.eSample(CaloSampling::PreSamplerE) + Cluster.eSample(CaloSampling::EME1) + Cluster.eSample(CaloSampling::EME2) + Cluster.eSample(CaloSampling::EME3) + Cluster.eSample(CaloSampling::FCAL0);
+ m_Cluster_eSample_EM->Fill((double)eSample_EM/1000.0);
+
+
+
+ float eSample_HAD;
+ eSample_HAD = Cluster.eSample(CaloSampling::TileBar0) + Cluster.eSample(CaloSampling::TileBar1) + Cluster.eSample(CaloSampling::TileBar2) + Cluster.eSample(CaloSampling::HEC0) + Cluster.eSample(CaloSampling::HEC1) + Cluster.eSample(CaloSampling::HEC2) + Cluster.eSample(CaloSampling::HEC3) + Cluster.eSample(CaloSampling::FCAL1) + Cluster.eSample(CaloSampling::FCAL2);
+ m_Cluster_eSample_HAD->Fill((double)eSample_HAD/1000.0);
+
}
}
--
GitLab