diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/CMakeLists.txt
deleted file mode 100644
index 6cd7c9c88b036bb9de95c9c835716ac522df67bf..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-# Package: HistogramUtils
-################################################################################
-
-# Declare the package name:
-atlas_subdir( HistogramUtils )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigAnalysis/TrigDecisionTool
- PRIVATE
- Control/AthenaBaseComps
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/PATCore
- PhysicsAnalysis/CommonTools/ExpressionEvaluation )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_component( HistogramUtils
- src/*.cxx
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigDecisionToolLib AthenaBaseComps GaudiKernel PATCoreLib ExpressionEvaluationLib )
-
-# Install files from the package:
-atlas_install_headers( HistogramUtils )
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
-
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/HistogramManager.py b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/HistogramManager.py
deleted file mode 100644
index 64b4d66d388f65876704b746c4ca8f262beeaf44..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/HistogramManager.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# @file: HistogramManager.py
-# @purpose: A python class to manage histogram booking
-# @author: Carsten Burgard <cburgard@cern.ch>
-
-__doc__ = 'A python class to manage histogram booking'
-__version__ = '$Revision: 1.0 $'
-__author__ = 'Carsten Burgard <cburgard@cern.ch>'
-
-import AthenaPython.PyAthena as PyAthena
-from ROOT import TH1, TH2, TH3
-from HistogramUtils.HistogramTool import HistogramTool
-import HistogramUtils
-from AthenaCommon.Logging import logging
-from AthenaCommon.Configurable import ConfigurableAlgTool
-
-
-histogramManagerLogger = logging.getLogger( 'histogramManagerLogger' )
-
-class HistogramManager:
- def __init__(self, Name, RootStreamName, RootDirName, OnlyAtCutStages = None, OutputLevel = 3, HistToolClasses = [HistogramUtils.HistogramUtilsConf.HistogramUtils__HistogramToolTH1, HistogramUtils.HistogramUtilsConf.HistogramUtils__HistogramToolTH2, HistogramUtils.HistogramUtilsConf.HistogramUtils__HistogramToolTH3]):
- self.m_name = Name
- self.m_rootStreamName = RootStreamName
- self.m_rootDirName = RootDirName
- self.m_onlyAtCutStages = OnlyAtCutStages
- self.m_histogramTools = {}
- self.m_outputLevel = OutputLevel
- self.m_histogramToolClasses = HistToolClasses
-
- def isAcceptedToolClass(self,obj):
- """return true if the type of this object is among the accepted tool classes, false otherwise"""
- if type(obj) in self.m_histogramToolClasses:
- return True
- return False
-
- def acceptToolClass(self,s):
- """add a type to the accepted tool classes"""
- self.m_histogramToolClasses.append(s)
-
- def rejectToolClass(self,s):
- """remove a type from the accepted tool classes"""
- l = len(self.m_histogramToolClasses)
- for i in range(0,l):
- if self.m_histogramToolClasses[l-i-1] == s:
- self.m_histogramToolClasses.remove(l-i-1)
-
- def printToolClasses(self):
- """print the list of accepted tool classes"""
- l = len(self.m_histogramToolClasses)
- for i in range(0,l):
- print(self.m_histogramToolClasses[i])
-
- def __iadd__(self, other):
- self.add(other)
- return self
-
- def add(self,other,arg1=None,arg2=None,arg3=None):
- """add a histogram tool to the list
- this method will do it's very best to interpret your input in a sensible way
- the most well-defined way of booking a histogram is manually constructing the tool, i.e.
- myHistMgr.add( HistogramTool( TH*("name","title",...) , "expression" ) )
- if something has been added, this function returns true, false otherwise.
- """
- if self.isAcceptedToolClass(other):
- # if this is a tool, add it to the list
- if other.name() not in self.m_histogramTools.keys():
- if self.m_outputLevel < 3: # 3 = INFO
- histogramManagerLogger.verbose("adding histogram tool '{:s}' to the manager".format(other.name()))
- self.m_histogramTools[other.name()] = other
- return True
- return False
- elif isinstance(other,ConfigurableAlgTool):
- histogramManagerLogger.warn("an instance of ConfigurableAlgTool named '{:s}' was passed to the HistogramManager, but its type is not listed as an accepted tool class. this HistogramManager will reject and ignore this instance. if you want this HistogramManager to accept this instance, you should add its type to the list of accepted tool classes by calling 'myHistogramManager.acceptToolClass(type(myToolObject))'.")
- return False
- elif isinstance(other, TH1):
- # if this is a histogram, instantiate a tool and add it to the list
- if other.GetName() not in self.m_histogramTools.keys():
- if self.m_outputLevel < 3: # 3 = INFO
- histogramManagerLogger.verbose("adding histogram '{:s}' to the manager".format(other.GetName()))
- if isinstance(other,TH3):
- self.m_histogramTools[other.GetName()] = HistogramTool(other,arg1,arg2,arg3,
- OutputLevel = self.m_outputLevel,
- RootDirName = self.m_rootDirName,
- RootStreamName = self.m_rootStreamName
- )
- return True
- elif isinstance(other,TH2):
- self.m_histogramTools[other.GetName()] = HistogramTool(other,arg1,arg2,
- OutputLevel = self.m_outputLevel,
- RootDirName = self.m_rootDirName,
- RootStreamName = self.m_rootStreamName
- )
- return True
- else:
- self.m_histogramTools[other.GetName()] = HistogramTool(other,arg1,
- OutputLevel = self.m_outputLevel,
- RootDirName = self.m_rootDirName,
- RootStreamName = self.m_rootStreamName
- )
- return True
- return False
- else:
- # if this is iterable, dispatch the items and recall the function
- first = None
- second = None
- third = None
- fourth = None
- try:
- iterator = iter(other)
- first = iterator.next()
- second = iterator.next()
- third = iterator.next()
- fourth = iterator.next()
- raise StopIteration
- except StopIteration:
- self.add(first,second,third,fourth)
- return True
- except TypeError:
- return False
-
- def __isub__(self, other):
- self.remove(other)
- return self
-
- def remove(self,other):
- """remove a histogram tool from the list - matching is done by name"""
- if isinstance(other, HistTool):
- if other.name() not in self.m_histogramTools.keys():
- del self.m_histogramTools[other.name()]
- return True
- elif isinstance(other, TH1):
- if other.GetName() not in self.m_histogramTools.keys():
- del self.m_histogramTools[other.GetName()]
- return True
- elif isinstance(other,basestring):
- if other not in self.m_histogramTools.keys():
- del self.m_histogramTools[other]
- return True
- return False
-
- def updateToolProperty(self,tool,key,value):
- """update a property of a tool, only setting it if it was undefined previously"""
- if not key in tool.getProperties().keys() or tool.getProperties()[key] == "<no value>":
- setattr(tool,key,value)
-
- def updateTools(self):
- """update the properties of all tool according to the defaults"""
- for tool in self.m_histogramTools.values():
- self.updateToolProperty(tool,"RootStreamName", self.m_rootStreamName )
- self.updateToolProperty(tool,"RootDirName", self.m_rootDirName )
- self.updateToolProperty(tool,"OutputLevel", self.m_outputLevel )
- self.updateToolProperty(tool,"OnlyAtCutStages",self.m_onlyAtCutStages)
-
- def ToolList(self):
- """retrieve the list of histogram tools"""
- self.updateTools()
- return self.m_histogramTools.values()
-
- def printToolList(self):
- """print the list of histogram tools"""
- list = self.ToolList()
- for tool in list:
- print("{: <10} {: <20} >> {:s}:{: <20}".format(tool.ClassName,tool.name(),tool.getProperties()["RootStreamName"],tool.getProperties()["RootDirName"]))
-
- def __str__(self):
- return "HistogramManager '{:s}' with ROOT stream '{:s}' to directory '{:s}'".format(self.m_name,self.m_rootStreamName,self.m_rootDirName)
-
- def __repr__(self):
- print(self.__str__())
- self.printToolList()
-
-
-
-
-
-
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/HistogramTool.py b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/HistogramTool.py
deleted file mode 100644
index 492679f718cae523e7aaf928e8b0f2b6ef58f2e2..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/HistogramTool.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# @file: HistogramTool.py
-# @purpose: A python factory for histogram tools
-# @author: Carsten Burgard <cburgard@cern.ch>
-
-__doc__ = 'A python factory for histogram tools'
-__version__ = '$Revision: 1.0 $'
-__author__ = 'Carsten Burgard <cburgard@cern.ch>'
-
-import HistogramUtils.HistogramUtilsConf as HistUtils
-from ROOT import TH1, TH2, TH3
-from AthenaCommon.Logging import logging
-from AthenaCommon.AppMgr import ToolSvc
-
-def extractBinning(axis):
- bins = []
- for i in range(1,axis.GetNbins()+1):
- bins.append(axis.GetBinLowEdge(i))
- bins.append(axis.GetBinUpEdge(axis.GetNbins()))
- return bins
-
-
-histogramToolLogger = logging.getLogger( 'histogramToolLogger' )
-
-def HistogramTool(histogram, arg1, arg2=None, arg3=None, **kwargs ):
- if isinstance(histogram,TH3) and arg2 and arg3:
- if histogram.GetXaxis().IsVariableBinSize():
- tool = HistUtils.HistogramUtils__HistogramToolTH3(
- ClassName = histogram.ClassName(),
- name = histogram.GetName(),
- Title = histogram.GetTitle(),
- NBinsX = histogram.GetNbinsX(),
- MinX = histogram.GetXaxis().GetXmin(),
- MaxX = histogram.GetXaxis().GetXmax(),
- VarX = arg1,
- BinBoundariesX = extractBinning(histogram.GetXaxis()),
- NBinsY = histogram.GetNbinsY(),
- MinY = histogram.GetYaxis().GetXmin(),
- MaxY = histogram.GetYaxis().GetXmax(),
- VarY = arg2,
- BinBoundariesY = extractBinning(histogram.GetYaxis()),
- NBinsZ = histogram.GetNbinsZ(),
- MinZ = histogram.GetZaxis().GetXmin(),
- MaxZ = histogram.GetZaxis().GetXmax(),
- BinBoundariesZ = extractBinning(histogram.GetZaxis()),
- VarZ = arg3
- )
- else:
- tool = HistUtils.HistogramUtils__HistogramToolTH3(
- ClassName = histogram.ClassName(),
- name = histogram.GetName(),
- Title = histogram.GetTitle(),
- NBinsX = histogram.GetNbinsX(),
- MinX = histogram.GetXaxis().GetXmin(),
- MaxX = histogram.GetXaxis().GetXmax(),
- VarX = arg1,
- NBinsY = histogram.GetNbinsY(),
- MinY = histogram.GetYaxis().GetXmin(),
- MaxY = histogram.GetYaxis().GetXmax(),
- VarY = arg2,
- NBinsZ = histogram.GetNbinsZ(),
- MinZ = histogram.GetZaxis().GetXmin(),
- MaxZ = histogram.GetZaxis().GetXmax(),
- VarZ = arg3
- )
- pass
- elif isinstance(histogram,TH2) and arg2 and not arg3:
- if histogram.GetXaxis().IsVariableBinSize():
- tool = HistUtils.HistogramUtils__HistogramToolTH2(
- ClassName = histogram.ClassName(),
- name = histogram.GetName(),
- Title = histogram.GetTitle(),
- NBinsX = histogram.GetNbinsX(),
- MinX = histogram.GetXaxis().GetXmin(),
- MaxX = histogram.GetXaxis().GetXmax(),
- VarX = arg1,
- BinBoundariesX = extractBinning(histogram.GetXaxis()),
- NBinsY = histogram.GetNbinsY(),
- MinY = histogram.GetYaxis().GetXmin(),
- MaxY = histogram.GetYaxis().GetXmax(),
- BinBoundariesY = extractBinning(histogram.GetYaxis()),
- VarY = arg2,
- )
- else:
- tool = HistUtils.HistogramUtils__HistogramToolTH2(
- ClassName = histogram.ClassName(),
- name = histogram.GetName(),
- Title = histogram.GetTitle(),
- NBinsX = histogram.GetNbinsX(),
- MinX = histogram.GetXaxis().GetXmin(),
- MaxX = histogram.GetXaxis().GetXmax(),
- VarX = arg1,
- NBinsY = histogram.GetNbinsY(),
- MinY = histogram.GetYaxis().GetXmin(),
- MaxY = histogram.GetYaxis().GetXmax(),
- VarY = arg2
- )
- pass
- elif isinstance(histogram,TH1) and not arg2 and not arg3:
- if histogram.GetXaxis().IsVariableBinSize():
- tool = HistUtils.HistogramUtils__HistogramToolTH1(
- ClassName = histogram.ClassName(),
- name = histogram.GetName(),
- Title = histogram.GetTitle(),
- NBinsX = histogram.GetNbinsX(),
- MinX = histogram.GetXaxis().GetXmin(),
- MaxX = histogram.GetXaxis().GetXmax(),
- BinBoundariesX = extractBinning(histogram.GetXaxis()),
- VarX = arg1
- )
- else:
- tool = HistUtils.HistogramUtils__HistogramToolTH1(
- ClassName = histogram.ClassName(),
- name = histogram.GetName(),
- Title = histogram.GetTitle(),
- NBinsX = histogram.GetNbinsX(),
- MinX = histogram.GetXaxis().GetXmin(),
- MaxX = histogram.GetXaxis().GetXmax(),
- VarX = arg1
- )
- pass
- else:
- histogramToolLogger.fatal("number of arguments does not match object of type '"+type(someObject).__name__+"'!")
- pass
- for key, value in kwargs.iteritems():
- setattr(tool,key,value)
- pass
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += tool
- return tool
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/__init__.py b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/__init__.py
deleted file mode 100644
index 74583d364ec2ca794156596c7254d9b234a940c6..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/python/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/share/AthHistogramSequencerExample.py b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/share/AthHistogramSequencerExample.py
deleted file mode 100644
index 16d50d358982b3361189589b93e1f329619e2a7c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/share/AthHistogramSequencerExample.py
+++ /dev/null
@@ -1,121 +0,0 @@
-from ROOT import TH1F, TH2F
-from AthenaCommon.AthenaCommonFlags import jobproperties as jp
-import AthenaCommon.SystemOfUnits as Units
-from HistogramUtils.HistogramManager import HistogramManager as HistMgr
-from HistogramUtils.HistogramTool import HistogramTool as HistTool
-
-from RecExConfig.RecFlags import rec
-rec.doDPD = False
-rec.doHist = False
-rec.doWriteTAG = False
-rec.doPerfMon = False
-rec.doSemiDetailedPerfMon = False
-rec.doDetailedPerfMon = False
-rec.doFileMetaData = False
-
-# Create the D3PD stream using MultipleStreamManager:
-# the aruments are: stream name, file name, TTree name in file
-
-myPath = "/afs/cern.ch/atlas/project/PAT/xAODs/r5534/valid2.117050.PowhegPythia_P2011C_ttbar.digit.AOD.e2657_s1933_s1964_r5534/AOD.01482225._000107.pool.root.1"
-jp.AthenaCommonFlags.FilesInput = [myPath]
-
-#from AthenaCommon.AlgSequence import AlgSequence
-#topSequence = AlgSequence()
-
-include ("RecExCommon/AnalysisCommon_topOptions.py")
-
-streamName = "MyFirstHistoStream"
-fileName = "myHistosAth.pool.root"
-rootStreamName = streamName
-rootDirName = "/Hists"
-
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-MyFirstHistoXAODStream = MSMgr.NewRootStream( streamName, fileName )
-
-
-if not hasattr( ServiceMgr, 'THistSvc' ): print 'Ahhhhhhhh'
-
-ServiceMgr.THistSvc.OutputLevel = VERBOSE
-
-
-# ====================================================================
-# Create a subsequence:
-# Only when the first algorithm returns isEventAccepted,
-# the rest of this sub-sequence is executed
-# ====================================================================
-from AthenaCommon.AlgSequence import AthSequencer
-
-subSeqMyAthAnalysis = AthSequencer("MyFirstAnalysisSubSeq")
-topSequence += subSeqMyAthAnalysis
-
-
-myHistMgr = HistMgr("HistMgrHtoWWtoemu",
- RootStreamName = rootStreamName,
- RootDirName = rootDirName,
- OutputLevel = VERBOSE
-# OnlyAtCutStages = ["CutAlg2", "CutAlg3"]
-)
-
-myHistMgr += ( TH1F("ept", "p_{t}^{e}", 50, 0.0, 100.0), "ElectronCollection.pt / GeV ")
-myHistMgr.add( TH1F("mupt", "p_{t}^{#mu}", 50, 0.0, 100.0), "Muons.pt / GeV ")
-myHistMgr.add( [ TH1F("ept2", "p_{t}^{e}", 50, 0.0, 100.0), "ElectronCollection.pt / GeV " ] )
-myHistMgr += TH2F("muptvselpt", "p_{t}^{#mu} vs. p_{t}^{e}", 50, 0.0, 100.0, 50, 0.0, 100.0), "Muons.pt / GeV", "ElectronCollection.pt / GeV"
-myHistMgr += HistTool( TH2F("muptvselpt2", "p_{t}^{#mu} vs. p_{t}^{e}", 50, 0.0, 100.0, 50, 0.0, 100.0), "Muons.pt / GeV", "ElectronCollection.pt / GeV" )
-
-print(myHistMgr)
-
-#
-# # example for custom hist tool
-# # from MyCode.MyCodeConf import MetHistTool
-# # myHistMgr += MetHistTool("MyMetHistTool")
-#
-# mySpecialHistToolInstance = HistTool( TH2F("muptvselpt2", "p_{t}^{#mu} vs. p_{t}^{e}", 50, 0.0, 1.0, 50, 0.0, 1.0), "muon.pt()", "electron.pt()",
-# RootStreamName = rootStreamName,
-# RootDirName = rootDirName,
-# OnlyAtCutStages = ["CutAlg2", "CutAlg3"]
-# )
-#
-#
-# mySpecialHistToolInstance2 = HistTool( TH2F("muptvselpt3", "p_{t}^{#mu} vs. p_{t}^{e}", 50, 0.0, 1.0, 50, 0.0, 1.0), "muon.pt()", "electron.pt()" )
-# mySpecialHistToolInstance2.RootStreamName = rootStreamName
-# mySpecialHistToolInstance2.RootDirName = rootDirName
-# mySpecialHistToolInstance2.OnlyAtCutStages = ["CutAlg2", "CutAlg3"]
-#
-#
-# # http://acode-browser.usatlas.bnl.gov/lxr/source/atlas/Control/GaudiSequencer/src/AthSequencer.h
-# #from AthenaCommon.AlgSequence import AthHistogramSequencer
-
-
-# #htoWWtoemuSeq += Alg1("Alg1")
-#
-# htoWWtoemuSeq += CutAlg("CutAlg2", "count(ElectronContainer.pt() > 20 GeV) >=1")
-#
-# htoWWtoemuSeq += CutAlg("CutAlg3", "count(muons.pt() > 20 GeV) >= 1")
-#
-
-
-
-myHistToolInstance = HistTool( TH1F("my_mupt", "p_{t}^{#mu}", 50, 0.0, 100.0), " Muons.pt * 0.001 ",
- RootStreamName=rootStreamName,
- RootDirName=rootDirName,
- OutputLevel = VERBOSE
- )
-
-# subSeqMyAthAnalysis += CfgMgr.CutAlg( "MuonPtCut",
-# OutputLevel = VERBOSE,
-# Cut = "count(Muons.pt > 10*GeV) >= 1" )
-
-subSeqMyAthAnalysis += CfgMgr.HistAlg("myHistAlg",
- OutputLevel = VERBOSE,
- RootStreamName = streamName,
- RootDirName = "/MyHists",
- HistToolList = [ myHistToolInstance ] )
-
-myHistMgr.printToolList()
-
-
-htoWWtoemuSeq = CfgMgr.AthAnalysisSequencer( "HtoWWtoemuSeq", HistToolList = myHistMgr.ToolList() )
-topSequence += htoWWtoemuSeq
-
-#subSeqMyAthAnalysis += CfgMgr.HistAlg("myHistMgrAlg",
-# HistToolList = myHistMgr.ToolList() )
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistAlg.cxx b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistAlg.cxx
deleted file mode 100644
index b507826b3236c294c457543fbfa934f5f8aaf608..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistAlg.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// HistAlg.cxx
-// Implementation file for class HistAlg
-// Author: Carsten Burgard <cburgard@cern.ch>
-///////////////////////////////////////////////////////////////////
-
-// HistogramUtils includes
-#include "HistAlg.h"
-#include "HistogramTool.h"
-
-// STL includes
-#include <iostream>
-
-// FrameWork includes
-#include "GaudiKernel/Property.h"
-#include "PATCore/IAthHistogramTool.h"
-
-// ROOT includes
-#include "TH1.h"
-
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-// Constructors
-////////////////
-HistAlg::HistAlg( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthHistogramAlgorithm( name, pSvcLocator ),
- m_histToolList(this)
-{
- //
- // Property declaration
- //
- //declareProperty( "HistToolList", m_histToolList, "List of histogram tools to be employed by this algorithm" );
- declareProperty( "HistToolList", m_histToolList, "Histogram tool list to be employed by this algorithm" );
-
-
-}
-
-// Destructor
-///////////////
-HistAlg::~HistAlg()
-{}
-
-// Athena Algorithm's Hooks
-////////////////////////////
-StatusCode HistAlg::initialize()
-{
- ATH_MSG_DEBUG ("Initializing " << name() << " and retrieving " << m_histToolList.size() << " tools...");
-
- ATH_CHECK(m_histToolList.retrieve());
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode HistAlg::finalize()
-{
- ATH_MSG_DEBUG ("Finalizing " << name() << "...");
-
- ATH_CHECK(m_histToolList.release());
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode HistAlg::execute()
-{
- ATH_MSG_DEBUG ("Executing " << name() << "...");
-
- for(auto itr = this->m_histToolList.begin(); itr != this->m_histToolList.end(); itr++){
- ATH_CHECK((*itr)->fill(1.));
- }
-
- return StatusCode::SUCCESS;
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistAlg.h b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistAlg.h
deleted file mode 100644
index 209f897f95c38eac7258121283ff7d0324795bca..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistAlg.h
+++ /dev/null
@@ -1,80 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// HistAlg.h
-// Header file for class HistAlg
-// Author: S.Binet<binet@cern.ch>
-///////////////////////////////////////////////////////////////////
-#ifndef HISTOGRAMUTILS_HISTALG_H
-#define HISTOGRAMUTILS_HISTALG_H 1
-
-// STL includes
-#include <string>
-
-// FrameWork includes
-#include "AthenaBaseComps/AthHistogramAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h"
-
-class IAthHistogramTool;
-
-
-class HistAlg
- : public ::AthHistogramAlgorithm
-{
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
- public:
-
- // Copy constructor:
-
- /// Constructor with parameters:
- HistAlg( const std::string& name, ISvcLocator* pSvcLocator );
-
- /// Destructor:
- virtual ~HistAlg();
-
- // Assignment operator:
- //HistAlg &operator=(const HistAlg &alg);
-
- // Athena algorithm's Hooks
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
-
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Private data:
- ///////////////////////////////////////////////////////////////////
- private:
-
- ToolHandleArray<IAthHistogramTool> m_histToolList;
-
- /// Default constructor:
- HistAlg();
-
- /// Containers
-
-
-};
-
-// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-// Inline methods:
-///////////////////////////////////////////////////////////////////
-
-
-#endif //> !HISTOGRAMUTILS_HISTALG_H
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistogramTool.cxx b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistogramTool.cxx
deleted file mode 100644
index c53716f56629a1a4f937e7bb931102b83fdc0190..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistogramTool.cxx
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "HistogramTool.h"
-
-#include "ExpressionEvaluation/TriggerDecisionProxyLoader.h"
-#include "ExpressionEvaluation/SGxAODProxyLoader.h"
-#include "ExpressionEvaluation/SGNTUPProxyLoader.h"
-#include "ExpressionEvaluation/MultipleProxyLoader.h"
-#include "ExpressionEvaluation/StackElement.h"
-#include "GaudiKernel/StatusCode.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// this source file makes heavy use of preprocessor macros
-// while this make it harder to understand the inner workings, it
-// helps to keep the code maintainable, reduces copy & paste errors,
-// and helps to keep the code short and clear by avoiding code
-// duplication.
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// this precompiler macro serves to allow a coherent way of declaring histogram properties to histogram tools
-#define DECLARE_HIST_PROPERTIES() \
- declareProperty( "Title", m_histTitle, "Histogram Title"); \
- declareProperty( "ClassName", m_histClassName, "Histogram Class ('TH[1/2/3][D/F/I]')"); \
- declareProperty( "OnlyAtCutStages", m_cutStages, "Cut stages to at which this histogram should be filled");
-
-// this precompiler macro serves to allow a coherent way of declaring axis properties to histogram tools
-#define DECLARE_AXIS_PROPERTIES(AXIS) \
- declareProperty( "Title"#AXIS, m_axis ## AXIS.m_title, "Title of "#AXIS"-axis"); \
- declareProperty( "Var"#AXIS, m_axis ## AXIS.m_variable, "Definition of variable along "#AXIS"-axis"); \
- declareProperty( "NBins"#AXIS, m_axis ## AXIS.m_nBins, "Number of bins of "#AXIS"-axis (regular binning)"); \
- declareProperty( "Min"#AXIS, m_axis ## AXIS.m_min, "Minimum of "#AXIS"-axis (regular binning)"); \
- declareProperty( "Max"#AXIS, m_axis ## AXIS.m_max, "Maximum of "#AXIS"-axis (regular binning)"); \
- declareProperty( "BinBoundaries"#AXIS, m_axis ## AXIS.m_binBoundaries, "Bin boundaries of "#AXIS"-axis (variable binning)");
-
-// this precompiler macro serves to allow a coherent way of calling histogram constructors
-#define CREATE_HISTOGRAM(TARGETVARIABLE,CLASSNAME,BASETYPE,CONSTRUCTOR) \
- if(CLASSNAME == #BASETYPE"F"){ /* call TH*F constructor */ \
- TARGETVARIABLE = new BASETYPE ## F CONSTRUCTOR ; \
- } else if(CLASSNAME == #BASETYPE"D"){ /* call TH*D constructor */ \
- TARGETVARIABLE = new BASETYPE ## D CONSTRUCTOR; \
- } else if(CLASSNAME == #BASETYPE"I"){ /* call TH*I constructor */ \
- TARGETVARIABLE = new BASETYPE ## I CONSTRUCTOR ; \
- } else if(CLASSNAME == #BASETYPE"C"){ /* call TH*C constructor */ \
- TARGETVARIABLE = new BASETYPE ## C CONSTRUCTOR ; \
- } else { /* no match found */ \
- ATH_MSG_FATAL("Histogram class '"+CLASSNAME+"' is unknown to this tool!"); \
- return StatusCode::FAILURE; \
- }
-
-// this precompiler macro should make the histogram constructor calls more readable (for variable binnings)
-#define VARBINS(AXIS) \
- this->m_axis ## AXIS.m_binBoundaries.size(),this->m_axis ## AXIS.m_binBoundaries.data()
-
-// this precompiler macro should make the histogram constructor calls more readable (for fixed binnings)
-#define FIXBINS(AXIS) \
- this->m_axis ## AXIS.m_nBins,this->m_axis ## AXIS.m_min,this->m_axis ## AXIS.m_max
-
-// this precompiler macro checks the axis for validity and should make the initialization code more readable
-#define CHECK_AXIS(AXIS) \
- std::cout << this->name() << ": " << std::endl; this->m_axis ## AXIS.print(); \
- if(this->m_axis ## AXIS.isEmpty()){ \
- ATH_MSG_WARNING("HistogramTool '"+this->name()+"' has empty "#AXIS"-axis definition!"); \
- return StatusCode::SUCCESS; /* TODO: this is a workaround since initialize is called by retrieve before setting the properties. FIXME! */ \
- } else if(!this->m_axis ## AXIS.isValid()){ \
- ATH_MSG_FATAL("HistogramTool '"+this->name()+"' has invalid "#AXIS"-axis definition!"); \
- return StatusCode::FAILURE; \
- }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-/// default constructor of the AxisDetails struct
-HistogramUtils::AxisDetails::AxisDetails():
- m_title(""),
- m_variable(""),
- m_nBins(0),
- m_min(0.),
- m_max(0.)
-{
- // empty
-}
-
-/// check if an AxidDetails object has variable binning
-/**
- \return true if the axis has a variable binning, false otherwise
-*/
-bool HistogramUtils::AxisDetails::hasVariableBinning() const {
- return (m_binBoundaries.size() > 0);
-}
-
-
-/// print the axis details
-void HistogramUtils::AxisDetails::print() const {
- if(m_title.empty())
- std::cout << "[untitled axis]";
- else std::cout << m_title;
- std::cout << " << '" << m_variable << "' : ";
- if(this->hasVariableBinning()){
- for(size_t i=0; i<this->m_binBoundaries.size(); ++i){
- std::cout << m_binBoundaries[i] << " ";
- }
- } else {
- std::cout << this->m_nBins << " bins " << m_min << " -- " << m_max;
- }
- std::cout << std::endl;
-}
-
-/// check if an AxisDetails object is valid
-/**
- \return true if the axis details are sensible and consistent, false
- otherwise
- */
-bool HistogramUtils::AxisDetails::isValid() const {
- if(this->hasVariableBinning()){
- for(size_t i=1; i<m_binBoundaries.size(); i++){
- if(!(m_binBoundaries[i] > m_binBoundaries[i-1]))
- return false;
- }
- } else {
- if(m_max < m_min) return false;
- if(m_nBins < 1) return false;
- }
- return true;
-}
-
-/// check if an AxisDetails object is empty
-/**
- \return true if the axis details empty
- */
-
-bool HistogramUtils::AxisDetails::isEmpty() const {
- if(this->m_max == 0. && this->m_min == 0. && this->m_nBins==0 && this->m_binBoundaries.size() == 0) return true;
- return false;
-}
-
-/// default constructor of a TH1 tool
-HistogramUtils::HistogramToolTH1::HistogramToolTH1(const std::string& type, const std::string& name, const IInterface* parent) :
- AthHistogramTool(type,name,parent),
- m_histogram(nullptr),
- m_parserX(0)
-#ifndef XAOD_ANALYSIS
- , m_trigDecisionTool("Trig::TrigDecisionTool/TrigDecisionTool")
-#endif
-{
- declareInterface<IAthHistogramTool>( this );
-
- DECLARE_HIST_PROPERTIES();
- DECLARE_AXIS_PROPERTIES(X);
-}
-
-/// default constructor of a TH1 tool
-HistogramUtils::HistogramToolTH2::HistogramToolTH2(const std::string& type, const std::string& name, const IInterface* parent) :
- AthHistogramTool(type,name,parent),
- m_histogram(nullptr),
- m_parserX(0),
- m_parserY(0)
-#ifndef XAOD_ANALYSIS
- , m_trigDecisionTool("Trig::TrigDecisionTool/TrigDecisionTool")
-#endif
-{
- declareInterface<IAthHistogramTool>( this );
-
- DECLARE_HIST_PROPERTIES();
- DECLARE_AXIS_PROPERTIES(X);
- DECLARE_AXIS_PROPERTIES(Y);
-}
-
-/// default constructor of a TH1 tool
-HistogramUtils::HistogramToolTH3::HistogramToolTH3(const std::string& type, const std::string& name, const IInterface* parent) :
- AthHistogramTool(type,name,parent),
- m_histogram(nullptr),
- m_parserX(0),
- m_parserY(0),
- m_parserZ(0)
-#ifndef XAOD_ANALYSIS
- , m_trigDecisionTool("Trig::TrigDecisionTool/TrigDecisionTool")
-#endif
-{
- declareInterface<IAthHistogramTool>( this );
-
- DECLARE_HIST_PROPERTIES();
- DECLARE_AXIS_PROPERTIES(X);
- DECLARE_AXIS_PROPERTIES(Y);
- DECLARE_AXIS_PROPERTIES(Z);
-}
-
-/// fill the histogram from the event store
-/**
- \param weight event weight to be used
-
- depending on what the expression parser finds in the event store
- for the given expression, the histogram will be filled once per
- event (for scalar values) or multiple times per event (for vector
- values).
- */
-StatusCode HistogramUtils::HistogramToolTH1::fill( const double weight){
- ExpressionParsing::StackElement valX = m_parserX->evaluate();
- if(valX.isScalar()){
- // we found a scalar, we fill it into the histogram with the given
- // weight
- this->m_histogram->Fill(valX.scalarValue<double>(),weight);
- } else if(valX.isVector()){
- // we found a vector, we fill each entry into the histogram with
- // the given weight
- std::vector<double> vecX(valX.vectorValue<double>());
- auto end(vecX.end());
- for(auto itr = vecX.begin(); itr != end; itr++){
- this->m_histogram->Fill(*itr,weight);
- }
- } else {
- // what we found in the event store is neither a scalar nor a vector
- // it must be of some awkward type that can't be filled in a histogram
- // therefore, we fail gracefully
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-/// initialize this tool
-/**
- will perform various initialization tasks:
- - check validity of axis definitions
- - instantiate and initialze helper classes for expression parsing
- - prepare histogram name
- - instantiate histogram according to axis definitions
- - register histogram with THistSvc
-
- \return SUCCESS if everything went well, FAILURE otherwise
-*/
-StatusCode HistogramUtils::HistogramToolTH1::initialize(){
- // check the axis details
- CHECK_AXIS(X);
-
- // initialize proxy loaders for expression parsing
- ExpressionParsing::MultipleProxyLoader *proxyLoaders = new ExpressionParsing::MultipleProxyLoader();
-#ifndef XAOD_ANALYSIS
- proxyLoaders->push_back(new ExpressionParsing::TriggerDecisionProxyLoader(m_trigDecisionTool));
-#endif
- proxyLoaders->push_back(new ExpressionParsing::SGxAODProxyLoader(evtStore()));
- proxyLoaders->push_back(new ExpressionParsing::SGNTUPProxyLoader(evtStore()));
-
- // load the expressions
- this->m_parserX = new ExpressionParsing::ExpressionParser(proxyLoaders);
- this->m_parserX->loadExpression(this->m_axisX.m_variable);
-
- // process histogram name
- std::string name(this->name());
- while(name.find(".") != std::string::npos){
- name.replace(name.find("."),1,"/");
- }
-
- // instantiate histogram
- TH1* hist(0);
- if(this->m_axisX.hasVariableBinning()){
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH1,(name.c_str(),this->m_histTitle.c_str(),
- VARBINS(X)));
- } else {
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH1,(name.c_str(),this->m_histTitle.c_str(),
- FIXBINS(X)));
- }
-
- if(((TString)(hist->GetXaxis()->GetTitle())).IsNull()) hist->GetXaxis()->SetTitle(m_axisX.m_variable.c_str());
-
- // register histogram with THistSvc
- hist->SetDirectory(NULL);
- this->m_histogram = this->bookGetPointer( *(hist) );
- if(!m_histogram) return StatusCode::FAILURE;
-
- ATH_MSG_DEBUG("m_histname: " << m_histogram->GetName());
- ATH_MSG_DEBUG("m_prefix: " << m_prefix );
- ATH_MSG_DEBUG("m_rootDir: " << m_rootDir );
- ATH_MSG_DEBUG("m_histNamePrefix: " << m_histNamePrefix );
- ATH_MSG_DEBUG("m_histNamePostfix: " << m_histNamePostfix );
- ATH_MSG_DEBUG("m_histTitlePrefix: " << m_histTitlePrefix );
- ATH_MSG_DEBUG("m_histTitlePostfix: " << m_histTitlePostfix );
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode HistogramUtils::HistogramToolTH1::finalize(){
- return StatusCode::SUCCESS;
-}
-
-/// fill the histogram from the event store
-/**
- \param weight event weight to be used
-
- depending on what the expression parser finds in the event store
- for the given expression, the histogram will be filled once per
- event (for scalar values) or multiple times per event (for vector
- values).
- */
-StatusCode HistogramUtils::HistogramToolTH2::fill( const double weight){
- ExpressionParsing::StackElement valX = m_parserX->evaluate();
- ExpressionParsing::StackElement valY = m_parserY->evaluate();
- if(valX.isScalar()){
- if(valY.isScalar()){
- this->m_histogram->Fill(valX.scalarValue<double>(),valY.scalarValue<double>(),weight);
- } else if(valY.isVector()){
- double tmpX = valX.scalarValue<double>();
- std::vector<double> vecY(valY.vectorValue<double>());
- auto end(vecY.end());
- for(auto itr = vecY.begin(); itr != end; ++itr){
- this->m_histogram->Fill(tmpX,*itr,weight);
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else if(valX.isVector()){
- if(valY.isScalar()){
- double tmpY = valY.scalarValue<double>();
- std::vector<double> vecX(valX.vectorValue<double>());
- auto end(vecX.end());
- for(auto itr = vecX.begin(); itr != end; ++itr){
- this->m_histogram->Fill(*itr,tmpY,weight);
- }
- } else if(valY.isVector()){
- std::vector<double> vecX(valX.vectorValue<double>());
- std::vector<double> vecY(valY.vectorValue<double>());
- auto endX(vecX.end());
- auto endY(vecY.end());
- for(auto itrX = vecX.begin(); itrX != endX; ++itrX){
- for(auto itrY = vecY.begin(); itrY != endY; ++itrY){
- this->m_histogram->Fill(*itrX,*itrY,weight);
- }
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else {
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-/// initialize this tool
-/**
- will perform various initialization tasks:
- - check validity of axis definitions
- - instantiate and initialze helper classes for expression parsing
- - prepare histogram name
- - instantiate histogram according to axis definitions
- - register histogram with THistSvc
-
- \return SUCCESS if everything went well, FAILURE otherwise
-*/
-StatusCode HistogramUtils::HistogramToolTH2::initialize(){
- // check the axis details
- CHECK_AXIS(X);
- CHECK_AXIS(Y);
-
- // initialize proxy loaders for expression parsing
- ExpressionParsing::MultipleProxyLoader *proxyLoaders = new ExpressionParsing::MultipleProxyLoader();
-#ifndef XAOD_ANALYSIS
- proxyLoaders->push_back(new ExpressionParsing::TriggerDecisionProxyLoader(m_trigDecisionTool));
-#endif
- proxyLoaders->push_back(new ExpressionParsing::SGxAODProxyLoader(evtStore()));
- proxyLoaders->push_back(new ExpressionParsing::SGNTUPProxyLoader(evtStore()));
-
- // load the expressions
- this->m_parserX = new ExpressionParsing::ExpressionParser(proxyLoaders);
- this->m_parserX->loadExpression(this->m_axisX.m_variable);
- this->m_parserY = new ExpressionParsing::ExpressionParser(proxyLoaders);
- this->m_parserY->loadExpression(this->m_axisY.m_variable);
-
- // process histogram name
- std::string name(this->name());
- while(name.find(".") != std::string::npos){
- name.replace(name.find("."),1,"/");
- }
-
- // instantiate histogram
- TH2* hist(0);
- if(this->m_axisX.hasVariableBinning()){
- if(this->m_axisY.hasVariableBinning()){
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH2,(name.c_str(),this->m_histTitle.c_str(),
- VARBINS(X),
- VARBINS(Y)));
- } else {
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH2,(name.c_str(),this->m_histTitle.c_str(),
- VARBINS(X),
- FIXBINS(Y)));
- }
- } else {
- if(this->m_axisY.hasVariableBinning()){
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH2,(name.c_str(),this->m_histTitle.c_str(),
- FIXBINS(X),
- VARBINS(Y)));
- } else {
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH2,(name.c_str(),this->m_histTitle.c_str(),
- FIXBINS(X),
- FIXBINS(Y)));
- }
- }
- if(((TString)(hist->GetXaxis()->GetTitle())).IsNull()) hist->GetXaxis()->SetTitle(m_axisX.m_variable.c_str());
- if(((TString)(hist->GetYaxis()->GetTitle())).IsNull()) hist->GetYaxis()->SetTitle(m_axisY.m_variable.c_str());
-
-
- // register histogram with THistSvc
- hist->SetDirectory(NULL);
- this->m_histogram = dynamic_cast<TH2*>(this->bookGetPointer( *(hist), this->m_rootDir, this->m_prefix ));
- if(!m_histogram) return StatusCode::FAILURE;
-
- ATH_MSG_DEBUG("m_histname: " << m_histogram->GetName());
- ATH_MSG_DEBUG("m_prefix: " << m_prefix );
- ATH_MSG_DEBUG("m_rootDir: " << m_rootDir );
- ATH_MSG_DEBUG("m_histNamePrefix: " << m_histNamePrefix );
- ATH_MSG_DEBUG("m_histNamePostfix: " << m_histNamePostfix );
- ATH_MSG_DEBUG("m_histTitlePrefix: " << m_histTitlePrefix );
- ATH_MSG_DEBUG("m_histTitlePostfix: " << m_histTitlePostfix );
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode HistogramUtils::HistogramToolTH2::finalize(){
- return StatusCode::SUCCESS;
-}
-
-/// fill the histogram from the event store
-/**
- \param weight event weight to be used
-
- depending on what the expression parser finds in the event store
- for the given expression, the histogram will be filled once per
- event (for scalar values) or multiple times per event (for vector
- values).
- */
-
-StatusCode HistogramUtils::HistogramToolTH3::fill( const double weight){
- ExpressionParsing::StackElement valX = m_parserX->evaluate();
- ExpressionParsing::StackElement valY = m_parserY->evaluate();
- ExpressionParsing::StackElement valZ = m_parserZ->evaluate();
- if(valX.isScalar()){
- if(valY.isScalar()){
- if(valZ.isScalar()){
- this->m_histogram->Fill(valX.scalarValue<double>(),valY.scalarValue<double>(),weight);
- } else if(valZ.isVector()){
- double tmpX = valX.scalarValue<double>();
- double tmpY = valY.scalarValue<double>();
- std::vector<double> vecZ(valZ.vectorValue<double>());
- auto end(vecZ.end());
- for(auto itr = vecZ.begin(); itr != end; ++itr){
- this->m_histogram->Fill(tmpX,tmpY,*itr,weight);
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else if(valY.isVector()){
- if(valZ.isScalar()){
- double tmpX = valX.scalarValue<double>();
- std::vector<double> vecY(valY.vectorValue<double>());
- double tmpZ = valZ.scalarValue<double>();
- auto end(vecY.end());
- for(auto itr = vecY.begin(); itr != end; ++itr){
- this->m_histogram->Fill(tmpX,*itr,tmpZ,weight);
- }
- } else if(valZ.isVector()){
- double tmpX = valX.scalarValue<double>();
- std::vector<double> vecY(valY.vectorValue<double>());
- std::vector<double> vecZ(valZ.vectorValue<double>());
- auto endY(vecY.end());
- auto endZ(vecZ.end());
- for(auto itrY = vecY.begin(); itrY != endY; ++itrY){
- for(auto itrZ = vecZ.begin(); itrZ != endZ; ++itrZ){
- this->m_histogram->Fill(tmpX,*itrY,*itrZ,weight);
- }
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else if(valX.isVector()){
- if(valY.isScalar()){
- if(valZ.isScalar()){
- std::vector<double> vecX(valX.vectorValue<double>());
- double tmpY = valY.scalarValue<double>();
- double tmpZ = valZ.scalarValue<double>();
- auto end(vecX.end());
- for(auto itr = vecX.begin(); itr != end; ++itr){
- this->m_histogram->Fill(*itr,tmpY,tmpZ,weight);
- }
- } else if(valZ.isVector()){
- std::vector<double> vecX(valX.vectorValue<double>());
- double tmpY = valY.scalarValue<double>();
- std::vector<double> vecZ(valZ.vectorValue<double>());
- auto endX(vecX.end());
- auto endZ(vecZ.end());
- for(auto itrX = vecX.begin(); itrX != endX; ++itrX){
- for(auto itrZ = vecZ.begin(); itrZ != endZ; ++itrZ){
- this->m_histogram->Fill(*itrX,tmpY,*itrZ,weight);
- }
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else if(valY.isVector()){
- if(valZ.isScalar()){
- std::vector<double> vecX(valX.vectorValue<double>());
- std::vector<double> vecY(valY.vectorValue<double>());
- double tmpZ = valZ.scalarValue<double>();
- auto endX(vecX.end());
- auto endY(vecY.end());
- for(auto itrX = vecX.begin(); itrX != endX; ++itrX){
- for(auto itrY = vecY.begin(); itrY != endY; ++itrY){
- this->m_histogram->Fill(*itrX,*itrY,tmpZ,weight);
- }
- }
- } else if(valZ.isVector()){
- std::vector<double> vecX(valX.vectorValue<double>());
- std::vector<double> vecY(valY.vectorValue<double>());
- std::vector<double> vecZ(valZ.vectorValue<double>());
- auto endX(vecX.end());
- auto endY(vecY.end());
- auto endZ(vecZ.end());
- for(auto itrX = vecX.begin(); itrX != endX; ++itrX){
- for(auto itrY = vecY.begin(); itrY != endY; ++itrY){
- for(auto itrZ = vecZ.begin(); itrZ != endZ; ++itrZ){
- this->m_histogram->Fill(*itrX,*itrY,*itrZ,weight);
- }
- }
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else {
- return StatusCode::FAILURE;
- }
- } else {
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-/// initialize this tool
-/**
- will perform various initialization tasks:
- - check validity of axis definitions
- - instantiate and initialze helper classes for expression parsing
- - prepare histogram name
- - instantiate histogram according to axis definitions
- - register histogram with THistSvc
-
- \return SUCCESS if everything went well, FAILURE otherwise
-*/
-StatusCode HistogramUtils::HistogramToolTH3::initialize(){
- // check axis
- CHECK_AXIS(X);
- CHECK_AXIS(Y);
- CHECK_AXIS(Z);
-
- // initialize proxy loaders for expression parsing
- ExpressionParsing::MultipleProxyLoader *proxyLoaders = new ExpressionParsing::MultipleProxyLoader();
-#ifndef XAOD_ANALYSIS
- proxyLoaders->push_back(new ExpressionParsing::TriggerDecisionProxyLoader(m_trigDecisionTool));
-#endif
- proxyLoaders->push_back(new ExpressionParsing::SGxAODProxyLoader(evtStore()));
- proxyLoaders->push_back(new ExpressionParsing::SGNTUPProxyLoader(evtStore()));
-
- // load the expressions
- this->m_parserX = new ExpressionParsing::ExpressionParser(proxyLoaders);
- this->m_parserX->loadExpression(this->m_axisX.m_variable);
- this->m_parserY = new ExpressionParsing::ExpressionParser(proxyLoaders);
- this->m_parserY->loadExpression(this->m_axisY.m_variable);
- this->m_parserZ = new ExpressionParsing::ExpressionParser(proxyLoaders);
- this->m_parserZ->loadExpression(this->m_axisZ.m_variable);
-
- // process histogram name
- std::string name(this->name());
- while(name.find(".") != std::string::npos){
- name.replace(name.find("."),1,"/");
- }
-
- // instantiate histogram
- TH3* hist(0);
- if(this->m_axisX.hasVariableBinning() && this->m_axisY.hasVariableBinning() && this->m_axisZ.hasVariableBinning()){
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH3,(name.c_str(),this->m_histTitle.c_str(),
- VARBINS(X),
- VARBINS(Y),
- VARBINS(Z)));
- } else if(!this->m_axisX.hasVariableBinning() && !this->m_axisY.hasVariableBinning() && !this->m_axisZ.hasVariableBinning()){
- CREATE_HISTOGRAM(hist,this->m_histClassName,TH3,(name.c_str(),this->m_histTitle.c_str(),
- FIXBINS(X),
- FIXBINS(Y),
- FIXBINS(Z)));
- } else {
- ATH_MSG_FATAL("TH3-type histograms can only be constructed with fixed bins on all axis or variable bins on all axis - mixed binnings are not supported!");
- return StatusCode::FAILURE;
- }
-
- if(((TString)(hist->GetXaxis()->GetTitle())).IsNull()) hist->GetXaxis()->SetTitle(m_axisX.m_variable.c_str());
- if(((TString)(hist->GetYaxis()->GetTitle())).IsNull()) hist->GetYaxis()->SetTitle(m_axisY.m_variable.c_str());
- if(((TString)(hist->GetZaxis()->GetTitle())).IsNull()) hist->GetZaxis()->SetTitle(m_axisZ.m_variable.c_str());
-
- // register histogram with THistSvc
- hist->SetDirectory(NULL);
- this->m_histogram = dynamic_cast<TH3*>(this->bookGetPointer( *(hist), this->m_rootDir, this->m_prefix ));
- if(!m_histogram) return StatusCode::FAILURE;
-
- ATH_MSG_DEBUG("m_histname: " << m_histogram->GetName());
- ATH_MSG_DEBUG("m_prefix: " << m_prefix );
- ATH_MSG_DEBUG("m_rootDir: " << m_rootDir );
- ATH_MSG_DEBUG("m_histNamePrefix: " << m_histNamePrefix );
- ATH_MSG_DEBUG("m_histNamePostfix: " << m_histNamePostfix );
- ATH_MSG_DEBUG("m_histTitlePrefix: " << m_histTitlePrefix );
- ATH_MSG_DEBUG("m_histTitlePostfix: " << m_histTitlePostfix );
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode HistogramUtils::HistogramToolTH3::finalize(){
- return StatusCode::SUCCESS;
-}
-
-// TODO: implement destructor
-// TODO: implement finalize
-// TODO: implement copy constructor
-// TODO: investigate use of shared resources for ExpressionParsing classes
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistogramTool.h b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistogramTool.h
deleted file mode 100644
index 726509db16997413e9f4d6b67b8daede082bec83..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/HistogramTool.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: HistogramTool.h,v 1.0 2014-05-25 16:54 cburgard Exp $
-/**
- * @file HistogramTool.h
- * @author carsten burgard <cburgarc@cern.ch>
- * @date July, 2014
- * @brief tool for booking histograms
-
- */
-
-#ifndef HISTOGRAMUTILS_HISTOGRAMTOOL_H
-#define HISTOGRAMUTILS_HISTOGRAMTOOL_H 1
-
-#include "TH1.h"
-#include "TH2.h"
-#include "TH3.h"
-#include <string>
-
-#include "GaudiKernel/StatusCode.h"
-
-#include "AthenaBaseComps/AthHistogramTool.h"
-#include "PATCore/IAthHistogramTool.h"
-
-#include "ExpressionEvaluation/ExpressionParser.h"
-#ifndef XAOD_ANALYSIS
-#include "TrigDecisionTool/TrigDecisionTool.h"
-#endif
-
-namespace HistogramUtils {
-
- struct AxisDetails {
- AxisDetails();
- std::string m_title;
- std::string m_variable;
- unsigned int m_nBins;
- std::vector<double> m_binBoundaries;
- double m_min;
- double m_max;
- bool hasVariableBinning() const;
- bool isValid() const;
- bool isEmpty() const;
- void print() const;
- };
-
-
- class HistogramToolTH1: public AthHistogramTool, virtual public IAthHistogramTool {
- public:
- TH1* m_histogram;
- std::string m_histTitle;
- std::string m_histClassName;
- std::vector<std::string> m_cutStages;
- AxisDetails m_axisX;
-
- ExpressionParsing::ExpressionParser *m_parserX;
-#ifndef XAOD_ANALYSIS
- ToolHandle<Trig::TrigDecisionTool> m_trigDecisionTool;
-#endif
-
- public:
- HistogramToolTH1(const std::string& type, const std::string& name, const IInterface* parent);
- virtual StatusCode fill( const double weight = 1.0) override final;
- virtual StatusCode initialize() final override;
- virtual StatusCode finalize() final override;
- };
-
- class HistogramToolTH2: public AthHistogramTool, virtual public IAthHistogramTool {
- protected:
- TH2* m_histogram;
- std::string m_histTitle;
- std::string m_histClassName;
- std::vector<std::string> m_cutStages;
- AxisDetails m_axisX;
- AxisDetails m_axisY;
-
- ExpressionParsing::ExpressionParser *m_parserX;
- ExpressionParsing::ExpressionParser *m_parserY;
-#ifndef XAOD_ANALYSIS
- ToolHandle<Trig::TrigDecisionTool> m_trigDecisionTool;
-#endif
-
- public:
- HistogramToolTH2(const std::string& type, const std::string& name, const IInterface* parent);
- virtual StatusCode fill( const double weight = 1.0) override final;
- virtual StatusCode initialize() final override;
- virtual StatusCode finalize() final override;
- };
-
- class HistogramToolTH3: public AthHistogramTool, virtual public IAthHistogramTool {
- protected:
- TH3* m_histogram;
- std::string m_histTitle;
- std::string m_histClassName;
- std::vector<std::string> m_cutStages;
- AxisDetails m_axisX;
- AxisDetails m_axisY;
- AxisDetails m_axisZ;
-
- ExpressionParsing::ExpressionParser *m_parserX;
- ExpressionParsing::ExpressionParser *m_parserY;
- ExpressionParsing::ExpressionParser *m_parserZ;
-#ifndef XAOD_ANALYSIS
- ToolHandle<Trig::TrigDecisionTool> m_trigDecisionTool;
-#endif
-
- public:
- HistogramToolTH3(const std::string& type, const std::string& name, const IInterface* parent);
- virtual StatusCode fill( const double weight = 1.0) override final;
- virtual StatusCode initialize() final override;
- virtual StatusCode finalize() final override;
- };
-
-}
-
-#endif // HISTOGRAMUTILS_HISTOGRAMTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
deleted file mode 100644
index 2548d9e2ad4abd87c8f85e7151a6b340c456e285..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "../HistogramTool.h"
-#include "../HistAlg.h"
-
-using namespace HistogramUtils;
-
-DECLARE_COMPONENT( HistogramToolTH1 )
-DECLARE_COMPONENT( HistogramToolTH2 )
-DECLARE_COMPONENT( HistogramToolTH3 )
-
-DECLARE_COMPONENT( HistAlg )
-