Merge pull request #28055 from bsunanda/Run3-hcx225

Run3-hcx225 Transform Phase0 HE algorithm for dd4hep
cms-sw · Sep 27, 2019 · 8a42805 · 8a42805
2 parents fc46275 + 5447273
commit 8a42805
Show file tree

Hide file tree

Showing 10 changed files with 1,051 additions and 10 deletions.
diff --git a/Geometry/HcalAlgo/data/cms-test-ddhcalHEPhase0-algorithm.xml b/Geometry/HcalAlgo/data/cms-test-ddhcalHEPhase0-algorithm.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/normal/cmsextent.xml"/>
+    <Include ref="Geometry/HcalAlgo/test/data/cms.xml"/>
+    <Include ref="Geometry/HcalAlgo/test/data/caloBase.xml"/>
+    <Include ref="Geometry/HcalAlgo/test/data/muonBase.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalalgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalendcapalgo.xml"/>
+  </IncludeSection>
+
+</DDDefinition>
+
+
diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc
@@ -12,7 +12,7 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/Core/interface/DDutils.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
@@ -23,6 +23,9 @@
 #include "DetectorDescription/Core/interface/DDAlgorithm.h"
 #include "DetectorDescription/Core/interface/DDAlgorithmFactory.h"
 
+//#define EDM_ML_DEBUG
+using namespace cms_units::operators;
+
 class DDHCalEndcapAlgo : public DDAlgorithm {
 public:
   //Constructor and Destructor
@@ -223,9 +226,6 @@ class DDHCalEndcapAlgo : public DDAlgorithm {
   double tolPos, tolAbs;  //Tolerances
 };
 
-//#define EDM_ML_DEBUG
-using namespace geant_units::operators;
-
 DDHCalEndcapAlgo::DDHCalEndcapAlgo()
     : modMat(0),
       modType(0),

diff --git a/Geometry/HcalAlgo/plugins/dd4hep/DDHCalEndcapAlgo.cc b/Geometry/HcalAlgo/plugins/dd4hep/DDHCalEndcapAlgo.cc
diff --git a/Geometry/HcalAlgo/test/python/dumpHEPhase0Geom_cfg.py b/Geometry/HcalAlgo/test/python/dumpHEPhase0Geom_cfg.py
@@ -23,7 +23,7 @@
 
 
 process.dump = cms.EDAnalyzer("DumpSimGeometry",
-                              outputFileName = cms.untracked.string('HEPhase0.root')
+                              outputFileName = cms.untracked.string('hePhase0DDD.root')
 )
 
 process.p = cms.Path(process.dump)
diff --git a/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py b/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py
@@ -0,0 +1,25 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DDHEPhase0GeomTest")
+
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.source = cms.Source("EmptySource")
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+    )
+
+process.MessageLogger.cerr.FwkReport.reportEvery = 5
+if hasattr(process,'MessageLogger'):
+    process.MessageLogger.categories.append('HCalGeom')
+
+process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHEPhase0-algorithm.xml'),
+                                            appendToDataLabel = cms.string('DDHCalHEPhase0')
+                                            )
+
+process.testDump = cms.EDAnalyzer("DDTestDumpFile",
+                                  outputFileName = cms.untracked.string('hePhase0DD4Hep.root'),
+                                  DDDetector = cms.ESInputTag('','DDHCalHEPhase0')
+                                  )
+
+process.p = cms.Path(process.testDump)
diff --git a/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py b/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("DDHEPhase1Test")
+process = cms.Process("DDHEPhase1GeomTest")
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.source = cms.Source("EmptySource")

diff --git a/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("DDForwardShieldTest")
+process = cms.Process("DDHFGeomTest")
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.source = cms.Source("EmptySource")

diff --git a/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("DDHOTest")
+process = cms.Process("DDHOGeomTest")
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.source = cms.Source("EmptySource")

diff --git a/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("DDHcalTBHO")
+process = cms.Process("DDHcalTBHOGeomTest")
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.source = cms.Source("EmptySource")

diff --git a/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py b/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("DDBeamLineTest")
+process = cms.Process("DDHcalTestBeamTest")
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.source = cms.Source("EmptySource")