From 7573ec3b47f063ca2b9c764f74e7bb30a2823a1a Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 2 Oct 2018 15:39:23 +0200
Subject: [PATCH] Remove unused AthAnalysisSequencer
Former-commit-id: ab5feb24ff213a73d52ba1fe16369a6a31acbc50
---
.../share/test_athanalysissequencer.py | 59 ---------------
.../src/AthAnalysisSequencer.cxx | 36 ----------
.../GaudiSequencer/src/AthAnalysisSequencer.h | 71 -------------------
.../src/components/GaudiSequencer_entries.cxx | 2 -
4 files changed, 168 deletions(-)
delete mode 100644 Control/GaudiSequencer/share/test_athanalysissequencer.py
delete mode 100644 Control/GaudiSequencer/src/AthAnalysisSequencer.cxx
delete mode 100644 Control/GaudiSequencer/src/AthAnalysisSequencer.h
diff --git a/Control/GaudiSequencer/share/test_athanalysissequencer.py b/Control/GaudiSequencer/share/test_athanalysissequencer.py
deleted file mode 100644
index da138eee8fb..00000000000
--- a/Control/GaudiSequencer/share/test_athanalysissequencer.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-svcMgr.EventSelector.InputCollections = [ "/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" ]
-
-# ====================================================================
-# Define your output root file using MultipleStreamManager
-# ====================================================================
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-rootStreamName = "MyFirstHistoStream"
-rootFileName = "myHistosAth.root"
-MyFirstHistoXAODStream = MSMgr.NewRootStream( rootStreamName, rootFileName )
-rootDirName = "/Hists"
-
-# Now, import the new histogram manager and histogram tool
-from HistogramUtils.HistogramManager import HistogramManager as HistMgr
-from HistogramUtils.HistogramTool import HistogramTool as HistTool
-
-histMgr = HistMgr( "MyHistMgr",
- RootStreamName = rootStreamName,
- RootDirName = rootDirName,
- )
-
-
-# Import the 1-d and 2-d histograms from ROOT
-from ROOT import TH1F, TH2F
-# Adding a few histograms to the histogram manager
-# Note the different methods of doing this (they are all equivalent)
-histMgr += ( TH1F("ept", "p_{t}^{e}", 50, 0.0, 100.0), "ElectronCollection.pt / GeV ")
-histMgr.add( TH1F("mupt", "p_{t}^{#mu}", 50, 0.0, 100.0), "Muons.pt / GeV ")
-histMgr += HistTool( 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" , OnlyAtCutStages = ["Cut2"] )
-
-# ====================================================================
-# Create a subsequence:
-# Remember that a subsequece stops its execution for a given event
-# after an algorithm that declares that that event doesn't pass
-# a certain selection.
-# ====================================================================
-algseq = CfgMgr.AthSequencer("AthAlgSeq")
-subSeq = CfgMgr.AthAnalysisSequencer("MySubSeq", HistToolList = histMgr.ToolList() , OutputLevel=DEBUG)
-#subSeq = CfgMgr.AthRetrySequencer("MySubSeq")
-#subSeq = CfgMgr.AthSequencer("MySubSeq")
-algseq += subSeq
-
-# Add an algorithm to your sub-sequence that fills all the histograms that
-# are managed by the histogram manager
-# subSeq += CfgMgr.HistAlg("HistAlgCut0", HistToolList = histMgr.ToolList() )
-
-# Make a cut
-subSeq += CfgMgr.CutAlg("Cut1", Cut = "count(Muons.pt > 10*GeV) >= 2" )
-
-# Add more histograms after the Cut1
-# subSeq += CfgMgr.HistAlg("HistAlgCut1", HistToolList = histMgr.ToolList() )
-
-# Make another cut
-subSeq += CfgMgr.CutAlg("Cut2", Cut = "count(ElectronCollection.pt > 10*GeV) >= 2" )
-
-# Add more histograms after the Cut2
-# subSeq += CfgMgr.HistAlg("HistAlgCut2", HistToolList = histMgr.ToolList() )
diff --git a/Control/GaudiSequencer/src/AthAnalysisSequencer.cxx b/Control/GaudiSequencer/src/AthAnalysisSequencer.cxx
deleted file mode 100644
index 1c2db3f8d6a..00000000000
--- a/Control/GaudiSequencer/src/AthAnalysisSequencer.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// AthAnalysisSequencer.cxx
-// Implementation file for class AthAnalysisSequencer
-// Author: Carsten Burgard
-///////////////////////////////////////////////////////////////////
-
-// GaudiSequencer includes
-#include "AthAnalysisSequencer.h"
-
-// STL includes
-
-// FrameWork includes
-//#include "GaudiKernel/Property.h"
-
-
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-// Constructors
-////////////////
-AthAnalysisSequencer::AthAnalysisSequencer( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthSequencer( name, pSvcLocator )
-{
-}
-
-// Destructor
-///////////////
-AthAnalysisSequencer::~AthAnalysisSequencer()
-{}
diff --git a/Control/GaudiSequencer/src/AthAnalysisSequencer.h b/Control/GaudiSequencer/src/AthAnalysisSequencer.h
deleted file mode 100644
index 2c02f0899ab..00000000000
--- a/Control/GaudiSequencer/src/AthAnalysisSequencer.h
+++ /dev/null
@@ -1,71 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// AthAnalysisSequencer.h
-// Header file for class AthAnalysisSequencer
-// Author: C. Burgard <cburgard@cern.ch>
-///////////////////////////////////////////////////////////////////
-#ifndef GAUDISEQUENCER_ATHANALYSISSEQUENCER_H
-#define GAUDISEQUENCER_ATHANALYSISSEQUENCER_H 1
-
-// STL includes
-#include <string>
-
-// FrameWork includes
-#include "AthSequencer.h"
-
-//#include "GaudiKernel/ToolHandle.h"
-//#include "GaudiKernel/IJobOptionsSvc.h"
-
-class IAthHistogramTool;
-
-/**
- ** ClassName: AthAnalysisSequencer
- **
- ** Description: An AthAnalysisSequencer is a special version of the
- ** AthSequencer that provides additional convenience functionality
- ** for histogramming and cutflow making. However, all the work
- ** is actually done in the python configurable here:
- ** Control/AthenaCommon/python/AlgSequence.py
- ** We keep this empty C++ shell currently only for being able to do:
- ** myAnaSeq = CfgMgr.AthAnalysisSequencer("MyAnalysisSeq")
- **/
-class AthAnalysisSequencer
- : public ::AthSequencer
-{
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
- public:
-
- // Copy constructor:
-
- /// Constructor with parameters:
- AthAnalysisSequencer( const std::string& name, ISvcLocator* pSvcLocator );
-
- /// Destructor:
- virtual ~AthAnalysisSequencer();
-
- ///////////////////////////////////////////////////////////////////
- // Private data:
- ///////////////////////////////////////////////////////////////////
- private:
-
- /// Default constructor:
- //AthAnalysisSequencer();
-
-};
-
-// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-// Inline methods:
-///////////////////////////////////////////////////////////////////
-
-
-#endif //> !GAUDISEQUENCER_ATHANALYSISSEQUENCER_H
diff --git a/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx b/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx
index f816583521e..20c5afa6642 100644
--- a/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx
+++ b/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx
@@ -1,13 +1,11 @@
#include "../AthRetrySequencer.h"
#include "../AthSequencer.h"
-#include "../AthAnalysisSequencer.h"
#include "../AthEventCounter.h"
#include "../AthPrescaler.h"
DECLARE_COMPONENT( AthRetrySequencer )
DECLARE_COMPONENT( AthSequencer )
-DECLARE_COMPONENT( AthAnalysisSequencer )
DECLARE_COMPONENT( AthEventCounter )
DECLARE_COMPONENT( AthPrescaler )
--
GitLab