Simulation/ISF/ISF_Acts/ISF_ActsTools/src/ActsFatrasSimTool.h

@@ -159,8 +159,7 @@ class ActsFatrasSimTool : public BaseSimulatorTool {
       if (not result.ok()) {
         return result.error();
       }
-      auto &value = result.value().template get<Result>();
-      return std::move(value);
+      return result.value().template get<Result>();
     }
   };// end of SingleParticleSimulation
 

Tools/LWHists/src/LWHistControls.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -14,15 +14,16 @@
 
 #include "LWHists/LWHistControls.h"
 #include "LWPools.h"
+#include <atomic>
 
 //____________________________________________________________________
 class LWHistControls::Imp {
 public:
-  static bool s_cleanupOnGetROOT;
-  static bool s_rootBackend;
+  static std::atomic<bool> s_cleanupOnGetROOT;
+  static std::atomic<bool> s_rootBackend;
 };
-bool LWHistControls::Imp::s_cleanupOnGetROOT = true;
-bool LWHistControls::Imp::s_rootBackend = false;
+std::atomic<bool> LWHistControls::Imp::s_cleanupOnGetROOT = true;
+std::atomic<bool> LWHistControls::Imp::s_rootBackend = false;
 
 //____________________________________________________________________
 void LWHistControls::setCleanupOnGetROOT(bool b)

Tools/LWHists/src/LWPools.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -16,7 +16,7 @@
 
 //____________________________________________________________________
 LWPools::PoolList LWPools::s_pools;
-long long LWPools::s_bytesDynAlloc = 0;
+std::atomic<long long> LWPools::s_bytesDynAlloc = 0;
 
 //____________________________________________________________________
 LWPools::PoolList::PoolList()

Tools/LWHists/src/LWPools.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -20,6 +20,7 @@
 #include "LWPoolSelector.h"
 #include "LWPool.h"
 #include <cassert>
+#include <atomic>
 
 #define MP_NEW(Class) new(LWPools::acquire(sizeof(Class))) Class
 #define MP_DELETE(Ptr) LWPools::deleteObject(Ptr)
@@ -54,7 +55,7 @@ private:
 private:
   class PoolList;
   static PoolList s_pools;
-  static long long s_bytesDynAlloc;
+  static std::atomic<long long> s_bytesDynAlloc;
   static LWPool * initPool(unsigned poolIndex,unsigned length);
   static LWPool * getPool(unsigned length);
   LWPools( const LWPools & );

Tools/LWHists/src/tests/comphistfiles/jobflags.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
+#include <atomic>
+
+
+std::atomic<bool> cfg_report_NaN;
+std::atomic<bool> cfg_ignore_unsupported_style_vars;
+std::atomic<bool> cfg_ignore_errors_related_to_a_non_existant_sumw2_array;
 
-bool cfg_report_NaN;
-bool cfg_ignore_unsupported_style_vars;
-bool cfg_ignore_errors_related_to_a_non_existant_sumw2_array;

Tools/PROCTools/data/q443_AOD_content.ref

@@ -1044,438 +1044,6 @@ InDetTrackParticlesClusterAssociations
 InDetTrackParticlesClusterAssociationsAux.
 IncompleteCutBookkeepers
 IncompleteCutBookkeepersAux.
