diff --git a/CODEOWNERS b/CODEOWNERS index 26691212..3c788977 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -11,12 +11,8 @@ * @c-dilks src/iguana/algorithms/clas12/CalorimeterLinker/* @c-dilks src/iguana/algorithms/clas12/EventBuilderFilter/* @c-dilks -src/iguana/algorithms/clas12/FTEnergyCorrection/* @asligonulacar -src/iguana/algorithms/clas12/FiducialFilter/* @Gregtom3 src/iguana/algorithms/clas12/MatchParticleProximity/* @c-dilks -src/iguana/algorithms/clas12/MomentumCorrection/* @RichCap @c-dilks src/iguana/algorithms/clas12/PhotonGBTFilter/* @Gregtom3 -src/iguana/algorithms/clas12/RGAFiducialFilter/* @tbhayward src/iguana/algorithms/clas12/SectorFinder/* @rtysonCLAS12 src/iguana/algorithms/clas12/TrajLinker/* @c-dilks src/iguana/algorithms/clas12/ZVertexFilter/* @rtysonCLAS12 diff --git a/src/iguana/algorithms/clas12/FTEnergyCorrection/Action.yaml b/src/iguana/algorithms/clas12/FTEnergyCorrection/Action.yaml deleted file mode 100644 index e8dfda6a..00000000 --- a/src/iguana/algorithms/clas12/FTEnergyCorrection/Action.yaml +++ /dev/null @@ -1,4 +0,0 @@ -algorithm: - name: 'clas12::FTEnergyCorrection' -include: - - '../rga/FTEnergyCorrection/Action.yaml' # include these action functions diff --git a/src/iguana/algorithms/clas12/FTEnergyCorrection/Algorithm.cc b/src/iguana/algorithms/clas12/FTEnergyCorrection/Algorithm.cc deleted file mode 100644 index ee9a3d94..00000000 --- a/src/iguana/algorithms/clas12/FTEnergyCorrection/Algorithm.cc +++ /dev/null @@ -1,4 +0,0 @@ -#include "Algorithm.h" -namespace iguana::clas12 { - REGISTER_IGUANA_ALGORITHM(FTEnergyCorrection); -} diff --git a/src/iguana/algorithms/clas12/FTEnergyCorrection/Algorithm.h b/src/iguana/algorithms/clas12/FTEnergyCorrection/Algorithm.h deleted file mode 100644 index d98e854f..00000000 --- a/src/iguana/algorithms/clas12/FTEnergyCorrection/Algorithm.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "iguana/algorithms/clas12/rga/FTEnergyCorrection/Algorithm.h" - -namespace iguana::clas12 { - - /// @algo_brief{RENAMED to iguana::clas12::rga::FTEnergyCorrection} - /// @algo_type_transformer - /// @deprecated This algorithm has been RENAMED to iguana::clas12::rga::FTEnergyCorrection, as of Iguana version 1.0.0. - class FTEnergyCorrection : public rga::FTEnergyCorrection - { - // the deprecated algorithm should inherit from the renamed algorithm, to avoid downstream build failures - DEFINE_IGUANA_SUBALGORITHM(FTEnergyCorrection, clas12::FTEnergyCorrection, clas12::rga::FTEnergyCorrection) - - public: - - // make sure base-class specialized `Run` functions (overloads) are not shadowed by any `Run` function overrides here - using rga::FTEnergyCorrection::Run; - - // override `Start`, `Run` and `Stop` - // provide the new name and the Iguana version number, for a runtime failure - DEPRECATE_IGUANA_ALGORITHM(ThrowSinceRenamed("clas12::rga::FTEnergyCorrection", "1.0.0");) - }; - -} diff --git a/src/iguana/algorithms/clas12/FiducialFilter/Action.yaml b/src/iguana/algorithms/clas12/FiducialFilter/Action.yaml deleted file mode 100644 index 2cb45bd6..00000000 --- a/src/iguana/algorithms/clas12/FiducialFilter/Action.yaml +++ /dev/null @@ -1,4 +0,0 @@ -algorithm: - name: 'clas12::FiducialFilter' -include: - - '../rga/FiducialFilterPass1/Action.yaml' # include these action functions diff --git a/src/iguana/algorithms/clas12/FiducialFilter/Algorithm.cc b/src/iguana/algorithms/clas12/FiducialFilter/Algorithm.cc deleted file mode 100644 index 5a0150e9..00000000 --- a/src/iguana/algorithms/clas12/FiducialFilter/Algorithm.cc +++ /dev/null @@ -1,4 +0,0 @@ -#include "Algorithm.h" -namespace iguana::clas12 { - REGISTER_IGUANA_ALGORITHM(FiducialFilter); -} diff --git a/src/iguana/algorithms/clas12/FiducialFilter/Algorithm.h b/src/iguana/algorithms/clas12/FiducialFilter/Algorithm.h deleted file mode 100644 index c2e059d2..00000000 --- a/src/iguana/algorithms/clas12/FiducialFilter/Algorithm.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "iguana/algorithms/clas12/rga/FiducialFilterPass1/Algorithm.h" - -namespace iguana::clas12 { - - /// @algo_brief{RENAMED to iguana::clas12::rga::FiducialFilterPass1} - /// @algo_type_filter - /// @deprecated This algorithm has been RENAMED to iguana::clas12::rga::FiducialFilterPass1, as of Iguana version 1.0.0. - class FiducialFilter : public rga::FiducialFilterPass1 - { - // the deprecated algorithm should inherit from the renamed algorithm, to avoid downstream build failures - DEFINE_IGUANA_SUBALGORITHM(FiducialFilter, clas12::FiducialFilter, clas12::rga::FiducialFilterPass1) - - public: - - // make sure base-class specialized `Run` functions (overloads) are not shadowed by any `Run` function overrides here - using rga::FiducialFilterPass1::Run; - - // override `Start`, `Run` and `Stop` - // provide the new name and the Iguana version number, for a runtime failure - DEPRECATE_IGUANA_ALGORITHM(ThrowSinceRenamed("clas12::rga::FiducialFilterPass1", "1.0.0");) - }; - -} diff --git a/src/iguana/algorithms/clas12/MomentumCorrection/Action.yaml b/src/iguana/algorithms/clas12/MomentumCorrection/Action.yaml deleted file mode 100644 index c358477d..00000000 --- a/src/iguana/algorithms/clas12/MomentumCorrection/Action.yaml +++ /dev/null @@ -1,4 +0,0 @@ -algorithm: - name: 'clas12::MomentumCorrection' -include: - - '../rga/MomentumCorrection/Action.yaml' # include these action functions diff --git a/src/iguana/algorithms/clas12/MomentumCorrection/Algorithm.cc b/src/iguana/algorithms/clas12/MomentumCorrection/Algorithm.cc deleted file mode 100644 index 3aaf8ad5..00000000 --- a/src/iguana/algorithms/clas12/MomentumCorrection/Algorithm.cc +++ /dev/null @@ -1,4 +0,0 @@ -#include "Algorithm.h" -namespace iguana::clas12 { - REGISTER_IGUANA_ALGORITHM(MomentumCorrection); -} diff --git a/src/iguana/algorithms/clas12/MomentumCorrection/Algorithm.h b/src/iguana/algorithms/clas12/MomentumCorrection/Algorithm.h deleted file mode 100644 index 9dba831e..00000000 --- a/src/iguana/algorithms/clas12/MomentumCorrection/Algorithm.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "iguana/algorithms/clas12/rga/MomentumCorrection/Algorithm.h" - -namespace iguana::clas12 { - - /// @algo_brief{RENAMED to iguana::clas12::rga::MomentumCorrection} - /// @algo_type_transformer - /// @deprecated This algorithm has been RENAMED to iguana::clas12::rga::MomentumCorrection, as of Iguana version 1.0.0. - class MomentumCorrection : public rga::MomentumCorrection - { - // the deprecated algorithm should inherit from the renamed algorithm, to avoid downstream build failures - DEFINE_IGUANA_SUBALGORITHM(MomentumCorrection, clas12::MomentumCorrection, clas12::rga::MomentumCorrection) - - public: - - // make sure base-class specialized `Run` functions (overloads) are not shadowed by any `Run` function overrides here - using rga::MomentumCorrection::Run; - - // override `Start`, `Run` and `Stop` - // provide the new name and the Iguana version number, for a runtime failure - DEPRECATE_IGUANA_ALGORITHM(ThrowSinceRenamed("clas12::rga::MomentumCorrection", "1.0.0");) - }; - -} diff --git a/src/iguana/algorithms/clas12/RGAFiducialFilter/Algorithm.cc b/src/iguana/algorithms/clas12/RGAFiducialFilter/Algorithm.cc deleted file mode 100644 index 53e0cbd0..00000000 --- a/src/iguana/algorithms/clas12/RGAFiducialFilter/Algorithm.cc +++ /dev/null @@ -1,4 +0,0 @@ -#include "Algorithm.h" -namespace iguana::clas12 { - REGISTER_IGUANA_ALGORITHM(RGAFiducialFilter); -} diff --git a/src/iguana/algorithms/clas12/RGAFiducialFilter/Algorithm.h b/src/iguana/algorithms/clas12/RGAFiducialFilter/Algorithm.h deleted file mode 100644 index b63958bf..00000000 --- a/src/iguana/algorithms/clas12/RGAFiducialFilter/Algorithm.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "iguana/algorithms/clas12/rga/FiducialFilterPass2/Algorithm.h" - -namespace iguana::clas12 { - - /// @algo_brief{RENAMED to iguana::clas12::rga::FiducialFilterPass2} - /// @algo_type_filter - /// @deprecated This algorithm has been RENAMED to iguana::clas12::rga::FiducialFilterPass2, as of Iguana version 1.0.0. - class RGAFiducialFilter : public rga::FiducialFilterPass2 - { - // the deprecated algorithm should inherit from the renamed algorithm, to avoid downstream build failures - DEFINE_IGUANA_SUBALGORITHM(RGAFiducialFilter, clas12::RGAFiducialFilter, clas12::rga::FiducialFilterPass2) - - public: - - // make sure base-class specialized `Run` functions (overloads) are not shadowed by any `Run` function overrides here - using rga::FiducialFilterPass2::Run; - - // override `Start`, `Run` and `Stop` - // provide the new name and the Iguana version number, for a runtime failure - DEPRECATE_IGUANA_ALGORITHM(ThrowSinceRenamed("clas12::rga::FiducialFilterPass2", "1.0.0");) - }; - -} diff --git a/src/iguana/algorithms/meson.build b/src/iguana/algorithms/meson.build index aaddac35..733b271d 100644 --- a/src/iguana/algorithms/meson.build +++ b/src/iguana/algorithms/meson.build @@ -44,7 +44,6 @@ algo_dict = [ 'prerequisites': [ 'clas12::CalorimeterLinker', 'clas12::TrajLinker' ], }, }, - { 'name': 'clas12::FiducialFilter', 'has_config': false, 'has_validator': false, 'test_args': { 'should_fail': true } }, # deprecated { 'name': 'clas12::SectorFinder', 'test_args': { @@ -75,7 +74,6 @@ algo_dict = [ 'has_validator': false, 'test_args': {'banks': [ 'RECFT::Particle' ]}, }, - { 'name': 'clas12::FTEnergyCorrection', 'has_config': false, 'has_validator': false, 'test_args': { 'should_fail': true } }, # deprecated { 'name': 'clas12::rga::MomentumCorrection', 'has_config': false, @@ -90,7 +88,6 @@ algo_dict = [ 'prerequisites': [ 'clas12::SectorFinder' ], }, }, - { 'name': 'clas12::MomentumCorrection', 'has_config': false, 'has_validator': false, 'test_args': { 'should_fail': true } }, # deprecated { 'name': 'physics::InclusiveKinematics', 'algorithm_needs_ROOT': true, @@ -138,7 +135,6 @@ algo_dict = [ 'banks': [ 'REC::Particle', 'RUN::config' ], }, }, - { 'name': 'clas12::RGAFiducialFilter', 'has_config': false, 'has_validator': false, 'has_action_yaml': false, 'test_args': { 'should_fail': true } }, # deprecated { 'name': 'clas12::MatchParticleProximity', 'algorithm_needs_ROOT': true,