remove phase2 tk customization functions

gem-sw · Oct 28, 2016 · 23019d1 · 23019d1
1 parent 0cefef6
commit 23019d1
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 63 deletions.
diff --git a/Configuration/Geometry/python/GeometryExtended2023D1_cff.py b/Configuration/Geometry/python/GeometryExtended2023D1_cff.py
@@ -5,5 +5,6 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023D1XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted_cff import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2023D2_cff.py b/Configuration/Geometry/python/GeometryExtended2023D2_cff.py
@@ -5,5 +5,6 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023D2XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkFlat_cff import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2023D3_cff.py b/Configuration/Geometry/python/GeometryExtended2023D3_cff.py
@@ -5,6 +5,7 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023D3XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted_cff import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
 from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *

diff --git a/Configuration/Geometry/python/GeometryExtended2023D4_cff.py b/Configuration/Geometry/python/GeometryExtended2023D4_cff.py
@@ -5,6 +5,7 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023D4XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted4021_cff import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
 from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *

diff --git a/Configuration/Geometry/python/GeometryExtended2023D5_cff.py b/Configuration/Geometry/python/GeometryExtended2023D5_cff.py
@@ -5,6 +5,7 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023D5XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted_cff import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
 from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *

diff --git a/Configuration/Geometry/scripts/dict2023Geometry.py b/Configuration/Geometry/scripts/dict2023Geometry.py
@@ -92,6 +92,7 @@
         ],
         "sim" : [
             'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
+            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted_cff import *',
         ],
         "reco" : [
             'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
@@ -162,6 +163,7 @@
         ],
         "sim" : [
             'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
+            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkFlat_cff import *',
         ],
         "reco" : [
             'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
@@ -198,6 +200,7 @@
         ],
         "sim" : [
             'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
+            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted4021_cff import *',
         ],
         "reco" : [
             'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -84,35 +84,30 @@
     '2023D1' : {
         'Geom' : 'Extended2023D1',
         'GT' : 'auto:phase2_realistic',
-        'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted',
         'Era' : 'Phase2C1',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullGlobal','HARVESTFullGlobal'],
     },    
     '2023D2' : {
         'Geom' : 'Extended2023D2',
         'GT' : 'auto:phase2_realistic',
-        'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023flat',
         'Era' : 'Phase2C1',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullGlobal','HARVESTFullGlobal'],
     },    
     '2023D3' : {
         'Geom' : 'Extended2023D3',
         'GT' : 'auto:phase2_realistic',
-        'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted',
         'Era' : 'Phase2C2',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullGlobal', 'HARVESTFullGlobal'],
     },    
     '2023D4' : {
         'Geom' : 'Extended2023D4',
         'GT' : 'auto:phase2_realistic',
-        'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted4021',
         'Era' : 'Phase2C2',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullLocal'],
     },
     '2023D5' : {
         'Geom' : 'Extended2023D5',
         'GT' : 'auto:phase2_realistic',
-        'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted',
         'Era' : 'Phase2C2_timing',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullGlobal', 'HARVESTFullGlobal'],
     }

diff --git a/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py b/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
@@ -5,27 +5,8 @@
 from SLHCUpgradeSimulations.Configuration.HCalCustoms import customise_HcalPhase1, customise_HcalPhase0
 from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions
 
-from SLHCUpgradeSimulations.Configuration.phase2TkTilted import customise as customiseTiltedTK
-from SLHCUpgradeSimulations.Configuration.phase2TkFlat import customise as customiseFlatTK
-from SLHCUpgradeSimulations.Configuration.phase2TkTilted4021 import customise as customiseTiltedTK4021
-
 import SLHCUpgradeSimulations.Configuration.aging as aging
 
-def cust_2023tilted(process):
-    # To allow simulatenous use of customisation and era while the era migration is in progress
-    process=customiseTiltedTK(process)
-    return process
-
-def cust_2023flat(process):
-    # To allow simulatenous use of customisation and era while the era migration is in progress
-    process=customiseFlatTK(process)
-    return process
-
-def cust_2023tilted4021(process):
-    # To allow simulatenous use of customisation and era while the era migration is in progress
-    process=customiseTiltedTK4021(process)
-    return process
-
 def cust_2019(process):
     process=customisePostLS1(process,displayDeprecationWarning=False)
     process=customisePhase1Tk(process)

diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py
diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py
diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted4021.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted4021.py