customize L1FPGATrackProducer #112

tschuh · 2021-11-04T16:45:08Z

This PR does:

adds set function in Settings for removalType_ and doMultipleMatches_
extends L1FPGATrackProducer to manipulate Settings::removalType_ and Settings::doMultipleMatches_ via python config
adapts HybridTracksNewKF_cfg.py, L1TrackNtupleMaker_cfg.py and demonstrator_cfg.py to use this function
removes obsolete L1FPGATrackProducer clones from Tracklet_cfi.py and L1HybridEmulationTracks_cff.py
adapts input tag in ProducerKF_cfi.py to not point to obsolete L1FPGATrackProducer clones
This PR depends on summer chain demonstrator #111

This PR introduces a duplication of some cfg params, as explained in #134 . This should ultimately be eliminated, as suggested in the "Issue". But the PR can be approved without doing this.

tschuh · 2021-12-09T16:47:25Z

@tomalin could you tell me why the gui reports failing CI while the CI reports https://gitlab.cern.ch/cms-l1tk/cmssw_CI/-/pipelines/3337331/builds all test passed?

tomalin · 2022-02-05T11:48:43Z

Please rebase this branch, to make it easier to understand which code must be reviewed.

L1Trigger/TrackFindingTracklet/python/Customize_cff.py

L1Trigger/TrackFindingTracklet/python/ProducerKF_cfi.py

tomalin · 2022-02-07T12:04:07Z

As you've introduced the reducedConfig() function is Customize_cff.py, do we still need the TTTracksFromReducedTrackletEmulation section of Tracklet_cfi.py?

L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py

L1Trigger/TrackFindingTracklet/python/Customize_cff.py

tschuh · 2022-02-07T14:57:13Z

As you've introduced the reducedConfig() function is Customize_cff.py, do we still need the TTTracksFromReducedTrackletEmulation section of Tracklet_cfi.py?

As long as TTTracksFromReducedTrackletEmulation is used you need it, however one could use everywhere the reducedConfig instead. Currently people have the choice of what they prefer.

tomalin · 2022-02-08T21:56:46Z

Clarify comment explaining IRChannelsIn at https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/python/ChannelAssignment_cfi.py#L33 . e.g. "ID of DTC connected to each IR". I assume the DTC ID is that returned by Setup::dtcId() https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackTrigger/interface/Setup.h#L63 . And I guess the IR ID is obtained from the order in which the IR is listed in the processingmodules.dat file? If so, this needs stating too.

tomalin · 2022-02-09T16:39:45Z

Is this comment accurate https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h#L15 ? It says this class assigns both Stubs & Tracks to Tracklet output channel. But whereas I see a function "bool channelId(const TTTrackRef& ttTrackRef, int& channelId) " to assign Tracks to channel, I don't see an equivalent function for Stubs. Nor to I see an equivalent function to assign Stubs to the Tracklet input channel, which the comment also says this class does. Though I do see one that "assigns DTC output channel to Tracklet input channel".

tomalin · 2022-02-09T17:45:59Z

I've finished reviewing this PR, if @tschuh can answer the remaining comments.

I've asked @aryd for advice on my suggestion above to eliminate cfg param IRChannelsIn". If we can determine this automatically, it is preferable to forcing the user to set these numbers by hand for every new HW test setup.

I've asked Stefano Mersi to tell us if each DTC crate contains 3 or 4 DTC reading 10 Gb/s PS modules.

…onstrator counts now the amount of passed events.

tschuh · 2022-02-10T16:28:27Z

Add comment to start of HybridTracksNewKF_cfg.py explaining what it is for. i.e. Why one wouldn't just run L1TrackNtupleMaker_cfg.py.

done

tschuh · 2022-02-10T16:28:43Z

Clarify comment explaining IRChannelsIn at https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/python/ChannelAssignment_cfi.py#L33 . e.g. "ID of DTC connected to each IR". I assume the DTC ID is that returned by Setup::dtcId() https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackTrigger/interface/Setup.h#L63 . And I guess the IR ID is obtained from the order in which the IR is listed in the processingmodules.dat file? If so, this needs stating too.

