Fix GCT EM cluster deserialization

code format

Fix TkEm WP and GCT energy

Author: cerminar

L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc

@@ -54,8 +54,10 @@
 #include "DataFormats/L1TCalorimeterPhase2/interface/DigitizedClusterCorrelator.h"
 #include "DataFormats/L1THGCal/interface/HGCalMulticluster.h"
 
-// constexpr unsigned int calomapping[] = {3, 0, 9, 6, 4, 1, 10, 7, 5, 2, 11, 8};
-constexpr unsigned int calomapping[] = {9, 6, 3, 0, 10, 7, 4, 1, 11, 8, 5, 2};
+constexpr unsigned int calomapping[] = {3, 0, 9, 6, 4, 1, 10, 7, 5, 2, 11, 8};
+// regions order:  GCT1 SLR1, GCT1 SLR3, GCT2 SLR1, GCT2 SLR3, GCT3 SLR1, GCT3SLR3
+// phi center:         10         70         130        -170       -110       -50
+// eta:               + -
 
 //--------------------------------------------------------------------------------------------------
 class L1TCorrelatorLayer1Producer : public edm::stream::EDProducer<> {
@@ -1001,15 +1003,6 @@ void L1TCorrelatorLayer1Producer::addHGCalHadCalo(const l1t::HGCalMulticluster &
   }
 }
 
-// regions order:  GCT1 SLR1, GCT1 SLR3, GCT2 SLR1, GCT2 SLR3, GCT3 SLR1, GCT3SLR3
-// always + then - eta for each region
-
-// I don't think above is right. I think this is the mapping
-// from reg. ord:  GCT1 SLR1+, GCT1 SLR1-, GCT1 SLR3+, GCT1 SLR3-, GCT2 SLR1+, GCT2 SLR1-,
-//                 GCT2 SLR3+, GCT2 SLR3-, GCT3 SLR1+, GCT3 SLR1-, GCT3 SLR3+, GCT3 SLR3-
-// to reg. order:  GCT1 SLR3-, GCT2 SLR3-, GCT3 SLR3-, GCT1 SLR3+, GCT2 SLR3+, GCT3 SLR3+,
-//                 GCT1 SLR1-, GCT2 SLR1-, GCT3 SLR1-, GCT1 SLR1+, GCT2 SLR1+, GCT3 SLR1+
-
 void L1TCorrelatorLayer1Producer::addGCTEmCaloRaw(const l1tp2::GCTEmDigiClusterLink &link,
                                                   unsigned int linkidx,
                                                   unsigned int entidx) {

L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py

@@ -41,7 +41,8 @@
     muonInputConversionAlgo = cms.string("Emulator"),
     gctEmInputConversionAlgo = cms.string("Emulator"),
     gctEmInputConversionParameters = cms.PSet(
-        gctEmCorrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel.root"),
+        # gctEmCorrector = cms.string("L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel.root"),
+        gctEmCorrector = cms.string(""),
         gctEmResol = cms.PSet(
             etaBins = cms.vdouble( 0.700,  1.200,  1.600),
             offset  = cms.vdouble( 0.873,  1.081,  1.563),

L1Trigger/Phase2L1ParticleFlow/src/l1-converters/gcteminput_ref.cpp

@@ -26,26 +26,33 @@ l1ct::GctEmClusterDecoderEmulator::~GctEmClusterDecoderEmulator() {}
 
 l1ct::EmCaloObjEmu l1ct::GctEmClusterDecoderEmulator::decode(const l1ct::PFRegionEmu &sector,
                                                              const ap_uint<64> &in) const {
+  constexpr float ETA_RANGE_ONE_SIDE = 1.4841;  // barrel goes from (-1.4841, +1.4841)
+  constexpr float ETA_LSB = 2 * ETA_RANGE_ONE_SIDE / 170.;
+  constexpr float PHI_LSB = 2 * M_PI / 360.;
+
   // need to add emid
   l1ct::EmCaloObjEmu calo;
   calo.clear();
   calo.hwPt = pt(in) * l1ct::pt_t(0.5);  // the LSB for GCT objects
-  calo.hwEta = eta(in) * 4;              // at this point eta is abs(globalEta)
-  calo.hwPhi = phi(in) * 4;
+  // We add half a crystal both in eta and phi to avoid a bias
+  calo.hwEta = l1ct::Scales::makeGlbEta(eta(in) * ETA_LSB + ETA_LSB / 2.);  // at this point eta is abs(globalEta)
+  calo.hwPhi = l1ct::Scales::makePhi(phi(in) * PHI_LSB + (PHI_LSB / 2));    // This is already in the local frame
 
   if (corrector_.valid()) {
-    float newpt = corrector_.correctedPt(calo.floatPt(), calo.floatPt(), calo.floatEta());
+    float newpt =
+        corrector_.correctedPt(calo.floatPt(), calo.floatPt(), calo.floatEta());  // NOTE: this is still abs(globalEta)
     calo.hwPt = l1ct::Scales::makePtFromFloat(newpt);
   }
 
   // Note: at this point still
-  calo.hwPtErr = l1ct::Scales::makePtFromFloat(resol_(calo.floatPt(), calo.floatEta()));
+  calo.hwPtErr =
+      l1ct::Scales::makePtFromFloat(resol_(calo.floatPt(), calo.floatEta()));  // NOTE: this is still abs(globalEta)
 
   // hwQual definition:
   // bit 0: standaloneWP: is_iso && is_ss
   // bit 1: looseL1TkMatchWP: is_looseTkiso && is_looseTkss
   // bit 2: photonWP:
-  calo.hwEmID = (passes_iso(in) & passes_ss(in)) | ((passes_looseTkiso(in) & passes_looseTkss(in)) << 1) | (false << 2);
+  calo.hwEmID = (passes_iso(in) & passes_ss(in)) | ((passes_looseTkiso(in) & passes_looseTkss(in)) << 1) | ((passes_looseTkiso(in) & passes_looseTkss(in)) << 2);
 
   // convert eta to local
   if (sector.hwEtaCenter < 0) {