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

renaming 2019 scenario to 2021 ... #26535

Merged
merged 10 commits into from
May 9, 2019
Merged

renaming 2019 scenario to 2021 ... #26535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c7fd69
First obvious changes
boudoul Apr 25, 2019
bcc6ef1
2nd round of 2019 migration
boudoul Apr 25, 2019
8ca7329
2021 Migration
boudoul Apr 25, 2019
ec90ee3
Finishing with relval step ....
boudoul Apr 25, 2019
608342c
forgot the lack od 2021 in the GT name
boudoul Apr 25, 2019
bfeb537
Preserving 2019 for actual changes during this particular year
boudoul Apr 30, 2019
c1d7538
Preserving 2019 for actual changes during this particular year
boudoul Apr 30, 2019
8898bff
Keeping 2019 for DB tag and updating GeometryConf
boudoul May 3, 2019
e9bc773
Keeping 2019 in 2019XML_cfi
boudoul May 3, 2019
a87a020
addressing Ianna's comments
boudoul May 7, 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
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ CaloTPGTranscoderULUT::getOutputLUTSize(const HcalTrigTowerDetId& id) const
return QIE11_OUTPUT_LUT_SIZE;
else
return QIE10_OUTPUT_LUT_SIZE;
case HcalTopologyMode::TriggerMode_2019:
case HcalTopologyMode::TriggerMode_2021:
if (id.ietaAbs() <= theTopology->lastHERing())
return QIE11_OUTPUT_LUT_SIZE;
else
Expand Down Expand Up @@ -268,7 +268,7 @@ CaloTPGTranscoderULUT::isOnlyQIE11(const HcalTrigTowerDetId& id) const
if (id.ietaAbs() <= theTopology->lastHBRing())
return false;
return true;
case HcalTopologyMode::TriggerMode_2019:
case HcalTopologyMode::TriggerMode_2021:
return true;
default:
throw cms::Exception("CaloTPGTranscoderULUT")
Expand Down
4 changes: 2 additions & 2 deletions Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public :
int runHi=99999999, int etaMin=1, int etaMax=29,
bool debug=false);
// mode of LHC is kept 1 for 2017 scenario as no change in depth segmentation
// mode of LHC is 0 for 2019
// mode of LHC is 0 for 2021
virtual ~HBHEMuonOfflineAnalyzer();

