Skip to content

Commit f4d9ad5

Browse files
silviodonatosilviodonato
authored
Merge branch 'master' into customiseHLTfor2018_112x
2 parents 8af9c7c + c3c5d03 commit f4d9ad5

File tree

227 files changed

+5818
-2316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+5818
-2316
lines changed

‎Alignment/OfflineValidation/data/lumiPerRun_Run2.txt‎

Lines changed: 1955 additions & 0 deletions
Large diffs are not rendered by default.

‎Alignment/OfflineValidation/macros/MultiRunAndPlotPVValidation.C‎

Lines changed: 126 additions & 82 deletions
Large diffs are not rendered by default.

‎CalibTracker/SiPixelQuality/python/DQMEventInfoSiPixelQuality_cff.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import FWCore.ParameterSet.Config as cms
2-
from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
3-
dqmEnvSiPixelQuality = DQMEDAnalyzer('DQMEventInfo',
4-
subSystemFolder = cms.untracked.string('PixelPhase1')
5-
)
2+
from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
3+
dqmEnvSiPixelQuality = DQMEDHarvester('DQMHarvestingMetadata',
4+
subSystemFolder = cms.untracked.string('PixelPhase1')
5+
)
66

‎CondTools/Geometry/plugins/PGeometricDetBuilder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void PGeometricDetBuilder::putOne(const GeometricDet* gd, PGeometricDet* pgd, in
189189
item._params9 = 0;
190190
item._params10 = 0;
191191
}
192-
item._geographicalID = gd->geographicalID();
192+
item._geographicalID = gd->geographicalId();
193193
item._radLength = gd->radLength();
194194
item._xi = gd->xi();
195195
item._pixROCRows = gd->pixROCRows();

‎Configuration/Eras/python/Era_Phase2C11M9_cff.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
4+
from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0
5+
6+
Phase2C11M9 = cms.ModifierChain(Phase2C11, phase2_GE0)

‎Configuration/Eras/python/Modifier_phase2_GE0_cff.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
phase2_GE0 = cms.Modifier()

‎Configuration/Geometry/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Muon system:
5555
* M6: same as M5 but with adjustment of ME0 in view of updated boundaries
5656
* M7: same as M6 with further ajustment of ME0 for boundaries
5757
* M8: same as M7 with changed number of strips for GE21
58+
* M9: same as M8 with GE0 replacing ME0
5859

5960
Fast Timing system:
6061
* I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments
@@ -89,5 +90,6 @@ Several detector combinations have been generated:
8990
* D64 = T22+C11+M4+I11+O5+F4
9091
* D65 = T23+C11+M4+I11+O5+F4
9192
* D66 = T21+C11+M8+I11+O5+F4
93+
* D67 = T21+C11+M9+I11+O5+F4
9294

9395
D49 is the HLT TDR baseline.

‎Configuration/Geometry/python/GeometryExtended2026D67Reco_cff.py‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generate2026Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryExtended2026D67_cff import *
7+
8+
# tracker
9+
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
10+
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
11+
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
12+
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
13+
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
14+
trackerGeometry.applyAlignment = cms.bool(False)
15+
16+
# calo
17+
from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
18+
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
19+
from Geometry.CaloEventSetup.CaloTopology_cfi import *
20+
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
21+
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
22+
SelectedCalos = cms.vstring("HCAL",
23+
"ZDC",
24+
"EcalBarrel",
25+
"TOWER",
26+
"HGCalEESensitive",
27+
"HGCalHESiliconSensitive",
28+
"HGCalHEScintillatorSensitive"
29+
)
30+
)
31+
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
32+
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
33+
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
34+
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
35+
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
36+
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
37+
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
38+
from Geometry.EcalMapping.EcalMapping_cfi import *
39+
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
40+
41+
# muon
42+
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
43+
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
44+
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
45+
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
46+
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
47+
48+
# forward
49+
from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
50+
51+
# timing
52+
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
53+
from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
54+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
55+
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
56+
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
57+
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
58+
mtdGeometry.applyAlignment = cms.bool(False)
59+

‎Configuration/Geometry/python/GeometryExtended2026D67_cff.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generate2026Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Geometry.CMSCommonData.cmsExtendedGeometry2026D67XML_cfi import *
7+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
9+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
10+
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
11+
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
12+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
13+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

‎Configuration/Geometry/python/dict2026Geometry.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,51 @@
10661066
],
10671067
"era" : "phase2_muon, phase2_GEM",
10681068
},
1069+
"M9" : {
1070+
1 : [
1071+
'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
1072+
'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
1073+
'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
1074+
'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
1075+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
1076+
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
1077+
'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
1078+
'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml',
1079+
'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
1080+
'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
1081+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
1082+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
1083+
'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
1084+
'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
1085+
'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
1086+
],
1087+
2 : [
1088+
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
1089+
],
1090+
3 : [
1091+
'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
1092+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
1093+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
1094+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
1095+
'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
1096+
'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
1097+
'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
1098+
],
1099+
4 : [
1100+
'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
1101+
],
1102+
"sim" : [
1103+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
1104+
],
1105+
"reco" : [
1106+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
1107+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
1108+
'from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *',
1109+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
1110+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
1111+
],
1112+
"era" : "phase2_muon, phase2_GEM, phase2_GE0",
1113+
},
10691114
}
10701115

10711116
forwardDict = {
@@ -1312,6 +1357,7 @@
13121357
("O5","T22","C11","M4","F4","I11") : "D64",
13131358
("O5","T23","C11","M4","F4","I11") : "D65",
13141359
("O5","T21","C11","M8","F4","I11") : "D66",
1360+
("O5","T21","C11","M9","F4","I11") : "D67",
13151361
}
13161362

13171363
deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D52", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D55" ])

0 commit comments

Comments
 (0)