-IncompleteCutBookkeepers_weight_1
-IncompleteCutBookkeepers_weight_10
-IncompleteCutBookkeepers_weight_100
-IncompleteCutBookkeepers_weight_100Aux.
-IncompleteCutBookkeepers_weight_101
-IncompleteCutBookkeepers_weight_101Aux.
-IncompleteCutBookkeepers_weight_102
-IncompleteCutBookkeepers_weight_102Aux.
-IncompleteCutBookkeepers_weight_103
-IncompleteCutBookkeepers_weight_103Aux.
-IncompleteCutBookkeepers_weight_104
-IncompleteCutBookkeepers_weight_104Aux.
-IncompleteCutBookkeepers_weight_105
-IncompleteCutBookkeepers_weight_105Aux.
-IncompleteCutBookkeepers_weight_106
-IncompleteCutBookkeepers_weight_106Aux.
-IncompleteCutBookkeepers_weight_107
-IncompleteCutBookkeepers_weight_107Aux.
-IncompleteCutBookkeepers_weight_108
-IncompleteCutBookkeepers_weight_108Aux.
-IncompleteCutBookkeepers_weight_109
-IncompleteCutBookkeepers_weight_109Aux.
-IncompleteCutBookkeepers_weight_10Aux.
-IncompleteCutBookkeepers_weight_11
-IncompleteCutBookkeepers_weight_110
-IncompleteCutBookkeepers_weight_110Aux.
-IncompleteCutBookkeepers_weight_111
-IncompleteCutBookkeepers_weight_111Aux.
-IncompleteCutBookkeepers_weight_112
-IncompleteCutBookkeepers_weight_112Aux.
-IncompleteCutBookkeepers_weight_113
-IncompleteCutBookkeepers_weight_113Aux.
-IncompleteCutBookkeepers_weight_114
-IncompleteCutBookkeepers_weight_114Aux.
-IncompleteCutBookkeepers_weight_115
-IncompleteCutBookkeepers_weight_115Aux.
-IncompleteCutBookkeepers_weight_116
-IncompleteCutBookkeepers_weight_116Aux.
-IncompleteCutBookkeepers_weight_117
-IncompleteCutBookkeepers_weight_117Aux.
-IncompleteCutBookkeepers_weight_118
-IncompleteCutBookkeepers_weight_118Aux.
-IncompleteCutBookkeepers_weight_119
-IncompleteCutBookkeepers_weight_119Aux.
-IncompleteCutBookkeepers_weight_11Aux.
-IncompleteCutBookkeepers_weight_12
-IncompleteCutBookkeepers_weight_120
-IncompleteCutBookkeepers_weight_120Aux.
-IncompleteCutBookkeepers_weight_121
-IncompleteCutBookkeepers_weight_121Aux.
-IncompleteCutBookkeepers_weight_122
-IncompleteCutBookkeepers_weight_122Aux.
-IncompleteCutBookkeepers_weight_123
-IncompleteCutBookkeepers_weight_123Aux.
-IncompleteCutBookkeepers_weight_124
-IncompleteCutBookkeepers_weight_124Aux.
-IncompleteCutBookkeepers_weight_125
-IncompleteCutBookkeepers_weight_125Aux.
-IncompleteCutBookkeepers_weight_126
-IncompleteCutBookkeepers_weight_126Aux.
-IncompleteCutBookkeepers_weight_127
-IncompleteCutBookkeepers_weight_127Aux.
-IncompleteCutBookkeepers_weight_128
-IncompleteCutBookkeepers_weight_128Aux.
-IncompleteCutBookkeepers_weight_129
-IncompleteCutBookkeepers_weight_129Aux.
-IncompleteCutBookkeepers_weight_12Aux.
-IncompleteCutBookkeepers_weight_13
-IncompleteCutBookkeepers_weight_130
-IncompleteCutBookkeepers_weight_130Aux.
-IncompleteCutBookkeepers_weight_131
-IncompleteCutBookkeepers_weight_131Aux.
-IncompleteCutBookkeepers_weight_132
-IncompleteCutBookkeepers_weight_132Aux.
-IncompleteCutBookkeepers_weight_133
-IncompleteCutBookkeepers_weight_133Aux.
-IncompleteCutBookkeepers_weight_134
-IncompleteCutBookkeepers_weight_134Aux.
-IncompleteCutBookkeepers_weight_135
-IncompleteCutBookkeepers_weight_135Aux.
-IncompleteCutBookkeepers_weight_136
-IncompleteCutBookkeepers_weight_136Aux.
-IncompleteCutBookkeepers_weight_137
-IncompleteCutBookkeepers_weight_137Aux.
-IncompleteCutBookkeepers_weight_138
-IncompleteCutBookkeepers_weight_138Aux.
-IncompleteCutBookkeepers_weight_139
-IncompleteCutBookkeepers_weight_139Aux.
-IncompleteCutBookkeepers_weight_13Aux.
-IncompleteCutBookkeepers_weight_14
-IncompleteCutBookkeepers_weight_140
-IncompleteCutBookkeepers_weight_140Aux.
-IncompleteCutBookkeepers_weight_141
-IncompleteCutBookkeepers_weight_141Aux.
-IncompleteCutBookkeepers_weight_142
-IncompleteCutBookkeepers_weight_142Aux.
-IncompleteCutBookkeepers_weight_143
-IncompleteCutBookkeepers_weight_143Aux.
-IncompleteCutBookkeepers_weight_144
-IncompleteCutBookkeepers_weight_144Aux.
-IncompleteCutBookkeepers_weight_145
-IncompleteCutBookkeepers_weight_145Aux.
-IncompleteCutBookkeepers_weight_146
-IncompleteCutBookkeepers_weight_146Aux.
-IncompleteCutBookkeepers_weight_147
-IncompleteCutBookkeepers_weight_147Aux.
-IncompleteCutBookkeepers_weight_148
-IncompleteCutBookkeepers_weight_148Aux.
-IncompleteCutBookkeepers_weight_149
-IncompleteCutBookkeepers_weight_149Aux.
-IncompleteCutBookkeepers_weight_14Aux.
-IncompleteCutBookkeepers_weight_15
-IncompleteCutBookkeepers_weight_150
-IncompleteCutBookkeepers_weight_150Aux.
-IncompleteCutBookkeepers_weight_151
-IncompleteCutBookkeepers_weight_151Aux.
-IncompleteCutBookkeepers_weight_152
-IncompleteCutBookkeepers_weight_152Aux.
-IncompleteCutBookkeepers_weight_153
-IncompleteCutBookkeepers_weight_153Aux.
-IncompleteCutBookkeepers_weight_154
-IncompleteCutBookkeepers_weight_154Aux.
-IncompleteCutBookkeepers_weight_155
-IncompleteCutBookkeepers_weight_155Aux.
-IncompleteCutBookkeepers_weight_156
-IncompleteCutBookkeepers_weight_156Aux.
-IncompleteCutBookkeepers_weight_157
-IncompleteCutBookkeepers_weight_157Aux.
-IncompleteCutBookkeepers_weight_158
-IncompleteCutBookkeepers_weight_158Aux.
-IncompleteCutBookkeepers_weight_159
-IncompleteCutBookkeepers_weight_159Aux.
-IncompleteCutBookkeepers_weight_15Aux.
-IncompleteCutBookkeepers_weight_16
-IncompleteCutBookkeepers_weight_160
-IncompleteCutBookkeepers_weight_160Aux.
-IncompleteCutBookkeepers_weight_161
-IncompleteCutBookkeepers_weight_161Aux.
-IncompleteCutBookkeepers_weight_162
-IncompleteCutBookkeepers_weight_162Aux.
-IncompleteCutBookkeepers_weight_163
-IncompleteCutBookkeepers_weight_163Aux.
-IncompleteCutBookkeepers_weight_164
-IncompleteCutBookkeepers_weight_164Aux.
-IncompleteCutBookkeepers_weight_165
-IncompleteCutBookkeepers_weight_165Aux.
-IncompleteCutBookkeepers_weight_166
-IncompleteCutBookkeepers_weight_166Aux.
-IncompleteCutBookkeepers_weight_167
-IncompleteCutBookkeepers_weight_167Aux.
-IncompleteCutBookkeepers_weight_168
-IncompleteCutBookkeepers_weight_168Aux.
-IncompleteCutBookkeepers_weight_169
-IncompleteCutBookkeepers_weight_169Aux.
-IncompleteCutBookkeepers_weight_16Aux.
-IncompleteCutBookkeepers_weight_17
-IncompleteCutBookkeepers_weight_170
-IncompleteCutBookkeepers_weight_170Aux.
-IncompleteCutBookkeepers_weight_171
-IncompleteCutBookkeepers_weight_171Aux.
-IncompleteCutBookkeepers_weight_172
-IncompleteCutBookkeepers_weight_172Aux.
-IncompleteCutBookkeepers_weight_173
-IncompleteCutBookkeepers_weight_173Aux.
-IncompleteCutBookkeepers_weight_174
-IncompleteCutBookkeepers_weight_174Aux.
-IncompleteCutBookkeepers_weight_175
-IncompleteCutBookkeepers_weight_175Aux.
-IncompleteCutBookkeepers_weight_176
-IncompleteCutBookkeepers_weight_176Aux.
-IncompleteCutBookkeepers_weight_177
-IncompleteCutBookkeepers_weight_177Aux.
-IncompleteCutBookkeepers_weight_178
-IncompleteCutBookkeepers_weight_178Aux.
-IncompleteCutBookkeepers_weight_179
-IncompleteCutBookkeepers_weight_179Aux.
-IncompleteCutBookkeepers_weight_17Aux.
-IncompleteCutBookkeepers_weight_18
-IncompleteCutBookkeepers_weight_180
-IncompleteCutBookkeepers_weight_180Aux.
-IncompleteCutBookkeepers_weight_181
-IncompleteCutBookkeepers_weight_181Aux.
-IncompleteCutBookkeepers_weight_182
-IncompleteCutBookkeepers_weight_182Aux.
-IncompleteCutBookkeepers_weight_183
-IncompleteCutBookkeepers_weight_183Aux.
-IncompleteCutBookkeepers_weight_184
-IncompleteCutBookkeepers_weight_184Aux.
-IncompleteCutBookkeepers_weight_185
-IncompleteCutBookkeepers_weight_185Aux.
-IncompleteCutBookkeepers_weight_186
-IncompleteCutBookkeepers_weight_186Aux.
-IncompleteCutBookkeepers_weight_187
-IncompleteCutBookkeepers_weight_187Aux.
-IncompleteCutBookkeepers_weight_188
-IncompleteCutBookkeepers_weight_188Aux.
-IncompleteCutBookkeepers_weight_189
-IncompleteCutBookkeepers_weight_189Aux.
-IncompleteCutBookkeepers_weight_18Aux.
-IncompleteCutBookkeepers_weight_19
-IncompleteCutBookkeepers_weight_190
-IncompleteCutBookkeepers_weight_190Aux.
-IncompleteCutBookkeepers_weight_191
-IncompleteCutBookkeepers_weight_191Aux.
-IncompleteCutBookkeepers_weight_192
-IncompleteCutBookkeepers_weight_192Aux.
-IncompleteCutBookkeepers_weight_193
-IncompleteCutBookkeepers_weight_193Aux.
-IncompleteCutBookkeepers_weight_194
-IncompleteCutBookkeepers_weight_194Aux.
-IncompleteCutBookkeepers_weight_195
-IncompleteCutBookkeepers_weight_195Aux.
-IncompleteCutBookkeepers_weight_196
-IncompleteCutBookkeepers_weight_196Aux.
-IncompleteCutBookkeepers_weight_197
-IncompleteCutBookkeepers_weight_197Aux.
-IncompleteCutBookkeepers_weight_198
-IncompleteCutBookkeepers_weight_198Aux.
-IncompleteCutBookkeepers_weight_199
-IncompleteCutBookkeepers_weight_199Aux.
-IncompleteCutBookkeepers_weight_19Aux.
-IncompleteCutBookkeepers_weight_1Aux.
-IncompleteCutBookkeepers_weight_2
-IncompleteCutBookkeepers_weight_20
-IncompleteCutBookkeepers_weight_200
-IncompleteCutBookkeepers_weight_200Aux.
-IncompleteCutBookkeepers_weight_201
-IncompleteCutBookkeepers_weight_201Aux.
-IncompleteCutBookkeepers_weight_202
-IncompleteCutBookkeepers_weight_202Aux.
-IncompleteCutBookkeepers_weight_203
-IncompleteCutBookkeepers_weight_203Aux.
-IncompleteCutBookkeepers_weight_204
-IncompleteCutBookkeepers_weight_204Aux.
-IncompleteCutBookkeepers_weight_205
-IncompleteCutBookkeepers_weight_205Aux.
-IncompleteCutBookkeepers_weight_206
-IncompleteCutBookkeepers_weight_206Aux.
-IncompleteCutBookkeepers_weight_207
-IncompleteCutBookkeepers_weight_207Aux.
-IncompleteCutBookkeepers_weight_208
-IncompleteCutBookkeepers_weight_208Aux.
-IncompleteCutBookkeepers_weight_209
-IncompleteCutBookkeepers_weight_209Aux.
-IncompleteCutBookkeepers_weight_20Aux.
-IncompleteCutBookkeepers_weight_21
-IncompleteCutBookkeepers_weight_210
-IncompleteCutBookkeepers_weight_210Aux.
-IncompleteCutBookkeepers_weight_211
-IncompleteCutBookkeepers_weight_211Aux.
-IncompleteCutBookkeepers_weight_212
-IncompleteCutBookkeepers_weight_212Aux.
-IncompleteCutBookkeepers_weight_213
-IncompleteCutBookkeepers_weight_213Aux.
-IncompleteCutBookkeepers_weight_214
-IncompleteCutBookkeepers_weight_214Aux.
-IncompleteCutBookkeepers_weight_215
-IncompleteCutBookkeepers_weight_215Aux.
-IncompleteCutBookkeepers_weight_216
-IncompleteCutBookkeepers_weight_216Aux.
-IncompleteCutBookkeepers_weight_21Aux.
-IncompleteCutBookkeepers_weight_22
-IncompleteCutBookkeepers_weight_22Aux.
-IncompleteCutBookkeepers_weight_23
-IncompleteCutBookkeepers_weight_23Aux.
-IncompleteCutBookkeepers_weight_24
-IncompleteCutBookkeepers_weight_24Aux.
-IncompleteCutBookkeepers_weight_25
-IncompleteCutBookkeepers_weight_25Aux.
-IncompleteCutBookkeepers_weight_26
-IncompleteCutBookkeepers_weight_26Aux.
-IncompleteCutBookkeepers_weight_27
-IncompleteCutBookkeepers_weight_27Aux.
-IncompleteCutBookkeepers_weight_28
-IncompleteCutBookkeepers_weight_28Aux.
-IncompleteCutBookkeepers_weight_29
-IncompleteCutBookkeepers_weight_29Aux.
-IncompleteCutBookkeepers_weight_2Aux.
-IncompleteCutBookkeepers_weight_3
-IncompleteCutBookkeepers_weight_30
-IncompleteCutBookkeepers_weight_30Aux.
-IncompleteCutBookkeepers_weight_31
-IncompleteCutBookkeepers_weight_31Aux.
-IncompleteCutBookkeepers_weight_32
-IncompleteCutBookkeepers_weight_32Aux.
-IncompleteCutBookkeepers_weight_33
-IncompleteCutBookkeepers_weight_33Aux.
-IncompleteCutBookkeepers_weight_34
-IncompleteCutBookkeepers_weight_34Aux.
-IncompleteCutBookkeepers_weight_35
-IncompleteCutBookkeepers_weight_35Aux.
-IncompleteCutBookkeepers_weight_36
-IncompleteCutBookkeepers_weight_36Aux.
-IncompleteCutBookkeepers_weight_37
-IncompleteCutBookkeepers_weight_37Aux.
-IncompleteCutBookkeepers_weight_38
-IncompleteCutBookkeepers_weight_38Aux.
-IncompleteCutBookkeepers_weight_39
-IncompleteCutBookkeepers_weight_39Aux.
-IncompleteCutBookkeepers_weight_3Aux.
-IncompleteCutBookkeepers_weight_4
-IncompleteCutBookkeepers_weight_40
-IncompleteCutBookkeepers_weight_40Aux.
-IncompleteCutBookkeepers_weight_41
-IncompleteCutBookkeepers_weight_41Aux.
-IncompleteCutBookkeepers_weight_42
-IncompleteCutBookkeepers_weight_42Aux.
-IncompleteCutBookkeepers_weight_43
-IncompleteCutBookkeepers_weight_43Aux.
-IncompleteCutBookkeepers_weight_44
-IncompleteCutBookkeepers_weight_44Aux.
-IncompleteCutBookkeepers_weight_45
-IncompleteCutBookkeepers_weight_45Aux.
-IncompleteCutBookkeepers_weight_46
-IncompleteCutBookkeepers_weight_46Aux.
-IncompleteCutBookkeepers_weight_47
-IncompleteCutBookkeepers_weight_47Aux.
-IncompleteCutBookkeepers_weight_48
-IncompleteCutBookkeepers_weight_48Aux.
-IncompleteCutBookkeepers_weight_49
-IncompleteCutBookkeepers_weight_49Aux.
-IncompleteCutBookkeepers_weight_4Aux.
-IncompleteCutBookkeepers_weight_5
-IncompleteCutBookkeepers_weight_50
-IncompleteCutBookkeepers_weight_50Aux.
-IncompleteCutBookkeepers_weight_51
-IncompleteCutBookkeepers_weight_51Aux.
-IncompleteCutBookkeepers_weight_52
-IncompleteCutBookkeepers_weight_52Aux.
-IncompleteCutBookkeepers_weight_53
-IncompleteCutBookkeepers_weight_53Aux.
-IncompleteCutBookkeepers_weight_54
-IncompleteCutBookkeepers_weight_54Aux.
-IncompleteCutBookkeepers_weight_55
-IncompleteCutBookkeepers_weight_55Aux.
-IncompleteCutBookkeepers_weight_56
-IncompleteCutBookkeepers_weight_56Aux.
-IncompleteCutBookkeepers_weight_57
-IncompleteCutBookkeepers_weight_57Aux.
-IncompleteCutBookkeepers_weight_58
-IncompleteCutBookkeepers_weight_58Aux.
-IncompleteCutBookkeepers_weight_59
-IncompleteCutBookkeepers_weight_59Aux.
-IncompleteCutBookkeepers_weight_5Aux.
-IncompleteCutBookkeepers_weight_6
-IncompleteCutBookkeepers_weight_60
-IncompleteCutBookkeepers_weight_60Aux.
-IncompleteCutBookkeepers_weight_61
-IncompleteCutBookkeepers_weight_61Aux.
-IncompleteCutBookkeepers_weight_62
-IncompleteCutBookkeepers_weight_62Aux.
-IncompleteCutBookkeepers_weight_63
-IncompleteCutBookkeepers_weight_63Aux.
-IncompleteCutBookkeepers_weight_64
-IncompleteCutBookkeepers_weight_64Aux.
-IncompleteCutBookkeepers_weight_65
-IncompleteCutBookkeepers_weight_65Aux.
-IncompleteCutBookkeepers_weight_66
-IncompleteCutBookkeepers_weight_66Aux.
-IncompleteCutBookkeepers_weight_67
-IncompleteCutBookkeepers_weight_67Aux.
-IncompleteCutBookkeepers_weight_68
-IncompleteCutBookkeepers_weight_68Aux.
-IncompleteCutBookkeepers_weight_69
-IncompleteCutBookkeepers_weight_69Aux.
-IncompleteCutBookkeepers_weight_6Aux.
-IncompleteCutBookkeepers_weight_7
-IncompleteCutBookkeepers_weight_70
-IncompleteCutBookkeepers_weight_70Aux.
-IncompleteCutBookkeepers_weight_71
-IncompleteCutBookkeepers_weight_71Aux.
-IncompleteCutBookkeepers_weight_72
-IncompleteCutBookkeepers_weight_72Aux.
-IncompleteCutBookkeepers_weight_73
-IncompleteCutBookkeepers_weight_73Aux.
-IncompleteCutBookkeepers_weight_74
-IncompleteCutBookkeepers_weight_74Aux.
-IncompleteCutBookkeepers_weight_75
-IncompleteCutBookkeepers_weight_75Aux.
-IncompleteCutBookkeepers_weight_76
-IncompleteCutBookkeepers_weight_76Aux.
-IncompleteCutBookkeepers_weight_77
-IncompleteCutBookkeepers_weight_77Aux.
-IncompleteCutBookkeepers_weight_78
-IncompleteCutBookkeepers_weight_78Aux.
-IncompleteCutBookkeepers_weight_79
-IncompleteCutBookkeepers_weight_79Aux.
-IncompleteCutBookkeepers_weight_7Aux.
-IncompleteCutBookkeepers_weight_8
-IncompleteCutBookkeepers_weight_80
-IncompleteCutBookkeepers_weight_80Aux.
-IncompleteCutBookkeepers_weight_81
-IncompleteCutBookkeepers_weight_81Aux.
-IncompleteCutBookkeepers_weight_82
-IncompleteCutBookkeepers_weight_82Aux.
-IncompleteCutBookkeepers_weight_83
-IncompleteCutBookkeepers_weight_83Aux.
-IncompleteCutBookkeepers_weight_84
-IncompleteCutBookkeepers_weight_84Aux.
-IncompleteCutBookkeepers_weight_85
-IncompleteCutBookkeepers_weight_85Aux.
-IncompleteCutBookkeepers_weight_86
-IncompleteCutBookkeepers_weight_86Aux.
-IncompleteCutBookkeepers_weight_87
-IncompleteCutBookkeepers_weight_87Aux.
-IncompleteCutBookkeepers_weight_88
-IncompleteCutBookkeepers_weight_88Aux.
-IncompleteCutBookkeepers_weight_89
-IncompleteCutBookkeepers_weight_89Aux.
-IncompleteCutBookkeepers_weight_8Aux.
-IncompleteCutBookkeepers_weight_9
-IncompleteCutBookkeepers_weight_90
-IncompleteCutBookkeepers_weight_90Aux.
-IncompleteCutBookkeepers_weight_91
-IncompleteCutBookkeepers_weight_91Aux.
-IncompleteCutBookkeepers_weight_92
-IncompleteCutBookkeepers_weight_92Aux.
-IncompleteCutBookkeepers_weight_93
-IncompleteCutBookkeepers_weight_93Aux.
-IncompleteCutBookkeepers_weight_94
-IncompleteCutBookkeepers_weight_94Aux.
-IncompleteCutBookkeepers_weight_95
-IncompleteCutBookkeepers_weight_95Aux.
-IncompleteCutBookkeepers_weight_96
-IncompleteCutBookkeepers_weight_96Aux.
-IncompleteCutBookkeepers_weight_97
-IncompleteCutBookkeepers_weight_97Aux.
-IncompleteCutBookkeepers_weight_98
-IncompleteCutBookkeepers_weight_98Aux.
-IncompleteCutBookkeepers_weight_99
-IncompleteCutBookkeepers_weight_99Aux.
-IncompleteCutBookkeepers_weight_9Aux.
 IsCalibration
 IsSimulation
 IsTestBeam
