From 50dead6dc1cbf457d01b8de80cf581d7981c0d4b Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Mon, 17 Aug 2020 15:16:10 +0200
Subject: [PATCH] Revert "A first version of validation code for pflow
FlowElements (charged)."
This reverts commit d1bc5d6d5d48541b3ada980b8c04acf8df0a44af.
---
.../PFChargedFlowElementValidationPlots.cxx | 15 -----
.../src/PFChargedFlowElementValidationPlots.h | 28 ---------
.../PFODQA/src/PhysValFlowElement.cxx | 61 -------------------
.../PFODQA/src/PhysValFlowElement.h | 39 ------------
.../PFODQA/src/components/PFODQA_entries.cxx | 2 -
5 files changed, 145 deletions(-)
delete mode 100644 Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.cxx
delete mode 100644 Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.h
delete mode 100644 Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.cxx
delete mode 100644 Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.h
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.cxx
deleted file mode 100644
index e02c597403b6..000000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PFChargedFlowElementValidationPlots.h"
-
-PFChargedFlowElementValidationPlots::PFChargedFlowElementValidationPlots(PlotBase* pParent, std::string sDir, std::string sFlowElementContainerName) : PlotBase(pParent, sDir)
- //m_PFOPlots(this,"",sPFOContainerName),
-{}
-
-void PFChargedFlowElementValidationPlots::fill(const xAOD::FlowElement& theFE, const xAOD::Vertex* theVertex ){
- //m_PFOPlots.fill(thePFO);
-}
-
-
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.h b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.h
deleted file mode 100644
index 3106ad79ae94..000000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PFChargedFlowElementValidationPlots.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PFCHARGEDFLOWELEMENTVALIDATIONPLOTS_H
-#define PFCHARGEDFLOWELEMENTVALIDATIONPLOTS_H
-
-#include "TrkValHistUtils/PlotBase.h"
-//#include "PFOHistUtils/PFOPlots.h"
-#include "xAODPFlow/FlowElement.h"
-#include "xAODTracking/Vertex.h"
-
-class PFChargedFlowElementValidationPlots : public PlotBase {
-
- public:
-
- /** Standard Constructor */
- PFChargedFlowElementValidationPlots(PlotBase* pParent, std::string sDir, std::string sPFOContainerName);
-
- /** fill the histograms up */
- void fill(const xAOD::FlowElement& theFE, const xAOD::Vertex* theVertex);
-
- private:
- /** 4-vector and charge histograms */
- //PFO::PFOPlots m_PFOPlots;
-
-};
-#endif
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.cxx
deleted file mode 100644
index 43b87bee1b8f..000000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PhysValFlowElement.h"
-#include "xAODPFlow/FlowElementContainer.h"
-
-PhysValFlowElement::PhysValFlowElement (const std::string& type, const std::string& name, const IInterface* parent ) : ManagedMonitorToolBase( type, name, parent ) {
-}
-
-PhysValFlowElement::~PhysValFlowElement() {}
-
-StatusCode PhysValFlowElement::initialize(){
- ATH_CHECK(ManagedMonitorToolBase::initialize());
-
- ATH_CHECK(m_PFFlowElementContainerHandleKey.initialize());
-
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode PhysValFlowElement::bookHistograms(){
-
- std::string theName = "PFlow/"+m_PFFlowElementContainerHandleKey.key();
-
- std::vector<HistData> hists;
- m_PFChargedFlowElementValidationPlots.reset(new PFChargedFlowElementValidationPlots(0,theName, theName));
- m_PFChargedFlowElementValidationPlots->setDetailLevel(100);
- m_PFChargedFlowElementValidationPlots->initialize();
- hists = m_PFChargedFlowElementValidationPlots->retrieveBookedHistograms();
-
- for (auto hist : hists) {
- ATH_CHECK(regHist(hist.first,hist.second,all));
- }
-
- return StatusCode::SUCCESS;
-
-}
-
-StatusCode PhysValFlowElement::fillHistograms(){
-
- SG::ReadHandle<xAOD::FlowElementContainer> PFlowElementContainerReadHandle(m_PFFlowElementContainerHandleKey);
- if(!PFlowElementContainerReadHandle.isValid()){
- ATH_MSG_WARNING("Invalid ReadHandle for xAOD::FlowElementContainer with key: " << PFlowElementContainerReadHandle.key());
- return StatusCode::SUCCESS;
- }
-
- for (auto theFE : *PFlowElementContainerReadHandle){
- if(theFE){
- m_PFChargedFlowElementValidationPlots->fill(*theFE, nullptr);
- }
- else ATH_MSG_WARNING("Invalid pointer to xAOD::FlowElement");
- }
-
- return StatusCode::SUCCESS;
-
-}
-
-StatusCode PhysValFlowElement::procHistograms(){
- return StatusCode::SUCCESS;
-}
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.h b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.h
deleted file mode 100644
index 2cd8c7822c95..000000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValFlowElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PHYSVALFLOWELEMENT_H
-#define PHYSVALFLOWELEMENT_H
-
-#include "PFChargedFlowElementValidationPlots.h"
-#include "AthenaMonitoring/ManagedMonitorToolBase.h"
-#include <string>
-#include "xAODPFlow/FlowElementContainer.h"
-#include "StoreGate/ReadHandleKey.h"
-
-class PhysValFlowElement : public ManagedMonitorToolBase {
-
-public:
-
- /** Standard Constructor */
- PhysValFlowElement (const std::string& type, const std::string& name, const IInterface* parent );
-
- /** Standard Destructor */
- virtual ~PhysValFlowElement();
-
- /** Standard AlgTool Functions */
- virtual StatusCode initialize();
- virtual StatusCode bookHistograms();
- virtual StatusCode fillHistograms();
- virtual StatusCode procHistograms();
-
- private:
-
- /** ReadHandle to retrieve xAOD::PFOContainer */
- SG::ReadHandleKey<xAOD::FlowElementContainer> m_PFFlowElementContainerHandleKey{this,"FlowElementContainerName","JetETMissChargedFlowElements","ReadHandleKey for the FlowElement container"};
-
- /** Pointer to class that deals with histograms for charged FlowElements */
- std::unique_ptr<PFChargedFlowElementValidationPlots> m_PFChargedFlowElementValidationPlots;
-
-};
-#endif
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
index 0167e0c4d41c..7c08e9e2dbfc 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
@@ -1,8 +1,6 @@
-#include "../PhysValFlowElement.h"
#include "../PhysValPFO.h"
#include "../PhysValCluster.h"
-DECLARE_COMPONENT( PhysValFlowElement )
DECLARE_COMPONENT( PhysValPFO )
DECLARE_COMPONENT( PhysValCluster )
--
GitLab