Merge branch 'larcabling.LArOnlDbPrep-20170414' into 'master'

LArOnlDbPrep: LArCablingService moved to LArCabling.

See merge request !960
Former-commit-id: bcd7c41f

LArCalorimeter/LArOnlDbPrep/CMakeLists.txt

@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           GaudiKernel
                           LArCalorimeter/LArRecConditions
-                          LArCalorimeter/LArTools
+                          LArCalorimeter/LArCabling
                           PRIVATE
                           Calorimeter/CaloDetDescr
                           Calorimeter/CaloInterface
@@ -31,7 +31,7 @@ atlas_add_component( LArOnlDbPrep
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier CaloTriggerToolLib AthenaBaseComps GaudiKernel LArRecConditions LArToolsLib CaloDetDescrLib StoreGateLib SGtests AthenaPoolUtilities LArCOOLConditions LArIdentifier )
+                     LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier CaloTriggerToolLib AthenaBaseComps GaudiKernel LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib SGtests AthenaPoolUtilities LArCOOLConditions LArIdentifier )
 
 # Install files from the package:
 atlas_install_headers( LArOnlDbPrep )

LArCalorimeter/LArOnlDbPrep/LArOnlDbPrep/LArDSPThresholdFillInline.h

@@ -8,7 +8,7 @@
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "CaloIdentifier/CaloCellGroup.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "LArRecConditions/ILArBadChannelMasker.h"
 
 class LArOnlineID;

LArCalorimeter/LArOnlDbPrep/LArOnlDbPrep/LArGeoWeightsFill.h

@@ -7,7 +7,7 @@
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloTriggerTool/CaloTriggerTowerService.h"
 
 class StoreGateSvc;

LArCalorimeter/LArOnlDbPrep/cmt/requirements

@@ -7,7 +7,7 @@ author chc
 use AtlasPolicy    AtlasPolicy-*
 use GaudiInterface GaudiInterface-* External
 
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
 use CaloIdentifier      CaloIdentifier-*   Calorimeter
 use CaloTriggerTool	CaloTriggerTool-*   Calorimeter
 use LArRecConditions	LArRecConditions-*  LArCalorimeter

LArCalorimeter/LArOnlDbPrep/src/LArDSPThresholdFillInline.cxx

@@ -7,7 +7,7 @@
 #include "StoreGate/StoreGate.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloIdentifier/CaloGain.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloInterface/ICaloNoiseTool.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"

LArCalorimeter/LArOnlDbPrep/src/LArGeoWeightsFill.cxx

@@ -6,7 +6,7 @@
 #include "LArIdentifier/LArOnlineID.h"
 #include "StoreGate/StoreGate.h"
 #include "CaloIdentifier/CaloCell_ID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include <fstream>