minor changes - removal of commented code, moving copyright header to very top...

minor changes - removal of commented code, moving copyright header to very top -, addressing code review comments.


Former-commit-id: 74961ac4

Event/xAOD/xAODJet/xAODJet/versions/JetTrigAuxContainer_v2.h

-// 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

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:

Event/xAOD/xAODJetAthenaPool/src/xAODJetTrigAuxContainerCnv_v1.h

-// 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

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
   //