@@ -1909,6 +1477,12 @@ NCB_MuonSegmentsAuxDyn.clusterTime
 NCB_MuonSegmentsAuxDyn.clusterTimeError
 NCB_MuonSegmentsAuxDyn.clusterTimeValid
 NCB_MuonSegmentsAuxDyn.muonSegment
+NeutralParticleFlowIsoCentralEventShape
+NeutralParticleFlowIsoCentralEventShapeAux.
+NeutralParticleFlowIsoCentralEventShapeAuxDyn.Density
+NeutralParticleFlowIsoForwardEventShape
+NeutralParticleFlowIsoForwardEventShapeAux.
+NeutralParticleFlowIsoForwardEventShapeAuxDyn.Density
 Photons
 PhotonsAux.
 PhotonsAuxDyn.Loose
@@ -1968,6 +1542,12 @@ SlowMuonsAuxDyn.hitPropagationTime
 SlowMuonsAuxDyn.hitShift
 SlowMuonsAuxDyn.hitTOF
 SlowMuonsAuxDyn.hitTechnology
+StauSegments
+StauSegmentsAux.
+StauSegmentsAuxDyn.clusterTime
+StauSegmentsAuxDyn.clusterTimeError
+StauSegmentsAuxDyn.clusterTimeValid
+StauSegmentsAuxDyn.muonSegment
 Staus
 StausAux.
 StausAuxDyn.CT_EL_Type
