[cross check]: updating and merging dev-align3 #429
Conversation
allows pre-alignment to obtain some of the information directly from the recon, instead of recalculating a lot of information
* using https for freehep * one more attempt * trying via mirror * trying via mirror * cleanup Co-authored-by: Nathan Baltzell <[email protected]>
…clas12-offline-software into TracTools-AddBanks
Lorentz angle correction fix. Fix in BMT uncertainty used in the fit. Fix in using isolated SVT clusters in track refit. Hit sorting using time and Edep. New clustering implemented; Default = off.
…nt. (using curved tracks in alignment still is not functional yet.)
… use existing RecoBankReader class, fixed issues with line-cylinder intersection in straight track KF transport
…ith both tracks from target and cosmics
…5` into dev-align3
|
@raffaelladevita, here are the diffs: Also I'm getting build errors in the CI (whereas #425 passes CI checks) |
|
I checked the differences, comparing manually the two branches since git is showing differences that are not really there. The relevant modifications are:
All other differences seems to be different coding choices |
… do not add those lines since the magnet scale is set in decoding
…y.java: use the dev-align-merge line
fixed in 3 recent commits
looks like this will take a bit more effort... perhaps we just use your version of |
|
discussed with @raffaelladevita, there are no more significant differences, aside from necessary changes in our backmerge (development -> this branch) conflict resolutions are consistent. closing this PR; proceed with testing #425 |
This should be very similar to #425, since it was made independently with the help of @sebouh137 and Sebastian to resolve the merge conflicts (~Feb. 2024)
Because @raffaelladevita independently resolved merge conflicts in #425, we can compare these two PRs.