Merge remote-tracking branch 'upstream/master' into checkTracking

src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp

@@ -507,8 +507,11 @@ void AnalysisEfficiency::finalize(const std::shared_ptr<ReadonlyClipboard>&) {
                 << "Accepted tracks:            " << total_tracks;
 
     double totalEff = 100 * static_cast<double>(matched_tracks) / (total_tracks > 0 ? total_tracks : 1);
-    LOG(STATUS) << "Total efficiency of detector " << m_detector->getName() << ": " << totalEff << "%, measured with "
-                << matched_tracks << "/" << total_tracks << " matched/total tracks";
+    double lowerEffError = totalEff - 100 * (TEfficiency::ClopperPearson(total_tracks, matched_tracks, 0.683, false));
+    double upperEffError = 100 * (TEfficiency::ClopperPearson(total_tracks, matched_tracks, 0.683, true)) - totalEff;
+    LOG(STATUS) << "Total efficiency of detector " << m_detector->getName() << ": " << totalEff << "(+" << upperEffError
+                << " -" << lowerEffError << ")%, measured with " << matched_tracks << "/" << total_tracks
+                << " matched/total tracks";
 
     for(int icol = 1; icol < m_detector->nPixels().X() + 1; icol++) {
         for(int irow = 1; irow < m_detector->nPixels().Y() + 1; irow++) {

testing/CMakeLists.txt

@@ -28,7 +28,7 @@ FUNCTION(ESCAPE_REGEX INP OUTPUT)
     # Escape possible regex patterns in the expected output:
     STRING(REPLACE "#PASS " "" _TMP_STR "${INP}")
     STRING(REPLACE "#FAIL " "" _TMP_STR "${_TMP_STR}")
-    STRING(REGEX REPLACE "([][+.*()^])" "\\\\\\1" _TMP_STR "${_TMP_STR}")
+    STRING(REGEX REPLACE "([][+-.*()^])" "\\\\\\1" _TMP_STR "${_TMP_STR}")
     SET(${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
 ENDFUNCTION()
 

testing/test_io_read_rootobj.conf

@@ -19,10 +19,11 @@ time_cut_frameedge = 10ns
 
 
 #DEPENDS test_io_write_rootobj.conf
-#PASS Total efficiency of detector W0013_G02: 100%, measured with 34446/34446 matched/total tracks
+#PASS Total efficiency of detector W0013_G02: 100(+0 -0.00534736)%, measured with 34446/34446 matched/total tracks
+
 # Please note:
 # Pixels are masked in the [EventLoaderTimepix3] when reading in the online configuration files.
 # Therefore, no pixels are masked here and the number of associated tracks is slightly higher than
 # in "test_io_write_obj.conf":
 #
-#   Total efficiency of detector W0013_G02: 100%, measured with 31816/31816 matched/total tracks
+#Total efficiency of detector W0013_G02: 100(+0 -0.00534736)%, measured with 34446/34446 matched/total tracks