From a7dfce31511043c92177d3b101c86ff91c2bc6da Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Mon, 14 Aug 2017 18:31:49 +0200
Subject: [PATCH] Rename FCS_StepInfoCollections
Drop the ZH prefix from the `FCS_StepInfoCollection` names.
---
Simulation/ISF/ISF_Example/python/ISF_Output.py | 2 +-
.../share/ISF_FastCaloSimParametrization_DigiPostInclude.py | 2 +-
.../share/ISF_FastCaloSimParametrization_SimPostInclude.py | 2 +-
.../src/FastCaloSimParamAlg.cxx | 4 ++--
.../ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx | 2 +-
.../ISF_Geant4UserActions/FastCaloSimParamAction.h | 2 +-
.../TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Simulation/ISF/ISF_Example/python/ISF_Output.py b/Simulation/ISF/ISF_Example/python/ISF_Output.py
index a656570b117f..fcb2bc118614 100644
--- a/Simulation/ISF/ISF_Example/python/ISF_Output.py
+++ b/Simulation/ISF/ISF_Example/python/ISF_Output.py
@@ -71,7 +71,7 @@ def getHITSStreamItemList():
hitsItemList +=["RecoTimingObj#EVNTtoHITS_timings"]
if 'G4UA::FastCaloSimParamActionTool' in simFlags.OptionalUserActionList.get_Value()['Step']:
- hitsItemList +=["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps"]
+ hitsItemList +=["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps"]
## add xAOD::TrackParticles output collection Parametric Simulation
if simFlags.SimulationFlavour == "ParametricSimulation":
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
index 55cef205defc..3491c5354028 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_DigiPostInclude.py
@@ -1,3 +1,3 @@
-streamRDO.ItemList+=["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps","LArHitContainer#*","TileHitVector#*"];
+streamRDO.ItemList+=["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps","LArHitContainer#*","TileHitVector#*"];
from AthenaCommon.CfgGetter import getPublicTool
getPublicTool("LArPileUpTool").CrossTalk=False
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
index 80b973f56f7a..67017a344bb8 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py
@@ -1,3 +1,3 @@
from ISF_FastCaloSimParametrization.ISF_FastCaloSimParametrizationConf import FastCaloSimParamAlg
topSeq += FastCaloSimParamAlg()
-ISF_HITSStream.stream1.ItemList += ["ISF_FCS_Parametrization::FCS_StepInfoCollection#ZHMergedEventSteps"]
+ISF_HITSStream.stream1.ItemList += ["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps"]
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
index 39331d5d3f74..5b59891e38e9 100755
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimParamAlg.cxx
@@ -193,7 +193,7 @@ StatusCode FastCaloSimParamAlg::execute()
}
//clusterize(eventSteps);
std::cout << "Size after clusterization: " << MergeeventSteps->size() << std::endl;
- StatusCode sc = evtStore()->record(MergeeventSteps,"ZHMergedEventSteps");
+ StatusCode sc = evtStore()->record(MergeeventSteps,"MergedEventSteps");
if (sc.isFailure())
{
std::cout<<"Coudn't resave merged collection "<<std::endl;
@@ -219,7 +219,7 @@ const HepMC::GenParticle* FastCaloSimParamAlg::getParticleFromMC()
const ISF_FCS_Parametrization::FCS_StepInfoCollection* FastCaloSimParamAlg::getFCS_StepInfo()
{
const ISF_FCS_Parametrization::FCS_StepInfoCollection* eventStepsES;
- StatusCode sc = evtStore()->retrieve(eventStepsES, "ZHEventSteps");
+ StatusCode sc = evtStore()->retrieve(eventStepsES, "EventSteps");
if (sc.isFailure()) return NULL;
return eventStepsES;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
index d5ef695fb5a4..f4944caec48c 100755
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
@@ -774,7 +774,7 @@ StatusCode ISF_HitAnalysis::execute()
//Get the FastCaloSim step info collection from store
const ISF_FCS_Parametrization::FCS_StepInfoCollection* eventStepsES;
- StatusCode sc = evtStore()->retrieve(eventStepsES, "ZHMergedEventSteps");
+ StatusCode sc = evtStore()->retrieve(eventStepsES, "MergedEventSteps");
if (sc.isFailure())
{
ATH_MSG_WARNING( "No FastCaloSim steps read from StoreGate?" );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h
index 314e616dbadf..bdf107b6c91b 100755
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/ISF_Geant4UserActions/FastCaloSimParamAction.h
@@ -77,7 +77,7 @@ namespace G4UA{
{
bool shift_lar_subhit=true;
bool shorten_lar_step=false;
- std::string stepInfoCollName="ZHEventSteps";
+ std::string stepInfoCollName="EventSteps";
// calculators
ServiceHandle<ILArCalculatorSvc> calculator_EMECIW_pos=ServiceHandle<ILArCalculatorSvc>("EMECPosInnerWheelCalculator", "FastCaloSimParamAction"); //!< handle to EMEC positive inner wheel calculator
ServiceHandle<ILArCalculatorSvc> calculator_EMECIW_neg=ServiceHandle<ILArCalculatorSvc>("EMECNegInnerWheelCalculator", "FastCaloSimParamAction"); //!< handle to EMEC negative inner wheel calculator
diff --git a/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx b/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx
index 69c1fe7c26e7..375b0c86391f 100644
--- a/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx
+++ b/TileCalorimeter/TileFastCaloSim/src/TileFCSmStepToTileHitVec.cxx
@@ -57,13 +57,13 @@ TileFCSmStepToTileHitVec::TileFCSmStepToTileHitVec(const std::string& name, ISvc
, m_allHits(0)
, m_Ushape(-1)
{
- m_FCS_StepInfo = "ZHMergedEventSteps";
+ m_FCS_StepInfo = "MergedEventSteps";
m_hitVec = "TileHitVec_FCS";
m_infoName = "TileInfo";
declareProperty( "GeoModelSvc", m_geoModSvc );
declareProperty( "TileCalculator", m_calc);
- declareProperty("ZHMergedEventSteps", m_FCS_StepInfo, "Name of input container (default=TileHitCnt)");
+ declareProperty("StepInfoCollection", m_FCS_StepInfo, "Name of input container (default=TileHitCnt)");
declareProperty("TileHitVector", m_hitVec, "Name of output hit vector (default=TileHitVec)");
declareProperty("TileInfoName", m_infoName, "Name of TileInfo store (default=TileInfo");
declareProperty("DeltaT", m_deltaT, "Minimal Time granularity in TileHit (default=0.5ns)");
--
GitLab