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.

Sign up for GitHub

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

Jump to bottom

Deprecating Phase2 Tracker T3 and corresp. scenarios + Adding D18 (= D8 but with the non deprec. Tracker) #18852

Merged
merged 13 commits into from May 29, 2017
Merged

Deprecating Phase2 Tracker T3 and corresp. scenarios + Adding D18 (= D8 but with the non deprec. Tracker) #18852

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7194e8c
removing all WFs with T3
boudoul May 18, 2017
6181ed9
removing scenario, preparing D18
boudoul May 19, 2017
077f7c4
creating dict for D18
boudoul May 19, 2017
9b28eb3
output of the geom scripts for D18
boudoul May 19, 2017
8b458fd
removing XML cfis from deprec scenario
boudoul May 19, 2017
572909e
Old tracker go to trash
boudoul May 19, 2017
3750c05
numbering for D18 to be the same as D8
boudoul May 19, 2017
5faed8c
removing deprec scenario in neutronkeys + IB test
boudoul May 19, 2017
697c4a0
removing my stupid print
boudoul May 19, 2017
e8eab7b
fix indent
boudoul May 19, 2017
f5291a0
removeD18 dupl + add D18 in tests + struggled with 20000
boudoul May 19, 2017
052f6fe
fix geom numbers and WF number loop
boudoul May 25, 2017
d3577e9
forgot a comment
boudoul May 25, 2017
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
18 changes: 5 additions & 13 deletions Configuration/Geometry/README.md
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@ Different versions of various subdetectors can be combined. The available versio
Tracker:
* T1: Phase2 tilted tracker (v2016-04-12) w/ phase 1 (extended) pixel - DEPRECATED, superseded by T3
* T2: Phase2 flat tracker (v2016-04-12) w/ phase 1 (extended) pixel- DEPRECATED, superseded by T4
* T3: Phase2 tilted tracker (v3.6.5) w/ phase 2 pixel (v4.0.2.6)
* T3: Phase2 tilted tracker (v3.6.5) w/ phase 2 pixel (v4.0.2.6) - DEPRECATED, superseded by T5
* T4: Phase2 flat tracker (v2016-04-12) w/ phase 2 pixel (v4.0.2.6)
* T5: Phase2 tilted tracker (v3.6.13) w/ phase 2 pixel (v4.0.2.5)
* T5: Phase2 tilted tracker (v3.6.13) w/ phase 2 pixel (v4.0.2.5)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah just a pico thing : T5 corresponds to OT v6.1.3 in tkLayout.
T5: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.2.5)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @ghugo83 , fixed in my last commit


Calorimeters:
* C1: Run2 calorimeters
Expand All @@ -29,20 +29,12 @@ The script also handles the common and forward elements of the geometry:
* F2: modifications needed to accommodate detailed cavern, ZDC description is removed.

Several detector combinations have been generated:
* D7 = T3+C1+M1+I1+O1+F1
* D4 = T3+C2+M1+I1+O1+F1
* D8 = T3+C2+M1+I2+O1+F1
* D9 = T3+C1+M2+I1+O1+F1
* D10 = T4+C1+M1+I1+O1+F1
* D11 = T5+C2+M1+I1+O1+F1
* D12 = T3+C2+M2+I1+O2+F2
* D13 = T3+C3+M2+I1+O1+F1
* D11 = T5+C2+M1+I1+O1+F1
* D14 = T5+C2+M2+I1+O2+F2
* D15 = T3+C3+M2+I1+O2+F2
* D16 = T5+C3+M2+I1+O1+F1
* D17 = T5+C3+M2+I1+O2+F2

Currently, D4 is considered to be the baseline for the Phase 2 Tracker and L1 Trigger TDRs,
and D12 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs.
* D18 = T5+C2+M1+I2+O1+F1
Currently, D17 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs.


50 changes: 0 additions & 50 deletions Configuration/Geometry/python/GeometryExtended2023D12Reco_cff.py
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Configuration/Geometry/python/GeometryExtended2023D12_cff.py
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions Configuration/Geometry/python/GeometryExtended2023D13Reco_cff.py
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Configuration/Geometry/python/GeometryExtended2023D13_cff.py
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions Configuration/Geometry/python/GeometryExtended2023D15Reco_cff.py
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Configuration/Geometry/python/GeometryExtended2023D15_cff.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .../python/GeometryExtended2023D8Reco_cff.py → ...python/GeometryExtended2023D18Reco_cff.py
View file
Open in desktop
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.GeometryExtended2023D8_cff import *
from Configuration.Geometry.GeometryExtended2023D18_cff import *

# tracker
from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
Expand Down
4 changes: 2 additions & 2 deletions ...etry/python/GeometryExtended2023D8_cff.py → ...try/python/GeometryExtended2023D18_cff.py
View file
Open in desktop
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.cmsExtendedGeometry2023D8XML_cfi import *
from Geometry.CMSCommonData.cmsExtendedGeometry2023D18XML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted4021_cff import *
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted4025_cff import *
from Geometry.HcalCommonData.hcalParameters_cfi import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
Expand Down
50 changes: 0 additions & 50 deletions Configuration/Geometry/python/GeometryExtended2023D4Reco_cff.py
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Configuration/Geometry/python/GeometryExtended2023D4_cff.py
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions Configuration/Geometry/python/GeometryExtended2023D7Reco_cff.py
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions Configuration/Geometry/python/GeometryExtended2023D7_cff.py
View file
Open in desktop

This file was deleted.