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

PFEGamma Rewrite for CMSSW 70X #143

Merged
merged 29 commits into from Aug 22, 2013

Conversation

lgray
Copy link
Contributor

@lgray lgray commented Jul 19, 2013

This is the set of changes that implements the rewrite of PFEGammaAlgo that truly merges the first steps of electron and photon reconstruction in the GED.
Please keep in mind that this change does not yet affect PF, since pfElectron & pfPhoton algos are still the primary reconstructions for those objects.

It presently affects the physics performance its output electrons with |eta| > 2.0, since there is a problem with the pf-photon reconstruction that now affects electrons too. This will be fixed in a future pre-release as it requires retraining of an associated MVA and some tweaking of the algorithm. This does not affect the present performance of GsfElectrons and pfElectrons, as it is a parallel algorithm.

Computing performance-wise, this algorithm has the same timing as (pfElectronAlgo+pfPhotonAlgo).
It has been checked in an electron gun sample with pileup and uses very little time.

This was developed in parallel to:
#120 (comment)
and should not interfere too much.
The only problem may be the complete rewrite of PFEGammaAlgo, since there are some changes in PR-120 that operate on the old code base.

@nclopezo
Copy link
Contributor

Hi Lindsey,

Are you sure that these changes were done in top of CMSSW_7_0_X? not on 6_2_0_pre8? the pull request should not have the commit 57ba31a.

@lgray
Copy link
Contributor Author

lgray commented Jul 22, 2013

Hi,

These were made and tested in 620_pre8 and then that was merged with an up-to-date 70X.
The code in the main repo for this particular bit didn't really change from 620_pre8 to 700_preX.
The changes were then tested again in a 700_pre0 area with the merged 70X branch.
If it comes down to it, we can cherry-pick out my commits, or is there a better way forward?

I also have a cherry-picked set of commits that work in CMSSW_6_2_X, how would I go about sending in a request for that to be merged?

Thanks,
-Lindsey

@nclopezo
Copy link
Contributor

Hi Lindsey,

I think the easiest way is to cherry-pick your commits. Regarding your second question, you want to take some commits that work in CMSSW_6_2_X and make a pull request for 7_0_X? If yes, you can also start from 7_0_X and cherry-pick the changes.

@lgray
Copy link
Contributor Author

lgray commented Jul 22, 2013

Hi David,

Ok, this is fine.
For the second bit, I mean I have a backport from 7_0_X (actually the same
commits since the code is basically the same at this point) in a separate
branch that was cherry picked from 7_0_X into the 6_2_X branch.
https://github.com/lgray/cmssw/tree/CMSSW_6_2_0_pfegamma

Best,
-Lindsey

On Mon, Jul 22, 2013 at 6:44 AM, David Mendez notifications@github.comwrote:

Hi Lindsey,

I think the easiest way is to cherry-pick your commits. Regarding your
second question, you want to take some commits that work in CMSSW_6_2_X and
make a pull request for 7_0_X? If yes, you can also start from 7_0_X and
cherry-pick the changes.


Reply to this email directly or view it on GitHubhttps://github.com//pull/143#issuecomment-21338813
.

@nclopezo
Copy link
Contributor

Hi Lindsey,

Yes, you can create your pull request as usual. Also, you can know if there will be conflicts beforehand by trying to merge your branch (CMSSW_6_2_0_pfegamma) into the 6_2_X branch from the official cmssw repository. If the merge shows no conflicts, it should be ok.

@slava77
Copy link
Contributor

slava77 commented Jul 23, 2013

@lgray
So, is this pull request as of commit f62ccfb in the final state or should I expect any more changes?
It looks like at the minimum, the tutorial commit should be removed from this pull request.

@lgray
Copy link
Contributor Author

lgray commented Jul 23, 2013

Hi Slava,

Yes, this should be the final 'state' that we start doing all the
performance and physics work on.
We can remove the tutorial commit, it just came along for the ride. Is
there a nice way to remove disjoint commits like this?

-Lindsey

On Tue, Jul 23, 2013 at 4:55 AM, slava77 notifications@github.com wrote:

@lgray https://github.com/lgray
So, is this pull request as of commit f62ccfbhttps://github.com/cms-sw/cmssw/commit/f62ccfb585662b54dea3181100173c4657fe1b9ein the final state or should I expect any more changes?
It looks like at the minimum, the tutorial commit should be removed from
this pull request.


Reply to this email directly or view it on GitHubhttps://github.com//pull/143#issuecomment-21403992
.

@nclopezo
Copy link
Contributor

Hi,

I took pulled the commits of this branch on top of CMSSW_7_0_X_2013-07-25-1400 ran the unit tests and RelVals, all tests passed.

@lgray
Copy link
Contributor Author

lgray commented Jul 29, 2013

@nclopezo Is there anything further that needs to be done to merge this?

@nclopezo
Copy link
Contributor

