Merge branch 'transfer_MR275_into_v1.0-stable' into 'v1.0-stable'

Transfer mr275 into v1.0 stable

See merge request !276

src/core/detector/Detector.cpp

@@ -383,14 +383,13 @@ bool Detector::hitMasked(Track* track, int tolerance) const {
 
 // Functions to get row and column from local position
 double Detector::getRow(const PositionVector3D<Cartesian3D<double>> localPosition) const {
-
-    double row = localPosition.Y() / m_pitch.Y() + static_cast<double>(m_nPixels.Y() - 1) / 2.;
+    // (1-m_nPixelsX%2)/2. --> add 1/2 pixel pitch if even number of rows
+    double row = localPosition.Y() / m_pitch.Y() + static_cast<double>(m_nPixels.Y()) / 2. + (1 - m_nPixels.Y() % 2) / 2.;
     return row;
 }
-
 double Detector::getColumn(const PositionVector3D<Cartesian3D<double>> localPosition) const {
-
-    double column = localPosition.X() / m_pitch.X() + static_cast<double>(m_nPixels.X() - 1) / 2.;
+    // (1-m_nPixelsX%2)/2. --> add 1/2 pixel pitch if even number of columns
+    double column = localPosition.X() / m_pitch.X() + static_cast<double>(m_nPixels.X()) / 2. + (1 - m_nPixels.X() % 2) / 2.;
     return column;
 }
 
@@ -398,7 +397,7 @@ double Detector::getColumn(const PositionVector3D<Cartesian3D<double>> localPosi
 PositionVector3D<Cartesian3D<double>> Detector::getLocalPosition(double column, double row) const {
 
     return PositionVector3D<Cartesian3D<double>>(
-        m_pitch.X() * (column - (m_nPixels.X() - 1) / 2.), m_pitch.Y() * (row - (m_nPixels.Y() - 1) / 2.), 0.);
+        m_pitch.X() * (column - m_nPixels.X() / 2), m_pitch.Y() * (row - m_nPixels.Y() / 2), 0.);
 }
 
 // Function to get in-pixel position

testing/test_read.conf

@@ -19,4 +19,4 @@ chi2ndof_cut = 8
 time_cut_frameedge = 10ns
 
 #DEPENDS test_write.conf
-#PASS Total efficiency of detector W0013_G02: 100%, measured with 32842/32842 matched/total tracks
+#PASS Total efficiency of detector W0013_G02: 100%, measured with 33304/33304 matched/total tracks

testing/test_timepix3tel_dut150um_ebeam120_sim.conf

@@ -24,4 +24,4 @@ spatial_cut_abs = 200um, 200um
 [AnalysisTelescope]
 
 #DATASET timepix3tel_dut150um_ebeam120_sim
-#PASS Ev: 3.3k Px: 70.2k Tr: 3.2k (0.958/ev) t = 33us
\ No newline at end of file
+#PASS Ev: 3.3k Px: 70.2k Tr: 3.2k (0.957/ev) t = 33us

testing/test_timepix3tel_ebeam120.conf

@@ -23,4 +23,4 @@ spatial_cut_abs = 200um, 200um
 
 
 #DATASET timepix3tel_ebeam120
-#PASS Ev: 18.8k Px: 6.23M Tr: 196.8k (10.5/ev) t = 3.76s
\ No newline at end of file
+#PASS Ev: 18.8k Px: 6.23M Tr: 197.4k (10.5/ev) t = 3.76s

testing/test_write.conf

@@ -29,4 +29,4 @@ chi2ndof_cut = 8
 time_cut_frameedge = 10ns
 
 #DATASET timepix3tel_ebeam120
-#PASS Total efficiency of detector W0013_G02: 99.9969%, measured with 32536/32537 matched/total tracks
+#PASS Total efficiency of detector W0013_G02: 100%, measured with 32993/32993 matched/total tracks