From a46be653e1392e446f0014d1ab43074fb6201804 Mon Sep 17 00:00:00 2001
From: Carlo Varni <cvarni@pc-tbed-pub-27.cern.ch>
Date: Tue, 11 Dec 2018 11:26:55 +0100
Subject: [PATCH] Renaming EventViewCreatorAlgorithmForBjet to
 Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets

---
 ...t.cxx => EventViewCreatorAlgorithmWithJets.cxx} | 12 ++++++------
 ...rBjet.h => EventViewCreatorAlgorithmWithJets.h} | 14 +++++++-------
 .../ViewAlgs/src/components/ViewAlgs_entries.cxx   |  4 ++--
 .../TrigUpgradeTest/python/bjetMenuDefs.py         |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)
 rename Trigger/TrigSteer/ViewAlgs/src/{EventViewCreatorAlgorithmForBjet.cxx => EventViewCreatorAlgorithmWithJets.cxx} (93%)
 rename Trigger/TrigSteer/ViewAlgs/src/{EventViewCreatorAlgorithmForBjet.h => EventViewCreatorAlgorithmWithJets.h} (71%)

diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmForBjet.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
similarity index 93%
rename from Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmForBjet.cxx
rename to Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
index 18937047063..1406d3f89c8 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmForBjet.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
@@ -4,7 +4,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "EventViewCreatorAlgorithmForBjet.h"
+#include "EventViewCreatorAlgorithmWithJets.h"
 #include "AthLinks/ElementLink.h"
 #include "AthViews/ViewHelper.h"
 #include "AthViews/View.h"
@@ -12,12 +12,12 @@
 #include "DecisionHandling/HLTIdentifier.h"
 
 
-EventViewCreatorAlgorithmForBjet::EventViewCreatorAlgorithmForBjet( const std::string& name, ISvcLocator* pSvcLocator )
+EventViewCreatorAlgorithmWithJets::EventViewCreatorAlgorithmWithJets( const std::string& name, ISvcLocator* pSvcLocator )
   : EventViewCreatorAlgorithm( name, pSvcLocator ) {}
 
-EventViewCreatorAlgorithmForBjet::~EventViewCreatorAlgorithmForBjet() {}
+EventViewCreatorAlgorithmWithJets::~EventViewCreatorAlgorithmWithJets() {}
 
-StatusCode EventViewCreatorAlgorithmForBjet::initialize() {
+StatusCode EventViewCreatorAlgorithmWithJets::initialize() {
   EventViewCreatorAlgorithm::initialize();
 
   ATH_CHECK( m_inViewJets.initialize() );
@@ -25,7 +25,7 @@ StatusCode EventViewCreatorAlgorithmForBjet::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode EventViewCreatorAlgorithmForBjet::execute_r( const EventContext& context ) const { 
+StatusCode EventViewCreatorAlgorithmWithJets::execute_r( const EventContext& context ) const { 
   auto outputHandles = decisionOutputs().makeHandles( context );     
   // make the views
   auto viewVector = std::make_unique< ViewContainer >();
@@ -156,7 +156,7 @@ StatusCode EventViewCreatorAlgorithmForBjet::execute_r( const EventContext& cont
   return StatusCode::SUCCESS;
 }
 
-StatusCode EventViewCreatorAlgorithmForBjet::placeJetInView( const xAOD::Jet* theObject, SG::View* view, const EventContext& context ) const {
+StatusCode EventViewCreatorAlgorithmWithJets::placeJetInView( const xAOD::Jet* theObject, SG::View* view, const EventContext& context ) const {
   // fill the Jet output collection  
   ATH_MSG_DEBUG( "Adding Jet To View : " << m_inViewJets.key() );
   auto oneObjectCollection = std::make_unique< ConstDataVector< xAOD::JetContainer > >();
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmForBjet.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
similarity index 71%
rename from Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmForBjet.h
rename to Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
index f8b10daa256..ff84d82709d 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmForBjet.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef ViewAlgs_EventViewCreatorAlgorithmForBjet_h
-#define ViewAlgs_EventViewCreatorAlgorithmForBjet_h
+#ifndef ViewAlgs_EventViewCreatorAlgorithmWithJets_h
+#define ViewAlgs_EventViewCreatorAlgorithmWithJets_h
 
 #include "EventViewCreatorAlgorithm.h"
 
@@ -11,14 +11,14 @@
 #include "xAODJet/JetAuxContainer.h"
 
  /**
-   * @class EventViewCreatorAlgorithmForBjet
+   * @class EventViewCreatorAlgorithmWithJets
    * @brief Used at the start of a sequence to create the EventViews: retrieves filtered collection via menu decision from previous step and writes it out directly so it can be used as input by the reco alg that follows in sequence.
    **/
 
-class EventViewCreatorAlgorithmForBjet : public EventViewCreatorAlgorithm {
+class EventViewCreatorAlgorithmWithJets : public EventViewCreatorAlgorithm {
  public:
-    EventViewCreatorAlgorithmForBjet( const std::string& name, ISvcLocator* pSvcLocator );
-    virtual ~EventViewCreatorAlgorithmForBjet();
+    EventViewCreatorAlgorithmWithJets( const std::string& name, ISvcLocator* pSvcLocator );
+    virtual ~EventViewCreatorAlgorithmWithJets();
 
     virtual StatusCode initialize() override;
     virtual StatusCode execute_r(const EventContext&) const override;
@@ -29,7 +29,7 @@ class EventViewCreatorAlgorithmForBjet : public EventViewCreatorAlgorithm {
 			       SG::View* view,
 			       const EventContext& context ) const;
 
-    EventViewCreatorAlgorithmForBjet();
+    EventViewCreatorAlgorithmWithJets();
 
     SG::WriteHandleKey< ConstDataVector<xAOD::JetContainer> > m_inViewJets {this,"InViewJets","Unspecified","Name with which the Jets should be inserted into the views"};
 
diff --git a/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx b/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx
index c89a4a07087..ba298d3a4cb 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx
@@ -1,12 +1,12 @@
 
 
 #include "../EventViewCreatorAlgorithm.h"
-#include "../EventViewCreatorAlgorithmForBjet.h"
+#include "../EventViewCreatorAlgorithmWithJets.h"
 #include "../MergeViews.h"
 
 
 
 DECLARE_COMPONENT( EventViewCreatorAlgorithm )
-DECLARE_COMPONENT( EventViewCreatorAlgorithmForBjet )
+DECLARE_COMPONENT( EventViewCreatorAlgorithmWithJets )
 DECLARE_COMPONENT( MergeViews )
 
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
index 5929e602ae4..1e9b7244cdf 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
@@ -201,8 +201,8 @@ def bJetStep2Sequence():
     from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
 
     # Event View Creator Algorithm
-    from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithmForBjet
-    InputMakerAlg = EventViewCreatorAlgorithmForBjet("BJetInputMaker_step2")
+    from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithmWithJets
+    InputMakerAlg = EventViewCreatorAlgorithmWithJets("BJetInputMaker_step2")
     InputMakerAlg.OutputLevel = DEBUG
     InputMakerAlg.ViewFallThrough = True # Access Store Gate for retrieving data
     InputMakerAlg.ViewPerRoI = True # If True it creates one view per RoI
-- 
GitLab