Merge branch 'LArToolsCleanup' into 'master'

Cleanup of LArCalorimeter/LArTools

See merge request atlas/athena!58724

Calorimeter/CaloRec/CMakeLists.txt

@@ -20,7 +20,7 @@ atlas_add_library( CaloRecLib
    LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloEvent CaloGeoHelpers
    CaloIdentifier AthenaBaseComps AthenaKernel CxxUtils AthenaPoolUtilities
    Identifier xAODCaloEvent GaudiKernel CaloDetDescrLib CaloUtilsLib
-   StoreGateLib LArToolsLib LumiBlockCompsLib AthenaMonitoringKernelLib
+   StoreGateLib LumiBlockCompsLib AthenaMonitoringKernelLib
    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES}
    ${EIGEN_LIBRARIES} AthAllocators IdDictParser CaloLumiConditions
    LArRawConditions FourMom LumiBlockData )

LArCalorimeter/LArCalibTools/CMakeLists.txt

@@ -12,7 +12,7 @@ atlas_add_component( LArCalibTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CaloCondBlobObjs CaloDetDescrLib CaloIdentifier CxxUtils GaudiKernel LArCOOLConditions LArCablingLib LArElecCalib LArIdentifier LArRawConditions LArRawEvent LArRecConditions LArToolsLib LumiBlockData StoreGateLib TrigDecisionToolLib xAODEventInfo )
+                     LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CaloCondBlobObjs CaloDetDescrLib CaloIdentifier CxxUtils GaudiKernel LArCOOLConditions LArCablingLib LArElecCalib LArIdentifier LArRawConditions LArRawEvent LArRecConditions LumiBlockData StoreGateLib TrigDecisionToolLib xAODEventInfo )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

LArCalorimeter/LArCnv/LArIdCnv/share/LArIdCnv_joboptions.py

@@ -2,8 +2,6 @@ include.block("LArIdCnv/LArIdCnv_joboptions.py")
 #
 #  Joboptions for the loading of the of LArID converters
 #
-# add the LArCablingService DLL:
-include( "LArTools/LArTools_jobOptions.py" )
+include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
+
 
-# DLLs 
-theApp.Dlls += [ "LArIdCnv" ]

LArCalorimeter/LArTools/CMakeLists.txt

-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( LArTools )
 
 # External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
+find_package( CORAL COMPONENTS CoralBase CoralKernel )
+find_package( ROOT COMPONENTS RIO Core )
 
 # Component(s) in the package:
-atlas_add_library( LArToolsLib
-                   src/*.cxx
-                   PUBLIC_HEADERS LArTools
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils Identifier GaudiKernel LArElecCalib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier AthenaPoolUtilities LArCablingLib LArRecConditions )
 
 atlas_add_component( LArTools
-                     src/components/*.cxx
-                     LINK_LIBRARIES LArToolsLib )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
+                     src/*.cxx src/components/*.cxx 
+                     LINK_LIBRARIES AthenaBaseComps CxxUtils Identifier LArElecCalib
+		     ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier AthenaPoolUtilities LArRecConditions )
 

LArCalorimeter/LArTools/doc/packagedoc.h

-/*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@page LArTools_page LArTools Package
-
-This package provides tools for LAr identifier mapping. 
-
-
-
-@author Hong Ma <hma@bnl.gov>
-@author Fabienne Ledroit <ledroit@lpsc.in2p3.fr>
-@author Arnaud Lucotte <arnaud.lucotte@lpsc.in2p3.fr>
-
-web pages:
-  http://lpsc.in2p3.fr/atlas/fabienne/identifiers.html
-  http://lpsc.in2p3.fr/atlas/lucotte/3.SOFTWARE/software_online.html
-  http://lpsc.in2p3.fr/atlas/lucotte/3.SOFTWARE/software_highvoltage.html
-
-*/

LArCalorimeter/LArTools/share/LArTools_jobOptions.py

-#
-#  Joboptions for the loading of the LArCablingService
-#
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-
-# DLLs
-theApp.Dlls += [ "LArTools" ]
-
-
-
-
-

LArCalorimeter/LArTools/src/LArHVPathologyDbTool.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArTools/LArHVPathologyDbTool.h" 
+#include "LArHVPathologyDbTool.h" 
 #include "LArRecConditions/LArHVPathologiesDb.h"
 
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/MsgStream.h"
-
 #include "AthenaPoolUtilities/AthenaAttributeList.h"
 #include "CoralBase/AttributeListException.h"
 #include "CoralBase/Blob.h"

LArCalorimeter/LArTools/src/components/LArTools_entries.cxx

-#include "LArTools/LArHVPathologyDbTool.h"
+#include "../LArHVPathologyDbTool.h"
 
 
 DECLARE_COMPONENT( LArHVPathologyDbTool )