Closed aryd closed 2 years ago
@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
OK - should be fixed now….
-Anders
Anders Ryd @.**@.>
On Apr 5, 2022, at 12:51 PM, Louise Skinnari @.**@.>> wrote:
@arydhttps://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 GitHubhttps://github.com/cms-L1TK/cmssw/pull/144#issuecomment-1089028437, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ABI4LTMVSHWNZ4W345SRWIDVDRVQRANCNFSM5SSXYO2A. You are receiving this because you were mentioned.Message ID: @.***>
@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 5bb53653e564dd699ad008f107b8e423825561a2 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: 1) Tracking performance is unchanged. 2) Dump of bit strings from output streamsStub & streamsTrack EDProducts is unchanged.
looks good to me now
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 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.