Merge branch 'roneil-master-patch-96092' into 'master'

Updated tests to follow new multiplicity counter added in Rec!3322

See merge request !853

DaVinciTests/tests/qmtest/functors.qms/test_thor_functors.qmt

@@ -29,7 +29,7 @@
   <text>DaVinciTests.functors:main</text>
 </set></argument>
 <argument name="validator"><text>
-findReferenceBlock("""TightD02KK                                                     INFO Number of counters : 6
+findReferenceBlock("""TightD02KK                                                     INFO Number of counters : 7
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"# passed"                                      |        21 |         19 |( 90.47619 +- 6.405645)% |
  |*"# passed CombinationCut"                       |       803 |         39 |( 4.856787 +- 0.7585875)% |
@@ -37,6 +37,7 @@ findReferenceBlock("""TightD02KK
  |*"# passed vertex fit"                           |        39 |         39 |( 100.0000 +- 0.000000)% |
  | "Input1 size"                                   |        21 |        258 |     12.286 |
  | "Input2 size"                                   |        21 |        258 |     12.286 |
+ | "candidate multiplicity"                        |        21 |         39 |     1.8571 |     1.1249 |       0.0000 |      4.0000 |
 """, stdout, result, causes, signature_offset = 0, id = "Stream3")
 countErrorLines({"FATAL":0, "ERROR":0})
 </text></argument>

DaVinciTests/tests/qmtest/io.qms/test_read_moore_dst.qmt

@@ -26,7 +26,7 @@
     input_process: Brunel
   </text></argument>
 <argument name="validator"><text>
-findReferenceBlock("""StdLooseD02KK                                                  INFO Number of counters : 6
+findReferenceBlock("""StdLooseD02KK                                                  INFO Number of counters : 7
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"# passed"                                      |        21 |         21 |( 100.0000 +- 0.000000)% |
  |*"# passed CombinationCut"                       |      2484 |         90 |( 3.623188 +- 0.3749350)% |
@@ -34,6 +34,7 @@ findReferenceBlock("""StdLooseD02KK
  |*"# passed vertex fit"                           |        90 |         90 |( 100.0000 +- 0.000000)% |
  | "Input1 size"                                   |        21 |        423 |     20.143 |
  | "Input2 size"                                   |        21 |        423 |     20.143 |
+ | "candidate multiplicity"                        |        21 |         83 |     3.9524 |     2.8364 |      1.0000 |      12.000 |
 """, stdout, result, causes, signature_offset = 0, id = "Stream3")
 countErrorLines({"FATAL":0, "ERROR":0})
 </text></argument>