Skip to content
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

Clock jump defaults #719

Merged
merged 46 commits into from
Dec 18, 2024
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
9a72c75
ClockJump_correction update and new method for Hit manipulation on co…
Dec 5, 2022
9889653
added missing etofHelperFunctions
Dec 6, 2022
ffa9088
addressed suggested changes
Dec 15, 2022
febf3f7
Merge branch 'main' into ClockJumpCorrection-and-CounterMod-update
plexoos Dec 17, 2022
c62c0a9
Merge branch 'main' into ClockJumpCorrection-and-CounterMod-update
plexoos Dec 20, 2022
8551432
2nd round of comments
Dec 21, 2022
0923a14
Merge branch 'ClockJumpCorrection-and-CounterMod-update' of https://g…
Dec 21, 2022
b9dcf39
change white space
plexoos Dec 21, 2022
7cd0372
3d round of comments
Dec 28, 2022
fa5e2c5
Merge branch 'ClockJumpCorrection-and-CounterMod-update' of https://g…
Dec 28, 2022
9a8fd38
4th round of comments
Jan 4, 2023
a38037f
Merge branch 'main' into ClockJumpCorrection-and-CounterMod-update
plexoos Jan 4, 2023
eda3e89
5th round of comments
Jan 5, 2023
e10c291
Merge branch 'ClockJumpCorrection-and-CounterMod-update' of https://g…
Jan 5, 2023
79f22f2
bug fix in HitMaker
Jan 5, 2023
ef9e5b6
Clean up white space according to coding guidelines
plexoos Jan 3, 2023
98f1101
remove undefined class method
plexoos Jan 10, 2023
7139608
Revert "bug fix in HitMaker"
plexoos Jan 10, 2023
fa6331e
Tweak StETofGeometry::init() default params
plexoos Jan 10, 2023
4c77e07
renamed variables and replaced 6.25 by etofConstant
Jan 10, 2023
591ab4e
Merge branch 'ClockJumpCorrection-and-CounterMod-update' of https://g…
Jan 10, 2023
9e25945
removed unused variable
Jan 10, 2023
b9b1559
adjusted default electronics dead-time
Jan 11, 2023
63f2ad4
Merge remote-tracking branch 'origin' into MaskCountersForProduction
May 24, 2023
fdd2424
add set method in MatchMaker, fix HitMaker for masking counters
Jun 1, 2023
84cd1e5
fixed PulserCorrection, added set method for AfterpulseCorrection
Jul 6, 2023
e5e1adf
StatusFlag Fix and implementation of SingleSidedMatches
Feb 28, 2024
a86d3ad
incremented ClassDef
Mar 5, 2024
b7b6d86
Merge branch 'main' into MatchUpdate-and-EventFlagFix
plexoos Mar 6, 2024
32cb6b6
removed unnecessary if statement
Mar 13, 2024
ab90434
Merge branch 'main' into MatchUpdate-and-EventFlagFix
YannickSoehngen Mar 13, 2024
ac94c47
removed unused variable
Mar 13, 2024
d92ae2b
adressed compiler warnings
Mar 15, 2024
cb80b34
fix match flag and efficiency
Aug 12, 2024
37deacc
clock jump calibration update
Sep 22, 2024
b93bd0e
get4Pair default jump state
Nov 22, 2024
b8f3a14
Merge branch 'main' into clock-jump-defaults
YannickSoehngen Nov 22, 2024
1e43cbe
Update StETofCalibMaker.cxx
YannickSoehngen Nov 22, 2024
8740219
Update StETofCalibMaker.cxx
YannickSoehngen Nov 24, 2024
1b66851
Update StRoot/StETofHitMaker/StETofHitMaker.cxx
YannickSoehngen Nov 27, 2024
1a2b0c3
Update StRoot/StETofCalibMaker/StETofCalibMaker.cxx
YannickSoehngen Nov 27, 2024
e155cd6
Update StRoot/StETofHitMaker/StETofHitMaker.cxx
YannickSoehngen Nov 27, 2024
8f7d238
Update StRoot/StETofCalibMaker/StETofCalibMaker.cxx
YannickSoehngen Nov 27, 2024
936e8b8
Update StRoot/StETofCalibMaker/StETofCalibMaker.h
YannickSoehngen Nov 27, 2024
959f595
Update StRoot/StETofCalibMaker/StETofCalibMaker.cxx
YannickSoehngen Nov 27, 2024
cd0bd6b
Update StETofCalibMaker.cxx
YannickSoehngen Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
renamed variables and replaced 6.25 by etofConstant
  • Loading branch information