Hi Lindsey,

According to the topic collector, it is pending signature by Reconstruction.

@nclopezo
Copy link
Contributor

Hi @slava77

Can you sign this pull request if everything is ok?

@slava77
Copy link
Contributor

slava77 commented Jul 30, 2013

Should be done some time later this week.
It's a pretty large change, need to check details.

On 7/30/13 10:35 AM, David Mendez wrote:

Hi @slava77 https://github.com/slava77

Can you sign this pull request if everything is ok?


Reply to this email directly or view it on GitHub
#143 (comment).


Vyacheslav (Slava) Krutelyov
TAMU: Physics Dept Texas A&M MS4242, College Station, TX 77843-4242
CERN: 42-R-027
AIM/Skype: siava16 googleTalk: slava77@gmail.com
(630) 291-5128 Cell (US) +41 76 275 7116 Cell (CERN)


@lgray
Copy link
Contributor Author

lgray commented Jul 30, 2013

Also, I'd like to add to the pull request changes to these modules to use getByToken.
This won't change any of Slava's validation work, so it can proceed in parallel.

@cmsbuild
Copy link
Contributor

The following categories have been signed by @slava77: Reconstruction

@cms-git-reconstruction

@lgray
Copy link
Contributor Author

lgray commented Aug 21, 2013

@slava77 The "Encountered the known GSF-SC splitting bug in PFBlockAlgo! We should really fix this!" is the manifestation of a bug in PF block algo where an ECAL driven GSF track is not in the same block as the SuperCluster that seeded it. This is obviously a bug, but it's not really been top priority to fix it.

If possible, I'd like to keep the warning around until we are able to fix the algorithm.

@ktf
Copy link
Contributor

ktf commented Aug 21, 2013

@lgray do you have an estimate about when you'll able to fix it? Moreover, do you have a reasonable test we can run which exercises it (i.e. a runTheMatrix workflow which touches it)?

@lgray
Copy link
Contributor Author

lgray commented Aug 21, 2013

@ktf This is something a bit deeper in particle flow, and I'm not sure of exactly where it is. I don't really have an estimate for when it would be fixed since it's a bit outside of my responsibility. It should remain a warning though since it is pathological behavior.

It randomly crops up in electron reconstruction, I don't have better coordinates than that.

@ktf
Copy link
Contributor

ktf commented Aug 21, 2013

Sorry, I meant about the part where you say:

Looking at the log file these tests don't really exercise the PFEGammaAlgo at all, as it's not part of PFBRECO yet

do you have a simple test which does that?

@lgray
Copy link
Contributor Author

lgray commented Aug 21, 2013

Hmm, if you have a test that does the full particle flow reco, starting from RecHits with all intermediate products, it should be a fine test.

@ktf
Copy link
Contributor

ktf commented Aug 21, 2013

@slava77 do we have such a test? Wouldn't if make sense to include it?

@slava77
Copy link
Contributor

slava77 commented Aug 21, 2013

We don't have standalone tests for many algorithms.
The complexity to set things up is usually too high
to provide a comprehensive test compared to that possible in a
full-chain setup.

If Lindsey can think of something feasible, it would help

    --slava

On 8/21/13 10:39 PM, Giulio Eulisse wrote:

@slava77 https://github.com/slava77 do we have such a test? Wouldn't
if make sense to include it?


Reply to this email directly or view it on GitHub
#143 (comment).


Vyacheslav (Slava) Krutelyov
TAMU: Physics Dept Texas A&M MS4242, College Station, TX 77843-4242
CERN: 42-R-027
AIM/Skype: siava16 googleTalk: slava77@gmail.com
(630) 291-5128 Cell (US) +41 76 275 7116 Cell (CERN)


@ktf
Copy link
Contributor

ktf commented Aug 22, 2013

Ok. Merging for now.

