Skip to content

Integration of e/g CompositeID in 12.5.X#110

Merged
gpetruc merged 70 commits intop2l1pfp:L1PF_12_5_Xfrom
cerminar:composite_eleid_125X_v0
Apr 4, 2023
Merged

Integration of e/g CompositeID in 12.5.X#110
gpetruc merged 70 commits intop2l1pfp:L1PF_12_5_Xfrom
cerminar:composite_eleid_125X_v0

Conversation

@cerminar
Copy link

@cerminar cerminar commented Jan 27, 2023

PR description:

Integrate the new CompositeID for building TkElectrons.
The main changes are:

  • add the CompositeID BDT model to the e/g algo emulator
  • modify the TkObj, EmCaloObj and HadCaloObj dataformats to include the variables needed by the new model
  • change the CTL1 event data format and the packing/unpacking emulators accordingly (bump the CTL1 Event version)

This PR supersedes #104

Peter Eduard Meiring and others added 30 commits January 27, 2023 12:05
@cerminar
starting point composite ID emulator
c848045
@cerminar
cast floats to apfixed, run inference and compare output
171cc91
@cerminar
add scheleton to plug in CompositeID
ef982cf
@cerminar
incorporate compositeID as alternative to tkElectron, using skeleton …
7edb2b7 
…of previous commit
@cerminar
fix DR and add some verbosity
4e7c57f
@cerminar
equip to write decoded tracks to the event
2e89963
@cerminar
add calo coordinates to PFCandidates
55c4544
@cerminar
trying to move normalizations to different function
5d19697
@cerminar
implement two BDT WPs
62d8ade
@cerminar
fixes
3ac8427
@cerminar
Mapping of scores and WPs for consistent comparisons
0d4e16d
@cerminar
trivialize the CompositeCandidate interface
108deea
@cerminar
remove the cut on the CompositeID BDT and store the score in the TkEl…
e89f8fc 
…ectron object + some cosmetics
@cerminar
Remove pt10 cut from composite candidates
98932ee
@cerminar
remove duplicated files
525233e
@cerminar
remove duplicated files
f8e4cea
@cerminar
fix typo
42d7ce2
@cerminar
add missing headers
32aa4c7
@cerminar
first implementation of the new data-formats for CompositeID input fe…
bbc27da 
…atures
@cerminar
reorder the code for adding the cluster-shape variables used by the c…
0b28796 
…omposite ID to the HGC clusters
@cerminar
temporary changes to run emulator from firmware testbench
cd9bd45
@cerminar
make # of composite candidates per cluster configurabel
0934ff3
@cerminar
add parameter for # of composite candidates per cluster
885ca19
@cerminar
change to new model with max tree depth of 4
56ed6f7
@cerminar
add variales for composite ID to HGCAL raw dataformat
8df4f6a
@cerminar
Replace egamma BDT with model using no input scaling
c76cda6
@cerminar
Update egamma BDT to model trained on hw values. Use inversion fn fro…
b5ee230 
…m jets
@cerminar
fix typo
47d4350
@cerminar
switch to rounding for consisntency with HGC raw data format
5874bb5
@cerminar
fix assignment of cluster variables
c5b620f
@gpetruc gpetruc mentioned this pull request Mar 13, 2023
Closed
cerminar and others added 22 commits March 15, 2023 16:00
@cerminar
Merge pull request #13 from thesps/composite_eleid_125X_v0+cnf-fix
b84d29b 
Conifer exceptions for composite ID
@cerminar
code format
c7b819c
@cerminar
Handle BDT WPs and do some cosmetics
e75fcf2
@cerminar
code format and fix python
ac9470b
@cerminar
cosmetics
c5e1296
new model with srrtot rescaled, binned chi2 variables and without z0
8dfef6d
@cerminar
Merge pull request #14 from Pmeiring/composite_eleid_125X_v0_newmodel
c2ba610 
New model with srrtot rescaled, binned chi2 variables and without z0
@cerminar
fix srr conversion back to float
7cb2bd4
@cerminar
Fix constexpr
b9e3ae9
@cerminar
code-format
feb0b83
@thesps
Set working points. Don't transform WPs or BDT score
4f0231c
@cerminar
Merge pull request #15 from thesps/composite_eleid_125X_v0_wps
64e9f43 
Set working points. Don't transform WPs or BDT score
@cerminar
attempt to rounding problems in scaling srrtot
fb34575
@cerminar
workaround to propagate BDT score to Layer2 objects
b3dde57
@cerminar
remove uneeded header
f64aac1
@cerminar
make names of score variables more future proof
53081b5
@cerminar
obsolete comment
ce0ce6e
@thesps
Fix type used in 1/pT
73b2049
@cerminar
Merge pull request #16 from thesps/composite_eleid_125X_v0_wps
8eaa9df 
Fix type used in 1/pT
@cerminar
update the model: now built for using the HW input values
030489a
@cerminar
update tight WP
846567b
@cerminar
Update tight WP for 90%eff
8d77d91
@cerminar cerminar marked this pull request as ready for review April 3, 2023 20:01
@gpetruc gpetruc merged commit 7534859 into p2l1pfp:L1PF_12_5_X Apr 4, 2023
@gpetruc
Copy link
Collaborator

gpetruc commented Apr 5, 2023

I will roll back history to allow @cerminar to squash rebase following cms-l1t-offline#1096

@gpetruc
Copy link
Collaborator

gpetruc commented Apr 5, 2023

It's done, so now this PR is in fact again unmerged

@cerminar cerminar mentioned this pull request Apr 5, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpetruc gpetruc gpetruc left review comments

@thesps thesps thesps left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cerminar @gpetruc @thesps