HBFUtils getter for 1st IR of TF from arbitrary IR within TF

shahor02 · shahor02 · commit 1b9e39b2041f · 2020-07-11T23:39:30.000+02:00
Also, limit TF and HBF IDs to uint32_t.
diff --git a/Detectors/Raw/include/DetectorsRaw/HBFUtils.h b/Detectors/Raw/include/DetectorsRaw/HBFUtils.h
@@ -54,10 +54,10 @@ struct HBFUtils : public o2::conf::ConfigurableParamHelper<HBFUtils> {
   IR getIRTF(uint32_t tf) const { return getIRHBF(tf * nHBFPerTF); }
 
   ///< get HBF ID corresponding to this IR
-  int64_t getHBF(const IR& rec) const;
+  uint32_t getHBF(const IR& rec) const;
 
   ///< get TF ID corresponding to this IR
-  int64_t getTF(const IR& rec) const { return getHBF(rec) / nHBFPerTF; }
+  uint32_t getTF(const IR& rec) const { return getHBF(rec) / nHBFPerTF; }
 
   ///< get TF and HB (within TF) for this IR
   std::pair<int, int> getTFandHBinTF(const IR& rec) const
@@ -66,6 +66,9 @@ struct HBFUtils : public o2::conf::ConfigurableParamHelper<HBFUtils> {
     return std::pair<int, int>(hbf / nHBFPerTF, hbf % nHBFPerTF);
   }
 
+  ///< get 1st IR of the TF corresponding to provided interaction record
+  IR getFirstIRofTF(const IR& rec) const { return getIRTF(getTF(rec)); }
+
   ///< get TF and HB (abs) for this IR
   std::pair<int, int> getTFandHB(const IR& rec) const
   {
diff --git a/Detectors/Raw/src/HBFUtils.cxx b/Detectors/Raw/src/HBFUtils.cxx
@@ -20,7 +20,7 @@ using namespace o2::raw;
 O2ParamImpl(o2::raw::HBFUtils);
 
 //_________________________________________________
-int64_t HBFUtils::getHBF(const IR& rec) const
+uint32_t HBFUtils::getHBF(const IR& rec) const
 {
   ///< get HBF ID corresponding to this IR
   auto diff = rec.differenceInBC(getFirstIR());

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ using namespace o2::raw;`
`20`	`20`	`O2ParamImpl(o2::raw::HBFUtils);`
`21`	`21`
`22`	`22`	`//_________________________________________________`
`23`		`-int64_t HBFUtils::getHBF(const IR& rec) const`
	`23`	`+uint32_t HBFUtils::getHBF(const IR& rec) const`
`24`	`24`	`{`
`25`	`25`	`///< get HBF ID corresponding to this IR`
`26`	`26`	`auto diff = rec.differenceInBC(getFirstIR());`