ktf added a commit that referenced this pull request Aug 22, 2013
@ktf ktf merged commit f85d1ef into cms-sw:CMSSW_7_0_X Aug 22, 2013
nclopezo added a commit to nclopezo/cmssw that referenced this pull request Nov 21, 2014
IB Pages: don't download config.map since now it is in cms-bot
gdimperi pushed a commit to gdimperi/cmssw that referenced this pull request Jun 21, 2015
Imported ATLAS PDFs from rev 896 of lhchcg
arizzi added a commit to arizzi/cmssw that referenced this pull request Aug 28, 2015
jbsauvan added a commit to jbsauvan/cmssw that referenced this pull request Oct 11, 2017
mariadalfonso added a commit to mariadalfonso/cmssw that referenced this pull request Dec 18, 2017
mandrenguyen pushed a commit to mandrenguyen/cmssw that referenced this pull request Mar 14, 2018
fwyzard pushed a commit to fwyzard/cmssw that referenced this pull request Aug 25, 2018
fwyzard pushed a commit to fwyzard/cmssw that referenced this pull request Aug 30, 2018
fwyzard pushed a commit to fwyzard/cmssw that referenced this pull request Aug 30, 2018
Apply clang-format reformatting to RiemannFit.h
fwyzard pushed a commit to fwyzard/cmssw that referenced this pull request Aug 30, 2018
Apply clang-format reformatting to RiemannFit.h
fwyzard pushed a commit to fwyzard/cmssw that referenced this pull request Aug 30, 2018
Apply clang-format reformatting to RiemannFit.h
cmsbuild pushed a commit that referenced this pull request Nov 18, 2020
cmsbuild pushed a commit that referenced this pull request Feb 10, 2021
slava77 pushed a commit to slava77/cmssw that referenced this pull request Oct 9, 2021
Validation feature additions: clone of PR cms-sw#143
sarafiorendi pushed a commit to sarafiorendi/cmssw that referenced this pull request Jun 10, 2022
* 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.
sarafiorendi pushed a commit to sarafiorendi/cmssw that referenced this pull request Jun 13, 2022
* 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.
cmsbuild pushed a commit that referenced this pull request Oct 13, 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 cms-L1TK#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
cramonal pushed a commit to cramonal/cmssw that referenced this pull request Nov 14, 2022
Include commit from fw_synch_210611 (cms-sw#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 (cms-sw#89)

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

Update geometry and MC files (cms-sw#91)

L1 tk dev 12 0 0 pre4 hph (cms-sw#94)

* First Commit

* Code Format

* Fix Typo

* Naming Rule

* Chris' 2nd Comment

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

Reduced configuration (cms-sw#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 (cms-sw#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 (cms-sw#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 (cms-sw#94)" (cms-sw#95)

This reverts commit 3b2f139.

fix getPhiRes function (cms-sw#97)

New KF (hand merged with L1TK-dev-12_0_0_pre4) (cms-sw#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 (cms-sw#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 cms-sw#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 cms-sw#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. (cms-sw#99)

* quick fix of KFin EnableTruncation option.

* both, enable and disabel truncation fixed.

Fix to KF out for multiple KF workers (cms-sw#100)

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

Fixed clang errors (cms-sw#104)

several bug fixes. (cms-sw#108)

* bug fixes.

* code format

* GlobalTag update.

* forgot a bug fix in AnalyzerDemonstrator.

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

* count of TTCluster added to endjob summary printout.

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

Added git CI (cms-sw#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 (cms-sw#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 (cms-sw#116)

Channel Assignment TrackBuilder output Tracks + Stubs and InputRouter input Stubs (cms-sw#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 (cms-sw#118)

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

Minor improvements (cms-sw#120)

* Minor improvements

* Added comments

Dropped MC to 104 iterations (cms-sw#123)

- Full agreement with HLS

Fixing integer range check in FPGAWord. (cms-sw#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 (cms-sw#127)

* Fix KF Track Parameter Digitization

* Add comments to Track.h

summer chain demonstrator (cms-sw#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. (cms-sw#128)

MP HLS agreement fixes (cms-sw#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 (cms-sw#130)

Fix "storeTrackBuilderOutput_" typo

Update Setup.cc (cms-sw#129)

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

Update LayerEncoding.h (cms-sw#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 (cms-sw#132)

* Made eventProcessor a member of the producer.

* Output TC tables in the reduced config.

MP cleanup 220208 + MC fix (cms-sw#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 (cms-sw#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 (cms-sw#135)

TBout analyzer (cms-sw#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 (cms-sw#124)

* Fix d0 bias

* Documented KF maths and variables

Ian tidy up (cms-sw#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 (cms-sw#142)

DTC phi range hard-wired constants removed (cms-sw#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 (cms-sw#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 (cms-sw#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 (cms-sw#148)

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

Update StubAssociation.cc (cms-sw#145)

as requested a separate PR.

Update github_CI.yml

Fixed incorrect comment

KFin emulator (cms-sw#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 (cms-sw#151)

* Fix rare crash in KF

* Fixed line break

Removed obsolete parameter. (cms-sw#152)

quick ntuple fix (cms-sw#153)

* L1TrackNtupleMaker_cfg.py updated reduced workflow.

* further cleaning.

Update L1TrackNtupleMaker_cfg.py

fixed typo

Removal of dependencies of ChannelAssignement (cms-sw#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 (cms-sw#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 (cms-sw#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 (cms-sw#161)

* update chi2 bins

* change chi2 variables to be per dof

Ian L1TStub bug fix (cms-sw#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 (cms-sw#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 (cms-sw#166)

* Added tilted and endcap module ring no. to L1TStub

* auto formatting

Fix stub order bug (cms-sw#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 (cms-sw#168)

Updated data/ files

tweak

Reduce L1 tracking CPU (cms-sw#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
dabrahamyan pushed a commit to dabrahamyan/cmssw that referenced this pull request Oct 26, 2023
* 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.
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