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

Clean up Phase2 workflows #27449

Merged
merged 6 commits into from
Jul 10, 2019
Merged

Clean up Phase2 workflows #27449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3da726e
deprecate outdated phase 2 geometries, add 2 new ones to keep alive c…
kpedro88 Jul 5, 2019
72c1b09
make it simpler to add new WFs
kpedro88 Jul 5, 2019
aba2c02
add missing era
kpedro88 Jul 5, 2019
d5b10c8
simplify
kpedro88 Jul 5, 2019
30f72d4
default dataset for D41
kpedro88 Jul 8, 2019
9a2a405
use updated I10 for new D45 geometry
kpedro88 Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C6_timing_cff import Phase2C6_timing
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar

Phase2C6_timing_layer_bar = cms.ModifierChain(Phase2C6_timing, phase2_timing_layer, phase2_timing_layer_bar)

31 changes: 4 additions & 27 deletions Configuration/Geometry/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,23 @@ Different versions of various subdetectors can be combined. The available versio
Tracker:
* T5: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.2.5)
* 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)
* T11: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.5) (same as T6 but 50x50 in all modules)
Copy link
Contributor

Choose a reason for hiding this comment

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

@emiglior @ghugo83 for my own understanding (in view of the other geometry-dependent conditions to be maintained for the future), is T11 (50x50um^2 cell) totally deprecated at this point? Is it going to be superseded by something else?

Copy link
Contributor

Choose a reason for hiding this comment

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

@mmusich T11 is not yet totally deprecated as currently we do not have another geometry featuring square pixels. As you wrote, it will be superseded once we reach a more stable layout (e.g. skew TBPX ladders and MB updates)

Copy link
Contributor

Choose a reason for hiding this comment

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

@emiglior thanks. But if I understand correctly the changes proposed here, T11 won't be exercised anymore in any production workflow (starting from the first pre-release in which this is merged). Is this the desired outcome? I am thinking in the scope of maintaining geometry-dependent IT conditions bound to this layout.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To be clear, T11 is not among the geometries explicitly listed to be kept in #26938, and therefore it is removed. We cannot maintain a monotonically increasing list of tracker geometries forever. The tracker group needs to set clear timelines and deliverables for alternate geometry studies.

* T14: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Based from T12. OT: reduced envelope. IT: new chip size, different radii, 2x2 modules everywhere in TEPX, new ring paradigm in TEPX)
* T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.)

Calorimeters:
* C3: HGCal (v8) + Phase2 HCAL and EB
* C4: HGCal (v9) + Phase2 HCAL and EB
* C5: HGCal (v9 without virtual wafers) + Phase2 HCAL and EB
* C6: HGCal (v9) + HFNose + Phase2 HCAL and EB
* C7: HGCal (v9a with inner support structure) + Phase2 HCAL and EB
* C8: HGCal (v10 post TDR HGCal Geometry) + Phase2 HCAL and EB + Tracker cables in calorimeter region

Muon system:
* M2: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1)
* M3: same as M2 with change to the number of iRPC strips from 192 to 96 as in TDR

Fast Timing system:
* I1: No Fast Timing detector
* I2: Fast Timing detector (LYSO barrel, silicon endcap), only sensitive layers
* I3: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO tiles
* I4: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars
* I5: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat
* I6: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat no hole between modules
* I7: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along phi flat
* I8: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along phi flat, crystal thickness as I5
* I9: Same as I7 but with ETL in the position defined in O3
* I10: Same as I9 w/ material adjustments

The script also handles the common and forward elements of the geometry:
* O2: detailed cavern description
Expand All @@ -39,24 +30,10 @@ The script also handles the common and forward elements of the geometry:
* F3: same as F2 but changes due to HFNose

Several detector combinations have been generated:
* D17 = T5+C3+M2+I1+O2+F2
* D19 = T5+C3+M2+I2+O2+F2
* D21 = T6+C3+M2+I1+O2+F2
* D24 = T6+C3+M2+I3+O2+F2
* D25 = T6+C3+M2+I4+O2+F2
* D28 = T6+C4+M2+I1+O2+F2
* D29 = T11+C3+M2+I1+O2+F2
* D30 = T6+C5+M2+I1+O2+F2
* D31 = T6+C6+M2+I1+O2+F3
* D32 = T6+C7+M2+I1+O2+F2
* D33 = T6+C3+M2+I5+O2+F2
* D34 = T6+C3+M2+I6+O2+F2
* D35 = T6+C4+M2+I5+O2+F2
* D38 = T6+C4+M2+I7+O2+F2
* D39 = T6+C4+M2+I8+O2+F2
* D40 = T14+C3+M2+I1+O2+F2
* D41 = T14+C8+M3+I9+O3+F2
* D42 = T15+C3+M2+I1+O2+F2
* D43 = T14+C4+M3+I7+O2+F2
* D44 = T14+C6+M3+I7+O2+F2
* D45 = T15+C8+M3+I10+O3+F2

Currently, D17 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs.
D35 is the baseline for the MTD TDR, and D41 is the baseline for the L1T TDR.
50 changes: 0 additions & 50 deletions Configuration/Geometry/python/GeometryExtended2023D17Reco_cff.py
View file
Open in desktop

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Loading