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 track quality chi2 bins #161

Merged
merged 2 commits into from
May 30, 2022
Merged

Update track quality chi2 bins #161

merged 2 commits into from
May 30, 2022

Conversation

cgsavard
Copy link

@cgsavard cgsavard commented May 26, 2022

PR description:

This PR updates the chi2rz, chi2rphi, and bendchi2 binnings used by the track quality classifier. These binning were proposed by Emily MacDonald and are the current accepted bins used by the L1TK group, and I have previously shown here that updating these bins in the track quality classifier does not effect the classifier performance. This PR is correlated to a PR made to cms-data to update the default classifier to one trained on the new binning.

PR validation:

I have checked that the python implementation and CMSSW implementation of the new classifier with these chi2 bin changes have matching output. I have also verified that the overall performance of this new classifier almost exactly matches the performance of the old classifier in CMSSW, just like what I showed in the python implementations here.

@tomalin
Copy link
Collaborator

tomalin commented May 26, 2022

TrackQuality gets some cfg params such as "maxZ0" from python cfg. So why does it hard-wire the chi2 binning?

Though I assume the chi2 bins here are the same as the ones in https://github.com/cms-sw/cmssw/blob/5bc18d0ced1478749b1e9364a351734e3b973f01/DataFormats/L1TrackTrigger/interface/TTTrack_TrackWord.h#L100 , where they are also hard-wired.

It's horrible to have the same hard-wired numbers in two different places, and need to keep them in phase. Perhaps they should be moved to a header file, containing only these constants, which both TTTrack_TrackWord.h and TrackQuality can include? (In which case it would have to go in DataFormats/L1TrackTrigger/ since DataFormats/ can't depend on L1Trigger/.

Not sure.

@tomalin
Copy link
Collaborator

tomalin commented May 26, 2022

Since your PR to cms-data has not yet been merged, the git CI running here is using the old cms-data files. But it's tracking efficiency looks unchanged. Is this a surprise?

Copy link

@Chriisbrown Chriisbrown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No comments from me, unless we want to do a more general way of setting the chi2 bins to these bins in our entire code and not just for track quality?

@cgsavard
Copy link
Author

I agree that it would be nice to have the bins hard-wired elsewhere and we can just pull from there. I don't know where is best but am open to any suggestions.

What is the tracking efficiency a measure of? Because I don't think track quality is actually currently being used in that definition so a change in track quality shouldn't change that. Track quality is only being calculated and put in the ntuple at the moment.

@tomalin
Copy link
Collaborator

tomalin commented May 27, 2022

Why is TrackQuality digitizing the chi2 itself at https://github.com/cms-L1TK/cmssw/blob/update_tq/L1Trigger/TrackTrigger/src/TrackQuality.cc#L127 , rather than calling aTrack.get_chi2XYBits() ? Wouldn't this eliminate the need to hard-wire the chi2 bins inside TrackQuality?

@cgsavard
Copy link
Author

cgsavard commented May 30, 2022

Why is TrackQuality digitizing the chi2 itself at https://github.com/cms-L1TK/cmssw/blob/update_tq/L1Trigger/TrackTrigger/src/TrackQuality.cc#L127 , rather than calling aTrack.get_chi2XYBits() ? Wouldn't this eliminate the need to hard-wire the chi2 bins inside TrackQuality?

This is a great idea. There are two issues I see at the moment. First off, the bins defined in the TTTrack word are not the newest binning https://github.com/cms-L1TK/cmssw/blob/L1TK-dev-12_0_0_pre4/DataFormats/L1TrackTrigger/src/TTTrack_TrackWord.cc#L383-L421. Should I update these bins as well or is there a reason why these are still the old bins? This would also require updating the TTTrack word to pass through the chi2 variables pdof. The other issue is that there is not a function to get the chi2rz bins, but that can easily be created as well.

@tomalin
Copy link
Collaborator

tomalin commented May 30, 2022

Why is TrackQuality digitizing the chi2 itself at https://github.com/cms-L1TK/cmssw/blob/update_tq/L1Trigger/TrackTrigger/src/TrackQuality.cc#L127 , rather than calling aTrack.get_chi2XYBits() ? Wouldn't this eliminate the need to hard-wire the chi2 bins inside TrackQuality?

