Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase 2 Trackers T12 and T13: TBPX Lp GBTs placement study #25357

Merged
merged 4 commits into from Dec 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Configuration/Geometry/README.md
Expand Up @@ -7,9 +7,9 @@ Tracker:
* T6: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.4) (TEDD slighly rotated + Inner Tracker barrel has lower radii than TDR T5 geometry)
* T7: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.2.0) (same as T6 but 25x100 in 1x2 modules, 50x200 in 2x2 modules)
* T8: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.2.1) (same as T6 but 25x100 in 1x2 modules, 100x100 in 2x2 modules)
* T9: Same as T5, but with an increase of 20% of the material (stress test studies)
* T10: Same as T5 but with an increase of 50% of the material (stress test studies)
* T11: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.5) (same as T6 but 50x50 in all modules)
* T12: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.6.1) (same as T6 but includes latest Tracker MB (notably, significant increase in IT modules Caps RL). OTST update not included yet. Slightly tuned LpGBTs Z positions over service cylinder.
* T13: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.6.0) (same as T9 but TBPX Lp GBTs placed over TBPX)

Calorimeters:
* C3: HGCal (v8) + Phase2 HCAL and EB
Expand Down Expand Up @@ -42,8 +42,6 @@ Several detector combinations have been generated:
* D23 = T8+C3+M2+I1+O2+F2
* D24 = T6+C3+M2+I3+O2+F2
* D25 = T6+C3+M2+I4+O2+F2
* D26 = T9+C3+M2+I1+C2+F2
* D27 = T10+C3+M2+I1+O2+F2
* D28 = T6+C4+M2+I1+O2+F2
* D29 = T11+C3+M2+I1+O2+F2
* D30 = T6+C5+M2+I1+O2+F2
Expand All @@ -52,5 +50,7 @@ Several detector combinations have been generated:
* D33 = T6+C3+M2+I5+O2+F2
* D34 = T6+C3+M2+I6+O2+F2
* D35 = T6+C4+M2+I5+O2+F2
* D36 = T12+C3+M2+I1+O2+F2
* D37 = T13+C3+M2+I1+O2+F2

Currently, D17 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs.
Expand Up @@ -3,7 +3,7 @@
# This config was generated automatically using generate2023Geometry.py
# If you notice a mistake, please update the generating script, not just this config

from Configuration.Geometry.GeometryExtended2023D26_cff import *
from Configuration.Geometry.GeometryExtended2023D36_cff import *

# tracker
from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
Expand Down
Expand Up @@ -3,9 +3,9 @@
# This config was generated automatically using generate2023Geometry.py
# If you notice a mistake, please update the generating script, not just this config

from Geometry.CMSCommonData.cmsExtendedGeometry2023D26XML_cfi import *
from Geometry.CMSCommonData.cmsExtendedGeometry2023D36XML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import *
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *
from Geometry.HcalCommonData.hcalParameters_cfi import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
Expand Down
Expand Up @@ -3,7 +3,7 @@
# This config was generated automatically using generate2023Geometry.py
# If you notice a mistake, please update the generating script, not just this config

from Configuration.Geometry.GeometryExtended2023D27_cff import *
from Configuration.Geometry.GeometryExtended2023D37_cff import *

# tracker
from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
Expand Down
Expand Up @@ -3,9 +3,9 @@
# This config was generated automatically using generate2023Geometry.py
# If you notice a mistake, please update the generating script, not just this config

