Skip to content

Commit

Permalink
reco.cc: add InclusiveKinematicseSigma backwards compatibility for now (
Browse files Browse the repository at this point in the history
#1577)

Provide a graceful deprecation for
#1572

---------

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
  • Loading branch information
veprbl and wdconinc authored Aug 24, 2024
1 parent 180fc07 commit 2a1e553
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
15 changes: 14 additions & 1 deletion src/global/reco/reco.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <JANA/JApplication.h>
#include <edm4eic/Cluster.h>
#include <edm4eic/EDM4eicVersion.h>
#include <edm4eic/InclusiveKinematics.h>
#include <edm4eic/MCRecoClusterParticleAssociation.h>
#include <edm4eic/MCRecoParticleAssociation.h>
#include <edm4eic/ReconstructedParticle.h>
Expand All @@ -18,10 +19,10 @@
#if EDM4EIC_VERSION_MAJOR >= 6
#include "algorithms/reco/HadronicFinalState.h"
#include "algorithms/reco/InclusiveKinematicsDA.h"
#include "algorithms/reco/InclusiveKinematicsESigma.h"
#include "algorithms/reco/InclusiveKinematicsElectron.h"
#include "algorithms/reco/InclusiveKinematicsJB.h"
#include "algorithms/reco/InclusiveKinematicsSigma.h"
#include "algorithms/reco/InclusiveKinematicsESigma.h"
#endif
#include "extensions/jana/JOmniFactoryGeneratorT.h"
#include "factories/meta/CollectionCollector_factory.h"
Expand Down Expand Up @@ -171,6 +172,18 @@ void InitPlugin(JApplication *app) {
app
));

// InclusiveKinematicseSigma is deprecated and will be removed, use InclusiveKinematicsESigma instead
app->Add(new JOmniFactoryGeneratorT<CollectionCollector_factory<edm4eic::InclusiveKinematics>>(
"InclusiveKinematicseSigma_legacy",
{
"InclusiveKinematicsESigma"
},
{
"InclusiveKinematicseSigma"
},
app
));


app->Add(new JOmniFactoryGeneratorT<InclusiveKinematicsReconstructed_factory<InclusiveKinematicsSigma>>(
"InclusiveKinematicsSigma",
Expand Down
1 change: 1 addition & 0 deletions src/services/io/podio/JEventProcessorPODIO.cc
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"InclusiveKinematicsJB",
"InclusiveKinematicsML",
"InclusiveKinematicsSigma",
"InclusiveKinematicseSigma", // Deprecated, use ESigma
"InclusiveKinematicsESigma",
"InclusiveKinematicsElectron",
"InclusiveKinematicsTruth",
Expand Down

0 comments on commit 2a1e553

Please sign in to comment.