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 to L1T Global for 2016 Menu (81X) #14282
Update to L1T Global for 2016 Menu (81X) #14282
Conversation
A new Pull Request was created by @mulhearn for CMSSW_8_1_X. It involves the following packages: DQM/L1TMonitor @perrotta, @cmsbuild, @dmitrijus, @Martin-Grunewald, @rekovic, @deguio, @fwyzard, @vanbesien, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks. cms-bot commands are list here #13028 |
please test |
The tests are being triggered in jenkins. |
-1 Tested at: c991b58 The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic: You can see the results of the tests here: I found follow errors while testing this PR Failed tests: RelVals AddOn
When I ran the RelVals I found an error in the following worklfows: runTheMatrix-results/134.911_RunSinglePh2015D+RunSinglePh2015D+HLTDR2_2016+RECODR2_2016reHLT+HARVESTDR2/step2_RunSinglePh2015D+RunSinglePh2015D+HLTDR2_2016+RECODR2_2016reHLT+HARVESTDR2.log1306.0 step2 runTheMatrix-results/1306.0_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15/step2_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15.log1330.0 step2 runTheMatrix-results/1330.0_ZMM_13+ZMM_13+DIGIUP15+RECOUP15+HARVESTUP15/step2_ZMM_13+ZMM_13+DIGIUP15+RECOUP15+HARVESTUP15.log135.4 step1 runTheMatrix-results/135.4_ZEE_13+ZEEFS_13+HARVESTUP15FS+MINIAODMCUP15FS/step1_ZEE_13+ZEEFS_13+HARVESTUP15FS+MINIAODMCUP15FS.log25202.0 step2 runTheMatrix-results/25202.0_TTbar_13+TTbar_13+DIGIUP15_PU25+RECOUP15_PU25+HARVESTUP15_PU25/step2_TTbar_13+TTbar_13+DIGIUP15_PU25+RECOUP15_PU25+HARVESTUP15_PU25.log
I found errors in the following addon tests: cmsRun /cvmfs/cms-ib.cern.ch/week0/slc6_amd64_gcc530/cms/cmssw/CMSSW_8_1_X_2016-04-26-2300/src/HLTrigger/Configuration/test/OnLine_HLT_PRef.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:29:31 2016-date Wed Apr 27 23:18:48 2016 s - exit: 16640 The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic: |
Conflicts: L1Trigger/L1TGlobal/interface/CorrelationTemplate.h L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h L1Trigger/L1TGlobal/plugins/GtProducer.cc L1Trigger/L1TGlobal/plugins/GtProducer.h L1Trigger/L1TGlobal/plugins/GtRecordDump.cc L1Trigger/L1TGlobal/plugins/TriggerMenuXmlParser.cc L1Trigger/L1TGlobal/src/CorrCondition.cc L1Trigger/L1TGlobal/src/CorrelationTemplate.cc L1Trigger/L1TGlobal/src/GtBoard.cc L1Trigger/L1TGlobal/src/L1TGlobalUtil.cc L1Trigger/L1TGlobal/src/MuCondition.cc L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromDigi.py L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromRAW.py L1Trigger/L1TGlobal/test/runGlobalFakeInputProducer.py
…wable window for uGT
@@ -24,6 +24,13 @@ def esproducers_by_type(process, *types): | |||
# pset.minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('HLTSiStripClusterChargeCutNone')) | |||
# return process | |||
|
|||
def customiseFor14282(process): |
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.
Because O2O is based on a new CondFormat, and L1T O2O is not yet ready, it seems some change to HLT configs is unavoidable. The only thing missing is this EmptyESSource.
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.
For 81X this is fine, but: This will not work online as online does not use this file!
We need to plan a proper migration for 80X.
Would the added ES source spoil things if already used without this PR?
Seems fine to add it, so I'll put it into the menu in ConfDB itself and update the HLT PR.
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.
No problem: now that #14201 is in 80X, you can immediately start producing the Empty source as here and everyone will ignore it until this PR is also back-ported to 80x.
+1 |
+1 |
Pull request #14282 was updated. @perrotta, @cmsbuild, @dmitrijus, @Martin-Grunewald, @rekovic, @deguio, @fwyzard, @vanbesien, @mulhearn, @davidlange6 can you please check and sign again. |
Minor update to remove debug flag from Makefile. |
l1t::GlobalObject value = (GlobalObject) - 1; | ||
|
||
bool found = false; | ||
for (int i = 0; l1TGtObjectStringToEnumMap[i].label && (!found); ++i) |
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.
much cleaner to replace the found statements by a continue instead the if statement
This brings the updated uGT software with bitwise correct emulation of correlation conditions.
It also calculates external conditions using the menu to determine the bit locations.
It uses new conditions, but in a way that allows the HLT configuration to either remain unchanged or update their configs to the new (temporary, pre-O2O) interface as they see fit.
I'll cleanup the history, leaving final product unchanged, while tests are running.
This replaces #14215.