implementing comments from Andrea

Author: pallabidas

DataFormats/L1TCalorimeterPhase2/interface/CaloPFCluster.h

@@ -6,7 +6,6 @@
 #include <string>
 #include <algorithm>
 #include "DataFormats/L1Trigger/interface/L1Candidate.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 namespace l1tp2 {
 

L1Trigger/L1CaloTrigger/interface/Phase2L1CaloPFClusterEmulator.h

@@ -34,7 +34,7 @@ namespace gctpf {
 
   typedef struct {
     GCTpfcluster_t GCTpfclusters[nPFClusterSLR];
-  } GCTPfcluster_t;
+  } PFcluster_t;
 
   typedef struct {
     float et;
@@ -96,7 +96,7 @@ namespace gctpf {
 
   inline GCTint_t getPeakPosition(const region_t& region) {
     gctEtaStripPeak_t etaPeak;
-    for (int i = 0; i < 19; i++) {
+    for (int i = 0; i < nTowerEtaSLR - 2; i++) {
       etaPeak.p[i] = getPeakOfStrip(region.s[i + 1]);
     }
     GCTint_t max = getPeakBin(etaPeak);
@@ -174,14 +174,14 @@ namespace gctpf {
     return pfclusterReturn;
   }
 
-  inline GCTPfcluster_t pfcluster(float temporary[nTowerEtaSLR][nTowerPhiSLR], int etaoffset, int phioffset) {
+  inline PFcluster_t pfcluster(float temporary[nTowerEtaSLR][nTowerPhiSLR], int etaoffset, int phioffset) {
     GCTpfcluster_t pfcluster[nPFClusterSLR];
 
     for (int i = 0; i < nPFClusterSLR; i++) {
       pfcluster[i] = recoPfcluster(temporary, etaoffset, phioffset);
     }
 
-    GCTPfcluster_t GCTPfclusters;
+    PFcluster_t GCTPfclusters;
 
     for (int i = 0; i < nPFClusterSLR; i++) {
       GCTPfclusters.GCTpfclusters[i].et = pfcluster[i].et;

L1Trigger/L1CaloTrigger/plugins/Phase2L1CaloPFClusterEmulator.cc

@@ -48,25 +48,17 @@
 class Phase2L1CaloPFClusterEmulator : public edm::stream::EDProducer<> {
 public:
   explicit Phase2L1CaloPFClusterEmulator(const edm::ParameterSet&);
-  ~Phase2L1CaloPFClusterEmulator() override;
+  ~Phase2L1CaloPFClusterEmulator() override = default;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
   void produce(edm::Event&, const edm::EventSetup&) override;
 
   // ----------member data ---------------------------
-  edm::EDGetTokenT<l1tp2::CaloTowerCollection> caloTowerToken_;
+  const edm::EDGetTokenT<l1tp2::CaloTowerCollection> caloTowerToken_;
 };
 
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
 //
 // constructors and destructor
 //
@@ -75,8 +67,6 @@ Phase2L1CaloPFClusterEmulator::Phase2L1CaloPFClusterEmulator(const edm::Paramete
   produces<l1tp2::CaloPFClusterCollection>("GCTPFCluster");
 }
 
-Phase2L1CaloPFClusterEmulator::~Phase2L1CaloPFClusterEmulator() {}
-
 //
 // member functions
 //
@@ -87,10 +77,10 @@ void Phase2L1CaloPFClusterEmulator::produce(edm::Event& iEvent, const edm::Event
   std::unique_ptr<l1tp2::CaloPFClusterCollection> pfclusterCands(make_unique<l1tp2::CaloPFClusterCollection>());
 
   edm::Handle<std::vector<l1tp2::CaloTower>> caloTowerCollection;
-  if (!iEvent.getByToken(caloTowerToken_, caloTowerCollection))
+  iEvent.getByToken(caloTowerToken_, caloTowerCollection);
+  if (!caloTowerCollection.isValid())
     cms::Exception("Phase2L1CaloPFClusterEmulator") << "Failed to get towers from caloTowerCollection!";
 
-  iEvent.getByToken(caloTowerToken_, caloTowerCollection);
   float GCTintTowers[nTowerEta][nTowerPhi];
   float realEta[nTowerEta][nTowerPhi];
   float realPhi[nTowerEta][nTowerPhi];
@@ -155,7 +145,7 @@ void Phase2L1CaloPFClusterEmulator::produce(edm::Event& iEvent, const edm::Event
     if (k > 1 && k % 2 == 0)
       phioffset = phioffset + 4;
 
-    gctpf::GCTPfcluster_t tempPfclusters;
+    gctpf::PFcluster_t tempPfclusters;
     tempPfclusters = gctpf::pfcluster(temporary, etaoffset, phioffset);
 
     for (int i = 0; i < nPFClusterSLR; i++) {