[HGCAL trigger] make code compatible with V9 geometry

DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h

@@ -61,7 +61,7 @@ class HGCScintillatorDetId : public DetId {
 
   static const HGCScintillatorDetId Undefined;
 
-private:
+public:
 
   static const int kHGCalPhiOffset      = 0;
   static const int kHGCalPhiMask        = 0x1FF;

DataFormats/ForwardDetId/interface/HGCSiliconDetId.h

@@ -106,7 +106,7 @@ class HGCSiliconDetId : public DetId {
 
   static const HGCSiliconDetId Undefined;
 
-private:
+public:
 
   static const int kHGCalCellUOffset      = 0;
   static const int kHGCalCellUMask        = 0x1F;

L1Trigger/Configuration/python/SimL1Emulator_cff.py

@@ -62,8 +62,7 @@
 _phase2_siml1emulator += hgcalTriggerPrimitives
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
-(phase2_hgcal & ~phase2_hgcalV9).toReplaceWith( SimL1Emulator , _phase2_siml1emulator )
+phase2_hgcal.toReplaceWith( SimL1Emulator , _phase2_siml1emulator )
 
 # If PreMixing, don't run these modules during first step
 # TODO: Do we actually need anything from here run in stage1?

L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h

@@ -31,16 +31,46 @@ class HGCalTriggerGeometryBase
 
         const std::string& name() const { return name_; } 
 
+        bool isV9Geometry() const {return !calo_geometry_.isValid();}
         const edm::ESHandle<CaloGeometry>& caloGeometry() const {return calo_geometry_;}
-        const HGCalGeometry* eeGeometry() const {return (static_cast<const HGCalGeometry*>(calo_geometry_->getSubdetectorGeometry(DetId::Forward,HGCEE)));}
-        const HGCalGeometry* fhGeometry() const {return (static_cast<const HGCalGeometry*>(calo_geometry_->getSubdetectorGeometry(DetId::Forward,HGCHEF)));}
-        const HcalGeometry* bhGeometry()  const {return (static_cast<const HcalGeometry*>(calo_geometry_->getSubdetectorGeometry(DetId::Hcal,HcalEndcap)));}
+        const HGCalGeometry* eeGeometry() const 
+        {
+            return ( hgc_ee_geometry_.isValid() ? hgc_ee_geometry_.product() : (static_cast<const HGCalGeometry*>(calo_geometry_->getSubdetectorGeometry(DetId::Forward,HGCEE))) );
+        }
+        const HGCalGeometry* fhGeometry() const 
+        {
+            return (hgc_hsi_geometry_.isValid() ? hgc_hsi_geometry_.product() : (static_cast<const HGCalGeometry*>(calo_geometry_->getSubdetectorGeometry(DetId::Forward,HGCHEF))) );
+        }
+        const HcalGeometry* bhGeometry()  const 
+        {
+            if(hgc_hsc_geometry_.isValid())
+            {
+                throw cms::Exception("HGCalTriggerGeometry")
+                    << "bhGeometry cannot be used with the V9 geometry";
+            }
+            return (static_cast<const HcalGeometry*>(calo_geometry_->getSubdetectorGeometry(DetId::Hcal,HcalEndcap)));
+        }
+        const HGCalGeometry* hsiGeometry() const {return fhGeometry();}
+        const HGCalGeometry* hscGeometry()  const 
+        {
+            if(!hgc_hsc_geometry_.isValid())
+            {
+                throw cms::Exception("HGCalTriggerGeometry")
+                    << "hscGeometry cannot be used with the V7 and V8 geometries";
+            }
+            return hgc_hsc_geometry_.product();
+        }
         const HGCalTopology& eeTopology() const {return eeGeometry()->topology();}
         const HGCalTopology& fhTopology() const {return fhGeometry()->topology();}
         const HcalTopology& bhTopology() const {return bhGeometry()->topology();}
+        const HGCalTopology& hsiTopology() const {return hsiGeometry()->topology();}
+        const HGCalTopology& hscTopology() const {return hscGeometry()->topology();}
 
         // non-const access to the geometry class
         virtual void initialize(const edm::ESHandle<CaloGeometry>&) = 0;
+        virtual void initialize(const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&) = 0;
         virtual void reset();
 
         // const access to the geometry class
@@ -66,12 +96,18 @@ class HGCalTriggerGeometryBase
 
     protected:
         void setCaloGeometry(const edm::ESHandle<CaloGeometry>& geom) {calo_geometry_=geom;}
+        void setEEGeometry(const edm::ESHandle<HGCalGeometry>& geom) {hgc_ee_geometry_=geom;}
+        void setHSiGeometry(const edm::ESHandle<HGCalGeometry>& geom) {hgc_hsi_geometry_=geom;}
+        void setHScGeometry(const edm::ESHandle<HGCalGeometry>& geom) {hgc_hsc_geometry_=geom;}
 
 
     private:
         const std::string name_;
 
         edm::ESHandle<CaloGeometry> calo_geometry_;
+        edm::ESHandle<HGCalGeometry> hgc_ee_geometry_;
+        edm::ESHandle<HGCalGeometry> hgc_hsi_geometry_;
+        edm::ESHandle<HGCalGeometry> hgc_hsc_geometry_;
 
 };
 

L1Trigger/L1THGCal/plugins/HGCalTriggerDigiProducer.cc

@@ -97,7 +97,7 @@ void HGCalTriggerDigiProducer::produce(edm::Event& e, const edm::EventSetup& es)
   }
   std::unordered_map<uint32_t,HGCalDigiCollection> hit_modules_bh;
   for(const auto& bhdata : bh_digis) {
-    if(HcalDetId(bhdata.id()).subdetId()!=HcalEndcap) continue;
+    if(DetId(bhdata.id()).det()!=DetId::HGCalHSc && HcalDetId(bhdata.id()).subdetId()!=HcalEndcap) continue;
     uint32_t module = triggerGeometry_->getModuleFromCell(bhdata.id());
     if(triggerGeometry_->disconnectedModule(module)) continue;
     auto itr_insert = hit_modules_bh.emplace(module, HGCalDigiCollection());

L1Trigger/L1THGCal/plugins/HGCalTriggerGeometryESProducer.cc

@@ -52,7 +52,26 @@ produce(const CaloGeometryRecord& iRecord)
     geometry->reset();
     edm::ESHandle<CaloGeometry> calo_geometry;
     iRecord.get(calo_geometry);
-    geometry->initialize(calo_geometry);
+    // Initialize trigger geometry for V7/V8 HGCAL geometry
+    if(calo_geometry.isValid() &&
+       calo_geometry->getSubdetectorGeometry(DetId::Forward,HGCEE) &&
+       calo_geometry->getSubdetectorGeometry(DetId::Forward,HGCHEF) &&
+       calo_geometry->getSubdetectorGeometry(DetId::Hcal,HcalEndcap)
+            )
+    {
+        geometry->initialize(calo_geometry);
+    }
+    // Initialize trigger geometry for V9 HGCAL geometry
+    else
+    {
+        edm::ESHandle<HGCalGeometry> ee_geometry;
+        edm::ESHandle<HGCalGeometry> hsi_geometry;
+        edm::ESHandle<HGCalGeometry> hsc_geometry;
+        iRecord.getRecord<IdealGeometryRecord>().get("HGCalEESensitive",ee_geometry);
+        iRecord.getRecord<IdealGeometryRecord>().get("HGCalHESiliconSensitive",hsi_geometry);
+        iRecord.getRecord<IdealGeometryRecord>().get("HGCalHEScintillatorSensitive",hsc_geometry);
+        geometry->initialize(ee_geometry, hsi_geometry, hsc_geometry);
+    }
     return geometry;
 
 }