@@ -2151,6 +1731,7 @@ TopoClusterIsoForwardEventShape
 TopoClusterIsoForwardEventShapeAux.
 TopoClusterIsoForwardEventShapeAuxDyn.Density
 TrigConfKeys
+TrigInDetTrackTruthMap
 TrigNavigation
 TrigNavigationAux.
 TriggerMenu

Tools/WorkflowTestRunner/python/References.py

@@ -24,7 +24,8 @@ references_map = {
     "d1726": "v7",
     "d1759": "v13",
     # Reco
-    "q442": "v17",
-    "q445": "v28",
-    "q449": "v34",
+    "q442": "v1",
+    "q443": "v1",
+    "q445": "v1",
+    "q449": "v1",
 }

Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run2.py

@@ -38,7 +38,7 @@ def main():
         if not options.workflow or options.workflow is WorkflowType.PileUpPresampling:
             tests_to_run.append(PileUpTest("d1730", run, WorkflowType.PileUpPresampling, ["HITtoRDO"], setup, options.extra_args))
         if not options.workflow or options.workflow is WorkflowType.MCPileUpReco:
-            tests_to_run.append(QTest("q444", run, WorkflowType.MCPileUpReco, ["RAWtoESD", "ESDtoAOD"], setup, options.extra_args))
+            tests_to_run.append(QTest("q444", run, WorkflowType.MCPileUpReco, ["Overlay", "RAWtoALL"], setup, options.extra_args + " --steering doOverlay doRAWtoALL"))
     elif options.derivation:
         tests_to_run.append(DerivationTest("p5205", run, WorkflowType.Derivation, ["Derivation"], setup, options.extra_args))
     else:
@@ -46,7 +46,7 @@ def main():
             if "--CA" in options.extra_args:
                 tests_to_run.append(QTest("q443", run, WorkflowType.MCReco, ["HITtoRDO", "RAWtoALL"], setup, options.extra_args + " --steering doRAWtoALL"))
             else:
-                tests_to_run.append(QTest("q443", run, WorkflowType.MCReco, ["HITtoRDO", "RDOtoRDOTrigger", "RAWtoESD", "ESDtoAOD"], setup, options.extra_args))
+                tests_to_run.append(QTest("q443", run, WorkflowType.MCReco, ["HITtoRDO", "RDOtoRDOTrigger", "RAWtoALL"], setup, options.extra_args + " --steering doRDO_TRIG doTRIGtoALL"))
         if not options.workflow or options.workflow is WorkflowType.DataReco:
             tests_to_run.append(QTest("q442", run, WorkflowType.DataReco, ["RAWtoALL"], setup, options.extra_args))
 

Tracking/TrkFitter/TrkGaussianSumFilterUtils/src/MultiComponentStateCombiner.cxx

