diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
index 836295c04612277d4152cb8a59aa7da37f8166ad..000f761ee323236361e2ce6cc1ede4358502922a 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
@@ -4917,15 +4917,14 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
fhTIR_all->Fill(dTIR);
- LOG(debug)
- << Form(
- " FoundMatches: %d with first chi2s = %12.1f, %12.1f, %12.1f, %12.1f",
- iNbMatchedHits,
- Chi2List[0],
- Chi2List[1],
- Chi2List[2],
- Chi2List[3])
- << Form(", Muls %4.0f, %4.0f, %4.0f", dMulD, dMul0, dMul4);
+ LOG(debug) << Form(
+ " FoundMatches: %d with first chi2s = %12.1f, %12.1f, %12.1f, %12.1f",
+ iNbMatchedHits,
+ Chi2List[0],
+ Chi2List[1],
+ Chi2List[2],
+ Chi2List[3])
+ << Form(", Muls %4.0f, %4.0f, %4.0f", dMulD, dMul0, dMul4);
if (BSel[0]) {
@@ -6639,7 +6638,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
Double_t dDX =
pHit->GetX()
- pTrk->GetFitX(
- pHit->GetZ()); // - tPar->GetX() - tPar->GetTx()*dDZ;
+ pHit->GetZ()); // - tPar->GetX() - tPar->GetTx()*dDZ;
Double_t dDXB = pTrk->GetXdif(
fiDutAddr, pHit); // ignore pHit in calc of reference
Double_t dDY =
@@ -6650,7 +6649,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
Double_t dDT =
pHit->GetTime()
- pTrk->GetFitT(
- pHit->GetZ()); // pTrk->GetTdif(fStationType[iSt]);
+ pHit->GetZ()); // pTrk->GetTdif(fStationType[iSt]);
Double_t dDTB = pTrk->GetTdif(
fiDutAddr, pHit); // ignore pHit in calc of reference
@@ -6997,13 +6996,13 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
fhLHTime[iDet]->FindBin(hitpos_local[0], hitpos_local[1]);
Int_t iBinA = iBin - 1; // index in pointer array
if (0)
- LOG(info)
- << Form("Insert Dut hit for Det %d, Bin %d, x %f, y %f, poi ",
- iDet,
- iBinA,
- hitpos_local[0],
- hitpos_local[1])
- << fhLHTime[iDet];
+ LOG(info) << Form(
+ "Insert Dut hit for Det %d, Bin %d, x %f, y %f, poi ",
+ iDet,
+ iBinA,
+ hitpos_local[0],
+ hitpos_local[1])
+ << fhLHTime[iDet];
if (iBin <= 0
|| iBin > fhLHTime[iDet]->GetNbinsX()
@@ -7577,7 +7576,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
for (Int_t iHit = 0; iHit < tTracklet->GetNofHits(); iHit++) {
if (5
== CbmTofAddress::GetSmType(
- (tTracklet->GetTofHitPointer(iHit))->GetAddress())) {
+ (tTracklet->GetTofHitPointer(iHit))->GetAddress())) {
iNTrackletHits--;
}
}
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 4608f45bc8f3789c4c05cc1900396e2cd29114c4..021d1ed28caff1476c6ea943983242390e828061 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -376,8 +376,8 @@ void CbmTofCalibrator::FillCalHist(CbmTofTracklet* pTrk, Int_t iOpt) {
+ (1. - 2. * tDigi0->GetSide()) * hlocal_d[1]
/ fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc)
- pTrk->GetFitT(
- pHit
- ->GetZ()) //-fTrackletTools->GetTexpected(pTrk, iDetId, pHit)
+ pHit
+ ->GetZ()) //-fTrackletTools->GetTexpected(pTrk, iDetId, pHit)
+ fTofFindTracks->GetTOff(iDetId)
+ 2. * (1. - 2. * tDigi0->GetSide()) * (hlocal_d[1] - hlocal_f[1])
/ fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc));
@@ -397,8 +397,8 @@ void CbmTofCalibrator::FillCalHist(CbmTofTracklet* pTrk, Int_t iOpt) {
+ (1. - 2. * tDigi1->GetSide()) * hlocal_d[1]
/ fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc)
- pTrk->GetFitT(
- pHit
- ->GetZ()) //-fTrackletTools->GetTexpected(pTrk, iDetId, pHit)
+ pHit
+ ->GetZ()) //-fTrackletTools->GetTexpected(pTrk, iDetId, pHit)
+ fTofFindTracks->GetTOff(iDetId)
+ 2. * (1. - 2. * tDigi1->GetSide()) * (hlocal_d[1] - hlocal_f[1])
/ fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc));
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx
index 85db628c2241a2795c60291c007d7bd94ad1eb9d..82bc5b3a2e2d9327c520bbc2eaaba1ed1e12a36d 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx
@@ -2798,9 +2798,8 @@ Bool_t CbmTofEventClusterizer::FillHistos() {
|| (TMath::Sqrt(
TMath::Power(
pHit->GetX() - dzscal * pTrig[iSel]->GetX(), 2.)
- + TMath::Power(pHit->GetY()
- - dzscal * pTrig[iSel]->GetY(),
- 2.))
+ + TMath::Power(
+ pHit->GetY() - dzscal * pTrig[iSel]->GetY(), 2.))
< fdCaldXdYMax)) {
BSel[iSel] = kTRUE;
Double_t dX2Y2 = TMath::Sqrt(dSEl2dXdz * dSEl2dXdz
@@ -3243,11 +3242,11 @@ Bool_t CbmTofEventClusterizer::FillHistos() {
* (pHit->GetZ() - (pTrig[iSel]->GetZ()))),
2.)
+ TMath::Power(
- pHit->GetY()
- - (pTrig[iSel]->GetY()
- + ddYdZ[iSel]
- * (pHit->GetZ() - (pTrig[iSel]->GetZ()))),
- 2.))
+ pHit->GetY()
+ - (pTrig[iSel]->GetY()
+ + ddYdZ[iSel]
+ * (pHit->GetZ() - (pTrig[iSel]->GetZ()))),
+ 2.))
> 0.5 * fdCaldXdYMax)
continue; // refine position selection cut in cosmic measurement
dTcor[iSel] = 0.; // precaution
diff --git a/reco/detectors/tof/CbmTofFindTracks.cxx b/reco/detectors/tof/CbmTofFindTracks.cxx
index c34a9d76f584d7551345b3076e54ce52c1fa39ad..f5794c786b995af4fb9be4e1780e926fbaf41b37 100644
--- a/reco/detectors/tof/CbmTofFindTracks.cxx
+++ b/reco/detectors/tof/CbmTofFindTracks.cxx
@@ -1750,9 +1750,7 @@ void CbmTofFindTracks::FindVertex() {
w,
fMinNofHits);
- if (
- w
- > (Double_t)
+ if (w > (Double_t)
fMinNofHits) { // for further analysis request minimum number of hits
fVTXNorm += w;
fVTX_T += w * pTrk->GetFitT(0.);
@@ -1906,13 +1904,13 @@ void CbmTofFindTracks::FillHistograms() {
Double_t dDX =
pHit->GetX()
- pTrk->GetFitX(
- pHit->GetZ()); // - tPar->GetX() - tPar->GetTx()*dDZ;
+ pHit->GetZ()); // - tPar->GetX() - tPar->GetTx()*dDZ;
Double_t dDY =
pHit->GetY() - pTrk->GetFitY(pHit->GetZ()); // - tPar->GetTy()*dDZ;
Double_t dDT =
pHit->GetTime()
- pTrk->GetFitT(
- pHit->GetZ()); // pTrk->GetTdif(fMapStationRpcId[iSt]);
+ pHit->GetZ()); // pTrk->GetTdif(fMapStationRpcId[iSt]);
Double_t dDTB =
fTrackletTools->GetTdif(pTrk,
fMapStationRpcId[iSt],
@@ -1920,21 +1918,20 @@ void CbmTofFindTracks::FillHistograms() {
Double_t dTOT = pHit->GetCh() / 10.; // misuse of channel field
Double_t dZZ = pHit->GetZ() - tPar->GetZy(pHit->GetY());
- LOG(debug)
- << Form(" St %d Id 0x%08x Hit %2d, Z %6.2f - DX %6.2f, DY %6.2f, "
- "Z %6.2f, DT %6.2f, %6.2f, ZZ %6.2f, Tt %6.4f ",
- iSt,
- fMapStationRpcId[iSt],
- iH,
- pHit->GetZ(),
- dDX,
- dDY,
- dDZ,
- dDT,
- dDTB,
- dZZ,
- dTt)
- << tPar->ToString();
+ LOG(debug) << Form(
+ " St %d Id 0x%08x Hit %2d, Z %6.2f - DX %6.2f, DY %6.2f, "
+ "Z %6.2f, DT %6.2f, %6.2f, ZZ %6.2f, Tt %6.4f ",
+ iSt,
+ fMapStationRpcId[iSt],
+ iH,
+ pHit->GetZ(),
+ dDX,
+ dDY,
+ dDZ,
+ dDT,
+ dDTB,
+ dZZ,
+ dTt) << tPar->ToString();
vhPullX[iSt]->Fill(dDX);
vhPullY[iSt]->Fill(dDY);
@@ -2043,7 +2040,7 @@ void CbmTofFindTracks::FillHistograms() {
Double_t dDX =
pHit->GetX()
- pTrk->GetFitX(
- pHit->GetZ()); // - tPar->GetX() - tPar->GetTx()*dDZ;
+ pHit->GetZ()); // - tPar->GetX() - tPar->GetTx()*dDZ;
Double_t dDY =
pHit->GetY() - pTrk->GetFitY(pHit->GetZ()); // - tPar->GetTy()*dDZ;
//Double_t dDT = pHit->GetTime() - pTrk->GetFitT(pHit->GetR()); //pTrk->GetTdif(fMapStationRpcId[iSt]);
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 2d725e67eaefed1b613fa4a47842747d119968a1..f4eeebca7ad4f4c6a7eb11a929c7330bc52bd2e7 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -97,8 +97,8 @@ CbmTofTrackFinderNN::CbmTofTrackFinderNN(const CbmTofTrackFinderNN& finder)
}
// assignment operator
-CbmTofTrackFinderNN& CbmTofTrackFinderNN::
-operator=(const CbmTofTrackFinderNN& /*fSource*/) {
+CbmTofTrackFinderNN&
+CbmTofTrackFinderNN::operator=(const CbmTofTrackFinderNN& /*fSource*/) {
// do copy
// ... (too lazy) ...
// return the existing object
@@ -204,7 +204,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits,
fvTrkVec[iHit].size());
if (iAddr
== fFindTracks->GetAddrOfStation(
- iSt0)) { // generate new track seed
+ iSt0)) { // generate new track seed
LOG(debug) << Form(
"<I> TofTracklet seed St0 %2d, St1 %2d, Mul %2d, Hit %2d, addr = "
"0x%08x - X %6.2f, Y %6.2f Z %6.2f T %6.2f TM %lu",
@@ -270,7 +270,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits,
//if (iSmType1 == fFindTracks->GetStationType(1)) { // generate new track seed
if (iAddr1
== fFindTracks->GetAddrOfStation(
- iSt1)) { // generate new track seed
+ iSt1)) { // generate new track seed
Int_t iChId1 = pHit1->GetAddress();
CbmTofCell* fChannelInfo1 = fDigiPar->GetCell(iChId1);
Int_t iCh1 = CbmTofAddress::GetChannelId(iChId1);
@@ -829,7 +829,7 @@ void CbmTofTrackFinderNN::TrklSeed(Int_t iHit) {
//if (iSmType1 == fFindTracks->GetStationType(iDet1)) { // generate candidate for new track seed
if (iAddr1
== fFindTracks->GetAddrOfStation(
- iDet1)) { // generate candidate for new track seed
+ iDet1)) { // generate candidate for new track seed
Int_t iChId1 = pHit1->GetAddress();
CbmTofCell* fChannelInfo1 = fDigiPar->GetCell(iChId1);
Int_t iCh1 = CbmTofAddress::GetChannelId(iChId1);