Merge branch 'larcabling.TBCnv-20170415' into 'master'

TBCnv: LArCablingService moved to LArCabling.

See merge request !987

TestBeam/TBCnv/CMakeLists.txt

@@ -18,7 +18,7 @@ atlas_depends_on_subdirs(
    Event/EventInfo
    GaudiKernel
    LArCalorimeter/LArIdentifier
-   LArCalorimeter/LArTools
+   LArCalorimeter/LArCabling
    TestBeam/TBEvent
    PRIVATE
    DetectorDescription/Identifier
@@ -34,7 +34,7 @@ atlas_add_library( TBCnvLib
    INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
    LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps
    ByteStreamData EventInfo GaudiKernel LArIdentifier TBEvent StoreGateLib
-   ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArToolsLib
+   ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArCablingLib
    PRIVATE_LINK_LIBRARIES Identifier LArRawEvent )
 
 atlas_add_component( TBCnv

TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h

@@ -11,9 +11,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include  "StoreGate/StoreGateSvc.h"
 #include "TBEvent/TBLArDigitContainer.h"
-// #include "LArRawEvent/LArRawChannelContainer.h"
-// #include "LArRawEvent/LArRawChannelCollection.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/LArFCAL_ID.h"
 #include "CaloIdentifier/LArHEC_ID.h"

TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h

@@ -29,7 +29,7 @@
 #include "TBEvent/TBEventInfo.h"
 #include "TBEvent/TBLArDigitContainer.h"
 #include "TBEvent/TBLArCalibDigitContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 
 #include "CaloIdentifier/CaloGain.h"
 

TestBeam/TBCnv/cmt/requirements

@@ -14,7 +14,7 @@ use DataCollection        DataCollection-*       External
 use GaudiInterface        GaudiInterface-*          External
 use TBEvent               TBEvent-*              TestBeam
 use CaloIdentifier        CaloIdentifier-*       Calorimeter
-use LArTools              LArTools-*             LArCalorimeter
+use LArCabling            LArCabling-*           LArCalorimeter
 use LArIdentifier         LArIdentifier-*        LArCalorimeter
 
 private

TestBeam/TBCnv/share/TBH6ByteStream-Calib.py

@@ -105,13 +105,6 @@ IOVDbSvc.userPwd    = "conditions";
 # Reconstruction
 # non-ATLAS detectors
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-theApp.Dlls += ["LArROD"]
-theApp.Dlls += ["TBRec"]
-theApp.Dlls += [ "AthenaMonitoring"]
-theApp.Dlls += [ "LArMonitoring"]
-
 theApp.TopAlg += ["TBEventStreamer/EventInfoStreamer"]
 EventInfoStreamer = Algorithm( "EventInfoStreamer" )
 EventInfoStreamer.ToolNames += [ "TBEventInfoStreamerTool/EventTypeSelector" ]

TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py

@@ -28,12 +28,6 @@ ToolSvc.LArRoI_Map.Print=FALSE
 ToolSvc.TBByteStreamCnvTool.Dump        = FALSE
 ToolSvc.TBByteStreamCnvTool.OutputLevel = WARNING
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-theApp.Dlls += ["LArROD"]
-theApp.Dlls += [ "TBRec" ]
-
-
 #--- Monitoring ---------------------------
 
 theApp.TopAlg += [ "TBAlgoSequencer/Seq1" ]

TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py

@@ -30,12 +30,6 @@ ToolSvc.LArRoI_Map.Print=FALSE
 ToolSvc.TBByteStreamCnvTool.Dump        = FALSE
 ToolSvc.TBByteStreamCnvTool.OutputLevel = WARNING
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-theApp.Dlls += ["LArROD"]
-theApp.Dlls += [ "TBRec" ]
-
-
 #--- Monitoring ---------------------------
 
 theApp.TopAlg += [ "TBAlgoSequencer/Seq1" ]

TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py

@@ -30,9 +30,6 @@ ByteStreamInputSvc.inputFiles    = ["/afs/cern.ch/atlas/offline/data/testfile/ru
 ToolSvc.TBByteStreamCnvTool.Dump = TRUE
 ToolSvc.TBByteStreamCnvTool.SummaryPath = "lastrun.txt"
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-
 # --- TBRec --------------
 theApp.Dlls += [ "TBRec" ]