Updating Stub Format for VMSMERouter Changes #279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add z0 resolution to performance printout * code format
* Disable binning in DR * bug fix * add comment * code format * tweak comment * fix previous erroneous commit
* Make combined modules default * tweak * Improve USEHYBRID ifdef range * Fix compiler error for pure Tracklet algo * Move fitpattern.txt refs, so only used for pure Tracklet algo * code format
* Made calculations more numerically stable. * Explicitly restrict to domain of asin/acos. * Added comments. * Code format. * Fixed typos in comments. * Only do calculations when needed. * Added const where applicable.
* Fix inventStubs bug in duplicate removal When using L2L3D1 seeds, it is only L2L3 that are used to determined the r-z helix params, not L2D1 as the code currently assumes. * Update PurgeDuplicate.cc * add comment * formatted
Full agreement with HLS (100 events L1PHIC - D5PHIC)
aryd
reviewed
May 22, 2024
| @@ -551,7 +551,7 @@ namespace tmtt { | |||
| matRinv = TMatrixD(TMatrixD::kInverted, matR); | |||
| } else { | |||
| // Protection against rare maths instability. | |||
| const TMatrixD unitMatrix(TMatrixD::kUnit, TMatrixD(nHelixPar_, nHelixPar_)); | |||
| const TMatrixD unitMatrix(TMatrixD::kUnit, TMatrixD(2, 2)); | |||
aryd
reviewed
May 22, 2024
| @@ -1,4 +1,4 @@ | |||
| To run the L1 tracking & create a TTree of tracking performance: | |||
| To run the L1 tracking & create a TTree of tracking performance: | |||
aryd
reviewed
May 22, 2024
| @@ -344,7 +345,7 @@ namespace trklet { | |||
|
|
|||
| double kz() const { return 2.0 * zlength_ / (1 << nzbitsstub_[0]); } | |||
| double kz(unsigned int layerdisk) const { return 2.0 * zlength_ / (1 << nzbitsstub_[layerdisk]); } | |||
| double kr() const { return rmaxdisk_ / (1 << nrbitsstub_[N_LAYER]); } | |||
| double kr() const { return rmaxdisk_ / (1 << (nrbitsstub_[N_LAYER] + 1)); } | |||
aryd
reviewed
May 22, 2024
| //Following values are used for duplicate removal | ||
| //Rinv bins were optimised to ensure a similar number of tracks in each bin prior to DR | ||
| //Rinv bin edges for 6 bins. | ||
| std::vector<double> rinvBins_{-rinvcut(), -0.004968, -0.003828, 0, 0.003828, 0.004968, rinvcut()}; | ||
| //std::vector<double> rinvBins_{-rinvcut(), -0.004968, -0.003828, 0, 0.003828, 0.004968, rinvcut()}; |
There was a problem hiding this comment.
Are these changes related to this updated?
aryd
reviewed
May 22, 2024
| @@ -221,6 +221,8 @@ namespace trklet { | |||
|
|
|||
| unsigned int PSseed() const { return ((layer() == 1) || (layer() == 2) || (disk() != 0)) ? 1 : 0; } | |||
|
|
|||
| // Seed type: | |||
aryd
reviewed
May 22, 2024
| @@ -160,7 +164,7 @@ double Stub::rapprox() const { | |||
| else | |||
| return settings_.rDSSouter(r_.value()); | |||
| } | |||
| return r_.value() * settings_.kr(); | |||
| return (r_.value() + (1 << 8)) * settings_.kr(); // Incorporating r offset for disk PS stubs | |||
There was a problem hiding this comment.
Can you do something like "int r_offset_bits=8" and use this variable?
aryd
reviewed
May 22, 2024
| @@ -403,9 +403,9 @@ void TrackletProcessor::execute(unsigned int iSector, double phimin, double phim | |||
| if (negdisk) { | |||
| indexz = ((1 << nbitszfinebintable_) - 1) - indexz; | |||
| } | |||
| indexr = stub->r().value() >> (stub->r().nbits() - nbitsrfinebintable_); | |||
| indexr = stub->rvalue() >> (stub->r().nbits() + 1 - nbitsrfinebintable_); | |||
aryd
reviewed
May 22, 2024
I've addressed the comments relating to my changes, the others are regarding code included in CMSSW 14 dev branch commits incorporated in my branch, but not yet merged into the ProjectionCalculator_without_IMATH_and_noncombined branch. |
aryd
merged commit ab2f3fe
into
ProjectionCalculator_without_IMATH_and_noncombined
1 check failed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates the DTC emulation and Track Finding emulation Disk Stub data format by adding to the beginning of the stubword a bit determining whether the stub is in the negative z region of the detector, and adding an offset to the encoded r value for DiskPS stubs of 256 (7.5 cm) to allow fitting the negDisk bit in 36 bits.
This information is required in the AllStubs to be used for the new VMSMERouter dual FPGA module, and it was decided this was the easiest way to incorporate the information without making changes to the previous processing modules / causing the DTC/Input/AllStubs to be of different format. More information regarding this is available here.
PR also includes changes to written memory text files required for current master firmware-hls (writing offset r values for DiskPS stubs and negDisk bit for all disk stubs).