@@ -72,11 +72,12 @@ computeImpl(const Trk::MultiComponentState* uncombinedState,
 
     AmgVector(5) parameters = trackParameters->parameters();
 
+    // Ensure that we don't have any problems with the cyclical nature of phi
+    // Use first state as reference poin
     // Ensure that we don't have any problems with the cyclical nature of phi
     // Use first state as reference poin
     double deltaPhi =
-      (*uncombinedState->begin()).first->parameters()[2] - parameters[2];
-
+        (*uncombinedState->begin()).first->parameters()[2] - parameters[2];
     if (deltaPhi > M_PI) {
       parameters[2] += 2 * M_PI;
     } else if (deltaPhi < -M_PI) {
@@ -249,17 +250,12 @@ Trk::MultiComponentStateCombiner::combineWithWeight(
     finalParameters, finalWeight, secondParameters, secondWeight);
 
   const AmgSymMatrix(5)* firstMeasuredCov = firstTrackParameters->covariance();
-  const AmgSymMatrix(5)* secondMeasuredCov =
-    secondTrackParameters->covariance();
+  const AmgSymMatrix(5)* secondMeasuredCov = secondTrackParameters->covariance();
   // Check to see if first track parameters are measured or not
   if (firstMeasuredCov && secondMeasuredCov) {
     AmgSymMatrix(5) finalMeasuredCov(*firstMeasuredCov);
-    combineCovWithWeight(firstParameters,
-                         finalMeasuredCov,
-                         firstWeight,
-                         secondParameters,
-                         *secondMeasuredCov,
-                         secondWeight);
+    combineCovWithWeight(firstParameters, finalMeasuredCov, firstWeight,
+                         secondParameters, *secondMeasuredCov, secondWeight);
     mergeTo.first->updateParameters(finalParameters, finalMeasuredCov);
     mergeTo.second = finalWeight;
   } else {
@@ -267,7 +263,20 @@ Trk::MultiComponentStateCombiner::combineWithWeight(
     mergeTo.second = finalWeight;
   }
 }
+/**
+ * Moment-preserving merge of two 5D components
+ * for example see
+ * Runnalls, Andrew R.(2007)
+ * Kullback-Leibler approach to Gaussian mixture reduction
+ * equations (2),(3),(4)
+ */
 
+// The following does heave use of Eigen
+// for covariance. Avoid out-of-line calls
+// to Eigen
+#if defined(__GNUC__)
+[[gnu::flatten]]
+#endif
 void
 Trk::MultiComponentStateCombiner::combineParametersWithWeight(
   AmgVector(5) & firstParameters,
@@ -275,10 +284,7 @@ Trk::MultiComponentStateCombiner::combineParametersWithWeight(
   const AmgVector(5) & secondParameters,
   const double secondWeight)
 {
-
   double totalWeight = firstWeight + secondWeight;
-  // Ensure that we don't have any problems with the cyclical nature of phi
-  // Use first state as reference poin
   double deltaPhi = firstParameters[2] - secondParameters[2];
   if (deltaPhi > M_PI) {
     firstParameters[2] -= 2 * M_PI;
@@ -286,8 +292,8 @@ Trk::MultiComponentStateCombiner::combineParametersWithWeight(
     firstParameters[2] += 2 * M_PI;
   }
   firstParameters =
-    firstWeight * firstParameters + secondWeight * secondParameters;
-  firstParameters /= totalWeight;
+      (firstWeight * firstParameters + secondWeight * secondParameters) /
+      totalWeight;
   // Ensure that phi is between -pi and pi
   firstParameters[2] = CxxUtils::wrapToPi(firstParameters[2]);
   firstWeight = totalWeight;
@@ -312,9 +318,9 @@ Trk::MultiComponentStateCombiner::combineCovWithWeight(
   AmgVector(5) parameterDifference = firstParameters - secondParameters;
   parameterDifference[2] = CxxUtils::wrapToPi(parameterDifference[2]);
   parameterDifference /= totalWeight;
-  firstMeasuredCov *= firstWeight;
-  firstMeasuredCov += secondWeight * secondMeasuredCov;
-  firstMeasuredCov /= totalWeight;
+  firstMeasuredCov =
+      (firstWeight * firstMeasuredCov + secondWeight * secondMeasuredCov) /
+      totalWeight;
   firstMeasuredCov += firstWeight * secondWeight * parameterDifference *
                       parameterDifference.transpose();
 }
@@ -410,4 +416,3 @@ Trk::MultiComponentStateCombiner::combine(
 
   return mergedState;
 }
-

Tracking/TrkFitter/TrkiPatFitter/TrkiPatFitter/MaterialAllocator.h

@@ -12,7 +12,7 @@
 #ifndef TRKIPATFITTER_MATERIALALLOCATOR_H
 #define TRKIPATFITTER_MATERIALALLOCATOR_H
 
-//<<<<<< INCLUDES                                                       >>>>>>
+//<<<<<< INCLUDES a>>>>>>
 
 #include <memory>
 #include <mutex>
@@ -32,7 +32,7 @@
 #include "TrkParameters/TrackParameters.h"
 #include "TrkiPatFitterUtils/IMaterialAllocator.h"
 
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
+//<<<<<< CLASS DECLARATIONS >>>>>>
 
 class MessageHelper;
 namespace Trk {
@@ -144,8 +144,7 @@ class MaterialAllocator : public AthAlgTool, virtual public IMaterialAllocator {
       this, "Intersector", "Trk::RungeKuttaIntersector/RungeKuttaIntersector",
       ""};
   ServiceHandle<ITrackingGeometrySvc> m_trackingGeometrySvc{
-      this, "TrackingGeometrySvc",
-      "TrackingGeometrySvc/AtlasTrackingGeometrySvc", ""};
+      this, "TrackingGeometrySvc","", ""};
   ServiceHandle<ITrackingVolumesSvc> m_trackingVolumesSvc{
       this, "TrackingVolumesSvc", "Trk::TrackingVolumesSvc/TrackingVolumesSvc",
       ""};
@@ -153,7 +152,7 @@ class MaterialAllocator : public AthAlgTool, virtual public IMaterialAllocator {
       this, "STEP_Propagator", "Trk::STEP_Propagator/AtlasSTEP_Propagator", ""};
 
   SG::ReadCondHandleKey<TrackingGeometry> m_trackingGeometryReadKey{
-      this, "TrackingGeometryReadKey", "",
+      this, "TrackingGeometryReadKey", "AtlasTrackingGeometry",
       "Key of the TrackingGeometry conditions data."};
 
   inline const Trk::TrackingVolume* getSpectrometerEntrance() const {

Tracking/TrkVertexFitter/TrkVertexFitterInterfaces/TrkVertexFitterInterfaces/ITrackToVertexIPEstimator.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRKVERTEXFITTERINTERFACES_ITRACKTOVERTEXIPESTIMATOR_H
 #define TRKVERTEXFITTERINTERFACES_ITRACKTOVERTEXIPESTIMATOR_H
 
-#include "GaudiKernel/IAlgTool.h" 
+#include "GaudiKernel/IAlgTool.h"
 #include "TrkParameters/TrackParameters.h"
+//
 #include "xAODTracking/TrackParticleFwd.h"
 #include "xAODTracking/VertexFwd.h"
-#include "CLHEP/Vector/ThreeVector.h"
+//
+#include <memory>
 
+#include "CLHEP/Vector/ThreeVector.h"
 /**
- * An abstract base class  for algorithms estimating the transverse impact parameter d0 and
- * its error of a given track wrt to the reconstructed vertex.
- * 
+ * An abstract base class  for algorithms estimating the transverse impact
+ * parameter d0 and its error of a given track wrt to the reconstructed vertex.
+ *
  * K.Prokofiev, C.Ruwiedel, June 2009.
  *
  * Changes: G. Piacquadio, July 2009, add lifetime signs for b-tagging
  *
  * David Shope <david.richard.shope@cern.ch> (2016-04-19)
- *   EDM Migration to xAOD - Remove methods involving Trk::VxCandidate and Trk::RecVertex 
+ *   EDM Migration to xAOD - Remove methods involving Trk::VxCandidate and
+ * Trk::RecVertex
  *
- */ 
-
-namespace Trk
-{
-
-
- struct ImpactParametersAndSigma 
- {
-   double IPd0;
-   double IPz0;
-   double IPz0SinTheta;
-   double sigmad0;
-   double sigmaz0;
-   double sigmaz0SinTheta;
-   double PVsigmad0;
-   double PVsigmaz0;
-   double PVsigmaz0SinTheta;
-   
- };
-   
- 
- static const InterfaceID IID_ITrackToVertexCompatibilityEstimator("ITrackToVertexIPEstimator", 1, 0);
- 
- class ITrackToVertexIPEstimator: virtual public IAlgTool
- {
- 
-  public:
- 
-   virtual ~ITrackToVertexIPEstimator(){};
- 
-   static const InterfaceID& interfaceID() { return IID_ITrackToVertexCompatibilityEstimator; };
- 
-/**
- * Estimate methods returning a d0 and its calculated sigma.
- * All  methods do check whether a track is actually fitted to a vertex
- */  
-   virtual const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const = 0;
-   virtual const  ImpactParametersAndSigma * estimate(const Trk::TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const = 0;
-
-
-   virtual const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const = 0;
-   virtual const  ImpactParametersAndSigma * estimate(const Trk::TrackParameters * track, const Trk::TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const = 0;
-
-
-   virtual xAOD::Vertex *   getUnbiasedVertex(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx ) const = 0;
-   virtual xAOD::Vertex * getUnbiasedVertex(const Trk::TrackParameters * track, const xAOD::Vertex * vtx ) const =0;
-
-   virtual const ImpactParametersAndSigma  * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex* vtx)const =0;
-   virtual const ImpactParametersAndSigma  * estimate(const Trk::TrackParameters * track, const xAOD::Vertex* vtx)const =0;
-
-
-  virtual double get3DLifetimeSignOfTrack(const Trk::TrackParameters & track,
-                                          const Amg::Vector3D & jetMomentum,
-                                          const xAOD::Vertex & primaryVertex) const =0;
-  virtual double get3DLifetimeSignOfTrack(const Trk::TrackParameters & track,
-                                          const CLHEP::Hep3Vector & jetMomentum,
-                                          const xAOD::Vertex & primaryVertex) const =0;
-   
-
-  virtual double get2DLifetimeSignOfTrack(const Trk::TrackParameters & track,
-                                          const Amg::Vector3D & jetMomentum,
-                                          const xAOD::Vertex & primaryVertex) const=0;
-  virtual double get2DLifetimeSignOfTrack(const Trk::TrackParameters & track,
-                                          const CLHEP::Hep3Vector & jetMomentum,
-                                          const xAOD::Vertex & primaryVertex) const=0;
-   
-  virtual double getZLifetimeSignOfTrack(const Trk::TrackParameters & track,
-                                         const Amg::Vector3D & jetMomentum,
-                                         const xAOD::Vertex & primaryVertex) const = 0;
-  virtual double getZLifetimeSignOfTrack(const Trk::TrackParameters & track,
-                                         const CLHEP::Hep3Vector & jetMomentum,
-                                         const xAOD::Vertex & primaryVertex) const = 0;
-
-   
-
- };//end of class definitions
-
-}
+ */
+
+namespace Trk {
+
+struct ImpactParametersAndSigma {
+  double IPd0;
+  double IPz0;
+  double IPz0SinTheta;
+  double sigmad0;
+  double sigmaz0;
+  double sigmaz0SinTheta;
+  double PVsigmad0;
+  double PVsigmaz0;
+  double PVsigmaz0SinTheta;
+};
+
+static const InterfaceID IID_ITrackToVertexCompatibilityEstimator(
+    "ITrackToVertexIPEstimator", 1, 0);
+
+class ITrackToVertexIPEstimator : virtual public IAlgTool {
+
+ public:
+  virtual ~ITrackToVertexIPEstimator(){};
+
+  static const InterfaceID& interfaceID() {
+    return IID_ITrackToVertexCompatibilityEstimator;
+  };
+
+  /**
+   * Estimate methods returning a d0 and its calculated sigma.
+   * All  methods do check whether a track is actually fitted to a vertex
+   */
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const xAOD::TrackParticle* track, const xAOD::Vertex* vtx,
+      bool doRemoval) const = 0;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const Trk::TrackParameters* track, const xAOD::Vertex* vtx,
+      bool doRemoval) const = 0;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const xAOD::TrackParticle* track, const xAOD::TrackParticle* newtrack,
+      const xAOD::Vertex* vtx, bool doRemoval) const = 0;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const Trk::TrackParameters* track, const Trk::TrackParameters* newtrack,
+      const xAOD::Vertex* vtx, bool doRemoval) const = 0;
+
+  virtual xAOD::Vertex* getUnbiasedVertex(const xAOD::TrackParticle* track,
+                                          const xAOD::Vertex* vtx) const = 0;
+  virtual xAOD::Vertex* getUnbiasedVertex(const Trk::TrackParameters* track,
+                                          const xAOD::Vertex* vtx) const = 0;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const xAOD::TrackParticle* track, const xAOD::Vertex* vtx) const = 0;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const Trk::TrackParameters* track, const xAOD::Vertex* vtx) const = 0;
+
+  virtual double get3DLifetimeSignOfTrack(
+      const Trk::TrackParameters& track, const Amg::Vector3D& jetMomentum,
+      const xAOD::Vertex& primaryVertex) const = 0;
+  virtual double get3DLifetimeSignOfTrack(
+      const Trk::TrackParameters& track, const CLHEP::Hep3Vector& jetMomentum,
+      const xAOD::Vertex& primaryVertex) const = 0;
+
+  virtual double get2DLifetimeSignOfTrack(
+      const Trk::TrackParameters& track, const Amg::Vector3D& jetMomentum,
+      const xAOD::Vertex& primaryVertex) const = 0;
+  virtual double get2DLifetimeSignOfTrack(
+      const Trk::TrackParameters& track, const CLHEP::Hep3Vector& jetMomentum,
+      const xAOD::Vertex& primaryVertex) const = 0;
+
+  virtual double getZLifetimeSignOfTrack(
+      const Trk::TrackParameters& track, const Amg::Vector3D& jetMomentum,
+      const xAOD::Vertex& primaryVertex) const = 0;
+  virtual double getZLifetimeSignOfTrack(
+      const Trk::TrackParameters& track, const CLHEP::Hep3Vector& jetMomentum,
+      const xAOD::Vertex& primaryVertex) const = 0;
+
+};  // end of class definitions
+
+}  // namespace Trk
 #endif

Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h

@@ -5,38 +5,36 @@
 #ifndef TRKVERTEXFITTERUTILS_TRACKTOVERTEXIPESTIMATOR_H
 #define TRKVERTEXFITTERUTILS_TRACKTOVERTEXIPESTIMATOR_H
 
+#include "TrkVertexFitterInterfaces/ITrackToVertexIPEstimator.h"
+//
 #include "AthenaBaseComps/AthAlgTool.h"
+//
 #include "GaudiKernel/ToolHandle.h"
-#include "TrkVertexFitterInterfaces/ITrackToVertexIPEstimator.h"
-
-#include "xAODTracking/TrackParticleFwd.h"
-#include "xAODTracking/VertexFwd.h"
-#include "CLHEP/Vector/ThreeVector.h"
-
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkVertexFitterInterfaces/IVertexLinearizedTrackFactory.h"
 #include "TrkVertexFitterInterfaces/IVertexUpdator.h"
+//
+#include "xAODTracking/TrackParticleFwd.h"
+#include "xAODTracking/VertexFwd.h"
+//
+#include "CLHEP/Vector/ThreeVector.h"
+namespace Trk {
 
-namespace Trk
-{
-
- class Track;
- class TrackParticleBase;
-
+class Track;
+class TrackParticleBase;
 
- 
 /**
  * A class estimating the transverse impact parameter d0 and
  * its error of a given track wrt to the reconstructed vertex.
  *
- * Algorithm:  
+ * Algorithm:
  *
  * (a) Provided track or track particle are checked,
  * whether they do already belong to the vertex.
  * (b) In the positive case, the vertex is reduced by
  * removing the track or track particle in question.
- * (c) The trajectory state is extrapolated to the 
- * perigee with the vertex in question, the d0 
+ * (c) The trajectory state is extrapolated to the
+ * perigee with the vertex in question, the d0
  * and its error is estimated. The error on the vertex
  * position is included in this calculation.
  *
@@ -47,113 +45,115 @@ namespace Trk
  *
  * Giacinto.Piacquadio@physik.uni-freiburg.de (update of 11.September 2008)
  *
- * In addition the tool is now able to provide the 
+ * In addition the tool is now able to provide the
  * impact parameter z0 and its error.
  *
- * At the same time an option can be passed not to remove 
+ * At the same time an option can be passed not to remove
  * the track from the vertex (non-default)
  *
- * In addition, the lifetime sign of the Impact Parameter 
- * given a lifetime direction of flight is also provided 
+ * In addition, the lifetime sign of the Impact Parameter
+ * given a lifetime direction of flight is also provided
  * with 3 methods: 2D, Z and full 3D.
  *
  * --------------------------------------
  * Johanna Fleckner (03.12.2009)
- * allow for estimation of IP parameter even if vertex doesn't contain any tracks
- * as can happen in BeamSpot or early running when PV is not reconstructed
- * degrade some INFO/WARNINGS to DEBUG
+ * allow for estimation of IP parameter even if vertex doesn't contain any
+ * tracks as can happen in BeamSpot or early running when PV is not
+ * reconstructed degrade some INFO/WARNINGS to DEBUG
  *
  * --------------------------------------
  * David Shope <david.richard.shope@cern.ch> (2016-04-19)
- * EDM Migration to xAOD - Remove methods involving Trk::VxCandidate and Trk::RecVertex
+ * EDM Migration to xAOD - Remove methods involving Trk::VxCandidate and
+ * Trk::RecVertex
  *
- */ 
- 
- 
-  class TrackToVertexIPEstimator : public AthAlgTool, virtual public ITrackToVertexIPEstimator
- {
- 
-  public:
- 
-
- /**
-  * Default Athena interface methods
-  */
-    virtual StatusCode initialize() override;
-
- 
- /**
-  * Default Athena interface constructor and destructor 
-  */  
-    TrackToVertexIPEstimator(const std::string& t, const std::string& n, const IInterface*  p);
-    
-   ~TrackToVertexIPEstimator();
-  
-/**
- * Estimate methods returning a d0 and its calculated sigma.
- * All  methods do check whether a track is actually fitted to a vertex
- */  
-   virtual const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const override;
-   virtual const  ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const override;
-
-   virtual const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track,const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const override;
-   virtual const  ImpactParametersAndSigma * estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const override;
-
-   virtual xAOD::Vertex *   getUnbiasedVertex(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx ) const override;
-   virtual xAOD::Vertex *   getUnbiasedVertex(const TrackParameters * track, const xAOD::Vertex * vtx ) const override;
-  
-
-   virtual const ImpactParametersAndSigma  * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex* vtx)const override;
-   virtual const ImpactParametersAndSigma  * estimate(const TrackParameters * track, const xAOD::Vertex* vtx)const override;
-   
-
-   /* Methods which provide the lifetime Sign for the Impact Parameter (2D, Z, 3D)  */
-   virtual
-   double get3DLifetimeSignOfTrack(const TrackParameters & track,
-                                   const Amg::Vector3D & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const override;
-   virtual
-   double get3DLifetimeSignOfTrack(const TrackParameters & track,
-                                   const CLHEP::Hep3Vector & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const override;
-
-   virtual
-   double get2DLifetimeSignOfTrack(const TrackParameters & track,
-                                   const Amg::Vector3D & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const override;
-   virtual
-   double get2DLifetimeSignOfTrack(const TrackParameters & track,
-                                   const CLHEP::Hep3Vector & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const override;
-
-   virtual
-   double getZLifetimeSignOfTrack(const TrackParameters & track,
-                                  const Amg::Vector3D & jetDirection,
-                                  const xAOD::Vertex & primaryVertex) const override;
-   virtual
-   double getZLifetimeSignOfTrack(const TrackParameters & track,
-                                  const CLHEP::Hep3Vector & jetDirection,
-                                  const xAOD::Vertex & primaryVertex) const override;
-
-
-
-
-  private:
-
-/**
- * A method calculating the do and its  error.
- * At this stage the trajectory is removed from the 
- * vertex.
  */
-   const ImpactParametersAndSigma  * calculate(const TrackParameters * track, const xAOD::Vertex& vtx) const;
-
-   ToolHandle< Trk::IExtrapolator >  m_extrapolator { this, "Extrapolator", "Trk::Extrapolator" }; 
-   ToolHandle< Trk::IVertexUpdator > m_Updator {this, "VertexUpdator", "Trk::KalmanVertexUpdator"};
-   ToolHandle< Trk::IVertexLinearizedTrackFactory > m_linFactory {this, "LinearizedTrackFactory", "Trk::FullLinearizedTrackFactory"};
-
- };//end of class definitions
-
 
-}//end of namespace definitions
+class TrackToVertexIPEstimator : public AthAlgTool,
+                                 virtual public ITrackToVertexIPEstimator {
+
+ public:
+  /**
+   * Default Athena interface methods
+   */
+  virtual StatusCode initialize() override;
+
+  /**
+   * Default Athena interface constructor and destructor
+   */
+  TrackToVertexIPEstimator(const std::string& t, const std::string& n,
+                           const IInterface* p);
+
+  ~TrackToVertexIPEstimator();
+
+  /**
+   * Estimate methods returning a d0 and its calculated sigma.
+   * All  methods do check whether a track is actually fitted to a vertex
+   */
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const xAOD::TrackParticle* track, const xAOD::Vertex* vtx,
+      bool doRemoval) const override;
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const TrackParameters* track, const xAOD::Vertex* vtx,
+      bool doRemoval) const override;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const xAOD::TrackParticle* track, const xAOD::TrackParticle* newtrack,
+      const xAOD::Vertex* vtx, bool doRemoval) const override;
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const TrackParameters* track, const TrackParameters* newtrack,
+      const xAOD::Vertex* vtx, bool doRemoval) const override;
+
+  virtual xAOD::Vertex* getUnbiasedVertex(
+      const xAOD::TrackParticle* track, const xAOD::Vertex* vtx) const override;
+  virtual xAOD::Vertex* getUnbiasedVertex(
+      const TrackParameters* track, const xAOD::Vertex* vtx) const override;
+
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const xAOD::TrackParticle* track, const xAOD::Vertex* vtx) const override;
+  virtual std::unique_ptr<ImpactParametersAndSigma> estimate(
+      const TrackParameters* track, const xAOD::Vertex* vtx) const override;
+
+  /* Methods which provide the lifetime Sign for the Impact Parameter (2D, Z,
+   * 3D)  */
+  virtual double get3DLifetimeSignOfTrack(
+      const TrackParameters& track, const Amg::Vector3D& jetDirection,
+      const xAOD::Vertex& primaryVertex) const override;
+  virtual double get3DLifetimeSignOfTrack(
+      const TrackParameters& track, const CLHEP::Hep3Vector& jetDirection,
+      const xAOD::Vertex& primaryVertex) const override;
+
+  virtual double get2DLifetimeSignOfTrack(
+      const TrackParameters& track, const Amg::Vector3D& jetDirection,
+      const xAOD::Vertex& primaryVertex) const override;
+  virtual double get2DLifetimeSignOfTrack(
+      const TrackParameters& track, const CLHEP::Hep3Vector& jetDirection,
+      const xAOD::Vertex& primaryVertex) const override;
+
+  virtual double getZLifetimeSignOfTrack(
+      const TrackParameters& track, const Amg::Vector3D& jetDirection,
+      const xAOD::Vertex& primaryVertex) const override;
+  virtual double getZLifetimeSignOfTrack(
+      const TrackParameters& track, const CLHEP::Hep3Vector& jetDirection,
+      const xAOD::Vertex& primaryVertex) const override;
+
+ private:
+  /**
+   * A method calculating the do and its  error.
+   * At this stage the trajectory is removed from the
+   * vertex.
+   */
+  std::unique_ptr<ImpactParametersAndSigma> calculate(
+      const TrackParameters* track, const xAOD::Vertex& vtx) const;
+
+  ToolHandle<Trk::IExtrapolator> m_extrapolator{this, "Extrapolator",
+                                                "Trk::Extrapolator"};
+  ToolHandle<Trk::IVertexUpdator> m_Updator{this, "VertexUpdator",
+                                            "Trk::KalmanVertexUpdator"};
+  ToolHandle<Trk::IVertexLinearizedTrackFactory> m_linFactory{
+      this, "LinearizedTrackFactory", "Trk::FullLinearizedTrackFactory"};
+
+};  // end of class definitions
+
+}  // namespace Trk
 
 #endif

Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx

