Fixed incorrect rounding to ns in collision time calculation; Fixed bug with number of entries counter

Author: wpierozak

DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h

@@ -39,8 +39,8 @@ struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
 
   int16_t CollisionTimeAmpltudeUpper = 4096;
   int16_t CollisionTimeAmplitudeLower = 0;
-  int16_t CollisionTimeTimeLower = -2050;
-  int16_t CollisionTimeTimeUpper = 2050;
+  int16_t CollisionTimeTimeLower = -500;
+  int16_t CollisionTimeTimeUpper = 500;
 
   uint8_t CollisionTimeValidPmInputFlagMask = static_cast<uint8_t>(~(1u << ChannelData::kNumberADC));
   uint8_t CollisionTimeValidPmInputFlags = static_cast<uint8_t>((1u << ChannelData::kIsCFDinADCgate) | (1u << ChannelData::kIsEventInTVDC));
@@ -49,12 +49,12 @@ struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
     return (flags & CollisionTimeValidPmInputFlagMask) == CollisionTimeValidPmInputFlags;
   }
 
-  float SwTriggerTimeLowThreshold = -1.25;
-  float SwTriggerTimeHighThreshold = 1.25;
-  float SwTriggerAmplitudeLowThreshold = 0.0;
-  float SwTriggerAmplitudeHighThreshold = 4096.0;
-  float SwTriggerTimeDiffMin = -1.25;
-  float SwTriggerTimeDiffMax = 1.25;
+  int16_t SwTriggerTimeLowThreshold = -153;
+  int16_t SwTriggerTimeHighThreshold = 153;
+  int16_t SwTriggerAmplitudeLowThreshold = 10;
+  int16_t SwTriggerAmplitudeHighThreshold = 4096;
+  float SwTriggerTimeDiffMin = -1.3;
+  float SwTriggerTimeDiffMax = 1.3;
   bool SwTriggerEnabled = false;
 
   O2ParamDef(FDDRecoConfig, "FDDRecoConfig");

Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx

@@ -27,13 +27,7 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
                             std::vector<o2::fdd::RecPoint>& RecPoints, std::vector<o2::fdd::ChannelDataFloat>& outChData)
 // gsl::span<o2::fdd::ChannelDataFloat> outChData)
 {
-  // Compute charge weighted average time
-  Double_t timeFDA = 0, timeFDC = 0;
-  Double_t weightFDA = 0.0, weightFDC = 0.0;
-  Int_t nInTimeA = 0, nInTimeC = 0;
-  int firstEntry = outChData.size();
-  int nStored = 0;
-  int nch = inChData.size();
+  const int firstEntry = outChData.size();
 
   bool atLeastOneVertexChannel = false;
   bool atLeastOneChannelInSwAmplitudeRange = false;
@@ -81,19 +75,19 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
   }
 
   constexpr float nsToPs = 1e3;
-  float meanTimeSideA = std::round(float(timeSideA) * timePerTDC / float(entriesNumSideA));
-  float meanTimeSideC = std::round(float(timeSideC) * timePerTDC / float(entriesNumSideC));
+  float meanTimeSideA = float(timeSideA) * timePerTDC / float(entriesNumSideA);
+  float meanTimeSideC = float(timeSideC) * timePerTDC / float(entriesNumSideC);
 
   bool swVertexTrg = FDDRecoConfig::Instance().SwTriggerEnabled ? calculateSwTrigger(meanTimeSideA, meanTimeSideC, swOrGateSideA, swOrGateSideC) : false;
 
   std::array<int, 2> mCollisionTime = {o2::fdd::RecPoint::sDummyCollissionTime, o2::fdd::RecPoint::sDummyCollissionTime};
   if (entriesNumSideA > 0) {
-    mCollisionTime[o2::fdd::RecPoint::TimeA] = meanTimeSideA * nsToPs;
+    mCollisionTime[o2::fdd::RecPoint::TimeA] = std::round(meanTimeSideA * nsToPs);
   }
   if (entriesNumSideC > 0) {
-    mCollisionTime[o2::fdd::RecPoint::TimeC] = meanTimeSideC * nsToPs;
+    mCollisionTime[o2::fdd::RecPoint::TimeC] = std::round(meanTimeSideC * nsToPs);
   }
-  RecPoints.emplace_back(mCollisionTime, firstEntry, nStored, digitBC.getIntRecord(), digitBC.mTriggers, swVertexTrg);
+  RecPoints.emplace_back(mCollisionTime, firstEntry, storedEntries, digitBC.getIntRecord(), digitBC.mTriggers, swVertexTrg);
 }
 //________________________________________________________
 void Reconstructor::finish()