done

tschuh · 2022-02-10T16:29:52Z

Is this comment accurate https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h#L15 ? It says this class assigns both Stubs & Tracks to Tracklet output channel. But whereas I see a function "bool channelId(const TTTrackRef& ttTrackRef, int& channelId) " to assign Tracks to channel, I don't see an equivalent function for Stubs. Nor to I see an equivalent function to assign Stubs to the Tracklet input channel, which the comment also says this class does. Though I do see one that "assigns DTC output channel to Tracklet input channel".

Yes it is, I the function returning stub channel ID is called layerId

tomalin · 2022-02-15T17:13:47Z

Can we agree that it's desirable to eliminate IRChannelsIn from https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/python/Customize_cff.py#L26 , instead taking this info from the tracklet wiring map? And that we should find a way (e.g. making the wiring map an ESProduct) of doing this?
If so, I suggest adding just above L26 a comment to remind us.

"TO DO: Eliminate cfg param IRChannelsIn by taking this info from Tracklet wiring map."

And adding a git "Issue", with containing:

"TO DO: Eliminate cfg param IRChannelsIn from from https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/python/Customize_cff.py#L26 by taking this info from Tracklet wiring map.
e.g. The list above "0, 1, 25," indicates that 2nd IR module (where counting starts at 0) is connected to DTC ID = 25. And LUTsReduced/processingmodules.dat says that2nd IR is named IR_PS10G_2_B , which wires.dat says is connected to the DTC named DL_PS10G_2_B . And using array dtcname (from L1FPGATrackProducer.cc), one finds that "PS10G_2" is in slot 1 of the crate, and this name also means its at +ve z and in the 2nd Tracker sector connected to this TFP region. From this info, a function added to your Setup class should be able to return the DTC ID. The difficulty is that EDProducer ChannelAssignment accesses IRChannelsIn, but doesn't have access to the wiring map."

tomalin · 2022-02-15T17:39:30Z

As you've introduced the reducedConfig() function is Customize_cff.py, do we still need the TTTracksFromReducedTrackletEmulation section of Tracklet_cfi.py?

As long as TTTracksFromReducedTrackletEmulation is used you need it, however one could use everywhere the reducedConfig instead. Currently people have the choice of what they prefer.

If Customize_cff.py contains function reducedConfig() and Tracklet_cfi.py contains TTTracksFromReducedTrackletEmulation, then we have duplicate python code specifying the summer chain. I'd therefore like to delete TTTracksFromReducedTrackletEmulation from Tracklet_cfi.py, which I suspect requires modifying https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py#L175 to use Customize_cff.py

tomalin · 2022-02-15T17:40:54Z

@tschuh If you can address remaining comments above, and ensure we don't forget the one open question by following the advice in #112 (comment) , I could approve this PR.

tschuh · 2022-02-16T14:26:44Z

Can we agree that it's desirable to eliminate IRChannelsIn from https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/python/Customize_cff.py#L26 , instead taking this info from the tracklet wiring map? And that we should find a way (e.g. making the wiring map an ESProduct) of doing this? If so, I suggest adding just above L26 a comment to remind us.

"TO DO: Eliminate cfg param IRChannelsIn by taking this info from Tracklet wiring map."

And adding a git "Issue", with containing:

"TO DO: Eliminate cfg param IRChannelsIn from from https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/python/Customize_cff.py#L26 by taking this info from Tracklet wiring map. e.g. The list above "0, 1, 25," indicates that 2nd IR module (where counting starts at 0) is connected to DTC ID = 25. And LUTsReduced/processingmodules.dat says that2nd IR is named IR_PS10G_2_B , which wires.dat says is connected to the DTC named DL_PS10G_2_B . And using array dtcname (from L1FPGATrackProducer.cc), one finds that "PS10G_2" is in slot 1 of the crate, and this name also means its at +ve z and in the 2nd Tracker sector connected to this TFP region. From this info, a function added to your Setup class should be able to return the DTC ID. The difficulty is that EDProducer ChannelAssignment accesses IRChannelsIn, but doesn't have access to the wiring map."

