From acada213f00ccf3040712b231e581940018cae72 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 3 Aug 2018 15:22:58 +0200
Subject: [PATCH] Delete TrigNtupleBase package
With the removal of TriggerMenuAnalysis and TriggerMenuNtuple
(ATR-15431) this package is no longer needed. Also remove some obsolete
reference to the job options, which weren't working anymore since a long
time.
---
.../share/RecExCommon_topOptions.py | 5 -
.../TrigNtupleBase/CMakeLists.txt | 24 --
.../TrigNtupleBase/NtupleAlgorithm.h | 81 ------
.../TrigNtupleBase/NtupleComponent.h | 57 ----
.../TrigNtupleBase/src/NtupleAlgorithm.cxx | 272 ------------------
.../TrigNtupleBase/src/NtupleComponent.cxx | 50 ----
.../share/TriggerNTupleProduction.py | 70 -----
.../share/TriggerNTupleProduction.py | 1 -
8 files changed, 560 deletions(-)
delete mode 100644 Trigger/TrigAnalysis/TrigNtupleBase/CMakeLists.txt
delete mode 100644 Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleAlgorithm.h
delete mode 100644 Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleComponent.h
delete mode 100644 Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleAlgorithm.cxx
delete mode 100644 Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleComponent.cxx
delete mode 100644 Trigger/TriggerCommon/TrigTier0/share/TriggerNTupleProduction.py
delete mode 100644 Trigger/TriggerRelease/share/TriggerNTupleProduction.py
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index d59cba6d3e7..25e8349655d 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -1532,11 +1532,6 @@ except Exception:
# protect until doPyDump is defined in all releases
treatException("problem with the dumpers")
-#Trigger ntuple (from Clemencia Mora). Not if not rec.doTrigger
-if rec.readESD() and rec.doTrigger() and TriggerFlags.NtupleProductionFlags.produceNtuples():
- #old Tier0TriggerFlags.doTier0TriggerNtuple():
- protectedInclude("TriggerRelease/TriggerNTupleProduction.py")
-
if rec.doCBNT():
# AANTupleStream should be at the very end
topSequence+=theAANTupleStream
diff --git a/Trigger/TrigAnalysis/TrigNtupleBase/CMakeLists.txt b/Trigger/TrigAnalysis/TrigNtupleBase/CMakeLists.txt
deleted file mode 100644
index 0c457731f0e..00000000000
--- a/Trigger/TrigAnalysis/TrigNtupleBase/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Package: TrigNtupleBase
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrigNtupleBase )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/StoreGate
- GaudiKernel
- Trigger/TrigAnalysis/TrigDecisionTool )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_library( TrigNtupleBase
- src/*.cxx
- PUBLIC_HEADERS TrigNtupleBase
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel StoreGateLib SGtests TrigDecisionToolLib )
-
diff --git a/Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleAlgorithm.h b/Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleAlgorithm.h
deleted file mode 100644
index 14921b3abea..00000000000
--- a/Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleAlgorithm.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGNTUPLEBASE_NTUPLEALGORITHM_H
-#define TRIGNTUPLEBASE_NTUPLEALGORITHM_H
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "StoreGate/ActiveStoreSvc.h"
-#include "TrigDecisionTool/TrigDecisionTool.h"
-#include "TrigNtupleBase/NtupleComponent.h"
-#include "TTree.h"
-#include <vector>
-#include <string>
-#include <map>
-
-class NtupleAlgorithm: public AthAlgorithm {
-
- public:
- NtupleAlgorithm (const std::string& name, ISvcLocator* pSvcLocator);
- StatusCode initialize(void);
- StatusCode execute(void);
- StatusCode finalize(void);
- StatusCode beginRun();
-
- TTree *tree(void) { return m_tree; }
- TTree *treeRun(void) { return m_treeRun; }
-
- StatusCode containerKey(std::string propertyName, std::string *containerKey);
-
- ServiceHandle<ActiveStoreSvc>& activeStore() const;
-
- ToolHandle<Trig::TrigDecisionTool>& trigDecisionTool() const;
-
- protected:
- /** A function to parse the NtComponent class requests */
- StatusCode parseNtupleComponentStrings(void);
-
- /** Ntuple properties */
- std::string m_ntupleFile;
- std::string m_ntupleDir;
- std::string m_ntupleTreeName;
- std::string m_ntupleTreeTitle;
-
- /** A vector of the names of NtComponent classes available from this algorithm */
- std::vector<std::string> m_availableComponents;
-
- /** A vector of strings defining ntuple components and their properties */
- std::vector<std::string> m_ntupleComponentCommands;
-
- /** A vector of NtComponent class parameters */
- std::vector<NtComponent::NtComponentParameters> m_ntupleComponentParameters;
-
- /** A vector of instantiated ntuple components */
- std::vector<NtComponent::NtupleComponent *> m_ntupleComponents;
-
- /** A vector of instantiated run-wise ntuple components */
- std::vector<NtComponent::NtupleComponent *> m_ntupleRunComponents;
-
- private:
- /** A pointer to the TTree */
- TTree *m_tree;
- TTree *m_treeRun;
-
- /** Iterators for access to ntuple component vector */
- std::vector<NtComponent::NtupleComponent *>::iterator m_itrNtComp;
- std::vector<NtComponent::NtupleComponent *>::iterator m_itrNtCompEnd;
-
- mutable ServiceHandle<ActiveStoreSvc> m_activeStore;
- mutable ToolHandle<Trig::TrigDecisionTool> m_trigDecisionTool;
-};
-
-inline
-ServiceHandle<ActiveStoreSvc>& NtupleAlgorithm::activeStore() const
-{ return m_activeStore; }
-
-inline
-ToolHandle<Trig::TrigDecisionTool>& NtupleAlgorithm::trigDecisionTool() const
-{ return m_trigDecisionTool; }
-
-#endif
diff --git a/Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleComponent.h b/Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleComponent.h
deleted file mode 100644
index 804374ebed1..00000000000
--- a/Trigger/TrigAnalysis/TrigNtupleBase/TrigNtupleBase/NtupleComponent.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGNTUPLEBASE_NTUPLECOMPONENT_H
-#define TRIGNTUPLEBASE_NTUPLECOMPONENT_H
-
-#include "TTree.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/ActiveStoreSvc.h"
-#include "TrigDecisionTool/TrigDecisionTool.h"
-
-#include <map>
-#include <vector>
-
-class NtupleAlgorithm;
-class MsgStream;
-
-namespace NtComponent {
- struct NtComponentParameters {
- std::string name;
- std::map<std::string,std::string> containerKeys;
- std::vector<std::string> options;
- };
-
-
- class NtupleComponent {
-
- public:
- NtupleComponent(NtupleAlgorithm *mainAlg,
- NtComponentParameters parameters);
- virtual ~NtupleComponent();
-
- virtual StatusCode setupServices(void);
- virtual StatusCode book(void) = 0;
- virtual StatusCode fill(void) = 0;
- void setIsRunInfoComponent(bool runInfo) {m_isRunInfoComponent = runInfo;}
-
- protected:
-
-
- NtupleAlgorithm *m_mainAlg;
- MsgStream *m_msg;
- ServiceHandle<StoreGateSvc> *m_evtStore;
- ServiceHandle<StoreGateSvc> *m_detStore;
- ServiceHandle<ActiveStoreSvc> *m_activeStore;
- ToolHandle<Trig::TrigDecisionTool> *m_trigDecisionTool;
- TTree *m_tree;
- NtComponentParameters m_parameters;
- bool m_warningPrinted;
- bool m_isRunInfoComponent;
- };
-}
-
-#endif
diff --git a/Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleAlgorithm.cxx b/Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleAlgorithm.cxx
deleted file mode 100644
index 260056378e0..00000000000
--- a/Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleAlgorithm.cxx
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigNtupleBase/NtupleAlgorithm.h"
-#include "GaudiKernel/ITHistSvc.h"
-
-//---------------------------------------------------------------------
-
-NtupleAlgorithm::NtupleAlgorithm(const std::string& name, ISvcLocator* pSvcLocator):
- AthAlgorithm (name, pSvcLocator),
- m_tree(nullptr),
- m_treeRun(nullptr),
- m_activeStore("ActiveStoreSvc", name),
- m_trigDecisionTool("Trig::TrigDecisionTool/TrigDecisionTool", this)
-{
- // Ntuple properties
- declareProperty("ntupleFile", m_ntupleFile = "trigmb");
- declareProperty("ntupleDir", m_ntupleDir = "MinBias");
- declareProperty("ntupleTreeName", m_ntupleTreeName = "TrigMinBias");
- declareProperty("ntupleTreeTitle", m_ntupleTreeTitle = "Minbias Trigger Validation");
- declareProperty("ntupleComponents", m_ntupleComponentCommands, "A definition ntuple components and their parameters");
-}
-
-//---------------------------------------------------------------------
-
-StatusCode NtupleAlgorithm::initialize(){
- StatusCode sc;
-
- if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "entering intialize()" << endmsg;
-
- // retrive pointer to THistSvc
- ITHistSvc *tHistSvc;
- sc = service("THistSvc", tHistSvc);
- if (sc.isFailure() || !tHistSvc) {
- msg(MSG::ERROR) << "Unable to locate Service THistSvc" << endmsg;
- return sc;
- }
-
- // Create TTree and register it in the THistSvc. The TTree object
- // must not be deleted such that it can be writen into the TFile.
- m_tree = new TTree(m_ntupleTreeName.c_str(), m_ntupleTreeTitle.c_str());
-
- std::string fullNtupleName = "/"+m_ntupleFile+"/"+m_ntupleDir+"/"+m_ntupleTreeName;
- sc = tHistSvc->regTree(fullNtupleName, m_tree);
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to register TTree : " << fullNtupleName << endmsg;
- return sc;
- }
-
- // Initialise all ntuple components
- m_itrNtComp = m_ntupleComponents.begin();
- m_itrNtCompEnd = m_ntupleComponents.end();
- for(;m_itrNtComp!=m_itrNtCompEnd; ++m_itrNtComp) {
- if((sc = (*m_itrNtComp)->setupServices()).isFailure()) return sc;
- if((sc = (*m_itrNtComp)->book()).isFailure()) return sc;
- }
-
- // Setup the run-wise TTree
- if (m_ntupleRunComponents.size() > 0) {
- m_treeRun = new TTree((m_ntupleTreeName+"RunInfo").c_str(),
- (m_ntupleTreeTitle+" (For each run)").c_str());
- fullNtupleName = "/"+m_ntupleFile+"/"+m_ntupleDir+"/"+m_ntupleTreeName+"RunInfo";
- sc = tHistSvc->regTree(fullNtupleName, m_treeRun);
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to register TTree : " << fullNtupleName << endmsg;
- return sc;
- }
-
- // Initialise all ntuple components
- m_itrNtComp = m_ntupleRunComponents.begin();
- m_itrNtCompEnd = m_ntupleRunComponents.end();
- for(;m_itrNtComp!=m_itrNtCompEnd; ++m_itrNtComp) {
- (*m_itrNtComp)->setIsRunInfoComponent(true);
- if((sc = (*m_itrNtComp)->setupServices()).isFailure()) return sc;
- if((sc = (*m_itrNtComp)->book()).isFailure()) return sc;
- }
- }
-
- if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "leaving intialize()" << endmsg;
-
- return StatusCode::SUCCESS;
-}
-
-//---------------------------------------------------------------------
-
-StatusCode NtupleAlgorithm::execute() {
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "entering execute()" << endmsg;
-
- // Fill ntuple components
- m_itrNtComp = m_ntupleComponents.begin();
- m_itrNtCompEnd = m_ntupleComponents.end();
- for(;m_itrNtComp!=m_itrNtCompEnd; ++m_itrNtComp) {
- StatusCode sc = (*m_itrNtComp)->fill();
- if(sc.isFailure()) return sc;
- }
-
- // Write the record
- m_tree->Fill();
-
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "leaving execute()" << endmsg;
-
- return StatusCode::SUCCESS;
-}
-
-//---------------------------------------------------------------------
-
-StatusCode NtupleAlgorithm::finalize() {
- msg(MSG::INFO) << "entering finalize()" << endmsg;
-
- // Delete ntuple components
- m_itrNtComp = m_ntupleComponents.begin();
- m_itrNtCompEnd = m_ntupleComponents.end();
- for(;m_itrNtComp!=m_itrNtCompEnd; ++m_itrNtComp) {
- delete (*m_itrNtComp);
- }
-
- msg(MSG::INFO) << "leaving finalize()" << endmsg;
-
- return StatusCode::SUCCESS;
-}
-
-//---------------------------------------------------------------------
-
-StatusCode NtupleAlgorithm::parseNtupleComponentStrings() {
- NtComponent::NtComponentParameters ntComponentParameters;
-
- std::string tmpString, before, after;
- size_t stringLength, i, pos;
- std::vector<std::string>::iterator itr;
- std::vector<std::string>::iterator itr_end;
- std::vector<std::string>::iterator allowed_itr_begin;
- std::vector<std::string>::iterator allowed_itr_end;
-
- allowed_itr_begin = m_availableComponents.begin();
- allowed_itr_end = m_availableComponents.end();
-
- // Clear the ntComponentParameters object
- ntComponentParameters.name.clear();
- ntComponentParameters.containerKeys.clear();
- ntComponentParameters.options.clear();
-
- // Loop over all vector elements where one element defines one
- // ntuple component.
- itr = m_ntupleComponentCommands.begin();
- itr_end = m_ntupleComponentCommands.end();
- for(;itr!=itr_end;++itr) {
-
- // Push back the last set of parameters if the name of the
- // NtComponent class is present.
- if(itr!=m_ntupleComponentCommands.begin()) {
- if(ntComponentParameters.name.length()>0) {
- m_ntupleComponentParameters.push_back(ntComponentParameters);
- }
- else {
- msg(MSG::WARNING) << "No NtComponent class name given in string." << endmsg;
- }
-
- // Clear the ntComponentParameters object
- ntComponentParameters.name.clear();
- ntComponentParameters.containerKeys.clear();
- ntComponentParameters.options.clear();
- }
-
- stringLength = (*itr).length();
-
- i=0;
- while(i<stringLength) {
- tmpString.clear();
-
- // Copy all non-white space characters until a ',' is found.
- while((*itr)[i] != ',' && i<stringLength) {
- if((*itr)[i] != ' ') {
- tmpString.push_back((*itr)[i]);
- }
- i++;
- }
-
- // Check if this is an NtComponent name and therefore does not
- // contain ':'
- if((pos=tmpString.find(':')) == std::string::npos) {
-
- // Check if this is an allowed NtComponent class.
- if(find(allowed_itr_begin,allowed_itr_end,tmpString) == allowed_itr_end) {
- msg(MSG::WARNING) << tmpString << " is not an available ntuple component." << endmsg;
- i = stringLength; // Break out of loop.
- continue;
- }
-
- // Copy the name.
- ntComponentParameters.name = tmpString;
- }
- else {
- // Split the string keeping before ':' and after.
- before = tmpString.substr(0,pos);
- after = tmpString.substr(pos+1,std::string::npos);
-
- if(before == "opt") {
- ntComponentParameters.options.push_back(after);
- }
- else {
- ntComponentParameters.containerKeys.insert(std::make_pair(before,after));
- }
- }
-
- i++;
- }
- }
-
- if(ntComponentParameters.name.length()>0) {
- m_ntupleComponentParameters.push_back(ntComponentParameters);
- }
-
- // Print out the settings if the message level is low enough.
- if (msgLvl(MSG::INFO)) {
- std::vector<NtComponent::NtComponentParameters>::iterator para_itr;
- std::vector<NtComponent::NtComponentParameters>::iterator para_itr_end;
- std::map<std::string,std::string>::iterator map_str_itr;
- std::vector<std::string>::iterator vec_str_itr;
-
- para_itr = m_ntupleComponentParameters.begin();
- para_itr_end = m_ntupleComponentParameters.end();
-
- msg(MSG::INFO) << "===================================================== " << endmsg;
- msg(MSG::INFO) << " Activated NtComponent classes and settings " << endmsg;
- msg(MSG::INFO) << "----------------------------------------------------- " << endmsg;
-
- for(;para_itr!=para_itr_end;para_itr++) {
- msg(MSG::INFO) << (*para_itr).name << "NtComponent";
-
- for(map_str_itr = (*para_itr).containerKeys.begin();
- map_str_itr != (*para_itr).containerKeys.end();
- map_str_itr++) {
- msg(MSG::INFO) << ", class=" << (*map_str_itr).first << ",key=\"" << (*map_str_itr).second << "\"";
- }
- for(vec_str_itr = (*para_itr).options.begin();
- vec_str_itr != (*para_itr).options.end();
- vec_str_itr++) {
- msg(MSG::INFO) << ", opt:" << (*vec_str_itr);
- }
- msg(MSG::INFO) << endmsg;
- }
-
- msg(MSG::INFO) << "===================================================== " << endmsg;
- }
-
- return StatusCode::SUCCESS;
-}
-
-//---------------------------------------------------------------------
-
-StatusCode NtupleAlgorithm::beginRun(){
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "entering beginRun()" << endmsg;
-
- // Fill ntuple components for the RunInfo TTree
- std::vector<NtComponent::NtupleComponent *>::iterator itrNtComp = m_ntupleRunComponents.begin();
- for(;itrNtComp!=m_ntupleRunComponents.end(); ++itrNtComp) {
- StatusCode sc = (*itrNtComp)->fill();
- if(sc.isFailure()) return sc;
- }
-
- // Write the record
- if (m_ntupleRunComponents.size() > 0)
- m_treeRun->Fill();
-
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "leaving beginRun()" << endmsg;
- return StatusCode::SUCCESS;
-
-}
-
-//---------------------------------------------------------------------
-
diff --git a/Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleComponent.cxx b/Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleComponent.cxx
deleted file mode 100644
index 80422bc940b..00000000000
--- a/Trigger/TrigAnalysis/TrigNtupleBase/src/NtupleComponent.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigNtupleBase/NtupleComponent.h"
-#include "TrigNtupleBase/NtupleAlgorithm.h"
-#include "GaudiKernel/MsgStream.h"
-
-namespace NtComponent {
-
- //---------------------------------------------------------
-
- NtupleComponent::NtupleComponent(NtupleAlgorithm *mainAlg,
- NtComponentParameters parameters):
- m_mainAlg(mainAlg),
- m_msg(0),
- m_evtStore(0),
- m_detStore(0),
- m_activeStore(0),
- m_trigDecisionTool(0),
- m_tree(0),
- m_parameters(parameters),
- m_warningPrinted(false),
- m_isRunInfoComponent(false){
- }
-
- //---------------------------------------------------------
-
- NtupleComponent::~NtupleComponent() {
- }
-
- //---------------------------------------------------------
-
- StatusCode NtupleComponent::setupServices() {
- m_msg = &(m_mainAlg->msg());
- m_evtStore = &(m_mainAlg->evtStore());
- m_detStore = &(m_mainAlg->detStore());
- m_activeStore = &(m_mainAlg->activeStore());
- m_trigDecisionTool = &(m_mainAlg->trigDecisionTool());
- if (m_isRunInfoComponent) {
- m_tree = m_mainAlg->treeRun();
- } else {
- m_tree = m_mainAlg->tree();
- }
- return StatusCode::SUCCESS;
- }
-
- //---------------------------------------------------------
-
-}
diff --git a/Trigger/TriggerCommon/TrigTier0/share/TriggerNTupleProduction.py b/Trigger/TriggerCommon/TrigTier0/share/TriggerNTupleProduction.py
deleted file mode 100644
index 082ce8d3bac..00000000000
--- a/Trigger/TriggerCommon/TrigTier0/share/TriggerNTupleProduction.py
+++ /dev/null
@@ -1,70 +0,0 @@
-include.block ("TrigTier0/TriggerNTupleProduction.py")
-
-##
-## Job options to steer the inclusion of the ntuple production setup for all slices
-## (this has to be included after the TriggerFlags.NtupleProductionFlags have been set)
-##
-
-## Inside the specific slice JO the TriggerFlags.NtupleProductionFlags
-## can be used to access the name of the root file where each slice
-## should go:
-## example: NTAlg.DestinationFile = TriggerFlags.NtupleProductionFlags.FileNames.forSlice('MinBias')
-
-
-## Root trees should not be written directly to file but registered in
-## the THistSvc together with the file name (see example in
-## Trigger/TrigAnalysis/TrigNtupleBase/NtupleAlgorithm.cxx)
-
-from RecExConfig.RecFlags import rec
-
-from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
-cfg = TriggerConfigGetter()
-
-from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
-from AthenaCommon.Logging import logging
-
-logTriggerNTupleProduction = logging.getLogger("TriggerNTupleProduction.py")
-
-
-logTriggerNTupleProduction.info("Including trigger ntuple setups according to the following specifications")
-logTriggerNTupleProduction.info("Production Site: %r" % tf.NtupleProductionFlags.ProductionLocation() )
-logTriggerNTupleProduction.info("Slices : %r" % tf.NtupleProductionFlags.SliceTuples() )
-logTriggerNTupleProduction.info("Files : %r" % tf.NtupleProductionFlags.FileNames() )
-logTriggerNTupleProduction.info("Disabled slices: %r" % tf.NtupleProductionFlags.DisabledSlices() )
-
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-for filename in tf.NtupleProductionFlags.FileNames():
- ServiceMgr.THistSvc.Output += [filename+" DATAFILE=\'"+filename+"\' OPT=\'RECREATE\'"]
-
-# MinBias
-if tf.NtupleProductionFlags.SliceTuples.doSlice( "MinBias" ):
- include("TrigMinBiasNtuple/TrigMinBiasNtuple_jo.py")
- pass
-
-# Muon
-if tf.NtupleProductionFlags.SliceTuples.doSlice( "Muon" ) and rec.doMuon() :
- include("TrigMuonNtuple/TrigMuonNtuple_jo.py")
- pass
-
-# Tau
-if tf.NtupleProductionFlags.SliceTuples.doSlice( "Tau" ) and rec.doTau() :
- include("TrigTauPerformAthena/TrigTauNtuple_jo.py")
- pass
-
-# Egamma
-if tf.NtupleProductionFlags.SliceTuples.doSlice( "EGamma" ) and rec.doEgamma() :
- include("TrigEgammaNtuple/TrigEgammaNtuple_jo.py")
- pass
-
-#L1Calo
-if tf.NtupleProductionFlags.SliceTuples.doSlice( "L1Calo" ):
- include("TrigT1CaloCalibTools/L1Calo_D3PD_Tier1_jobOptions.py")
- pass
-
-# TrigMenu
-if tf.NtupleProductionFlags.SliceTuples.doSlice( "TrigMenu" ):
- include("TriggerMenuAnalysis/TriggerMenuAnalysis_Nt_Tier0.py")
- pass
diff --git a/Trigger/TriggerRelease/share/TriggerNTupleProduction.py b/Trigger/TriggerRelease/share/TriggerNTupleProduction.py
deleted file mode 100644
index 64b73491770..00000000000
--- a/Trigger/TriggerRelease/share/TriggerNTupleProduction.py
+++ /dev/null
@@ -1 +0,0 @@
-include("TrigTier0/TriggerNTupleProduction.py")
--
GitLab