Resolve merge to atlas conflicts

PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py

@@ -7,10 +7,11 @@ from BTagging.BTagLightSecVertexingConfig import BTagLightSecVtxToolCfg
 # import the JetBTaggingAlg configurable
 from BTagging.BTaggingConf import Analysis__JetBTaggingAlg as JetBTaggingAlg
 
-def JetBTaggingAlgCfg(ConfigFlags, JetCollection="", TaggerList=[], SetupScheme="", SVandAssoc={""}, **options):
+def JetBTaggingAlgCfg(ConfigFlags, JetCollection="", TaggerList=[], SetupScheme="", SVandAssoc={""}, TimeStamp = "", **options):
 
     acc = ComponentAccumulator()
     jetcol = JetCollection
+    ts = TimeStamp
 
     BTagTrackToJetAssocNameList = []
     for k, v in SVandAssoc.items():
@@ -22,35 +23,28 @@ def JetBTaggingAlgCfg(ConfigFlags, JetCollection="", TaggerList=[], SetupScheme=
 
     options.setdefault('BTagTool', acc.popToolsAndMerge(BTagToolCfg(ConfigFlags, TaggerList, SetupScheme)))
 
-    timestamp = options.get('TimeStamp', None)
-    if not timestamp:
-        timestamp = ['']
+    # setup the secondary vertexing tool
+    options['BTagSecVertexing'] = acc.popToolsAndMerge(BTagLightSecVtxToolCfg(ConfigFlags, 'LightSecVx'+ConfigFlags.BTagging.GeneralToolSuffix, jetcol, SVandAssoc =SVandAssoc, TimeStamp = ts, **options))
+
+    btagname = ConfigFlags.BTagging.OutputFiles.Prefix + jetcol
+    # Set remaining options
+    options['JetCollectionName'] = jetcol.replace('Track', 'PV0Track') + 'Jets'
+    options['TrackToJetAssociatorNames'] = TrackToJetAssociatorNameList
+    options['JetCalibrationName'] = jetcol.replace('Track', 'PV0Track')
+    if SetupScheme == "Trig":
+	options['BTagSVCollectionName'] = 'HLT_SecVtx'
+        options['BTagJFVtxCollectionName'] = 'HLT_JFVtx'
     else:
-        del options['TimeStamp']
-
-    for ts in timestamp:
-        # setup the secondary vertexing tool
-        options['BTagSecVertexing'] = acc.popToolsAndMerge(BTagLightSecVtxToolCfg(ConfigFlags, 'LightSecVx'+ConfigFlags.BTagging.GeneralToolSuffix, jetcol, SVandAssoc =SVandAssoc, TimeStamp = ts, **options))
-
-        btagname = ConfigFlags.BTagging.OutputFiles.Prefix + jetcol
-        if ts:
-            btagname += '_'+ts
-        # Set remaining options
-        options['name'] = (btagname + ConfigFlags.BTagging.GeneralToolSuffix).lower()
-        options['JetCollectionName'] = jetcol.replace('Track', 'PV0Track') + 'Jets'
-        options['TrackToJetAssociatorNames'] = TrackToJetAssociatorNameList
-        if SetupScheme == "Trig":
-	    options['BTagSVCollectionName'] = 'HLT_SecVtx'
-            options['BTagJFVtxCollectionName'] = 'HLT_JFVtx'
-	else:
-            options['BTagSVCollectionName'] = btagname + 'SecVtx'
-            options['BTagJFVtxCollectionName'] = btagname + 'JFVtx'
-        options['JetCalibrationName'] = jetcol.replace('Track', 'PV0Track')
-        options['BTaggingCollectionName'] = btagname
-        options['BTaggingLinkName'] = '.btaggingLink'+ts
-        options['JetLinkName'] = options['BTaggingCollectionName'] + '.jetLink'
-
-        # -- create main BTagging algorithm
-        acc.addEventAlgo(JetBTaggingAlg(**options))
+        options['BTagSVCollectionName'] = btagname + 'SecVtx'
+        options['BTagJFVtxCollectionName'] = btagname + 'JFVtx'
+    options['BTaggingLinkName'] = '.btaggingLink'+ts
+    if ts:
+        btagname += '_'+ts
+    options['BTaggingCollectionName'] = btagname
+    options['JetLinkName'] = options['BTaggingCollectionName'] + '.jetLink'
+    options['name'] = (btagname + ConfigFlags.BTagging.GeneralToolSuffix).lower()
+
+    # -- create main BTagging algorithm
+    acc.addEventAlgo(JetBTaggingAlg(**options))
 
     return acc

Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.cxx

@@ -41,7 +41,7 @@
 
 //Read Decorated properties (NEW)
 #include "StoreGate/ReadDecorHandle.h"
-
+#include "AthenaMonitoringKernel/Monitored.h"
 // ----------------------------------------------------------------------------------------------------------------- 
 
 
@@ -191,6 +191,39 @@ StatusCode TrigBtagFexMT::execute() {
 		   " z=" << pv->z() );
 
 
+  auto monitor_for_track_count = Monitored::Scalar( "track_count", trkContainer->size() );
+
+  auto monitor_for_track_Et = Monitored::Collection( "track_Et", *trkContainer, []( const xAOD::TrackParticle *trk ) { return trk->p4().Et(); } );
+  auto monitor_for_track_eta = Monitored::Collection( "track_eta", *trkContainer, &xAOD::TrackParticle::eta );
+  auto monitor_for_track_phi = Monitored::Collection( "track_phi", *trkContainer, &xAOD::TrackParticle::phi );
+
+  // Monitors for d0 and z0 track impact parameter variables
+  auto monitor_for_track_d0 = Monitored::Collection( "track_d0", *trkContainer, &xAOD::TrackParticle::d0 );
+  auto monitor_for_track_d0err = Monitored::Collection( "track_d0err", *trkContainer, []( const xAOD::TrackParticle *trk ) {
+    return trk->definingParametersCovMatrix()( Trk::d0, Trk::d0 );
+  } );
+  auto monitor_for_track_d0sig = Monitored::Collection( "track_d0sig", *trkContainer, []( const xAOD::TrackParticle *trk ) {
+    return trk->d0() / trk->definingParametersCovMatrix()( Trk::d0, Trk::d0 );
+  } );
+
+  auto monitor_for_track_z0 = Monitored::Collection( "track_z0", *trkContainer, &xAOD::TrackParticle::z0 );
+  auto monitor_for_track_z0err = Monitored::Collection( "track_z0err", *trkContainer, []( const xAOD::TrackParticle *trk ) {
+    return trk->definingParametersCovMatrix()( Trk::z0, Trk::z0 );
+  } );
+  auto monitor_for_track_z0sig = Monitored::Collection( "track_z0sig", *trkContainer, []( const xAOD::TrackParticle *trk ) {
+    return trk->z0() / trk->definingParametersCovMatrix()( Trk::z0, Trk::z0 );
+  } );
+
+  for ( const xAOD::TrackParticle *trk : *trkContainer ) {
+    ATH_MSG_DEBUG( "  *** pt=" << trk->p4().Et() * 1e-3 << " eta=" << trk->eta() << " phi=" << trk->phi() );
+  }
+  auto monitor_group_for_tracks = Monitored::Group( m_monTool, 
+    monitor_for_track_Et, monitor_for_track_eta, monitor_for_track_phi,
+    monitor_for_track_d0, monitor_for_track_d0err, monitor_for_track_d0sig,
+    monitor_for_track_z0, monitor_for_track_z0err, monitor_for_track_z0sig
+  );
+
+
   // Creating dummy B-Tagging container in order to avoid
   // warnings from the SGInputLoader
   std::unique_ptr< xAOD::BTaggingContainer > outputBtagging = std::make_unique< xAOD::BTaggingContainer >();

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py

@@ -39,8 +39,12 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
     bTagFex.trackposKey = inputTracks + ".btagIp_trackDisplacement"
     bTagFex.trackmomKey = inputTracks + ".btagIp_trackMomentum"
     bTagFex.OutputBTagging = recordable( "HLT_BTagging" )
+
+    from TrigBjetHypo.TrigBtagFexMTConfig import TrigBtagFexMT_OnlineMonitoring
+    bTagFex.MonTool = TrigBtagFexMT_OnlineMonitoring()
     acc.addEventAlgo(bTagFex)
 
+
     from BTagging.JetParticleAssociationAlgConfig import JetParticleAssociationAlgCfg
     from BTagging.JetSecVtxFindingAlgConfig import JetSecVtxFindingAlgCfg
     from BTagging.JetSecVertexingAlgConfig import JetSecVertexingAlgCfg
@@ -67,7 +71,7 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
         acc.merge(JetSecVertexingAlg)
     
     JetBTaggingAlg = JetBTaggingAlgCfg(ConfigFlags, JetCollection = inputJets.replace("Jets",""), TaggerList = ConfigFlags.BTagging.TrigTaggersList, SetupScheme = "Trig", SVandAssoc = SecVertexingAndAssociators, **kwargs)
-    BTaggingAlg = JetBTaggingAlg.getEventAlgo("btagging_hlt_inview")
+    BTaggingAlg = JetBTaggingAlg.getEventAlgo((ConfigFlags.BTagging.OutputFiles.Prefix + inputJets.replace("Jets","") + ConfigFlags.BTagging.GeneralToolSuffix).lower()) #Defined in JetBTaggingAlgConfig.py; Ends up to be "btagging_hlt_inview"
     BTaggingAlg.BTaggingCollectionName = recordable("HLT_OfflineBTagging")
     acc.merge(JetBTaggingAlg)