Merge pull request #38672 from perrotta/saferSyntaxGeometryForwardCom…

…monData Use a safer syntax in Geometry/ForwardCommonData
cms-sw · Jul 11, 2022 · 31882a8 · 31882a8
2 parents 6494d8f + b9aeab7
commit 31882a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py b/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py
@@ -2,19 +2,12 @@
 
 from Geometry.HGCalCommonData.hgcalEEParametersInitialize_cfi import *
 
-
 hfnoseParametersInitialize = hgcalEEParametersInitialize.clone(
-    name  = cms.string("HGCalHFNoseSensitive"),
-    name2 = cms.string("HFNoseEE"),
-    nameW = cms.string("HFNoseWafer"),
-    nameC = cms.string("HFNoseCell"),
-    nameT = cms.string("HFNose"),
-    nameX = cms.string("HGCalHFNoseSensitive"),
-)
-
-from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-
-dd4hep.toModify(hfnoseParametersInitialize,
-                fromDD4hep = cms.bool(True)
+    name  = "HGCalHFNoseSensitive",
+    name2 = "HFNoseEE",
+    nameW = "HFNoseWafer",
+    nameC = "HFNoseCell",
+    nameT = "HFNose",
+    nameX = "HGCalHFNoseSensitive"
 )
 
diff --git a/Geometry/ForwardCommonData/python/hfnoseV15ParametersInitialization_cfi.py b/Geometry/ForwardCommonData/python/hfnoseV15ParametersInitialization_cfi.py
@@ -3,10 +3,10 @@
 from Geometry.HGCalCommonData.hgcalEEV15ParametersInitialization_cfi import *
 
 hfnoseParametersInitialize = hgcalEEParametersInitialize.clone(
-    name  = cms.string("HGCalHFNoseSensitive"),
-    name2 = cms.string("HFNoseEE"),
-    nameW = cms.string("HFNoseWafer"),
-    nameC = cms.string("HFNoseCell"),
-    nameT = cms.string("HFNose"),
-    nameX = cms.string("HGCalHFNoseSensitive"),
+    name  = "HGCalHFNoseSensitive",
+    name2 = "HFNoseEE",
+    nameW = "HFNoseWafer",
+    nameC = "HFNoseCell",
+    nameT = "HFNose",
+    nameX = "HGCalHFNoseSensitive"
 )
diff --git a/Geometry/HGCalCommonData/python/hgcalParametersInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalParametersInitialization_cfi.py
@@ -2,11 +2,6 @@
 
 from Geometry.HGCalCommonData.hgcalEEParametersInitialize_cfi import *
 
-from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-
-dd4hep.toModify(hgcalEEParametersInitialize,
-                fromDD4hep = True )
-
 hgcalHESiParametersInitialize = hgcalEEParametersInitialize.clone(
     name  = "HGCalHESiliconSensitive",
     nameW = "HGCalHEWafer",