From cmssw 6 2 x slhc 2014 06 04 0200

Configuration/Geometry/python/GeometryExtended2023HGCalConcept_cff.py

@@ -2,3 +2,4 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalConceptXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCalMuon4EtaReco_cff.py

@@ -25,6 +25,9 @@
 trackerSLHCGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.FCalGeometry.HGCalGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 

Configuration/Geometry/python/GeometryExtended2023HGCalMuon4Eta_cff.py

@@ -3,3 +3,4 @@
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalMuon4EtaXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCalMuonReco_cff.py

@@ -25,6 +25,9 @@
 trackerSLHCGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.FCalGeometry.HGCalGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 

Configuration/Geometry/python/GeometryExtended2023HGCalMuon_cff.py

@@ -3,3 +3,4 @@
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalMuonXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCalReco_cff.py

@@ -25,6 +25,9 @@
 trackerSLHCGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.FCalGeometry.HGCalGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 

Configuration/Geometry/python/GeometryExtended2023HGCal_cff.py

@@ -3,3 +3,4 @@
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCal4EtaReco_cff.py

@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalNoTaper4EtaReco_cff.py

@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperReco_cff.py

@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalReco_cff.py

@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

DataFormats/ForwardDetId/interface/HGCEEDetId.h

@@ -19,6 +19,11 @@ class HGCEEDetId : public DetId {
   HGCEEDetId(const DetId& id);
   /** Assignment from a generic cell id */
   HGCEEDetId& operator=(const DetId& id);
+
+  /** Converter for a geometry cell id
+   * @param id full EKDetId 
+   */
+  HGCEEDetId geometryCell () const {return HGCEEDetId (subdet(), zside(), layer(), sector(), 0, 0);}
 
   /// get the subdetector
   ForwardSubdetector subdet() const { return HGCEE; }

DataFormats/ForwardDetId/interface/HGCHEDetId.h

@@ -1,3 +1,4 @@
+
 #ifndef DataFormats_ForwardDetId_HGCHEDetId_H
 #define DataFormats_ForwardDetId_HGCHEDetId_H 1
 
@@ -19,6 +20,11 @@ class HGCHEDetId : public DetId {
   /** Assignment from a generic cell id */
   HGCHEDetId& operator=(const DetId& id);
 
+  /** Converter for a geometry cell id
+   * @param id full EKDetId 
+   */
+  HGCHEDetId geometryCell () const;
+
   /// get the subdetector
   ForwardSubdetector subdet() const { return (ForwardSubdetector)(subdetId());}
 

DataFormats/ForwardDetId/src/HGCHEDetId.cc

@@ -42,6 +42,11 @@ HGCHEDetId& HGCHEDetId::operator=(const DetId& gen) {
   return (*this);
 }
 
+HGCHEDetId HGCHEDetId::geometryCell () const {
+  int sub = ((subdet() == HGCHEF) ? 0 : ((id_>>18)&0x1));
+  return HGCHEDetId(subdet(), zside(), layer(), sector(), sub, 0);
+}
+
 std::ostream& operator<<(std::ostream& s,const HGCHEDetId& id) {
   if  (id.subdet() == HGCHEF || id.subdet() == HGCHEB ||
        id.subdet() == HGCHET) {

Geometry/CaloEventSetup/plugins/CaloGeometryBuilder.cc

@@ -27,7 +27,7 @@
 #include "Geometry/EcalAlgo/interface/EcalBarrelGeometry.h"
 #include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
 #include "Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h"
-#include "Geometry/CaloTopology/interface/ShashlikGeometry.h"
+#include "Geometry/FCalGeometry/interface/ShashlikGeometry.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 #include "Geometry/HcalTowerAlgo/interface/CaloTowerGeometry.h"
 #include "Geometry/ForwardGeometry/interface/CastorGeometry.h"

Geometry/CaloEventSetup/plugins/HGCalTopologyBuilder.cc

@@ -34,6 +34,8 @@
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
 #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h"
 
+//#define DebugLog
+
 //
 // class decleration
 //
@@ -93,7 +95,9 @@ HGCalTopologyBuilder::produce(const IdealGeometryRecord& iRecord ) {
   const HGCalDDDConstants & hgdc = (*pHGDC);
 
   ReturnType ct ( new HGCalTopology(hgdc, subdet_, halfType_) ) ;
+#ifdef DebugLog
   std::cout << "Create HGCalTopology(hgdc,subdet,type)" << std::endl;
+#endif
   return ct ;
 }
 

Geometry/CaloEventSetup/python/HGCalTopology_cfi.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 #
-# This cfi should be included to build the Shashlik Topology
+# This cfi should be included to build the HGCal Topologies
 #
 HGCalEETopologyBuilder = cms.ESProducer("HGCalTopologyBuilder",
                                         Name = cms.untracked.string("HGCalEESensitive"),

Geometry/CaloGeometry/interface/CaloCellGeometry.h

@@ -75,9 +75,9 @@ class CaloCellGeometry
   virtual const CornersVec& getCorners() const = 0 ;
 
   /// Returns the position of reference for this cell 
-  const GlobalPoint& getPosition() const {return m_refPoint ; }
-  float etaPos() const { return m_eta;}
-  float phiPos() const { return m_phi;}
+  virtual const GlobalPoint& getPosition() const {return m_refPoint ; }
+  virtual float etaPos() const { return m_eta;}
+  virtual float phiPos() const { return m_phi;}
 
 
 

Geometry/CaloGeometry/interface/FlatTrd.h

@@ -0,0 +1,88 @@
+#ifndef GeometryCaloGeometryFlatTrd_h
+#define GeometryCaloGeometryFlatTrd_h
+
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include <CLHEP/Geometry/Point3D.h>
+#include <CLHEP/Geometry/Plane3D.h>
+#include <CLHEP/Geometry/Vector3D.h>
+#include <CLHEP/Geometry/Transform3D.h>
+#include <vector>
+
+/**
+
+   \class FlatTrd
+
+   \brief A base class to handle the particular shape of HGCal volumes.
+
+*/
+
+class FlatTrd  GCC11_FINAL : public CaloCellGeometry {
+public:
+
+  typedef CaloCellGeometry::CCGFloat CCGFloat ;
+  typedef CaloCellGeometry::Pt3D     Pt3D     ;
+  typedef CaloCellGeometry::Pt3DVec  Pt3DVec  ;
+  typedef CaloCellGeometry::Tr3D     Tr3D     ;
+
+  FlatTrd( void );
+
+  FlatTrd( const FlatTrd& tr ) ;
+
+  FlatTrd& operator=( const FlatTrd& tr ) ;
+
+  FlatTrd( const CornersMgr*  cMgr ,
+	   const GlobalPoint& fCtr ,
+	   const GlobalPoint& bCtr ,
+	   const GlobalPoint& cor1 ,
+	   const CCGFloat*    parV   ) ;
+
+  FlatTrd( const CornersVec& corn ,
+	   const CCGFloat*   par    ) ;
+
+  FlatTrd( const FlatTrd& tr, const Pt3D& local) ;
+
+  virtual ~FlatTrd() ;
+
+  virtual const GlobalPoint& getPosition() const { return m_global; }
+  GlobalPoint getPosition( const Pt3D& local ) const;
+  virtual float etaPos() const { return m_global.eta(); }
+  virtual float phiPos() const { return m_global.phi(); }
+  Pt3D getLocal( const GlobalPoint& global ) const;
+
+  virtual const CornersVec& getCorners() const ;
+
+  // Return thetaAxis polar angle of axis of the crystal
+  CCGFloat getThetaAxis() const ;
+
+  // Return phiAxis azimuthal angle of axis of the crystal
+  CCGFloat getPhiAxis() const ;
+
+  const GlobalVector& axis() const ;
+
+  virtual void vocalCorners( Pt3DVec&        vec ,
+			     const CCGFloat* pv  ,
+			     Pt3D&           ref  ) const ;
+
+  static void createCorners( const std::vector<CCGFloat>& pv ,
+                             const Tr3D&                  tr ,
+                             std::vector<GlobalPoint>&    co   ) ;
+
+  static void localCorners( Pt3DVec&        vec ,
+                            const CCGFloat* pv  ,
+                            Pt3D&           ref  ) ;
+
+  virtual void getTransform( Tr3D& tr, Pt3DVec* lptr ) const ;
+
+private:
+  GlobalVector makeAxis( void );
+
+  const GlobalPoint backCtr( void ) const;    
+  GlobalVector m_axis;
+  Pt3D         m_corOne, m_local;
+  GlobalPoint  m_global;
+  Tr3D         m_tr;
+};
+
+std::ostream& operator<<( std::ostream& s, const FlatTrd& cell ) ;
+
+#endif