Merge pull request cms-sw#234 from jbsauvan/integrate-pr24544-comments

Integration in devel of  cms-sw#24544 PR comments

Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py

@@ -12,9 +12,9 @@
 #
 simHcalTechTrigDigis.ttpDigiCollection = "DMHcalTTPDigis"
 #
-hgcalTriggerPrimitiveDigiProducer.eeDigis = "mixData:HGCDigisEE"
-hgcalTriggerPrimitiveDigiProducer.fhDigis = "mixData:HGCDigisHEfront"
-hgcalTriggerPrimitiveDigiProducer.bhDigis = "mixData:HGCDigisHEback"
+hgcalVFEProducer.eeDigis = "mixData:HGCDigisEE"
+hgcalVFEProducer.fhDigis = "mixData:HGCDigisHEfront"
+hgcalVFEProducer.bhDigis = "mixData:HGCDigisHEback"
 
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
 if not stage2L1Trigger.isChosen():

L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py

@@ -117,11 +117,11 @@ def _appendStage2Digis(obj):
 # adding HGCal L1 trigger digis
 def _appendHGCalDigis(obj):
     l1HGCalDigis = [
-        'keep *_hgcalTriggerPrimitiveDigiProducer_calibratedTriggerCells_*',
-        'keep *_hgcalTriggerPrimitiveDigiProducer_cluster2D_*',
-        'keep *_hgcalTriggerPrimitiveDigiProducer_cluster3D_*',
-        'keep *_hgcalTriggerPrimitiveDigiProducer_towerMap_*',
-        'keep *_hgcalTriggerPrimitiveDigiProducer_tower_*',
+        'keep l1tHGCalTriggerCellBXVector_hgcalVFEProducer_*_*',
+        'keep l1tHGCalTriggerCellBXVector_hgcalConcentratorProducer_*_*',
+        'keep l1tHGCalTowerBXVector_hgcalTowerProducer_*_*',
+        'keep l1tHGCalClusterBXVector_hgcalBackEndLayer1Producer_*_*',
+        'keep l1tHGCalMulticlusterBXVector_hgcalBackEndLayer2Producer_*_*'
         ]
     obj.outputCommands += l1HGCalDigis
 

L1Trigger/L1THGCal/interface/HGCalProcessorBase.h

@@ -0,0 +1,29 @@
+#ifndef __L1Trigger_L1THGCal_HGCalProcessorBase_h__
+#define __L1Trigger_L1THGCal_HGCalProcessorBase_h__
+
+#include "L1Trigger/L1THGCal/interface/HGCalProcessorBaseT.h"
+
+#include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
+#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
+#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
+#include "DataFormats/L1THGCal/interface/HGCalCluster.h"
+#include "DataFormats/L1THGCal/interface/HGCalMulticluster.h"
+#include "DataFormats/L1THGCal/interface/HGCalTowerMap.h"
+#include "DataFormats/L1THGCal/interface/HGCalTower.h"
+
+typedef HGCalProcessorBaseT<HGCalDigiCollection, l1t::HGCalTriggerCellBxCollection> HGCalVFEProcessorBase;
+typedef HGCalProcessorBaseT<edm::Handle<l1t::HGCalTriggerCellBxCollection>, l1t::HGCalTriggerCellBxCollection> HGCalConcentratorProcessorBase;
+typedef HGCalProcessorBaseT<edm::Handle<l1t::HGCalTriggerCellBxCollection>, l1t::HGCalClusterBxCollection> HGCalBackendLayer1ProcessorBase;
+typedef HGCalProcessorBaseT<edm::Handle<l1t::HGCalClusterBxCollection>, l1t::HGCalMulticlusterBxCollection>  HGCalBackendLayer2ProcessorBase;
+typedef HGCalProcessorBaseT<edm::Handle<l1t::HGCalTriggerCellBxCollection>, l1t::HGCalTowerMapBxCollection> HGCalTowerMapProcessorBase;
+typedef HGCalProcessorBaseT<edm::Handle<l1t::HGCalTowerMapBxCollection>, l1t::HGCalTowerBxCollection> HGCalTowerProcessorBase;
+
+#include "FWCore/PluginManager/interface/PluginFactory.h"
+typedef edmplugin::PluginFactory< HGCalVFEProcessorBase* (const edm::ParameterSet&) > HGCalVFEProcessorBaseFactory;
+typedef edmplugin::PluginFactory< HGCalConcentratorProcessorBase* (const edm::ParameterSet&) > HGCalConcentratorFactory;
+typedef edmplugin::PluginFactory< HGCalBackendLayer1ProcessorBase* (const edm::ParameterSet&) > HGCalBackendLayer1Factory;
+typedef edmplugin::PluginFactory< HGCalBackendLayer2ProcessorBase* (const edm::ParameterSet&) > HGCalBackendLayer2Factory;
+typedef edmplugin::PluginFactory< HGCalTowerMapProcessorBase* (const edm::ParameterSet&) > HGCalTowerMapFactory;
+typedef edmplugin::PluginFactory< HGCalTowerProcessorBase* (const edm::ParameterSet&) > HGCalTowerFactory;
+
+#endif

L1Trigger/L1THGCal/interface/HGCalProcessorBaseT.h

@@ -0,0 +1,36 @@
+#ifndef __L1Trigger_L1THGCal_HGCalProcessorBaseT_h__
+#define __L1Trigger_L1THGCal_HGCalProcessorBaseT_h__
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Common/interface/Handle.h"
+
+#include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h"
+
+
+template<typename InputCollection, typename OutputCollection> class HGCalProcessorBaseT {
+
+ public:
+  HGCalProcessorBaseT(const edm::ParameterSet& conf) : 
+    geometry_(nullptr),
+    name_(conf.getParameter<std::string>("ProcessorName"))
+    {}
+
+  virtual ~HGCalProcessorBaseT() {}
+
+  const std::string& name() const { return name_; } 
+
+  void setGeometry(const HGCalTriggerGeometryBase* const geom) { geometry_ = geom;}
+
+  virtual void run(const InputCollection& inputColl,
+                       OutputCollection& outColl,
+                       const edm::EventSetup& es) = 0;
+
+ protected:
+  const HGCalTriggerGeometryBase* geometry_;
+
+ private:
+  const std::string name_;
+
+};
+
+#endif

L1Trigger/L1THGCal/interface/HGCalTriggerTools.h

@@ -65,10 +65,7 @@ class HGCalTriggerTools {
     std::vector<T> bxVectorToVector(const BXVector<T>& inputBXVector){    
       std::vector<T> outputVector;     
       //loop over collection for a given bx and put the objects into a std::vector
-      for( typename std::vector<T>::const_iterator it = inputBXVector.begin(0) ; it != inputBXVector.end(0) ; ++it )
-      { 
-        outputVector.push_back(*it); 
-      }
+      outputVector.insert(outputVector.end(), inputBXVector.begin(0), inputBXVector.end(0));
       return outputVector;
     }
 

L1Trigger/L1THGCal/interface/concentrator/HGCalConcentratorProcessorSelection.h

@@ -1,7 +1,7 @@
 #ifndef __L1Trigger_L1THGCal_HGCalConcentratorProcessorSelection_h__
 #define __L1Trigger_L1THGCal_HGCalConcentratorProcessorSelection_h__
 
-#include "L1Trigger/L1THGCal/interface/HGCalConcentratorProcessorBase.h"
+#include "L1Trigger/L1THGCal/interface/HGCalProcessorBase.h"
 #include "L1Trigger/L1THGCal/interface/concentrator/HGCalConcentratorSelectionImpl.h"
 
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerTools.h"