From cf0246065846b35a1cb5b02145a61c9918a91db6 Mon Sep 17 00:00:00 2001
From: Pavol Strizenec <pavol.strizenec@cern.ch>
Date: Mon, 12 Aug 2019 08:04:26 +0000
Subject: [PATCH] Cleaning LArConditionsTest
---
.../LArTest/LArCalibTest/CMakeLists.txt | 7 +++++--
.../LArCalibTest}/FixLArElecCalib.h | 0
.../LArCalibTest}/FixLArIdMap.h | 0
.../LArCalibTest}/LArFebRodMapConvert.h | 0
.../LArCalibTest}/LArFecLvTempDcsTest.h | 0
.../LArCalibTest}/LArIdMapConvert.h | 0
.../LArCalibTest}/LArOFCtoOFC.h | 0
.../LArCalibTest}/LArShapeToSCShape.h | 0
.../share/AllPedestalToPool.csh | 0
.../FixLArElecCalib_FcalIdFix7_jobOptions.py | 0
.../share/FixLArElecCalib_fix3_jobOptions.py | 0
.../share/FixLArElecCalib_fix4_jobOptions.py | 0
.../share/FixLArElecCalib_fix5_jobOptions.py | 0
.../share/FixLArElecCalib_fix6_jobOptions.py | 0
.../share/FixLArElecCalib_fix7_jobOptions.py | 0
.../share/FixLArElecCalib_fix8_jobOptions.py | 0
.../share/FixLArElecCalib_fix9_jobOptions.py | 0
.../share/FixLArIdMap_jobOptions.py | 0
.../share/LArConvertCTBConditonsToPool.py | 0
.../share/LArConvertH6ConditonsToPool.py | 0
.../share/LArConvertH6IdMapToPool.py | 0
.../share/LArConvertH8IdMapToPool.py | 0
.../share/LArConvertMCNovaToPool.py | 0
.../share/LArConvertMCNovaToPool_DC3-05.py | 0
.../share/LArFecLvCTempTest_jobOptions.py | 0
.../share/LArHVCommissionTest_jobOptions.py | 0
.../share/LArIdMapConvert.py | 0
.../share/LArOFCtoOFC.py | 0
.../share/LArShapeToShapeSC.py | 0
.../share/autocorr_hec.txt | 0
.../share/barrel_dac2ua_oct06.txt | 0
.../share/dac2ua_em.txt | 0
.../share/dac2ua_hec.txt | 0
.../share/dac2ua_ua2mev_rel13.txt | 0
.../share/fsampl_1250.txt | 0
.../share/fsampl_1300.txt | 0
.../share/fsampl_1300_qgsp-bert.txt | 0
.../share/fsampl_1303_qgsp-bert.txt | 0
.../share/mbrms_em_rel12.txt | 0
.../share/mbrms_hec_rel12.txt | 0
.../share/mphys_hec.txt | 0
.../share/noise_hec.txt | 0
.../share/ramp_hec.txt | 0
.../share/shape_hec.txt | 0
.../share/ua2mev_em.txt | 0
.../share/ua2mev_hec.txt | 0
.../src/FixLArElecCalib.cxx | 2 +-
.../src/FixLArIdMap.cxx | 2 +-
.../src/LArFebRodMapConvert.cxx | 2 +-
.../src/LArFecLvTempDcsTest.cxx | 2 +-
.../src/LArIdMapConvert.cxx | 2 +-
.../src/LArOFCtoOFC.cxx | 2 +-
.../src/LArShapeToSCShape.cxx | 4 ++--
.../src/LisIOVList.cxx | 0
.../src/components/LArCalibTest_entries.cxx | 15 +++++++++++++++
.../LArTest/LArConditionsTest/CMakeLists.txt | 6 ------
.../src/LArConditionsTest_entries.cxx | 16 +---------------
57 files changed, 29 insertions(+), 31 deletions(-)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/FixLArElecCalib.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/FixLArIdMap.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/LArFebRodMapConvert.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/LArFecLvTempDcsTest.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/LArIdMapConvert.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/LArOFCtoOFC.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest/LArConditionsTest => LArCalibTest/LArCalibTest}/LArShapeToSCShape.h (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/AllPedestalToPool.csh (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_FcalIdFix7_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix3_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix4_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix5_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix6_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix7_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix8_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArElecCalib_fix9_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/FixLArIdMap_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArConvertCTBConditonsToPool.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArConvertH6ConditonsToPool.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArConvertH6IdMapToPool.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArConvertH8IdMapToPool.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArConvertMCNovaToPool.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArConvertMCNovaToPool_DC3-05.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArFecLvCTempTest_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArHVCommissionTest_jobOptions.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArIdMapConvert.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArOFCtoOFC.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/LArShapeToShapeSC.py (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/autocorr_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/barrel_dac2ua_oct06.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/dac2ua_em.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/dac2ua_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/dac2ua_ua2mev_rel13.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/fsampl_1250.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/fsampl_1300.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/fsampl_1300_qgsp-bert.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/fsampl_1303_qgsp-bert.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/mbrms_em_rel12.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/mbrms_hec_rel12.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/mphys_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/noise_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/ramp_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/shape_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/ua2mev_em.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/share/ua2mev_hec.txt (100%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/FixLArElecCalib.cxx (99%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/FixLArIdMap.cxx (99%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/LArFebRodMapConvert.cxx (98%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/LArFecLvTempDcsTest.cxx (98%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/LArIdMapConvert.cxx (99%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/LArOFCtoOFC.cxx (99%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/LArShapeToSCShape.cxx (98%)
rename LArCalorimeter/LArTest/{LArConditionsTest => LArCalibTest}/src/LisIOVList.cxx (100%)
diff --git a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
index 8bbc069caf8..e0efce0719a 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
@@ -20,13 +20,16 @@ atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
Event/xAOD/xAODEventInfo
LArCalorimeter/LArRawConditions
+ LArCalorimeter/LArCOOLConditions
Tools/PathResolver )
# Component(s) in the package:
atlas_add_component( LArCalibTest
- src/*.cxx
+ src/LAr*.cxx
+ src/DumpCaloBadChannels.cxx
+ src/FixLArElecCalib.cxx
src/components/*.cxx
- LINK_LIBRARIES CaloConditions CaloIdentifier AthenaBaseComps GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib SGtests xAODEventInfo LArRawConditions PathResolver )
+ LINK_LIBRARIES CaloConditions CaloIdentifier AthenaBaseComps GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib SGtests xAODEventInfo LArRawConditions LArCOOLConditions PathResolver )
# Install files from the package:
atlas_install_headers( LArCalibTest )
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArElecCalib.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArElecCalib.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArElecCalib.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArElecCalib.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArIdMap.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArIdMap.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArIdMap.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArIdMap.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFebRodMapConvert.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFebRodMapConvert.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFebRodMapConvert.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFebRodMapConvert.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFecLvTempDcsTest.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFecLvTempDcsTest.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFecLvTempDcsTest.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFecLvTempDcsTest.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArIdMapConvert.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArIdMapConvert.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArIdMapConvert.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArIdMapConvert.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArOFCtoOFC.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArOFCtoOFC.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArOFCtoOFC.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArOFCtoOFC.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArShapeToSCShape.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArShapeToSCShape.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArShapeToSCShape.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArShapeToSCShape.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/AllPedestalToPool.csh b/LArCalorimeter/LArTest/LArCalibTest/share/AllPedestalToPool.csh
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/AllPedestalToPool.csh
rename to LArCalorimeter/LArTest/LArCalibTest/share/AllPedestalToPool.csh
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix3_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix3_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix4_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix4_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix5_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix5_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix6_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix6_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix7_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix7_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix8_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix8_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix9_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix9_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArIdMap_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArIdMap_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertCTBConditonsToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertCTBConditonsToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6ConditonsToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6ConditonsToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6IdMapToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH8IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH8IdMapToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool_DC3-05.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool_DC3-05.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArFecLvCTempTest_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArFecLvCTempTest_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArHVCommissionTest_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArHVCommissionTest_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArIdMapConvert.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArIdMapConvert.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArIdMapConvert.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArIdMapConvert.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArOFCtoOFC.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArOFCtoOFC.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArOFCtoOFC.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArOFCtoOFC.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArShapeToShapeSC.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArShapeToShapeSC.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArShapeToShapeSC.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArShapeToShapeSC.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/autocorr_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/autocorr_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/autocorr_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/autocorr_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/barrel_dac2ua_oct06.txt b/LArCalorimeter/LArTest/LArCalibTest/share/barrel_dac2ua_oct06.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/barrel_dac2ua_oct06.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/barrel_dac2ua_oct06.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_em.txt b/LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_em.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_em.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_em.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_ua2mev_rel13.txt b/LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_ua2mev_rel13.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_ua2mev_rel13.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_ua2mev_rel13.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1250.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1250.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1250.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1250.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300_qgsp-bert.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300_qgsp-bert.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300_qgsp-bert.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300_qgsp-bert.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1303_qgsp-bert.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1303_qgsp-bert.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1303_qgsp-bert.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1303_qgsp-bert.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_em_rel12.txt b/LArCalorimeter/LArTest/LArCalibTest/share/mbrms_em_rel12.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_em_rel12.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/mbrms_em_rel12.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_hec_rel12.txt b/LArCalorimeter/LArTest/LArCalibTest/share/mbrms_hec_rel12.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_hec_rel12.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/mbrms_hec_rel12.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/mphys_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/mphys_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/mphys_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/mphys_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/noise_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/noise_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/noise_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/noise_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/ramp_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/ramp_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/ramp_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/ramp_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/shape_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/shape_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/shape_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/shape_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_em.txt b/LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_em.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_em.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_em.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
index 3a4964b7c4b..3997f9833bb 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
@@ -58,7 +58,7 @@
**/
-#include "LArConditionsTest/FixLArElecCalib.h"
+#include "LArCalibTest/FixLArElecCalib.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArIdMap.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/FixLArIdMap.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
index fddb4b7853b..e605e0eed20 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArIdMap.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
@@ -177,7 +177,7 @@ quadrant:
**/
-#include "LArConditionsTest/FixLArIdMap.h"
+#include "LArCalibTest/FixLArIdMap.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFebRodMapConvert.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArFebRodMapConvert.cxx
similarity index 98%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArFebRodMapConvert.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArFebRodMapConvert.cxx
index 5fee4f48624..873cb93d449 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFebRodMapConvert.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArFebRodMapConvert.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "LArConditionsTest/LArFebRodMapConvert.h"
+#include "LArCalibTest/LArFebRodMapConvert.h"
//#include "LArTools/LArOnOffIdMap.h"
#include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFecLvTempDcsTest.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
similarity index 98%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArFecLvTempDcsTest.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
index c7d8129270d..af934d85d88 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFecLvTempDcsTest.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
@@ -15,7 +15,7 @@
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/AlgTool.h"
-#include "LArConditionsTest/LArFecLvTempDcsTest.h"
+#include "LArCalibTest/LArFecLvTempDcsTest.h"
#include "LArRawConditions/LArFecLvTempDcs.h"
#include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArIdMapConvert.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArIdMapConvert.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArIdMapConvert.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArIdMapConvert.cxx
index e270a419347..3a7c8c3f142 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArIdMapConvert.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArIdMapConvert.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "LArConditionsTest/LArIdMapConvert.h"
+#include "LArCalibTest/LArIdMapConvert.h"
//#include "LArTools/LArCablingBlob.h"
//#include "LArTools/LArOnOffIdMap.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArOFCtoOFC.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArOFCtoOFC.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
index 1ec1d51e4c7..49765c0b1cf 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArOFCtoOFC.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "LArConditionsTest/LArOFCtoOFC.h"
+#include "LArCalibTest/LArOFCtoOFC.h"
#include "LArRawConditions/LArOFCComplete.h"
#include "LArRawConditions/LArShapeComplete.h"
#include "CaloIdentifier/CaloGain.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArShapeToSCShape.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
similarity index 98%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArShapeToSCShape.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
index fc7e1407f02..e8730d22a06 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArShapeToSCShape.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
@@ -7,8 +7,8 @@
// LArShapeToSCShape.cxx
///////////////////////////////////////////////////////////////////
-// LArConditionsTest includes
-#include "LArConditionsTest/LArShapeToSCShape.h"
+// LArCalibTest includes
+#include "LArCalibTest/LArShapeToSCShape.h"
#include "CaloDetDescr/ICaloSuperCellIDTool.h"
#include "LArElecCalib/ILArShape.h"
#include "LArCOOLConditions/LArShapeSC.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LisIOVList.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LisIOVList.cxx
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LisIOVList.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LisIOVList.cxx
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
index 2658ad2cfca..1944782279e 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
@@ -3,6 +3,14 @@
#include "LArCalibTest/LArReadHadDMCoeffFile.h"
#include "LArCalibTest/LArReadHadDMCoeffFile2.h"
#include "LArCalibTest/DumpCaloBadChannels.h"
+//#include "LArCalibTest/FixLArIdMap.h"
+#include "LArCalibTest/LArFecLvTempDcsTest.h"
+#include "LArCalibTest/FixLArElecCalib.h"
+#include "LArCalibTest/LArIdMapConvert.h"
+#include "LArCalibTest/LArFebRodMapConvert.h"
+#include "LArCalibTest/LArShapeToSCShape.h"
+#include "LArCalibTest/LArOFCtoOFC.h"
+
@@ -11,4 +19,11 @@ DECLARE_COMPONENT( LArReadHadDMCoeffFile )
DECLARE_COMPONENT( LArReadHadDMCoeffFile2 )
DECLARE_COMPONENT( LArFakeCellFactor )
DECLARE_COMPONENT( DumpCaloBadChannels )
+//DECLARE_COMPONENT( FixLArIdMap )
+DECLARE_COMPONENT( LArFecLvTempDcsTest )
+DECLARE_COMPONENT( FixLArElecCalib )
+DECLARE_COMPONENT( LArIdMapConvert )
+DECLARE_COMPONENT( LArFebRodMapConvert )
+DECLARE_COMPONENT( LArShapeToSCShape )
+DECLARE_COMPONENT( LArOFCtoOFC )
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index 45c17411bff..b469e64fb82 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -34,15 +34,9 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
atlas_add_component( LArConditionsTest
src/LArConditionsTest_entries.cxx
src/TestLArConditionsTools.cxx
- src/FixLArElecCalib.cxx
src/LArCondDataTest.cxx
src/LArConditionsTestAlg.cxx
- src/LArFecLvTempDcsTest.cxx
src/LArCablingTest.cxx
- src/LArIdMapConvert.cxx
- src/LArShapeToSCShape.cxx
- src/LArOFCtoOFC.cxx
- src/LArFebRodMapConvert.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel LArCablingLib LArIdentifier LArRawConditions LArRawUtilsLib LArToolsLib CaloDetDescrLib CaloEvent CaloIdentifier AthenaKernel AthenaPoolUtilities LArCOOLConditions )
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
index 51e8f14f3c8..50af6ab7680 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
@@ -1,27 +1,13 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "LArConditionsTest/LArConditionsTestAlg.h"
#include "LArConditionsTest/LArCondDataTest.h"
-//#include "LArConditionsTest/FixLArIdMap.h"
-#include "LArConditionsTest/LArFecLvTempDcsTest.h"
-#include "LArConditionsTest/FixLArElecCalib.h"
#include "LArConditionsTest/TestLArConditionsTools.h"
#include "LArConditionsTest/LArCablingTest.h"
-#include "LArConditionsTest/LArIdMapConvert.h"
-#include "LArConditionsTest/LArFebRodMapConvert.h"
-#include "LArConditionsTest/LArShapeToSCShape.h"
-#include "LArConditionsTest/LArOFCtoOFC.h"
DECLARE_COMPONENT( LArConditionsTestAlg )
DECLARE_COMPONENT( LArCondDataTest )
-//DECLARE_COMPONENT( FixLArIdMap )
-DECLARE_COMPONENT( LArFecLvTempDcsTest )
-DECLARE_COMPONENT( FixLArElecCalib )
DECLARE_COMPONENT( TestLArConditionsTools )
DECLARE_COMPONENT( LArCablingTest )
-DECLARE_COMPONENT( LArIdMapConvert )
-DECLARE_COMPONENT( LArFebRodMapConvert )
-DECLARE_COMPONENT( LArShapeToSCShape )
-DECLARE_COMPONENT( LArOFCtoOFC )
--
GitLab