From 8018ad0a8d0160ff25e893aafab3fc1da935d3bb Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Thu, 13 Apr 2017 16:26:56 +0200
Subject: [PATCH] LArByteStream: LArCablingService moved to LArCabling.
Former-commit-id: 3321a68fff5cc6c7ac8419beb9997c2464c20544
---
LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt | 4 ++--
.../LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h | 6 +++---
.../LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h | 4 +---
.../LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h | 2 +-
LArCalorimeter/LArCnv/LArByteStream/cmt/requirements | 2 +-
.../LArByteStream/share/TBReadLArDigits_jobOptions.py | 5 -----
.../LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx | 1 -
.../LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx | 1 -
.../LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx | 1 -
.../LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx | 1 -
10 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt b/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
index 722e14bd87f..e854e96478f 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_depends_on_subdirs(
LArCalorimeter/LArRecConditions
LArCalorimeter/LArRecEvent
LArCalorimeter/LArRecUtils
- LArCalorimeter/LArTools
+ LArCalorimeter/LArCabling
PRIVATE
Calorimeter/CaloInterface
Control/CLIDSvc
@@ -47,7 +47,7 @@ atlas_add_library( LArByteStreamLib
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps
AthenaKernel ByteStreamData EventInfo GaudiKernel LArIdentifier LArRawEvent
LArRecConditions LArRecEvent CaloDetDescrLib CaloUtilsLib StoreGateLib
- ByteStreamCnvSvcBaseLib LArRODLib LArRawUtilsLib LArRecUtilsLib LArToolsLib
+ ByteStreamCnvSvcBaseLib LArRODLib LArRawUtilsLib LArRecUtilsLib LArCablingLib
ByteStreamCnvSvcLib
PRIVATE_LINK_LIBRARIES SGTools AtlasDetDescr Identifier LArRawConditions )
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h
index 09634fd51b2..18df3634f08 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef __HID2RESRCID__
-#define __HID2RESRCID__
+#ifndef LARBYTESTREAM_HID2RESRCID_H
+#define LARBYTESTREAM_HID2RESRCID_H
// #include "ByteStreamData/RESrcID.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include <stdint.h>
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
index 5d3abcc1921..7bfd0cd3808 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
@@ -29,7 +29,7 @@
#include "LArROD/LArCellBuilderDriver.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "LArByteStream/LArRodBlockStructure.h"
#include "LArRecUtils/MakeLArCellFromRaw.h"
#include "LArRecConditions/ILArBadChannelMasker.h"
@@ -37,8 +37,6 @@
#include "LArRawUtils/LArRoI_Map.h"
-#include "LArTools/LArCablingService.h"
-
#include "ByteStreamData/RawEvent.h"
#include "LArRecEvent/LArFebEnergy.h"
#include "LArRecEvent/LArFebEnergyCollection.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h
index 60e50cbade2..d780a3e8a0b 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h
@@ -41,7 +41,7 @@
#include "LArRawEvent/LArCalibDigit.h"
#include "LArRawEvent/LArCalibDigitContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "LArByteStream/LArRodBlockStructure.h"
//#include "LArByteStream/LArRodBlockStructure_0.h"
//#include "LArByteStream/LArRodBlockStructure_1.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements b/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements
index f9f0361d8c2..123a3127028 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements
+++ b/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements
@@ -18,7 +18,7 @@ use LArRecEvent LArRecEvent-* LArCalorimeter
use LArRecUtils LArRecUtils-* LArCalorimeter
use LArROD LArROD-* LArCalorimeter
use LArRecConditions LArRecConditions-* LArCalorimeter
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
use LArRecConditions LArRecConditions-* LArCalorimeter
use StoreGate StoreGate-* Control
use AthenaBaseComps AthenaBaseComps-* Control
diff --git a/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py b/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py
index f2aca9be264..1f8e3757030 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py
@@ -38,11 +38,6 @@ MessageSvc.OutputLevel =3
AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
AthenaEventLoopMgr.OutputLevel=4
-#Necessary DLL's
-theApp.Dlls += [ "LArRawUtils","LArROD", "LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
# The only TopAlg: ReadLArDigits
theApp.TopAlg += ["ReadLArDigits"]
ReadLArDigits = Algorithm( "ReadLArDigits" )
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
index 4987f3b0ded..a43800b8b0e 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
@@ -11,7 +11,6 @@
#include "LArRawEvent/LArRawChannel.h"
#include "LArRawEvent/LArDigit.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
index 198d766e4b6..2ded1e39c70 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
@@ -11,7 +11,6 @@
#include "LArRawEvent/LArRawChannel.h"
#include "LArRawEvent/LArDigit.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
index f1d673013cb..f101fe5fee0 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
@@ -11,7 +11,6 @@
#include "LArRawEvent/LArRawChannel.h"
#include "LArRawEvent/LArDigit.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
index a79ea2ccc65..81e0bead892 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
@@ -11,7 +11,6 @@
#include "LArRawEvent/LArRawChannel.h"
#include "LArRawEvent/LArDigit.h"
#include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
--
GitLab