Merge pull request cms-sw#66 from jbsauvan/pr15782-comments-pre9

Backporting comments of PR 15782 to pre9

DataFormats/ForwardDetId/interface/HGCTriggerDetId.h

@@ -4,7 +4,6 @@
 #include <iosfwd>
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h"
-#include "TObject.h"
 
 
 class HGCTriggerDetId : public DetId {

DataFormats/ForwardDetId/interface/HGCalDetId.h

@@ -59,6 +59,7 @@ class HGCalDetId : public DetId {
   static const HGCalDetId Undefined;
 };
 
+
 std::ostream& operator<<(std::ostream&,const HGCalDetId& id);
 
 #endif

DataFormats/ForwardDetId/src/HGCalDetId.cc

@@ -63,6 +63,8 @@ bool HGCalDetId::isValid(ForwardSubdetector subdet, int zp, int lay, int waferty
   return ok;
 }
 
+
+
 std::ostream& operator<<(std::ostream& s,const HGCalDetId& id) {
   return s << "isHGCal=" << id.isHGCal() << " zpos=" << id.zside() 
 	   << " layer=" << id.layer()  << " wafer type=" << id.waferType()

DataFormats/ForwardDetId/src/classes.h

@@ -3,7 +3,6 @@
 #include "DataFormats/ForwardDetId/interface/HGCHEDetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCTriggerDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerHexDetId.h"
 #include "DataFormats/ForwardDetId/interface/FastTimeDetId.h"
 
 namespace DataFormats_ForwardDetId {
@@ -18,9 +17,6 @@ namespace DataFormats_ForwardDetId {
     //HGCal specific
     HGCalDetId anHGCalDetId;
 
-    //HGCal trigger specific
-    HGCTriggerHexDetId anHGCTriggerHexDetId;
-
     //FastTimer specific
     FastTimeDetId anFastTimeDetId;
   };

DataFormats/ForwardDetId/src/classes_def.xml

@@ -14,9 +14,6 @@
    <version ClassVersion="14" checksum="2581740375"/>
    <version ClassVersion="13" checksum="519079711"/>
   </class>
-  <class name="HGCTriggerHexDetId" ClassVersion="10">
-   <version ClassVersion="10" checksum="4158504449"/>
-  </class>
   <class name="FastTimeDetId" ClassVersion="14">
    <version ClassVersion="14" checksum="692755117"/>
    <version ClassVersion="13" checksum="2752729489"/>

L1Trigger/L1THGCal/interface/HGCalTriggerGeometryOld.h → L1Trigger/L1THGCal/interface/HGCalTriggerGeometryGenericMapping.h

@@ -1,5 +1,5 @@
-#ifndef __L1Trigger_L1THGCal_HGCalTriggerGeometryOld_h__
-#define __L1Trigger_L1THGCal_HGCalTriggerGeometryOld_h__
+#ifndef __L1Trigger_L1THGCal_HGCalTriggerGeometryGenericMapping_h__
+#define __L1Trigger_L1THGCal_HGCalTriggerGeometryGenericMapping_h__
 
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h"
 
@@ -17,7 +17,7 @@
 
 /*******
  *
- * class: HGCalTriggerGeometryOld
+ * class: HGCalTriggerGeometryGenericMapping
  * author: L.Gray (FNAL)
  * date: 26 July, 2015
  *
@@ -38,7 +38,7 @@
  * full nature of the trigger detids.
  *******/
 
-class HGCalTriggerGeometryOld;
+class HGCalTriggerGeometryGenericMapping;
 
 namespace HGCalTriggerGeometry {
   class TriggerCell {
@@ -121,14 +121,14 @@ namespace HGCalTriggerGeometry {
   };
 }  
 
-class HGCalTriggerGeometryOld : public HGCalTriggerGeometryBase { 
+class HGCalTriggerGeometryGenericMapping : public HGCalTriggerGeometryBase { 
  public:  
 
   typedef std::unordered_map<unsigned,std::unique_ptr<const HGCalTriggerGeometry::Module> > module_map;
   typedef std::unordered_map<unsigned,std::unique_ptr<const HGCalTriggerGeometry::TriggerCell> > trigger_cell_map;
 
-  HGCalTriggerGeometryOld(const edm::ParameterSet& conf);
-  virtual ~HGCalTriggerGeometryOld() {}
+  HGCalTriggerGeometryGenericMapping(const edm::ParameterSet& conf);
+  virtual ~HGCalTriggerGeometryGenericMapping() {}
 
   // non-const access to the geometry class
   //virtual void initialize( const es_info& ) = 0;

L1Trigger/L1THGCal/interface/fe_codecs/HGCalBestChoiceCodecImpl.h

@@ -4,7 +4,6 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerHexDetId.h"
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
 
 #include <array>

L1Trigger/L1THGCal/plugins/HGCalTriggerDigiFEReproducer.cc

@@ -7,7 +7,6 @@
 #include "DataFormats/L1THGCal/interface/HGCFETriggerDigi.h"
 #include "DataFormats/L1THGCal/interface/HGCFETriggerDigiFwd.h"
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerDetId.h"
 
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h"
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerFECodecBase.h"

L1Trigger/L1THGCal/plugins/be_algorithms/FullModuleSumAlgo.cc

@@ -1,6 +1,6 @@
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerBackendAlgorithmBase.h"
 #include "L1Trigger/L1THGCal/interface/fe_codecs/HGCalBestChoiceCodec.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerHexDetId.h"
+#include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
 
 #include "DataFormats/L1THGCal/interface/HGCalCluster.h"
 
@@ -44,7 +44,7 @@ void FullModuleSumAlgo::run(const l1t::HGCFETriggerDigiCollection& coll)
     {
         HGCalBestChoiceCodec::data_type data;
         data.reset();
-        const HGCTriggerHexDetId& moduleId = digi.getDetId<HGCTriggerHexDetId>();
+        const HGCalDetId& moduleId = digi.getDetId<HGCalDetId>();
         digi.decode(codec_, data);
 
         // Sum of trigger cells inside the module

L1Trigger/L1THGCal/plugins/be_algorithms/SingleCellClusterAlgo.cc

@@ -1,6 +1,6 @@
 #include "L1Trigger/L1THGCal/interface/HGCalTriggerBackendAlgorithmBase.h"
 #include "L1Trigger/L1THGCal/interface/fe_codecs/HGCalBestChoiceCodec.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerHexDetId.h"
+#include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
 
 #include "DataFormats/L1THGCal/interface/HGCalCluster.h"
 
@@ -44,7 +44,7 @@ void SingleCellClusterAlgo::run(const l1t::HGCFETriggerDigiCollection& coll)
     {
         HGCalBestChoiceCodec::data_type data;
         data.reset();
-        const HGCTriggerHexDetId& moduleId = digi.getDetId<HGCTriggerHexDetId>();
+        const HGCalDetId& moduleId = digi.getDetId<HGCalDetId>();
         digi.decode(codec_, data);
         int i = 0;
         for(const auto& value : data.payload)

L1Trigger/L1THGCal/plugins/fe_codecs/HGCalBestChoiceCodec.cc

@@ -1,5 +1,4 @@
 #include "L1Trigger/L1THGCal/interface/fe_codecs/HGCalBestChoiceCodec.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerDetId.h"
 #include <limits>
 
 using namespace HGCalTriggerFE;

L1Trigger/L1THGCal/plugins/geometries/HGCalTriggerGeometryHexImp1.cc

@@ -1,14 +1,14 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 
-#include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryOld.h"
-#include "DataFormats/ForwardDetId/interface/HGCTriggerHexDetId.h"
+#include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryGenericMapping.h"
+#include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
 
 #include <vector>
 #include <iostream>
 #include <fstream>
 
 
-class HGCalTriggerGeometryHexImp1 : public HGCalTriggerGeometryOld
+class HGCalTriggerGeometryHexImp1 : public HGCalTriggerGeometryGenericMapping
 {
     public:
         HGCalTriggerGeometryHexImp1(const edm::ParameterSet& conf);
@@ -26,7 +26,7 @@ class HGCalTriggerGeometryHexImp1 : public HGCalTriggerGeometryOld
 
 /*****************************************************************/
 HGCalTriggerGeometryHexImp1::HGCalTriggerGeometryHexImp1(const edm::ParameterSet& conf):
-    HGCalTriggerGeometryOld(conf),
+    HGCalTriggerGeometryGenericMapping(conf),
     l1tCellsMapping_(conf.getParameter<edm::FileInPath>("L1TCellsMapping")),
     l1tModulesMapping_(conf.getParameter<edm::FileInPath>("L1TModulesMapping"))
 /*****************************************************************/
@@ -139,10 +139,10 @@ void HGCalTriggerGeometryHexImp1::fillMaps(const es_info& esInfo)
             // The module id is used instead of the wafer id for the trigger cells
             // Since there are several wafers per module, an offset is applied on the HGCalDetId::cell field
             if(triggercell_offset+triggerCellId >= HGCalDetId::kHGCalCellMask) edm::LogError("HGCalTriggerGeometry") << "Trigger cell id requested with a cell field larger than available in HGCalDetId (" << triggercell_offset+triggerCellId << " >= " << HGCalDetId::kHGCalCellMask << ")\n";
-            HGCTriggerHexDetId triggerCellDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, triggercell_offset + triggerCellId);
+            HGCalDetId triggerCellDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, triggercell_offset + triggerCellId);
             cells_to_trigger_cells_.emplace(cellDetId, triggerCellDetId);
             // Fill trigger cell -> module mapping
-            HGCTriggerHexDetId moduleDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, HGCTriggerHexDetId::kHGCalCellMask);
+            HGCalDetId moduleDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, HGCalDetId::kHGCalCellMask);
             trigger_cells_to_modules_.emplace(triggerCellDetId, moduleDetId); 
         }
     }
@@ -162,10 +162,10 @@ void HGCalTriggerGeometryHexImp1::fillMaps(const es_info& esInfo)
             // The module id is used instead of the wafer id for the trigger cells
             // Since there are several wafers per module, an offset is applied on the HGCalDetId::cell field
             if(triggercell_offset+triggerCellId >= HGCalDetId::kHGCalCellMask) edm::LogError("HGCalTriggerGeometry") << "Trigger cell id requested with a cell field larger than available in HGCalDetId (" << triggercell_offset+triggerCellId << " >= " << HGCalDetId::kHGCalCellMask << ")\n";
-            HGCTriggerHexDetId triggerCellDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, triggercell_offset + triggerCellId);
+            HGCalDetId triggerCellDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, triggercell_offset + triggerCellId);
             cells_to_trigger_cells_.emplace(cellDetId, triggerCellDetId);
             // Fill trigger cell -> module mapping
-            HGCTriggerHexDetId moduleDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, HGCTriggerHexDetId::kHGCalCellMask);
+            HGCalDetId moduleDetId(ForwardSubdetector(waferDetId.subdetId()), waferDetId.zside(), waferDetId.layer(), waferDetId.waferType(), module, HGCalDetId::kHGCalCellMask);
             trigger_cells_to_modules_.emplace(triggerCellDetId, moduleDetId); 
         }
     }