Rename JFactoryPodioTFixed, strip out datamodel_glue

This means that we won't need to modify 100+ files again
eic · Apr 14, 2023 · 9fa09ff · 9fa09ff
1 parent 766b621
commit 9fa09ff
Show file tree

Hide file tree

Showing 98 changed files with 221 additions and 315 deletions.
diff --git a/src/algorithms/trk_chain_example/v2/JFactoryT_SiliconTrackerDigi.h b/src/algorithms/trk_chain_example/v2/JFactoryT_SiliconTrackerDigi.h
@@ -4,15 +4,14 @@
 
 #include <fmt/core.h>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <edm4hep/SimTrackerHit.h>
 
 #include "algorithms/digi/RawTrackerHit.h"
 
 template <typename InputT, typename OutputT>
-class SiliconTrackerDigi_factoryT : public JFactoryPodioTFixed<OutputT> {
+class SiliconTrackerDigi_factoryT : public eicrecon::JFactoryPodioT<OutputT> {
 
 public:
     SiliconTrackerDigi_factoryT() {

diff --git a/src/algorithms/trk_chain_example/v2/JFactoryT_SimTrackerHitsCollector.h b/src/algorithms/trk_chain_example/v2/JFactoryT_SimTrackerHitsCollector.h
@@ -8,16 +8,15 @@
 
 #include <fmt/core.h>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <JANA/JEvent.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <edm4hep/SimTrackerHit.h>
 #include <algorithms/interfaces/ICollectionProducer.h>
 
 
 template <typename OutputT>
-class JFactoryT_SimTrackerHitsCollector : public JFactoryPodioTFixed<OutputT>, eicrecon::ICollectionProducer {
+class JFactoryT_SimTrackerHitsCollector : public eicrecon::JFactoryPodioT<OutputT>, eicrecon::ICollectionProducer {
 
 public:
     JFactoryT_SimTrackerHitsCollector() {

diff --git a/src/algorithms/trk_chain_example/v2/JFactoryT_TrackerHitReconstruction.h b/src/algorithms/trk_chain_example/v2/JFactoryT_TrackerHitReconstruction.h
@@ -3,14 +3,13 @@
 
 #include <fmt/core.h>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <edm4hep/TrackerHit.h>
 
 
 
 template <typename OutputType>
-class JFactoryT_TrackerHitReconstruction : public JFactoryPodioTFixed<OutputType> {
+class JFactoryT_TrackerHitReconstruction : public eicrecon::JFactoryPodioT<OutputType> {
 
 public:
     JFactoryT_TrackerHitReconstruction() {

diff --git a/src/algorithms/trk_chain_example/v3/JFactoryT_SiliconTrackerDigi.h b/src/algorithms/trk_chain_example/v3/JFactoryT_SiliconTrackerDigi.h
@@ -4,16 +4,15 @@
 
 #include <fmt/core.h>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <edm4hep/SimTrackerHit.h>
 
 #include "algorithms/digi/RawTrackerHit.h"
 #include "SimTrackerHitDigi.h"
 
 template <typename InputT, typename OutputT>
-class JFactoryT_SiliconTrackerDigi : public JFactoryPodioTFixed<OutputT>, SimTrackerHitDigi {
+class JFactoryT_SiliconTrackerDigi : public eicrecon::JFactoryPodioT<OutputT>, SimTrackerHitDigi {
 
 public:
     JFactoryT_SiliconTrackerDigi() {

diff --git a/src/detectors/B0ECAL/CalorimeterHit_factory_B0ECalRecHits.h b/src/detectors/B0ECAL/CalorimeterHit_factory_B0ECalRecHits.h
@@ -2,14 +2,13 @@
 #pragma once
 
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <algorithms/calorimetry/CalorimeterHitReco.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
-class CalorimeterHit_factory_B0ECalRecHits : public JFactoryPodioTFixed<edm4eic::CalorimeterHit>, CalorimeterHitReco {
+class CalorimeterHit_factory_B0ECalRecHits : public eicrecon::JFactoryPodioT<edm4eic::CalorimeterHit>, CalorimeterHitReco {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/B0ECAL/Cluster_factory_B0ECalClusters.h b/src/detectors/B0ECAL/Cluster_factory_B0ECalClusters.h
@@ -7,16 +7,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterRecoCoG.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_B0ECalClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
+class Cluster_factory_B0ECalClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/B0ECAL/Cluster_factory_B0ECalMergedClusters.h b/src/detectors/B0ECAL/Cluster_factory_B0ECalMergedClusters.h
@@ -6,16 +6,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterMerger.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_B0ECalMergedClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterMerger {
+class Cluster_factory_B0ECalMergedClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterMerger {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalIslandProtoClusters.h b/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalIslandProtoClusters.h
@@ -6,14 +6,13 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterIslandCluster.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
-class ProtoCluster_factory_B0ECalIslandProtoClusters : public JFactoryPodioTFixed<edm4eic::ProtoCluster>, CalorimeterIslandCluster {
+class ProtoCluster_factory_B0ECalIslandProtoClusters : public eicrecon::JFactoryPodioT<edm4eic::ProtoCluster>, CalorimeterIslandCluster {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalTruthProtoClusters.h b/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalTruthProtoClusters.h
@@ -6,14 +6,13 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterTruthClustering.h>
 
 
 
-class ProtoCluster_factory_B0ECalTruthProtoClusters : public JFactoryPodioTFixed<edm4eic::ProtoCluster>, CalorimeterTruthClustering {
+class ProtoCluster_factory_B0ECalTruthProtoClusters : public eicrecon::JFactoryPodioT<edm4eic::ProtoCluster>, CalorimeterTruthClustering {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/B0ECAL/RawCalorimeterHit_factory_B0ECalRawHits.h b/src/detectors/B0ECAL/RawCalorimeterHit_factory_B0ECalRawHits.h
@@ -7,8 +7,7 @@
 #include <random>
 
 #include <JANA/JEvent.h>
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterHitDigi.h>
 #include <edm4hep/SimCalorimeterHit.h>
@@ -19,7 +18,7 @@
 
 
 
-class RawCalorimeterHit_factory_B0ECalRawHits : public JFactoryPodioTFixed<edm4hep::RawCalorimeterHit>, CalorimeterHitDigi {
+class RawCalorimeterHit_factory_B0ECalRawHits : public eicrecon::JFactoryPodioT<edm4hep::RawCalorimeterHit>, CalorimeterHitDigi {
 
 public:
 

diff --git a/src/detectors/B0ECAL/TruthCluster_factory_B0ECalTruthProtoClusters.h b/src/detectors/B0ECAL/TruthCluster_factory_B0ECalTruthProtoClusters.h
@@ -6,12 +6,11 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterTruthClustering.h>
 
-class TruthCluster_factory_B0ECalTruthProtoClusters : public JFactoryPodioTFixed<edm4eic::ProtoCluster>, CalorimeterTruthClustering {
+class TruthCluster_factory_B0ECalTruthProtoClusters : public eicrecon::JFactoryPodioT<edm4eic::ProtoCluster>, CalorimeterTruthClustering {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelImagingRecHits.h b/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelImagingRecHits.h
@@ -1,14 +1,13 @@
 
 #pragma once
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <algorithms/calorimetry/ImagingPixelReco.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
-class CalorimeterHit_factory_EcalBarrelImagingRecHits : public JFactoryPodioTFixed<edm4eic::CalorimeterHit>, ImagingPixelReco {
+class CalorimeterHit_factory_EcalBarrelImagingRecHits : public eicrecon::JFactoryPodioT<edm4eic::CalorimeterHit>, ImagingPixelReco {
 
 public:
 

diff --git a/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelScFiMergedHits.h b/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelScFiMergedHits.h
@@ -1,14 +1,13 @@
 
 #pragma once
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <algorithms/calorimetry/CalorimeterHitsMerger.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
-class CalorimeterHit_factory_EcalBarrelScFiMergedHits : public JFactoryPodioTFixed<edm4eic::CalorimeterHit>, CalorimeterHitsMerger {
+class CalorimeterHit_factory_EcalBarrelScFiMergedHits : public eicrecon::JFactoryPodioT<edm4eic::CalorimeterHit>, CalorimeterHitsMerger {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelScFiRecHits.h b/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelScFiRecHits.h
@@ -1,14 +1,13 @@
 
 #pragma once
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <algorithms/calorimetry/CalorimeterHitReco.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
-class CalorimeterHit_factory_EcalBarrelScFiRecHits : public JFactoryPodioTFixed<edm4eic::CalorimeterHit>, CalorimeterHitReco {
+class CalorimeterHit_factory_EcalBarrelScFiRecHits : public eicrecon::JFactoryPodioT<edm4eic::CalorimeterHit>, CalorimeterHitReco {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelSciGlassRecHits.h b/src/detectors/BEMC/CalorimeterHit_factory_EcalBarrelSciGlassRecHits.h
@@ -1,14 +1,13 @@
 
 #pragma once
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 
 #include <algorithms/calorimetry/CalorimeterHitReco.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
-class CalorimeterHit_factory_EcalBarrelSciGlassRecHits : public JFactoryPodioTFixed<edm4eic::CalorimeterHit>, CalorimeterHitReco {
+class CalorimeterHit_factory_EcalBarrelSciGlassRecHits : public eicrecon::JFactoryPodioT<edm4eic::CalorimeterHit>, CalorimeterHitReco {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelImagingClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelImagingClusters.h
@@ -6,16 +6,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/ImagingClusterReco.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_EcalBarrelImagingClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, ImagingClusterReco {
+class Cluster_factory_EcalBarrelImagingClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, ImagingClusterReco {
 
 public:
 

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelImagingMergedClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelImagingMergedClusters.h
@@ -5,15 +5,14 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/TruthEnergyPositionClusterMerger.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
-class Cluster_factory_EcalBarrelImagingMergedClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, TruthEnergyPositionClusterMerger {
+class Cluster_factory_EcalBarrelImagingMergedClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, TruthEnergyPositionClusterMerger {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelScFiClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelScFiClusters.h
@@ -6,16 +6,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterRecoCoG.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_EcalBarrelScFiClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
+class Cluster_factory_EcalBarrelScFiClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassClusters.h
@@ -6,16 +6,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterRecoCoG.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_EcalBarrelSciGlassClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
+class Cluster_factory_EcalBarrelSciGlassClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassMergedClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassMergedClusters.h
@@ -5,16 +5,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterMerger.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_EcalBarrelSciGlassMergedClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterMerger {
+class Cluster_factory_EcalBarrelSciGlassMergedClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterMerger {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassMergedTruthClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassMergedTruthClusters.h
@@ -5,16 +5,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterMerger.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_EcalBarrelSciGlassMergedTruthClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterMerger {
+class Cluster_factory_EcalBarrelSciGlassMergedTruthClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterMerger {
 
 public:
     //------------------------------------------

diff --git a/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassTruthClusters.h b/src/detectors/BEMC/Cluster_factory_EcalBarrelSciGlassTruthClusters.h
@@ -5,16 +5,15 @@
 
 #include <random>
 
-#include <services/io/podio/datamodel_glue.h>
-#include <services/io/podio/JFactoryPodioTFixed.h>
+#include <services/io/podio/JFactoryPodioT.h>
 #include <services/geometry/dd4hep/JDD4hep_service.h>
 #include <algorithms/calorimetry/CalorimeterClusterRecoCoG.h>
 #include <services/log/Log_service.h>
 #include <extensions/spdlog/SpdlogExtensions.h>
 
 
 
-class Cluster_factory_EcalBarrelSciGlassTruthClusters : public JFactoryPodioTFixed<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
+class Cluster_factory_EcalBarrelSciGlassTruthClusters : public eicrecon::JFactoryPodioT<edm4eic::Cluster>, CalorimeterClusterRecoCoG {
 
 public:
     //------------------------------------------