From 88a97016820c3f492fb23da4f39502fe55f6674b Mon Sep 17 00:00:00 2001 From: Walter Lampl Date: Fri, 18 Oct 2019 12:03:02 +0200 Subject: [PATCH] remove obsolete interface classes in CaloUtils --- .../CaloUtils/CaloUtils/ICaloBadChannelTool.h | 11 ----------- Calorimeter/CaloUtils/CaloUtils/ICaloCellSelector.h | 11 ----------- .../CaloUtils/CaloUtils/ICaloHVGeometryTool.h | 10 ---------- Calorimeter/CaloUtils/CaloUtils/ICaloHVScaleTool.h | 10 ---------- Calorimeter/CaloUtils/CaloUtils/ICaloMBAverageTool.h | 11 ----------- Calorimeter/CaloUtils/CaloUtils/ICaloNoiseTool.h | 11 ----------- .../CaloUtils/CaloUtils/ICalorimeterNoiseTool.h | 11 ----------- Calorimeter/CaloUtils/CaloUtils/ICellWeightTool.h | 12 ------------ .../CaloUtils/CaloUtils/IClusterCellWeightTool.h | 11 ----------- .../CaloUtils/CaloUtils/IClusterClassificationTool.h | 11 ----------- .../CaloUtils/CaloUtils/IHadronicCalibrationTool.h | 11 ----------- TestBeam/TBRec/src/TBClusterMaker.cxx | 1 - TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx | 1 - 13 files changed, 122 deletions(-) delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICaloBadChannelTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICaloCellSelector.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICaloHVGeometryTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICaloHVScaleTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICaloMBAverageTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICaloNoiseTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICalorimeterNoiseTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/ICellWeightTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/IClusterCellWeightTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/IClusterClassificationTool.h delete mode 100644 Calorimeter/CaloUtils/CaloUtils/IHadronicCalibrationTool.h diff --git a/Calorimeter/CaloUtils/CaloUtils/ICaloBadChannelTool.h b/Calorimeter/CaloUtils/CaloUtils/ICaloBadChannelTool.h deleted file mode 100644 index 638ff3922a0..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICaloBadChannelTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALOBADCHANNELTOOL_H -#define CALOUTILS_ICALOBADCHANNELTOOL_H - -#warning "obsolete header file: Use CaloInterface/ICaloBadChannelTool.h instead of CaloUtils/ICaloBadChannelTool.h " -#include "CaloInterface/ICaloBadChannelTool.h" - -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICaloCellSelector.h b/Calorimeter/CaloUtils/CaloUtils/ICaloCellSelector.h deleted file mode 100644 index c6264cec5b3..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICaloCellSelector.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALOCELLSELECTOR_H -#define CALOUTILS_ICALOCELLSELECTOR_H - -#warning "obsolete header file: Use CaloInterface/ICellSelectorTool.h instead of CaloUtils/ICellSelectorTool.h " -#include "CaloInterface/ICaloCellSelector.h" - -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICaloHVGeometryTool.h b/Calorimeter/CaloUtils/CaloUtils/ICaloHVGeometryTool.h deleted file mode 100644 index 566ec779448..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICaloHVGeometryTool.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALOHVGEOMETRYTOOL_H -#define CALOUTILS_ICALOHVGEOMETRYTOOL_H - -#warning "obsolete header file: Use CaloInterface/ICaloHVGeometryTool.h instead of CaloUtils/ICaloHVGeometryTool.h " -#include "CaloInterface/ICaloHVGeometryTool.h" -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICaloHVScaleTool.h b/Calorimeter/CaloUtils/CaloUtils/ICaloHVScaleTool.h deleted file mode 100644 index 64ed7c7a8c5..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICaloHVScaleTool.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALOHVSCALETOOL_H -#define CALOUTILS_ICALOHVSCALETOOL_H - -#warning "obsolete header file: Use CaloInterface/ICaloHVScaleTool.h instead of CaloUtils/ICaloHVScaleTool.h " -#include "CaloInterface/ICaloHVScaleTool.h" -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICaloMBAverageTool.h b/Calorimeter/CaloUtils/CaloUtils/ICaloMBAverageTool.h deleted file mode 100644 index a79c3cb93dd..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICaloMBAverageTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALOMBAVERAGETOOL_H -#define CALOUTILS_ICALOMBAVERAGETOOL_H - -#warning "obsolete header file: Use CaloInterface/ICaloMBAverageTool.h instead of CaloUtils/ICaloMBAverageTool.h " -#include "CaloInterface/ICaloMBAverageTool.h" - -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICaloNoiseTool.h b/Calorimeter/CaloUtils/CaloUtils/ICaloNoiseTool.h deleted file mode 100644 index f4745708352..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICaloNoiseTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALONOISETOOL_H -#define CALOUTILS_ICALONOISETOOL_H - -#warning "obsolete header file: Use CaloInterface/ICaloNoiseTool.h instead of CaloUtils/ICaloNoiseTool.h " -#include "CaloInterface/ICaloNoiseTool.h" - -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICalorimeterNoiseTool.h b/Calorimeter/CaloUtils/CaloUtils/ICalorimeterNoiseTool.h deleted file mode 100644 index 80b70fd6f1c..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICalorimeterNoiseTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICALORIMETERNOISETOOL_H -#define CALOUTILS_ICALORIMETERNOISETOOL_H - -#warning "obsolete header file: Use CaloInterface/ICalorimeterNoiseTool.h instead of CaloUtils/ICalorimeterNoiseTool.h " -#include "CaloInterface/ICalorimeterNoiseTool.h" - -#endif diff --git a/Calorimeter/CaloUtils/CaloUtils/ICellWeightTool.h b/Calorimeter/CaloUtils/CaloUtils/ICellWeightTool.h deleted file mode 100644 index 84b61e6048f..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/ICellWeightTool.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICELLWEIGHTTOOL_H -#define CALOUTILS_ICELLWEIGHTTOOL_H - -#warning "obsolete header file: Use CaloInterface/ICellWeightTool.h instead of CaloUtils/ICellWeightTool.h " -#include "CaloInterface/ICellWeightTool.h" - -#endif - diff --git a/Calorimeter/CaloUtils/CaloUtils/IClusterCellWeightTool.h b/Calorimeter/CaloUtils/CaloUtils/IClusterCellWeightTool.h deleted file mode 100644 index 6c643651bb0..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/IClusterCellWeightTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICLUSTERCELLWEIGHTTOOL_H -#define CALOUTILS_ICLUSTERCELLWEIGHTTOOL_H - -#warning "obsolete header file: Use CaloInterface/IClusterCellWeightTool.h instead of CaloUtils/IClusterCellWeightTool.h " -#include "CaloInterface/IClusterCellWeightTool.h" -#endif - diff --git a/Calorimeter/CaloUtils/CaloUtils/IClusterClassificationTool.h b/Calorimeter/CaloUtils/CaloUtils/IClusterClassificationTool.h deleted file mode 100644 index f64a6d8437f..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/IClusterClassificationTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_ICLUSTERCLASSIFICATIONTOOL_H -#define CALOUTILS_ICLUSTERCLASSIFICATIONTOOL_H - -#warning "obsolete header file: Use CaloInterface/IClusterClassificationTool.h instead of CaloUtils/IClusterClassificationTool.h " -#include "CaloInterface/IClusterClassificationTool.h" -#endif - diff --git a/Calorimeter/CaloUtils/CaloUtils/IHadronicCalibrationTool.h b/Calorimeter/CaloUtils/CaloUtils/IHadronicCalibrationTool.h deleted file mode 100644 index ec81f7c5f42..00000000000 --- a/Calorimeter/CaloUtils/CaloUtils/IHadronicCalibrationTool.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef CALOUTILS_IHADRONICCALIBRATIONTOOL_H -#define CALOUTILS_IHADRONICCALIBRATIONTOOL_H - -#warning "obsolete header file: Use CaloInterface/IHadronicCalibrationTool.h instead of CaloUtils/IHadronicCalibrationTool.h " -#include "CaloInterface/IHadronicCalibrationTool.h" -#endif - diff --git a/TestBeam/TBRec/src/TBClusterMaker.cxx b/TestBeam/TBRec/src/TBClusterMaker.cxx index 67aa4063e8f..5790e74bd0c 100644 --- a/TestBeam/TBRec/src/TBClusterMaker.cxx +++ b/TestBeam/TBRec/src/TBClusterMaker.cxx @@ -7,7 +7,6 @@ #include "CLHEP/Units/SystemOfUnits.h" #include "CaloDetDescr/CaloDetDescrManager.h" #include "CaloGeoHelpers/CaloPhiRange.h" -//#include "CaloUtils/ICaloNoiseTool.h" #include "CaloInterface/ICalorimeterNoiseTool.h" #include "CaloEvent/CaloCell.h" diff --git a/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx b/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx index 762cd037dcb..57e59457ef7 100644 --- a/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx +++ b/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx @@ -27,7 +27,6 @@ #include "CaloEvent/CaloCluster.h" #include "CaloEvent/CaloClusterContainer.h" #include "CaloIdentifier/CaloCell_ID.h" -//#include "CaloUtils/ICaloNoiseTool.h" #include "CaloInterface/ICaloNoiseTool.h" #include "LArRawEvent/LArDigitContainer.h" -- GitLab