-
Notifications
You must be signed in to change notification settings - Fork 24
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
Updates to MC and MP #225
Updates to MC and MP #225
Conversation
7430af0
to
3d512e3
Compare
88398b6
to
7d33622
Compare
I've included all barrel layers in |
f6f8b64
to
8139170
Compare
Could you try and rebase this branch w.r.t. fw_sync_12_0_0_pre4? The list of files changed is a bit confusing as it contains changes that were made in the fw synch branch thus shouldn't show up for this PR. |
TrackletAlgorithm/MatchCalculator.h
Outdated
@@ -763,6 +756,11 @@ void MatchCalculator(BXType bx, | |||
id_next = projid; | |||
bool newtracklet = (istep==0 || (id_next != id))? true : false; | |||
|
|||
//increament full match memories |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
increment? (sorry :-) )
ba3897c
to
c327f41
Compare
After the rebase, it closed the PR. I've never seen GitHub do that before. @aehart was this branch already merged into the fw sync? |
c327f41
to
f1a2dc6
Compare
214c203
to
587734b
Compare
@bryates I did already add the commits from this branch to the FW sync branch. Sorry, I didn't realize you were using that branch for this PR. I think these changes are needed on the FW sync branch in order for the MC and MP to pass the C-simulation, so I'll just review them on #220. Other PRs that are not needed for C-simulation to pass can wait until #220 is merged. |
Ok, thanks! |
This PR fixes the MP timing issue, as well as the recent disagreement in the MC.
MC:
All barrel layers run and fully match
MP:
All barrel layers run and fully match
CP achieved post-implementation: 3.837
Test vectors are temporary until
fw_sync_12_0_0_pre4
is updated.