done

tschuh · 2022-02-16T14:27:09Z

As you've introduced the reducedConfig() function is Customize_cff.py, do we still need the TTTracksFromReducedTrackletEmulation section of Tracklet_cfi.py?

As long as TTTracksFromReducedTrackletEmulation is used you need it, however one could use everywhere the reducedConfig instead. Currently people have the choice of what they prefer.

If Customize_cff.py contains function reducedConfig() and Tracklet_cfi.py contains TTTracksFromReducedTrackletEmulation, then we have duplicate python code specifying the summer chain. I'd therefore like to delete TTTracksFromReducedTrackletEmulation from Tracklet_cfi.py, which I suspect requires modifying https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py#L175 to use Customize_cff.py

done

tschuh · 2022-02-16T14:27:41Z

@tschuh If you can address remaining comments above, and ensure we don't forget the one open question by following the advice in #112 (comment) , I could approve this PR.

done, please let me know if I missed something

tomalin · 2022-02-17T17:49:14Z

Is this comment accurate https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h#L15 ? It says this class assigns both Stubs & Tracks to Tracklet output channel. But whereas I see a function "bool channelId(const TTTrackRef& ttTrackRef, int& channelId) " to assign Tracks to channel, I don't see an equivalent function for Stubs. Nor to I see an equivalent function to assign Stubs to the Tracklet input channel, which the comment also says this class does. Though I do see one that "assigns DTC output channel to Tracklet input channel".

Yes it is, I the function returning stub channel ID is called layerId

Ah, I see. For the TrackBuilder output, the number returned by ChannelAssignment::layerId() is both an indication of layer number and of channel no.. Please clarify the comment for function layerId() to make this clear. This will relate it more obviously to the comment at the top of the class about the class assigning stubs to channels.

tschuh · 2022-02-17T17:57:23Z

Is this comment accurate https://github.com/cms-L1TK/cmssw/blob/tschuh_customize/L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h#L15 ? It says this class assigns both Stubs & Tracks to Tracklet output channel. But whereas I see a function "bool channelId(const TTTrackRef& ttTrackRef, int& channelId) " to assign Tracks to channel, I don't see an equivalent function for Stubs. Nor to I see an equivalent function to assign Stubs to the Tracklet input channel, which the comment also says this class does. Though I do see one that "assigns DTC output channel to Tracklet input channel".

Yes it is, I the function returning stub channel ID is called layerId

Ah, I see. For the TrackBuilder output, the number returned by ChannelAssignment::layerId() is both an indication of layer number and of channel no.. Please clarify the comment for function layerId() to make this clear. This will relate it more obviously to the comment at the top of the class about the class assigning stubs to channels.

done

tomalin

Approved, though we should fix #134 at some point in the future.

* 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>

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

tschuh assigned tomalin Nov 4, 2021

tschuh mentioned this pull request Nov 4, 2021

Summerchain new KF #107

Closed

tschuh force-pushed the tschuh_customize branch 5 times, most recently from ffff4dc to 09b26d3 Compare November 11, 2021 14:57

tschuh force-pushed the tschuh_customize branch 2 times, most recently from 9dce8d3 to 74180d3 Compare November 18, 2021 18:05

tschuh force-pushed the tschuh_customize branch from 74180d3 to 0630031 Compare December 9, 2021 15:16

aryd self-requested a review January 30, 2022 23:48

tomalin removed their assignment Feb 5, 2022

tomalin self-requested a review February 5, 2022 11:49

tschuh force-pushed the tschuh_customize branch from 5ab6641 to 3f30cb0 Compare February 6, 2022 15:49

This comment was marked as resolved.

Sign in to view

tomalin reviewed Feb 7, 2022

View reviewed changes

