LArEventTest: LArCablingService moved to LArCabling.

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 )

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"
 

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"
 

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"

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"

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"

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

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")

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")

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")

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" 

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");

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"]