From 40e331c99add63f85d98c81b171b92e9c30ccdb3 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Sat, 15 Apr 2017 07:58:52 +0200
Subject: [PATCH] LArEventTest: LArCablingService moved to LArCabling.
---
LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt | 4 ++--
.../LArTest/LArEventTest/LArEventTest/DumpLArDigits.h | 3 +--
.../LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h | 2 +-
.../LArEventTest/LArEventTest/FindDuplicatedLArDigits.h | 7 +------
.../LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h | 7 +------
.../LArEventTest/LArEventTest/TriggerPatternCount.h | 7 +------
LArCalorimeter/LArTest/LArEventTest/cmt/requirements | 2 +-
.../LArEventTest/share/DumpLArDigits_eformatOnly.py | 5 -----
.../LArTest/LArEventTest/share/DumpLArRawChannels.py | 5 -----
.../LArEventTest/share/DumpLArRawChannels_eformatOnly.py | 5 -----
.../LArTest/LArEventTest/share/LArDigitsToNtuple.py | 5 -----
.../LArTest/LArEventTest/share/TBDumpLArRawChannels.py | 6 ------
.../LArTest/LArEventTest/share/TriggerPatternCount.py | 2 --
13 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt
index 48e9bb50595..e1d3ba697d3 100644
--- a/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArIdentifier
LArCalorimeter/LArRawConditions
LArCalorimeter/LArRawEvent
- LArCalorimeter/LArTools
+ LArCalorimeter/LArCabling
TestBeam/TBEvent
PRIVATE
Calorimeter/CaloEvent
@@ -30,7 +30,7 @@ atlas_add_component( LArEventTest
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArToolsLib TBEvent CaloEvent CxxUtils xAODEventInfo )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArCablingLib TBEvent CaloEvent CxxUtils xAODEventInfo )
# Install files from the package:
atlas_install_headers( LArEventTest )
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h
index c988311514e..e3bcf598aef 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h
@@ -6,8 +6,7 @@
#define DUMPLARDIGITS_H
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LArRawEvent/LArDigitContainer.h"
-//#include "LArRawEvent/LArDigitCollection.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
index 6f9fa472431..0a607c604ba 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
@@ -6,7 +6,7 @@
#define DUMPLARRAWCHANNEL_H
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LArRawEvent/LArRawChannelContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h
index e7cc8bff876..25a3133ebaa 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h
@@ -23,15 +23,10 @@
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include <vector>
#include <string>
#include <map>
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h
index 7a41d31bc32..94497edf21d 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h
@@ -21,15 +21,10 @@
#define LARDIGITSTONTUPLE_H
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include <vector>
#include <string>
#include <map>
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
index cf62c0d03e8..b111927ec1f 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
@@ -21,15 +21,10 @@
#define TRIGGERPATTERNCOUNT_H
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include <vector>
#include <string>
#include <map>
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/cmt/requirements b/LArCalorimeter/LArTest/LArEventTest/cmt/requirements
index 27aa9eaf7c2..8dda7bcef9a 100755
--- a/LArCalorimeter/LArTest/LArEventTest/cmt/requirements
+++ b/LArCalorimeter/LArTest/LArEventTest/cmt/requirements
@@ -7,7 +7,7 @@ use GaudiInterface GaudiInterface-* External
use LArIdentifier LArIdentifier-* LArCalorimeter
use LArRawConditions LArRawConditions-* LArCalorimeter
use LArRawEvent LArRawEvent-* LArCalorimeter
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
use StoreGate StoreGate-* Control
use AthenaBaseComps AthenaBaseComps-* Control
use TBEvent TBEvent-* TestBeam
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py
index bced285ba7f..3ff769e98af 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py
@@ -21,11 +21,6 @@ MessageSvc.OutputLevel =DEBUG
AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
AthenaEventLoopMgr.OutputLevel=4
-#Necessary DLL's
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
theApp.Dlls += [ "LArEventTest"]
theApp.topAlg+=["DumpLArDigits"]
DumpLArDigits=Algorithm("DumpLArDigits")
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py
index 469368f036a..5e1c4e558ff 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py
@@ -34,11 +34,6 @@ MessageSvc.OutputLevel =3
AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
AthenaEventLoopMgr.OutputLevel=4
-#Necessary DLL's
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
theApp.Dlls += [ "LArEventTest"]
theApp.topAlg+=["DumpLArRawChannels"]
DumpLArRawChannels=Algorithm("DumpLArRawChannels")
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py
index f0fc3360e1f..170a4422272 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py
@@ -21,11 +21,6 @@ MessageSvc.OutputLevel =DEBUG
AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
AthenaEventLoopMgr.OutputLevel=4
-#Necessary DLL's
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
theApp.Dlls += [ "LArEventTest"]
theApp.topAlg+=["DumpLArRawChannels"]
DumpLArRawChannels=Algorithm("DumpLArRawChannels")
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py b/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py
index dc6cc7a3e23..2c97478ba05 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py
@@ -52,11 +52,6 @@ MessageSvc.OutputLevel = INFO
#AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
#AthenaEventLoopMgr.OutputLevel= INFO
-#Necessary DLL's
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
#----- JobOptions for Ntuple-output
theApp.Dlls += [ "RootHistCnv" ];
theApp.HistogramPersistency = "ROOT"
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py b/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py
index ac3ed041938..2a3a8336061 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py
@@ -39,12 +39,6 @@ MessageSvc.OutputLevel = DEBUG
AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
AthenaEventLoopMgr.OutputLevel=4
-#Necessary DLL's
-theApp.Dlls += [ "LArRawUtils","LArROD", "LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
-
theApp.topAlg+=["LArRawChannelSimpleBuilder/TBLArRawChannelBuilder"]
### Liquid argon reco
TBLArRawChannelBuilder = Algorithm("TBLArRawChannelBuilder");
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py b/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py
index f70370a2935..ff281095d41 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py
@@ -33,8 +33,6 @@ ByteStreamInputSvc.FilePrefix += [RawDataFilePrefix]
ByteStreamInputSvc.RunNumber += [runnumber]
ToolSvc = Service( "ToolSvc" )
ToolSvc.LArRoI_Map.Print=FALSE
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
include( "TBCnv/TBReadH8BS_jobOptions.py" )
theApp.Dlls += [ "LArEventTest"]
theApp.topAlg+=["TriggerPatternCount"]
--
GitLab