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.

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

Merged

Conversation

mulhearn
Copy link
Contributor

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.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mulhearn for CMSSW_8_1_X.

It involves the following packages:

DQM/L1TMonitor
DataFormats/L1TGlobal
EventFilter/L1TRawToDigi
HLTrigger/HLTfilters
L1Trigger/L1TCommon
L1Trigger/L1TGlobal

@perrotta, @cmsbuild, @dmitrijus, @Martin-Grunewald, @rekovic, @deguio, @fwyzard, @vanbesien, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@mulhearn
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 27, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/12681/console

@cmsbuild
Copy link
Contributor

-1

Tested at: c991b58

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
c991b58
54efe54
3df37a6
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-14282/12681/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-14282/12681/git-merge-result

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-14282/12681/summary.html

I found follow errors while testing this PR

Failed tests: RelVals AddOn

  • RelVals:

When I ran the RelVals I found an error in the following worklfows:
134.911 step2

runTheMatrix-results/134.911_RunSinglePh2015D+RunSinglePh2015D+HLTDR2_2016+RECODR2_2016reHLT+HARVESTDR2/step2_RunSinglePh2015D+RunSinglePh2015D+HLTDR2_2016+RECODR2_2016reHLT+HARVESTDR2.log
1306.0 step2
runTheMatrix-results/1306.0_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15/step2_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15.log
1330.0 step2
runTheMatrix-results/1330.0_ZMM_13+ZMM_13+DIGIUP15+RECOUP15+HARVESTUP15/step2_ZMM_13+ZMM_13+DIGIUP15+RECOUP15+HARVESTUP15.log
135.4 step1
runTheMatrix-results/135.4_ZEE_13+ZEEFS_13+HARVESTUP15FS+MINIAODMCUP15FS/step1_ZEE_13+ZEEFS_13+HARVESTUP15FS+MINIAODMCUP15FS.log
25202.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
  • AddOn:

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
cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PRef_DATA.root --fileout file:RelVal_Raw_PRef_DATA_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:29:31 2016-date Wed Apr 27 23:18:48 2016 s - exit: 16640
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_HIon.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:29:12 2016-date Wed Apr 27 23:18:49 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=HeavyIons -n 10 --conditions auto:run2_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016,Run2_HI --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:29:12 2016-date Wed Apr 27 23:18:49 2016 s - exit: 16640
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_GRun.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:34:09 2016-date Wed Apr 27 23:18:52 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_MC.root --fileout file:RelVal_Raw_GRun_MC_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:34:09 2016-date Wed Apr 27 23:18:52 2016 s - exit: 16640
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=False globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:33:03 2016-date Wed Apr 27 23:18:56 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PRef_MC.root --fileout file:RelVal_Raw_PRef_MC_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:33:03 2016-date Wed Apr 27 23:18:56 2016 s - exit: 16640
cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi --conditions auto:run2_mc --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@relval2016,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot NominalCollision2015 --era Run2_2016 --magField 38T_PostLS1 : FAILED - time: date Wed Apr 27 23:25:05 2016-date Wed Apr 27 23:19:01 2016 s - exit: 16640
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_PIon.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:29:17 2016-date Wed Apr 27 23:19:06 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:29:17 2016-date Wed Apr 27 23:19:06 2016 s - exit: 16640
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_HIon.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:32:55 2016-date Wed Apr 27 23:19:13 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --mc --scenario=HeavyIons -n 10 --conditions auto:run2_mc_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016,Run2_HI --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_MC.root --fileout file:RelVal_Raw_HIon_MC_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:32:55 2016-date Wed Apr 27 23:19:13 2016 s - exit: 16640
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_GRun.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:30:31 2016-date Wed Apr 27 23:19:25 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_25ns --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:30:31 2016-date Wed Apr 27 23:19:25 2016 s - exit: 16640
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_PIon.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Wed Apr 27 23:33:00 2016-date Wed Apr 27 23:19:34 2016 s - exit: 16640
cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_MC.root --fileout file:RelVal_Raw_PIon_MC_HLT_RECO.root : FAILED - time: date Wed Apr 27 23:33:00 2016-date Wed Apr 27 23:19:34 2016 s - exit: 16640

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
c991b58
54efe54
3df37a6
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-14282/12681/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-14282/12681/git-merge-result

puigh and others added 13 commits April 28, 2016 00:21
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
@@ -24,6 +24,13 @@ def esproducers_by_type(process, *types):
# pset.minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('HLTSiStripClusterChargeCutNone'))
# return process

def customiseFor14282(process):
Copy link
Contributor Author

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.

Copy link
Contributor

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.

Copy link
Contributor Author

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.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@Martin-Grunewald
Copy link
Contributor

+1

@mulhearn
Copy link
Contributor Author

+1

@cmsbuild
Copy link
Contributor

Pull request #14282 was updated. @perrotta, @cmsbuild, @dmitrijus, @Martin-Grunewald, @rekovic, @deguio, @fwyzard, @vanbesien, @mulhearn, @davidlange6 can you please check and sign again.

@mulhearn
Copy link
Contributor Author

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)
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants