-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Update DD4HEP GT with latest developments #35436
Conversation
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35436/25572
|
A new Pull Request was created by @tvami (Tamas Vami) for master. It involves the following packages:
@jordan-martins, @bbilin, @wajidalikhan, @cmsbuild, @AdrianoDee, @srimanob, @kskovpen can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
@cmsbuild , please test |
@tvami is there a 12_0_X backport? |
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b038b7/19163/summary.html Comparison SummarySummary:
|
Hi @tvami |
@@ -1104,7 +1104,7 @@ def condition(self, fragment, stepList, key, hasHarvest): | |||
class UpgradeWorkflow_DD4hepDB(UpgradeWorkflow): | |||
def setup_(self, step, stepName, stepDict, k, properties): | |||
if 'Run3' in stepDict[step][k]['--era']: | |||
stepDict[stepName][k] = merge([{'--conditions': '120X_mcRun3_2021_realistic_dd4hep_v1', '--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) | |||
stepDict[stepName][k] = merge([{'--conditions': '121X_mcRun3_2021_realistic_dd4hep_v1', '--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tvami @cms-sw/alca-l2 as far as I can see this GlobalTag differs from the regular one (121X_mcRun3_2021_realistic_v8
as proposed at #35373) not only in terms of the geometry tags, but there is also the pixel dynamic inefficiency
$ conddb diff 121X_mcRun3_2021_realistic_dd4hep_v1 121X_mcRun3_2021_realistic_v8
[2021-09-28 09:37:11,986] INFO: Connecting to pro [frontier://PromptProd/cms_conditions]
Record Label pro::121X_mcRun3_2021_realistic_dd4hep_v1 Tag pro::121X_mcRun3_2021_realistic_v8 Tag
----------------------------- -------- ------------------------------------------------ ---------------------------------------
CSCRecoDigiParametersRcd - CSCRECODIGI_Geometry_120DD4hepV1 CSCRECODIGI_Geometry_112YV2
CSCRecoGeometryRcd - CSCRECO_Geometry_120DD4hepV1 CSCRECO_Geometry_112YV2
DTRecoGeometryRcd - DTRECO_Geometry_120DD4hepV1 DTRECO_Geometry_112YV2
EcalPFRecHitThresholdsRcd - EcalPFRecHitThresholds_UL_2018_2e3sig EcalPFRecHitThresholds_34sigma_TL235
GEMRecoGeometryRcd - GEMRECO_Geometry_120DD4hepV1 GEMRECO_Geometry_113YV4
GeometryFileRcd Extended XMLFILE_Geometry_120DD4hepV3_Extended2021_mc XMLFILE_Geometry_120YV2_Extended2021_mc
HcalParametersRcd - HCALParameters_Geometry_120DD4hepV1 HCALParameters_Geometry_112YV2
HcalRespCorrsRcd - HcalRespCorrs_2021_v2.0_mc HcalRespCorrs_2021_v3.0_mc
IdealGeometryRecord - TKRECO_Geometry_120DD4hepV1 TKRECO_Geometry_120YV2
PCaloTowerRcd - CTRECO_Geometry_120DD4hepV1 CTRECO_Geometry_112YV2
PEcalBarrelRcd - EBRECO_Geometry_120DD4hepV1 EBRECO_Geometry_112YV2
PEcalEndcapRcd - EERECO_Geometry_120DD4hepV1 EERECO_Geometry_112YV2
PEcalPreshowerRcd - EPRECO_Geometry_120DD4hepV1 EPRECO_Geometry_112YV2
PHcalRcd - HCALRECO_Geometry_120DD4hepV1 HCALRECO_Geometry_112YV2
PTrackerParametersRcd - TKParameters_Geometry_120DD4hepV1 TKParameters_Geometry_112YV2
PZdcRcd - ZDCRECO_Geometry_120DD4hepV1 ZDCRECO_Geometry_112YV2
RPCRecoGeometryRcd - RPCRECO_Geometry_120DD4hepV1 RPCRECO_Geometry_112YV2
SiPixelDynamicInefficiencyRcd - SiPixelDynamicInefficiency_PhaseI_Run3Studies_v2 SiPixelDynamicInefficiency_PhaseI_v9
is this intended?
Also given that presumably you want to keep it continuously on par with the regular one excepted the geometry tags, can you consider the autoCondModifiers
mechanism, see:
cmssw/Configuration/AlCa/python/autoCondModifiers.py
Lines 1 to 32 in 8d07392
## | |
## Append for 0T conditions | |
## | |
from Configuration.StandardSequences.CondDBESSource_cff import GlobalTag as essource | |
connectionString = essource.connect.value() | |
# method called in autoCond | |
def autoCond0T(autoCond): | |
ConditionsFor0T = ','.join( ['RunInfo_0T_v1_mc', "RunInfoRcd", connectionString, "", "2020-07-01 12:00:00.000"] ) | |
GlobalTags0T = {} | |
for key,val in autoCond.items(): | |
if "phase" in key: # restrict to phase1 upgrade GTs | |
GlobalTags0T[key+"_0T"] = (autoCond[key], ConditionsFor0T) | |
autoCond.update(GlobalTags0T) | |
return autoCond | |
def autoCondHLTHI(autoCond): | |
GlobalTagsHLTHI = {} | |
# emulate hybrid ZeroSuppression on the VirginRaw data of 2015 | |
FullPedestalsForHLTHI = ','.join( ['SiStripFullPedestals_GR10_v1_hlt', "SiStripPedestalsRcd", connectionString, "", "2021-03-11 12:00:00.000"] ) | |
MenuForHLTHI = ','.join( ['L1Menu_CollisionsHeavyIons2015_v5_uGT_xml', "L1TUtmTriggerMenuRcd", connectionString, "", "2021-03-11 12:00:00.000"] ) | |
for key,val in autoCond.items(): | |
if key == 'run2_hlt_relval': # modification of HLT relval GT | |
GlobalTagsHLTHI['run2_hlt_hi'] = (autoCond[key], FullPedestalsForHLTHI, MenuForHLTHI) | |
autoCond.update(GlobalTagsHLTHI) | |
return autoCond |
Given the diff of the two GlobalTags is: ]$ conddb diff 121X_mcRun3_2021_realistic_dd4hep_v1 120X_mcRun3_2021_realistic_dd4hep_v1
[2021-09-28 09:43:58,277] INFO: Connecting to pro [frontier://PromptProd/cms_conditions]
Record Label pro::121X_mcRun3_2021_realistic_dd4hep_v1 Tag pro::120X_mcRun3_2021_realistic_dd4hep_v1 Tag
------------------------------ ------ --------------------------------------------------------------------------------------- ---------------------------------------------
BeamSpotOnlineHLTObjectsRcd - BeamSpotOnlineObjects_Realistic25ns_13TeVCollisions_RoundOpticsLowSigmaZ_RunBased_v1_mc -
BeamSpotOnlineLegacyObjectsRcd - BeamSpotOnlineObjects_Realistic25ns_13TeVCollisions_RoundOpticsLowSigmaZ_RunBased_v1_mc -
DTRecoUncertaintiesRcd - - DTRecoUncertainties_v1_mc
MFGeometryFileRcd 120812 - MFGeometry_120812
MFGeometryFileRcd 130503 - MFGeometry_130503
SiPixelDynamicInefficiencyRcd - SiPixelDynamicInefficiency_PhaseI_Run3Studies_v2 SiPixelDynamicInefficiency_PhaseI_v9
SiPixelDynamicInefficiencyRcd 50ns - SiPixelDynamicInefficiency_13TeV_50ns_v2_mc
SiPixelTemplateDBObjectRcd 2T - SiPixelTemplateDBObject_2T_v3_mc
SiPixelTemplateDBObjectRcd 35T - SiPixelTemplateDBObject_35T_v3_mc
SiPixelTemplateDBObjectRcd 3T - SiPixelTemplateDBObject_3T_v3_mc
SiPixelTemplateDBObjectRcd 4T - SiPixelTemplateDBObject_4T_v3_mc excepted the |
-1 (fwiw) |
-alca
|
@cms-sw/alca-l2 @mmusich |
Hi @mmusich |
the change proposed here is just a regression, so either @cms-sw/alca-l2 prepares a new physical GlobalTag now fixing the problems this one has or some ad-hoc |
I have created 121X_mcRun3_2021_realistic_dd4hep_v2 which is now up to date (except the Geometry tags of course) with I will open a new PR ~now with the correct GT, so I think this can be closed. EDIT: I will handle the 120X case after that. |
@mmusich I have created also 120X_mcRun3_2021_realistic_dd4hep_v3 which is now in line with FYI @srimanob @cvuosalo: please note that there was and intermediate v2 (120X_mcRun3_2021_realistic_dd4hep_v2) which had: Since a new extended geometry is now available (https://hypernews.cern.ch/HyperNews/CMS/get/calibrations/4475.html) and the update requested by Marco is very urgent the "XMLFILE_Geometry_120DD4hepV4_Extended2021_mc" tag was not used in the new dd4ehp GT (120X_mcRun3_2021_realistic_dd4hep_v3) and we will deal with its update at a later moment. |
@francescobrivio, but in that case if we test PR #35373 with this Global Tag, there would be spurious differences coming from the ECal and HCal conditions, wouldn't it? |
You are right. I have created new GTs: 120X new GT is 120X_mcRun3_2021_realistic_dd4hep_v4 which has only the new BeamSpotOnline MC tag and the fixed SiPixelDynEff tag. All the rest is the same as v1 (see diff here), meaning that Ecal and Hcal tags have been reverted. 121X new GT is 121X_mcRun3_2021_realistic_dd4hep_v3 same description as above, see difference wrt v3 here. |
@francescobrivio thanks! Should I update this PR with the new 12_1_X GT? |
@tvami I am picking them up in my PR. You can close this one. |
PR description:
Following the comment #35373 (comment)
Bringing the DD4HEP GT up to date + adding the BeamSpot tags discussed in [1].
The diff wrt to the previous DD4HEP GT [2] contains
BeamSpotOnlineHLTObjectsRcd
andBeamSpotOnlineLegacyObjectsRcd
are supplied to Run 3 Simulation GlobalTags via the newly created tag:BeamSpotOnlineObjects_Realistic25ns_13TeVCollisions_RoundOpticsLowSigmaZ_RunBased_v1_mc
(same on both records) with the same parameters as the regular BeamSpotObjectsRcd tag (BeamSpotObjects_Realistic25ns_13TeVCollisions_RoundOpticsLowSigmaZ_RunBased_v1_mc
)[1] https://hypernews.cern.ch/HyperNews/CMS/get/calibrations/4474.html
[2] https://cms-conddb.cern.ch/cmsDbBrowser/diff/Prod/gts/121X_mcRun3_2021_realistic_dd4hep_v1/120X_mcRun3_2021_realistic_dd4hep_v1
if this PR is a backport please specify the original PR and why you need to backport that PR:
This is not a backport and no backport is needed
resolves cms-AlCaDB/AlCaTools#38