Clock jump defaults #719
Merged
Clock jump defaults #719
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
…ithub.com/YannickSoehngen/star-sw into ClockJumpCorrection-and-CounterMod-update
…ithub.com/YannickSoehngen/star-sw into ClockJumpCorrection-and-CounterMod-update
…ithub.com/YannickSoehngen/star-sw into ClockJumpCorrection-and-CounterMod-update
This reverts commit 79f22f2.
…ithub.com/YannickSoehngen/star-sw into ClockJumpCorrection-and-CounterMod-update
YannickSoehngen
requested review from
nigmatkulov,
marrbnl,
plexoos,
jdbrice,
klendathu2k and
PhilippWeidenkaff
as code owners
genevb
approved these changes
Nov 25, 2024
| Get4Id2 = -1; | ||
| get4state2 = -1; | ||
|
|
||
| if(stateInt1 < 6912){ |
There was a problem hiding this comment.
Suggested change
| if(stateInt1 < 6912){ | |
| if(stateInt1 < eTofConst::nChannelsInSystem){ |
| Get4Id1 = stateInt1 % (eTofConst::nGet4sInSystem/2); | ||
| get4state1 = stateInt1 / (eTofConst::nGet4sInSystem/2); | ||
| } | ||
| if(stateInt2 < 6912){ |
There was a problem hiding this comment.
Suggested change
| if(stateInt2 < 6912){ | |
| if(stateInt1 < eTofConst::nChannelsInSystem){ |
Comment on lines
+1328
to
+1332
| keyGet4 = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 1 - 1 ) + ( ( strip - 1 ) / 4 ); | ||
| keyGet4_comp = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 2 - 1 ) + ( ( strip - 1 ) / 4 ); | ||
| }else{ | ||
| keyGet4 = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 2 - 1 ) + ( ( strip - 1 ) / 4 ); | ||
| keyGet4_comp = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 1 - 1 ) + ( ( strip - 1 ) / 4 ); |
There was a problem hiding this comment.
If we're using the constants provided, I think this equates to....
Suggested change
| keyGet4 = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 1 - 1 ) + ( ( strip - 1 ) / 4 ); | |
| keyGet4_comp = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 2 - 1 ) + ( ( strip - 1 ) / 4 ); | |
| }else{ | |
| keyGet4 = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 2 - 1 ) + ( ( strip - 1 ) / 4 ); | |
| keyGet4_comp = 144 * ( sector - 13 ) + 48 * ( plane -1 ) + 16 * ( counter - 1 ) + 8 * ( 1 - 1 ) + ( ( strip - 1 ) / 4 ); | |
| keyGet4 = (eTofConst::nStrips * (eTofConst::nSides * (eTofConst::nCounters * (eTofConst::nPlanes * ( sector - 13 ) + ( plane -1 )) + ( counter - 1 )) + ( 1 - 1 )) + ( strip - 1 )) / 4; | |
| keyGet4_comp = (eTofConst::nStrips * (eTofConst::nSides * (eTofConst::nCounters * (eTofConst::nPlanes * ( sector - 13 ) + ( plane -1 )) + ( counter - 1 )) + ( 2 - 1 )) + ( strip - 1 )) / 4; | |
| }else{ | |
| keyGet4 = (eTofConst::nStrips * (eTofConst::nSides * (eTofConst::nCounters * (eTofConst::nPlanes * ( sector - 13 ) + ( plane -1 )) + ( counter - 1 )) + ( 2 - 1 )) + ( strip - 1 )) / 4; | |
| keyGet4_comp = (eTofConst::nStrips * (eTofConst::nSides * (eTofConst::nCounters * (eTofConst::nPlanes * ( sector - 13 ) + ( plane -1 )) + ( counter - 1 )) + ( 1 - 1 )) + ( strip - 1 )) / 4; |
Comment on lines
+1356
to
+1375
| if(def == 1 ){ | ||
| time -= eTofConst::coarseClockCycle * 0.5; | ||
| } | ||
| if(def == 3){ | ||
| time += eTofConst::coarseClockCycle * 0.5; | ||
| } | ||
| if(def == 2){ | ||
| if(posY > 0){ | ||
| time -= eTofConst::coarseClockCycle * 0.5; | ||
| }else{ | ||
| time += eTofConst::coarseClockCycle * 0.5; | ||
| } | ||
| } | ||
| if(def == 4){ | ||
| if(posY > 0){ | ||
| time += eTofConst::coarseClockCycle * 0.5; | ||
| }else{ | ||
| time -= eTofConst::coarseClockCycle * 0.5; | ||
| } | ||
| } |
There was a problem hiding this comment.
Just a shorter version of yours:
Suggested change
| if(def == 1 ){ | |
| time -= eTofConst::coarseClockCycle * 0.5; | |
| } | |
| if(def == 3){ | |
| time += eTofConst::coarseClockCycle * 0.5; | |
| } | |
| if(def == 2){ | |
| if(posY > 0){ | |
| time -= eTofConst::coarseClockCycle * 0.5; | |
| }else{ | |
| time += eTofConst::coarseClockCycle * 0.5; | |
| } | |
| } | |
| if(def == 4){ | |
| if(posY > 0){ | |
| time += eTofConst::coarseClockCycle * 0.5; | |
| }else{ | |
| time -= eTofConst::coarseClockCycle * 0.5; | |
| } | |
| } | |
| bool POSY = (posY > 0); | |
| double addOrSub = (def == 3 || (def == 4 && POSY) || (def == 2 && !POSY) ? 0.5 : -0.5); | |
| time += addOrSub * eTofConst::coarseClockCycle; |
| time -= eTofConst::coarseClockCycle * 0.5; | ||
| } | ||
| } | ||
| timeDiff -= eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ) ); |
There was a problem hiding this comment.
You're assuming ( timeDiff > 0) evaluates to +1? Just a step further is safer as suggested here. I looked for a C/C++ function that returns -1,0,1 for floats <0,0,>0, but didn't find any except this hack, that I don't really love: (x>>31) - (-x>>31);. So maybe yours is better.
Suggested change
| timeDiff -= eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ) ); | |
| timeDiff -= eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ? 1 : 0) ); |
There was a problem hiding this comment.
OK, I found this
Suggested change
| timeDiff -= eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ) ); | |
| timeDiff -= (timeDiff == 0 ? 0 : TMath::Sign(eTofConst::coarseClockCycle , timeDiff)); |
There was a problem hiding this comment.
Or similarly...
Suggested change
| timeDiff -= eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ) ); | |
| if (timeDiff != 0) timeDiff -= TMath::Sign(eTofConst::coarseClockCycle , timeDiff); |
Co-authored-by: Gene Van Buren <[email protected]>
Co-authored-by: Gene Van Buren <[email protected]>
Co-authored-by: Gene Van Buren <[email protected]>
Co-authored-by: Gene Van Buren <[email protected]>
Co-authored-by: Gene Van Buren <[email protected]>
Co-authored-by: Gene Van Buren <[email protected]>
fgeurts
approved these changes
Dec 17, 2024
|
@YannickSoehngen Did I understand correctly that you will merge this branch today? If so, I'll keep an eye on it and tag as requested by Gene. |
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.
No description provided.