virtual Int_t Cut(Long64_t entry);
Expand Down Expand Up @@ -1712,7 +1712,7 @@ int HBHEMuonOfflineAnalyzer::nDepthBins(int eta, int phi) {
int nDepthR3[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,3,5,6,6,6,6,6,6,6,7,7,7,3};
// Run 4 scenario
int nDepthR4[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,7,7,7};
// for 2019 scenario multi depth segmentation
// for 2021 scenario multi depth segmentation
// int nDepth[29]={3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5,5,5,5,5,5,5,5,5,5};
// modeLHC_ = 0 --> nbin defined maxDepthHB/HE
// = 1 --> corresponds to Run 1 (valid till 2016)
Expand Down
4 changes: 2 additions & 2 deletions Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public :

HBHEMuonOfflineSimAnalyzer(const char *infile, const char *outfile="dyll_PU20_25_output_10.root", const int mode=0, const int maxDHB=4, const int maxDHE=7);
// mode of LHC is kept 1 for 2017 scenario as no change in depth segmentation
// mode of LHC is 0 for 2019
// mode of LHC is 0 for 2021
virtual ~HBHEMuonOfflineSimAnalyzer();
virtual Int_t Cut(Long64_t entry);
virtual Int_t GetEntry(Long64_t entry);
Expand Down Expand Up @@ -862,7 +862,7 @@ void HBHEMuonOfflineSimAnalyzer::WriteHistograms() {

int HBHEMuonOfflineSimAnalyzer::NDepthBins(int eta) {
// int nDepth[29]={1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,3,1,2,2,2,2,2,2,2,2,2,3,3,2};
// for 2019 scenario multi depth segmentation
// for 2021 scenario multi depth segmentation
// int nDepth[29]={3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5,5,5,5,5,5,5,5,5,5};
int nDepth[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,7,7,7};

Expand Down
10 changes: 5 additions & 5 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
'phase1_2018_cosmics' : '106X_upgrade2018cosmics_realistic_deco_v3',
# GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode
'phase1_2018_cosmics_peak' : '106X_upgrade2018cosmics_realistic_peak_v3',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
'phase1_2019_design' : '106X_postLS2_design_v4', # GT containing design conditions for postLS2
# GlobalTag for MC production with realistic conditions for Phase1 2019
'phase1_2019_realistic' : '106X_postLS2_realistic_v4', # GT containing realistic conditions for postLS2
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021
'phase1_2021_design' : '106X_postLS2_design_v4', # GT containing design conditions for postLS2
# GlobalTag for MC production with realistic conditions for Phase1 2021
'phase1_2021_realistic' : '106X_postLS2_realistic_v4', # GT containing realistic conditions for postLS2
# GlobalTag for MC production with realistic conditions for Phase2 2023
'phase2_realistic' : '106X_upgrade2023_realistic_v2'
}
Expand Down Expand Up @@ -97,5 +97,5 @@
autoCond['upgradePLS1'] = ( autoCond['run2_mc'] )
autoCond['upgradePLS150ns'] = ( autoCond['run2_mc_50ns'] )
autoCond['upgrade2017'] = ( autoCond['phase1_2017_design'] )
autoCond['upgrade2019'] = ( autoCond['phase1_2019_design'] )
autoCond['upgrade2021'] = ( autoCond['phase1_2021_design'] )
autoCond['upgradePLS3'] = ( autoCond['phase2_realistic'] )
2 changes: 1 addition & 1 deletion ...ry/python/GeometryExtended2019Reco_cff.py → ...ry/python/GeometryExtended2021Reco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2019_cff import *
from Configuration.Geometry.GeometryExtended2021_cff import *



Expand Down
2 changes: 1 addition & 1 deletion ...ometry/python/GeometryExtended2019_cff.py → ...ometry/python/GeometryExtended2021_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi import *
from Geometry.CMSCommonData.cmsExtendedGeometry2021XML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
from Geometry.HcalCommonData.hcalParameters_cfi import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# he collapse: TTbar, TTbar PU, TTbar design
# killStuckTBM: TTbar, ZMM
# ParkingBPH: TTbar
# 2019 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
# 2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,
10024.1,10024.2,10024.3,10024.4,10024.5,
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2932,8 +2932,8 @@ def gen2018HiMix(fragment,howMuch):
defaultDataSets['2017Design']='CMSSW_10_0_0_pre2-100X_mc2017_design_IdealBS_v1-v'
defaultDataSets['2018']='CMSSW_10_5_0_pre1-103X_upgrade2018_realistic_v8-v'
defaultDataSets['2018Design']='CMSSW_10_5_0_pre1-103X_upgrade2018_design_v4-v'
defaultDataSets['2019']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v'
defaultDataSets['2019Design']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v'
defaultDataSets['2021']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v'
defaultDataSets['2021Design']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v'
defaultDataSets['2023D17']='CMSSW_10_2_0_pre2-101X_upgrade2023_realistic_v5_2023D17noPU-v'
defaultDataSets['2023D19']=''
defaultDataSets['2023D21']=''
Expand Down
24 changes: 12 additions & 12 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
'2018PU',
'2018Design',
'2018DesignPU',
'2019',
'2019PU',
'2019Design',
'2019DesignPU',
'2021',
'2021PU',
'2021Design',
'2021DesignPU',
]

upgradeKeys[2023] = [
Expand Down Expand Up @@ -278,16 +278,16 @@
'BeamSpot': 'GaussSigmaZ4cm',
'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
},
'2019' : {
'2021' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2019_realistic',
'GT' : 'auto:phase1_2021_realistic',
'HLTmenu': '@relval2017',
'Era' : 'Run3',
'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull','ALCAFull'],
},
'2019Design' : {
'2021Design' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2019_design',
'GT' : 'auto:phase1_2021_design',
'HLTmenu': '@relval2017',
'Era' : 'Run3',
'BeamSpot': 'GaussSigmaZ4cm',
Expand All @@ -305,10 +305,10 @@
upgradeProperties[2017]['2018DesignPU'] = deepcopy(upgradeProperties[2017]['2018Design'])
upgradeProperties[2017]['2018DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']

upgradeProperties[2017]['2019PU'] = deepcopy(upgradeProperties[2017]['2019'])
upgradeProperties[2017]['2019PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull']
upgradeProperties[2017]['2019DesignPU'] = deepcopy(upgradeProperties[2017]['2019Design'])
upgradeProperties[2017]['2019DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
upgradeProperties[2017]['2021PU'] = deepcopy(upgradeProperties[2017]['2021'])
upgradeProperties[2017]['2021PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull']
upgradeProperties[2017]['2021DesignPU'] = deepcopy(upgradeProperties[2017]['2021Design'])
upgradeProperties[2017]['2021DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']

upgradeProperties[2023] = {
'2023D17' : {
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/scripts/runTheMatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def runSelected(opt):
10024.0, #2017 ttbar
10224.0, #2017 ttbar PU
10824.0, #2018 ttbar
11624.0, #2019 ttbar
11624.0, #2021 ttbar
20034.0, #2023D17 ttbar (TDR baseline Muon/Barrel)
21234.0, #2023D21 ttbar (Inner Tracker with lower radii than in TDR)
27434.0, #2023D35 to exercise new HGCal + new MTD
Expand Down
4 changes: 2 additions & 2 deletions Configuration/StandardSequences/python/GeometryConf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'DBExtended2017' : 'DB:Extended',
'DBExtended2017ZeroMaterial' : 'DB:Extended2017ZeroMaterial',
'DBExtended2018' : 'DB:Extended',
'DBExtended2019' : 'DB:Extended2019',
'DBExtended2021' : 'DB:Extended',
'DBExtended2023' : 'DB:Extended2023',
'DBIdeal2015' : 'DB:Ideal2015',
'DBIdeal2015dev' : 'DB:Ideal2015dev',
Expand All @@ -23,7 +23,7 @@
'Extended2018' : 'Extended2018,Extended2018Reco',
'Extended2017Plan1' : 'Extended2017Plan1,Extended2017Plan1Reco',
'Extended2017Plan1ZeroMaterial' : 'Extended2017Plan1ZeroMaterial,Extended2017Plan1ZeroMaterialReco',
'Extended2019' : 'Extended2019,Extended2019Reco',
'Extended2021' : 'Extended2021,Extended2021Reco',
'All' : 'Configuration.Geometry.GeometrySimAll_cff,Reco',
'ECALHCAL' : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff',
'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff',
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<Include ref='Geometry/MuonCommonData/data/csc/2015/v2/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2015/v2/muonNumbering.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2019/v1/dtSpecsFilter.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
Copy link
Contributor

Choose a reason for hiding this comment

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

@boudoul - this is a change in XML for a current DT introduced this year.

<Include ref='Geometry/MuonSimData/data/muonProdCuts.xml'/>
<Include ref='DetectorDescription/DDCMS/data/trackerParameters.xml'/>
</IncludeSection>
Expand Down
8 changes: 4 additions & 4 deletions Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from FWCore.Utilities.Enumerate import Enumerate
from Configuration.Geometry.dict2023Geometry import detectorVersionDict

varType = Enumerate ("Run1 2015 2017 2019 2023 MaPSA")
varType = Enumerate ("Run1 2015 2017 2021 2023 MaPSA")
defaultVersion=str();

def help():
Expand Down Expand Up @@ -64,13 +64,13 @@ def recoGeoLoad(score):
process.GlobalTag.globaltag = autoCond['upgrade2017']
process.load('Configuration.Geometry.GeometryExtended2017Reco_cff')

elif score == "2019":
elif score == "2021":
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['upgrade2019']
process.GlobalTag.globaltag = autoCond['upgrade2021']
## NOTE: There is no PTrackerParameters Rcd in this GT yet
process.load('Geometry.TrackerGeometryBuilder.trackerParameters_cfi')
process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
## NOTE: There are no Muon alignement records in the GT yet
process.DTGeometryESModule.applyAlignment = cms.bool(False)
process.CSCGeometryESModule.applyAlignment = cms.bool(False)
Expand Down
6 changes: 3 additions & 3 deletions Fireworks/Geometry/python/dumpSimGeometry_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from FWCore.Utilities.Enumerate import Enumerate
from Configuration.Geometry.dict2023Geometry import detectorVersionDict

varType = Enumerate ("Run1 2015 2015dev 2017 2017Muon 2019 2023")
varType = Enumerate ("Run1 2015 2015dev 2017 2017Muon 2021 2023")
defaultVersion=str();

def help():
Expand Down Expand Up @@ -46,8 +46,8 @@ def simGeoLoad(score):
elif score == "2017Muon":
process.load("Geometry.CMSCommonData.cmsExtendedGeometry2017MuonXML_cfi")

elif score == "2019":
process.load("Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi")
elif score == "2021":
process.load("Geometry.CMSCommonData.cmsExtendedGeometry2021XML_cfi")

elif score == "2023":
versionCheck(options.version)
Expand Down
Loading