Removal of dependencies of ChannelAssignement #144

aryd · 2022-04-05T13:20:57Z

This removes the CMSSWS dependencies from recent PRs by Thomas Schuh, so as to allow the tracklet pattern reco to be run outside CMSSW again.

Validation:
Tracking performance unchanged with both HYBRID_NEWKF & HYBRID_REDUCED OPTIONS
Dump of bit strings from output streamsStub & streamsTrack EDProducts, were unchanged.

skinnari · 2022-04-05T16:51:10Z

@aryd I think you need to update this PR to make it to the appropriate branch (L1TK-dev-12_0_0_pre4) rather than master

aryd · 2022-04-05T19:31:28Z

OK - should be fixed now…. -Anders Anders Ryd ***@***.******@***.***> On Apr 5, 2022, at 12:51 PM, Louise Skinnari ***@***.******@***.***>> wrote: @aryd<https://github.com/aryd> I think you need to update this PR to make it to the appropriate branch (L1TK-dev-12_0_0_pre4) rather than master — Reply to this email directly, view it on GitHub<#144 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ABI4LTMVSHWNZ4W345SRWIDVDRVQRANCNFSM5SSXYO2A>. You are receiving this because you were mentioned.Message ID: ***@***.***>

tomalin · 2022-05-12T11:30:51Z

@aryd & @tschuh I've rebased this branch with:

git cms-checkout-topic -u cms-L1TK:L1TK-dev-12_0_0_pre4
git cms-rebase-topic -u -o 5bb5365 cms-L1TK:aryd_TBoutAnalyzer

(so rejecting Anders's first commit to it, which was actually just a copy of code already in Thomas's PRs).

I then fixed some git conflicts by hand, and tidied up a bit. The main change is that since Anders created this branch, Thomas had changed the output streamsStub EDProduct in L1TK-dev-12_0_0_pre4, so that the number of streams from each TrackBuilder varied in the same way as the number of projection layers varies according to the seed type. I therefore had to make the same change in Anders's branch.

Validation: I've checked that for both HYBRID_NEWKF & HYBRID_REDUCED OPTIONS:

Tracking performance is unchanged.
Dump of bit strings from output streamsStub & streamsTrack EDProducts is unchanged.

tomalin

This looks OK to me. (Though supporting the stand-alone functionality has added complexity & ugliness to the code). I'm approving it, but could @aryd please check & approve my commits to his branch before we merge?

L1Trigger/TrackFindingTracklet/src/FitTrack.cc

tschuh · 2022-05-12T12:18:36Z

L1Trigger/TrackFindingTracklet/test/fpga.cc

@@ -208,7 +209,10 @@ int main(const int argc, const char **argv) {
    edm::LogVerbatim("Tracklet") << "Process event: " << eventnum << " with " << ev.nstubs() << " stubs and "
                                 << ev.nsimtracks() << " simtracks";

-    eventProcessor.event(ev);
+    std::vector<std::vector<std::string>> tracksStream(N_SECTOR * 8);


tschuh · 2022-05-12T12:21:43Z

L1Trigger/TrackFindingTracklet/src/FitTrack.cc

+
+      unsigned int ihit(0);
+      for (unsigned int ilayer = 0; ilayer < N_LAYER + N_DISK; ilayer++) {
+        if (bestTracklet->match(ilayer)) {


a if (!bestTracklet->match(ilayer)) continue; would reduce the indentation and make the code a bit more beautiful

People have mixed opinions about continue & break statements. e.g. See https://softwareengineering.stackexchange.com/questions/58237/are-break-and-continue-bad-programming-practices . They're best avoided in the middle of loops, where they can be easily missed. The one you refer to is at the start of a loop, so we could use continue there. But the indented "if" block is also very clear. Matter of taste ...

tschuh · 2022-05-12T12:22:26Z

L1Trigger/TrackFindingTracklet/src/FitTrack.cc

-      for (int layer : hitMap.ids(false)) {
-        streamsStub[layer].emplace_back(tt::FrameStub());
+      while (ihit < streamsStubRaw.size()) {
+        streamsStubRaw[ihit++].emplace_back(StubStreamData());


are you sure that you place the gaps in the right layer?

The index in streamStubRaw does not correspond to a fixed layer. I think Anders did it this way, as it's hard to determine the KF layer number from within FitTrack (in a stand-alone way). However, because StubStreamData contains an L1TStub object, this can be used (near end of L1FPGATrackProducer.cc to access the TTStub and hence determine the KF layer. Hence the "incorrect" index in FitTrack.cc is fixed in L1FPGATrackProducer.cc

I did not expect the kf layer, I expected the projection layer, but I see that it is just a container and has nothing to do with the stub streams, the name is misleading.

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

L1Trigger/TrackFindingTracklet/interface/StubStreamData.h

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

tschuh · 2022-05-12T12:30:44Z

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

+      }
+      for (int layerId : hitMap.ids(false)) {  // invalid stubs
+        streamsStub[chanStubOffsetOut + layerId].emplace_back(tt::FrameStub());
+      }


some unnecessary brackets since single line loop

Again a matter of style. My preference is to use brackets unless the entire loop fits on a single line, (whereas in L1FPGATrackProducer.cc it requires 2 lines). This seems in accordance with recommendations such as https://stackoverflow.com/questions/12193170/whats-the-purpose-of-using-braces-i-e-for-a-single-line-if-or-loop .

tschuh · 2022-05-12T12:32:06Z

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

+        // FW current has one (perhaps invalid) stub per layer per track.
+        const StubStreamData& stubdata = streamsStubRaw[chanStubOffsetIn + iproj][itk];
+        const L1TStub& stub = stubdata.stub();
+        if (stubdata.valid()) {


I would prefer if (!valid) continue to reduce indentation

Another matter of taste. This continue statement would be further into the loop, so more easily overlooked. Whereas the "if () {" statement with an indented block is hard to overlook.

tschuh · 2022-05-13T17:06:10Z

looks good to me now

… generation. The old code is still running in parallel.

…int out in this commit

tomalin · 2022-05-13T20:08:02Z

I fear the two "git push -f" commands today messed git up. It now claims conflicts, but refuses to rebase. I propose to merge this PR, and if it's imperfect, we submit another to fix it ...

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

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

aryd changed the base branch from master to L1TK-dev-12_0_0_pre4 April 5, 2022 19:30

tomalin force-pushed the aryd_TBoutAnalyzer branch from 7cf363f to cf61c91 Compare May 12, 2022 11:19

tomalin self-assigned this May 12, 2022

tomalin self-requested a review May 12, 2022 11:50

tomalin approved these changes May 12, 2022

View reviewed changes