L1Trigger/L1THGCal/plugins/geometries/HGCalTriggerGeometryHexImp1.cc

@@ -15,6 +15,9 @@ class HGCalTriggerGeometryHexImp1 : public HGCalTriggerGeometryGenericMapping
         HGCalTriggerGeometryHexImp1(const edm::ParameterSet& conf);
 
         void initialize(const edm::ESHandle<CaloGeometry>& ) final;
+        void initialize(const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&) final;
 
     private:
         edm::FileInPath l1tCellsMapping_;
@@ -34,7 +37,6 @@ HGCalTriggerGeometryHexImp1::HGCalTriggerGeometryHexImp1(const edm::ParameterSet
 {
 }
 
-
 /*****************************************************************/
 void HGCalTriggerGeometryHexImp1::initialize(const edm::ESHandle<CaloGeometry>& calo_geometry)
 /*****************************************************************/
@@ -48,6 +50,17 @@ void HGCalTriggerGeometryHexImp1::initialize(const edm::ESHandle<CaloGeometry>&
 
 }
 
+/*****************************************************************/
+ void HGCalTriggerGeometryHexImp1::initialize(const edm::ESHandle<HGCalGeometry>& hgc_ee_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsi_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsc_geometry
+        )
+/*****************************************************************/
+{
+    throw cms::Exception("BadGeometry")
+        << "HGCalTriggerGeometryHexImp1 geometry cannot be initialized with the V9 HGCAL geometry";
+}
+
 
 
 /*****************************************************************/

L1Trigger/L1THGCal/plugins/geometries/HGCalTriggerGeometryHexImp2.cc

@@ -16,6 +16,9 @@ class HGCalTriggerGeometryHexImp2 : public HGCalTriggerGeometryBase
         HGCalTriggerGeometryHexImp2(const edm::ParameterSet& conf);
 
         void initialize(const edm::ESHandle<CaloGeometry>& ) final;
+        void initialize(const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&) final;
         void reset() final;
 
         unsigned getTriggerCellFromCell( const unsigned ) const final;
@@ -118,6 +121,17 @@ initialize(const edm::ESHandle<CaloGeometry>& calo_geometry)
 
 }
 