from Geometry.CMSCommonData.cmsExtendedGeometry2023D27XML_cfi import *
from Geometry.CMSCommonData.cmsExtendedGeometry2023D37XML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import *
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *
from Geometry.HcalCommonData.hcalParameters_cfi import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
Expand Down
90 changes: 46 additions & 44 deletions Configuration/Geometry/python/dict2023Geometry.py
Expand Up @@ -174,29 +174,30 @@
],
"era" : "phase2_tracker, trackingPhase2PU140",
},
"T9" : {
"T11" : {
1 : [
'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025TwentyPercent/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025TwentyPercent/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025TwentyPercent/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker405/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
"sim" : [
'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import *',
'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *',
],
"reco" : [
'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
Expand All @@ -207,30 +208,31 @@
'trackerGeometry.applyAlignment = cms.bool(False)',
],
"era" : "phase2_tracker, trackingPhase2PU140",
},
"T10" : {
1 : [
},
"T12" : {
1 : [
'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025FiftyPercent/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025FiftyPercent/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025FiftyPercent/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
"sim" : [
'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import *',
'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *',
],
"reco" : [
'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
Expand All @@ -242,23 +244,23 @@
],
"era" : "phase2_tracker, trackingPhase2PU140",
},
"T11" : {
"T13" : {
1 : [
'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker460/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker405/pixelStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
Expand All @@ -276,7 +278,7 @@
'trackerGeometry.applyAlignment = cms.bool(False)',
],
"era" : "phase2_tracker, trackingPhase2PU140",
}
}
}

caloDict = {
Expand Down Expand Up @@ -921,17 +923,17 @@
("O2","T8","C3","M2","F2","I1") : "D23",
("O2","T6","C3","M2","F2","I3") : "D24",
("O2","T6","C3","M2","F2","I4") : "D25",
("O2","T9","C3","M2","F2","I1") : "D26",
("O2","T10","C3","M2","F2","I1") : "D27",
("O2","T6","C4","M2","F2","I1") : "D28",
("O2","T11","C3","M2","F2","I1") : "D29",
("O2","T6","C5","M2","F2","I1") : "D30",
("O2","T6","C6","M2","F3","I1") : "D31",
("O2","T6","C7","M2","F2","I1") : "D32",
("O2","T6","C3","M2","F2","I5") : "D33",
("O2","T6","C3","M2","F2","I6") : "D34",
("O2","T6","C4","M2","F2","I5") : "D35",
("O2","T6","C4","M2","F2","I5") : "D35",
("O2","T12","C3","M2","F2","I1") : "D36",
("O2","T13","C3","M2","F2","I1") : "D37",
}

deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18","D20" ])
deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "C1", "C2", "M1", "O1", "F1" ])
deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18", "D20", "D26", "D27" ])
deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T9", "T10", "C1", "C2", "M1", "O1", "F1" ])
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_2023.py
Expand Up @@ -23,5 +23,7 @@
numWFIB.extend([22434.0]) #2023D24
numWFIB.extend([24034.0]) #2023D28
numWFIB.extend([27434.0]) #2023D35
numWFIB.extend([23234.0]) #2023D36
numWFIB.extend([23634.0]) #2023D37
for numWF in numWFIB:
workflows[numWF] = _upgrade_workflows[numWF]
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Expand Up @@ -2767,15 +2767,15 @@ def gen2018HiMix(fragment,howMuch):
defaultDataSets['2023D23']=''
defaultDataSets['2023D24']=''
defaultDataSets['2023D25']=''
defaultDataSets['2023D26']=''
defaultDataSets['2023D27']=''
defaultDataSets['2023D28']=''
defaultDataSets['2023D29']=''
defaultDataSets['2023D30']=''
defaultDataSets['2023D31']=''
defaultDataSets['2023D33']=''
defaultDataSets['2023D34']=''
defaultDataSets['2023D35']=''
defaultDataSets['2023D36']=''
defaultDataSets['2023D37']=''

keys=defaultDataSets.keys()
for key in keys:
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_upgrade.py
Expand Up @@ -15,7 +15,7 @@ def makeStepNameSim(key,frag,step,suffix):
def makeStepName(key,frag,step,suffix):
return step+suffix+'_'+key

neutronKeys = ['2023D17','2023D19','2023D21','2023D22','2023D23','2023D24','2023D25','2023D26','2023D27','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35']
neutronKeys = ['2023D17','2023D19','2023D21','2023D22','2023D23','2023D24','2023D25','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35','2023D36','2023D37']
neutronFrags = ['ZMM_14','MinBias_14TeV']

#just define all of them
Expand Down
Expand Up @@ -34,10 +34,10 @@
'2023D24PU',
'2023D25',
'2023D25PU',
'2023D26',
'2023D26PU',
'2023D27',
'2023D27PU',
'2023D36',
'2023D36PU',
'2023D37',
'2023D37PU',
'2023D28',
'2023D28PU',
'2023D29',
Expand Down Expand Up @@ -316,15 +316,15 @@
'Era' : 'Phase2_timing_layer_new',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2023D26' : {
'Geom' : 'Extended2023D26',
'2023D36' : {
'Geom' : 'Extended2023D36',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic',
'Era' : 'Phase2',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2023D27' : {
'Geom' : 'Extended2023D27',
'2023D37' : {
'Geom' : 'Extended2023D37',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic',
'Era' : 'Phase2',
Expand Down Expand Up @@ -398,10 +398,10 @@
upgradeProperties[2023]['2023D24PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D25PU'] = deepcopy(upgradeProperties[2023]['2023D25'])
upgradeProperties[2023]['2023D25PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D26PU'] = deepcopy(upgradeProperties[2023]['2023D26'])
upgradeProperties[2023]['2023D26PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D27PU'] = deepcopy(upgradeProperties[2023]['2023D27'])
upgradeProperties[2023]['2023D27PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D36PU'] = deepcopy(upgradeProperties[2023]['2023D36'])
upgradeProperties[2023]['2023D36PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D37PU'] = deepcopy(upgradeProperties[2023]['2023D37'])
upgradeProperties[2023]['2023D37PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D28PU'] = deepcopy(upgradeProperties[2023]['2023D28'])
upgradeProperties[2023]['2023D28PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
upgradeProperties[2023]['2023D29PU'] = deepcopy(upgradeProperties[2023]['2023D29'])
Expand Down
4 changes: 2 additions & 2 deletions Configuration/StandardSequences/python/GeometryConf.py
Expand Up @@ -35,8 +35,6 @@
'Extended2023D23' : 'Extended2023D23,Extended2023D23Reco',
'Extended2023D24' : 'Extended2023D24,Extended2023D24Reco',
'Extended2023D25' : 'Extended2023D25,Extended2023D25Reco',
'Extended2023D26' : 'Extended2023D26,Extended2023D26Reco',
'Extended2023D27' : 'Extended2023D27,Extended2023D27Reco',
'Extended2023D28' : 'Extended2023D28,Extended2023D28Reco',
'Extended2023D29' : 'Extended2023D29,Extended2023D29Reco',
'Extended2023D30' : 'Extended2023D30,Extended2023D30Reco',
Expand All @@ -45,4 +43,6 @@
'Extended2023D33' : 'Extended2023D33,Extended2023D33Reco',
'Extended2023D34' : 'Extended2023D34,Extended2023D34Reco',
'Extended2023D35' : 'Extended2023D35,Extended2023D35Reco',
'Extended2023D36' : 'Extended2023D36,Extended2023D36Reco',
'Extended2023D37' : 'Extended2023D37,Extended2023D37Reco',
}