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

Jump to bottom

Pr90x L1T developments #17509

Merged
merged 46 commits into from Feb 27, 2017
Merged

Pr90x L1T developments #17509

merged 46 commits into from Feb 27, 2017

Conversation

rekovic
Copy link
Contributor

@rekovic rekovic commented Feb 14, 2017 •
edited

90x with L1T developments up to l1t-integration-v91.10

  • New L1T data format HOTPDigiTwinMux
  • Switch to Stage2 for Phase2 --> reverted at the end
  • Calo Layer1 calibration constants for 2017 (change in constants in py file)
  • EG/Tau emulator uses different logic due to reconfigured LUTs which are now in synch with O2O Payloads. This allows to configure Calo emulator in consistent way from payloads and static py file. Need merged New EG/Tau LUTs with changed logic in parser - in synch with payloads. cms-data/L1Trigger-L1TCalorimeter#16
  • Some ports of missed improvements in when porting to 90x:
    • Performance improvements for the L1TMuonCaloSumProducer
    • Make L1TMuonCaloSumProducer multi-BX capable
    • Fixes in L1TNtuples

rekovic and others added 30 commits January 17, 2017 16:34
@rekovic
In 90x we don't have stage1L1Trigger defined in a full way in Configu…
6542bfe 
…ration.Eras.Modifier_stage1L1Trigger_cff.

It is rather simple. So comment out adding Trees in Ntuplizer for Stage1
for now.
@rekovic
Revert "In 90x we don't have stage1L1Trigger defined in a full way in…
09074f1 
… Configuration.Eras.Modifier_stage1L1Trigger_cff."

This reverts commit 6542bfe.
@rekovic
Fix typo in era-syntax chage introduced before.
21ea414
@rekovic
Configure L1T to run Stage2 (not Legacy) in Phase2 era.
d0d9a16
@rekovic
adding new dataformat of HO TPs in TwinMUX
4ab9fb9
@rekovic
adding new dataformat of HO TPs in TwinMUX
09ee0c4
@rekovic
adding new dataformat of HO TPs in TwinMUX
10e6eeb
@rekovic
modified to add HO TPs in twinmux
29694ad
@rekovic
modified to add HO TPs in Twinmux
606e5bf
@rekovic
modified to add HO TPs in TwinMUX
88e16f3
@thomreis @rekovic
Add HO variables to the L1 ntuples.
5e11f9b
@gomber
Merged l1t-integration-v90.0 from repository cms-l1t-offline
e516200
@gomber
2017 Layer1 ECAL + HBHE calibrations using MC
207ff97
@gomber
2017 Layer1 ECAL + HBHE calibrations using MC for HI too
c6b521b
@rekovic
Merge branch 'l1t-integration-CMSSW_9_0_0_pre2' into bhawna_Calibrati…
fe18632 
…ons2017
@rekovic
Merge branch 'bhawna_Calibrations2017' into l1t-integration-CMSSW_9_0…
1bfa4cd 
…_0_pre2
@rekovic
Add customisation customiseSettings.myL1TSettingsToCaloStage2Params_2…
a4db5c6 
…017_v1_1 and 2017_v1_1_HI to use 2017_v1_1 CaloLayer1 calibrations.
@rekovic
Rename new caloStage2Params_2017_v1_1 to 2017_v1_0_inconsitent, to re…
ef61c83 
…flect that these are only Layer1 calibrations updated, and we still need updated of Layer2 calibrations in these files.
@rekovic
Fix Calo hackConditions to use right caloParams previously blessed in…
6df2dff 
… 2016 (v3_3_1).
@davignon @rekovic
Update E/G and Tau emulators, LUTs and parameters for O2O, changes tr…
97e3120 
…ansparent to user
@davignon @rekovic
Minor fixes
a5dc0f5
@davignon @rekovic
Final fixes
0e554d4
@davignon @rekovic
Remove cout
08a747b
@davignon @rekovic
Small fix to caloStage2Params v3_3_1
8d7c7f0
@rekovic
Apply consistent changes of EG-Tau LUTs from PR446 also to the new 20…
c4dd1fa 
…17 caloParams of Layer1 constnatns.
@dinyar @rekovic
Added charge field to Generator dataformat and filling it in GenTreeP…
9926fc4 
…roducer.

Conflicts:
	L1Trigger/L1TNtuples/plugins/L1GenTreeProducer.cc
@tstreble @rekovic
Added new emulator variables for L1EG in L1Ntuples
4bf029c
@tstreble @rekovic
Remove print out
247ff18
@dinyar @rekovic
Fixing the GenTreeProducer.
2412102 
The L1AnalysisGeneratorDataFormat was never created, leading to a segfault when used.
Also made muon part functional again.

Conflicts:
	L1Trigger/L1TNtuples/plugins/L1GenTreeProducer.cc
@thomreis @rekovic
Add pA triggers
d9cff94
@smuzaffar
Copy link
Contributor

jenkins tests are running now. Note that cms-sw/cmsdist#2830 is already merged. So normal "please test" should also work

@cmsbuild
Copy link
Contributor

Pull request #17509 was updated. @cmsbuild, @rekovic, @mulhearn, @davidlange6 can you please check and sign again.

@rekovic
Copy link
Contributor Author

rekovic commented Feb 21, 2017

please test

@rekovic
Copy link
Contributor Author

rekovic commented Feb 21, 2017

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 21, 2017 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/17903/console Started: 2017/02/21 15:51

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_9_0_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @smuzaffar

@cmsbuild
Copy link
Contributor

+1
Tested at: 7875915
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-17509/17903/summary.html

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-17509/17903/summary.html

@davidlange6
Copy link
Contributor

+1

@rekovic assures me that the class with the static will be gone in a few weeks..

@cmsbuild cmsbuild merged commit 93a0e8e into cms-sw:CMSSW_9_0_X Feb 27, 2017
@rekovic
Copy link
Contributor Author

rekovic commented Feb 27, 2017

@davidlange6 Thanks. The integration of a new EMTF emulator code is forseen on that time scale.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidlange6 davidlange6 davidlange6 left review comments

Assignees
No one assigned
Labels
comparison-available fully-signed l1-approved orp-approved tests-approved
Projects
None yet
Milestone
CMSSW_9_0_X
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@rekovic @cmsbuild @smuzaffar @davidlange6 @thomreis @gomber @davignon @dinyar @tstreble @apana