@@ -59,7 +59,7 @@ namespace Trk
  }//end of initialize method
 
 
- const  ImpactParametersAndSigma * TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const
  {
   if(track && vtx)
   {
@@ -70,7 +70,7 @@ namespace Trk
   //end of track particle validity check
  }//end of method using track particles
 
- const  ImpactParametersAndSigma * TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track, const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track, const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const
  {
   if(track && vtx)
   {
@@ -84,7 +84,7 @@ namespace Trk
 
 
 
- const  ImpactParametersAndSigma * TrackToVertexIPEstimator::estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const
  {
    if(track && vtx){
      return estimate(track,track,vtx,doRemoval);
@@ -95,7 +95,7 @@ namespace Trk
 
  }//end of parameterBase estimate method
 
- const  ImpactParametersAndSigma * TrackToVertexIPEstimator::estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const
  {
 
    if (vtx==nullptr)
@@ -114,7 +114,7 @@ namespace Trk
      }
    }
 
-   const ImpactParametersAndSigma  *  IPandSigma=calculate(newtrack,*newVertex);
+   std::unique_ptr<ImpactParametersAndSigma>  IPandSigma=calculate(newtrack,*newVertex);
 
    if (doRemoval)
    {
@@ -127,7 +127,7 @@ namespace Trk
  }//end of parameterBase estimate method
 
 
- const  ImpactParametersAndSigma * TrackToVertexIPEstimator::calculate(const TrackParameters * track, const xAOD::Vertex& vtx) const
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::calculate(const TrackParameters * track, const xAOD::Vertex& vtx) const
  {
   //estimating the d0 and its significance by propagating the trajectory state towards
   //the vertex position. By this time the vertex should NOT contain this trajectory anymore
@@ -151,19 +151,14 @@ namespace Trk
 
     AmgSymMatrix(2) vrtXYCov = vtx.covariancePosition().block<2,2>(0,0);
 
-    //   std::cout<<"Vertex covariance: "<<vtx.errorPosition().covariance()<<std::endl;
-    //   std::cout<<"Vertex covariance sub: "<<vrtXYCov<<std::endl;
-
     const AmgSymMatrix(5) & perigeeCov = *(extrapolatedParameters->covariance());
     //   std::cout<<"Perigee covariance: "<<perigeeCov<<std::endl;
 
     //d0phi->cartesian Jacobian
     Amg::Vector2D d0JacXY(-sin(phi), cos(phi));
 
-    //  std::cout<<"To cartesian jacobian "<<d0PhiCart<<std::endl;
-    //  std::cout<<" - d0*cos(phi)"<< - d0*cos(phi)<<std::endl;
 
-    ImpactParametersAndSigma* newIPandSigma=new ImpactParametersAndSigma;
+    auto newIPandSigma=std::make_unique<ImpactParametersAndSigma>();
     newIPandSigma->IPd0=d0;
     double d0_PVcontrib=d0JacXY.transpose()*(vrtXYCov*d0JacXY);
     if (d0_PVcontrib>=0)
@@ -199,7 +194,7 @@ namespace Trk
    }
    else
    {
-     msg(MSG::WARNING) << " The contribution to z0_err: " << vrtZZCov << " from PV is negative: critical error in PV error matrix! Removing contribution from PV ... "  << endmsg;
+     ATH_MSG_WARNING(" The contribution to z0_err: " << vrtZZCov << " from PV is negative: critical error in PV error matrix! Removing contribution from PV ... ");
      newIPandSigma->IPz0SinTheta=z0*sin(theta);
      double temp = (IPz0JacZ0Theta.transpose()*(covPerigeeZ0Theta*IPz0JacZ0Theta));
      newIPandSigma->sigmaz0SinTheta=sqrt(temp);
@@ -210,15 +205,6 @@ namespace Trk
      newIPandSigma->PVsigmaz0 = 0;
    }
 
-   //   std::cout<<"Calculated sigma: "<<sqrt(sigmaM)<<std::endl;
-
-   //checking the other way of calculating the errors
-   // Calculation using the projection
-   //   double  s_d0_test = extrapolatedParameters->localErrorMatrix().covValue(Trk::d0)+
-   //   sin(phi) * sin(phi) * vtx.errorPosition().covValue(Trk::x) +
-   //   cos(phi) * cos(phi) * vtx.errorPosition().covValue(Trk::y) -
-   //   2.* sin(phi) * cos(phi) * vtx.errorPosition().covValue(Trk::x, Trk::y);
-   //   std::cout<<"new sigma: "<<sqrt(s_d0_test)<<std::endl;
 
    delete extrapolatedParameters;
    return newIPandSigma;
@@ -449,7 +435,7 @@ xAOD::Vertex * TrackToVertexIPEstimator::getUnbiasedVertex(const TrackParameters
 
 
 
- const ImpactParametersAndSigma  * TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track,
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::estimate(const xAOD::TrackParticle * track,
                                                                       const xAOD::Vertex* vtx)const
  {
 
@@ -460,7 +446,7 @@ xAOD::Vertex * TrackToVertexIPEstimator::getUnbiasedVertex(const TrackParameters
 
  }
 
- const ImpactParametersAndSigma  * TrackToVertexIPEstimator::estimate(const TrackParameters * track,
+ std::unique_ptr<ImpactParametersAndSigma> TrackToVertexIPEstimator::estimate(const TrackParameters * track,
                                                                       const xAOD::Vertex* vtx)const
  {
 

Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Z0PVTrackComaptibilityEstimator.cxx

@@ -65,7 +65,7 @@ namespace Trk{
 						     const xAOD::VertexContainer* primaryVertexContainer, unsigned int index) const{
     
     // TODO: do we want to doRemoval here? (I have it as false for now) 
-    const ImpactParametersAndSigma* ip =  m_ipEstimator->estimate(track, track, (*primaryVertexContainer)[index], false);
+    std::unique_ptr<ImpactParametersAndSigma> ip =  m_ipEstimator->estimate(track, track, (*primaryVertexContainer)[index], false);
     
     bool pileup = false;
   
@@ -120,12 +120,10 @@ namespace Trk{
   
     if(std::abs(ip->IPz0) / ip->sigmaz0 < m_z0SignificanceMax && !pileup){
 
-      delete ip;
       
       return true;
     }
   
-    delete ip;
     
     return false;
   }

Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx

@@ -322,14 +322,13 @@ GaussianDensityTestAlg::findTruth(double mode,
     v.setFitQuality(0., 0.);
 
     double significance = 0.0;
-    const ImpactParametersAndSigma* ipas = m_ipEstimator->estimate( params, &v );
+    std::unique_ptr<ImpactParametersAndSigma> ipas = m_ipEstimator->estimate( params, &v );
     if ( ipas != nullptr )
     {  
       if ( ipas->sigmad0 > 0 && ipas->sigmaz0 > 0)
       {
-	significance = sqrt( pow(ipas->IPd0/ipas->sigmad0,2) + pow(ipas->IPz0/ipas->sigmaz0,2) );
+        significance = sqrt( pow(ipas->IPd0/ipas->sigmad0,2) + pow(ipas->IPz0/ipas->sigmaz0,2) );
       }
-      delete ipas;
     }
     return significance;
   }

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py

@@ -28,5 +28,15 @@ test.art_type = 'build'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
+# Add a step comparing counts against a reference
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_RDOtoRDOTrig_v1Dev_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_RDOtoRDOTrig_v1Dev_build.new'
+refcomp.args += ' --patch'
+refcomp.reference_from_release = True # installed from TrigAnalysisTest/share
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
+
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

@@ -4419,13 +4419,13 @@ HLT_j240f_L1J75p31ETA49:
 HLT_j240f_L1jJ125p31ETA49:
   eventCount: 0
 HLT_j25_020jvt_pf_ftf_L1RD0_FILLED:
-  eventCount: 17
+  eventCount: 19
   stepCounts:
     0: 50
-    1: 17
+    1: 19
   stepFeatures:
     0: 50
-    1: 31
+    1: 33
 HLT_j25_L1RD0_FILLED:
   eventCount: 21
   stepCounts:
@@ -4433,13 +4433,13 @@ HLT_j25_L1RD0_FILLED:
   stepFeatures:
     0: 43
 HLT_j25_pf_ftf_L1RD0_FILLED:
-  eventCount: 17
+  eventCount: 19
   stepCounts:
     0: 50
-    1: 17
+    1: 19
   stepFeatures:
     0: 50
-    1: 34
+    1: 37
 HLT_j25f_L1RD0_FILLED:
   eventCount: 2
   stepCounts:
@@ -4741,31 +4741,31 @@ HLT_j450_pf_ftf_preselj225_L1J100:
 HLT_j450_pf_ftf_preselj225_L1jJ160:
   eventCount: 0
 HLT_j45_020jvt_pf_ftf_preselj20_L1J15:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
     0: 9
-    1: 6
+    1: 7
   stepFeatures:
     0: 9
-    1: 12
+    1: 13
 HLT_j45_020jvt_pf_ftf_preselj20_L1RD0_FILLED:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
     0: 35
-    1: 6
+    1: 7
   stepFeatures:
     0: 35
-    1: 12
+    1: 13
 HLT_j45_0eta290_020jvt_boffperf_pf_ftf_L1J20:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
     0: 8
-    1: 6
-    2: 6
+    1: 7
+    2: 7
   stepFeatures:
     0: 8
-    1: 12
-    2: 12
+    1: 13
+    2: 13
 HLT_j45_0eta290_020jvt_boffperf_pf_ftf_L1jJ50:
   eventCount: 1
   stepCounts:
@@ -4777,15 +4777,15 @@ HLT_j45_0eta290_020jvt_boffperf_pf_ftf_L1jJ50:
     1: 3
     2: 3
 HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20:
-  eventCount: 6
+  eventCount: 7
   stepCounts:
     0: 8
-    1: 6
-    2: 6
+    1: 7
+    2: 7
   stepFeatures:
     0: 8
-    1: 12
-    2: 12
+    1: 13
+    2: 13
 HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1jJ50:
   eventCount: 1
   stepCounts:
@@ -4825,7 +4825,7 @@ HLT_j45_pf_ftf_preselj20_L1J15:
     1: 7
   stepFeatures:
     0: 9
-    1: 13
+    1: 14
 HLT_j45_pf_ftf_preselj20_L1RD0_FILLED:
   eventCount: 7
   stepCounts:
@@ -4833,7 +4833,7 @@ HLT_j45_pf_ftf_preselj20_L1RD0_FILLED:
     1: 7
   stepFeatures:
     0: 35
-    1: 13
+    1: 14
 HLT_j45_pf_ftf_preselj20_L1jJ40:
   eventCount: 1
   stepCounts:
@@ -4991,19 +4991,21 @@ HLT_j60_j0_FBDJSHARED_L1J20:
 HLT_j60_j45_j25_j20_pf_ftf_preselc60XXc45XXc25XXc20_PhysicsTLA_L1J45p0ETA21_3J15p0ETA25:
   eventCount: 0
 HLT_j60_pf_ftf_preselj50_L1J20:
-  eventCount: 5
+  eventCount: 6
   stepCounts:
     0: 8
-    1: 5
+    1: 6
   stepFeatures:
     0: 8
-    1: 9
+    1: 10
 HLT_j60_pf_ftf_preselj50_L1jJ50:
-  eventCount: 0
+  eventCount: 1
   stepCounts:
     0: 1
+    1: 1
   stepFeatures:
     0: 1
+    1: 1
 ? HLT_j60c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bdl1d85bb77_pf_ftf_presel2c20XX2c20b85_L1J45p0ETA21_3J15p0ETA25
 : eventCount: 0
 ? HLT_j60c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_3j20c_020jvt_bdl1d85bb77_pf_ftf_presel2c20XX2c20b85_L1MU8F_2J15_J20
@@ -6626,7 +6628,7 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j25_pf_ftf_03dRAB_L1RD0_FILLED:
     6: 3
   stepFeatures:
     0: 50
-    1: 23
+    1: 24
     2: 19
     3: 19
     4: 19
@@ -6659,7 +6661,7 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j420_pf_ftf_preselj225_03dRAB_L1J100:
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j440_pf_ftf_preselj225_03dRAB_L1J100:
   eventCount: 0
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j45_pf_ftf_preselj20_03dRAB_L1J15:
-  eventCount: 1
+  eventCount: 2
   stepCounts:
     0: 9
     1: 7
@@ -6667,10 +6669,10 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j45_pf_ftf_preselj20_03dRAB_L1J15:
     3: 7
     4: 7
     5: 7
-    6: 1
+    6: 2
   stepFeatures:
     0: 9
-    1: 13
+    1: 14
     2: 16
     3: 16
     4: 16
@@ -6680,19 +6682,19 @@ HLT_tau20_mediumRNN_tracktwoMVA_probe_j60_pf_ftf_preselj50_03dRAB_L1J20:
   eventCount: 1
   stepCounts:
     0: 8
-    1: 5
-    2: 5
-    3: 5
-    4: 5
-    5: 5
+    1: 6
+    2: 6
+    3: 6
+    4: 6
+    5: 6
     6: 1
   stepFeatures:
     0: 8
-    1: 9
-    2: 11
-    3: 11
-    4: 11
-    5: 11
+    1: 10
+    2: 15
+    3: 15
+    4: 15
+    5: 15
     6: 1
 HLT_tau20_mediumRNN_tracktwoMVA_probe_j85_pf_ftf_preselj50_03dRAB_L1J20:
   eventCount: 0

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py

@@ -60,5 +60,15 @@ msgcount.thresholds = {
 }
 msgcount.required = True # make the test exit code depend on this step
 
+# Add a step comparing counts against a reference
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_v1Dev_decodeBS_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_v1Dev_decodeBS_build.new'
+refcomp.args += ' --patch'
+refcomp.reference_from_release = True # installed from TrigP1Test/share
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
+
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_forkAndMT_build.py

@@ -30,6 +30,15 @@ test.art_type = 'build'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
+# Add a step comparing counts against a reference from test_trigP1_v1Dev_decodeBS_build
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_v1Dev_decodeBS_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_v1Dev_decodeBS_build.new'
+refcomp.reference_from_release = True # installed from TrigP1Test/share
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
+
 # Use RootComp reference from test_trigP1_v1Dev_decodeBS_build
 test.get_step('RootComp').ref_test_name = 'trigP1_v1Dev_decodeBS_build'