From 63b8bf13b825319fd8c1e5c01137a4f4cbfc1b44 Mon Sep 17 00:00:00 2001
From: Kenneth Long <kdlong@hep.wisc.edu>
Date: Fri, 30 Sep 2022 00:35:07 +0200
Subject: [PATCH] A bit of reorganizing between Calo and HGCal nano folders

---
 .../CaloIndexFromAssociationTableProducer.cc  |  2 ++
 .../SimpleCaloObjectFlatTableProducer.cc      |  4 ++++
 .../ObjectIndexFromAssociationProducer.cc     | 24 -------------------
 .../SimClusterRecEnergyTableProducer.cc       |  7 ------
 .../SimpleHGCFlatTableProducerPlugins.cc      | 22 -----------------
 5 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 DPGAnalysis/HGCalNanoAOD/plugins/SimClusterRecEnergyTableProducer.cc
 delete mode 100644 DPGAnalysis/HGCalNanoAOD/plugins/SimpleHGCFlatTableProducerPlugins.cc

diff --git a/DPGAnalysis/CaloNanoAOD/plugins/CaloIndexFromAssociationTableProducer.cc b/DPGAnalysis/CaloNanoAOD/plugins/CaloIndexFromAssociationTableProducer.cc
index b56a5aa8c5a46..e88698824a872 100644
--- a/DPGAnalysis/CaloNanoAOD/plugins/CaloIndexFromAssociationTableProducer.cc
+++ b/DPGAnalysis/CaloNanoAOD/plugins/CaloIndexFromAssociationTableProducer.cc
@@ -21,6 +21,8 @@ typedef ObjectIndexFromAssociationTableProducer<SimClusterCollection, CaloPartic
 typedef ObjectIndexFromAssociationTableProducer<SimClusterCollection, SimClusterCollection>
     SimClusterToSimClusterIndexTableProducer;
 
+#include "FWCore/Framework/interface/MakerMacros.h"
+
 DEFINE_FWK_MODULE(SimTrackToSimClusterIndexTableProducer);
 DEFINE_FWK_MODULE(CaloHitToSimClusterIndexTableProducer);
 DEFINE_FWK_MODULE(SimClusterToCaloParticleIndexTableProducer);
diff --git a/DPGAnalysis/CaloNanoAOD/plugins/SimpleCaloObjectFlatTableProducer.cc b/DPGAnalysis/CaloNanoAOD/plugins/SimpleCaloObjectFlatTableProducer.cc
index cd1e3b044668e..206dc856b374a 100644
--- a/DPGAnalysis/CaloNanoAOD/plugins/SimpleCaloObjectFlatTableProducer.cc
+++ b/DPGAnalysis/CaloNanoAOD/plugins/SimpleCaloObjectFlatTableProducer.cc
@@ -11,8 +11,12 @@ typedef SimpleFlatTableProducer<CaloRecHit> SimpleCaloRecHitFlatTableProducer;
 #include "SimDataFormats/CaloAnalysis/interface/CaloParticle.h"
 typedef SimpleFlatTableProducer<CaloParticle> SimpleCaloParticleFlatTableProducer;
 
+#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
+typedef SimpleFlatTableProducer<reco::CaloCluster> SimpleCaloClusterFlatTableProducer;
+
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(SimplePCaloHitFlatTableProducer);
 DEFINE_FWK_MODULE(SimpleCaloRecHitFlatTableProducer);
 DEFINE_FWK_MODULE(SimpleSimClusterFlatTableProducer);
 DEFINE_FWK_MODULE(SimpleCaloParticleFlatTableProducer);
+DEFINE_FWK_MODULE(SimpleCaloClusterFlatTableProducer);
diff --git a/DPGAnalysis/HGCalNanoAOD/plugins/ObjectIndexFromAssociationProducer.cc b/DPGAnalysis/HGCalNanoAOD/plugins/ObjectIndexFromAssociationProducer.cc
index 636dc103d127a..2f1fae5868674 100644
--- a/DPGAnalysis/HGCalNanoAOD/plugins/ObjectIndexFromAssociationProducer.cc
+++ b/DPGAnalysis/HGCalNanoAOD/plugins/ObjectIndexFromAssociationProducer.cc
@@ -1,39 +1,15 @@
 #include "PhysicsTools/NanoAOD/interface/ObjectIndexFromAssociationProducer.h"