L1Trigger/TrackFindingTracklet/python/Customize_cff.py Show resolved Hide resolved

tomalin reviewed Feb 7, 2022

View reviewed changes

L1Trigger/TrackFindingTracklet/python/ProducerKF_cfi.py Show resolved Hide resolved

tomalin reviewed Feb 7, 2022

View reviewed changes

L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py Outdated Show resolved Hide resolved

tomalin reviewed Feb 7, 2022

View reviewed changes

L1Trigger/TrackFindingTracklet/python/Customize_cff.py Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

track builder channel upgraded to assign stubs to channel.

d759883

tschuh added 9 commits February 10, 2022 16:14

rebased and name change of TrackBuilderChannel adopted.

b26b288

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

0280ad3

StreamsStub added as EDProduct of L1FPGATrackProducer

fcc0443

use customize function to manipulate L1FPGATrackProducer configuration

4576304

rebase to tschuh_SummerChain, customize updated to set EmulateTB, dem…

983257d

…onstrator counts now the amount of passed events.

initial counter values fixed.

5ffb35b

rebase and reduce config customize function extended

252c529

fixing merge errors.

236c6cd

Ians first comments.

b522565

tschuh force-pushed the tschuh_customize branch from fd10ce0 to b522565 Compare February 10, 2022 16:15

rebase and Ians secodn comments.

c975260

Update ChannelAssignment_cfi.py

f1871df

Ians third comments.

0cb94ed

Ians fourth comments.

dd5a269

tomalin approved these changes Feb 17, 2022

View reviewed changes

tomalin merged commit 18458d2 into L1TK-dev-12_0_0_pre4 Feb 17, 2022

tschuh deleted the tschuh_customize branch May 9, 2022 16:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

customize L1FPGATrackProducer #112

customize L1FPGATrackProducer #112

tschuh commented Nov 4, 2021 •

edited by tomalin

Loading

tschuh commented Dec 9, 2021

tomalin commented Feb 5, 2022

This comment was marked as resolved.

tomalin commented Feb 7, 2022

This comment was marked as resolved.

tschuh commented Feb 7, 2022 •

edited

Loading

This comment was marked as resolved.

This comment was marked as resolved.

tomalin commented Feb 8, 2022

tomalin commented Feb 9, 2022

tomalin commented Feb 9, 2022

tschuh commented Feb 10, 2022

tschuh commented Feb 10, 2022

tschuh commented Feb 10, 2022

tomalin commented Feb 15, 2022

tomalin commented Feb 15, 2022

tomalin commented Feb 15, 2022

tschuh commented Feb 16, 2022

tschuh commented Feb 16, 2022

tschuh commented Feb 16, 2022

tomalin commented Feb 17, 2022

tschuh commented Feb 17, 2022

tomalin left a comment

customize L1FPGATrackProducer #112

customize L1FPGATrackProducer #112

Conversation

tschuh commented Nov 4, 2021 • edited by tomalin Loading

tschuh commented Dec 9, 2021

tomalin commented Feb 5, 2022

This comment was marked as resolved.

tomalin commented Feb 7, 2022

This comment was marked as resolved.

tschuh commented Feb 7, 2022 • edited Loading

This comment was marked as resolved.

This comment was marked as resolved.

tomalin commented Feb 8, 2022

tomalin commented Feb 9, 2022

tomalin commented Feb 9, 2022

tschuh commented Feb 10, 2022

tschuh commented Feb 10, 2022

tschuh commented Feb 10, 2022

tomalin commented Feb 15, 2022

tomalin commented Feb 15, 2022

tomalin commented Feb 15, 2022

tschuh commented Feb 16, 2022

tschuh commented Feb 16, 2022

tschuh commented Feb 16, 2022

tomalin commented Feb 17, 2022

tschuh commented Feb 17, 2022

tomalin left a comment

Choose a reason for hiding this comment

tschuh commented Nov 4, 2021 •

edited by tomalin

Loading

tschuh commented Feb 7, 2022 •

edited

Loading