+void
+HGCalTriggerGeometryHexImp2::
+initialize(const edm::ESHandle<HGCalGeometry>& hgc_ee_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsi_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsc_geometry
+        )
+{
+    throw cms::Exception("BadGeometry")
+        << "HGCalTriggerGeometryHexImp2 geometry cannot be initialized with the V9 HGCAL geometry";
+}
+
 unsigned 
 HGCalTriggerGeometryHexImp2::
 getTriggerCellFromCell( const unsigned cell_id ) const

L1Trigger/L1THGCal/plugins/geometries/HGCalTriggerGeometryHexLayerBasedImp1.cc

@@ -17,6 +17,9 @@ class HGCalTriggerGeometryHexLayerBasedImp1 : public HGCalTriggerGeometryBase
         HGCalTriggerGeometryHexLayerBasedImp1(const edm::ParameterSet& conf);
 
         void initialize(const edm::ESHandle<CaloGeometry>& ) final;
+        void initialize(const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&) final;
         void reset() final;
 
         unsigned getTriggerCellFromCell( const unsigned ) const final;
@@ -155,6 +158,17 @@ initialize(const edm::ESHandle<CaloGeometry>& calo_geometry)
 
 }
 
+void
+HGCalTriggerGeometryHexLayerBasedImp1::
+initialize(const edm::ESHandle<HGCalGeometry>& hgc_ee_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsi_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsc_geometry
+        )
+{
+    throw cms::Exception("BadGeometry")
+        << "HGCalTriggerGeometryHexLayerBasedImp1 geometry cannot be initialized with the V9 HGCAL geometry";
+}
+
 unsigned 
 HGCalTriggerGeometryHexLayerBasedImp1::
 getTriggerCellFromCell( const unsigned cell_id ) const

L1Trigger/L1THGCal/plugins/geometries/HGCalTriggerGeometryImp1.cc

@@ -15,9 +15,14 @@ class HGCalTriggerGeometryImp1 : public HGCalTriggerGeometryGenericMapping
         HGCalTriggerGeometryImp1(const edm::ParameterSet& conf);
 
         void initialize(const edm::ESHandle<CaloGeometry>& ) final;
+        void initialize(const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&,
+                const edm::ESHandle<HGCalGeometry>&) final;
 
     private:
         edm::FileInPath l1tCellsMapping_;
+
+        void buildMaps();
 };
 
 
@@ -29,7 +34,6 @@ HGCalTriggerGeometryImp1::HGCalTriggerGeometryImp1(const edm::ParameterSet& conf
 {
 }
 
-
 /*****************************************************************/
 void HGCalTriggerGeometryImp1::initialize(const edm::ESHandle<CaloGeometry>& calo_geometry)
 /*****************************************************************/
@@ -39,6 +43,24 @@ void HGCalTriggerGeometryImp1::initialize(const edm::ESHandle<CaloGeometry>& cal
                                             << "WARNING: Only the EE part is covered.\n"\
                                             << "WARNING: There is no neighbor information.\n";
     setCaloGeometry(calo_geometry);
+}
+
+/*****************************************************************/
+void HGCalTriggerGeometryImp1::initialize(const edm::ESHandle<HGCalGeometry>& hgc_ee_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsi_geometry,
+        const edm::ESHandle<HGCalGeometry>& hgc_hsc_geometry
+        )
+/*****************************************************************/
+{
+    throw cms::Exception("BadGeometry")
+        << "HGCalTriggerGeometryImp1 geometry cannot be initialized with the V9 HGCAL geometry";
+}
+
+
+/*****************************************************************/
+void HGCalTriggerGeometryImp1::buildMaps()
+/*****************************************************************/
+{
     //
     // read trigger cell mapping file
     std::ifstream l1tCellsMappingStream(l1tCellsMapping_.fullPath());