Yannick Soehngen committed Jan 10, 2023
commit 4c77e07f6bb13a2f1293463c971d0be261a3ea52
38 changes: 17 additions & 21 deletions StRoot/StETofHitMaker/StETofHitMaker.cxx
Original file line number Diff line number Diff line change
@@ -1274,11 +1274,11 @@ StETofHitMaker::matchSides()
if(mETofGeom){

StMuPrimaryVertex* pVtx = mMuDst->primaryVertex( 0 );
StThreeVectorD* posGlo = new StThreeVectorD( mETofGeom->hitLocal2Master( constructedHit ));

StThreeVectorD posGlo = mETofGeom->hitLocal2Master( constructedHit );
if( pVtx ) {
StThreeVectorD* vtxPos = new StThreeVectorD( pVtx->position());
exptof = tofPathLength(vtxPos , posGlo , 0) / ( nanosecond * c_light );
StThreeVectorF vtxPos = pVtx->position();
exptof = tofPathLength(&vtxPos , &posGlo , 0) / ( nanosecond * c_light );
}
}

@@ -1306,9 +1306,9 @@ StETofHitMaker::matchSides()
}

if(mGet4doublejumpFlag.at(get4Nr) == 1){
constructedHit->setTime(constructedHit->time() + 6.25);
constructedHit->setTime(constructedHit->time() + eTofConst::coarseClockCycle);
constructedHit->setClusterSize(constructedHit->clusterSize() + 200);
tof += 6.25;
tof += eTofConst::coarseClockCycle;
}
}
}
@@ -1548,8 +1548,8 @@ StETofHitMaker::mergeClusters( const bool isMuDst )
LOG_DEBUG << "mergeClusters() - checking hit vector for possible hits to merge with..." << endm;
}

bool IsMissmatch = false;
int IdTruth = 0;
bool isMissmatch = false;
int idTruth = 0;

StETofHit* pHit = hitVec->at( 0 );

@@ -1660,11 +1660,11 @@ StETofHitMaker::mergeClusters( const bool isMuDst )
if(mIsSim){

if(pMergeHit->idTruth() !=pHit->idTruth()){
IdTruth = -99999;
IsMissmatch = 1;
idTruth = -99999;
isMissmatch = 1;
}
else if(!IsMissmatch){
IdTruth = pHit->idTruth();
else if(!isMissmatch){
idTruth = pHit->idTruth();
}
}

@@ -1692,8 +1692,8 @@ StETofHitMaker::mergeClusters( const bool isMuDst )

// set idTruth if nothing to merge
if(mIsSim){
if(IdTruth == 0){
IdTruth = pHit->idTruth();
if(idTruth == 0){
idTruth = pHit->idTruth();
}
}

@@ -1724,7 +1724,7 @@ StETofHitMaker::mergeClusters( const bool isMuDst )
StETofHit* combinedHit = new StETofHit( sector, plane, counter, weightedTime, weightsTotSum, clusterSize, weightedPosX, weightedPosY );

if(mIsSim){
combinedHit->setIdTruth(IdTruth);
combinedHit->setIdTruth(idTruth);
}


@@ -2384,15 +2384,11 @@ StETofHitMaker::modifyHit( int modMode, double& localX,double& localY, double& t
break;

case 4:
x = localX;
localX = localY;
localY = -1*x;
std::swap(localX, localY), localY = -localY;
break;

case 5:
x = localX;
localX = -1*localY;
localY = x;
std::swap(localX, localY), localX = -localX;
break;

case 99:
4 changes: 2 additions & 2 deletions StRoot/StETofHitMaker/StETofHitMaker.h
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ class StETofHitMaker: public StMaker {
void setFileNameModMatrix( const char* fileName );
void setFileNameAlignParam( const char* fileName );

void setGet4MinTime( const double& minTime );
void setGet4MinTime( const double minTime );
void setSoftwareDeadTime( const double& deadTime );
void setDoClockJumpShift( const bool doShift );
void setDoDoubleClockJumpShift( const bool doDoubleShift );
@@ -188,7 +188,7 @@ inline void StETofHitMaker::setFileNameModMatrix( const char* fileName )
inline void StETofHitMaker::setFileNameAlignParam( const char* fileName ) { mFileNameAlignParam = fileName; }


inline void StETofHitMaker::setGet4MinTime( const double& minTime ) { mGet4doublejumpTmin = minTime; }
inline void StETofHitMaker::setGet4MinTime( const double minTime ) { mGet4doublejumpTmin = minTime; }
inline void StETofHitMaker::setSoftwareDeadTime( const double& deadTime ) { mSoftwareDeadTime = deadTime; }
inline void StETofHitMaker::setDoClockJumpShift( const bool doShift ) { mDoClockJumpShift = doShift; }
inline void StETofHitMaker::setDoDoubleClockJumpShift( const bool doDoubleShift ) { mDoDoubleClockJumpShift = doDoubleShift; }
5 changes: 0 additions & 5 deletions StRoot/StETofMatchMaker/StETofMatchMaker.h
Original file line number Diff line number Diff line change
@@ -99,11 +99,6 @@ class StETofMatchMaker : public StMaker {
Double_t beta;
Double_t pathLength;
Double_t tof;

Int_t idTruth;
Int_t idTruthHit;
Int_t nHitsFit;
bool isMissMatch;
};

typedef std::vector< StructETofHit > eTofHitVec;