A bit of reorganizing between Calo and HGCal nano folders

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);

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);

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);