diff --git a/core/base/CbmTrackingDetectorInterfaceBase.cxx b/core/base/CbmTrackingDetectorInterfaceBase.cxx
index 6fd5b1bd5d872aa959d08d44c7dfc30c61dbd1cc..28994558d29a47a90662e2f0a6148b49a0a792b4 100644
--- a/core/base/CbmTrackingDetectorInterfaceBase.cxx
+++ b/core/base/CbmTrackingDetectorInterfaceBase.cxx
@@ -81,13 +81,6 @@ bool CbmTrackingDetectorInterfaceBase::Check() const
msg << prefix << " NaN back strips stereo angle (" << angleB << " rad)\n";
res = false && res;
}
-
- // Time resolution
- auto timeRes = this->GetTimeResolution(iSt);
- if (timeRes < std::numeric_limits<double>::epsilon() || std::isnan(timeRes)) {
- msg << prefix << " zero, negative or NaN time resolution (" << timeRes << " cm)\n";
- res = false && res;
- }
}
// Position along beam axis
@@ -128,7 +121,6 @@ std::string CbmTrackingDetectorInterfaceBase::ToString() const
table << setw(10) << setfill(' ') << "R_max[cm]" << ' ';
table << setw(10) << setfill(' ') << "x_max[cm]" << ' ';
table << setw(10) << setfill(' ') << "y_max[cm]" << ' ';
- table << setw(12) << setfill(' ') << "res.time[ns]" << ' ';
table << setw(11) << setfill(' ') << "angleF[rad]" << ' ';
table << setw(11) << setfill(' ') << "angleB[rad]" << ' ';
table << setw(10) << setfill(' ') << "dz [cm]" << ' ';
@@ -140,7 +132,6 @@ std::string CbmTrackingDetectorInterfaceBase::ToString() const
table << setw(10) << setfill(' ') << GetRmax(iSt) << ' ';
table << setw(10) << setfill(' ') << GetXmax(iSt) << ' ';
table << setw(10) << setfill(' ') << GetYmax(iSt) << ' ';
- table << setw(12) << setfill(' ') << GetTimeResolution(iSt) << ' ';
table << setw(11) << setfill(' ') << GetStripsStereoAngleFront(iSt) << ' ';
table << setw(11) << setfill(' ') << GetStripsStereoAngleBack(iSt) << ' ';
table << setw(10) << setfill(' ') << GetThickness(iSt) << ' ';
diff --git a/core/base/CbmTrackingDetectorInterfaceBase.h b/core/base/CbmTrackingDetectorInterfaceBase.h
index ad1c9fb5a7b5827405804e20887f2d7c1fa16a3b..d14c9364305bff9c182359a72cdb1b59e4112c78 100644
--- a/core/base/CbmTrackingDetectorInterfaceBase.h
+++ b/core/base/CbmTrackingDetectorInterfaceBase.h
@@ -63,11 +63,6 @@ public:
/// \return Station thickness [cm]
virtual double GetThickness(int stationId) const = 0;
- /// Gets time resolution for a station
- /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
- /// \return Time resolution [ns]
- virtual double GetTimeResolution(int stationId) const = 0;
-
/// Gets a tracking station of a CbmPixelHit
/// \param hit A pointer to CbmPixelHit
/// \return Local index of the tracking station
diff --git a/core/detectors/much/CbmMuchTrackingInterface.h b/core/detectors/much/CbmMuchTrackingInterface.h
index 348d40e0723836fe6022a7279b996d1073d1e161..aa9a5440a5766c5c5f01c6518e821a93ba907c13 100644
--- a/core/detectors/much/CbmMuchTrackingInterface.h
+++ b/core/detectors/much/CbmMuchTrackingInterface.h
@@ -87,11 +87,6 @@ public:
/// \return Station thickness [cm]
double GetThickness(int stationId) const { return GetMuchLayer(stationId)->GetDz(); };
- /// Gets time resolution for a station
- /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
- /// \return Time resolution [ns]
- double GetTimeResolution(int /*stationId*/) const { return 3.9; }
-
/// Gets a tracking station of a CbmPixelHit
/// \param hit A pointer to CbmPixelHit
/// \return Local index of the tracking station
diff --git a/core/detectors/sts/CbmStsTrackingInterface.h b/core/detectors/sts/CbmStsTrackingInterface.h
index 72af70ac787212c07ba382bd1b5bc3ab87841049..44dddd5519e3c737de72eaabdc712df193d74dcb 100644
--- a/core/detectors/sts/CbmStsTrackingInterface.h
+++ b/core/detectors/sts/CbmStsTrackingInterface.h
@@ -86,11 +86,6 @@ public:
/// \return Station thickness [cm]
double GetThickness(int stationId) const { return GetStsStation(stationId)->GetSensorD(); }
- /// Gets time resolution for a station
- /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
- /// \return Time resolution [ns]
- double GetTimeResolution(int /*stationId*/) const { return 5.; }
-
/// Gets a tracking station of a CbmPixelHit
/// \param hit A pointer to CbmPixelHit
/// \return Local index of the tracking station
diff --git a/core/detectors/tof/CbmTofTrackingInterface.h b/core/detectors/tof/CbmTofTrackingInterface.h
index c94fa74a84db6a9338d31ddb9186c544992cbd13..205e29599b5b7b1eb9593b70917abc9a47027e47 100644
--- a/core/detectors/tof/CbmTofTrackingInterface.h
+++ b/core/detectors/tof/CbmTofTrackingInterface.h
@@ -83,11 +83,6 @@ public:
/// \return Station thickness [cm]
double GetThickness(int /*stationId*/) const { return 10.; }
- /// Gets time resolution for a station
- /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
- /// \return Time resolution [ns]
- double GetTimeResolution(int /*stationId*/) const { return 0.075; }
-
/// Gets a tracking station of a ToF hit
/// \param hit A pointer to ToF hit
/// \return Local index of the tracking station
diff --git a/core/detectors/trd/CbmTrdTrackingInterface.h b/core/detectors/trd/CbmTrdTrackingInterface.h
index f6e94dfff38844dd793d6b70d13347749b7930df..fd732b9282149fe9b6fe6ba8d7bc07a054edb83a 100644
--- a/core/detectors/trd/CbmTrdTrackingInterface.h
+++ b/core/detectors/trd/CbmTrdTrackingInterface.h
@@ -83,11 +83,6 @@ public:
/// \return Station thickness [cm]
double GetThickness(int stationId) const { return 2. * GetTrdModulePar(stationId)->GetSizeZ(); }
- /// Gets time resolution for a station
- /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
- /// \return Time resolution [ns]
- double GetTimeResolution(int /*stationId*/) const { return 10.; }
-
/// Gets a tracking station of a CbmPixelHit
/// \param hit A pointer to CbmPixelHit
/// \return Local index of the tracking station
diff --git a/mvd/CbmMvdTrackingInterface.h b/mvd/CbmMvdTrackingInterface.h
index b319bb9527cdff7c0d53436444ebc6f69cd056ea..fdb6af21b93ec9e6d81bd4dff2b1867e51a4fad9 100644
--- a/mvd/CbmMvdTrackingInterface.h
+++ b/mvd/CbmMvdTrackingInterface.h
@@ -101,11 +101,6 @@ public:
/// \return Station thickness [cm]
double GetThickness(int stationId) const { return fMvdStationPar->GetZThickness(stationId); }
- /// Gets time resolution for a tracking station
- /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
- /// \return Time resolution [ns]
- double GetTimeResolution(int /*stationId*/) const { return 1000.; }
-
/// Gets a tracking station of a CbmPixelHit
/// \param hit A pointer to CbmPixelHit
/// \return Local index of the tracking station
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 7373ce8608e264a68d0c890382bcd78fa2c04292..0340a376e330f950f7fc4df3f41946450476c362 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -466,7 +466,6 @@ InitStatus CbmL1::Init()
auto stationInfo = L1BaseStationInfo(L1DetectorID::kMvd, iSt);
stationInfo.SetStationType(1); // MVD
stationInfo.SetTimeInfo(mvdInterface->IsTimeInfoProvided(iSt));
- stationInfo.SetTimeResolution(mvdInterface->GetTimeResolution(iSt));
stationInfo.SetFieldStatus(fTrackingMode == L1Algo::TrackingMode::kMcbm ? 0 : 1);
stationInfo.SetZ(mvdInterface->GetZ(iSt));
stationInfo.SetXmax(mvdInterface->GetXmax(iSt));
@@ -493,7 +492,6 @@ InitStatus CbmL1::Init()
stationInfo.SetTimeInfo(stsInterface->IsTimeInfoProvided(iSt));
stationInfo.SetTimeInfo(L1Algo::TrackingMode::kMcbm != fTrackingMode ? stsInterface->IsTimeInfoProvided(iSt)
: false);
- stationInfo.SetTimeResolution(stsInterface->GetTimeResolution(iSt));
stationInfo.SetFieldStatus(L1Algo::TrackingMode::kMcbm == fTrackingMode ? 0 : 1);
stationInfo.SetZ(stsInterface->GetZ(iSt));
stationInfo.SetXmax(stsInterface->GetXmax(iSt));
@@ -520,7 +518,6 @@ InitStatus CbmL1::Init()
stationInfo.SetTimeInfo(muchInterface->IsTimeInfoProvided(iSt));
stationInfo.SetTimeInfo(L1Algo::TrackingMode::kMcbm != fTrackingMode ? stsInterface->IsTimeInfoProvided(iSt)
: false);
- stationInfo.SetTimeResolution(muchInterface->GetTimeResolution(iSt));
stationInfo.SetFieldStatus(0);
stationInfo.SetZ(muchInterface->GetZ(iSt));
stationInfo.SetXmax(muchInterface->GetXmax(iSt));
@@ -547,7 +544,6 @@ InitStatus CbmL1::Init()
stationInfo.SetTimeInfo(trdInterface->IsTimeInfoProvided(iSt));
stationInfo.SetTimeInfo(L1Algo::TrackingMode::kMcbm != fTrackingMode ? stsInterface->IsTimeInfoProvided(iSt)
: false);
- stationInfo.SetTimeResolution(trdInterface->GetTimeResolution(iSt));
stationInfo.SetFieldStatus(0);
stationInfo.SetZ(trdInterface->GetZ(iSt));
stationInfo.SetXmax(trdInterface->GetXmax(iSt));
@@ -558,10 +554,7 @@ InitStatus CbmL1::Init()
stationInfo.SetMaterialMap(std::move(materialTableTrd[iSt]));
fscal trdFrontPhi = trdInterface->GetStripsStereoAngleFront(iSt);
fscal trdBackPhi = trdInterface->GetStripsStereoAngleBack(iSt);
- if (L1Algo::TrackingMode::kGlobal == fTrackingMode) {
- // stationInfo.SetTimeResolution(1.e10);
- stationInfo.SetTimeInfo(false);
- }
+ if (L1Algo::TrackingMode::kGlobal == fTrackingMode) { stationInfo.SetTimeInfo(false); }
stationInfo.SetFrontBackStripsGeometry(trdFrontPhi, trdBackPhi);
stationInfo.SetTrackingStatus(target.z < stationInfo.GetZdouble() ? true : false);
if (iSt == 1 && L1Algo::TrackingMode::kMcbm == fTrackingMode && fMissingHits) {
@@ -581,7 +574,6 @@ InitStatus CbmL1::Init()
stationInfo.SetTimeInfo(tofInterface->IsTimeInfoProvided(iSt));
stationInfo.SetTimeInfo(L1Algo::TrackingMode::kMcbm != fTrackingMode ? stsInterface->IsTimeInfoProvided(iSt)
: false);
- stationInfo.SetTimeResolution(tofInterface->GetTimeResolution(iSt));
stationInfo.SetFieldStatus(0);
stationInfo.SetZ(tofInterface->GetZ(iSt));
auto thickness = tofInterface->GetThickness(iSt);
diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx
index d4d7132fbcc44ba659bfc3960de073614fbdd19d..5ac7aac61114076644fdbf119be0ba8c2269f680 100644
--- a/reco/L1/CbmL1ReadEvent.cxx
+++ b/reco/L1/CbmL1ReadEvent.cxx
@@ -114,14 +114,14 @@ struct TmpHit {
/// \param NStrips
/// \param st reference to the station info object
void CreateHitFromPoint(const CbmL1MCPoint& point, int ip, int det, int nTmpHits, int& NStrips, const L1Station& st,
- double du_, double dv_, bool doSmear)
+ double du_, double dv_, double dt_, bool doSmear)
{
ExtIndex = 0;
Det = det;
id = nTmpHits;
iStation = point.iStation;
- dt = st.dt[0];
+ dt = dt_;
time = point.time;
iStripF = NStrips;
@@ -743,8 +743,9 @@ void CbmL1::ReadEvent(float& TsStart, float& TsLength, float& /*TsOverlap*/, int
TmpHit th;
int DetId = 0;
double du = 5.e-4;
+ double dt = 1000.;
th.CreateHitFromPoint(p, ip, DetId, tmpHits.size(), NStrips, fpAlgo->GetParameters()->GetStation(p.iStation), du,
- du, true);
+ du, dt, true);
tmpHits.push_back(th);
nMvdHits++;
}
@@ -856,8 +857,9 @@ void CbmL1::ReadEvent(float& TsStart, float& TsLength, float& /*TsOverlap*/, int
TmpHit th;
int DetId = 1;
double du = 10.e-4;
+ double dt = 5.;
th.CreateHitFromPoint(p, ip, DetId, tmpHits.size(), NStrips, fpAlgo->GetParameters()->GetStation(p.iStation), du,
- du, true);
+ du, dt, true);
tmpHits.push_back(th);
nStsHits++;
}
@@ -971,8 +973,9 @@ void CbmL1::ReadEvent(float& TsStart, float& TsLength, float& /*TsOverlap*/, int
TmpHit th;
int DetId = 2;
double du = 100.e-4;
+ double dt = 3.9;
th.CreateHitFromPoint(p, ip, DetId, tmpHits.size(), NStrips, fpAlgo->GetParameters()->GetStation(p.iStation), du,
- du, true);
+ du, dt, true);
tmpHits.push_back(th);
nMuchHits++;
@@ -1104,8 +1107,9 @@ void CbmL1::ReadEvent(float& TsStart, float& TsLength, float& /*TsOverlap*/, int
TmpHit th;
int DetId = 3;
double du = 0.1;
+ double dt = 10.;
th.CreateHitFromPoint(p, ip, DetId, tmpHits.size(), NStrips, fpAlgo->GetParameters()->GetStation(p.iStation), du,
- du, true);
+ du, dt, true);
tmpHits.push_back(th);
nTrdHits++;
}
@@ -1200,8 +1204,9 @@ void CbmL1::ReadEvent(float& TsStart, float& TsLength, float& /*TsOverlap*/, int
TmpHit th;
int DetId = 4;
double du = 0.1;
+ double dt = 0.075;
th.CreateHitFromPoint(p, ip, DetId, tmpHits.size(), NStrips, fpAlgo->GetParameters()->GetStation(p.iStation), du,
- du, true);
+ du, dt, true);
tmpHits.push_back(th);
nTofHits++;
}
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index b7a7b54b07b30a38b301d39119f09056874ad3a1..9331b0ddfa744a88424aea3810f096f0b5c8297d 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -418,6 +418,7 @@ public:
fscal fMaxDx[L1Constants::size::kMaxNstations];
fscal fMaxDy[L1Constants::size::kMaxNstations];
+ fscal fMaxDt[L1Constants::size::kMaxNstations];
double fCATime {0.}; // time of track finding
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.cxx b/reco/L1/L1Algo/L1BaseStationInfo.cxx
index 01a93f090b03b2fe1ffbe53b25b13647c2ea2b21..9238022d58140cbcabb1354f9728356f94593e1d 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.cxx
+++ b/reco/L1/L1Algo/L1BaseStationInfo.cxx
@@ -411,13 +411,6 @@ void L1BaseStationInfo::SetTimeInfo(int inTimeInfo)
fInitController.SetFlag(EInitKey::kTimeInfo);
}
-//------------------------------------------------------------------------------------------------------------------------
-//
-void L1BaseStationInfo::SetTimeResolution(double dt)
-{
- fL1Station.dt = dt;
- fInitController.SetFlag(EInitKey::kTimeResolution);
-}
//------------------------------------------------------------------------------------------------------------------------
//
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index b896f27f96603290e34f64e70cd07136edd97278..7eb6b37106c89ada22be1d47392d41ae6ecfbaf6 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -57,7 +57,6 @@ public:
kFieldSlice, ///< L1Station.L1FieldSlice object initialization
kStripsFrontPhi, ///< strips geometry initialization
kStripsBackPhi, ///<
- kTimeResolution, ///< time resolution
// The last item is equal to the number of bits in fInitFlags
kEnd
};
@@ -143,9 +142,6 @@ public:
/// Gets station type
int GetStationType() const { return fL1Station.type; }
- /// Gets time resolution
- fvec GetTimeResolution() const { return fL1Station.dt; }
-
/// Gets tracking status: true - station is active for tracking, false - station exists, but not used in tracking
bool GetTrackingStatus() const { return fTrackingStatus; }
@@ -214,9 +210,6 @@ public:
/// 1 - time information is provided by the detector and can be used in tracking
void SetTimeInfo(int inTimeInfo);
- /// Sets time resolution
- void SetTimeResolution(double dt);
-
/// Sets tracking status: true - station is active for tracking, false - station exists, but not used in tracking
void SetTrackingStatus(bool flag);
diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx
index cd8d74c14415a183f20595bb2851044ee4356da1..e77be40a97b2feb056a5be6f2ead4167ba7b975f 100644
--- a/reco/L1/L1Algo/L1CATrackFinder.cxx
+++ b/reco/L1/L1Algo/L1CATrackFinder.cxx
@@ -1655,6 +1655,7 @@ void L1Algo::CATrackFinder()
const L1Station& st = fParameters.GetStation(iS);
fMaxDx[iS] = 0.;
fMaxDy[iS] = 0.;
+ fMaxDt[iS] = 0.;
bool timeUninitialised = 1;
fscal lasttime = 0;
fscal starttime = 0;
@@ -1663,8 +1664,11 @@ void L1Algo::CATrackFinder()
auto [dxx, dxy, dyy] = st.FormXYCovarianceMatrix(h.du2, h.dv2);
fscal dx = sqrt(dxx);
fscal dy = sqrt(dyy);
+ fscal dt = sqrt(h.dt2);
+
if (fMaxDx[iS] < dx) { fMaxDx[iS] = dx; }
if (fMaxDy[iS] < dy) { fMaxDy[iS] = dy; }
+ if (fMaxDt[iS] < dt) { fMaxDt[iS] = dt; }
const fscal time = h.t;
assert(std::isfinite(time));
diff --git a/reco/L1/L1Algo/L1Station.cxx b/reco/L1/L1Algo/L1Station.cxx
index 8e32bc91551f61f4382a513cbb72001acbe40240..85be4deca5a28ede207faa67c9e20ae9f1faf978 100644
--- a/reco/L1/L1Algo/L1Station.cxx
+++ b/reco/L1/L1Algo/L1Station.cxx
@@ -44,7 +44,6 @@ void L1Station::CheckConsistency() const
L1Utils::CheckSimdVectorEquality(fZ, "L1Station::fZ");
L1Utils::CheckSimdVectorEquality(Rmin, "L1Station::Rmin");
L1Utils::CheckSimdVectorEquality(Rmax, "L1Station::Rmax");
- L1Utils::CheckSimdVectorEquality(dt, "L1Station::dt");
/*
* Inner and outer radia checks:
@@ -59,16 +58,6 @@ void L1Station::CheckConsistency() const
throw std::logic_error(msg.str());
}
- /*
- * Time resolution cannot be smaller then 0
- */
-
- if (dt[0] < 0) {
- std::stringstream msg;
- msg << "L1Station: " << this->ToString() << " has incorrect time resolution value: "
- << "dt = " << dt[0] << " ns (expected positive)";
- throw std::logic_error(msg.str());
- }
/*
* Check consistency of other members
diff --git a/reco/L1/L1Algo/L1Station.h b/reco/L1/L1Algo/L1Station.h
index ddc3cb76e4d05eb621e951bd4722cf0880b59a3e..baa4638624718b46d2bc39c52cce1f1302587999 100644
--- a/reco/L1/L1Algo/L1Station.h
+++ b/reco/L1/L1Algo/L1Station.h
@@ -29,7 +29,7 @@ public:
fvec fZthick {L1NaN::SetNaN<decltype(fZthick)>()}; ///< z thickness of the station [cm]
fvec Rmin {L1NaN::SetNaN<decltype(Rmin)>()}; ///< min radius of the station [cm]
fvec Rmax {L1NaN::SetNaN<decltype(Rmax)>()}; ///< max radius of the station [cm]
- fvec dt {L1NaN::SetNaN<decltype(dt)>()}; ///< time resolution [ns]
+
L1FieldSlice fieldSlice {};
L1UMeasurementInfo frontInfo {};
L1UMeasurementInfo backInfo {};
@@ -49,7 +49,6 @@ public:
ar& fZthick;
ar& Rmin;
ar& Rmax;
- ar& dt;
ar& fieldSlice;
ar& frontInfo;