-#include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
-#include "SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h"
-#include "SimDataFormats/CaloAnalysis/interface/CaloParticle.h"
-#include "SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h"
 #include "SimDataFormats/PFAnalysis/interface/PFTruthParticle.h"
 #include "SimDataFormats/PFAnalysis/interface/PFTruthParticleFwd.h"
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "DataFormats/CaloRecHit/interface/CaloRecHit.h"
-#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
-#include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-typedef ObjectIndexFromAssociationTableProducer<edm::SimTrackContainer, SimClusterCollection>
-    SimTrackToSimClusterIndexTableProducer;
-typedef ObjectIndexFromAssociationTableProducer<edm::PCaloHitContainer, SimClusterCollection>
-    CaloHitToSimClusterIndexTableProducer;
 typedef ObjectIndexFromAssociationTableProducer<edm::View<CaloRecHit>, reco::PFCandidateCollection>
     CaloRecHitToPFCandIndexTableProducer;
-typedef ObjectIndexFromAssociationTableProducer<edm::View<CaloRecHit>, SimClusterCollection>
-    CaloRecHitToBestSimClusterIndexTableProducer;
-typedef ObjectIndexFromAssociationTableProducer<SimClusterCollection, CaloParticleCollection>
-    SimClusterToCaloParticleIndexTableProducer;
-typedef ObjectIndexFromAssociationTableProducer<SimClusterCollection, SimClusterCollection>
-    SimClusterToSimClusterIndexTableProducer;
 typedef ObjectIndexFromAssociationTableProducer<edm::View<CaloRecHit>, PFTruthParticleCollection>
     CaloRecHitToPFTruthParticleIndexTableProducer;
 
-DEFINE_FWK_MODULE(SimTrackToSimClusterIndexTableProducer);
-DEFINE_FWK_MODULE(CaloHitToSimClusterIndexTableProducer);
-DEFINE_FWK_MODULE(SimClusterToCaloParticleIndexTableProducer);
-DEFINE_FWK_MODULE(SimClusterToSimClusterIndexTableProducer);
 DEFINE_FWK_MODULE(CaloRecHitToPFCandIndexTableProducer);
-DEFINE_FWK_MODULE(CaloRecHitToBestSimClusterIndexTableProducer);
 DEFINE_FWK_MODULE(CaloRecHitToPFTruthParticleIndexTableProducer);
diff --git a/DPGAnalysis/HGCalNanoAOD/plugins/SimClusterRecEnergyTableProducer.cc b/DPGAnalysis/HGCalNanoAOD/plugins/SimClusterRecEnergyTableProducer.cc
deleted file mode 100644
index 295f71418841d..0000000000000
--- a/DPGAnalysis/HGCalNanoAOD/plugins/SimClusterRecEnergyTableProducer.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "PhysicsTools/NanoAOD/interface/ObjectPropertyFromIndexMapTableProducer.h"
-#include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
-#include "SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-
-typedef ObjectPropertyFromIndexMapTableProducer<SimClusterCollection, float> SimClusterRecEnergyTableProducer;
-DEFINE_FWK_MODULE(SimClusterRecEnergyTableProducer);
diff --git a/DPGAnalysis/HGCalNanoAOD/plugins/SimpleHGCFlatTableProducerPlugins.cc b/DPGAnalysis/HGCalNanoAOD/plugins/SimpleHGCFlatTableProducerPlugins.cc
deleted file mode 100644
index 206dc856b374a..0000000000000
--- a/DPGAnalysis/HGCalNanoAOD/plugins/SimpleHGCFlatTableProducerPlugins.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h"
-
-#include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
-typedef SimpleFlatTableProducer<SimCluster> SimpleSimClusterFlatTableProducer;
-
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
-typedef SimpleFlatTableProducer<PCaloHit> SimplePCaloHitFlatTableProducer;
-#include "DataFormats/CaloRecHit/interface/CaloRecHit.h"
-typedef SimpleFlatTableProducer<CaloRecHit> SimpleCaloRecHitFlatTableProducer;
-
-#include "SimDataFormats/CaloAnalysis/interface/CaloParticle.h"
-typedef SimpleFlatTableProducer<CaloParticle> SimpleCaloParticleFlatTableProducer;
-
-#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
-typedef SimpleFlatTableProducer<reco::CaloCluster> SimpleCaloClusterFlatTableProducer;
-
-#include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE(SimplePCaloHitFlatTableProducer);
-DEFINE_FWK_MODULE(SimpleCaloRecHitFlatTableProducer);
-DEFINE_FWK_MODULE(SimpleSimClusterFlatTableProducer);
-DEFINE_FWK_MODULE(SimpleCaloParticleFlatTableProducer);
-DEFINE_FWK_MODULE(SimpleCaloClusterFlatTableProducer);