From 2a828e00595711dfcb0cf60b11e2e6bb44e1a200 Mon Sep 17 00:00:00 2001
From: cantel <claire.antel@gmail.com>
Date: Wed, 19 Apr 2017 09:38:56 +0200
Subject: [PATCH] minor changes - removal of commented code, moving copyright
header to very top -, addressing code review comments.
Former-commit-id: 74961ac42f2718ca57c5908a3161da304d63c911
---
.../xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h | 4 ++--
.../src/xAODJetTrigAuxContainerCnv_v1.cxx | 6 ------
.../xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h | 4 ++--
.../TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h | 8 --------
4 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h b/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h
index 607f1471ba4..adb04d5c4fc 100644
--- a/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h
+++ b/Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h
@@ -1,9 +1,9 @@
-// Dear emacs, this is -*- c++ -*-
-
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
+// Dear emacs, this is -*- c++ -*-
+
// $Id: JetTrigAuxContainer_v2.h 2017-02-12 16:52 sschramm $
#ifndef XAODJET_VERSIONS_JETTRIGAUXCONTAINER_V2_H
#define XAODJET_VERSIONS_JETTRIGAUXCONTAINER_V2_H
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx
index 159d9ca2f28..b9b4d1ec5be 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.cxx
@@ -69,12 +69,6 @@ persToTrans( const xAOD::JetTrigAuxContainer_v1* oldObj,
}
newInt.setStore( newObj );
- /** THIS IS WHERE CONVERSION CAN BE DONE IF NEEDED
-
- E.g. you might want to create an empty vector of ElementLinks for the new branch.
-
- **/
-
std::vector< std::vector< ElementLink< xAOD::IParticleContainer > > > GhostTrack;
// Print what happened:
diff --git a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h
index ef90c8a0074..d74f97186ed 100644
--- a/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h
+++ b/Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h
@@ -1,9 +1,9 @@
-// Dear emacs, this is -*- c++ -*-
-
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
+// Dear emacs, this is -*- c++ -*-
+
// $Id: xAODJetTrigAuxContainerCnv_v1.h 797270 2017-02-15 00:03:55Z khoo $
#ifndef XAODJETATHENAPOOL_XAODJETTRIGAUXCONTAINERCNV_V1_H
#define XAODJETATHENAPOOL_XAODJETTRIGAUXCONTAINERCNV_V1_H
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h
index eb4e86b05ed..3af19261ff9 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetRecBase.h
@@ -61,14 +61,6 @@ class TrigHLTJetRecBase: public HLT::FexAlgo {
LabelIndex* indexMap,
PseudoJetVector& pjv_secondary);
- /*virtual HLT::ErrorCode retrieveSecondaryPseudoJetGetter();
-
- virtual HLT::ErrorCode getSecondaryPseudoJets(HLT::TriggerElement* inputTE,
- LabelIndex* indexMap,
- PseudoJetVector& pjv);
- virtual HLT::ErrorCode loadSecondaryPseudoJets(
- PseudoJetVector& pjv);
- */
ToolHandle<ITriggerPseudoJetGetter> m_secondarypseudoJetGetter; // a secondary pseudojet getter (for e.g. ghost association)
std::string m_secondarylabel; // to label secondary pseudojets
//
--
GitLab