This is a great idea. There are two issues I see at the moment. First off, the bins defined in the TTTrack word are not the newest binning https://github.com/cms-L1TK/cmssw/blob/L1TK-dev-12_0_0_pre4/DataFormats/L1TrackTrigger/src/TTTrack_TrackWord.cc#L383-L421. Should I update these bins as well or is there a reason why these are still the old bins? This would also require updating the TTTrack word to pass through the chi2 variables pdof. The other issue is that there is not a function to get the chi2rz bins, but that can easily be created as well.

  1. You do not need to update the chi2 binning in TTTrack_TrackWord, since that update is already done in the official CMSSW release. https://github.com/cms-sw/cmssw/blob/master/DataFormats/L1TrackTrigger/interface/TTTrack_TrackWord.h#L99 . I think the digitized chi2rphi value is available in the CMSSW release, perhaps at https://github.com/cms-sw/cmssw/blob/master/DataFormats/L1TrackTrigger/interface/TTTrack_TrackWord.h#L207 (I've not checked). If so, then we should add my suggestion after I've rebased cms-L1TK to latest CMSSW release.

Copy link
Collaborator

@tomalin tomalin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm approving this, but after we rebase to the latest CMSSW, the digitized chi2 values should be obtained directly from the TTTrack class, avoiding the need to calculate them in the TrackQuality and hence eliminating nasty hard-wired numbers.

@tomalin tomalin merged commit b9d6929 into L1TK-dev-12_0_0_pre4 May 30, 2022
@cgsavard cgsavard deleted the update_tq branch June 3, 2022 14:24
tomalin pushed a commit that referenced this pull request Jul 8, 2022
* update chi2 bins

