Rebase onto CMSSW 16.

Author: bfonta

SimCalorimetry/HGCalAssociatorProducers/plugins/LCToCPAssociatorEDProducer.cc

@@ -37,7 +37,7 @@ class LCToCPAssociatorEDProducerT : public edm::global::EDProducer<> {
   explicit LCToCPAssociatorEDProducerT(const edm::ParameterSet &);
   ~LCToCPAssociatorEDProducerT() override = default;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+  // static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
   static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
@@ -60,7 +60,8 @@ LCToCPAssociatorEDProducerT<CLUSTER>::LCToCPAssociatorEDProducerT(const edm::Par
 
   CPCollectionToken_ = consumes<CaloParticleCollection>(pset.getParameter<edm::InputTag>("label_cp"));
   LCCollectionToken_ = consumes<CLUSTER>(label_lc);
-  associatorToken_ = consumes<ticl::LayerClusterToCaloParticleAssociatorT<CLUSTER>>(pset.getParameter<edm::InputTag>("associator"));
+  associatorToken_ =
+      consumes<ticl::LayerClusterToCaloParticleAssociatorT<CLUSTER>>(pset.getParameter<edm::InputTag>("associator"));
 }
 
 //
@@ -95,7 +96,7 @@ void LCToCPAssociatorEDProducerT<CLUSTER>::produce(edm::StreamID,
   // Protection against missing cluster collection
   if (!LCCollection.isValid()) {
     edm::LogWarning("LCToCPAssociatorEDProducerT")
-      << "CaloCluster collection with label " << label_lc << " is unavailable. Producing empty associations.";
+        << "CaloCluster collection with label " << label_lc << " is unavailable. Producing empty associations.";
 
     // Return empty collections
     auto emptyRecSimColl = std::make_unique<ticl::RecoToSimCollectionT<CLUSTER>>();
@@ -120,6 +121,7 @@ void LCToCPAssociatorEDProducerT<CLUSTER>::produce(edm::StreamID,
   iEvent.put(std::move(str));
 }
 
+template <typename CLUSTER>
 void LCToCPAssociatorEDProducerT<CLUSTER>::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("label_cp", edm::InputTag("mix", "MergedCaloTruth"));

SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSCAssociatorByEnergyScoreProducer.cc

@@ -31,7 +31,7 @@ void LCToSCAssociatorByEnergyScoreProducerT<HIT, CLUSTER>::produce(edm::StreamID
   std::vector<const HIT *> hits;
 
   for (unsigned i = 0; i < hits_token_.size(); ++i) {
-	auto hits_handle = iEvent.getHandle(hits_token_[i]);
+    auto hits_handle = iEvent.getHandle(hits_token_[i]);
 
     // Check handle validity
     if (!hits_handle.isValid()) {

SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSCAssociatorEDProducer.cc

@@ -54,7 +54,8 @@ LCToSCAssociatorEDProducerT<CLUSTER>::LCToSCAssociatorEDProducerT(const edm::Par
 
   LCCollectionToken_ = consumes<CLUSTER>(label_lcl);
   SCCollectionToken_ = consumes<SimClusterCollection>(label_scl);
-  associatorToken_ = consumes<ticl::LayerClusterToSimClusterAssociatorT<CLUSTER>>(pset.getParameter<edm::InputTag>("associator"));
+  associatorToken_ =
+      consumes<ticl::LayerClusterToSimClusterAssociatorT<CLUSTER>>(pset.getParameter<edm::InputTag>("associator"));
 }
 
 //
@@ -92,15 +93,15 @@ void LCToSCAssociatorEDProducerT<CLUSTER>::produce(edm::StreamID,
   // Protections
   if (!SCCollection.isValid()) {
     edm::LogWarning("LCToSCAssociatorEDProducerT")
-      << "CaloCluster collection with label " << label_scl << " is unavailable. Producing empty associations.";
+        << "CaloCluster collection with label " << label_scl << " is unavailable. Producing empty associations.";
   }
   if (!LCCollection.isValid()) {
     edm::LogWarning("LCToSCAssociatorEDProducer")
-      << "CaloCluster collection with label " << label_lcl << " is unavailable. Producing empty associations.";
+        << "CaloCluster collection with label " << label_lcl << " is unavailable. Producing empty associations.";
 
     // Return empty collections
-    auto emptyRecSimColl = std::make_unique<ticl::RecoToSimCollectionWithSimClusters>();
-    auto emptySimRecColl = std::make_unique<ticl::SimToRecoCollectionWithSimClusters>();
+    auto emptyRecSimColl = std::make_unique<ticl::RecoToSimCollectionWithSimClustersT<CLUSTER>>();
+    auto emptySimRecColl = std::make_unique<ticl::SimToRecoCollectionWithSimClustersT<CLUSTER>>();
 
     iEvent.put(std::move(emptyRecSimColl));
     iEvent.put(std::move(emptySimRecColl));