Merge pull request #30645 from kpedro88/Phase2-WF60

Clean up Phase 2 workflows (2020, 11_2_X)

Configuration/Eras/python/Era_Phase2C9_cff.py

@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C8_cff import Phase2C8
+from Configuration.Eras.Era_Phase2_cff import Phase2
+from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
 
-Phase2C9 = cms.ModifierChain(Phase2C8, phase2_hgcalV11)
+Phase2C9 = cms.ModifierChain(Phase2, phase2_hgcalV9, phase2_hgcalV10, phase2_hgcalV11)
 

Configuration/Geometry/README.md

@@ -5,45 +5,31 @@ The Phase2 geometries are automatically created using the script [generate2026Ge
 Different versions of various subdetectors can be combined. The available versions are:
 
 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)
-* 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.)
-* T16: Active geometry: skewed Inner Tracker geometry. Material Budget: same as T15.
 * T17: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.5) TFPX: Changed sensors spacing within all double-disks + Increased distance between Disks 6 and 7 + Put TBPX portcards between Disks 6 and 7.
 * T19: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v7.0.0) Inner Tracker description with 3D sensors in TBPX L1 + TBPX L2 + TFPX R1.
 * T20: Phase2 tilted tracker (v6.1.6) Outer Tracker: All sensors 200 um -> 290 um + Update in Module MB + PS modules: s-sensor 164 um longer + Major update in OTST MB. Inner Tracker: (v6.1.5) from T17 is called.
 
 Calorimeters:
-* C4: HGCal (v9) + Phase2 HCAL and EB
-* C6: HGCal (v9) + HFNose + Phase2 HCAL and EB
-* C8: HGCal (v10 post TDR HGCal Geometry) + Phase2 HCAL and EB + Tracker cables in calorimeter region
-* C9: HGCal (v11 post TDR HGCal Geometry same as C8 + corner centering for HE part)
+* C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables
 * C10: HGCal (as in C9) + HFNose with corrected wafer size + Phase2 HCAL and EB
 * C11: HGCal (v12 post TDR HGCal Geometry same as C9 + modified support structure + full list of masked wafers)
 * C12: HGCal (as in C11) + HFNose with corrected wafer size + Phase2 HCAL and EB
 * C13: HGCal (reading the constants of the flat file and made provision to be used downstream) + Phase2 HCAL and EB
 
 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
-* M4: same as M3 but no Overlaps inside the Muon System and MB4Shields completed
+* M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
 * M5: same as M4 but with: the right value for YE3 size, no "hidden" overlaps inside the Muon System and iRPC updated.
 * M6: same as M5 but with adjustment of ME0 in view of updated boundaries
 * M7: same as M6 with further ajustment of ME0 for boundaries
 
 Fast Timing system:
-* I5: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat
-* I7: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along phi flat
-* I9: Same as I7 but with ETL in the position defined in O3
-* I10: Same as I9 w/ material adjustments
+* I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments
 * I11: Same as I10, xml reorganized, comparison base for new ETL and DD4hep migration
 * I12: Starting from I11, new ETL layout from MTD TDR
 
 The script also handles the common and forward elements of the geometry:
-* O2: detailed cavern description
-* O3: O2 + changes due to modified CALO region due to changes in the Endcap part
-* O4: same as O3 but no Overlaps inside the Muon System 
+* O4: detailed cavern description, changes for modified CALO region for endcap part, no overlaps inside the Muon System 
 * O5: same as O4 but with changes needed for new support structure 
 * O6: same as O5 with changes needed for new defintion of boundaries
 * F2: modifications needed to accommodate detailed cavern, ZDC description is removed.
@@ -53,23 +39,16 @@ The script also handles the common and forward elements of the geometry:
 * F6: same as F4 with modifications needed for BRM and forward shield
 
 Several detector combinations have been generated:
-* D35 = T6+C4+M2+I5+O2+F2 
-* D41 = T14+C8+M3+I9+O3+F2
-* D43 = T14+C4+M3+I7+O2+F2
-* D44 = T14+C6+M3+I7+O2+F3
-* D45 = T15+C8+M3+I10+O3+F2
-* D46 = T15+C9+M3+I10+O3+F2
-* D47 = T15+C10+M3+I10+O3+F3
-* D48 = T16+C9+M3+I10+O3+F2
 * D49 = T15+C9+M4+I10+O4+F2
 * D50 = T15+C9+M4+I11+O4+F2
 * D51 = T17+C9+M4+I10+O4+F2
 * D53 = T15+C9+M4+I12+O4+F2
 * D54 = T19+C9+M4+I10+O4+F2
-* D55 = T19+C9+M5+I10+O4+F2
 * D56 = T20+C9+M4+I10+O4+F2
 * D57 = T17+C11+M6+I11+O5+F4
 * D58 = T17+C12+M6+I11+O5+F5
 * D59 = T17+C13+M7+I11+O6+F6
+* D60 = T15+C10+M4+I10+O4+F3
+* D61 = T17+C9+M5+I10+O4+F2
 
-D35 is the MTD TDR baseline, D41 is the L1T TDR baseline, and D49 is the HLT TDR baseline.
+D49 is the HLT TDR baseline.