Merge pull request #31160 from bsunanda/Run3-hcx263

Run3-hcx263 Remove unwanted DDD reference fro the code and test the used scripts

Geometry/HGCalCommonData/python/hgcalV6ParametersInitialization_cfi.py

@@ -9,8 +9,8 @@
 )
 
 hgcalHESiParametersInitialize = hgcalEEParametersInitialize.clone(
-    name  = cms.untracked.string("HGCalHESiliconSensitive"),
-    nameW = cms.untracked.string("HGCalHEWafer"),
-    nameC = cms.untracked.string("HGCalHECell"),
-    name2 = cms.untracked.string("HGCalHEsil"),
+    name  = cms.string("HGCalHESiliconSensitive"),
+    nameW = cms.string("HGCalHEWafer"),
+    nameC = cms.string("HGCalHECell"),
+    name2 = cms.string("HGCalHEsil"),
 )

Geometry/HcalCommonData/test/HcalRecNumberingTester.cc

@@ -30,9 +30,6 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DetectorDescription/Core/interface/DDCompactView.h"
-#include "DetectorDescription/Core/interface/DDExpandedView.h"
-#include "DetectorDescription/Core/interface/DDSpecifics.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"

Geometry/HcalCommonData/test/HcalSimNumberingTester.cc

@@ -30,9 +30,6 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DetectorDescription/Core/interface/DDCompactView.h"
-#include "DetectorDescription/Core/interface/DDExpandedView.h"
-#include "DetectorDescription/Core/interface/DDSpecifics.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/HcalSimNumberingRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDSimConstants.h"

Geometry/HcalCommonData/test/python/runHcalRecNumberingTester_cfg.py → Geometry/HcalCommonData/test/python/runHcalRecNumberingDD4hepTester_cfg.py

@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
-process = cms.Process("HcalRecNumberingTest")
+from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
 
-process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff')
-#process.load('Geometry.HcalCommonData.testGeometry17bXML_cfi')
-#process.load('Geometry.HcalCommonData.hcalDDConstants_cff')
+process = cms.Process("HcalRecNumberingTest",Run3_dd4hep)
+
+process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if 'MessageLogger' in process.__dict__:

Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py

@@ -0,0 +1,23 @@
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_cff import Run3
+
+process = cms.Process("HcalRecNumberingTest",Run3)
+
+process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
+#process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.categories.append('HcalGeom')
+
+process.source = cms.Source("EmptySource")
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+    )
+
+process.hpa = cms.EDAnalyzer("HcalRecNumberingTester")
+
+process.Timing = cms.Service("Timing")
+process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck")
+
+process.p1 = cms.Path(process.hpa)

Geometry/HcalCommonData/test/python/runHcalSimNumberingTester_cfg.py → Geometry/HcalCommonData/test/python/runHcalSimNumberingDD4hepTester_cfg.py

@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
-process = cms.Process("HcalSimNumberingTest")
+from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
 
-#process.load('Geometry.HcalCommonData.testPhase1GeometryXML_cfi')
-#process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff')
-process.load('Configuration.Geometry.GeometryExtended2026D41_cff')
+process = cms.Process("HcalSimNumberingTest",Run3_dd4hep)
+
+process.load('Configuration.Geometry.GeometryDD4hepExtended2021_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if 'MessageLogger' in process.__dict__:

Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py

@@ -0,0 +1,25 @@
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_cff import Run3
+
+process = cms.Process("HcalSimNumberingTest",Run3)
+
+#process.load('Geometry.HcalCommonData.testPhase2GeometryFine_cff')
+#process.load('Geometry.HcalCommonData.hcalParameters_cff')
+#process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff')
+process.load('Configuration.Geometry.GeometryExtended2021_cff')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.categories.append('HcalGeom')
+
+process.source = cms.Source("EmptySource")
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+    )
+
+process.hpa = cms.EDAnalyzer("HcalSimNumberingTester")
+
+process.Timing = cms.Service("Timing")
+process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck")
+
+process.p1 = cms.Path(process.hpa)