Fix firing channel mapping and add further diagnostic histograms to FIT bitmapping task

Author: sandor-lokos

PWGUD/Core/UDHelpers.h

@@ -560,28 +560,52 @@ inline void buildFT0FV0Words(TFT0 const& ft0, TFV0A const& fv0a,
   constexpr int kFV0Offset = 208;
 
   auto ampsA = ft0.amplitudeA();
-  const int nA = std::min<int>(ampsA.size(), 96);
-  for (int i = 0; i < nA; ++i) {
-    const auto a = ampsA[i];
-    setBit(thr1, kFT0AOffset + i, a >= thr1_FT0A);
-    setBit(thr2, kFT0AOffset + i, a >= thr2_FT0A);
-  }
+	auto chanA = ft0.channelA();
+	const int nA = std::min<int>(ampsA.size(), chanA.size());
+
+	for (int i = 0; i < nA; ++i) {
+		const auto a = ampsA[i];
+		const int c = chanA[i];
+
+		if (c < 0 || c >= 96) {
+			continue;
+		}
+
+		setBit(thr1, kFT0AOffset + c, a >= thr1_FT0A);
+		setBit(thr2, kFT0AOffset + c, a >= thr2_FT0A);
+	}
 
   auto ampsC = ft0.amplitudeC();
-  const int nC = std::min<int>(ampsC.size(), 112);
-  for (int i = 0; i < nC; ++i) {
-    const auto a = ampsC[i];
-    setBit(thr1, kFT0COffset + i, a >= thr1_FT0C);
-    setBit(thr2, kFT0COffset + i, a >= thr2_FT0C);
-  }
+	auto chanC = ft0.channelC();
+	const int nC = std::min<int>(ampsC.size(), chanC.size());
+
+	for (int i = 0; i < nC; ++i) {
+		const auto a = ampsC[i];
+		const int c = chanC[i]; // physical FT0C channel id
 
+		if (c < 0 || c >= 112) {
+			continue;
+		}
+
+		setBit(thr1, kFT0COffset + c, a >= thr1_FT0C);
+		setBit(thr2, kFT0COffset + c, a >= thr2_FT0C);
+	}
+	
   auto ampsV = fv0a.amplitude();
-  const int nV = std::min<int>(ampsV.size(), 48);
-  for (int i = 0; i < nV; ++i) {
-    const auto a = ampsV[i];
-    setBit(thr1, kFV0Offset + i, a >= thr1_FV0A);
-    setBit(thr2, kFV0Offset + i, a >= thr2_FV0A);
-  }
+	auto chanV = fv0a.channel();
+	const int nV = std::min<int>(ampsV.size(), chanV.size());
+
+	for (int i = 0; i < nV; ++i) {
+		const auto a = ampsV[i];
+		const int c = chanV[i];
+
+		if (c < 0 || c >= 48) {
+			continue;
+		}
+
+		setBit(thr1, kFV0Offset + c, a >= thr1_FV0A);
+		setBit(thr2, kFV0Offset + c, a >= thr2_FV0A);
+	}
 }
 
 // -----------------------------------------------------------------------------