Fix rounding in InteractionRecord::ns2bc

shahor02 · shahor02 · commit 0bbc1ba53dfb · 2023-06-02T10:09:23.000+02:00
diff --git a/DataFormats/common/include/CommonDataFormat/InteractionRecord.h b/DataFormats/common/include/CommonDataFormat/InteractionRecord.h
@@ -71,9 +71,9 @@ struct InteractionRecord {
 
   static int ns2bc(double ns, unsigned int& orb)
   {
-    orb = ns > 0 ? ns / o2::constants::lhc::LHCOrbitNS : 0;
-    ns -= orb * o2::constants::lhc::LHCOrbitNS;
-    return std::round(ns / o2::constants::lhc::LHCBunchSpacingNS);
+    long nb = std::round(ns / o2::constants::lhc::LHCBunchSpacingNS);
+    orb = nb / o2::constants::lhc::LHCMaxBunches;
+    return nb % o2::constants::lhc::LHCMaxBunches;
   }
 
   double bc2ns() const

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ struct InteractionRecord {`
`71`	`71`
`72`	`72`	`static int ns2bc(double ns, unsigned int& orb)`
`73`	`73`	`{`
`74`		`- orb = ns > 0 ? ns / o2::constants::lhc::LHCOrbitNS : 0;`
`75`		`- ns -= orb * o2::constants::lhc::LHCOrbitNS;`
`76`		`- return std::round(ns / o2::constants::lhc::LHCBunchSpacingNS);`
	`74`	`+ long nb = std::round(ns / o2::constants::lhc::LHCBunchSpacingNS);`
	`75`	`+ orb = nb / o2::constants::lhc::LHCMaxBunches;`
	`76`	`+ return nb % o2::constants::lhc::LHCMaxBunches;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`double bc2ns() const`