* change chi2 variables to be per dof
tomalin pushed a commit that referenced this pull request Jul 8, 2022
Include commit from fw_synch_210611 (#86)

* Fixes to remove unused TPROJ memory and fix problem with VMR LUT in L6

* apply code-formats and code-checks

Co-authored-by: Anders <aryd@cern.ch>

Update Settings.h (#89)

TE truncation reduced from 108 to 107, as requested in #85

Update geometry and MC files (#91)

L1 tk dev 12 0 0 pre4 hph (#94)

* First Commit

* Code Format

* Fix Typo

* Naming Rule

* Chris' 2nd Comment

Co-authored-by: Jack Li <jingyan.li@cern.ch>

Reduced configuration (#87)

* Modified code to support a reduced config (the summer chain)

* Updates from running code checker.

* Reverted to standard configuration options.

* Reverted to standard configuration options.

* Settings used to make TV for event 1912

* Reverted to default settings for PR.

* Made some of the TV changes in issue 85, and created output TVs 2021-08-04-TTbar-SimpleFWHarmonization.

* Clarified comments

* Include commit from fw_synch_210611 (#86)

* Fixes to remove unused TPROJ memory and fix problem with VMR LUT in L6

* apply code-formats and code-checks

Co-authored-by: Anders <aryd@cern.ch>

* Returning to standard config.

* Returning to standard config.

* Returning to standard config.

* Update geometry and MC files (#91)

* Included reduced variable in non-reduced setups for consistency.

* Updated settings to match default configuration rather than HLS compatibility

* Added comment about reduced config files

Co-authored-by: Tova Holmes <tholmes@cern.ch>
Co-authored-by: Louise Skinnari <louise.skinnari@cern.ch>
Co-authored-by: Anders <aryd@cern.ch>
Co-authored-by: Ian Tomalin <ian.tomalin@stfc.ac.uk>

Revert "L1 tk dev 12 0 0 pre4 hph (#94)" (#95)

This reverts commit 3b2f139.

fix getPhiRes function (#97)

New KF (hand merged with L1TK-dev-12_0_0_pre4) (#88)

* initial commit.

* renamed KFout producer to TT producer

* KFout producer and analyzer added. Producer is so far only a skeleton.

* small includings fix.

* quick TTTypes fix

* comments for ian

* initial commit.

* renamed KFout producer to TT producer

* KFout producer and analyzer added. Producer is so far only a skeleton.

* small includings fix.

* quick TTTypes fix

* comments for ian

* small script modifications

* little ntuple maker mod.

* readding fake fit config interface.

* track tigger association added, not in the best way.

* tttrack associator added as it should be.

* option to use TTStubAssMap to associate TTTracks with TPs removed and output module cleaned up.

* Added Hybrid_NewKF

* Added comment

* Update L1TrackNtupleMaker_cfg.py

fix typo made by Ian

* added tmtt costumization and fakefit option to tracklet config

* data format fix

* README filled and Configuration.StandardSequences.L1TrackTrigger_cff removed from run scripts.

* associateFinal added to StubAssociation.

* Update README.md

English corrections

* minor changes in various comments.

* KF 7 layer tracking debugged and defaulted.

* turned supported geometry white list into a black list.

* Cbrown kfout (#93)

* Initial Commit for Kfout emulator

* with ttTrackRefMap back in

* Correct link structure and eta routing

* No more print statements

* Remove print statements

* Merge changes in kfout producer

* Thomas' comments #1

* Thomas' comments #2

* Change dphi/dz LUT scaling to num of bits

* Fix bug to phi sector correction

* sync with FW fix

* Commit of distribution server for clock accuracy

* Fix to undefined operation on numLinkTracks

* Fix to numLinkTracks #2

Co-authored-by: Ian Tomalin <ian.tomalin@stfc.ac.uk>
Co-authored-by: Chriisbrown <41648127+Chriisbrown@users.noreply.github.com>

fix of KFin EnableTruncation option. (#99)

* quick fix of KFin EnableTruncation option.

* both, enable and disabel truncation fixed.

Fix to KF out for multiple KF workers (#100)

code-format, llvm-ccdb and clang-tidy (#103)

Fixed clang errors (#104)

several bug fixes. (#108)

* bug fixes.

* code format

* GlobalTag update.

* forgot a bug fix in AnalyzerDemonstrator.

add number of TTCluster to DTC analzyer end job summary (#109)

* count of TTCluster added to endjob summary printout.

* rebase to L1TK-dev-12_0_0_pre4 and code format.

Added git CI (#106)

* Added git CI

* Run CI on PR to any branch

* Make L1TRKALGO configurable

* tweak

* Added script to skim MC datasets for git CI

* Remove L1TRKALGO option

* Gave CI more sensible name

Update github_CI.yml

temporary debug check

Memory cleanup (#98)

* Cleanup of writing leading 0x in memories

* Cleanup of obsolote comment

* Change order of input links to match VMRouter expectation

* Add support for debugging

* Remove one pipelining step to match HLS

* Determine the PS vs 2S in disks same way as we do in HLS

* Some cleanup

* Correction to LUT code

* Comment out printout

* Ran scram build code-format

* Update comment about IR steps

* Cleanup of obsolote comment

* Remove one pipelining step to match HLS

* Determine the PS vs 2S in disks same way as we do in HLS

* Correction to LUT code

* Ran scram build code-format

phiprojder bug fix (#116)

Channel Assignment TrackBuilder output Tracks + Stubs and InputRouter input Stubs (#110)

* track builder channel upgraded to assign stubs to channel.

* code format

* readded missing pieces.

* renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping

* name change in L1Trigger/TrackFindingTracklet/python/ProducerKF_cff.py

* bug fix

* name change of config parameter

* code-format

* namespace change and consitency check added.

* addressing ians comments

* addressing ians comments

TP_minPt and binning fix (#118)

Updated VMR maxstep to 107 (originally 108) to match firmware (#119)

Minor improvements (#120)

* Minor improvements

* Added comments

Dropped MC to 104 iterations (#123)

- Full agreement with HLS

Fixing integer range check in FPGAWord. (#125)

* fixing integer range check in FPGAWord.

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* Slight rewerite to use <= instead < and not do subtracktion

* Fix < to <= to avoid overflow by one

Co-authored-by: Brent R. Yates <brentRyates@gmail.com>
Co-authored-by: Anders <aryd@cern.ch>

Fix KF Track Parameter Digitization (#127)

* Fix KF Track Parameter Digitization

* Add comments to Track.h

summer chain demonstrator (#111)

* track builder channel upgraded to assign stubs to channel.

* renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping

* ProducerIRin and ProducerTBout added, Demonstrator configured by default to use them.

* rebase with tschuh_TrackBuilder and code format

* StreamsStub added as EDProduct of L1FPGATrackProducer

* code format.

* convert only finally accepted Tracklets to StreamsStub.

* undo last commit, adding trackword ed product and adding gaps to stubs and tracks to get clock accurate emulation.

* swap bugfix.

* rebased and name change of TrackBuilderChannel adopted.

* fixing rebase errors.

* fixing more rebase errors.

* fixing even more rebase errors.

* first comments from Ian.

* code format

* second comments from Ian.

* code format

* Ians third comments.

* Ians 4th comments.

* small merge error fix

* Added comment

* Refine comment

* miniscule comment change

Co-authored-by: Ian Tomalin <ian.tomalin@stfc.ac.uk>

Fixed comparisons to avoid overflow. (#128)

MP HLS agreement fixes (#126)

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* Fixes to get agreement with HLS code

* fixing integer range check in FPGAWord.

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* Slight rewerite to use <= instead < and not do subtracktion

Co-authored-by: Brent R. Yates <brentRyates@gmail.com>
Co-authored-by: Thomas Schuh <thomas.schuh@stfc.ac.uk>

Update Settings.h (#130)

Fix "storeTrackBuilderOutput_" typo

Update Setup.cc (#129)

Change trackerDTC::Setup to tt::Setup . (Bug fix)

Update LayerEncoding.h (#131)

* Update LayerEncoding.h

Add function to access layer corresponding to given DTC channel. (Needed by L1Trk Future CMSSW code).

* Update LayerEncoding.h

response to comment + fix to previous commit

* Update LayerEncoding.cc

Initialize data member numDTCsPerRegion_

* Update LayerEncoding.h

added comment

* Update LayerEncoding.h

clarified comment

Test vector fixes (#132)

* Made eventProcessor a member of the producer.

* Output TC tables in the reduced config.

MP cleanup 220208 + MC fix (#133)

* fixing integer range check in FPGAWord.

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* Slight rewerite to use <= instead < and not do subtracktion

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* Some updates to MP to converge with HLS code

* Further clenup of the MP code

* More cleanup -removal of hardcoded numbers

* Further cleanup

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* fixing integer range check in FPGAWord.

* Fixing `zmatchcut_` for L1 and L2

* Undo the -0.06 in Settings.h as there is a cleaner fix to the overflows

* Slight rewerite to use <= instead < and not do subtracktion

* Some updates to MP to converge with HLS code

* Further clenup of the MP code

* More cleanup -removal of hardcoded numbers

* Further cleanup

* Fixes to the MC to allow full agreement with HLS

* Added a comment header and pipeline description

* Added comment about MC iterations

Co-authored-by: Thomas Schuh <thomas.schuh@stfc.ac.uk>
Co-authored-by: Anders <aryd@cern.ch>

customize L1FPGATrackProducer (#112)

* track builder channel upgraded to assign stubs to channel.

* renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping

* StreamsStub added as EDProduct of L1FPGATrackProducer

* code format.

* convert only finally accepted Tracklets to StreamsStub.

* undo last commit, adding trackword ed product and adding gaps to stubs and tracks to get clock accurate emulation.

* swap bugfix.

* rebased and name change of TrackBuilderChannel adopted.

* fixing rebase errors.

* fixing more rebase errors.

* fixing even more rebase errors.

* track builder channel upgraded to assign stubs to channel.

* renamed TrackBuilderChannel to ChannelAssignment now also containing DTC to IR mapping

* StreamsStub added as EDProduct of L1FPGATrackProducer

* rebased and name change of TrackBuilderChannel adopted.

* criteria to build track updated, TBout works now for all seed types.

* StreamsStub added as EDProduct of L1FPGATrackProducer

* use customize function to manipulate L1FPGATrackProducer configuration

* rebase to tschuh_SummerChain, customize updated to set EmulateTB, demonstrator counts now the amount of passed events.

* initial counter values fixed.

* rebase and reduce config customize function extended

* fixing merge errors.

* Ians first comments.

* rebase and Ians secodn comments.

* Update ChannelAssignment_cfi.py

* Ians third comments.

* Ians fourth comments.

Co-authored-by: Ian Tomalin <ian.tomalin@stfc.ac.uk>

Update Customize_cff.py (#135)

TBout analyzer (#114)

* Reviewed.

* one merge error fixed, but a problem remains

* fixed second error.

* Update AnalyzerTBout.cc

Co-authored-by: Ian Tomalin <ian.tomalin@stfc.ac.uk>

Fix d0 bias (#124)

* Fix d0 bias

* Documented KF maths and variables

Ian tidy up (#137)

* Added function to convert ATCA slot to DTC name

* Moved dtcname to Settings.h and put underscore at end of settings

* Declared functions const if dont change data members

* Added comments to clarify params overridden by python cfg

* Added comment

* Removed duplicate function TCNAme

disable truncation for displaced tracking (#142)

DTC phi range hard-wired constants removed (#141)

* Added function to get num ATCA slots

* Added comment

* Automatically calc DTC phi ranges

* Improved comments

* Added comment

* Simplified phi offset calc

* Fixed missing half-sector rotation bug

* Added comments

* Changed dtcphirange.txt to numbers instead of C++ code

Displaced tracking phi fix (#147)

* usephiapprox on modify NtupleMaker cfg for grid jobs

* added displaced terms to phi calculation in TrackletCalculatorDisplaced

* reverting changes unrelated to phi correction

Jack hph (#146)

* First Commit

* Code Format

* Fix Typo

* Naming Rule

* Chris' 2nd Comment

* Fixing Bug

* Ian's 1st Comments

* Ian's 2nd Comment: Remove SensorModule Class

* Ian's 3rd comment: Get rid of magic numbers

* Ian's 4th Comment: Add more clarification

* Code-check

Co-authored-by: Jack Li <jingyan.li@cern.ch>

Adding new features to ntuplemaker (#148)

Co-authored-by: Jack Li <jingyan.li@cern.ch>

Update StubAssociation.cc (#145)

as requested a separate PR.

Update github_CI.yml

Fixed incorrect comment

KFin emulator (#143)

* initial commit.

* move ProducerTBout.cc from test to plugins

* KFin fully debugged.

* Producer TBout added to NTupleMaker

* chriss change to KFout

* Louises first comments.

* fixing rebase errors.

* KF reintegrated, stub residuals are not bit accurate yet.

* code format.

* added 1k ttbar@0PU events for internal kf maths tuning.

* Track builder r residual debug and KF digi function corrected.

* bug in z residual base fixed.

* Ians first comments.

* Ians secodn comments.

* recalculate z ressid from TTStubRefs, use TTStubRefs for seed stubs instead of fake stubs.

* Ians third comment.

* fixed comments TTDTC::Frames -> tt::Frames

* old stub uncertainty caclulation re-enabled.

* Ians 4th comments.

* code-checks.

* tilted stub z uncertainty fixed. not yet debugged against f/w.

* set max layers a kff adds to a track to 7 as we did in the past, no clue why it is 4 again ...

* agrrement with f/w, ready to merge.

Fix rare crash in KF (#151)

* Fix rare crash in KF

* Fixed line break

Removed obsolete parameter. (#152)

quick ntuple fix (#153)

* L1TrackNtupleMaker_cfg.py updated reduced workflow.

* further cleaning.

Update L1TrackNtupleMaker_cfg.py

fixed typo

Removal of dependencies of ChannelAssignement (#144)

* This code includes a new implementation of the Track and Stub Streams generation. The old code is still running in parallel.

* Remove code for old calculation of stream data - keeping the debug print out in this commit

* Remove debud printout

* added numSeedTypes function

* rebased Anders branch

* rebased Anders branch

* tidied up Anders branch

* tidied up Anders branch

* ran scram b code-format

* Thomas PR review comments

* max num of proj layers added to channel assignment.

* merge with Thomas commit

Co-authored-by: Ian Tomalin <ian.tomalin@stfc.ac.uk>
Co-authored-by: Thomas Schuh <thomas.schuh@stfc.ac.uk>

Ran second auto formatter tool (#154)

* Ran second auto formatter tool

* tweak

Update ProducerSetup_cfi.py

correct comment in code

Update Customize_cff.py

add comment in code

Tracklet Processor Displaced (#159)

* Tracklet Processor Displaced

* code-format

* code-format again

* remove unnecessary comments and add explanation for header file

* implement more comments

* remove more magic numbers

Update track quality chi2 bins (#161)

* update chi2 bins

* change chi2 variables to be per dof

Ian L1TStub bug fix (#160)

* Ran second auto formatter tool

* tweak

* Fixed bug in L1TStub::isTilted function

* Update L1TrackNtupleMaker_cfg.py

Removed unnecessary line

* Update L1FPGATrackProducer.cc

Fix incorrect tiltedBarrel variable in endcap

rebase and scram b code-format

ran formatter tool 2

tweak

Update chi2 tq bins (#165)

* change binning method used by track quality

* clean TrackQuality class to only create features used by default classifier

* ran scram b -j8 clang-format

Added tilted and endcap module ring no. to L1TStub (#166)

* Added tilted and endcap module ring no. to L1TStub

* auto formatting

Fix stub order bug (#164)

* fix to stub order bug

* fix to stub order bug

* Updated to one::EDAnalyzer

* ran scram b code format

* Fixed bug for combined modules

Update MatchCalculator.cc

Added comment.

rebase git conflict resolution

rebase git conflict resolution

rebase git conflict resolution

Remove obsolete FWCore functions (#168)

Updated data/ files

tweak

Reduce L1 tracking CPU (#172)

* Reduce CPU use

* Reduce CPU

* Reduce CPU

* Added track quality plots

* updated geom

* Trivial variable renames

* Moved RunTime call to constructor to save CPU

* Removed debug calcs from VarBase::calculate

* Optimised a bit more VarBase::calculate

* optimise CPU further

* auto format

Update L1TrackNtupleMaker.cc

Restored consumes<TrackingVertex>. Not required, but keeps CPU expensive loading of TrackingVertexCollection where it was to make CPU comparisons easier.

Removed CI .yml files & data/ directory to allow PR to central CMSSW
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants