From d09c46a4e37b39ec9e5b5a7f4dd2b53cc9be559e Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <fwinkl@cern> Date: Wed, 29 Jul 2020 18:01:24 +0200 Subject: [PATCH] IRegionSelector: Delete LUTCondData classes Delete the unused RegSel*LUTCondData classes (ATR-21807) to avoid a cyclic dependency on the RegionSelector library/package. Also cleanup the cmake configuration. --- .../IRegionSelector/CMakeLists.txt | 13 +-------- .../IRegionSelector/RegSelCaloLUTCondData.h | 29 ------------------- .../IRegionSelector/RegSelLUTCondData.h | 27 ----------------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 DetectorDescription/IRegionSelector/IRegionSelector/RegSelCaloLUTCondData.h delete mode 100644 DetectorDescription/IRegionSelector/IRegionSelector/RegSelLUTCondData.h diff --git a/DetectorDescription/IRegionSelector/CMakeLists.txt b/DetectorDescription/IRegionSelector/CMakeLists.txt index 8ab50c51f64..7be03db626a 100644 --- a/DetectorDescription/IRegionSelector/CMakeLists.txt +++ b/DetectorDescription/IRegionSelector/CMakeLists.txt @@ -1,19 +1,8 @@ -# $Id: CMakeLists.txt 749910 2016-05-26 15:00:09Z krasznaa $ -################################################################################ -# Package: IRegionSelector -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( IRegionSelector ) -# Declare the package's dependencies. But only for an Athena build: -if( NOT XAOD_STANDALONE ) - atlas_depends_on_subdirs( PUBLIC - Control/AthenaKernel - DetectorDescription/Identifier - GaudiKernel ) -endif() - # Component(s) in the package: if( XAOD_STANDALONE ) atlas_add_library( IRegionSelector diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/RegSelCaloLUTCondData.h b/DetectorDescription/IRegionSelector/IRegionSelector/RegSelCaloLUTCondData.h deleted file mode 100644 index 345efdff5d8..00000000000 --- a/DetectorDescription/IRegionSelector/IRegionSelector/RegSelCaloLUTCondData.h +++ /dev/null @@ -1,29 +0,0 @@ -/* emacs: this is -*- c++ -*- */ -/** - ** @file RegSelCaloLUTCondData.h - ** - ** @author sutt - ** @date Tue 4 Feb 2020 15:25:00 CET - ** - ** $Id: RegSelCaloLUTCondData.h, v0.0 Sat 21 March 2020 15:25:00 CET sutt $ - ** - ** Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - **/ - -#ifndef REGSELCALOLUTCONDDATA_H -#define REGSELCALOLUTCONDDATA_H - -#include "AthenaKernel/CondCont.h" -#include "AthenaKernel/CLASS_DEF.h" - -#include "IRegionSelector/RegSelCondData.h" -#include "RegionSelector/RegSelectorHashMap.h" - -typedef RegSelCondData<RegSelectorHashMap> RegSelCaloLUTCondData; - -CLASS_DEF ( RegSelCaloLUTCondData, 232357481, 0 ) -CONDCONT_DEF ( RegSelCaloLUTCondData, 198043569 ); - - - -#endif // REGSELCALOLUTCONDDATA_H diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/RegSelLUTCondData.h b/DetectorDescription/IRegionSelector/IRegionSelector/RegSelLUTCondData.h deleted file mode 100644 index 01341212f7a..00000000000 --- a/DetectorDescription/IRegionSelector/IRegionSelector/RegSelLUTCondData.h +++ /dev/null @@ -1,27 +0,0 @@ -/* emacs: this is -*- c++ -*- */ -/** - ** @file RegSelLUTCondData.h - ** - ** @author sutt - ** @date Tue 4 Feb 2020 15:25:00 CET - ** - ** $Id: RegSelLUTCondData.h, v0.0 Tue 4 Feb 2020 15:25:00 CET sutt $ - ** - ** Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - **/ - -#ifndef REGSELLUTCONDDATA_H -#define REGSELLUTCONDDATA_H - -#include "AthenaKernel/CondCont.h" -#include "AthenaKernel/CLASS_DEF.h" - -#include "RegSelLUT/RegSelSiLUT.h" -#include "IRegionSelector/RegSelCondData.h" - -typedef RegSelCondData<RegSelSiLUT> RegSelLUTCondData; - -CLASS_DEF ( RegSelLUTCondData, 244180796, 0 ) -CONDCONT_DEF ( RegSelLUTCondData, 30547718 ); - -#endif // REGSELLUTCONDDATA_H -- GitLab