From fa992e41b966b2c45478b63ac67f51b37a1fa6e1 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 15 May 2023 00:34:36 -0400
Subject: [PATCH] fix: use plain hits collection, use tag name without
 associations

---
 src/detectors/BEMC/BEMC.cc               | 12 ++++++------
 src/detectors/BHCAL/BHCAL.cc             |  4 ++--
 src/detectors/EEMC/EEMC.cc               | 10 +++++-----
 src/detectors/EHCAL/EHCAL.cc             |  8 ++++----
 src/detectors/FEMC/FEMC.cc               | 16 ++++++++--------
 src/detectors/FHCAL/FHCAL.cc             | 24 ++++++++++++------------
 src/detectors/LUMISPECCAL/LUMISPECCAL.cc |  4 ++--
 src/detectors/ZDC/ZDC.cc                 |  8 ++++----
 8 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc
index 1ebff74d8f..c48aef7d91 100644
--- a/src/detectors/BEMC/BEMC.cc
+++ b/src/detectors/BEMC/BEMC.cc
@@ -61,9 +61,9 @@ extern "C" {
         app->Add(new JFactoryGeneratorT<ProtoCluster_factory_EcalBarrelSciGlassProtoClusters>());
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalBarrelSciGlassClusters>(
-             "EcalBarrelSciGlassClustersWithAssociations",
+             "EcalBarrelSciGlassClusters",
             {"EcalBarrelSciGlassProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalBarrelSciGlassRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "EcalBarrelSciGlassHits"},                // edm4hep::SimCalorimeterHitCollection
             {"EcalBarrelSciGlassClusters",             // edm4eic::Cluster
              "EcalBarrelSciGlassClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -84,9 +84,9 @@ extern "C" {
         app->Add(new JFactoryGeneratorT<ProtoCluster_factory_EcalBarrelScFiProtoClusters>());
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalBarrelScFiClusters>(
-             "EcalBarrelScFiClustersWithAssociations",
+             "EcalBarrelScFiClusters",
             {"EcalBarrelScFiProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalBarrelScFiRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "EcalBarrelScFiHits"},                // edm4hep::SimCalorimeterHitCollection
             {"EcalBarrelScFiClusters",             // edm4eic::Cluster
              "EcalBarrelScFiClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
              {
@@ -115,9 +115,9 @@ extern "C" {
         app->Add(new JFactoryGeneratorT<ProtoCluster_factory_EcalBarrelSciGlassTruthProtoClusters>());
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalBarrelSciGlassTruthClusters>(
-             "EcalBarrelSciGlassTruthClustersWithAssociations",
+             "EcalBarrelSciGlassTruthClusters",
             {"EcalBarrelSciGlassTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalBarrelSciGlassTruthRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "EcalBarrelSciGlassHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"EcalBarrelSciGlassTruthClusters",             // edm4eic::Cluster
              "EcalBarrelSciGlassTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
              {
diff --git a/src/detectors/BHCAL/BHCAL.cc b/src/detectors/BHCAL/BHCAL.cc
index 7047453c86..35cbac16ed 100644
--- a/src/detectors/BHCAL/BHCAL.cc
+++ b/src/detectors/BHCAL/BHCAL.cc
@@ -43,7 +43,7 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalBarrelClusters>(
-             "HcalBarrelClustersWithAssociations",
+             "HcalBarrelClusters",
             {"HcalBarrelIslandProtoClusters",  // edm4eic::ProtoClusterCollection
              "HcalBarrelHits"},                // edm4hep::SimCalorimeterHitCollection
             {"HcalBarrelClusters",             // edm4eic::Cluster
@@ -62,7 +62,7 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalBarrelTruthClusters>(
-             "HcalBarrelTruthClustersWithAssociations",
+             "HcalBarrelTruthClusters",
             {"HcalBarrelTruthProtoClusters",        // edm4eic::ProtoClusterCollection
              "HcalBarrelHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"HcalBarrelTruthClusters",             // edm4eic::Cluster
diff --git a/src/detectors/EEMC/EEMC.cc b/src/detectors/EEMC/EEMC.cc
index 331a1dd67d..58beef8b8b 100644
--- a/src/detectors/EEMC/EEMC.cc
+++ b/src/detectors/EEMC/EEMC.cc
@@ -42,9 +42,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalEndcapNTruthClusters>(
-             "EcalEndcapNTruthClustersWithAssociations",
+             "EcalEndcapNTruthClusters",
             {"EcalEndcapNTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalEndcapNRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "EcalEndcapNHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"EcalEndcapNTruthClusters",             // edm4eic::Cluster
              "EcalEndcapNTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -61,9 +61,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalEndcapNClusters>(
-             "EcalEndcapNClustersWithAssociations",
-            {"EcalEndcapNProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalEndcapNRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "EcalEndcapNClusters",
+            {"EcalEndcapNIslandProtoClusters",  // edm4eic::ProtoClusterCollection
+             "EcalEndcapNHits"},                // edm4hep::SimCalorimeterHitCollection
             {"EcalEndcapNClusters",             // edm4eic::Cluster
              "EcalEndcapNClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
diff --git a/src/detectors/EHCAL/EHCAL.cc b/src/detectors/EHCAL/EHCAL.cc
index 684c398ee4..b86dd2507e 100644
--- a/src/detectors/EHCAL/EHCAL.cc
+++ b/src/detectors/EHCAL/EHCAL.cc
@@ -44,9 +44,9 @@ extern "C" {
         app->Add(new JFactoryGeneratorT<ProtoCluster_factory_HcalEndcapNIslandProtoClusters>());
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalEndcapNTruthClusters>(
-             "HcalEndcapNTruthClustersWithAssociations",
+             "HcalEndcapNTruthClusters",
             {"HcalEndcapNTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "HcalEndcapNRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "HcalEndcapNHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"HcalEndcapNTruthClusters",             // edm4eic::Cluster
              "HcalEndcapNTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -63,9 +63,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalEndcapNClusters>(
-             "HcalEndcapNClustersWithAssociations",
+             "HcalEndcapNClusters",
             {"HcalEndcapNIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "HcalEndcapNRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "HcalEndcapNHits"},                // edm4hep::SimCalorimeterHitCollection
             {"HcalEndcapNClusters",             // edm4eic::Cluster
              "HcalEndcapNClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
diff --git a/src/detectors/FEMC/FEMC.cc b/src/detectors/FEMC/FEMC.cc
index 652ea3a7c5..f37cc970c6 100644
--- a/src/detectors/FEMC/FEMC.cc
+++ b/src/detectors/FEMC/FEMC.cc
@@ -61,9 +61,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalEndcapPTruthClusters>(
-             "EcalEndcapPTruthClustersWithAssociations",
+             "EcalEndcapPTruthClusters",
             {"EcalEndcapPTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalEndcapPRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "EcalEndcapPHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"EcalEndcapPTruthClusters",             // edm4eic::Cluster
              "EcalEndcapPTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -80,9 +80,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalEndcapPClusters>(
-             "EcalEndcapPClustersWithAssociations",
+             "EcalEndcapPClusters",
             {"EcalEndcapPIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "EcalEndcapPRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "EcalEndcapPHits"},                // edm4hep::SimCalorimeterHitCollection
             {"EcalEndcapPClusters",             // edm4eic::Cluster
              "EcalEndcapPClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -104,9 +104,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalEndcapPInsertTruthClusters>(
-             "EcalEndcapPInsertTruthClustersWithAssociations",
+             "EcalEndcapPInsertTruthClusters",
             {"EcalEndcapPInsertTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "EcalEndcapPInsertRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "EcalEndcapPInsertHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"EcalEndcapPInsertTruthClusters",             // edm4eic::Cluster
              "EcalEndcapPInsertTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -123,9 +123,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalEndcapPInsertClusters>(
-             "EcalEndcapPInsertClustersWithAssociations",
+             "EcalEndcapPInsertClusters",
             {"EcalEndcapPInsertIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "EcalEndcapPInsertRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "EcalEndcapPInsertHits"},                // edm4hep::SimCalorimeterHitCollection
             {"EcalEndcapPInsertClusters",             // edm4eic::Cluster
              "EcalEndcapPInsertClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
diff --git a/src/detectors/FHCAL/FHCAL.cc b/src/detectors/FHCAL/FHCAL.cc
index 8d2401fe67..64d3922453 100644
--- a/src/detectors/FHCAL/FHCAL.cc
+++ b/src/detectors/FHCAL/FHCAL.cc
@@ -84,9 +84,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalEndcapPTruthClusters>(
-             "HcalEndcapPTruthClustersWithAssociations",
+             "HcalEndcapPTruthClusters",
             {"HcalEndcapPTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "HcalEndcapPRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "HcalEndcapPHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"HcalEndcapPTruthClusters",             // edm4eic::Cluster
              "HcalEndcapPTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -103,9 +103,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalEndcapPClusters>(
-             "HcalEndcapPClustersWithAssociations",
+             "HcalEndcapPClusters",
             {"HcalEndcapPIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "HcalEndcapPRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "HcalEndcapPHits"},                // edm4hep::SimCalorimeterHitCollection
             {"HcalEndcapPClusters",             // edm4eic::Cluster
              "HcalEndcapPClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -128,9 +128,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalEndcapPTruthClusters>(
-             "HcalEndcapPInsertTruthClustersWithAssociations",
+             "HcalEndcapPInsertTruthClusters",
             {"HcalEndcapPInsertTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "HcalEndcapPInsertRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "HcalEndcapPInsertHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"HcalEndcapPInsertTruthClusters",             // edm4eic::Cluster
              "HcalEndcapPInsertTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -147,9 +147,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_HcalEndcapPInsertClusters>(
-             "HcalEndcapPInsertClustersWithAssociations",
+             "HcalEndcapPInsertClusters",
             {"HcalEndcapPInsertIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "HcalEndcapPInsertRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "HcalEndcapPInsertHits"},                // edm4hep::SimCalorimeterHitCollection
             {"HcalEndcapPInsertClusters",             // edm4eic::Cluster
              "HcalEndcapPInsertClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -171,9 +171,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_LFHCALTruthClusters>(
-             "LFHCALTruthClustersWithAssociations",
+             "LFHCALTruthClusters",
             {"LFHCALTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "LFHCALRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "LFHCALHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"LFHCALTruthClusters",             // edm4eic::Cluster
              "LFHCALTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -190,9 +190,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_LFHCALClusters>(
-             "LFHCALClustersWithAssociations",
+             "LFHCALClusters",
             {"LFHCALIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "LFHCALRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "LFHCALHits"},                // edm4hep::SimCalorimeterHitCollection
             {"LFHCALClusters",             // edm4eic::Cluster
              "LFHCALClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
diff --git a/src/detectors/LUMISPECCAL/LUMISPECCAL.cc b/src/detectors/LUMISPECCAL/LUMISPECCAL.cc
index f243e82c00..111398ea50 100644
--- a/src/detectors/LUMISPECCAL/LUMISPECCAL.cc
+++ b/src/detectors/LUMISPECCAL/LUMISPECCAL.cc
@@ -42,7 +42,7 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalLumiSpecClusters>(
-             "EcalLumiSpecClustersWithAssociations",
+             "EcalLumiSpecClusters",
             {"EcalLumiSpecIslandProtoClusters",  // edm4eic::ProtoClusterCollection
              "EcalLumiSpecHits"},                // edm4hep::SimCalorimeterHitCollection
             {"EcalLumiSpecClusters",             // edm4eic::Cluster
@@ -61,7 +61,7 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_EcalLumiSpecTruthClusters>(
-             "EcalLumiSpecTruthClustersWithAssociations",
+             "EcalLumiSpecTruthClusters",
             {"EcalLumiSpecTruthProtoClusters",        // edm4eic::ProtoClusterCollection
              "EcalLumiSpecHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"EcalLumiSpecTruthClusters",             // edm4eic::Cluster
diff --git a/src/detectors/ZDC/ZDC.cc b/src/detectors/ZDC/ZDC.cc
index 28da801d9a..2112adeb6c 100644
--- a/src/detectors/ZDC/ZDC.cc
+++ b/src/detectors/ZDC/ZDC.cc
@@ -43,9 +43,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_ZDCEcalTruthClusters>(
-             "ZDCEcalTruthClustersWithAssociations",
+             "ZDCEcalTruthClusters",
             {"ZDCEcalTruthProtoClusters",        // edm4eic::ProtoClusterCollection
-             "ZDCEcalRawHits"},                  // edm4hep::SimCalorimeterHitCollection
+             "ZDCEcalHits"},                     // edm4hep::SimCalorimeterHitCollection
             {"ZDCEcalTruthClusters",             // edm4eic::Cluster
              "ZDCEcalTruthClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {
@@ -62,9 +62,9 @@ extern "C" {
 
         app->Add(
           new JChainMultifactoryGeneratorT<Cluster_factory_ZDCEcalClusters>(
-             "ZDCEcalClustersWithAssociations",
+             "ZDCEcalClusters",
             {"ZDCEcalIslandProtoClusters",  // edm4eic::ProtoClusterCollection
-             "ZDCEcalRawHits"},             // edm4hep::SimCalorimeterHitCollection
+             "ZDCEcalHits"},                // edm4hep::SimCalorimeterHitCollection
             {"ZDCEcalClusters",             // edm4eic::Cluster
              "ZDCEcalClusterAssociations"}, // edm4eic::MCRecoClusterParticleAssociation
             {