diff --git a/Control/AthenaConfiguration/python/AtlasSemantics.py b/Control/AthenaConfiguration/python/AtlasSemantics.py
index 97ff06f2c0fd9853dd6b1571f186e89150be0587..1dd6ff8b710eab59fc53b447a9f4c19aa05e8d3b 100644
--- a/Control/AthenaConfiguration/python/AtlasSemantics.py
+++ b/Control/AthenaConfiguration/python/AtlasSemantics.py
@@ -81,8 +81,8 @@ class ToolHandleSemantics(GaudiConfig2.semantics.PropertySemantics):
def merge(self,a,b):
#Deal with 'None'
- if a is None: return b
- if b is None: return a
+ if a is None or a=='': return b
+ if b is None or b=='': return a
return a.merge(b)
class PublicHandleSemantics(GaudiConfig2.semantics.PropertySemantics):
@@ -180,7 +180,7 @@ class ToolHandleArraySemantics(GaudiConfig2.semantics.PropertySemantics):
for bTool in b:
try:
#If a tool with that name exists in a, we'll merge it
- a.__getitem__(bTool.name).merge(bTool)
+ a.__getitem__(bTool.getName()).merge(bTool)
except IndexError:
#Tool does not exists in a, append it
a.append(bTool)
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 6ff7f98c86e4ca546f7e35130141cff5fbdd64c4..c9f564fb9ba789a03c7a7720550e13218af72af7 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -42,10 +42,10 @@ def printProperties(msg, c, nestLevel = 0):
if isinstance(propval,GaudiHandles.PublicToolHandleArray):
- ths = [th.name for th in propval]
+ ths = [th.getName() for th in propval]
propstr = "PublicToolHandleArray([ {0} ])".format(', '.join(ths))
elif isinstance(propval,GaudiHandles.PrivateToolHandleArray):
- ths = [th.name for th in propval]
+ ths = [th.getName() for th in propval]
propstr = "PrivateToolHandleArray([ {0} ])".format(', '.join(ths))
elif isinstance(propval,GaudiHandles.GaudiHandle): # Any other handle
propstr = "Handle( {0} )".format(propval.typeAndName)
@@ -642,7 +642,7 @@ class ComponentAccumulator(object):
jos=app.getService("JobOptionsSvc")
def addCompToJos(comp,namePrefix=""):
- name=namePrefix+comp.name
+ name=namePrefix+comp.getName()
for k, v in comp._properties.items():
#Handle special cases of properties:
#1.PrivateToolHandles
@@ -803,7 +803,7 @@ class ComponentAccumulator(object):
# Compatibility layer allowing to convert between new (as of 2020) Gaudi Configurable2
# and old Confiburable classes
-def __indent( indent ):
+def __indent( indent = ""):
return indent + " "
@@ -845,7 +845,7 @@ def conf2toConfigurable( comp, indent="" ):
_log.warning( "{}Component: \"{}\" is of type string, no conversion, some properties possibly not set?".format(indent, comp ) )
return comp
- _log.info( "{}Converting from GaudiConfig2 object {} type {}".format(indent, compName(comp), type(comp) ) )
+ _log.info( "{}Converting from GaudiConfig2 object {} type {}".format(indent, compName(comp), comp.__class__.__name__ ))
def __alreadyConfigured( instanceName ):
from AthenaCommon.Configurable import Configurable
@@ -911,16 +911,19 @@ def conf2toConfigurable( comp, indent="" ):
__areSettingsSame( getattr(existingConfigurableInstance, pname), pvalue, __indent(indent))
else:
if alreadySetProperties[pname] != pvalue:
- raise ConfigurationError( "CAtoGlobalWrapper existing Configurabl component {} and Conf2 component have different property: {} {} vs Conf2 value {}, this is not mergable".format(
- existingConfigurable.getName(), pname, alreadySetProperties[pname], pvalue) )
-
+ _log.info("{}Merging property: {} for {}".format(__indent(indent), pname, newConf2Instance.getName() ))
+ # create surrogate
+ clone = newConf2Instance.getInstance("Clone")
+ setattr(clone, pname, alreadySetProperties[pname])
+ updatedPropValue = newConf2Instance._descriptors[pname].semantics.merge( getattr(newConf2Instance, pname), getattr(clone, pname))
+ setattr(existingConfigurable, pname, updatedPropValue)
+ del clone
+ _log.info("{} invoked GaudiConf2 semantics to merge the {} and the {} to {} for property {} of {}".format(
+ __indent(indent), alreadySetProperties[pname], pvalue, pname, updatedPropValue, existingConfigurable.getName()))
existingConfigurable = __alreadyConfigured( comp.name )
if existingConfigurable: # if configurable exists we try to merge with it
__areSettingsSame( existingConfigurable, comp )
- #conf2Clone = __configurableToConf2( existingConfigurable )
-
- # comp.merge( conf2Clone ) # let the Configurable2 system to handle merging
_log.debug( "{}Pre-existing configurable was found to have the same properties".format( indent, comp.name ) )
instance = existingConfigurable
else: # create new configurable
@@ -931,8 +934,7 @@ def conf2toConfigurable( comp, indent="" ):
return instance
-from AthenaCommon.AppMgr import athAlgSeq
-def CAtoGlobalWrapper(cfgFunc, flags, destinationSeq=athAlgSeq, **kwargs):
+def CAtoGlobalWrapper(cfgFunc, flags, **kwargs):
"""
Temporarily available method allowing to merge CA into the configurations based on Configurable classes
"""
@@ -947,14 +949,15 @@ def CAtoGlobalWrapper(cfgFunc, flags, destinationSeq=athAlgSeq, **kwargs):
ca = result
Configurable.configurableRun3Behavior=0
- appendCAtoAthena(ca,destinationSeq)
+ appendCAtoAthena(ca)
pass
-def appendCAtoAthena(ca, destinationSeq=athAlgSeq ):
+def appendCAtoAthena(ca):
_log = logging.getLogger( "conf2toConfigurable".ljust(32) )
_log.info( "Merging of CA to global ..." )
- from AthenaCommon.AppMgr import ServiceMgr,ToolSvc,athAlgSeq,athCondSeq
+
+ from AthenaCommon.AppMgr import ServiceMgr,ToolSvc,athCondSeq,athOutSeq,athAlgSeq,topSequence
if len(ca.getServices()) != 0:
_log.info( "Merging services" )
for comp in ca.getServices():
@@ -974,13 +977,21 @@ def appendCAtoAthena(ca, destinationSeq=athAlgSeq ):
ToolSvc += instance
_log.info( "Merging sequences and algorithms" )
- from AthenaCommon.CFElements import findSubSequence, flatSequencers
- from AthenaCommon.AlgSequence import AlgSequence
+ from AthenaCommon.CFElements import findSubSequence
+
+ def __fetchOldSeq(name=""):
+ from AthenaCommon.Configurable import Configurable
+ currentBehaviour = Configurable.configurableRun3Behavior
+ Configurable.configurableRun3Behavior=0
+ from AthenaCommon.AlgSequence import AlgSequence
+ seq = AlgSequence(name)
+ Configurable.configurableRun3Behavior=currentBehaviour
+ return seq
def __mergeSequences( currentConfigurableSeq, conf2Sequence, indent="" ):
sequence = findSubSequence( currentConfigurableSeq, conf2Sequence.name )
if not sequence:
- sequence = AlgSequence( conf2Sequence.name )
+ sequence = __fetchOldSeq( conf2Sequence.name )
__setProperties( sequence, conf2Sequence, indent=__indent( indent ) )
currentConfigurableSeq += sequence
_log.info( "{}Created missing AlgSequence {} and added to {}".format( __indent( indent ), sequence.name(), currentConfigurableSeq.name() ) )
@@ -989,15 +1000,30 @@ def appendCAtoAthena(ca, destinationSeq=athAlgSeq ):
if el.__class__.__name__ == "AthSequencer":
__mergeSequences( sequence, el, __indent( indent ) )
elif el.getGaudiType() == "Algorithm":
-
sequence += conf2toConfigurable( el, indent=__indent( indent ) )
- _log.info( "{}Created algorithm {} and added to the sequence {}".format( __indent( indent ), el.getFullJobOptName(), sequence.name() ) )
-
- __mergeSequences( destinationSeq, ca._sequence )
- for name, content in six.iteritems( flatSequencers(athAlgSeq) ):
- _log.debug( "{}Sequence {}".format( "-\\", name ) )
- for c in content:
- _log.debug( "{} name {} type {}".format( " +", c.name(), type(c) ) )
+ _log.info( "{}Algorithm {} and added to the sequence {}".format( __indent( indent ), el.getFullJobOptName(), sequence.name() ) )
+
+
+ preconfigured = [athCondSeq,athOutSeq,athAlgSeq,topSequence]
+ #preconfigured = ["AthMasterSeq", "AthCondSeq", "AthAlgSeq", "AthOutSeq", "AthRegSeq"]
+
+ for seq in ca._allSequences:
+ merged = False
+ for pre in preconfigured:
+ if seq.getName() == pre.getName():
+ _log.info( "{}found sequence {} to have the same name as predefined {}".format( __indent(), seq.getName(), pre ) )
+ __mergeSequences( pre, seq )
+ merged = True
+ break
+ if findSubSequence( pre, seq.name ):
+ _log.info( "{}found sequence {} in predefined {}".format( __indent(), seq.getName(), pre ) )
+ __mergeSequences( pre, seq )
+ merged = True
+ break
+
+ if not merged:
+ _log.info( "{}not found sequence {} merging it to AthAlgSeq".format( __indent(), seq.name ) )
+ __mergeSequences( athAlgSeq, seq )
ca.wasMerged()
_log.info( "Merging of CA to global done ..." )
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py b/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py
index 830ba6e9fe0fca4238a653e3e0e34ceb40a2c2ef..a6e6b98c654b5122700d2371b5dd5dc2d34b92e3 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py
@@ -483,8 +483,7 @@ class TestSequencesMerging( unittest.TestCase ):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
ca2 = OutputStreamCfg(ConfigFlags, "RDO", ItemList = [
"SCT_RDO_Container#SCT_RDOs",
- "InDetSimDataCollection#SCT_SDO_Map"
- ])
+ "InDetSimDataCollection#SCT_SDO_Map"])
ca2.printConfig()
print("after merge")
diff --git a/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt b/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt
index 8b9041b976fe867e072039eb32fdcb6c4cbbebfc..433119a28496de4890efeb1be9b2abbe42c67ec2 100644
--- a/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt
@@ -21,8 +21,6 @@ atlas_add_component( AthExOnnxRuntime
# Install files from the package.
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/OnnxRuntimeConfig.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up tests for the package.
atlas_add_test( AthExOnnxRuntimeJob_serial
diff --git a/Control/CxxUtils/test/PackedArray_test.cxx b/Control/CxxUtils/test/PackedArray_test.cxx
index ddcb124059d015cfc7b8f1624c32faf7539a3487..dbf4d5e7f81cafea3351c0dc573e813ac4be673e 100644
--- a/Control/CxxUtils/test/PackedArray_test.cxx
+++ b/Control/CxxUtils/test/PackedArray_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: PackedArray_test.cxx,v 1.2 2008-12-12 04:26:20 ssnyder Exp $
@@ -68,6 +68,7 @@ void testit (PackedArray& arr)
}
compare (arr, v);
+ // cppcheck-suppress invalidContainerReference // false positive
assert (carr.front() == (cv.front() & bitmask));
assert (arr.front() == (v.front() & bitmask));
x = std::rand();
diff --git a/Control/CxxUtils/test/vec_test.cxx b/Control/CxxUtils/test/vec_test.cxx
index 0763571eab760fd36e055ea1ac8c822691d98721..277b0877bb79cd038f6f5459825df25d6d78f541 100644
--- a/Control/CxxUtils/test/vec_test.cxx
+++ b/Control/CxxUtils/test/vec_test.cxx
@@ -155,8 +155,10 @@ void test_int NO_SANITIZE_UNDEFINED (const VEC& v1)
TEST(&, _);
TEST(%, _);
if (!std::is_signed_v<T>) {
+ // cppcheck-suppress compareBoolExpressionWithInt // false positive
TEST(<<, MOD);
}
+ // cppcheck-suppress compareBoolExpressionWithInt // false positive
TEST(>>, MOD);
#undef TEST
diff --git a/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonAlg.h b/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonAlg.h
index 0c73e5d93230e9c569fb62289d81d2386eabb5db..8e0c2d5c977974b8e9d3696ec0b809b91b765cef 100644
--- a/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonAlg.h
+++ b/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonAlg.h
@@ -9,7 +9,7 @@
//
// AUTHOR: Peter Onyisi
// following original by Luca Fiorini <Luca.Fiorini@cern.ch>
-//
+//
//
// ********************************************************************
#ifndef DQTDetSynchMonAlg_H
@@ -18,7 +18,6 @@
#include <set>
#include "GaudiKernel/ToolHandle.h"
#include <stdint.h>
-#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "TH1.h"
#include "TH2.h"
#include "LWHists/TProfile_LW.h"
@@ -30,15 +29,11 @@
#include "MuonRDO/RpcPadContainer.h"
#include "AthenaMonitoring/AthMonitorAlgorithm.h"
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
// MagField cache
#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "MagFieldElements/AtlasFieldCache.h"
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-namespace Trk {
- class IMagFieldSvc;
-}
class TProfile;
@@ -46,21 +41,19 @@ class DQTDetSynchMonAlg: public AthMonitorAlgorithm
{
public:
-
+
DQTDetSynchMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~DQTDetSynchMonAlg();
virtual StatusCode initialize() override;
-
+
virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
uint32_t findid(const std::multiset<uint32_t>& mset) const;
float findfrac(const std::multiset<uint32_t>& mset, uint16_t ctpid) const;
private:
- ServiceHandle<MagField::IMagFieldSvc> m_field { this, "MagFieldTool",
- "AtlasFieldSvc" };
Gaudi::Property<Int_t> m_solenoidPositionX { this, "SolenoidPositionX", 0 };
Gaudi::Property<Int_t> m_solenoidPositionY { this, "SolenoidPositionY", 10 };
Gaudi::Property<Int_t> m_solenoidPositionZ { this, "SolenoidPositionZ", 0 };
@@ -73,7 +66,7 @@ private:
// some strings so we don't need to do string manipulation every event
static const int NDETS = 7;
std::vector<std::string> m_diffnamevec;
-
+
// storegate keys
SG::ReadHandleKeyArray<InDetTimeCollection> m_InDetTimeCollectionKeys
{ this, "InDetTimeCollectionKeys", {"TRT_BCID", "SCT_BCID", "PixelBCID", "TRT_LVL1ID", "SCT_LVL1ID", "PixelLVL1ID"} } ;
@@ -83,10 +76,13 @@ private:
{ this, "TileDigitsContainerKey", "TileDigitsFlt" };
SG::ReadHandleKey<RpcPadContainer> m_RpcPadContainerKey
{ this, "RpcPadContainerKey", "RPCPAD" };
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj",
- "Name of the Magnetic Field conditions object key"};
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey{
+ this,
+ "AtlasFieldCacheCondObj",
+ "fieldCondObj",
+ "Name of the Magnetic Field conditions object key"
+ };
+
};
#endif
diff --git a/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonTool.h b/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonTool.h
index 4fcc7609eab53ac77b40fe0af1ffae8ea5a455b3..679bd516c0b98d1f82eb73d224a1e19e7edf301f 100644
--- a/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonTool.h
+++ b/DataQuality/DataQualityTools/DataQualityTools/DQTDetSynchMonTool.h
@@ -8,16 +8,17 @@
// PACKAGE: DataQualityTools
//
// AUTHOR: Luca Fiorini <Luca.Fiorini@cern.ch>
-//
+//
//
// ********************************************************************
#ifndef DQTDetSynchMonTool_H
#define DQTDetSynchMonTool_H
+#include "GeoPrimitives/GeoPrimitives.h"
+#include "GaudiKernel/EventContext.h"
#include <set>
#include "GaudiKernel/ToolHandle.h"
#include <stdint.h>
-#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "DataQualityTools/DataQualityFatherMonTool.h"
#include "TH1.h"
#include "TH2.h"
@@ -28,18 +29,9 @@
#include "TileEvent/TileDigitsContainer.h"
#include "LArRawEvent/LArFebHeaderContainer.h"
#include "MuonRDO/RpcPadContainer.h"
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// MagField cache
#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "MagFieldElements/AtlasFieldCache.h"
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace Trk {
- //REL18 class IMagneticFieldTool;
- //REL19
- class IMagFieldSvc;
-}
class TProfile;
@@ -47,18 +39,16 @@ class DQTDetSynchMonTool: public DataQualityFatherMonTool
{
public:
-
+
DQTDetSynchMonTool(const std::string & type, const std::string & name, const IInterface* parent);
~DQTDetSynchMonTool();
StatusCode initialize();
-
+
StatusCode bookHistograms( );
- //StatusCode bookHistograms( bool isNewEventsBlock, bool isNewLumiBlock, bool isNewRun );
StatusCode fillHistograms( );
StatusCode procHistograms( );
- //StatusCode procHistograms( bool isEndOfEventsBlock, bool isEndOfLumiBlock, bool isEndOfRun );
StatusCode checkHists(bool fromFinalize);
uint32_t findid(std::multiset<uint32_t>& mset);
float findfrac(std::multiset<uint32_t>& mset, uint16_t ctpid);
@@ -71,7 +61,6 @@ class DQTDetSynchMonTool: public DataQualityFatherMonTool
private:
- ServiceHandle<MagField::IMagFieldSvc> m_field;
Int_t m_solenoidPositionX;
Int_t m_solenoidPositionY;
Int_t m_solenoidPositionZ;
@@ -194,7 +183,7 @@ private:
TH1I* m_diff_CTP_LAR_BCID_Rebin;
TH1I* m_diff_CTP_Tile_BCID_Rebin;
TH1I* m_diff_CTP_RPC_BCID_Rebin;
-
+
TH1I* m_diff_CTP_SCT_L1ID_Rebin;
TH1I* m_diff_CTP_TRT_L1ID_Rebin;
TH1I* m_diff_CTP_LAR_L1ID_Rebin;
@@ -216,8 +205,8 @@ private:
TH1I_LW* m_Bfield_solenoid;
TH1I_LW* m_Bfield_toroid;
- TProfile_LW* m_Bfield_solenoid_vsLB;
- TProfile_LW* m_Bfield_toroid_vsLB;
+ TProfile_LW* m_Bfield_solenoid_vsLB;
+ TProfile_LW* m_Bfield_toroid_vsLB;
TH2I_LW* m_diff_BCID;
TH2I_LW* m_diff_BCID_rate;
@@ -237,23 +226,6 @@ private:
std::multiset<uint32_t> m_rpcl1idset;
std::multiset<uint32_t> m_pixell1idset;
- //int m_nevents;
-
- //int m_n_sct_nrobs;
- //int m_n_trt_nrobs;
- //int m_n_lar_nrobs;
- //int m_n_tile_nrobs;
- //int m_n_pixel_nrobs;
-
-
- //int m_n_sct_bcid_nrobs;
- //int m_n_trt_bcid_nrobs;
- //int m_n_sct_lvl1_nrobs;
- //int m_n_trt_lvl1_nrobs;
- //int m_n_pixel_bcid_nrobs;
- //int m_n_pixel_lvl1_nrobs;
-
- // Use these so we don't print out endless messages!
bool m_printedErrorCTP_RIO;
bool m_printedErrorTRT_BCID;
bool m_printedErrorSCT_BCID;
@@ -268,9 +240,7 @@ private:
bool m_printedErrorTileCtr;
bool m_printedErrorRPC;
- // detector indices
- //std::map<int, std::string>
-
+
// storegate keys
SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKey
{ "EventInfo" };
@@ -282,11 +252,8 @@ private:
{ "TileDigitsFlt" };
SG::ReadHandleKey<RpcPadContainer> m_RpcPadContainerKey
{ "RPCPAD" };
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj",
- "Name of the Magnetic Field conditions object key"};
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey {this,
+ "AtlasFieldCacheCondObj", "fieldCondObj","Name of the Magnetic Field conditions object key"};
};
#endif
diff --git a/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx b/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx
index 4c7a007417d597fc439b8e4e023e2b93bfe48041..f8201cfe49ba3d53349ab892b56ba5dba1ab6609 100644
--- a/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx
+++ b/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx
@@ -5,7 +5,7 @@
// ********************************************************************
//
// NAME: DQTDetSynchMonAlg.cxx
-// PACKAGE: DataQualityTools
+// PACKAGE: DataQualityTools
//
// AUTHORS: Luca Fiorini <Luca.Fiorini@cern.ch>
// Updated by:
@@ -13,7 +13,7 @@
// and Max Baak (mbaakcern.ch)
// and Sam King (samking@physics.ubc.ca)
// and Simon Viel (svielcern.ch)
-// and Peter Onyisi
+// and Peter Onyisi
//
// ********************************************************************
@@ -23,11 +23,10 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
-
#include "TProfile.h"
#include "AthenaMonitoringKernel/Monitored.h"
+
//----------------------------------------------------------------------------------
DQTDetSynchMonAlg::DQTDetSynchMonAlg( const std::string& name,
ISvcLocator* pSvcLocator )
@@ -57,11 +56,7 @@ StatusCode DQTDetSynchMonAlg::initialize() {
ATH_CHECK( m_LArFebHeaderContainerKey.initialize() );
ATH_CHECK( m_TileDigitsContainerKey.initialize() );
ATH_CHECK( m_RpcPadContainerKey.initialize() );
- ATH_CHECK( m_field.retrieve() );
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ATH_CHECK( m_fieldCondObjInputKey.initialize() );
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
return AthMonitorAlgorithm::initialize();
}
@@ -77,7 +72,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
std::multiset<uint32_t> tilebcidset;
std::multiset<uint32_t> rpcbcidset;
std::multiset<uint32_t> pixelbcidset;
-
+
std::multiset<uint32_t> sctl1idset;
std::multiset<uint32_t> trtl1idset;
std::multiset<uint32_t> larl1idset;
@@ -96,7 +91,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
uint32_t ctpl1id(9999999); // handled specially
uint32_t lumi(0), evtNum(0);
-
+
//Retrieve CTP, other things from EventInfo
SG::ReadHandle<xAOD::EventInfo> thisEventInfo { GetEventInfo(ctx) } ;
if(! thisEventInfo.isValid())
@@ -116,7 +111,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
if (inDetTimeCollections[0].isValid()) {
auto& TRT_BCIDColl(inDetTimeCollections[0]);
- for ( InDetTimeCollection::const_iterator itrt_bcid
+ for ( InDetTimeCollection::const_iterator itrt_bcid
= TRT_BCIDColl->begin();
itrt_bcid != TRT_BCIDColl->end(); ++itrt_bcid ) {
//Current bcid
@@ -127,10 +122,10 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
ATH_MSG_WARNING( "Could not get any TRT_BCID containers " );
}
-
+
if (inDetTimeCollections[1].isValid()) {
auto& SCT_BCIDColl(inDetTimeCollections[1]);
- for ( InDetTimeCollection::const_iterator isct_bcid
+ for ( InDetTimeCollection::const_iterator isct_bcid
= SCT_BCIDColl->begin();
isct_bcid != SCT_BCIDColl->end(); ++isct_bcid ) {
//Current bcid
@@ -140,11 +135,11 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
else {
ATH_MSG_WARNING( "Could not get any SCT_BCID containers " );
}
-
+
if (inDetTimeCollections[2].isValid()) {
auto& Pixel_BCIDColl(inDetTimeCollections[2]);
- for ( InDetTimeCollection::const_iterator ipixel_bcid
+ for ( InDetTimeCollection::const_iterator ipixel_bcid
= Pixel_BCIDColl->begin();
ipixel_bcid != Pixel_BCIDColl->end(); ++ipixel_bcid ) {
//Current bcid
@@ -158,7 +153,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
if (inDetTimeCollections[3].isValid()) {
auto& TRT_LVL1IDColl(inDetTimeCollections[3]);
- for ( InDetTimeCollection::const_iterator itrt_lvl1id
+ for ( InDetTimeCollection::const_iterator itrt_lvl1id
= TRT_LVL1IDColl->begin();
itrt_lvl1id != TRT_LVL1IDColl->end(); ++itrt_lvl1id ) {
//Current lvl1id
@@ -172,7 +167,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
if (inDetTimeCollections[4].isValid()) {
auto& SCT_LVL1IDColl(inDetTimeCollections[4]);
- for ( InDetTimeCollection::const_iterator isct_lvl1id
+ for ( InDetTimeCollection::const_iterator isct_lvl1id
= SCT_LVL1IDColl->begin();
isct_lvl1id != SCT_LVL1IDColl->end(); ++isct_lvl1id ) {
//Current lvl1id
@@ -182,11 +177,11 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
else {
ATH_MSG_WARNING( "Could not get SCT_LVL1ID container " );
}
-
+
if (inDetTimeCollections[5].isValid()) {
auto& Pixel_LVL1IDColl(inDetTimeCollections[5]);
- for ( InDetTimeCollection::const_iterator ipixel_lvl1id
+ for ( InDetTimeCollection::const_iterator ipixel_lvl1id
= Pixel_LVL1IDColl->begin();
ipixel_lvl1id != Pixel_LVL1IDColl->end(); ++ipixel_lvl1id ) {
//Current lvl1id
@@ -207,15 +202,15 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
pixell1id=findid(pixell1idset);
pixelbcid=findid(pixelbcidset);
pixelfrac=findfrac(pixelbcidset,ctpbcid);
-
+
SG::ReadHandle<LArFebHeaderContainer> hdrCont(m_LArFebHeaderContainerKey, ctx);
if (! hdrCont.isValid()) {
ATH_MSG_WARNING( "No LArFEB container found in TDS" );
}
else {
- //log << MSG::DEBUG << "LArFEB container found" <<endmsg;
- LArFebHeaderContainer::const_iterator it = hdrCont->begin();
- LArFebHeaderContainer::const_iterator itend = hdrCont->end();
+ //log << MSG::DEBUG << "LArFEB container found" <<endmsg;
+ LArFebHeaderContainer::const_iterator it = hdrCont->begin();
+ LArFebHeaderContainer::const_iterator itend = hdrCont->end();
for ( ; it!=itend;++it) {
//HWIdentifier febid=(*it)->FEBId();
unsigned int febid=((*it)->FEBId()).get_identifier32().get_compact();
@@ -228,11 +223,11 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
larbcid=findid(larbcidset);
larfrac=findfrac(larbcidset,larbcid);
larl1id=findid(larl1idset);
-
+
SG::ReadHandle<TileDigitsContainer> DigitsCnt(m_TileDigitsContainerKey, ctx);
if (! DigitsCnt.isValid()) {
ATH_MSG_WARNING( "No Tile Digits container found in TDS" );
- }
+ }
else {
TileDigitsContainer::const_iterator collItr=DigitsCnt->begin();
TileDigitsContainer::const_iterator lastColl=DigitsCnt->end();
@@ -247,7 +242,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
if (m_doRPC) {
SG::ReadHandle<RpcPadContainer> rpcRDO(m_RpcPadContainerKey, ctx);
- if (! rpcRDO.isValid()) {
+ if (! rpcRDO.isValid()) {
ATH_MSG_WARNING( "No RPC Pad container found in TDS" );
} else {
RpcPadContainer::const_iterator pad = rpcRDO->begin();
@@ -267,7 +262,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
rpcbcid=findid(rpcbcidset);
rpcfrac=findfrac(rpcbcidset,rpcbcid);
rpcl1id=findid(rpcl1idset);
-
+
auto ctp_l1id16 = Monitored::Scalar<uint32_t>("ctpl1id", ctpl1id & 0xFFFF);
uint32_t ctp_l1id9 = ctpl1id & 0x1FF;
auto tile_l1id16 = Monitored::Scalar<uint32_t>("tilel1id", tilel1id & 0xFFFF);
@@ -286,8 +281,8 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
auto bcidrates_idx = Monitored::Collection( "bcidrates_idx",
bcidrates_idx_base );
-
-
+
+
std::vector<Int_t> bcidvals { ctpbcid, sctbcid, trtbcid, larbcid,
tilebcid, rpcbcid, pixelbcid };
std::vector<int> diffx_base, diffy_base;
@@ -331,7 +326,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
auto diffjunk = Monitored::Scalar("diff_0_6", bcidvals[0]-bcidvals[6]);
fill("bcid", diffjunk, lb);
}
-
+
auto diffx = Monitored::Collection("diffx", diffx_base);
auto diffy = Monitored::Collection("diffy", diffy_base);
fill("bcid", ctpbcid, sctbcid, trtbcid, larbcid, tilebcid, rpcbcid,
@@ -353,7 +348,7 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
for (size_t iy = ix+1; iy < NDETS; ++iy) {
UInt_t xl1id, yl1id;
// RPC (index 5) is an exception
- if (iy == 5) {
+ if (iy == 5) {
yl1id = rpcl1id; xl1id = l1idvals_d9[ix];
} else if (ix == 5) {
xl1id = rpcl1id; yl1id = l1idvals_d9[iy];
@@ -387,33 +382,24 @@ StatusCode DQTDetSynchMonAlg::fillHistograms( const EventContext& ctx ) const
fill("l1id", ctp_l1id16, sctl1id, trtl1id, larl1id,
tile_l1id16, rpcl1id, pixell1id, diffx, diffy);
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////
// B field
- Amg::Vector3D f;
+ Amg::Vector3D f;
Amg::Vector3D gP1(m_solenoidPositionX, m_solenoidPositionY, m_solenoidPositionZ);
MagField::AtlasFieldCache fieldCache;
- SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCondObjInputKey, ctx};
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, ctx};
const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
-
if (fieldCondObj == nullptr) {
- ATH_MSG_ERROR("DQTDetSynchMonAlg: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key());
+ ATH_MSG_ERROR("DQTDetSynchMonAlg: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
return StatusCode::FAILURE;
}
fieldCondObj->getInitializedCache (fieldCache);
-
- // MT version uses cache, temporarily keep old version
- if (fieldCache.useNewBfieldCache()) fieldCache.getField(gP1.data(),f.data());
- else m_field->getField(&gP1,&f);
+ fieldCache.getField(gP1.data(),f.data());
// field is in kilotesla (!)
auto solenoid_bz = Monitored::Scalar("solenoid_bz", f[2]*1000.);
Amg::Vector3D gP2(m_toroidPositionX, m_toroidPositionY, m_toroidPositionZ);
-
- // MT version uses cache, temporarily keep old version
if (fieldCache.useNewBfieldCache()) fieldCache.getField(gP2.data(),f.data());
- ////////////////////////////////////////////////////////////////////////////////////////////////////
auto toroid_bx = Monitored::Scalar("toroid_bx", f[0]*1000.);
@@ -471,7 +457,7 @@ float DQTDetSynchMonAlg::findfrac(const std::multiset<uint32_t>& mset, uint16_t
int nonctpIdCounter=0;
float frac = 0.0;
- if (it!=itend && !mset.empty()){
+ if (it!=itend && !mset.empty()){
for (;it!=itend;++it) {
totalCounter++;
if ( (*it) != ctpid ) nonctpIdCounter++;
diff --git a/DataQuality/DataQualityTools/src/DQTDetSynchMonTool.cxx b/DataQuality/DataQualityTools/src/DQTDetSynchMonTool.cxx
index 6eaf4893e62d7eab0ee8fb8ee6ed0f406f8df3c4..951c4de5fe48fa0fa74d91df3b8e2d2b571d7339 100644
--- a/DataQuality/DataQualityTools/src/DQTDetSynchMonTool.cxx
+++ b/DataQuality/DataQualityTools/src/DQTDetSynchMonTool.cxx
@@ -5,7 +5,7 @@
// ********************************************************************
//
// NAME: DQTDetSynchMonTool.cxx
-// PACKAGE: DataQualityTools
+// PACKAGE: DataQualityTools
//
// AUTHORS: Luca Fiorini <Luca.Fiorini@cern.ch>
// Updated by:
@@ -22,16 +22,13 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
-
#include "TProfile.h"
//----------------------------------------------------------------------------------
-DQTDetSynchMonTool::DQTDetSynchMonTool(const std::string & type,
+DQTDetSynchMonTool::DQTDetSynchMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
: DataQualityFatherMonTool(type, name, parent),
- m_field("AtlasFieldSvc", name),
m_CTP_BCID(0),
m_SCT_BCID(0),
m_TRT_BCID(0),
@@ -144,8 +141,8 @@ DQTDetSynchMonTool::DQTDetSynchMonTool(const std::string & type,
m_diff_Tile_RPC_L1ID_Rebin(0),
m_Bfield_solenoid(0),
m_Bfield_toroid(0),
- m_Bfield_solenoid_vsLB(0),
- m_Bfield_toroid_vsLB(0),
+ m_Bfield_solenoid_vsLB(0),
+ m_Bfield_toroid_vsLB(0),
m_diff_BCID(0),
m_diff_BCID_rate(0), //rate plot; bcid diff relative to ctp
m_diff_L1ID(0),
@@ -179,7 +176,6 @@ DQTDetSynchMonTool::DQTDetSynchMonTool(const std::string & type,
//declareProperty("doRunBeam", m_doRunBeam = 1);
//declareProperty("doOfflineHists", m_doOfflineHists = 1);
//declareProperty("doOnlineHists", m_doOnlineHists = 1);
- declareProperty("MagFieldTool", m_field);
declareProperty("SolenoidPositionX", m_solenoidPositionX = 0);
declareProperty("SolenoidPositionY", m_solenoidPositionY = 10);
declareProperty("SolenoidPositionZ", m_solenoidPositionZ = 0);
@@ -202,9 +198,7 @@ StatusCode DQTDetSynchMonTool::initialize() {
ATH_CHECK( m_LArFebHeaderContainerKey.initialize() );
ATH_CHECK( m_TileDigitsContainerKey.initialize() );
ATH_CHECK( m_RpcPadContainerKey.initialize() );
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ATH_CHECK( m_fieldCondObjInputKey.initialize() );
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
return DataQualityFatherMonTool::initialize();
}
@@ -228,17 +222,17 @@ StatusCode DQTDetSynchMonTool::bookHistograms( )
m_printedErrorLAr = false;
m_printedErrorTile = false;
m_printedErrorTileCtr = false;
- m_printedErrorRPC = false;
+ m_printedErrorRPC = false;
//// if (isNewEventsBlock || isNewLumiBlock || isNewRun) {
//if (newRun) {
MsgStream log(msgSvc(), name());
-
+
//log << MSG::DEBUG << "in bookHistograms() and m_doRunCosmics = " << m_doRunCosmics << " and m_doRunBeam = " << m_doRunBeam << endmsg;
//log << MSG::DEBUG << "Using base path " << m_path << endmsg;
-
- failure = bookBCID();
+
+ failure = bookBCID();
failure = failure || bookL1ID();
failure = failure || bookBfield();
//}
@@ -247,7 +241,7 @@ StatusCode DQTDetSynchMonTool::bookHistograms( )
//}
if (failure) {return StatusCode::FAILURE;}
else {return StatusCode::SUCCESS;}
-}
+}
//----------------------------------------------------------------------------------
@@ -257,8 +251,8 @@ bool DQTDetSynchMonTool::bookBCID()
bool failure(false);
// if (isNewEventsBlock || isNewLumiBlock || isNewRun) {
MsgStream log(msgSvc(), name());
-
-
+
+
std::string fullPathBCID=m_path+"/BCID";
// Book summary plot
@@ -291,7 +285,7 @@ bool DQTDetSynchMonTool::bookBCID()
m_diff_BCID_rate->GetXaxis()->SetBinLabel(5, "RPC");
m_diff_BCID_rate->GetXaxis()->SetBinLabel(6, "Pixel");
}
-
+
// Booking subdetectors BCID values
failure = failure | registerHist(fullPathBCID, m_CTP_BCID = TH1I_LW::create("m_CTP_BCID", "BCID of CTP", 4096, -0.5, 4095.5)).isFailure();
failure = failure | registerHist(fullPathBCID, m_SCT_BCID = TH1I_LW::create("m_SCT_BCID", "BCID of SCT detector", 4096, -0.5, 4095.5)).isFailure();
@@ -309,9 +303,9 @@ bool DQTDetSynchMonTool::bookBCID()
failure = failure |registerHist(fullPathBCID, m_diff_CTP_RPC_BCID = TH1I_LW::create("m_diff_CTP_RPC_BCID", "BCID difference between CTP and RPC detectors", 51, -25.5, 25.5)).isFailure();
-
+
// Booking subdetectors BCID differences wrt CTP as a function of LumiBlock
- if (!m_doOnlineHists) {
+ if (!m_doOnlineHists) {
failure = failure |registerHist(fullPathBCID, m_diff_CTP_SCT_BCID_lumi = new TProfile("m_diff_CTP_SCT_BCID_lumi", "BCID difference between CTP and SCT detectors as a function of the LumiBlock", 30, 0., 30,-4096.,4096)).isFailure();
failure = failure |registerHist(fullPathBCID, m_diff_CTP_TRT_BCID_lumi = new TProfile("m_diff_CTP_TRT_BCID_lumi", "BCID difference between CTP and TRT detectors as a function of the LumiBlock", 30, 0., 30,-4096.,4096)).isFailure();
failure = failure |registerHist(fullPathBCID, m_diff_CTP_LAR_BCID_lumi = new TProfile("m_diff_CTP_LAR_BCID_lumi", "BCID difference between CTP and LAR detectors as a function of the LumiBlock", 30, 0., 30,-4096.,4096)).isFailure();
@@ -354,7 +348,7 @@ bool DQTDetSynchMonTool::bookBCID()
if (!m_doOnlineHists) {
- // Booking subdetectors BCID differences wrt CTP in resizable histograms
+ // Booking subdetectors BCID differences wrt CTP in resizable histograms
failure = failure |registerHist(fullPathBCID, m_diff_CTP_SCT_BCID_Rebin = new TH1I("m_diff_CTP_SCT_BCID_Rebin", "BCID difference between CTP and SCT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
m_diff_CTP_SCT_BCID_Rebin->SetCanExtend(TH1::kAllAxes);
failure = failure |registerHist(fullPathBCID, m_diff_CTP_TRT_BCID_Rebin = new TH1I("m_diff_CTP_TRT_BCID_Rebin", "BCID difference between CTP and TRT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
@@ -391,8 +385,6 @@ bool DQTDetSynchMonTool::bookBCID()
m_diff_LAR_RPC_BCID_Rebin->SetCanExtend(TH1::kAllAxes);
failure = failure |registerHist(fullPathBCID, m_diff_Tile_RPC_BCID_Rebin = new TH1I("m_diff_Tile_RPC_BCID_Rebin", "BCID difference between Tile and RPC detectors. Full Range", 51, -25.5, 25.5)).isFailure();
m_diff_Tile_RPC_BCID_Rebin->SetCanExtend(TH1::kAllAxes);
-
-
failure = failure |registerHist(fullPathBCID, m_diff_Pixel_SCT_BCID_Rebin = new TH1I("m_diff_Pixel_SCT_BCID_Rebin", "BCID difference between Pixel and SCT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
m_diff_Pixel_SCT_BCID_Rebin->SetCanExtend(TH1::kAllAxes);
failure = failure |registerHist(fullPathBCID, m_diff_Pixel_TRT_BCID_Rebin = new TH1I("m_diff_Pixel_TRT_BCID_Rebin", "BCID difference between Pixel and TRT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
@@ -406,16 +398,16 @@ bool DQTDetSynchMonTool::bookBCID()
failure = failure |registerHist(fullPathBCID, m_diff_Pixel_CTP_BCID_Rebin = new TH1I("m_diff_Pixel_CTP_BCID_Rebin", "BCID difference between Pixel and CTP detectors. Full Range", 51, -25.5, 25.5)).isFailure();
m_diff_Pixel_CTP_BCID_Rebin->SetCanExtend(TH1::kAllAxes);
}
-
-
- if (failure)
+
+
+ if (failure)
{
log << MSG::WARNING << "Error Booking BCID histograms " << endmsg;
}
return failure;
}
-
+
//----------------------------------------------------------------------------------
bool DQTDetSynchMonTool::bookL1ID()
@@ -423,7 +415,7 @@ bool DQTDetSynchMonTool::bookL1ID()
{
bool failure(false);
MsgStream log(msgSvc(), name());
-
+
std::string fullPathL1ID=m_path+"/L1ID";
failure = failure | registerHist(fullPathL1ID, m_diff_L1ID = TH2I_LW::create("m_L1ID","L1ID subdetector summary ", 7, 0.5, 7.5, 7, 0.5, 7.5)).isFailure();
@@ -460,8 +452,8 @@ bool DQTDetSynchMonTool::bookL1ID()
failure = failure |registerHist(fullPathL1ID, m_diff_CTP_LAR_L1ID = TH1I_LW::create("m_diff_CTP_LAR_L1ID", "L1ID difference between CTP and LAR detectors", 51, -25.5, 25.5)).isFailure();
failure = failure |registerHist(fullPathL1ID, m_diff_CTP_Tile_L1ID = TH1I_LW::create("m_diff_CTP_Tile_L1ID", "L1ID difference between CTP and Tile detectors", 51, -25.5, 25.5)).isFailure();
failure = failure |registerHist(fullPathL1ID, m_diff_CTP_RPC_L1ID = TH1I_LW::create("m_diff_CTP_RPC_L1ID", "L1ID difference between CTP and RPC detectors", 51, -25.5, 25.5)).isFailure();
-
-
+
+
// Booking subdetectors L1ID differences as a function of the lumiblock
if (!m_doOnlineHists) {
failure = failure |registerHist(fullPathL1ID, m_diff_CTP_SCT_L1ID_lumi = new TProfile("m_diff_CTP_SCT_L1ID_lumi", "L1ID difference between CTP and SCT detectors as a function of the LumiBlock", 30, 0., 30,-4096.,4096)).isFailure();
@@ -501,11 +493,11 @@ bool DQTDetSynchMonTool::bookL1ID()
failure = failure |registerHist(fullPathL1ID, m_diff_Pixel_Tile_L1ID = TH1I_LW::create("m_diff_Pixel_Tile_L1ID", "L1ID difference between Pixel and Tile detectors", 51, -25.5, 25.5)).isFailure();
failure = failure |registerHist(fullPathL1ID, m_diff_Pixel_RPC_L1ID = TH1I_LW::create("m_diff_Pixel_RPC_L1ID", "L1ID difference between Pixel and RPC detectors", 51, -25.5, 25.5)).isFailure();
failure = failure |registerHist(fullPathL1ID, m_diff_Pixel_CTP_L1ID = TH1I_LW::create("m_diff_Pixel_CTP_L1ID", "L1ID difference between Pixel and CTP", 51, -25.5, 25.5)).isFailure();
-
-
+
+
// Booking subdetectors L1ID differences in resizable histograms, these were missing
if (!m_doOnlineHists) {
-
+
// Booking subdetectors L1ID differences wrt CTP in resizable histograms
failure = failure |registerHist(fullPathL1ID, m_diff_CTP_SCT_L1ID_Rebin = new TH1I("m_diff_CTP_SCT_L1ID_Rebin", "L1ID difference between CTP and SCT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
m_diff_CTP_SCT_L1ID_Rebin->SetCanExtend(TH1::kAllAxes);
@@ -539,8 +531,8 @@ bool DQTDetSynchMonTool::bookL1ID()
failure = failure |registerHist(fullPathL1ID, m_diff_LAR_RPC_L1ID_Rebin = new TH1I("m_diff_LAR_RPC_L1ID_Rebin", "L1ID difference between LAR and RPC detectors. Full Range", 51, -25.5, 25.5)).isFailure();
m_diff_LAR_RPC_L1ID_Rebin->SetCanExtend(TH1::kAllAxes);
failure = failure |registerHist(fullPathL1ID, m_diff_Tile_RPC_L1ID_Rebin = new TH1I("m_diff_Tile_RPC_L1ID_Rebin", "L1ID difference between Tile and RPC detectors. Full Range", 51, -25.5, 25.5)).isFailure();
- m_diff_Tile_RPC_L1ID_Rebin->SetCanExtend(TH1::kAllAxes);
+ m_diff_Tile_RPC_L1ID_Rebin->SetCanExtend(TH1::kAllAxes);
failure = failure |registerHist(fullPathL1ID, m_diff_Pixel_SCT_L1ID_Rebin = new TH1I("m_diff_Pixel_SCT_L1ID_Rebin", "L1ID difference between Pixel and SCT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
m_diff_Pixel_SCT_L1ID_Rebin->SetCanExtend(TH1::kAllAxes);
failure = failure |registerHist(fullPathL1ID, m_diff_Pixel_TRT_L1ID_Rebin = new TH1I("m_diff_Pixel_TRT_L1ID_Rebin", "L1ID difference between Pixel and TRT detectors. Full Range.", 51, -25.5, 25.5)).isFailure();
@@ -556,13 +548,13 @@ bool DQTDetSynchMonTool::bookL1ID()
}
- if (failure)
+ if (failure)
{
log << MSG::WARNING << "Error Booking L1ID histograms " << endmsg;
}
return failure;
-
-}
+
+}
//----------------------------------------------------------------------------------
bool DQTDetSynchMonTool::bookBfield()
@@ -570,21 +562,21 @@ bool DQTDetSynchMonTool::bookBfield()
{
bool failure(false);
MsgStream log(msgSvc(), name());
-
+
std::string fullPathBfield=m_path+"/Bfield";
-
+
failure = failure |registerHist(fullPathBfield, m_Bfield_solenoid = TH1I_LW::create("m_Bfield_solenoid", "Bz of Solenoid", 50, -1, 4)).isFailure();
failure = failure |registerHist(fullPathBfield, m_Bfield_toroid = TH1I_LW::create("m_Bfield_toroid", "Bx of Toroid", 50, -1, 4)).isFailure();
failure = failure |registerHist(fullPathBfield, m_Bfield_solenoid_vsLB = TProfile_LW::create("m_Bfield_solenoid_vsLB","m_Bfield_solenoid_vsLB", 1500, -0.5, 1499.5)).isFailure();
failure = failure |registerHist(fullPathBfield, m_Bfield_toroid_vsLB = TProfile_LW::create("m_Bfield_toroid_vsLB","m_Bfield_toroid_vsLB", 1500, -0.5, 1499.5)).isFailure();
- if (failure)
+ if (failure)
{
log << MSG::WARNING << "Error Booking L1ID histograms " << endmsg;
}
return failure;
-}
+}
@@ -615,7 +607,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
clearMultisets(); // clear previous event entries
uint16_t sctbcid(0), trtbcid(0), larbcid(0), tilebcid(0), rpcbcid(0), pixelbcid(0);
- uint32_t sctl1id(0), trtl1id(0), larl1id(0), tilel1id(0), rpcl1id(0), pixell1id(0);
+ uint32_t sctl1id(0), trtl1id(0), larl1id(0), tilel1id(0), rpcl1id(0), pixell1id(0);
float sctfrac(0.0), trtfrac(0.0), larfrac(0.0), tilefrac(0.0), rpcfrac(0.0), pixelfrac(0.0);
@@ -623,7 +615,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
uint32_t ctpl1id(9999999);
uint32_t lumi(0), evtNum(0);
-
+
//Retrieve CTP, other things from EventInfo
SG::ReadHandle<xAOD::EventInfo> thisEventInfo(m_EventInfoKey);
if(! thisEventInfo.isValid())
@@ -642,46 +634,46 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
if (inDetTimeCollections[0].isValid()) {
auto& TRT_BCIDColl(inDetTimeCollections[0]);
- for ( InDetTimeCollection::const_iterator itrt_bcid
+ for ( InDetTimeCollection::const_iterator itrt_bcid
= TRT_BCIDColl->begin();
itrt_bcid != TRT_BCIDColl->end(); ++itrt_bcid ) {
//log << MSG::DEBUG << "TRT BCID pointer found! " << endmsg;
//Current bcid
m_trtbcidset.insert((uint16_t)(*itrt_bcid).second);
- //log << MSG::DEBUG << "TRT BCID found " << (*itrt_bcid)->second << endmsg;
-
+ //log << MSG::DEBUG << "TRT BCID found " << (*itrt_bcid)->second << endmsg;
+
} // End for loop
}
else {
ATH_MSG_WARNING( "Could not get any TRT_BCID containers " );
}
-
+
if (inDetTimeCollections[1].isValid()) {
auto& SCT_BCIDColl(inDetTimeCollections[1]);
- for ( InDetTimeCollection::const_iterator isct_bcid
+ for ( InDetTimeCollection::const_iterator isct_bcid
= SCT_BCIDColl->begin();
isct_bcid != SCT_BCIDColl->end(); ++isct_bcid ) {
//log << MSG::DEBUG << "SCT BCID pointer found! " << endmsg;
//Current bcid
m_sctbcidset.insert((uint16_t)(*isct_bcid).second);
- //log << MSG::DEBUG << "SCT BCID found " << (*isct_bcid)->second << endmsg;
+ //log << MSG::DEBUG << "SCT BCID found " << (*isct_bcid)->second << endmsg;
} // End for loop
}
else {
ATH_MSG_WARNING( "Could not get any SCT_BCID containers " );
}
-
+
if (inDetTimeCollections[2].isValid()) {
auto& Pixel_BCIDColl(inDetTimeCollections[2]);
- for ( InDetTimeCollection::const_iterator ipixel_bcid
+ for ( InDetTimeCollection::const_iterator ipixel_bcid
= Pixel_BCIDColl->begin();
ipixel_bcid != Pixel_BCIDColl->end(); ++ipixel_bcid ) {
//log << MSG::DEBUG << "Pixel BCID pointer found! " << endmsg;
//Current bcid
m_pixelbcidset.insert((uint16_t)(*ipixel_bcid).second);
- //log << MSG::DEBUG << "Pixel BCID found " << (*ipixel_bcid)->second << endmsg;
+ //log << MSG::DEBUG << "Pixel BCID found " << (*ipixel_bcid)->second << endmsg;
} // End for loop
}
else {
@@ -691,13 +683,13 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
if (inDetTimeCollections[3].isValid()) {
auto& TRT_LVL1IDColl(inDetTimeCollections[3]);
- for ( InDetTimeCollection::const_iterator itrt_lvl1id
+ for ( InDetTimeCollection::const_iterator itrt_lvl1id
= TRT_LVL1IDColl->begin();
itrt_lvl1id != TRT_LVL1IDColl->end(); ++itrt_lvl1id ) {
//log << MSG::DEBUG << "TRT LVL1 ID pointer found! " << endmsg;
//Current lvl1id
m_trtl1idset.insert((uint16_t)(*itrt_lvl1id).second);
- //log << MSG::DEBUG << "TRT LVL1 ID found " << (*itrt_lvl1id)->second << endmsg;
+ //log << MSG::DEBUG << "TRT LVL1 ID found " << (*itrt_lvl1id)->second << endmsg;
} // End for loop
}
else {
@@ -707,29 +699,29 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
if (inDetTimeCollections[4].isValid()) {
auto& SCT_LVL1IDColl(inDetTimeCollections[4]);
- for ( InDetTimeCollection::const_iterator isct_lvl1id
+ for ( InDetTimeCollection::const_iterator isct_lvl1id
= SCT_LVL1IDColl->begin();
isct_lvl1id != SCT_LVL1IDColl->end(); ++isct_lvl1id ) {
//log << MSG::DEBUG << "SCT LVL1 ID pointer found! " << endmsg;
//Current lvl1id
m_sctl1idset.insert((uint16_t)(*isct_lvl1id).second);
- //log << MSG::DEBUG << "SCT LVL1 ID found " << (*isct_lvl1id)->second << endmsg;
+ //log << MSG::DEBUG << "SCT LVL1 ID found " << (*isct_lvl1id)->second << endmsg;
} // End for loop
}
else {
ATH_MSG_WARNING( "Could not get SCT_LVL1ID container " );
}
-
+
if (inDetTimeCollections[5].isValid()) {
auto& Pixel_LVL1IDColl(inDetTimeCollections[5]);
- for ( InDetTimeCollection::const_iterator ipixel_lvl1id
+ for ( InDetTimeCollection::const_iterator ipixel_lvl1id
= Pixel_LVL1IDColl->begin();
ipixel_lvl1id != Pixel_LVL1IDColl->end(); ++ipixel_lvl1id ) {
//log << MSG::DEBUG << "Pixel LVL1 ID pointer found! " << endmsg;
//Current lvl1id
m_pixell1idset.insert((uint16_t)(*ipixel_lvl1id).second);
- //log << MSG::DEBUG << "Pixel LVL1 ID found " << (*ipixel_lvl1id)->second << endmsg;
+ //log << MSG::DEBUG << "Pixel LVL1 ID found " << (*ipixel_lvl1id)->second << endmsg;
} // End for loop
}
else {
@@ -746,15 +738,15 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
pixell1id=findid(m_pixell1idset);
pixelbcid=findid(m_pixelbcidset);
pixelfrac=findfrac(m_pixelbcidset,ctpbcid);
-
+
SG::ReadHandle<LArFebHeaderContainer> hdrCont(m_LArFebHeaderContainerKey);
if (! hdrCont.isValid()) {
ATH_MSG_WARNING( "No LArFEB container found in TDS" );
}
else {
- //log << MSG::DEBUG << "LArFEB container found" <<endmsg;
- LArFebHeaderContainer::const_iterator it = hdrCont->begin();
- LArFebHeaderContainer::const_iterator itend = hdrCont->end();
+ //log << MSG::DEBUG << "LArFEB container found" <<endmsg;
+ LArFebHeaderContainer::const_iterator it = hdrCont->begin();
+ LArFebHeaderContainer::const_iterator itend = hdrCont->end();
for ( ; it!=itend;++it) {
//HWIdentifier febid=(*it)->FEBId();
unsigned int febid=((*it)->FEBId()).get_identifier32().get_compact();
@@ -767,11 +759,11 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
larbcid=findid(m_larbcidset);
larfrac=findfrac(m_larbcidset,larbcid);
larl1id=findid(m_larl1idset);
-
+
SG::ReadHandle<TileDigitsContainer> DigitsCnt(m_TileDigitsContainerKey);
if (! DigitsCnt.isValid()) {
ATH_MSG_WARNING( "No Tile Digits container found in TDS" );
- }
+ }
else {
TileDigitsContainer::const_iterator collItr=DigitsCnt->begin();
TileDigitsContainer::const_iterator lastColl=DigitsCnt->end();
@@ -787,17 +779,17 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
SG::ReadHandle<RpcPadContainer> rpcRDO(m_RpcPadContainerKey);
if (! rpcRDO.isValid())
- {
+ {
ATH_MSG_WARNING( "No RPC Pad container found in TDS" );
}
- else
+ else
{
RpcPadContainer::const_iterator pad = rpcRDO->begin();
RpcPadContainer::const_iterator endpad = rpcRDO->end();
for (; pad != endpad ; ++pad ) {
if ( (*pad) ) {
- if ( (*pad)->size() > 0 )
+ if ( (*pad)->size() > 0 )
{
m_rpcbcidset.insert( (*pad)->bcId() );
m_rpcl1idset.insert( (*pad)->lvl1Id() );
@@ -811,7 +803,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
rpcbcid=findid(m_rpcbcidset);
rpcfrac=findfrac(m_rpcbcidset,rpcbcid);
rpcl1id=findid(m_rpcl1idset);
-
+
uint32_t ctp_l1id16 = ctpl1id & 0xFFFF;
uint32_t ctp_l1id9 = ctpl1id & 0x1FF;
uint32_t tile_l1id16 = tilel1id & 0xFFFF;
@@ -820,7 +812,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
uint32_t trt_l1id9 = trtl1id & 0x1FF;
uint32_t lar_l1id9 = larl1id & 0x1FF;
uint32_t pixel_l1id9 = pixell1id & 0x1FF;
-
+
m_CTP_BCID->Fill(ctpbcid);
m_SCT_BCID->Fill(sctbcid);
m_TRT_BCID->Fill(trtbcid);
@@ -831,14 +823,14 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
m_RPC_BCID->Fill(rpcbcid);
m_Pixel_BCID->Fill(pixelbcid);
-
+
m_diff_BCID_rate->Fill(1,sctfrac);
m_diff_BCID_rate->Fill(2,trtfrac);
m_diff_BCID_rate->Fill(3,larfrac);
m_diff_BCID_rate->Fill(4,tilefrac);
m_diff_BCID_rate->Fill(5,rpcfrac);
m_diff_BCID_rate->Fill(6,pixelfrac);
-
+
if (((Int_t)ctpbcid-(Int_t)sctbcid) > 0) m_diff_BCID->Fill(1,2);
else if (((Int_t)ctpbcid-(Int_t)sctbcid) < 0) m_diff_BCID->Fill(2,1);
@@ -1020,7 +1012,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
m_Tile_L1ID->Fill(tile_l1id16);
m_RPC_L1ID->Fill(rpcl1id);
m_Pixel_L1ID->Fill(pixell1id);
-
+
m_diff_Pixel_SCT_BCID->Fill((int)(pixelbcid-sctbcid));
m_diff_Pixel_TRT_BCID->Fill((int)(pixelbcid-trtbcid));
@@ -1028,7 +1020,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
m_diff_Pixel_Tile_BCID->Fill((int)(pixelbcid-tilebcid));
m_diff_Pixel_RPC_BCID->Fill((int)(pixelbcid-rpcbcid));
m_diff_Pixel_CTP_BCID->Fill((int)(pixelbcid-ctpbcid));
-
+
m_diff_CTP_SCT_BCID->Fill((int)(ctpbcid-sctbcid));
m_diff_CTP_TRT_BCID->Fill((int)(ctpbcid-trtbcid));
m_diff_CTP_LAR_BCID->Fill((int)(ctpbcid-larbcid));
@@ -1078,7 +1070,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
m_diff_Pixel_LAR_BCID_Rebin->Fill((int)(pixelbcid-larbcid));
m_diff_Pixel_Tile_BCID_Rebin->Fill((int)(pixelbcid-tilebcid));
m_diff_Pixel_RPC_BCID_Rebin->Fill((int)(pixelbcid-rpcbcid));
- m_diff_Pixel_CTP_BCID_Rebin->Fill((int)(pixelbcid-ctpbcid));
+ m_diff_Pixel_CTP_BCID_Rebin->Fill((int)(pixelbcid-ctpbcid));
m_diff_CTP_SCT_BCID_Rebin->Fill((int)(ctpbcid-sctbcid));
m_diff_CTP_TRT_BCID_Rebin->Fill((int)(ctpbcid-trtbcid));
m_diff_CTP_LAR_BCID_Rebin->Fill((int)(ctpbcid-larbcid));
@@ -1127,7 +1119,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
m_diff_CTP_Tile_BCID_lumi->Fill(lumi,float(ctpbcid-tilebcid));
m_diff_CTP_RPC_BCID_lumi->Fill(lumi,float(ctpbcid-rpcbcid));
m_diff_CTP_Pixel_BCID_lumi->Fill(lumi,float(ctpbcid-pixelbcid));
-
+
m_diff_CTP_SCT_L1ID_lumi->Fill(lumi,float(ctp_l1id16-sctl1id));
m_diff_CTP_TRT_L1ID_lumi->Fill(lumi,float(ctp_l1id16-trtl1id));
m_diff_CTP_LAR_L1ID_lumi->Fill(lumi,float(ctp_l1id16-larl1id));
@@ -1137,37 +1129,24 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
}
- if ( m_field.retrieve().isFailure() ) {
- log << MSG::WARNING << "Failed to retrieve MagneticField tool " << m_field << endmsg;
- return StatusCode::FAILURE;
- } else {
- //log << MSG::DEBUG << "Retrieved MagneticField tool " << m_field << endmsg;
- }
-
- //REL19
- Amg::Vector3D f;
- //REL18 CLHEP::Hep3Vector f;
- //REL19
+ //REL19
+ Amg::Vector3D f;
+ //REL18 CLHEP::Hep3Vector f;
+ //REL19
Amg::Vector3D gP1(m_solenoidPositionX, m_solenoidPositionY, m_solenoidPositionZ);
//REL18 Trk::GlobalPosition gP1(m_solenoidPositionX, m_solenoidPositionY, m_solenoidPositionZ);
- //REL19
-// m_field->getField(&gP1,&f);
-////////////////////////////////////////////////////////////////////////////////////////////////////
- MagField::AtlasFieldCache fieldCache;
+ //REL19
- SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCondObjInputKey, Gaudi::Hive::currentContext()};
+ MagField::AtlasFieldCache fieldCache;
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, Gaudi::Hive::currentContext()};
const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
-
if (fieldCondObj == nullptr) {
- ATH_MSG_ERROR("DQTDetSynchMonAlg: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key());
+ ATH_MSG_ERROR("DQTDetSynchMonTool: Failed to retrieve AtlasFieldCacheCondObj with key "
+ << m_fieldCacheCondObjInputKey.key());
return StatusCode::FAILURE;
}
-
fieldCondObj->getInitializedCache (fieldCache);
-
- // MT version uses cache, temporarily keep old version
- if (fieldCache.useNewBfieldCache()) fieldCache.getField (gP1.data(),f.data());
- else m_field->getField (&gP1,&f);
+ fieldCache.getField (gP1.data(),f.data());
//REL18 m_field->getMagneticFieldKiloGauss(gP1,f);
float solenoid_bz = f[2];
@@ -1175,17 +1154,15 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
solenoid_bz *= 1000;
//REL18 : was in kilogauss
//solenoid_bz/=10;
- m_Bfield_solenoid->Fill(solenoid_bz);
+ m_Bfield_solenoid->Fill(solenoid_bz);
m_Bfield_solenoid_vsLB->Fill(lumi, solenoid_bz);
- //REL19
+ //REL19
Amg::Vector3D gP2(m_toroidPositionX, m_toroidPositionY, m_toroidPositionZ);
//REL18 Trk::GlobalPosition gP2(m_toroidPositionX, m_toroidPositionY, m_toroidPositionZ);
- //REL19
+ //REL19
// MT version uses cache, temporarily keep old version
- if (fieldCache.useNewBfieldCache()) fieldCache.getField (gP2.data(),f.data());
- else m_field->getField (&gP2,&f);
-
+ fieldCache.getField (gP2.data(),f.data());
//REL18 m_field->getMagneticFieldKiloGauss(gP2,f);
float toroid_bx = f[0];
@@ -1193,7 +1170,7 @@ StatusCode DQTDetSynchMonTool::fillHistograms()
toroid_bx *= 1000;
//REL18 : was in kilogauss
//toroid_bx/=10;
- m_Bfield_toroid->Fill(toroid_bx);
+ m_Bfield_toroid->Fill(toroid_bx);
m_Bfield_toroid_vsLB->Fill(lumi, toroid_bx);
@@ -1244,7 +1221,7 @@ uint32_t DQTDetSynchMonTool::findid(std::multiset<uint32_t>& mset)
std::multiset<uint32_t>::iterator it = mset.begin();
std::multiset<uint32_t>::iterator itend = mset.end();
- if (it!=itend && !mset.empty()){ //if empty do nothing
+ if (it!=itend && !mset.empty()){ //if empty do nothing
// the following uses invalid iterator
// if ( (*it)==(*itend) ) { log << "all ids equal: " << (*it) << endmsg; return (*it);} // if all ids equal, return the result immediately
for (;it!=itend;++it) {
diff --git a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h
index 46992a4e68dd503b63665eabf2ddcf1cc154dedb..3fe4f35c9a7e6985a85c1b6979ae0d42af763921 100644
--- a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h
+++ b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h
@@ -60,8 +60,8 @@ private:
std::string m_ioSvcName;
/// list of service names
- Gaudi::Property<std::vector<std::string>> m_ioSvcNameList;
-
+ Gaudi::Property<std::vector<std::string>> m_ioSvcNameList{ this, "ByteStreamOutputSvcList", {}, "", "Set<T>"};
+
/// Services for writing output
std::map<std::string, ByteStreamOutputSvc*> m_ioSvcMap;
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index 46b359966db003657ef23058e9134dfa611889cc..f936bcef98845282bda0cea5dd9655d22059e264 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -108,7 +108,7 @@ def TrigBSReadCfg(inputFlags):
def ByteStreamWriteCfg( flags, typeNames=[] ):
- acc = ComponentAccumulator()
+ acc = ComponentAccumulator("AthOutSeq")
outputSvc = CompFactory.ByteStreamEventStorageOutputSvc()
outputSvc.MaxFileMB = 15000
# event (beyond which it creates a new file)
@@ -121,20 +121,17 @@ def ByteStreamWriteCfg( flags, typeNames=[] ):
assert len(allRuns) == 1, "The input is from multiple runs, do not know which one to use {}".format(allRuns)
outputSvc.RunNumber = allRuns.pop()
- bsCnvSvc = CompFactory.ByteStreamCnvSvc("OutBSCnvSvc")
- # TODO for technical reasons a separate instance of the ByteStreamCnvSvc have to be created, once all the config (i.e. trigger) is moved to CA based the name needs to be left default
- # to test such change the test_trig_data_v1Dev_writeBS_build.py can be used
+ bsCnvSvc = CompFactory.ByteStreamCnvSvc("ByteStreamCnvSvc")
bsCnvSvc.ByteStreamOutputSvcList = [ outputSvc.getName() ]
streamAlg = CompFactory.AthenaOutputStream( "BSOutputStreamAlg",
EvtConversionSvc = bsCnvSvc.getName(),
+ OutputFile = "ByteStreamEventStorageOutputSvc",
ItemList = typeNames )
acc.addService( outputSvc )
acc.addService( bsCnvSvc )
- acc.addSequence( CompFactory.AthSequencer("AthOutSeq") )
- acc.addEventAlgo( streamAlg, sequenceName="AthOutSeq", primary = True )
-
+ acc.addEventAlgo( streamAlg, primary = True )
return acc
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx
index 1d5ea81da3133ab8fdb2beb49ea6cf00d714763b..f70cabf4a83156eed6d6dd7df5a7e480641af595 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx
@@ -26,7 +26,6 @@ ByteStreamCnvSvc::ByteStreamCnvSvc(const std::string& name, ISvcLocator* pSvcLoc
m_evtStore ("StoreGateSvc", name)
{
declareProperty("ByteStreamOutputSvc", m_ioSvcName);
- declareProperty("ByteStreamOutputSvcList", m_ioSvcNameList);
declareProperty("IsSimulation", m_isSimulation = false);
declareProperty("IsTestbeam", m_isTestbeam = false);
declareProperty("IsCalibration", m_isCalibration= false);
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/ATLAS_CHECK_THREAD_SAFETY b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..8b14ccbf72822f648f585bc7fee1319b2c74e9e7
--- /dev/null
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/MdtCalibrationRegionSvc.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/MdtCalibrationRegionSvc.h
index c2f46b3545fc2ba37376db07c44c357003f5bf6e..f300a74aa5c1897f4835afcefea79291fefd8cdc 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/MdtCalibrationRegionSvc.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/MdtCalibSvc/MdtCalibrationRegionSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONCALIB_MDTCALIBRATIONREGIONSVC_H
@@ -39,7 +39,7 @@ public:
/** IInterface implementation */
static const InterfaceID &interfaceID() {
- static InterfaceID s_iID("MdtCalibrationRegionSvc", 1, 0);
+ static const InterfaceID s_iID("MdtCalibrationRegionSvc", 1, 0);
return s_iID;
}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx
index 1ee319553733f681506ec59d7f271757360c1287..74b3c053625f06d630b2db57fbe7f98c4feb1f2c 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationRegionSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// other packages
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/python/CalibNtupleMetaData.py b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/python/CalibNtupleMetaData.py
index f90f08ba3c647aa9e31e85fa6b83046fdd7f97ab..7858f4574c955e605079c72510832e9810986ca6 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/python/CalibNtupleMetaData.py
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/python/CalibNtupleMetaData.py
@@ -9,7 +9,7 @@ class CalibNtupleMetaData:
def __init__(self, filelist):
self.MetaData={}
- fl=file(filelist)
+ fl=open(filelist)
root_file=None
inf=None
for line in fl.readlines():
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkMaster.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkMaster.py
index 36894f7962d10e347c7ddb5728fc14c4063f0959..8536ae2be4afe4345d876bf7d3200bb436d17460 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkMaster.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkMaster.py
@@ -59,10 +59,10 @@ if inputFileSummary is not None:
if not globalflags.InputFormat=="bytestream":
# Extra config: make sure if we are using EVNT that we don't try to check sim/digi/reco metadata
from RecExConfig.ObjKeyStore import objKeyStore
- ToolSvc += CfgMgr.xAODMaker__FileMetaDataCreatorTool( "FileMetaDataCreatorTool",
- isEVNT = objKeyStore.isInInput( "McEventCollection", "GEN_EVENT" ),
- OutputLevel = 2 )
- svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.FileMetaDataCreatorTool ]
+# ToolSvc += CfgMgr.xAODMaker__FileMetaDataCreatorTool( "FileMetaDataCreatorTool",
+# isEVNT = objKeyStore.isInInput( "McEventCollection", "GEN_EVENT" ),
+# OutputLevel = 2 )
+# svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.FileMetaDataCreatorTool ]
# Set up stream auditor
if not hasattr(svcMgr, 'DecisionSvc'):
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
index 738405860bb69dfc38cd650d4802c48458eb0953..2004520c3426141c22d18b7547c261786c75f72a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
#********************************************************************
# EGammaCommon.py
@@ -37,15 +39,15 @@ if isMC:
simulationFlavour = af.fileinfos['metadata']['/Simulation/Parameters']['SimulationFlavour']
isFullSim = simulationFlavour in ('default', 'MC12G4', 'FullG4')
-print "EGammaCommon: isMC = ", isMC
+print("EGammaCommon: isMC = ", isMC)
if isMC:
- print "EGammaCommon: isFullSim = ", isFullSim
+ print("EGammaCommon: isFullSim = ", isFullSim)
if isFullSim:
from ElectronPhotonShowerShapeFudgeTool.ElectronPhotonShowerShapeFudgeToolConf import ElectronPhotonShowerShapeFudgeTool
DF_ElectronPhotonShowerShapeFudgeTool = ElectronPhotonShowerShapeFudgeTool(Preselection=22)
ToolSvc += DF_ElectronPhotonShowerShapeFudgeTool
- print DF_ElectronPhotonShowerShapeFudgeTool
+ print(DF_ElectronPhotonShowerShapeFudgeTool)
#====================================================================
@@ -178,7 +180,7 @@ ElectronPassLHVeryLoose = DerivationFramework__EGSelectionToolWrapper( name = "E
StoreGateEntryName = "DFCommonElectronsLHVeryLoose",
ContainerName = "Electrons")
ToolSvc += ElectronPassLHVeryLoose
-print ElectronPassLHVeryLoose
+print(ElectronPassLHVeryLoose)
# decorate electrons with the output of LH loose
ElectronPassLHLoose = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHLoose",
@@ -188,7 +190,7 @@ ElectronPassLHLoose = DerivationFramework__EGSelectionToolWrapper( name = "Elect
StoreGateEntryName = "DFCommonElectronsLHLoose",
ContainerName = "Electrons")
ToolSvc += ElectronPassLHLoose
-print ElectronPassLHLoose
+print(ElectronPassLHLoose)
# decorate electrons with the output of LH loose+BL
ElectronPassLHLooseBL = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHLooseBL",
@@ -198,7 +200,7 @@ ElectronPassLHLooseBL = DerivationFramework__EGSelectionToolWrapper( name = "Ele
StoreGateEntryName = "DFCommonElectronsLHLooseBL",
ContainerName = "Electrons")
ToolSvc += ElectronPassLHLooseBL
-print ElectronPassLHLooseBL
+print (ElectronPassLHLooseBL)
# decorate electrons with the output of LH medium
ElectronPassLHMedium = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHMedium",
@@ -208,7 +210,7 @@ ElectronPassLHMedium = DerivationFramework__EGSelectionToolWrapper( name = "Elec
StoreGateEntryName = "DFCommonElectronsLHMedium",
ContainerName = "Electrons")
ToolSvc += ElectronPassLHMedium
-print ElectronPassLHMedium
+print(ElectronPassLHMedium)
# decorate electrons with the output of LH tight
ElectronPassLHTight = DerivationFramework__EGSelectionToolWrapper( name = "ElectronPassLHTight",
@@ -218,7 +220,7 @@ ElectronPassLHTight = DerivationFramework__EGSelectionToolWrapper( name = "Elect
StoreGateEntryName = "DFCommonElectronsLHTight",
ContainerName = "Electrons")
ToolSvc += ElectronPassLHTight
-print ElectronPassLHTight
+print(ElectronPassLHTight)
# decorate electrons with the output of ECIDS ----------------------------------------------------------------------
ElectronPassECIDS = DerivationFramework__EGElectronLikelihoodToolWrapper( name = "ElectronPassECIDS",
@@ -230,7 +232,7 @@ ElectronPassECIDS = DerivationFramework__EGElectronLikelihoodToolWrapper( name =
ContainerName = "Electrons",
StoreTResult = True)
ToolSvc += ElectronPassECIDS
-print ElectronPassECIDS
+print (ElectronPassECIDS)
# decorate forward electrons with the output of LH loose
ForwardElectronPassLHLoose = DerivationFramework__EGSelectionToolWrapper( name = "ForwardElectronPassLHLoose",
@@ -240,7 +242,7 @@ ForwardElectronPassLHLoose = DerivationFramework__EGSelectionToolWrapper( name =
StoreGateEntryName = "DFCommonForwardElectronsLHLoose",
ContainerName = "ForwardElectrons")
ToolSvc += ForwardElectronPassLHLoose
-print ForwardElectronPassLHLoose
+print (ForwardElectronPassLHLoose)
# decorate forward electrons with the output of LH medium
ForwardElectronPassLHMedium = DerivationFramework__EGSelectionToolWrapper( name = "ForwardElectronPassLHMedium",
@@ -250,7 +252,7 @@ ForwardElectronPassLHMedium = DerivationFramework__EGSelectionToolWrapper( name
StoreGateEntryName = "DFCommonForwardElectronsLHMedium",
ContainerName = "ForwardElectrons")
ToolSvc += ForwardElectronPassLHMedium
-print ForwardElectronPassLHMedium
+print (ForwardElectronPassLHMedium)
# decorate forward electrons with the output of LH tight
ForwardElectronPassLHTight = DerivationFramework__EGSelectionToolWrapper( name = "ForwardElectronPassLHTight",
@@ -260,7 +262,7 @@ ForwardElectronPassLHTight = DerivationFramework__EGSelectionToolWrapper( name =
StoreGateEntryName = "DFCommonForwardElectronsLHTight",
ContainerName = "ForwardElectrons")
ToolSvc += ForwardElectronPassLHTight
-print ForwardElectronPassLHTight
+print (ForwardElectronPassLHTight)
# decorate photons with the output of IsEM loose
@@ -280,7 +282,7 @@ else:
StoreGateEntryName = "DFCommonPhotonsIsEMLoose",
ContainerName = "Photons")
ToolSvc += PhotonPassIsEMLoose
-print PhotonPassIsEMLoose
+print(PhotonPassIsEMLoose)
# decorate photons with the output of IsEM tight
# on full-sim MC, fudge the shower shapes before computing the ID (but the original shower shapes are not overridden)
@@ -299,7 +301,7 @@ else:
StoreGateEntryName = "DFCommonPhotonsIsEMTight",
ContainerName = "Photons")
ToolSvc += PhotonPassIsEMTight
-print PhotonPassIsEMTight
+print(PhotonPassIsEMTight)
# decorate photons with the output of IsEM tight pt-inclusive menu
# Can be removed once pt-dependent cuts are fully supported.
@@ -311,7 +313,7 @@ PhotonPassIsEMTightPtIncl = DerivationFramework__EGSelectionToolWrapper( name =
StoreGateEntryName = "DFCommonPhotonsIsEMTightPtIncl",
ContainerName = "Photons")
ToolSvc += PhotonPassIsEMTightPtIncl
-print PhotonPassIsEMTightPtIncl
+print (PhotonPassIsEMTightPtIncl)
# decorate photons with the photon cleaning flags
# on MC, fudge the shower shapes before computing the flags
@@ -327,7 +329,7 @@ else:
StoreGateEntryName = "DFCommonPhotonsCleaning",
ContainerName = "Photons")
ToolSvc += PhotonPassCleaning
-print PhotonPassCleaning
+print (PhotonPassCleaning)
# decorate central electrons and photons with a flag to tell the the candidates are affected by the crack bug in mc16a and data 2015+2016
from DerivationFrameworkEGamma.DerivationFrameworkEGammaConf import DerivationFramework__EGCrackVetoCleaningTool as DF_EGCVCT
@@ -372,7 +374,7 @@ if rec.doTruth():
ToolSvc += BkgElectronClassificationTool
- print BkgElectronClassificationTool
+ print(BkgElectronClassificationTool)
EGAugmentationTools.append(BkgElectronClassificationTool)
# Decorate egammaTruthParticles with truth-particle-level etcone20,30,40
@@ -386,7 +388,7 @@ if rec.doTruth():
IsolationVarNamePrefix = 'etcone',
ChargedParticlesOnly = False)
ToolSvc += TruthEgetIsolationTool
- print TruthEgetIsolationTool
+ print(TruthEgetIsolationTool)
EGAugmentationTools.append(TruthEgetIsolationTool)
# Decorate egammaTruthParticles with truth-particle-level ptcone20,30,40
@@ -398,7 +400,7 @@ if rec.doTruth():
IsolationVarNamePrefix = 'ptcone',
ChargedParticlesOnly = True)
ToolSvc += TruthEgptIsolationTool
- print TruthEgptIsolationTool
+ print(TruthEgptIsolationTool)
EGAugmentationTools.append(TruthEgptIsolationTool)
# Compute the truth-particle-level energy density in the central eta region
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FlavourTagCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FlavourTagCommon.py
index e414bbb58f867ff19ff4e2365f9598f2bd67b271..e2f829a670c24fe4727afc4003afb66f21d1e0fa 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FlavourTagCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FlavourTagCommon.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
#********************************************************************
@@ -146,13 +148,13 @@ def ReTag(Taggers, JetCollections = ['AntiKt4EMTopoJets' ], Sequencer=None, DoFu
Sequencer += SAbtagger
SAJetBTaggerAlgs[SA + AuthorSubString[i].lower()] = SAbtagger
ftaglog.info("Create {} in {}".format(SAbtagger,Sequencer))
- # print SAbtagger
+ # print (SAbtagger)
#global DerivationFrameworkJob
#DerivationFrameworkJob += SAbtagger
except AttributeError as error:
- print '#BTAG# --> ' + str(error)
- print '#BTAG# --> ' + jet[1]
- print '#BTAG# --> ' + AuthorSubString[i]
+ print ('#BTAG# --> ' + str(error))
+ print ('#BTAG# --> ' + jet[1])
+ print ('#BTAG# --> ' + AuthorSubString[i])
NotInJetToolManager.append(AuthorSubString[i])
if len(NotInJetToolManager) > 0:
@@ -267,12 +269,12 @@ def applyBTagging(jetalg,algname,sequence):
btagtool.MinPt = 0
if '_BTagging' in jetalg:
btagtool.JetAuthor = jetalg.replace('_BTagging','Jets_BTagging')
- btagtool.ErrorOnTagWeightFailure = False #avoid an error when the jets tagweight cannot be retrived, and only print a warning
+ btagtool.ErrorOnTagWeightFailure = False #avoid an error when the jets tagweight cannot be retrieved, and only print a warning
btagtool.FlvTagCutDefinitionsFileName = "xAODBTaggingEfficiency/13TeV/2019-21-13TeV-MC16-CDI-2019-10-07_v1.root"
btagKey = btagWP+'_'+btagAlg
btagtooldict[btagKey] = btagtool
- from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+ from DerivationFrameworkJetEtMiss.ExtendedJetCommon import applyBTaggingAugmentation
applyBTaggingAugmentation(jetalg,algname,sequence,btagtooldict)
def applyBTagging_xAODColl(jetalg='AntiKt4EMTopo',sequence=DerivationFrameworkJob):
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/HbbCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/HbbCommon.py
index 62eca674c0e74e1166de8a62672a661c3e5879e6..be17685dfa8f13cacdfbaf1c59726b0b2b560584 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/HbbCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/HbbCommon.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from __future__ import print_function
+
# import Common Algs
from DerivationFrameworkJetEtMiss.JetCommon import DFJetAlgs
@@ -53,9 +55,9 @@ def buildExclusiveSubjets(ToolSvc, JetCollectionName, subjet_mode, nsubjet, doGh
if hasattr(jtm, ExKtbbTagToolName):
ExKtbbTagToolInstance = jtm[ ExKtbbTagToolName ]
- print " ExKtbbTagTool ", ExKtbbTagToolName, "is alredy in jtm.tools"
+ print (" ExKtbbTagTool ", ExKtbbTagToolName, "is alredy in jtm.tools")
else:
- print " building ExKtbbTagTool ", ExKtbbTagToolName
+ print (" building ExKtbbTagTool ", ExKtbbTagToolName)
from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import SubjetFinderTool
from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import SubjetRecorderTool
@@ -100,7 +102,7 @@ def buildExclusiveSubjets(ToolSvc, JetCollectionName, subjet_mode, nsubjet, doGh
#===================================================================
def addExKtCoM(sequence, ToolSvc, JetCollectionExCoM, nSubjets, doTrackSubJet, doGhostAssoc=False, ExGhostLabels=["GhostBHadronsFinal","GhostCHadronsFinal","GhostTrack"], min_subjet_pt_mev = 0, subjetAlgName = "Kt"):
if(subjetAlgName != "Kt" and subjetAlgName != "CoM"):
- print "WARNING: Subjet type must be Kt or CoM. Using Kt as default!"
+ print ("WARNING: Subjet type must be Kt or CoM. Using Kt as default!")
subjetAlgName = "Kt"
from JetRec.JetRecStandard import jtm
ExCoMJetCollection__SubJet = []
@@ -117,23 +119,23 @@ def addExKtCoM(sequence, ToolSvc, JetCollectionExCoM, nSubjets, doTrackSubJet, d
excomBTagName = "BTagging_%s" % (SubjetContainerName.replace("Jets", ""))
if excomAlgName in DFJetAlgs:
- print " Algorithm Ex%s "%subjetAlgName, excomAlgName, "already built before sequence ", sequence
+ print (" Algorithm Ex%s "%subjetAlgName, excomAlgName, "already built before sequence ", sequence)
if hasattr(sequence, excomAlgName):
- print " sequence Ex%s "%subjetAlgName, sequence, "already has an instance of algorithm", excomAlgName
+ print (" sequence Ex%s "%subjetAlgName, sequence, "already has an instance of algorithm", excomAlgName)
else:
- print " Add algorithm Ex%s "%subjetAlgName, excomAlgName, "to sequence", sequence
+ print (" Add algorithm Ex%s "%subjetAlgName, excomAlgName, "to sequence", sequence)
sequence += DFJetAlgs[excomAlgName]
sequence += CfgMgr.xAODMaker__ElementLinkResetAlg(excomELresetName, SGKeys=[SubjetContainerName+"Aux."])
sequence += DFJetAlgs[excomAlgName+"_btag"]
sequence += CfgMgr.xAODMaker__ElementLinkResetAlg(excomELresetNameLJet, SGKeys=[JetCollectionExCoM+"Aux."])
else:
- print " Algorithm Ex%s "%subjetAlgName, excomAlgName, " to be built sequence ", sequence
+ print (" Algorithm Ex%s "%subjetAlgName, excomAlgName, " to be built sequence ", sequence)
if hasattr(jtm, excomJetRecToolName):
- print " Ex%sJetRecTool "%subjetAlgName, excomJetRecToolName, " already built sequence ", sequence
+ print (" Ex%sJetRecTool "%subjetAlgName, excomJetRecToolName, " already built sequence ", sequence)
jetrec = jtm [ excomJetRecToolName ]
else:
- print " Ex%s tool "%subjetAlgName, excomJetRecToolName, " to be built sequence ", sequence
+ print (" Ex%s tool "%subjetAlgName, excomJetRecToolName, " to be built sequence ", sequence)
from JetRec.JetRecConf import JetRecTool
jetrec = JetRecTool(
name = excomJetRecToolName,
@@ -146,10 +148,10 @@ def addExKtCoM(sequence, ToolSvc, JetCollectionExCoM, nSubjets, doTrackSubJet, d
excomJetRecBTagToolName = str( "%s_sub"%excomJetRecToolName )
if hasattr(jtm, excomJetRecBTagToolName):
- print " Ex%sJetRecBTagTool "%subjetAlgName, excomJetRecBTagToolName, " already built sequence ", sequence
+ print (" Ex%sJetRecBTagTool "%subjetAlgName, excomJetRecBTagToolName, " already built sequence ", sequence)
jetrec_btagging = jtm [ excomJetRecBTagToolName ]
else:
- print " Ex%sJetRecBTagTool "%subjetAlgName, excomJetRecBTagToolName, " to be built sequence ", sequence
+ print (" Ex%sJetRecBTagTool "%subjetAlgName, excomJetRecBTagToolName, " to be built sequence ", sequence)
#make the btagging tool for excom jets
from BTagging.BTaggingFlags import BTaggingFlags
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG1.py
index 1028dcd1e13746e823e06747f790a0e2973296c6..9dcf2eb3e01f4bebb6bff04bf7b3ce76549a0672 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG1.py
@@ -48,7 +48,7 @@ triggersSkim = triggers_jX + triggers_bperf
FTAG1TriggerSkimmingTool = DerivationFramework__TriggerSkimmingTool(name = "FTAG1TriggerSkimmingTool",
TriggerListOR = triggersSkim)
ToolSvc += FTAG1TriggerSkimmingTool
-print FTAG1TriggerSkimmingTool
+printfunc (FTAG1TriggerSkimmingTool)
FTAG1Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG1SkimKernel",
SkimmingTools = [FTAG1TriggerSkimmingTool],
@@ -77,8 +77,8 @@ FTAG1DstarVertexing = DstarVertexing( name = "FTAG1DstarVertexing",
JetPtCut = 20)
ToolSvc += FTAG1DstarVertexing
-print "using DstarVertexing package to add D0 vertex information"
-print FTAG1DstarVertexing
+printfunc ("using DstarVertexing package to add D0 vertex information")
+printfunc (FTAG1DstarVertexing)
FTAG1Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG1AugmentKernel",
AugmentationTools = [FTAG1DstarVertexing]
@@ -87,7 +87,7 @@ FTAG1Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG1AugmentKernel",
#make IPE tool for BTagTrackAugmenter
FTAG1IPETool = Trk__TrackToVertexIPEstimator(name = "FTAG1IPETool")
ToolSvc += FTAG1IPETool
-print FTAG1IPETool
+printfunc (FTAG1IPETool)
#====================================================================
# Basic Jet Collections
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG2.py
index 589e9db5a97ddd34a0a9eaa9246af6367b37eecc..aabae141cce66f82e212c9ddbd8f39495f8c124c 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG2.py
@@ -42,7 +42,7 @@ FTAG2StringSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "FT
expression = 'count( (Muons.pt > 18*GeV) && (0 == Muons.muonType || 1 == Muons.muonType || 4 == Muons.muonType) ) + count(( Electrons.pt > 18*GeV) && ((Electrons.Loose) || (Electrons.DFCommonElectronsLHLoose))) >= 2 ')
ToolSvc += FTAG2StringSkimmingTool
-print FTAG2StringSkimmingTool
+printfunc (FTAG2StringSkimmingTool)
FTAG2Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG2SkimKernel",
SkimmingTools = [FTAG2StringSkimmingTool],
@@ -65,7 +65,7 @@ if globalflags.DataSource()!='data':
#make IPE tool for BTagTrackAugmenter
FTAG2IPETool = Trk__TrackToVertexIPEstimator(name = "FTAG2IPETool")
ToolSvc += FTAG2IPETool
-print FTAG2IPETool
+printfunc (FTAG2IPETool)
#augment jets with track info
FTAG2Seq += CfgMgr.BTagVertexAugmenter()
@@ -76,7 +76,7 @@ FTAG2Seq += CfgMgr.BTagVertexAugmenter()
# DecorationPrefix = "FTAG2",
# ContainerName = "InDetTrackParticles")
#ToolSvc += FTAG2TrackToVertexWrapper
-#print FTAG2TrackToVertexWrapper
+#printfunc (FTAG2TrackToVertexWrapper)
#====================================================================
# Basic Jet Collections
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG3.py
index 0503c50e15af1447ab802c1fab7a301c37840c9a..b5e408d04bce56dc428df6e1c05944ac8c3d3280 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG3.py
@@ -67,7 +67,7 @@ if globalflags.DataSource()=='data':
FTAG3TriggerSkimmingTool = DerivationFramework__TriggerSkimmingTool(name = "FTAG3TriggerSkimmingTool",
TriggerListOR = triggers )
ToolSvc += FTAG3TriggerSkimmingTool
- print FTAG3TriggerSkimmingTool
+ printfunc (FTAG3TriggerSkimmingTool)
FTAG3Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG3SkimKernel",
SkimmingTools = [FTAG3TriggerSkimmingTool] )
@@ -76,7 +76,7 @@ if globalflags.DataSource()!='data':
FTAG3StringSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "FTAG3StringSkimmingTool",
expression = 'count( (Muons.pt > 4*GeV) && (Muons.DFCommonGoodMuon) ) >= 1')
ToolSvc += FTAG3StringSkimmingTool
- print FTAG3StringSkimmingTool
+ printfunc (FTAG3StringSkimmingTool)
FTAG3Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG3SkimKernel",
SkimmingTools = [FTAG3StringSkimmingTool] )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG4.py
index d5968b587979409c1e4a357536d90277db7159ee..cf85040bccf6c9e62fd36bd342a06b28f293412b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/share/FTAG4.py
@@ -43,12 +43,12 @@ FTAG4Seq = CfgMgr.AthSequencer("FTAG4Sequence")
offlineElec = "(Electrons.pt > 24*GeV) && (Electrons.Medium || Electrons.DFCommonElectronsLHMedium)"
offlineMuon = "(Muons.pt > 24*GeV) && (Muons.DFCommonGoodMuon) && (0 == Muons.muonType)"
offlineExpression = "( (count("+offlineElec+") >= 1) || (count("+offlineMuon+") >= 1) )"
-print 'FTAG4: offline skimming expression : \n', offlineExpression
+printfunc ('FTAG4: offline skimming expression : \n', offlineExpression)
FTAG4StringSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "FTAG4StringSkimmingTool",
expression = offlineExpression)
ToolSvc += FTAG4StringSkimmingTool
-print FTAG4StringSkimmingTool
+printfunc (FTAG4StringSkimmingTool)
# triggers used for skimming:
# single lepton triggers: we want to include lowest un-prescaled
@@ -64,7 +64,7 @@ triggersSkim = triggers_e + triggers_mu
FTAG4TriggerSkimmingTool = DerivationFramework__TriggerSkimmingTool(name = "FTAG4TriggerSkimmingTool",
TriggerListOR = triggersSkim)
ToolSvc += FTAG4TriggerSkimmingTool
-print FTAG4TriggerSkimmingTool
+printfunc (FTAG4TriggerSkimmingTool)
FTAG4Seq += CfgMgr.DerivationFramework__DerivationKernel("FTAG4SkimKernel",
SkimmingTools = [FTAG4StringSkimmingTool,FTAG4TriggerSkimmingTool])
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/README.md b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/README.md
index ebd50b7534b0f6870d67c8f5712b7646d1ee9920..280db9f138ed6b33020fa4ef3907cc1e0a3e717d 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/README.md
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/README.md
@@ -6,6 +6,17 @@ transform the raw outputs from vertex finding into flavor tagging
outputs. It is meant as "stand-alone" code: it should be usable in
both Athena and AnalysisBase.
+This code is meant to run in all actively developed ATLAS projects. This means that the following features should _not_ be used:
+
+ - Read / Write Handles: These are not supported in 21.2, and thus
+ won't work in analysis code. Revisit in mid 2021.
+
+ - Any C++ features beyond C++11: Upgrade physics will use
+ [LCG_88][lcg88] for the foreseeable future. This release ships
+ with GCC 6.2, which predates C++17. Revisit in 2024.
+
+[lcg88]: http://lcginfo.cern.ch/release/88/
+
Package Overview
----------------
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2.cxx
index 7e2d016cd603d34b6b06a29929c7ca1038a2102c..fe2da2cdbb217f4bf4ed1f6994dab7125314cfdb 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2.cxx
@@ -7,6 +7,15 @@
#include "lwtnn/LightweightGraph.hh"
#include "lwtnn/NanReplacer.hh"
+namespace {
+ // This is a workaround because a lot of our builds still don't
+ // support C++17. It's meant to look just as ugly as it is.
+ template <typename T>
+ void set_merge_gcc6p2(std::set<T>& target, const std::set<T>& src) {
+ target.insert(src.begin(), src.end());
+ }
+}
+
namespace FlavorTagDiscriminants {
@@ -53,13 +62,23 @@ namespace FlavorTagDiscriminants {
flipConfig);
// add the tracking data dependencies
auto track_data_deps = get::trackFilter(track_cfg.selection).second;
- track_data_deps.merge(get::flipFilter(flipConfig).second);
+
+ // FIXME: change this back to use std::map::merge when we
+ // support C++17 everywhere
+ set_merge_gcc6p2(track_data_deps, get::flipFilter(flipConfig).second);
track_getter.name = track_cfg.name;
for (const DL2TrackInputConfig& input_cfg: track_cfg.inputs) {
- auto [seqGetter, deps] = get::seqFromTracks(input_cfg);
- track_getter.sequencesFromTracks.push_back(seqGetter);
- track_data_deps.merge(deps);
+ // FIXME: change this back to
+ //
+ // auto [seqGetter, deps] = get::seqFromTracks(input_cfg);
+ //
+ // when we support C++17
+ auto seqGetter_deps = get::seqFromTracks(input_cfg);
+ track_getter.sequencesFromTracks.push_back(seqGetter_deps.first);
+ // FIXME: change this back to use std::map::merge when we
+ // support C++17 everywhere
+ set_merge_gcc6p2(track_data_deps,seqGetter_deps.second);
}
m_trackSequenceBuilders.push_back(track_getter);
m_dataDependencyNames.trackInputs = track_data_deps;
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx
index 6934b2340f9764314bea6b27611e722b541154bb..8e5a310342b4b6338ffdc659f8ec11fed7bedec2 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx
@@ -54,7 +54,7 @@ namespace FlavorTagDiscriminants {
fs::path nn_path = config.input_file_path;
if (!fs::exists(nn_path)) {
nn_path = PathResolverFindCalibFile(nn_path.string());
- if (nn_path.empty() == 0) {
+ if (nn_path.empty()) {
throw std::runtime_error(
"no file found at '" + config.input_file_path.string() + "'");
}
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/VRJetOverlapDecorator.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/VRJetOverlapDecorator.cxx
index df9d3d83bf53683dfa03eef33c4ae023897477d8..ebb4ef4e293bb356fbc7eae8ce0d030102f6b321 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/VRJetOverlapDecorator.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/VRJetOverlapDecorator.cxx
@@ -39,12 +39,18 @@ namespace {
const TLorentzVector j2p4 = j2->p4();
const double j2_radius = getRadius(j2p4, cfg);
const double min_radius = std::min(j1_radius, j2_radius);
- const double dR = j1p4.DeltaR(j2p4) / min_radius;
- min_dr.at(iii).absolute = std::min(dR, min_dr.at(iii).absolute);
- min_dr.at(jjj).absolute = std::min(dR, min_dr.at(jjj).absolute);
+ const double dR = j1p4.DeltaR(j2p4);
const double rel_dR = dR / min_radius;
- min_dr.at(iii).relative = std::min(rel_dR, min_dr.at(iii).relative);
- min_dr.at(jjj).relative = std::min(rel_dR, min_dr.at(jjj).relative);
+ // check both jets, if the relative dR is less than whatever
+ // we have recorded, save this relative dR and absolute dR
+ for (const size_t idx: {iii,jjj}) {
+ if (rel_dR < min_dr.at(idx).relative) {
+ VRJetDR vrstruct;
+ vrstruct.relative = rel_dR;
+ vrstruct.absolute = dR;
+ min_dr.at(idx) = vrstruct;
+ }
+ }
}
}
return min_dr;
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 4cd49083bd4f7a6331ba77e7d6c2ccb9f0516873..245d216727f85f535a8ebf0a8685bb8196008b7e 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.65
+AnalysisBaseExternalsVersion = 2.0.67
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 476a4654143299cac2eab31e444bb277004df532..245674a020236ac94380862c67bcc7d3acac7e0c 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.65
+AtlasExternalsVersion = 2.0.67
diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt
index a69f765b983333b9ec1eb444f23b07d923b3b30e..2b1dc97f7ab03d8dbd11f8aad3b95b552f4be578 100644
--- a/Projects/AthGeneration/CMakeLists.txt
+++ b/Projects/AthGeneration/CMakeLists.txt
@@ -8,10 +8,11 @@ project( AthGeneration VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
+set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6
+ --ignore ATL238,ATL9,E701,E702,E704,E741
+ --enable-extensions ATL902
CACHE STRING "Default flake8 command" )
-
-set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
+set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration
CACHE STRING "Python checker command to run during Python module compilation" )
# Find the ATLAS CMake code:
@@ -77,9 +78,13 @@ string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}"
TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
+configure_file( ${CMAKE_SOURCE_DIR}/cmake/PreConfig.cmake.in
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake @ONLY )
configure_file( ${CMAKE_SOURCE_DIR}/cmake/PostConfig.cmake.in
- ${CMAKE_BINARY_DIR}/PostConfig.cmake @ONLY )
-install( FILES ${CMAKE_BINARY_DIR}/PostConfig.cmake
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake @ONLY )
+install( FILES
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake
DESTINATION ${CMAKE_INSTALL_CMAKEDIR} )
# Package up the release using CPack:
diff --git a/Projects/AthGeneration/cmake/PreConfig.cmake.in b/Projects/AthGeneration/cmake/PreConfig.cmake.in
new file mode 100644
index 0000000000000000000000000000000000000000..bb88d84693a17223665c82fcbbfcc91d6740f73b
--- /dev/null
+++ b/Projects/AthGeneration/cmake/PreConfig.cmake.in
@@ -0,0 +1,10 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# Pre-config script to propagate variables to downstream projects
+#
+
+# Set up the project's flake8 usage.
+set( ATLAS_FLAKE8 @ATLAS_FLAKE8@
+ CACHE STRING "Default flake8 command" )
+set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@
+ CACHE STRING "Python checker command to run during Python module compilation" )
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index 2dabe38db588cee1aadad550373df15b3ae53035..de8d585d442decc9995728294a4a4c1690902019 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.65
+AthGenerationExternalsVersion = 2.0.67
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.001
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 22ba04f7a411f79610b1be8d44b043b89bc8e3e0..d6025d29256d1a1cf724cc1fa04e0ddd7a15a204 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.65
+AthSimulationExternalsVersion = 2.0.67
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.001
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index d56dd3b518eee57d5674d43ba213bdac4cf031c2..150d15736ccc99fcf5006078a8db512e0863adfe 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -41,10 +41,11 @@ mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME
TDAQ_ATROOT )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
+set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6
+ --ignore ATL238,ATL9,E701,E702,E704,E741
+ --enable-extensions ATL902
CACHE STRING "Default flake8 command" )
-
-set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
+set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration
CACHE STRING "Python checker command to run during Python module compilation" )
# Find the ATLAS CMake code:
diff --git a/Projects/Athena/cmake/PreConfig.cmake.in b/Projects/Athena/cmake/PreConfig.cmake.in
index 7ab85c3097c5fd49b660d0f601f5a8e390892629..9b2078c3cc8200cabfcce4bf36c6d48ae0732f60 100644
--- a/Projects/Athena/cmake/PreConfig.cmake.in
+++ b/Projects/Athena/cmake/PreConfig.cmake.in
@@ -3,10 +3,10 @@
# Pre-config script to propagate variables to downstream projects
#
-set( ATLAS_FLAKE8 "@ATLAS_FLAKE8@"
+# Set up the project's flake8 usage.
+set( ATLAS_FLAKE8 @ATLAS_FLAKE8@
CACHE STRING "Default flake8 command" )
-
-set( ATLAS_PYTHON_CHECKER "@ATLAS_PYTHON_CHECKER@"
+set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@
CACHE STRING "Python checker command to run during Python module compilation" )
# Figure out whether to use QUIET in the following calls.
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 0f87b8b7d00b0905365b3cea18d2ac19e8fd85db..e821365accf9bb8b0eb411dbfc1484af610c78eb 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.65
+AthenaExternalsVersion = 2.0.67
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.001
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 765bc91747d6f95d5024de8c19dcbc01af6f0992..ffff1e066b41973875e0cda718dcae312abc0a55 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.65
+VP1LightExternalsVersion = 2.0.67
diff --git a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx
index 37c59a94fd7661d58c9ac4853a01557d2d30912d..2680e5c1a8658b2cdd2b9e337206ed3efa84e4e2 100644
--- a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx
@@ -58,14 +58,14 @@ StatusCode EMFourMomBuilder::initialize(){
}
StatusCode EMFourMomBuilder::execute(const EventContext& ctx, xAOD::Egamma* eg) const {
-
(void)ctx;
if (!eg){
ATH_MSG_WARNING("Null pointer to egamma object ");
return StatusCode::SUCCESS;
}
- xAOD::Electron *electron = dynamic_cast< xAOD::Electron* >(eg);
- xAOD::Photon *photon = electron ? nullptr : dynamic_cast< xAOD::Photon* >(eg);
+
+ xAOD::Electron *electron = eg->type() == xAOD::Type::Electron ? static_cast<xAOD::Electron*>(eg) : nullptr;
+ xAOD::Photon *photon = electron ? nullptr : static_cast<xAOD::Photon*>(eg);
bool hasTrack(false);
if (electron) {
diff --git a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h
index 2f1b53b55001c8c62d0c010cb2754c8111d283db..f9a71460649aadb3cb23fa119988a25b10e12e5f 100644
--- a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h
@@ -9,9 +9,10 @@
@class EMFourMomBuilder
sets the fourmomentum : energy is taken from the cluster and angles either from tracking or cluster.
In case the egamma object is a conversion :
- - if it is a single/double track conversion with TRT only tracks (i.e no more than 4 hits in pixel+SCT), take the cluster info, not the track info
+ - if it is a single/double track conversion with TRT only tracks
+ - (i.e no more than 4 hits in pixel+SCT), take the cluster info, not the track info
-
- @author D. Zerwas
+ @author Zerwas,Anastopoulos
*/
// XAOD INCLUDES:
@@ -47,11 +48,11 @@ public:
~EMFourMomBuilder();
/** @brief initialize method*/
- StatusCode initialize();
+ StatusCode initialize() override;
/** @brief execute method*/
- virtual StatusCode execute(const EventContext& ctx, xAOD::Egamma* eg) const;
+ virtual StatusCode execute(const EventContext& ctx, xAOD::Egamma* eg) const override;
/** @brief execute method*/
- virtual StatusCode hltExecute(xAOD::Egamma* eg) const;
+ virtual StatusCode hltExecute(xAOD::Egamma* eg) const override;
private:
diff --git a/Reconstruction/egamma/egammaUtils/Root/eg_resolution.cxx b/Reconstruction/egamma/egammaUtils/Root/eg_resolution.cxx
index 4a1b3165c38a35a6fb5dfae2b73174dfe2c741a7..112aab8bf0fdf66d201868645604b8e20f93630e 100644
--- a/Reconstruction/egamma/egammaUtils/Root/eg_resolution.cxx
+++ b/Reconstruction/egamma/egammaUtils/Root/eg_resolution.cxx
@@ -91,14 +91,14 @@ eg_resolution::eg_resolution(const std::string& configuration)
eg_resolution::~eg_resolution(){
}
-//============================================================================
-// inputs are particle_type (0=elec, 1=reco unconv photon, 2=reco conv photon, 3=true unconv photon)
-// energy in MeV
-// eta
-// resolution_type (0=gaussian core fit, 1=sigmaeff 80%, 2=sigma eff 90%)
-//
-// returned value is sigmaE/E
-//
+/*
+ * inputs are
+ * particle_type (0=elec, 1=reco unconv photon, 2=reco conv photon, 3=true unconv photon)
+ * energy in MeV
+ * eta
+ * resolution_type (0=gaussian core fit, 1=sigmaeff 80%, 2=sigma eff 90%)
+ * returned value is sigmaE/E
+*/
double eg_resolution::getResolution(int particle_type, double energy, double eta, int resolution_type) const
{
@@ -112,9 +112,8 @@ double eg_resolution::getResolution(int particle_type, double energy, double eta
throw std::runtime_error("resolution type must be 0, 1, 2");
}
- const float aeta = fabs(eta); // TODO: move to std
+ const float aeta = fabs(eta);
int ibinEta = m_etaBins->GetSize() - 2;
- // TODO: use TAxis bin search
for (int i = 1; i < m_etaBins->GetSize(); ++i) {
if (aeta < m_etaBins->GetAt(i)) {
ibinEta = i - 1;
@@ -131,26 +130,27 @@ double eg_resolution::getResolution(int particle_type, double energy, double eta
const double rsampling = m_hSampling[particle_type][resolution_type]->GetBinContent(ibinEta + 1);
const double rnoise = m_hNoise[particle_type][resolution_type]->GetBinContent(ibinEta + 1);
const double rconst = m_hConst[particle_type][resolution_type]->GetBinContent(ibinEta + 1);
-
const double sigma2 = rsampling*rsampling/energyGeV + rnoise*rnoise/energyGeV/energyGeV + rconst*rconst;
return sqrt(sigma2);
}
-// TODO: not tested
double eg_resolution::getResolution(const xAOD::Egamma& particle, int resolution_type) const
{
int particle_type = -1;
- if (dynamic_cast<const xAOD::Electron*>(&particle)) { particle_type = 0; }
- else if (const xAOD::Photon* ph = dynamic_cast<const xAOD::Photon*>(&particle)) {
+ if (particle.type() == xAOD::Type::Electron) {
+ particle_type = 0;
+ } else if (particle.type() == xAOD::Type::Photon) {
+ const xAOD::Photon* ph = static_cast<const xAOD::Photon*> (&particle);
const xAOD::Vertex* phVertex = ph->vertex();
if (phVertex) {
const Amg::Vector3D& pos = phVertex->position();
const double Rconv = static_cast<float>(hypot(pos.x(), pos.y()));
if (Rconv > 0 and Rconv < 800) { particle_type = 2; }
else { particle_type = 1; }
+ } else {
+ particle_type = 1;
}
- else { particle_type = 1; }
}
assert (particle_type != 1);
diff --git a/TileCalorimeter/TileMuId/CMakeLists.txt b/TileCalorimeter/TileMuId/CMakeLists.txt
index 0356ca5abb51674d4df28ee74cd1608bec863b2c..54456b299d3130d4e93df7189a2cb9115a4deedd 100644
--- a/TileCalorimeter/TileMuId/CMakeLists.txt
+++ b/TileCalorimeter/TileMuId/CMakeLists.txt
@@ -1,32 +1,20 @@
-################################################################################
-# Package: TileMuId
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# Declare the package name:
+# Declare the package name.
atlas_subdir( TileMuId )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- TileCalorimeter/TileEvent )
-
-# Component(s) in the package:
+# Component(s) in the package.
atlas_add_component( TileMuId
- src/Tile*.cxx
- src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel CaloEvent CaloIdentifier AthenaKernel TileEvent )
+ TileMuId/*.h src/*.cxx src/components/*.cxx
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel CaloEvent CaloIdentifier
+ AthenaKernel TileEvent StoreGateLib )
-# Install files from the package:
-atlas_install_headers( TileMuId )
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*jobOptions*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Install files from the package.
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*jobOptions*.py )
+# Test(s) in the package.
atlas_add_test( TileMuIdConfig_test
- SCRIPT python -m TileMuId.TileMuIdConfig
- PROPERTIES TIMEOUT 300
- POST_EXEC_SCRIPT nopost.sh)
+ SCRIPT python -m TileMuId.TileMuIdConfig
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh)
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
index 1df405a505bd9ad8de0fd3320009c63f823a10dd..0379ec604950e1fe2be619bb94ea45433f8d3fe0 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
@@ -336,7 +336,7 @@ Trk::Extrapolator::initialize() {
for (int i(0);i != int(Trk::NumberOfSignatures);++i){
msgString += std::to_string(i)+") propagator: "+m_subPropagators[i]->name()+", updater: "+m_subupdaters[i]->name()+"\n";
}
- ATH_MSG_INFO(msgString);
+ ATH_MSG_VERBOSE(msgString);
ATH_CHECK( m_stepPropagator.retrieve() );
ATH_MSG_DEBUG("initialize() successful");
return StatusCode::SUCCESS;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
index 3a9c29fc1f90e440badb4282102f0c92d883c2c1..47e78775b2304e9171f4ff2b473351fb255b3c5e 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
@@ -6,7 +6,6 @@
#include "CxxUtils/features.h"
#include "CxxUtils/vectorize.h"
#include <limits>
-
#if !defined(__GNUC__)
#define __builtin_assume_aligned(X, N) X
#else
@@ -17,19 +16,20 @@
#endif
#endif
+//This enables -ftree-vectorize in gcc (we compile with O2)
ATH_ENABLE_VECTORIZATION;
namespace{
-/*
+/**
* Component Merging helper methods
*/
-
using namespace GSFUtils;
/**
* Based on
- * https://arxiv.org/pdf/2001.00727.pdf
- * equation (10)
+ * https://www.sciencedirect.com/science/article/pii/089812218990103X
+ * equation (16)
* but not accounting for weights
+ * covI * invCovJ + covJ * invCovI + (mean1-mean2) (invcov+invcov) (mean1-mean2)
*/
[[maybe_unused]]
float
@@ -37,15 +37,15 @@ symmetricKL(const Component1D& componentI,
const Component1D& componentJ)
{
const double meanDifference = componentI.mean - componentJ.mean;
- const double covDifference = componentI.cov - componentJ.cov;
- const double invertCovDiff = componentI.invCov - componentJ.invCov;
const double inverCovSum = componentI.invCov + componentJ.invCov;
- return covDifference * invertCovDiff +
+ return componentI.invCov * componentJ.cov +
+ componentJ.invCov * componentI.cov +
meanDifference * inverCovSum * meanDifference;
}
/**
* https://arxiv.org/pdf/2001.00727.pdf
* equation (10)
+ * Same as above but accounting for weights
*/
[[maybe_unused]]
float
@@ -53,11 +53,10 @@ weightedSymmetricKL(const Component1D& componentI,
const Component1D& componentJ)
{
const double meanDifference = componentI.mean - componentJ.mean;
- const double covDifference = componentI.cov - componentJ.cov;
- const double invertCovDiff = componentI.invCov - componentJ.invCov;
const double inverCovSum = componentI.invCov + componentJ.invCov;
const double weightMul = componentI.weight * componentJ.weight;
- const double symmetricDis = covDifference * invertCovDiff +
+ const double symmetricDis = componentI.invCov * componentJ.cov +
+ componentJ.invCov * componentI.cov +
meanDifference * inverCovSum * meanDifference;
return weightMul * symmetricDis;
}
@@ -92,11 +91,12 @@ combine(GSFUtils::Component1D& updated,
updated.invCov = 1. / sumVariance;
updated.weight = sumWeight;
- //Large numbers so distance wrt to is is large
+ //large numbers to enter the multiplications/sums
+ //make distance large
removed.mean = 1e10;
removed.cov = 1e10;
removed.invCov = 1e10;
- removed.weight = 1.;
+ removed.weight = 1;
}
/**
@@ -104,7 +104,7 @@ combine(GSFUtils::Component1D& updated,
* and return the minimum index/distance wrt to this
* new component
*/
-std::pair<int32_t, float>
+void
recalculateDistances(const componentPtrRestrict componentsIn,
floatPtrRestrict distancesIn,
const int32_t mini,
@@ -116,30 +116,19 @@ recalculateDistances(const componentPtrRestrict componentsIn,
const int32_t j = mini;
const int32_t indexConst = (j - 1) * j / 2;
- int32_t minIndex = 0;
- float minDistance = std::numeric_limits<float>::max();
-
- // Element at the same raw of mini/j
+ //Rows
const Component1D componentJ = components[j];
for (int32_t i = 0; i < j; ++i) {
const Component1D componentI = components[i];
const int32_t index = indexConst + i;
distances[index] = symmetricKL(componentI, componentJ);
- if (distances[index] < minDistance) {
- minIndex = index;
- minDistance = distances[index];
- }
}
+ //Columns
for (int32_t i = j + 1; i < n; ++i) {
const int32_t index = (i - 1) * i / 2 + j;
const Component1D componentI = components[i];
distances[index] = symmetricKL(componentI,componentJ);
- if (distances[index] < minDistance) {
- minIndex = index;
- minDistance = distances[index];
- }
}
- return {minIndex,minDistance};
}
/**
@@ -154,7 +143,6 @@ calculateAllDistances(const componentPtrRestrict componentsIn,
const Component1D* components =
static_cast<const Component1D*>(__builtin_assume_aligned(componentsIn, alignment));
float* distances = static_cast<float*>(__builtin_assume_aligned(distancesIn, alignment));
-
for (int32_t i = 1; i < n; ++i) {
const int32_t indexConst = (i-1) * i / 2;
const Component1D componentI = components[i];
@@ -176,9 +164,11 @@ resetDistances(floatPtrRestrict distancesIn,
float* distances = (float*)__builtin_assume_aligned(distancesIn, alignment);
const int32_t j = minj;
const int32_t indexConst = (j - 1) * j / 2;
+ //Rows
for (int32_t i = 0; i < j; ++i) {
distances[indexConst + i] = std::numeric_limits<float>::max();
}
+ //Columns
for (int32_t i = j+1; i < n; ++i) {
const int32_t index = (i-1)*i/2 + j;
distances[index] = std::numeric_limits<float>::max();
@@ -219,42 +209,26 @@ findMerges(componentPtrRestrict componentsIn,
(nn & 7) == 0 ? nn
: nn + (8 - (nn & 7));
AlignedDynArray<float, alignment> distances(nn2, std::numeric_limits<float>::max());
-
+
// vector to be returned
std::vector<std::pair<int32_t, int32_t>> merges;
merges.reserve(inputSize - reducedSize);
-
// initial distance calculation
calculateAllDistances(components, distances, n);
-
+
// merge loop
int32_t numberOfComponentsLeft = n;
- int32_t minIndex = -1;
- float currentMinValue = std::numeric_limits<float>::max();
- bool foundNext =false;
while (numberOfComponentsLeft > reducedSize) {
// see if we have the next already
- if (!foundNext) {
- std::pair<int32_t,float> minDis = findMinimumIndex(distances, nn2);
- minIndex = minDis.first;
- currentMinValue = minDis.second;
- }
- //always reset
- foundNext=false;
+ const std::pair<int32_t, float> minDis = findMinimumIndex(distances, nn2);
+ const int32_t minIndex = minDis.first;
const triangularToIJ conversion= convert[minIndex];
const int32_t mini = conversion.I;
const int32_t minj = conversion.J;
// Combine the 2 components
combine(components[mini], components[minj]);
// re-calculate distances wrt the new component at mini
- std::pair<int32_t, float> possibleNextMin =
- recalculateDistances(components, distances, mini, n);
- //We might already got something smaller than the previous minimum
- if (possibleNextMin.first > 0 && possibleNextMin.second < currentMinValue) {
- foundNext=true;
- minIndex= possibleNextMin.first;
- currentMinValue=possibleNextMin.second;
- }
+ recalculateDistances(components, distances, mini, n);
// Reset old weights wrt the minj position
resetDistances(distances, minj, n);
// keep track and decrement
@@ -263,23 +237,15 @@ findMerges(componentPtrRestrict componentsIn,
} // end of merge while
return merges;
}
-
-
-
/*
* findMinimumIndex
*
* For FindMinimumIndex at x86_64 we have
- * AVX2 and SSE versions
+ * AVX2,SSE4.1,SSE2 versions
* These assume that the number of elements is a multiple
* of 8 and are to be used for sizeable inputs.
*
* We also provide a default "scalar" implementation
- *
- * One of the issues we have see in that gcc8.3 and clang8 (02/2020)
- * optimise differently:
- * https://its.cern.ch/jira/projects/ATLASRECTS/issues/ATLASRECTS-5244
- *
*/
#if HAVE_FUNCTION_MULTIVERSIONING
#if defined(__x86_64__)
@@ -335,9 +301,7 @@ findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
minindices = _mm256_blendv_epi8(minindices, indicesIn, lt);
minvalues = _mm256_min_ps(values, minvalues);
}
- /*
- * Do the final calculation scalar way
- */
+ //Do the final calculation scalar way
alignas(alignment) float distances[8];
alignas(alignment) int32_t indices[8];
_mm256_store_ps(distances, minvalues);
@@ -385,8 +349,7 @@ std::pair<int32_t,float>
findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
{
float* array = (float*)__builtin_assume_aligned(distancesIn, alignment);
- /* Assuming SSE do 2 vectors of 4 elements in a time
- * one might want to revisit for AVX2 */
+ //Do 2 vectors of 4 elements , so 8 at time
const __m128i increment = _mm_set1_epi32(8);
__m128i indices1 = _mm_setr_epi32(0, 1, 2, 3);
__m128i indices2 = _mm_setr_epi32(4, 5, 6, 7);
@@ -410,9 +373,7 @@ findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
minindices2 = _mm_blendv_epi8(minindices2, indices2, lt2);
minvalues2 = _mm_min_ps(values2, minvalues2);
}
- /*
- * Do the final calculation scalar way
- */
+ //Do the final calculation scalar way
alignas(alignment) float distances[8];
alignas(alignment) int32_t indices[8];
_mm_store_ps(distances, minvalues1);
@@ -448,8 +409,7 @@ std::pair<int32_t,float>
findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
{
float* array = (float*)__builtin_assume_aligned(distancesIn, alignment);
- /* Assuming SSE do 2 vectors of 4 elements in a time
- * one might want to revisit for AVX2 */
+ //Do 2 vectors of 4 elements, so 8 at a time
const __m128i increment = _mm_set1_epi32(8);
__m128i indices1 = _mm_setr_epi32(0, 1, 2, 3);
__m128i indices2 = _mm_setr_epi32(4, 5, 6, 7);
@@ -473,9 +433,7 @@ findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
minindices2 = SSE2_mm_blendv_epi8(minindices2, indices2, lt2);
minvalues2 = _mm_min_ps(values2, minvalues2);
}
- /*
- * Do the final calculation scalar way
- */
+ //Do the final calculation scalar way
alignas(alignment) float distances[8];
alignas(alignment) int32_t indices[8];
_mm_store_ps(distances, minvalues1);
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
index f4aaf2d7588ee20e42e6dcb9b60481d0fbd5c6b9..67cce83579c800f784a904fcdfc01187b81ded00 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// EnhancedBiasWeighter includes
@@ -55,7 +55,7 @@ StatusCode EnhancedBiasWeighter::initialize()
} else { // isData
- if (m_runNumber == 0) {
+ if (m_runNumber == 0u) {
ATH_MSG_FATAL("calculateWeightingData is TRUE, but the RunNumber property has not been set. This must be set such that we can read in the correct data.");
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx
index 23550ebdee3874a4b3dbe791eca66bab9713311b..5bc73e32de0e2abdde1296caa1f5f94d48554315 100755
--- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx
+++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx
@@ -26,7 +26,7 @@ void HLTResultCnv_p1::transToPers(const HLT::HLTResult* trans,
const EventContext& ctx = Gaudi::Hive::currentContext();
std::vector< unsigned int > temp;
if (cache->trigNavigationThinningSvc()->doSlimming (ctx, temp).isFailure()) {
- log << MSG::ERROR << "HLTReultCnv_p1::transToPers: doSlimming failed." << endmsg;
+ log << MSG::ERROR << "HLTResultCnv_p1::transToPers: doSlimming failed." << endmsg;
}
pers->m_navigationResult = temp;
}
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
index 65dfdf13ac5e54a459af76799c63445ae17740ba..c2531161d548be0c3472097f10fc9ab38650abb6 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
@@ -152,7 +152,9 @@ StatusCode TrigSignatureMoniMT::stop() {
// retrieve information whether chain was active in Step
std::map<std::string, std::set<std::string>> chainToSteps;
+ std::map<std::string, std::set<int>> chainToStepsId;
for ( const TrigConf::Chain& chain: *hltMenuHandle ){
+ int nstep=1; //let's start from step=1
for ( const auto& seq : chain.getList("sequencers", true) ){
// example sequencer name is "Step1_FastCalo_electron", we need only information about Step + number
const std::string seqName = seq.getValue();
@@ -162,6 +164,11 @@ StatusCode TrigSignatureMoniMT::stop() {
std::string stepName = stepNameMatch[0];
stepName[0] = std::toupper(stepName[0]); // fix for "step1" names
chainToSteps[chain.name()].insert( stepName );
+ chainToStepsId[chain.name()].insert( nstep );
+ //check that the step name is set with the same position in the execution
+ if ("Step"+std::to_string(nstep) != stepName)
+ ATH_MSG_INFO("Sequence "<<seqName<<" (step "<<stepName<<") used at step "<<nstep<<" in chain "<<chain.name());
+ nstep++;
}
}
@@ -173,8 +180,8 @@ StatusCode TrigSignatureMoniMT::stop() {
// skip steps where chain wasn't active
// ybins are for all axis labes, steps are in bins from 3 to stepsSize + 2
const std::string chainName = m_passHistogram->GetXaxis()->GetBinLabel(xbin);
- ybin < 3 || ybin > stepsSize + 2 || chainToSteps[chainName].find("Step" + std::to_string(ybin - 2)) != chainToSteps[chainName].end() ?
- v += fixedWidth( std::to_string( int(hist->GetBinContent( xbin, ybin ))) , 11 )
+ ybin < 3 || ybin > stepsSize + 2 || chainToStepsId[chainName].find(ybin - 2) != chainToStepsId[chainName].end() ?
+ v += fixedWidth( std::to_string( int(hist->GetBinContent( xbin, ybin ))) , 11 )
: v += fixedWidth( "-", 11 );
} else {
v += fixedWidth( " ", 11 );
diff --git a/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx
index a08a231cc933e6f4f4ed36a5f91168d1dd897c6e..8a9e2b574d4129664aa3e93d3b6b9bc2281d1465 100644
--- a/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx
@@ -39,7 +39,8 @@ StatusCode FSRoIsUnpackingTool::start() {
StatusCode FSRoIsUnpackingTool::updateConfiguration() {
using namespace TrigConf;
-
+ m_allFSChains.clear();
+
for ( auto thresholdToChain: m_thresholdToChainMapping ) {
m_allFSChains.insert( thresholdToChain.second.begin(), thresholdToChain.second.end() );
}
@@ -68,8 +69,11 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, "L1" ); // This "L1" denotes an initial node with no parents
for ( auto c: activeFSchains ) addDecisionID( c, decision );
- ATH_MSG_DEBUG("Unpacking FS RoI for " << activeFSchains.size() << " chains");
-
+ ATH_MSG_DEBUG("Unpacking FS RoI for " << activeFSchains.size() << " chains: " << [&](){
+ TrigCompositeUtils::DecisionIDContainer ids;
+ TrigCompositeUtils::decisionIDs( decision, ids );
+ return std::vector<TrigCompositeUtils::DecisionID>( ids.begin(), ids.end() ); }() );
+
std::unique_ptr<TrigRoiDescriptorCollection> fsRoIsColl = std::make_unique<TrigRoiDescriptorCollection>();
TrigRoiDescriptor* fsRoI = new TrigRoiDescriptor( true ); // true == FS
@@ -79,7 +83,7 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_CHECK( roiHandle.record ( std::move( fsRoIsColl ) ) );
ATH_MSG_DEBUG("Linking to FS RoI descriptor");
- decision->setObjectLink( "initialRoI", ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey.key(), 0 ) );
+ decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey.key(), 0 ) );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
index 8fce74997f4513bbdae143d23e7be22d60cd271d..48276eac59c5a8e1ec43c334f94bef8e81040317 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
@@ -1,7 +1,7 @@
/*
General-purpose view creation algorithm <bwynne@cern.ch>
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "EventViewCreatorAlgorithm.h"
@@ -181,7 +181,7 @@ StatusCode EventViewCreatorAlgorithm::linkViewToParent( const TrigCompositeUtils
// We must call this BEFORE having added the new link, check
if (outputDecision->hasObjectLink(viewString())) {
ATH_MSG_ERROR("Called linkViewToParent on a Decision object which already has been given a '"
- << viewString << "' link. Call this fn BEFORE linking the new View.");
+ << viewString() << "' link. Call this fn BEFORE linking the new View.");
return StatusCode::FAILURE;
}
std::vector<LinkInfo<ViewContainer>> parentViews = findLinks<ViewContainer>(outputDecision, viewString(), TrigDefs::lastFeatureOfType);
@@ -257,4 +257,4 @@ StatusCode EventViewCreatorAlgorithm::placeJetInView( const xAOD::Jet* theObject
ATH_CHECK( handle.setProxyDict( view ) );
ATH_CHECK( handle.record( std::move( oneObjectCollection ) ) );
return StatusCode::SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index 996e400e1b8fb8bd6dfed1b720e9fa5dc3699ce0..7e6abdd7617b1f668b81466958e42e1c78978988 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -1,438 +1,438 @@
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
-TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - 2
-TrigSignatureMoniMT INFO -- #3136730292 Features 6 149 7 - -
+TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - 2
+TrigSignatureMoniMT INFO -- #3136730292 Features 12 298 14 - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - 20
-TrigSignatureMoniMT INFO -- #2613484113 Features 171 1848 390 - -
+TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - - 20
+TrigSignatureMoniMT INFO -- #2613484113 Features 342 3696 780 - - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH #2426612258
-TrigSignatureMoniMT INFO -- #2426612258 Events 2 2 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2426612258 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2426612258 Events 2 2 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2426612258 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 2 2 1 1 0 - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 2 2 0 - -
+TrigSignatureMoniMT INFO -- #58053304 Events 2 2 1 1 0 - - - 0
+TrigSignatureMoniMT INFO -- #58053304 Features 4 4 0 - - -
TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 2 2 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #3965466087 Events 2 2 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 3 3 3 1 1 1 - 1
-TrigSignatureMoniMT INFO -- #2619091790 Features 12 4 4 4 -
+TrigSignatureMoniMT INFO -- #2619091790 Events 3 3 3 1 1 1 - - 1
+TrigSignatureMoniMT INFO -- #2619091790 Features 12 4 4 4 - -
TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 3 3 3 1 1 1 - 1
-TrigSignatureMoniMT INFO -- #557204938 Features 12 4 4 4 -
+TrigSignatureMoniMT INFO -- #557204938 Events 3 3 3 1 1 1 - - 1
+TrigSignatureMoniMT INFO -- #557204938 Features 12 4 4 4 - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 4 4 4 4 - 4
-TrigSignatureMoniMT INFO -- #1584776935 Features 16 16 24 20 -
+TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 4 4 4 4 - - 4
+TrigSignatureMoniMT INFO -- #1584776935 Features 16 16 24 20 - -
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 4 3 - - - 3
-TrigSignatureMoniMT INFO -- #2046267508 Features 16 12 - - -
+TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 4 3 - - - - 3
+TrigSignatureMoniMT INFO -- #2046267508 Features 16 12 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
-TrigSignatureMoniMT INFO -- #1316992871 Events 10 10 4 3 3 3 2 0
-TrigSignatureMoniMT INFO -- #1316992871 Features 16 12 18 16 2
+TrigSignatureMoniMT INFO -- #1316992871 Events 10 10 4 3 3 3 2 - 0
+TrigSignatureMoniMT INFO -- #1316992871 Features 16 12 18 16 2 -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 4 4 4 3 - - - 3
-TrigSignatureMoniMT INFO -- #3304584056 Features 16 12 - - -
+TrigSignatureMoniMT INFO -- #3304584056 Events 4 4 4 3 - - - - 3
+TrigSignatureMoniMT INFO -- #3304584056 Features 16 12 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
-TrigSignatureMoniMT INFO -- #1747073535 Events 4 4 4 3 3 3 - 3
-TrigSignatureMoniMT INFO -- #1747073535 Features 16 12 18 16 -
+TrigSignatureMoniMT INFO -- #1747073535 Events 4 4 4 3 3 3 - - 3
+TrigSignatureMoniMT INFO -- #1747073535 Features 16 12 18 16 - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 4 3 3 3 - 3
-TrigSignatureMoniMT INFO -- #2398136098 Features 16 12 18 16 -
+TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 4 3 3 3 - - 3
+TrigSignatureMoniMT INFO -- #2398136098 Features 16 12 18 16 - -
TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2199422919 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #493765146 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1832399408 Events 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1199773318 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #424835335 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1834383636 Events 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 7 7 1 - - - - 1
-TrigSignatureMoniMT INFO -- #1175391812 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #1175391812 Events 7 7 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #1175391812 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM24VHI #2512605388
-TrigSignatureMoniMT INFO -- #2512605388 Events 6 6 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2512605388 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2512605388 Events 6 6 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2512605388 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_nod0_L1EM24VHI #2532156734
-TrigSignatureMoniMT INFO -- #2532156734 Events 6 6 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2532156734 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2532156734 Events 6 6 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2532156734 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
-TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - 6
-TrigSignatureMoniMT INFO -- #1703681121 Features 7 134 7 - -
+TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - 6
+TrigSignatureMoniMT INFO -- #1703681121 Features 7 134 7 - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI #3494457106
-TrigSignatureMoniMT INFO -- #3494457106 Events 6 6 5 5 5 3 - 3
-TrigSignatureMoniMT INFO -- #3494457106 Features 5 65 8 3 -
+TrigSignatureMoniMT INFO -- #3494457106 Events 6 6 5 5 5 3 - - 3
+TrigSignatureMoniMT INFO -- #3494457106 Features 5 65 8 3 - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM24VHI #4227411116
-TrigSignatureMoniMT INFO -- #4227411116 Events 6 6 5 5 5 3 - 3
-TrigSignatureMoniMT INFO -- #4227411116 Features 5 65 8 3 -
+TrigSignatureMoniMT INFO -- #4227411116 Events 6 6 5 5 5 3 - - 3
+TrigSignatureMoniMT INFO -- #4227411116 Features 5 65 8 3 - -
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM24VHI #3481091923
-TrigSignatureMoniMT INFO -- #3481091923 Events 6 6 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3481091923 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3481091923 Events 6 6 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3481091923 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 #2086577378
-TrigSignatureMoniMT INFO -- #2086577378 Events 5 5 5 - - - - 5
-TrigSignatureMoniMT INFO -- #2086577378 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #2086577378 Events 5 5 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #2086577378 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 20 20 20 - - 20
-TrigSignatureMoniMT INFO -- #683953566 Features 171 1848 390 - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 20 20 20 - - - 20
+TrigSignatureMoniMT INFO -- #683953566 Features 171 1848 390 - - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - 20
-TrigSignatureMoniMT INFO -- #324908483 Features 137 1657 190 - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - - 20
+TrigSignatureMoniMT INFO -- #324908483 Features 137 1657 190 - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - 4
-TrigSignatureMoniMT INFO -- #1053337356 Features 56 656 116 5 -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - - 4
+TrigSignatureMoniMT INFO -- #1053337356 Features 56 656 116 5 - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - 4
-TrigSignatureMoniMT INFO -- #176627878 Features 48 534 93 5 -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - - 4
+TrigSignatureMoniMT INFO -- #176627878 Features 48 534 93 5 - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 3 - 3
-TrigSignatureMoniMT INFO -- #2758326765 Features 45 516 84 4 -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 3 - - 3
+TrigSignatureMoniMT INFO -- #2758326765 Features 45 516 84 4 - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI #713054523
-TrigSignatureMoniMT INFO -- #713054523 Events 6 6 2 2 2 2 - 2
-TrigSignatureMoniMT INFO -- #713054523 Features 2 34 4 2 -
+TrigSignatureMoniMT INFO -- #713054523 Events 6 6 2 2 2 2 - - 2
+TrigSignatureMoniMT INFO -- #713054523 Features 2 34 4 2 - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_nod0_L1EM24VHI #756001976
-TrigSignatureMoniMT INFO -- #756001976 Events 6 6 2 2 2 2 - 2
-TrigSignatureMoniMT INFO -- #756001976 Features 2 34 4 2 -
+TrigSignatureMoniMT INFO -- #756001976 Events 6 6 2 2 2 2 - - 2
+TrigSignatureMoniMT INFO -- #756001976 Features 2 34 4 2 - -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 20 20 20 - - 20
-TrigSignatureMoniMT INFO -- #1959043579 Features 89 1136 112 - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 20 20 20 - - - 20
+TrigSignatureMoniMT INFO -- #1959043579 Features 89 1136 112 - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 6 6 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1045486446 Events 6 6 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI #3534544568
-TrigSignatureMoniMT INFO -- #3534544568 Events 6 6 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3534544568 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #3534544568 Events 6 6 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3534544568 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 14 14 14 14 12 12 - 12
-TrigSignatureMoniMT INFO -- #2706532790 Features 24 24 22 20 -
+TrigSignatureMoniMT INFO -- #2706532790 Events 14 14 14 14 12 12 - - 12
+TrigSignatureMoniMT INFO -- #2706532790 Features 24 24 22 20 - -
TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 20 20 20 - - 20
-TrigSignatureMoniMT INFO -- #471243435 Features 137 137 190 - -
+TrigSignatureMoniMT INFO -- #471243435 Events 20 20 20 20 20 - - - 20
+TrigSignatureMoniMT INFO -- #471243435 Features 137 137 190 - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 20 20 20 20 - 20
-TrigSignatureMoniMT INFO -- #3486231698 Features 137 137 190 118 -
+TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 20 20 20 20 - - 20
+TrigSignatureMoniMT INFO -- #3486231698 Features 137 137 190 118 - -
TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 17 17 17 9 - 9
-TrigSignatureMoniMT INFO -- #3230088967 Features 56 56 116 12 -
+TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 17 17 17 9 - - 9
+TrigSignatureMoniMT INFO -- #3230088967 Features 56 56 116 12 - -
TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 16 16 16 9 - 9
-TrigSignatureMoniMT INFO -- #385248610 Features 48 48 93 12 -
+TrigSignatureMoniMT INFO -- #385248610 Events 20 20 16 16 16 9 - - 9
+TrigSignatureMoniMT INFO -- #385248610 Features 48 48 93 12 - -
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - 9
-TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 84 9 -
+TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - - 9
+TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 84 9 - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
-TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1341875780 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1341875780 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 15 - - - - 15
-TrigSignatureMoniMT INFO -- #4034799151 Features 425 - - - -
+TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 15 - - - - - 15
+TrigSignatureMoniMT INFO -- #4034799151 Features 425 - - - - -
TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 3 3 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3992507557 Events 3 3 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 3 3 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1211559599 Events 3 3 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 3 3 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3706723666 Events 3 3 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 3 3 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1837565816 Events 3 3 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2205518067 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #4179085188 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 19 - - - - 19
-TrigSignatureMoniMT INFO -- #1364976160 Features 50 - - - -
+TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 19 - - - - - 19
+TrigSignatureMoniMT INFO -- #1364976160 Features 50 - - - - -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 15 - - - - 15
-TrigSignatureMoniMT INFO -- #3295122398 Features 27 - - - -
+TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 15 - - - - - 15
+TrigSignatureMoniMT INFO -- #3295122398 Features 27 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 19 - - - - 19
-TrigSignatureMoniMT INFO -- #868405538 Features 50 - - - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 19 - - - - - 19
+TrigSignatureMoniMT INFO -- #868405538 Features 50 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 19 19 16 - - - - 16
-TrigSignatureMoniMT INFO -- #1335156103 Features 31 - - - -
+TrigSignatureMoniMT INFO -- #1335156103 Events 19 19 16 - - - - - 16
+TrigSignatureMoniMT INFO -- #1335156103 Features 31 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 19 19 15 - - - - 15
-TrigSignatureMoniMT INFO -- #3658890913 Features 29 - - - -
+TrigSignatureMoniMT INFO -- #3658890913 Events 19 19 15 - - - - - 15
+TrigSignatureMoniMT INFO -- #3658890913 Features 29 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 12 - - - - 12
-TrigSignatureMoniMT INFO -- #2857031468 Features 20 - - - -
+TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 12 - - - - - 12
+TrigSignatureMoniMT INFO -- #2857031468 Features 20 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 12 - - - - 12
-TrigSignatureMoniMT INFO -- #2938374624 Features 19 - - - -
+TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 12 - - - - - 12
+TrigSignatureMoniMT INFO -- #2938374624 Features 19 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 12 - - - - 12
-TrigSignatureMoniMT INFO -- #1593009344 Features 19 - - - -
+TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 12 - - - - - 12
+TrigSignatureMoniMT INFO -- #1593009344 Features 19 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 19 - - - - 19
-TrigSignatureMoniMT INFO -- #3341539267 Features 51 - - - -
+TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 19 - - - - - 19
+TrigSignatureMoniMT INFO -- #3341539267 Features 51 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 19 19 19 19 19 - - 19
-TrigSignatureMoniMT INFO -- #991419339 Features 50 50 50 - -
+TrigSignatureMoniMT INFO -- #991419339 Events 19 19 19 19 19 - - - 19
+TrigSignatureMoniMT INFO -- #991419339 Features 50 50 50 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 19 19 19 19 19 - - 19
-TrigSignatureMoniMT INFO -- #1961149049 Features 50 50 50 - -
+TrigSignatureMoniMT INFO -- #1961149049 Events 19 19 19 19 19 - - - 19
+TrigSignatureMoniMT INFO -- #1961149049 Features 50 50 50 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 19 19 16 - - - - 16
-TrigSignatureMoniMT INFO -- #761060030 Features 31 - - - -
+TrigSignatureMoniMT INFO -- #761060030 Events 19 19 16 - - - - - 16
+TrigSignatureMoniMT INFO -- #761060030 Features 31 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 18 - - - - 18
-TrigSignatureMoniMT INFO -- #1509925407 Features 44 - - - -
+TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 18 - - - - - 18
+TrigSignatureMoniMT INFO -- #1509925407 Features 44 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 19 19 16 - - - - 16
-TrigSignatureMoniMT INFO -- #4012311417 Features 31 - - - -
+TrigSignatureMoniMT INFO -- #4012311417 Events 19 19 16 - - - - - 16
+TrigSignatureMoniMT INFO -- #4012311417 Features 31 - - - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 17 - - - - 17
-TrigSignatureMoniMT INFO -- #2042444294 Features 39 - - - -
+TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 17 - - - - - 17
+TrigSignatureMoniMT INFO -- #2042444294 Features 39 - - - - -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 15 - - - - 15
-TrigSignatureMoniMT INFO -- #1542468090 Features 26 - - - -
+TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 15 - - - - - 15
+TrigSignatureMoniMT INFO -- #1542468090 Features 26 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #215408633 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1151767619 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #582699527 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #582699527 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 19 19 13 - - - - 13
-TrigSignatureMoniMT INFO -- #510475538 Features 21 - - - -
+TrigSignatureMoniMT INFO -- #510475538 Events 19 19 13 - - - - - 13
+TrigSignatureMoniMT INFO -- #510475538 Features 21 - - - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 19 19 13 - - - - 13
-TrigSignatureMoniMT INFO -- #877042532 Features 21 - - - -
+TrigSignatureMoniMT INFO -- #877042532 Events 19 19 13 - - - - - 13
+TrigSignatureMoniMT INFO -- #877042532 Features 21 - - - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 19 19 8 - - - - 8
-TrigSignatureMoniMT INFO -- #1538535401 Features 13 - - - -
+TrigSignatureMoniMT INFO -- #1538535401 Events 19 19 8 - - - - - 8
+TrigSignatureMoniMT INFO -- #1538535401 Features 13 - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 8 8 0 - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #997163309 Events 8 8 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #782182242 Events 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 10 10 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #48780310 Events 10 10 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 10 5 5 - - 5
-TrigSignatureMoniMT INFO -- #2083734526 Features 14 6 5 - -
+TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 10 5 5 - - - 5
+TrigSignatureMoniMT INFO -- #2083734526 Features 14 6 5 - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 8 8 6 6 6 6 - 6
-TrigSignatureMoniMT INFO -- #677658909 Features 7 7 7 7 -
+TrigSignatureMoniMT INFO -- #677658909 Events 8 8 6 6 6 6 - - 6
+TrigSignatureMoniMT INFO -- #677658909 Features 7 7 7 7 - -
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 8 8 8 5 4 3 2 2
-TrigSignatureMoniMT INFO -- #3411723090 Features 10 6 5 4 2
+TrigSignatureMoniMT INFO -- #3411723090 Events 8 8 8 5 4 3 2 - 2
+TrigSignatureMoniMT INFO -- #3411723090 Features 10 6 5 4 2 -
TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 8 8 8 5 4 3 2 2
-TrigSignatureMoniMT INFO -- #1963262787 Features 10 6 5 3 2
+TrigSignatureMoniMT INFO -- #1963262787 Events 8 8 8 5 4 3 2 - 2
+TrigSignatureMoniMT INFO -- #1963262787 Features 10 6 5 3 2 -
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 8 8 8 5 3 2 1 1
-TrigSignatureMoniMT INFO -- #597064890 Features 10 6 4 2 1
+TrigSignatureMoniMT INFO -- #597064890 Events 8 8 8 5 3 2 1 - 1
+TrigSignatureMoniMT INFO -- #597064890 Features 10 6 4 2 1 -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 8 5 1 1 - 1
-TrigSignatureMoniMT INFO -- #3657158931 Features 10 6 1 1 -
+TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 8 5 1 1 - - 1
+TrigSignatureMoniMT INFO -- #3657158931 Features 10 6 1 1 - -
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 8 8 8 5 1 1 1 1
-TrigSignatureMoniMT INFO -- #827327262 Features 10 6 1 1 1
+TrigSignatureMoniMT INFO -- #827327262 Events 8 8 8 5 1 1 1 - 1
+TrigSignatureMoniMT INFO -- #827327262 Features 10 6 1 1 1 -
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 8 8 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 2 0 0 - -
+TrigSignatureMoniMT INFO -- #1642591450 Events 8 8 1 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1642591450 Features 2 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 10 10 10 10 - - - 10
-TrigSignatureMoniMT INFO -- #996392590 Features 14 13 - - -
+TrigSignatureMoniMT INFO -- #996392590 Events 10 10 10 10 - - - - 10
+TrigSignatureMoniMT INFO -- #996392590 Features 14 13 - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 10 10 10 10 - 10
-TrigSignatureMoniMT INFO -- #2560542253 Features 14 13 16 15 -
+TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 10 10 10 10 - - 10
+TrigSignatureMoniMT INFO -- #2560542253 Features 14 13 16 15 - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 10 10 10 10 10 10 - 10
-TrigSignatureMoniMT INFO -- #934918532 Features 14 14 17 18 -
+TrigSignatureMoniMT INFO -- #934918532 Events 10 10 10 10 10 10 - - 10
+TrigSignatureMoniMT INFO -- #934918532 Features 14 14 17 18 - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 10 10 10 10 6 6
-TrigSignatureMoniMT INFO -- #1012713062 Features 14 13 16 15 6
+TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 10 10 10 10 6 - 6
+TrigSignatureMoniMT INFO -- #1012713062 Features 14 13 16 15 6 -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 10 0 10 - - 10
-TrigSignatureMoniMT INFO -- #3895421032 Features 14 0 17 - -
+TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 10 0 10 - - - 10
+TrigSignatureMoniMT INFO -- #3895421032 Features 14 0 17 - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 4 4 4 4 4 4 - 4
-TrigSignatureMoniMT INFO -- #1713982776 Features 8 8 12 10 -
+TrigSignatureMoniMT INFO -- #1713982776 Events 4 4 4 4 4 4 - - 4
+TrigSignatureMoniMT INFO -- #1713982776 Features 8 8 12 10 - -
+TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
+TrigSignatureMoniMT INFO -- #451489897 Events 10 10 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #3518031697 Features 14 - - - -
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 #1631468602
-TrigSignatureMoniMT INFO -- #1631468602 Events 10 10 - - - 0 0 10
-TrigSignatureMoniMT INFO -- #1631468602 Features - - - 0 0
+TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 10 - - - - - 10
+TrigSignatureMoniMT INFO -- #3518031697 Features 14 - - - - -
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 8 8 8 0 0 - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 10 0 0 - -
+TrigSignatureMoniMT INFO -- #761101109 Events 8 8 8 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #761101109 Features 10 0 0 - - -
TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3024203296 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3024203296 Events 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3024203296 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2342716369 Events 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 18 18 18 - - - - 18
-TrigSignatureMoniMT INFO -- #372992233 Features 42 - - - -
+TrigSignatureMoniMT INFO -- #372992233 Events 18 18 18 18 - - - - 18
+TrigSignatureMoniMT INFO -- #372992233 Features 42 42 - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 5 5 5 - - - - 5
-TrigSignatureMoniMT INFO -- #1376650121 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #1376650121 Events 5 5 5 5 - - - - 5
+TrigSignatureMoniMT INFO -- #1376650121 Features 6 6 - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #714660857 Events 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #2725693236 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
-TrigSignatureMoniMT INFO -- #886074432 Events 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #886074432 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #886074432 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
-TrigSignatureMoniMT INFO -- #1747754287 Events 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #1747754287 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #2334140248 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
-TrigSignatureMoniMT INFO -- #1799096347 Events 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #1799096347 Events 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
-TrigSignatureMoniMT INFO -- #554271976 Events 14 14 14 - - - - 14
-TrigSignatureMoniMT INFO -- #554271976 Features 24 - - - -
+TrigSignatureMoniMT INFO -- #554271976 Events 14 14 14 14 - - - - 14
+TrigSignatureMoniMT INFO -- #554271976 Features 24 24 - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 14 14 14 13 - - - 13
-TrigSignatureMoniMT INFO -- #988149859 Features 24 17 - - -
+TrigSignatureMoniMT INFO -- #988149859 Events 14 14 14 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #988149859 Features 24 17 17 - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 14 14 14 13 - - - 13
-TrigSignatureMoniMT INFO -- #3346942453 Features 24 17 - - -
+TrigSignatureMoniMT INFO -- #3346942453 Events 14 14 14 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #3346942453 Features 24 17 17 - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 14 14 12 11 - - - 9
-TrigSignatureMoniMT INFO -- #169452969 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #169452969 Events 14 14 12 11 9 - - - 9
+TrigSignatureMoniMT INFO -- #169452969 Features 22 15 10 - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 14 14 12 11 - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #2490017573 Events 14 14 12 11 0 - - - 0
+TrigSignatureMoniMT INFO -- #2490017573 Features 22 15 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 14 14 12 11 - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #506456080 Events 14 14 12 11 0 - - - 0
+TrigSignatureMoniMT INFO -- #506456080 Features 22 15 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 14 14 12 11 - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #4055280067 Events 14 14 12 11 0 - - - 0
+TrigSignatureMoniMT INFO -- #4055280067 Features 22 15 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 14 14 12 11 - - - 3
-TrigSignatureMoniMT INFO -- #1433975745 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #1433975745 Events 14 14 12 11 3 - - - 3
+TrigSignatureMoniMT INFO -- #1433975745 Features 22 15 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 14 14 12 11 - - - 6
-TrigSignatureMoniMT INFO -- #2222894847 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #2222894847 Events 14 14 12 11 6 - - - 6
+TrigSignatureMoniMT INFO -- #2222894847 Features 22 15 6 - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 14 14 12 11 - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #698603885 Events 14 14 12 11 0 - - - 0
+TrigSignatureMoniMT INFO -- #698603885 Features 22 15 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 14 14 14 13 - - - 13
-TrigSignatureMoniMT INFO -- #112814536 Features 24 17 - - -
+TrigSignatureMoniMT INFO -- #112814536 Events 14 14 14 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #112814536 Features 24 17 17 - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 14 14 14 13 - - - 13
-TrigSignatureMoniMT INFO -- #1129072492 Features 24 17 - - -
+TrigSignatureMoniMT INFO -- #1129072492 Events 14 14 14 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #1129072492 Features 24 17 17 - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 14 14 12 11 - - - 5
-TrigSignatureMoniMT INFO -- #2472860683 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #2472860683 Events 14 14 12 11 5 - - - 5
+TrigSignatureMoniMT INFO -- #2472860683 Features 22 15 5 - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 14 14 12 11 - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #2537544560 Events 14 14 12 11 0 - - - 0
+TrigSignatureMoniMT INFO -- #2537544560 Features 22 15 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 14 14 12 11 - - - 9
-TrigSignatureMoniMT INFO -- #2992830434 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #2992830434 Events 14 14 12 11 9 - - - 9
+TrigSignatureMoniMT INFO -- #2992830434 Features 22 15 10 - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 14 14 12 11 - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 22 15 - - -
+TrigSignatureMoniMT INFO -- #1275052132 Events 14 14 12 11 0 - - - 0
+TrigSignatureMoniMT INFO -- #1275052132 Features 22 15 0 - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
-TrigSignatureMoniMT INFO -- #2456480859 Events 14 14 11 10 - - - 5
-TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 - - -
+TrigSignatureMoniMT INFO -- #2456480859 Events 14 14 11 10 5 - - - 5
+TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 5 - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 10 10 6 - - - - 6
-TrigSignatureMoniMT INFO -- #532175988 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #532175988 Events 10 10 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #532175988 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 10 10 2 - - - - 2
-TrigSignatureMoniMT INFO -- #1890237897 Features 2 - - - -
+TrigSignatureMoniMT INFO -- #1890237897 Events 10 10 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1890237897 Features 2 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 10 10 3 - - - - 3
-TrigSignatureMoniMT INFO -- #2803198799 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #2803198799 Events 10 10 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #2803198799 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 10 10 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1055916731 Features 4 - - - -
+TrigSignatureMoniMT INFO -- #1055916731 Events 10 10 4 - - - - - 4
+TrigSignatureMoniMT INFO -- #1055916731 Features 4 - - - - -
TrigSignatureMoniMT INFO HLT_xe110_mht_L1XE50 #3030733259
-TrigSignatureMoniMT INFO -- #3030733259 Events 10 10 6 - - - - 6
-TrigSignatureMoniMT INFO -- #3030733259 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #3030733259 Events 10 10 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #3030733259 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_xe110_tc_em_L1XE50 #607113828
-TrigSignatureMoniMT INFO -- #607113828 Events 10 10 5 - - - - 5
-TrigSignatureMoniMT INFO -- #607113828 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #607113828 Events 10 10 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #607113828 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_xe110_tcpufit_L1XE50 #892853397
-TrigSignatureMoniMT INFO -- #892853397 Events 10 10 3 - - - - 3
-TrigSignatureMoniMT INFO -- #892853397 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #892853397 Events 10 10 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #892853397 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 19 19 17 - - - - 17
-TrigSignatureMoniMT INFO -- #1649696554 Features 17 - - - -
+TrigSignatureMoniMT INFO -- #1649696554 Events 19 19 17 - - - - - 17
+TrigSignatureMoniMT INFO -- #1649696554 Features 17 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 19 19 15 - - - - 15
-TrigSignatureMoniMT INFO -- #3768353779 Features 15 - - - -
+TrigSignatureMoniMT INFO -- #3768353779 Events 19 19 15 - - - - - 15
+TrigSignatureMoniMT INFO -- #3768353779 Features 15 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 19 - - - - 19
-TrigSignatureMoniMT INFO -- #3626903018 Features 19 - - - -
+TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 19 - - - - - 19
+TrigSignatureMoniMT INFO -- #3626903018 Features 19 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 19 19 14 - - - - 14
-TrigSignatureMoniMT INFO -- #998713382 Features 14 - - - -
+TrigSignatureMoniMT INFO -- #998713382 Events 19 19 14 - - - - - 14
+TrigSignatureMoniMT INFO -- #998713382 Features 14 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 15 - - - - 15
-TrigSignatureMoniMT INFO -- #1583719916 Features 15 - - - -
+TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 15 - - - - - 15
+TrigSignatureMoniMT INFO -- #1583719916 Features 15 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 17 - - - - 17
-TrigSignatureMoniMT INFO -- #2468872349 Features 17 - - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 17 - - - - - 17
+TrigSignatureMoniMT INFO -- #2468872349 Features 17 - - - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 10 10 7 - - - - 7
-TrigSignatureMoniMT INFO -- #531141817 Features 7 - - - -
+TrigSignatureMoniMT INFO -- #531141817 Events 10 10 7 - - - - - 7
+TrigSignatureMoniMT INFO -- #531141817 Features 7 - - - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 10 10 3 - - - - 3
-TrigSignatureMoniMT INFO -- #115518400 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #115518400 Events 10 10 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #115518400 Features 3 - - - - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
index eedfbce25f172727b2c8c6829fc6f36bf992d505..ca8ad18a78a5f543c180332a3ce2579467fc0f98 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
@@ -37,7 +37,7 @@ def generateL1DecoderAndChains():
# event 0: empty
- data['ctp'] [0] = 'HLT_e20_L1EM10 HLT_e5_e8_L1EM3_EM5 HLT_e5_L1EM7 HLT_e8_L1EM7 HLT_g5_EM7'
+ data['ctp'] [0] = 'HLT_e20_L1EM10 HLT_e5_e8_L1EM3_EM5 HLT_e5_L1EM3 HLT_e8_L1EM5 HLT_g5_EM7'
data['l1emroi'][0] = ';'
data['emclusters'][0]= ';'
data['l1muroi'][0] = ';'
@@ -45,22 +45,23 @@ def generateL1DecoderAndChains():
#event 1: 3e (1 not passing at L1, 1 not passing at step1) + 2mu (2 not passing) - HLT_e5_e8_L1EM3_EM5 HLT_2mu6_L12MU6
- data['ctp'] [1] = 'HLT_e20_L1EM10 HLT_e5_L1EM7 HLT_e8_L1EM7 HLT_g5_L1EM7 HLT_e5_v3_L1EM7 HLT_e5_e8_L1EM3_EM5 HLT_mu8_e8_L1MU6_EM7 HLT_2mu6_L12MU6'
- data['l1emroi'][1] = '1,1,0,EM3,EM5,EM7,EM20,EM50,EM100; 2.,-1.2,0,EM3,EM5; 3.,0.2,0,EM3;'
+ data['ctp'] [1] = 'HLT_e20_L1EM10 HLT_e5_L1EM3 HLT_e8_L1EM5 HLT_g5_L1EM7 HLT_e5_v3_L1EM7 HLT_e5_e8_L1EM3_EM5 HLT_mu8_e8_L1MU6_EM7 HLT_2mu6_L12MU6 HLT_mu6_mu10_L12MU6 HLT_2mu4_bDimu_L12MU6'
+ data['l1emroi'][1] = '1,1,0,EM3,EM5,EM7,EM20,EM50,EM100; 2.,-1.2,0,EM3,EM5,EM7; 3.,0.2,0,EM3;'
data['emclusters'][1]= 'eta:1,phi:1,et:180000; eta:1,phi:-1.2,et:6000; eta:0.5,phi:-1.2,et:3000;'
data['l1muroi'][1] = '2,0.5,0,MU6; 3,0.5,0,MU6;'
#data['l1muroi'][1] = '0,0,0,MU0;'
data['msmu'][1] = 'eta:-1.2,phi:0.7,pt:1500,pt2:1500; eta:-1.1,phi:0.6,pt:1500,pt2:1500;'
-
- # event 2: 2e+ 3mu : HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6, HLT_mu6_e8_L1MU6_EM5
- data['ctp'] [2] = 'HLT_mu6_L1MU6 HLT_mu8_L1MU10 HLT_mu10_L1MU10 HLT_mu8_1step_L1MU6 HLT_e20_L1EM10 HLT_e8_L1EM7 HLT_mu6_e8_L1MU6_EM5 HLT_mu6Comb_e8_L1MU6_EM5 HLT_e3_e5_L1EM3_EM5 HLT_2mu6_L12MU6 HLT_2mu6Comb_L12MU6 HLT_2mu4_bDimu_L12MU4 HLT_e5_e8_L1EM3_EM5 HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 HLT_mu6_mu6noL1_L1MU6'
+
+ # event 2: 2e+ 3mu : HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6, HLT_mu6_e10_L1MU6_EM5
+ data['ctp'] [2] = 'HLT_mu6_L1MU6 HLT_mu8_L1MU10 HLT_mu10_L1MU10 HLT_mu8_1step_L1MU6 HLT_e20_L1EM10 HLT_e5_L1EM3 HLT_e8_L1EM5 HLT_mu6_e10_L1MU6_EM5 HLT_mu6Comb_e8_L1MU6_EM5 HLT_e3_e5_L1EM3_EM5 HLT_2mu6_L12MU6 HLT_2mu6Comb_L12MU6 HLT_mu6_mu10_L12MU6 HLT_2mu4_bDimu_L12MU6 HLT_e5_e8_L1EM3_EM5 HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 HLT_mu6_mu6noL1_L1MU6'
data['l1emroi'][2] = '2,0.2,0,EM3,EM5,EM7,EM15,EM20,EM50,EM100; 1,-1.1,0,EM3,EM5,EM7,EM15,EM20,EM50;'
data['emclusters'][2]= 'eta:0.5,phi:0,et:120000; eta:1,phi:-1.2,et:65000;'
data['l1muroi'][2] = '2,0.5,0,MU6,MU8; 3,0.5,0,MU6,MU8,MU10;2.2,0.6,0,MU6;'
data['msmu'][2] = 'eta:-1.2,phi:0.7,pt:6500,pt2:8500; eta:-1.1,phi:0.6,pt:8500,pt2:8500;eta:-1.1,phi:0.6,pt:8500,pt2:8500;'
- #event 3: 1e + 1mu - HLT_mu6_e8_L1MU6_EM5
- data['ctp'] [3] = 'HLT_mu20_L1MU10 HLT_mu10_L1MU10 HLT_mu8_L1MU10 HLT_mu8_1step_L1MU6 HLT_2mu8 HLT_e8_L1EM7 HLT_mu6_e8_L1MU6_EM5 HLT_mu6Comb_e8_L1MU6_EM5'
+ #event 3: 1e + 1mu; HLT_mu6_e10_L1MU6_EM5 does not pass because of e10
+ data['ctp'] [3] = 'HLT_mu20_L1MU10 HLT_mu10_L1MU10 HLT_mu8_L1MU10 HLT_mu8_1step_L1MU6 HLT_2mu8 HLT_e8_L1EM5 HLT_mu6_e10_L1MU6_EM5 HLT_mu6Comb_e8_L1MU6_EM5'
+
data['l1emroi'][3] = '1,1.5,0,EM3,EM5,EM7;'
data['emclusters'][3]= 'eta:-0.6,phi:1.7,et:9000;'
data['l1muroi'][3] = '2,-0.1,0,MU6,MU8,MU10;'
@@ -124,7 +125,7 @@ def generateL1DecoderAndChains():
step_mu32 = ChainStep("Step3_mu32", [mu32] )
step_mu41 = ChainStep("Step4_mu41", [mu41] )
- step_empy= ChainStep("Step_empty")
+ step_empy= ChainStep("Step2_empty")
MuChains = [
@@ -155,11 +156,11 @@ def generateL1DecoderAndChains():
ElChains = [
- makeChain(name='HLT_e5_L1EM7' , L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step_em11", [el11]), ChainStep("Step_em21", [el21]) ] ),
- makeChain(name='HLT_e5_v2_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step_em11", [el11]), ChainStep("Step_em22", [el22]) ] ),
- makeChain(name='HLT_e5_v3_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step_em11", [el11]), ChainStep("Step_em23", [el23]) ] ),
- makeChain(name='HLT_e8_L1EM7' , L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step_em11", [el11]), ChainStep("Step_em21", [el21]), ChainStep("Step_em31", [el31]) ] ),
- makeChain(name='HLT_g5_L1EM7' , L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step_gam11", [gamm11]) ] )
+ makeChain(name='HLT_e5_L1EM3' , L1Thresholds=["EM3"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em21", [el21]) ] ),
+ makeChain(name='HLT_e5_v2_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em22", [el22]) ] ),
+ makeChain(name='HLT_e5_v3_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em23", [el23]) ] ),
+ makeChain(name='HLT_e8_L1EM5' , L1Thresholds=["EM5"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em21", [el21]), ChainStep("Step3_em31", [el31]) ] ),
+ makeChain(name='HLT_g5_L1EM7' , L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step1_gam11", [gamm11]) ] )
]
HLTChains += ElChains
@@ -202,29 +203,46 @@ def generateL1DecoderAndChains():
CombChains =[
# This is an example of a chain running in "serial"
- makeChain(name='HLT_mu6_e8_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[ ChainStep("Step1_mu_em_serial", [mu11, emptySeq1], multiplicity=[1,1]),
- ChainStep("Step2_mu_em_serial", [emptySeq2, el21], multiplicity=[1,1])] ),
-
- makeChain(name='HLT_mu6Comb_e8_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[ ChainStep("Step1_mu2_em", [mu12, el11], multiplicity=[1,1]),
- ChainStep("Step2_mu_em", [mu21, el21], multiplicity=[1,1])] ),
-
- makeChain(name='HLT_e5_e8_L12EM3', L1Thresholds=["EM3","EM3"], ChainSteps=[ ChainStep("Step1_2emAs", [el11, el11], multiplicity=[1,1]),
- ChainStep("Step2_2emAs", [el21, el21], multiplicity=[1,1]) ]),
- makeChain(name='HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6', L1Thresholds=["EM3","EM5","MU6"],
- ChainSteps=[ChainStep("Step1_2em_2mu", [el11,el11,mu11], multiplicity=[1,1,2]),
- ChainStep("Step2_2em_2mu", [el21,el21,mu21], multiplicity=[1,1,2]) ]),
- makeChain(name='HLT_2mu6_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu", [mu11], multiplicity=[2]),
- ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
-
- makeChain(name='HLT_2mu6Comb_L12MU6', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu_empty", multiplicity=[2]),
- ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
+ makeChain(name='HLT_mu6_e10_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
+ ChainStep("Step1_mu_em_serial", [mu11, emptySeq1], multiplicity=[1,1]),
+ ChainStep("Step2_mu_em_serial", [emptySeq2, el21], multiplicity=[1,1])] ),
+
+ makeChain(name='HLT_mu6Comb_e8_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
+ ChainStep("Step1_mu2_em", [mu12, el11], multiplicity=[1,1]),
+ ChainStep("Step2_mu_em", [mu21, el21], multiplicity=[1,1])] ),
+
+ makeChain(name='HLT_e5_e8_L12EM3', L1Thresholds=["EM3","EM3"], ChainSteps=[
+ ChainStep("Step1_2emAs", [el11, el11], multiplicity=[1,1]),
+ ChainStep("Step2_2emAs", [el21, el21], multiplicity=[1,1]) ]),
+
+ makeChain(name='HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6', L1Thresholds=["EM3","EM5","MU6"], ChainSteps=[
+ ChainStep("Step1_2em_2mu", [el11,el11,mu11], multiplicity=[1,1,2]),
+ ChainStep("Step2_2em_2mu", [el21,el21,mu21], multiplicity=[1,1,2]) ]),
+
+ makeChain(name='HLT_2mu6_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
+ ChainStep("Step1_2mu", [mu11], multiplicity=[2]),
+ ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
+
+ makeChain(name='HLT_mu6_mu10_L12MU6', L1Thresholds=["MU6", "MU6"], ChainSteps=[
+ ChainStep("Step1_2muAs", [mu11,mu11], multiplicity=[1,1]),
+ ChainStep("Step2_2muAs", [mu21,mu21], multiplicity=[1,1]) ]),
+
+ makeChain(name='HLT_2mu6Comb_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
+ ChainStep("Step1_2mu_empty", multiplicity=[2]),
+ ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
+
+ makeChain(name='HLT_mu6_e5_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
+ ChainStep("Step1_mu_em", [mu11, el11], multiplicity=[1,1], comboToolConfs=[dimuDrComboHypoTool]),
+ ChainStep("Step2_mu_em", [mu21, el21], multiplicity=[1,1], comboToolConfs=[dimuDrComboHypoTool])] ),
- makeChain(name='HLT_2mu4_bDimu_L12MU4', L1Thresholds=["MU6"], ChainSteps=[ ChainStep("Step1_2mu", [mu11], multiplicity=[2], comboToolConfs=[dimuDrComboHypoTool]),
- ChainStep("Step2_2mu22", [mu22], multiplicity=[2]),
- ChainStep("Step3_2mu", [mu31], multiplicity=[2]) ] ),
+ makeChain(name='HLT_2mu4_bDimu_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
+ ChainStep("Step1_2mu", [mu11], multiplicity=[2], comboToolConfs=[dimuDrComboHypoTool]),
+ ChainStep("Step2_2mu22", [mu22], multiplicity=[2]),
+ ChainStep("Step3_2mu", [mu31], multiplicity=[2]) ] ),
- makeChain(name='HLT_mu6_mu6noL1_L1MU6', L1Thresholds=["MU6", "FSNOSEED"], ChainSteps=[ ChainStep("Step1_2muAs", [mu11, mu11], multiplicity=[1,1]),
- ChainStep("Step2_2muAs", [mu21, mu21], multiplicity=[1,1]) ])
+ makeChain(name='HLT_mu6_mu6noL1_L1MU6', L1Thresholds=["MU6", "FSNOSEED"], ChainSteps=[
+ ChainStep("Step1_2muAs", [mu11, mu11], multiplicity=[1,1]),
+ ChainStep("Step2_2muAs", [mu21, mu21], multiplicity=[1,1]) ])
]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
index 809894e0887d229d30931f39d4856d1f203fa124..db56788c55ff5106baf0bb701dd4b9c0e479ed1d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
@@ -1,115 +1,115 @@
TriggerSummaryStep1 1 0 DEBUG In summary 4 chains passed:
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_L1EM3 ID#744746179
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_v3_L1EM7 ID#1502850332
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_L1EM7 ID#3386155124
TriggerSummaryStep1 1 0 DEBUG +++ HLT_g5_L1EM7 ID#3537091008
TriggerSummaryStep2 1 0 DEBUG In summary 3 chains passed:
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_L1EM3 ID#744746179
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_v3_L1EM7 ID#1502850332
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_L1EM7 ID#3386155124
TriggerSummaryStep3 1 0 DEBUG In summary 1 chains passed:
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
-TriggerSummaryStep1 2 0 DEBUG In summary 18 chains passed:
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
+TriggerSummaryStep1 2 0 DEBUG In summary 20 chains passed:
+TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_mu6_mu10_L12MU6 ID#308277064
TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#345317877
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6_e10_L1MU6_EM5 ID#463671945
+TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_mu6_e10_L1MU6_EM5 ID#474197064
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_L1EM3 ID#744746179
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_mu6Comb_e8_L1MU6_EM5 ID#1248852240
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_mu6_e8_L1MU6_EM5 ID#1567806656
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2mu4_bDimu_L12MU4 ID#1730084172
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2mu6_L12MU6 ID#1747073535
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6_e8_L1MU6_EM5 ID#2038386564
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2mu6Comb_L12MU6 ID#2046267508
TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu8_L1MU10 ID#2258266078
TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6Comb_e8_L1MU6_EM5 ID#2371747463
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#2467396139
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_mu6_e8_L1MU6_EM5 ID#2542671571
TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#2627130263
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_mu6_mu6noL1_L1MU6 ID#2893452617
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
TriggerSummaryStep1 2 0 DEBUG +++ HLT_mu8_1step_L1MU6 ID#3380352717
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_mu6Comb_e8_L1MU6_EM5 ID#3495876895
+TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_mu6_e10_L1MU6_EM5 ID#3616111893
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_2mu4_bDimu_L12MU6 ID#3793062581
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#4130483534
-TriggerSummaryStep2 2 0 DEBUG In summary 15 chains passed:
+TriggerSummaryStep2 2 0 DEBUG In summary 16 chains passed:
TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#345317877
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_mu6_e10_L1MU6_EM5 ID#463671945
+TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_mu6_e10_L1MU6_EM5 ID#474197064
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_L1EM3 ID#744746179
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_mu6Comb_e8_L1MU6_EM5 ID#1248852240
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_mu6_e8_L1MU6_EM5 ID#1567806656
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2mu4_bDimu_L12MU4 ID#1730084172
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep2 2 0 DEBUG +++ HLT_2mu6_L12MU6 ID#1747073535
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_mu6_e8_L1MU6_EM5 ID#2038386564
TriggerSummaryStep2 2 0 DEBUG +++ HLT_2mu6Comb_L12MU6 ID#2046267508
TriggerSummaryStep2 2 0 DEBUG +++ HLT_mu6Comb_e8_L1MU6_EM5 ID#2371747463
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#2467396139
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_mu6_e8_L1MU6_EM5 ID#2542671571
TriggerSummaryStep2 2 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#2627130263
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_mu6Comb_e8_L1MU6_EM5 ID#3495876895
+TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_mu6_e10_L1MU6_EM5 ID#3616111893
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_2mu4_bDimu_L12MU6 ID#3793062581
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 ID#4130483534
TriggerSummaryStep3 2 0 DEBUG In summary 3 chains passed:
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_2mu4_bDimu_L12MU4 ID#1730084172
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep3 2 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_2mu4_bDimu_L12MU6 ID#3793062581
TriggerSummaryStep4 2 0 DEBUG In summary 1 chains passed:
TriggerSummaryStep4 2 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep1 3 0 DEBUG In summary 11 chains passed:
TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu10_L1MU10 ID#209090273
TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu20_L1MU10 ID#361599135
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu6_e10_L1MU6_EM5 ID#463671945
+TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_mu6_e10_L1MU6_EM5 ID#474197064
TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_mu6Comb_e8_L1MU6_EM5 ID#1248852240
-TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_mu6_e8_L1MU6_EM5 ID#1567806656
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu6_e8_L1MU6_EM5 ID#2038386564
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu8_L1MU10 ID#2258266078
TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu6Comb_e8_L1MU6_EM5 ID#2371747463
-TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_mu6_e8_L1MU6_EM5 ID#2542671571
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
TriggerSummaryStep1 3 0 DEBUG +++ HLT_mu8_1step_L1MU6 ID#3380352717
TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_mu6Comb_e8_L1MU6_EM5 ID#3495876895
-TriggerSummaryStep2 3 0 DEBUG In summary 10 chains passed:
+TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_mu6_e10_L1MU6_EM5 ID#3616111893
+TriggerSummaryStep2 3 0 DEBUG In summary 7 chains passed:
TriggerSummaryStep2 3 0 DEBUG +++ HLT_mu10_L1MU10 ID#209090273
TriggerSummaryStep2 3 0 DEBUG +++ HLT_mu20_L1MU10 ID#361599135
TriggerSummaryStep2 3 0 DEBUG +++ leg000_HLT_mu6Comb_e8_L1MU6_EM5 ID#1248852240
-TriggerSummaryStep2 3 0 DEBUG +++ leg001_HLT_mu6_e8_L1MU6_EM5 ID#1567806656
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_mu6_e8_L1MU6_EM5 ID#2038386564
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep2 3 0 DEBUG +++ HLT_mu8_L1MU10 ID#2258266078
TriggerSummaryStep2 3 0 DEBUG +++ HLT_mu6Comb_e8_L1MU6_EM5 ID#2371747463
-TriggerSummaryStep2 3 0 DEBUG +++ leg000_HLT_mu6_e8_L1MU6_EM5 ID#2542671571
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
TriggerSummaryStep2 3 0 DEBUG +++ leg001_HLT_mu6Comb_e8_L1MU6_EM5 ID#3495876895
TriggerSummaryStep3 3 0 DEBUG In summary 4 chains passed:
TriggerSummaryStep3 3 0 DEBUG +++ HLT_mu10_L1MU10 ID#209090273
TriggerSummaryStep3 3 0 DEBUG +++ HLT_mu20_L1MU10 ID#361599135
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_e8_L1EM5 ID#1310390142
TriggerSummaryStep3 3 0 DEBUG +++ HLT_mu8_L1MU10 ID#2258266078
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_e8_L1EM7 ID#2914644523
TriggerSummaryStep4 3 0 DEBUG In summary 1 chains passed:
TriggerSummaryStep4 3 0 DEBUG +++ HLT_mu8_L1MU10 ID#2258266078
-TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 #1730084172
-TrigSignatureMoniMT INFO -- #1730084172 Events 1 1 1 1 1 - 1
-TrigSignatureMoniMT INFO -- #1730084172 Features 5 4 4 -
+TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU6 #3793062581
+TrigSignatureMoniMT INFO -- #3793062581 Events 2 2 1 1 1 - 1
+TrigSignatureMoniMT INFO -- #3793062581 Features 5 4 4 -
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
TrigSignatureMoniMT INFO -- #2046267508 Events 1 1 0 1 - - 1
TrigSignatureMoniMT INFO -- #2046267508 Features 0 6 - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
TrigSignatureMoniMT INFO -- #1747073535 Events 2 2 1 1 - - 1
TrigSignatureMoniMT INFO -- #1747073535 Features 6 6 - -
-TrigSignatureMoniMT INFO HLT_e5_L1EM7 #3386155124
-TrigSignatureMoniMT INFO -- #3386155124 Events 2 2 - - - - 1
-TrigSignatureMoniMT INFO -- #3386155124 Features - - - -
+TrigSignatureMoniMT INFO HLT_e5_L1EM3 #744746179
+TrigSignatureMoniMT INFO -- #744746179 Events 3 3 2 2 - - 2
+TrigSignatureMoniMT INFO -- #744746179 Features 4 4 - -
TrigSignatureMoniMT INFO HLT_e5_e8_2mu6_L1EM3_EM5_L12MU6 #4130483534
-TrigSignatureMoniMT INFO -- #4130483534 Events 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #4130483534 Features - - - -
+TrigSignatureMoniMT INFO -- #4130483534 Events 1 1 1 1 - - 1
+TrigSignatureMoniMT INFO -- #4130483534 Features 2 2 - -
TrigSignatureMoniMT INFO HLT_e5_e8_L12EM3 #1990716439
-TrigSignatureMoniMT INFO -- #1990716439 Events 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1990716439 Features - - - -
+TrigSignatureMoniMT INFO -- #1990716439 Events 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1990716439 Features 0 0 - -
TrigSignatureMoniMT INFO HLT_e5_v2_L1EM7 #1479704746
-TrigSignatureMoniMT INFO -- #1479704746 Events 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1479704746 Features - - - -
+TrigSignatureMoniMT INFO -- #1479704746 Events 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1479704746 Features 0 0 - -
TrigSignatureMoniMT INFO HLT_e5_v3_L1EM7 #1502850332
-TrigSignatureMoniMT INFO -- #1502850332 Events 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #1502850332 Features - - - -
-TrigSignatureMoniMT INFO HLT_e8_L1EM7 #2914644523
-TrigSignatureMoniMT INFO -- #2914644523 Events 4 4 - - - - 3
-TrigSignatureMoniMT INFO -- #2914644523 Features - - - -
+TrigSignatureMoniMT INFO -- #1502850332 Events 1 1 1 1 - - 1
+TrigSignatureMoniMT INFO -- #1502850332 Features 2 2 - -
+TrigSignatureMoniMT INFO HLT_e8_L1EM5 #1310390142
+TrigSignatureMoniMT INFO -- #1310390142 Events 4 4 3 3 3 - 3
+TrigSignatureMoniMT INFO -- #1310390142 Features 4 4 4 -
TrigSignatureMoniMT INFO HLT_g5_L1EM7 #3537091008
-TrigSignatureMoniMT INFO -- #3537091008 Events 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #3537091008 Features - - - -
+TrigSignatureMoniMT INFO -- #3537091008 Events 1 1 1 - - - 1
+TrigSignatureMoniMT INFO -- #3537091008 Features 2 - - -
TrigSignatureMoniMT INFO HLT_mu10_L1MU10 #209090273
TrigSignatureMoniMT INFO -- #209090273 Events 2 2 1 1 1 - 1
TrigSignatureMoniMT INFO -- #209090273 Features 1 1 1 -
@@ -117,17 +117,23 @@ TrigSignatureMoniMT INFO HLT_mu20_L1MU10 #361599
TrigSignatureMoniMT INFO -- #361599135 Events 1 1 1 1 1 - 1
TrigSignatureMoniMT INFO -- #361599135 Features 1 1 1 -
TrigSignatureMoniMT INFO HLT_mu6Comb_e8_L1MU6_EM5 #2371747463
-TrigSignatureMoniMT INFO -- #2371747463 Events 2 2 - - - - 2
-TrigSignatureMoniMT INFO -- #2371747463 Features - - - -
+TrigSignatureMoniMT INFO -- #2371747463 Events 2 2 2 2 - - 2
+TrigSignatureMoniMT INFO -- #2371747463 Features 4 4 - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 1 1 1 - 1 1 1
-TrigSignatureMoniMT INFO -- #2560542253 Features 3 - 3 3
-TrigSignatureMoniMT INFO HLT_mu6_e8_L1MU6_EM5 #2038386564
-TrigSignatureMoniMT INFO -- #2038386564 Events 2 2 - - - - 2
-TrigSignatureMoniMT INFO -- #2038386564 Features - - - -
+TrigSignatureMoniMT INFO -- #2560542253 Events 1 1 1 0 1 1 1
+TrigSignatureMoniMT INFO -- #2560542253 Features 3 0 3 3
+TrigSignatureMoniMT INFO HLT_mu6_e10_L1MU6_EM5 #463671945
+TrigSignatureMoniMT INFO -- #463671945 Events 2 2 2 1 - - 1
+TrigSignatureMoniMT INFO -- #463671945 Features 4 3 - -
+TrigSignatureMoniMT INFO HLT_mu6_e5_L1MU6_EM5 #1137020258
+TrigSignatureMoniMT INFO -- #1137020258 Events 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1137020258 Features 0 0 - -
+TrigSignatureMoniMT INFO HLT_mu6_mu10_L12MU6 #1678556515
+TrigSignatureMoniMT INFO -- #1678556515 Events 2 2 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1678556515 Features 0 0 - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 1 1 - - - - 0
-TrigSignatureMoniMT INFO -- #451489897 Features - - - -
+TrigSignatureMoniMT INFO -- #451489897 Events 1 1 0 0 - - 0
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 - -
TrigSignatureMoniMT INFO HLT_mu8_1step_L1MU6 #3380352717
TrigSignatureMoniMT INFO -- #3380352717 Events 2 2 2 - - - 2
TrigSignatureMoniMT INFO -- #3380352717 Features 3 - - -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 893cae5bf5a8aa95d0381d959ddad9c7716ac44a..6827578b85e31822ad17e9f803333dbf4f9af590 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1,585 +1,587 @@
+TrigSignatureMoniMT INFO Sequence stepSPCount (step ) used at step 1 in chain HLT_mb_sptrk_L1RD0_FILLED
+TrigSignatureMoniMT INFO Sequence stepTrkCount (step ) used at step 2 in chain HLT_mb_sptrk_L1RD0_FILLED
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
-TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #2613484113 Features 46 155 86 - -
+TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #2613484113 Features 92 310 172 - - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH #2426612258
-TrigSignatureMoniMT INFO -- #2426612258 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2426612258 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2426612258 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2426612258 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #58053304 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #58053304 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1584776935 Features 4 0 0 0 -
+TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 1 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1584776935 Features 4 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
-TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 1 0 - - - 0
-TrigSignatureMoniMT INFO -- #3304584056 Features 4 0 - - -
+TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 1 0 - - - - 0
+TrigSignatureMoniMT INFO -- #3304584056 Features 4 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
-TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1175391812 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1175391812 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 #3989372080
-TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - -
+TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - 20
+TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - -
TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480
-TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - -
+TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - 20
+TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM24VHI #2512605388
-TrigSignatureMoniMT INFO -- #2512605388 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2512605388 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2512605388 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2512605388 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_nod0_L1EM24VHI #2532156734
-TrigSignatureMoniMT INFO -- #2532156734 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2532156734 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2532156734 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2532156734 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
-TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - 0
-TrigSignatureMoniMT INFO -- #1703681121 Features 1 3 0 - -
+TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - - 0
+TrigSignatureMoniMT INFO -- #1703681121 Features 1 3 0 - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI #3494457106
-TrigSignatureMoniMT INFO -- #3494457106 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3494457106 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #3494457106 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3494457106 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM24VHI #4227411116
-TrigSignatureMoniMT INFO -- #4227411116 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #4227411116 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #4227411116 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #4227411116 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM24VHI #3481091923
-TrigSignatureMoniMT INFO -- #3481091923 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3481091923 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3481091923 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3481091923 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 #2086577378
-TrigSignatureMoniMT INFO -- #2086577378 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2086577378 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2086577378 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2086577378 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - 14
-TrigSignatureMoniMT INFO -- #683953566 Features 48 156 87 - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - - 14
+TrigSignatureMoniMT INFO -- #683953566 Features 48 156 87 - - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #324908483 Features 41 141 47 - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #324908483 Features 41 141 47 - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 0 - 0
-TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 29 0 -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 0 - - 0
+TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 29 0 - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - 0
-TrigSignatureMoniMT INFO -- #176627878 Features 13 49 28 0 -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - - 0
+TrigSignatureMoniMT INFO -- #176627878 Features 13 49 28 0 - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - 0
-TrigSignatureMoniMT INFO -- #2758326765 Features 13 49 28 0 -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - - 0
+TrigSignatureMoniMT INFO -- #2758326765 Features 13 49 28 0 - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI #713054523
-TrigSignatureMoniMT INFO -- #713054523 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #713054523 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #713054523 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #713054523 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_nod0_L1EM24VHI #756001976
-TrigSignatureMoniMT INFO -- #756001976 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #756001976 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #756001976 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #756001976 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - 11
-TrigSignatureMoniMT INFO -- #1959043579 Features 26 90 20 - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - - 11
+TrigSignatureMoniMT INFO -- #1959043579 Features 26 90 20 - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI #3534544568
-TrigSignatureMoniMT INFO -- #3534544568 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3534544568 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #3534544568 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3534544568 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - 3
-TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 -
+TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - - 3
+TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 - -
TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 - -
+TrigSignatureMoniMT INFO -- #471243435 Events 20 20 13 13 13 - - - 13
+TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - 13
-TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 -
+TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - - 13
+TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 - -
TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - 2
-TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 -
+TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - - 2
+TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 - -
TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - 2
-TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 -
+TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - - 2
+TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 - -
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - 1
-TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 -
+TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - - 1
+TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
-TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 8 - - - - 8
-TrigSignatureMoniMT INFO -- #1341875780 Features 174 - - - -
+TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 8 - - - - - 8
+TrigSignatureMoniMT INFO -- #1341875780 Features 174 - - - - -
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #4034799151 Features 34 - - - -
+TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #4034799151 Features 34 - - - - -
TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3992507557 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1211559599 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3706723666 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1837565816 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #4179085188 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #1364976160 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #1364976160 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #3295122398 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #3295122398 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #868405538 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #868405538 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #1335156103 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #1335156103 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #3658890913 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #3658890913 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #2857031468 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #2857031468 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #2938374624 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #2938374624 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1593009344 Features 4 - - - -
+TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 4 - - - - - 4
+TrigSignatureMoniMT INFO -- #1593009344 Features 4 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #3341539267 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #3341539267 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 20 20 5 5 5 - - 5
-TrigSignatureMoniMT INFO -- #991419339 Features 5 5 5 - -
+TrigSignatureMoniMT INFO -- #991419339 Events 20 20 5 5 5 - - - 5
+TrigSignatureMoniMT INFO -- #991419339 Features 5 5 5 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 20 20 5 5 5 - - 5
-TrigSignatureMoniMT INFO -- #1961149049 Features 5 5 5 - -
+TrigSignatureMoniMT INFO -- #1961149049 Events 20 20 5 5 5 - - - 5
+TrigSignatureMoniMT INFO -- #1961149049 Features 5 5 5 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #761060030 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #761060030 Events 20 20 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #761060030 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #1509925407 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #1509925407 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #4012311417 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #4012311417 Features 5 - - - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #2042444294 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #2042444294 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1542468090 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #1542468090 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #582699527 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #582699527 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #510475538 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #510475538 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #510475538 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #877042532 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #877042532 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #877042532 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #1538535401 Features 2 - - - -
+TrigSignatureMoniMT INFO -- #1538535401 Events 20 20 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1538535401 Features 2 - - - - -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
-TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 - - - - - 19
-TrigSignatureMoniMT INFO -- #4097312640 Features - - - - -
+TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 19 - - - - 19
+TrigSignatureMoniMT INFO -- #4097312640 Features 20 19 - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2083734526 Features 1 1 1 - -
+TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 1 1 1 - - - 1
+TrigSignatureMoniMT INFO -- #2083734526 Features 1 1 1 - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #677658909 Features 1 1 0 0 -
+TrigSignatureMoniMT INFO -- #677658909 Events 20 20 1 1 0 0 - - 0
+TrigSignatureMoniMT INFO -- #677658909 Features 1 1 0 0 - -
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #3411723090 Features 1 1 0 0 0
+TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 1 1 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3411723090 Features 1 1 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #1963262787 Features 1 1 0 0 0
+TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 1 1 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1963262787 Features 1 1 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #597064890 Features 1 1 0 0 0
+TrigSignatureMoniMT INFO -- #597064890 Events 20 20 1 1 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #597064890 Features 1 1 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #3657158931 Features 1 1 0 0 -
+TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 1 1 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3657158931 Features 1 1 0 0 - -
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #827327262 Features 1 1 0 0 0
+TrigSignatureMoniMT INFO -- #827327262 Events 20 20 1 1 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #827327262 Features 1 1 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 20 20 1 1 - - - 1
-TrigSignatureMoniMT INFO -- #996392590 Features 1 1 - - -
+TrigSignatureMoniMT INFO -- #996392590 Events 20 20 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #996392590 Features 1 1 - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #2560542253 Features 1 1 0 0 -
+TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 1 1 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2560542253 Features 1 1 0 0 - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #934918532 Features 1 1 0 0 -
+TrigSignatureMoniMT INFO -- #934918532 Events 20 20 1 1 0 0 - - 0
+TrigSignatureMoniMT INFO -- #934918532 Features 1 1 0 0 - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #1012713062 Features 1 1 0 0 0
+TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 1 1 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1012713062 Features 1 1 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3895421032 Features 1 0 0 - -
+TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 1 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3895421032 Features 1 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1713982776 Features 2 0 0 0 -
+TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 1 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1713982776 Features 2 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
+TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 1 - - - - 1
-TrigSignatureMoniMT INFO -- #3518031697 Features 1 - - - -
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 #1631468602
-TrigSignatureMoniMT INFO -- #1631468602 Events 20 20 - - - 0 0 0
-TrigSignatureMoniMT INFO -- #1631468602 Features - - - 0 0
+TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #3518031697 Features 1 - - - - -
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 20 20 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 1 0 0 - -
+TrigSignatureMoniMT INFO -- #761101109 Events 20 20 1 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #761101109 Features 1 0 0 - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM10VH #314199913
-TrigSignatureMoniMT INFO -- #314199913 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #314199913 Features - - - - -
+TrigSignatureMoniMT INFO -- #314199913 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #314199913 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM12 #3885916609
-TrigSignatureMoniMT INFO -- #3885916609 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3885916609 Features - - - - -
+TrigSignatureMoniMT INFO -- #3885916609 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15 #480733925
-TrigSignatureMoniMT INFO -- #480733925 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #480733925 Features - - - - -
+TrigSignatureMoniMT INFO -- #480733925 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #480733925 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15VH #2374865899
-TrigSignatureMoniMT INFO -- #2374865899 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2374865899 Features - - - - -
+TrigSignatureMoniMT INFO -- #2374865899 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM20VH #3719542824
-TrigSignatureMoniMT INFO -- #3719542824 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3719542824 Features - - - - -
+TrigSignatureMoniMT INFO -- #3719542824 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM22VHI #1723589313
-TrigSignatureMoniMT INFO -- #1723589313 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1723589313 Features - - - - -
+TrigSignatureMoniMT INFO -- #1723589313 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM3 #4169267792
-TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4169267792 Features - - - - -
+TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM7 #3226970354
-TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3226970354 Features - - - - -
+TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM8VH #4065285611
-TrigSignatureMoniMT INFO -- #4065285611 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4065285611 Features - - - - -
+TrigSignatureMoniMT INFO -- #4065285611 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
-TrigSignatureMoniMT INFO -- #1026959128 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1026959128 Features - - - - -
+TrigSignatureMoniMT INFO -- #1026959128 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J12 #2640820608
-TrigSignatureMoniMT INFO -- #2640820608 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2640820608 Features - - - - -
+TrigSignatureMoniMT INFO -- #2640820608 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2640820608 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J120 #2116228652
-TrigSignatureMoniMT INFO -- #2116228652 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2116228652 Features - - - - -
+TrigSignatureMoniMT INFO -- #2116228652 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2116228652 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J15 #1976430774
-TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1976430774 Features - - - - -
+TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J20 #2241112369
-TrigSignatureMoniMT INFO -- #2241112369 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2241112369 Features - - - - -
+TrigSignatureMoniMT INFO -- #2241112369 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J25 #39428635
-TrigSignatureMoniMT INFO -- #39428635 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #39428635 Features - - - - -
+TrigSignatureMoniMT INFO -- #39428635 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #39428635 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J30 #3523994129
-TrigSignatureMoniMT INFO -- #3523994129 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3523994129 Features - - - - -
+TrigSignatureMoniMT INFO -- #3523994129 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J40 #1497591431
-TrigSignatureMoniMT INFO -- #1497591431 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1497591431 Features - - - - -
+TrigSignatureMoniMT INFO -- #1497591431 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J400 #2494874701
-TrigSignatureMoniMT INFO -- #2494874701 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2494874701 Features - - - - -
+TrigSignatureMoniMT INFO -- #2494874701 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J50 #3346352675
-TrigSignatureMoniMT INFO -- #3346352675 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3346352675 Features - - - - -
+TrigSignatureMoniMT INFO -- #3346352675 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J75 #1651897827
-TrigSignatureMoniMT INFO -- #1651897827 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1651897827 Features - - - - -
+TrigSignatureMoniMT INFO -- #1651897827 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J85 #166231461
-TrigSignatureMoniMT INFO -- #166231461 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #166231461 Features - - - - -
+TrigSignatureMoniMT INFO -- #166231461 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #166231461 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_EMPTY #914660695
-TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #914660695 Features - - - - -
+TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #914660695 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_FILLED #211699639
-TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #211699639 Features - - - - -
+TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #211699639 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12 #4248050338
-TrigSignatureMoniMT INFO -- #4248050338 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4248050338 Features - - - - -
+TrigSignatureMoniMT INFO -- #4248050338 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
-TrigSignatureMoniMT INFO -- #357557968 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #357557968 Features - - - - -
+TrigSignatureMoniMT INFO -- #357557968 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #357557968 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU20 #3602376876
-TrigSignatureMoniMT INFO -- #3602376876 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3602376876 Features - - - - -
+TrigSignatureMoniMT INFO -- #3602376876 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3602376876 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU20IM #1931583332
-TrigSignatureMoniMT INFO -- #1931583332 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1931583332 Features - - - - -
+TrigSignatureMoniMT INFO -- #1931583332 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU30 #1944789678
-TrigSignatureMoniMT INFO -- #1944789678 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1944789678 Features - - - - -
+TrigSignatureMoniMT INFO -- #1944789678 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU40 #1394621652
-TrigSignatureMoniMT INFO -- #1394621652 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1394621652 Features - - - - -
+TrigSignatureMoniMT INFO -- #1394621652 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
-TrigSignatureMoniMT INFO -- #3332424451 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3332424451 Features - - - - -
+TrigSignatureMoniMT INFO -- #3332424451 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU8 #3165115874
-TrigSignatureMoniMT INFO -- #3165115874 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3165115874 Features - - - - -
+TrigSignatureMoniMT INFO -- #3165115874 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3165115874 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE10 #1583053368
-TrigSignatureMoniMT INFO -- #1583053368 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1583053368 Features - - - - -
+TrigSignatureMoniMT INFO -- #1583053368 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE150 #958178429
-TrigSignatureMoniMT INFO -- #958178429 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #958178429 Features - - - - -
+TrigSignatureMoniMT INFO -- #958178429 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #958178429 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE30 #2047368922
-TrigSignatureMoniMT INFO -- #2047368922 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2047368922 Features - - - - -
+TrigSignatureMoniMT INFO -- #2047368922 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE300 #1315853555
-TrigSignatureMoniMT INFO -- #1315853555 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1315853555 Features - - - - -
+TrigSignatureMoniMT INFO -- #1315853555 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE35 #2313039014
-TrigSignatureMoniMT INFO -- #2313039014 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2313039014 Features - - - - -
+TrigSignatureMoniMT INFO -- #2313039014 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE40 #4293469116
-TrigSignatureMoniMT INFO -- #4293469116 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4293469116 Features - - - - -
+TrigSignatureMoniMT INFO -- #4293469116 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE45 #2365048177
-TrigSignatureMoniMT INFO -- #2365048177 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2365048177 Features - - - - -
+TrigSignatureMoniMT INFO -- #2365048177 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE50 #1168752081
-TrigSignatureMoniMT INFO -- #1168752081 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1168752081 Features - - - - -
+TrigSignatureMoniMT INFO -- #1168752081 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE55 #268928384
-TrigSignatureMoniMT INFO -- #268928384 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #268928384 Features - - - - -
+TrigSignatureMoniMT INFO -- #268928384 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #268928384 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE60 #4154240531
-TrigSignatureMoniMT INFO -- #4154240531 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4154240531 Features - - - - -
+TrigSignatureMoniMT INFO -- #4154240531 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE65 #4229937363
-TrigSignatureMoniMT INFO -- #4229937363 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4229937363 Features - - - - -
+TrigSignatureMoniMT INFO -- #4229937363 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #4229937363 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE70 #3765216228
-TrigSignatureMoniMT INFO -- #3765216228 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3765216228 Features - - - - -
+TrigSignatureMoniMT INFO -- #3765216228 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE75 #225440053
-TrigSignatureMoniMT INFO -- #225440053 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #225440053 Features - - - - -
+TrigSignatureMoniMT INFO -- #225440053 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #225440053 Features - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE80 #2742079961
-TrigSignatureMoniMT INFO -- #2742079961 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #2742079961 Features - - - - -
+TrigSignatureMoniMT INFO -- #2742079961 Events 20 20 - - - - - - 20
+TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - -
TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - -
+TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - - 20
+TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 - - - - 4
-TrigSignatureMoniMT INFO -- #372992233 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 4 - - - - 4
+TrigSignatureMoniMT INFO -- #372992233 Features 5 5 - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1376650121 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1376650121 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
-TrigSignatureMoniMT INFO -- #886074432 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #886074432 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #886074432 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
-TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
-TrigSignatureMoniMT INFO -- #1799096347 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 - - -
+TrigSignatureMoniMT INFO -- #1799096347 Events 20 20 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
-TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #554271976 Features 4 - - - -
+TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 3 - - - - 3
+TrigSignatureMoniMT INFO -- #554271976 Features 4 4 - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #988149859 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 3 - - - 3
+TrigSignatureMoniMT INFO -- #988149859 Features 4 3 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #3346942453 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 3 - - - 3
+TrigSignatureMoniMT INFO -- #3346942453 Features 4 3 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #169452969 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 3 - - - 3
+TrigSignatureMoniMT INFO -- #169452969 Features 4 3 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 0 - - - 0
+TrigSignatureMoniMT INFO -- #2490017573 Features 4 3 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 0 - - - 0
+TrigSignatureMoniMT INFO -- #506456080 Features 4 3 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 0 - - - 0
+TrigSignatureMoniMT INFO -- #4055280067 Features 4 3 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 - - - 1
-TrigSignatureMoniMT INFO -- #1433975745 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 1 - - - 1
+TrigSignatureMoniMT INFO -- #1433975745 Features 4 3 1 - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 - - - 1
-TrigSignatureMoniMT INFO -- #2222894847 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 1 - - - 1
+TrigSignatureMoniMT INFO -- #2222894847 Features 4 3 1 - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 0 - - - 0
+TrigSignatureMoniMT INFO -- #698603885 Features 4 3 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #112814536 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 3 - - - 3
+TrigSignatureMoniMT INFO -- #112814536 Features 4 3 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #1129072492 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 3 - - - 3
+TrigSignatureMoniMT INFO -- #1129072492 Features 4 3 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 - - - 1
-TrigSignatureMoniMT INFO -- #2472860683 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 1 - - - 1
+TrigSignatureMoniMT INFO -- #2472860683 Features 4 3 1 - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 0 - - - 0
+TrigSignatureMoniMT INFO -- #2537544560 Features 4 3 0 - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2992830434 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 3 - - - 3
+TrigSignatureMoniMT INFO -- #2992830434 Features 4 3 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 0 - - - 0
+TrigSignatureMoniMT INFO -- #1275052132 Features 4 3 0 - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
-TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 - - - 1
-TrigSignatureMoniMT INFO -- #2456480859 Features 4 3 - - -
+TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 1 - - - 1
+TrigSignatureMoniMT INFO -- #2456480859 Features 4 3 1 - - -
TrigSignatureMoniMT INFO HLT_timeburner_L1All #819160059
-TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #532175988 Features 2 - - - -
+TrigSignatureMoniMT INFO -- #532175988 Events 20 20 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #532175988 Features 2 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1890237897 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1890237897 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2803198799 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2803198799 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1055916731 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1055916731 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe110_mht_L1XE50 #3030733259
-TrigSignatureMoniMT INFO -- #3030733259 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #3030733259 Features 2 - - - -
+TrigSignatureMoniMT INFO -- #3030733259 Events 20 20 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #3030733259 Features 2 - - - - -
TrigSignatureMoniMT INFO HLT_xe110_tc_em_L1XE50 #607113828
-TrigSignatureMoniMT INFO -- #607113828 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #607113828 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #607113828 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #607113828 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe110_tcpufit_L1XE50 #892853397
-TrigSignatureMoniMT INFO -- #892853397 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #892853397 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #892853397 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #892853397 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1649696554 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #1649696554 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #3768353779 Features 2 - - - -
+TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #3768353779 Features 2 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 16 - - - - 16
-TrigSignatureMoniMT INFO -- #3626903018 Features 16 - - - -
+TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 16 - - - - - 16
+TrigSignatureMoniMT INFO -- #3626903018 Features 16 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #998713382 Features 3 - - - -
+TrigSignatureMoniMT INFO -- #998713382 Events 20 20 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #998713382 Features 3 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #1583719916 Features 2 - - - -
+TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1583719916 Features 2 - - - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #2468872349 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 6 - - - - - 6
+TrigSignatureMoniMT INFO -- #2468872349 Features 6 - - - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #531141817 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #531141817 Features 0 - - - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #115518400 Features 0 - - - -
+TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #115518400 Features 0 - - - - -
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index efd9578b0ac2862335b61df37bace7d90f98ea1b..adf28d4c4f03c71ea0bbb4c4a83b1e19267b8614 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -42,7 +42,7 @@ def collectHypos( steps ):
# will replace by function once dependencies are sorted
if hasProp( alg, 'HypoInputDecisions'):
__log.info( "found hypo " + alg.getName() + " in " +stepSeq.getName() )
- if __isCombo( alg ):
+ if __isCombo( alg ) and len(alg.ComboHypoTools):
__log.info( " with %d comboHypoTools: %s", len(alg.ComboHypoTools), ' '.join(map(str, [tool.getName() for tool in alg.ComboHypoTools])))
hypos[stepSeq.getName()].append( alg )
else:
@@ -175,8 +175,11 @@ def triggerSummaryCfg(flags, hypos):
decisionSummaryAlg = DecisionSummaryMakerAlg()
allChains = OrderedDict()
+
for stepName, stepHypos in sorted( hypos.items() ):
- for hypo in stepHypos:
+ # order hypos so that ComboHypos are last ones
+ orderedStepHypos = sorted(stepHypos, key=lambda hypo: __isCombo(hypo))
+ for hypo in orderedStepHypos:
hypoChains,hypoOutputKey = __decisionsFromHypo( hypo )
allChains.update( OrderedDict.fromkeys( hypoChains, hypoOutputKey ) )
@@ -193,6 +196,7 @@ def triggerSummaryCfg(flags, hypos):
allChains[chainName] = mapThresholdToL1DecisionCollection( chainDict['chainParts'][0]['L1threshold'] )
__log.debug("The chain %s final decisions will be taken from %s", chainName, allChains[chainName] )
+
for c, cont in six.iteritems (allChains):
__log.debug("Final decision of chain " + c + " will be read from " + cont )
decisionSummaryAlg.FinalDecisionKeys = list(OrderedDict.fromkeys(allChains.values()))
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index b5f22bfccb79d0712b9a1bce9d25e9e5425f50b7..4c461e4057486914e3c903959beccb4ad5fbba3a 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -431,6 +431,8 @@ if opt.doL1Sim:
topSequence += Lvl1SimulationSequence()
+
+
# ---------------------------------------------------------------
# HLT prep: RoIBResult and L1Decoder
# ---------------------------------------------------------------
@@ -536,7 +538,6 @@ if svcMgr.MessageSvc.OutputLevel<INFO:
# Use parts of NewJO
#-------------------------------------------------------------
from AthenaCommon.Configurable import Configurable
-from TriggerJobOpts.TriggerConfig import triggerIDCCacheCreatorsCfg
from AthenaConfiguration.AllConfigFlags import ConfigFlags
# Output flags
@@ -558,6 +559,7 @@ ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
ConfigFlags.Input.isMC = False
# ID Cache Creators
ConfigFlags.lock()
+from TriggerJobOpts.TriggerConfig import triggerIDCCacheCreatorsCfg
CAtoGlobalWrapper(triggerIDCCacheCreatorsCfg,ConfigFlags)
@@ -587,7 +589,7 @@ if opt.doWriteBS or opt.doWriteRDOTrigger:
log.warning("Failed to find L1Decoder or DecisionSummaryMakerAlg, cannot determine Decision names for output configuration")
decObj = []
decObjHypoOut = []
- CAtoGlobalWrapper( triggerOutputCfg, ConfigFlags, destinationSeq=AlgSequence("AthMasterSeq"), decObj=decObj, decObjHypoOut=decObjHypoOut, summaryAlg=summaryMakerAlg)
+ CAtoGlobalWrapper( triggerOutputCfg, ConfigFlags, decObj=decObj, decObjHypoOut=decObjHypoOut, summaryAlg=summaryMakerAlg)
#-------------------------------------------------------------
# Non-ComponentAccumulator Cost Monitoring
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 7cf22d9c06a1c04ca2dbe6f81740e53ed733faad..a8470c7dddc4a9bd6a4d256de289d036d484688f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -6,8 +6,6 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragmentsPool
-
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import fastElectronMenuSequence
@@ -102,31 +100,22 @@ class ElectronChainConfiguration(ChainConfigurationBase):
def getFastCalo(self, doRinger=True):
if doRinger:
- stepName = "Step1_FastCaloRinger_electron"
+ stepName = "FastCaloRinger_electron"
fastCaloCfg = electronFastCaloRingerCfg
else:
- stepName = "Step1_FastCalo_electron"
+ stepName = "FastCalo_electron"
fastCaloCfg = electronFastCaloCfg
- log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve(fastCaloCfg , None )
- return ChainStep(stepName, [fastCalo], [self.mult], [self.dict])
+ return self.getStep(1,stepName,[ fastCaloCfg])
def getFastElectron(self):
- stepName = "Step2_fast_electron"
- log.debug("Configuring step " + stepName)
- electronReco = RecoFragmentsPool.retrieve( fastElectronSequenceCfg, None )
- return ChainStep(stepName, [electronReco], [self.mult], [self.dict])
-
+ stepName = "fast_electron"
+ return self.getStep(2,stepName,[ fastElectronSequenceCfg])
def getPrecisionCaloElectron(self):
- stepName = "Step3_precisionCalo_electron"
- log.debug("Configuring step " + stepName)
- precisionReco = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
- return ChainStep(stepName, [precisionReco], [self.mult], [self.dict])
-
+ stepName = "precisionCalo_electron"
+ return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
def getPrecisionElectron(self):
- stepName = "Step4_precision_electron"
- log.debug("Configuring step " + stepName)
- precisionElectron = RecoFragmentsPool.retrieve( precisionElectronSequenceCfg, None )
- return ChainStep(stepName, [precisionElectron], [self.mult], [self.dict])
+ stepName = "precision_electron"
+ return self.getStep(4,stepName,[ precisionElectronSequenceCfg])
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
index 3cd14d89d7f68835746a45db937dccec4fc176b8..bc972642ac7d9d4657cce72844da677e79bb7028 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
@@ -20,11 +20,10 @@ def generateChainConfigs( chainDict ):
listOfChainDefs = []
for subChainDict in listOfChainDicts:
-
+ log.debug('Assembling subChainsDict %s for chain %s', len(listOfChainDefs), subChainDict['chainName'] )
Electron = ElectronChainConfiguration(subChainDict).assembleChain()
listOfChainDefs += [Electron]
- log.debug('length of chaindefs %s', len(listOfChainDefs) )
if len(listOfChainDefs)>1:
@@ -32,7 +31,6 @@ def generateChainConfigs( chainDict ):
else:
theChainDef = listOfChainDefs[0]
- log.debug("theChainDef %s" , theChainDef)
return theChainDef
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py
index fb6f4d5766e3c37200f2dfb18f48a976a5796274..2670cea6e5f43ec3c778a76a1e95d8f043f6453d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py
@@ -2,6 +2,7 @@
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonDef import PhotonChainConfiguration as PhotonChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
from AthenaCommon.Logging import logging
@@ -19,21 +20,17 @@ def generateChainConfigs( chainDict ):
listOfChainDefs = []
for subChainDict in listOfChainDicts:
-
+ log.debug('Assembling subChainsDict %s for chain %s', len(listOfChainDefs), subChainDict['chainName'] )
Photon = PhotonChainConfiguration(subChainDict).assembleChain()
listOfChainDefs += [Photon]
- log.debug('length of chaindefs %s', len(listOfChainDefs) )
if len(listOfChainDefs)>1:
- log.warning("Implement case for multi-electron chain!!")
- theChainDef = listOfChainDefs[0] #needs to be implemented properly
+ theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
else:
theChainDef = listOfChainDefs[0]
- log.debug("theChainDef %s" , theChainDef)
-
return theChainDef
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
index 328521d27d670e5141073babc0c9250932acb7a0..f488412f3169a0043dd34cf77e24d5ba900e8ea8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
@@ -8,7 +8,6 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.PhotonDef")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragmentsPool
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonSequenceSetup import fastPhotonMenuSequence, precisionPhotonMenuSequence
@@ -84,31 +83,20 @@ class PhotonChainConfiguration(ChainConfigurationBase):
# Configuration of steps
# --------------------
def getFastCalo(self):
- stepName = "Step1_PhotonFastCalo"
- log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve( fastPhotonCaloSequenceCfg, None ) # the None will be used for flags in future
- return ChainStep(stepName, [fastCalo], [self.mult])
+ stepName = "PhotonFastCalo"
+ return self.getStep(1,stepName,[ fastPhotonCaloSequenceCfg])
def getFastPhoton(self):
- stepName = "Step2_L2Photon"
- log.debug("Configuring step " + stepName)
- photonReco = RecoFragmentsPool.retrieve( fastPhotonSequenceCfg, None )
- return ChainStep(stepName, [photonReco], [self.mult])
+ stepName = "L2Photon"
+ return self.getStep(2,stepName,[ fastPhotonSequenceCfg])
def getPrecisionCaloPhoton(self):
- stepName = "Step3_PhotonPrecisionCalo"
- log.debug("Configuring step " + stepName)
- precisionCaloPhoton = RecoFragmentsPool.retrieve( precisionPhotonCaloSequenceCfg, None )
- return ChainStep(stepName, [precisionCaloPhoton], [self.mult])
-
+ stepName = "PhotonPrecisionCalo"
+ return self.getStep(3,stepName,[ precisionPhotonCaloSequenceCfg])
def getPrecisionPhoton(self):
- stepName = "Step4_PhotonPrecision"
- log.debug("Configuring step " + stepName)
- precisionPhoton = RecoFragmentsPool.retrieve( precisionPhotonSequenceCfg, None )
- return ChainStep(stepName, [precisionPhoton], [self.mult])
-
-
+ stepName = "PhotonPrecision"
+ return self.getStep(4,stepName,[ precisionPhotonSequenceCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
index d9b38c02be58c63bfd59e6e8edc02131d08b221f..6bc773918f92afe1319658c38cacf73c53c3104e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -12,8 +12,7 @@ def mergeChainDefs(listOfChainDefs, chainDict):
strategy = chainDict["mergingStrategy"]
offset = chainDict["mergingOffset"]
- log.info(chainDict['chainName'])
- log.info("Combine by using %s merging", strategy)
+ log.info("%s: Combine by using %s merging", chainDict['chainName'], strategy)
if strategy=="parallel":
return mergeParallel(listOfChainDefs, offset)
@@ -86,26 +85,19 @@ def serial_zip(allSteps, chainName):
# put the step from the current sub-chain into the right place
stepList[chain_index] = step
- log.info('Put step: ' + str(step))
+ log.info('Put step: ' + str(step.name))
# all other steps should contain an empty sequence
for step_index2, emptyStep in enumerate(stepList):
if emptyStep is None:
- seqName = chainName + 'EmptySeq' + str(chain_index) + '_' + str(step_index+1)
+ seqName = str(step.name) + '_leg' + str(chain_index) + '_EmptySeqStep' + str(step_index+1)
emptySeq = EmptyMenuSequence(seqName)
- stepList[step_index2] = ChainStep('Step' + str(step_index+1) + "_" + seqName, Sequences=[emptySeq], chainDicts=step.chainDicts)
-
- # first create a list of chain steps where each step is an empty sequence
- #seqName = chainName + 'EmptySeq' + str(chain_index) + '_'
- #emptySeqList = [EmptyMenuSequence(seqName + str(_x)) for _x in range(n_chains)]
- #stepList = [ChainStep('Step_' + seqName, Sequences=[seq], chainDicts=step.chainDicts) for seq in emptySeqList]
- # now overwrite one of these steps from the step in the current sub-chain
- #stepList[chain_index] = step
+ stepList[step_index2] = ChainStep( seqName, Sequences=[emptySeq], chainDicts=step.chainDicts)
newsteps.append(stepList)
log.debug('After serial_zip')
for s in newsteps:
- log.debug( s )
+ log.debug( ', '.join(map(str, [step.name for step in s]) ) )
return newsteps
def mergeSerial(chainDefList):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index 3d762ba3a0f4f18aee622a65d7fbf50788327c89..51bcd54ef0ea001dc3b8db61e8cfc5e962cbab7b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -125,8 +125,6 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
- #add the L1Upcacking
- # TopHLTRootSeq += L1UnpackingSeq
# connect to L1Decoder
l1decoder = [ d for d in topSequence.getChildren() if d.getType() == "L1Decoder" ]
@@ -153,7 +151,7 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
for step in finalDecisions:
flatDecisions.extend (step)
- summary= makeSummary("TriggerSummaryFinal", flatDecisions)
+ summary= makeSummary("Final", flatDecisions)
hltTop += summary
# TODO - check we are not running things twice. Once here and once in TriggerConfig.py
@@ -210,7 +208,7 @@ def matrixDisplayOld( allCFSeq ):
else:
return s.step.sequences[0].hypo.tools
else:
- return list(s.step.combo.getChains().keys())
+ return list(s.step.combo.getChains())
return []
@@ -241,10 +239,7 @@ def matrixDisplay( allCFSeq ):
def __getHyposOfStep( step ):
if len(step.sequences):
- if len(step.sequences)==1:
- return step.sequences[0].getTools()
- else:
- return list(step.combo.getChains().keys())
+ step.getChainNames()
return []
# fill dictionary to cumulate chains on same sequences, in steps (dict with composite keys)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
index 58d11c34e41071de2e60fd12d592077ccf89b191..4b26e7a96473f90d660f5bee971a6cf489dd24a7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
@@ -6,7 +6,7 @@
from AthenaCommon.AlgSequence import AthSequencer
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import algColor
import itertools
-from AthenaCommon.CFElements import getSequenceChildren, isSequence
+from AthenaCommon.CFElements import getSequenceChildren, isSequence, compName
def create_dot():
from TriggerJobOpts.TriggerFlags import TriggerFlags
@@ -21,19 +21,20 @@ def drawHypoTools(file, all_hypos):
for hp in all_hypos:
for hypotool in hp.tools:
file.write(" %s[fillcolor=yellow,style=filled,shape= Mdiamond]\n"%(hypotool))
- file.write(" %s -> %s [style=dashed, color=grey]\n"%(hp.Alg.getName(), hypotool))
+ file.write(" %s -> %s [style=dashed, color=grey]\n"%(compName(hp.Alg), hypotool))
def stepCF_ControlFlow_to_dot(stepCF):
def _dump (seq, indent):
o = list()
if isSequence(seq):
- for c in getSequenceChildren( seq ):
- o.append( ("%s[color=%s, shape=circle, width=.5, fixedsize=true ,style=filled]\n"%(c.getName(),_seqColor(c)), indent) )
- else:
- o.append( ("%s[fillcolor=%s,style=filled]\n"%(c.getName(),algColor(c)), indent) )
- o.append( ("%s -> %s\n"%(seq.getName(), c.getName()), indent))
- o.extend( _dump (c, indent+1) )
+ for c in getSequenceChildren( seq ):
+ if isSequence(c):
+ o.append( ("%s[color=%s, shape=circle, width=.5, fixedsize=true ,style=filled]\n"%(compName(c),_seqColor(c)), indent) )
+ else:
+ o.append( ("%s[fillcolor=%s,style=filled]\n"%(compName(c),algColor(c)), indent) )
+ o.append( ("%s -> %s\n"%(compName(seq), compName(c)), indent))
+ o.extend( _dump (c, indent+1) )
return o
def _parOR (seq):
@@ -66,14 +67,14 @@ def stepCF_ControlFlow_to_dot(stepCF):
- with open('%s.CF.dot'%stepCF.getName(), mode="wt") as file:
+ with open('%s.CF.dot'%compName(stepCF), mode="wt") as file:
#strict
file.write( 'digraph step { \n'\
+' concentrate=true;\n'\
+' rankdir="LR";\n'
+' node [ shape=polygon, fontname=Helvetica ]\n'\
+' edge [ fontname=Helvetica ]\n'
- +' %s [shape=Mdiamond]\n'%stepCF.getName())
+ +' %s [shape=Mdiamond]\n'%compName(stepCF))
indent=0
# out = [("%s[color=%s shape=circle]\n"%(stepCF.getName(),_seqColor(stepCF)), indent)]
@@ -106,7 +107,7 @@ def all_DataFlow_to_dot(name, step_list):
# reset the last step
last_step_hypoNodes =[]
for cfseq in cfseq_list:
- file.write(" %s[fillcolor=%s style=filled]\n"%(cfseq.filter.Alg.getName(),algColor(cfseq.filter.Alg)))
+ file.write(" %s[fillcolor=%s style=filled]\n"%(compName(cfseq.filter.Alg),algColor(cfseq.filter.Alg)))
step_connections.append(cfseq.filter)
file.write( '\n subgraph cluster_%s {\n'%(cfseq.step.name)\
+' concentrate=true;\n'
@@ -123,17 +124,16 @@ def all_DataFlow_to_dot(name, step_list):
last_step_hypoNodes.append(cfseq.filter)
for menuseq in cfseq.step.sequences:
- cfseq_algs, all_hypos, last_step_hypoNodes = menuseq.buildCFDot(cfseq_algs,
+ cfseq_algs, all_hypos, last_step_hypoNodes = menuseq.buildDFDot(cfseq_algs,
all_hypos,
cfseq.step.isCombo,
last_step_hypoNodes,
file)
- #combo
if cfseq.step.isCombo:
if cfseq.step.combo is not None:
- file.write(" %s[color=%s]\n"%(cfseq.step.combo.Alg.getName(), algColor(cfseq.step.combo.Alg)))
+ file.write(" %s[color=%s]\n"%(compName(cfseq.step.combo.Alg), algColor(cfseq.step.combo.Alg)))
cfseq_algs.append(cfseq.step.combo)
last_step_hypoNodes.append(cfseq.step.combo)
file.write(' }\n')
@@ -160,9 +160,9 @@ def stepCF_DataFlow_to_dot(name, cfseq_list):
all_hypos = []
for cfseq in cfseq_list:
- file.write(" %s[fillcolor=%s style=filled]\n"%(cfseq.filter.Alg.getName(),algColor(cfseq.filter.Alg)))
+ file.write(" %s[fillcolor=%s style=filled]\n"%(compName(cfseq.filter.Alg),algColor(cfseq.filter.Alg)))
for inp in cfseq.filter.getInputList():
- file.write(addConnection(name, cfseq.filter.Alg.getName(), inp))
+ file.write(addConnection(name, compName(cfseq.filter.Alg), inp))
file.write( '\n subgraph cluster_%s {\n'%(cfseq.step.name)\
+' concentrate=true;\n'
@@ -176,15 +176,14 @@ def stepCF_DataFlow_to_dot(name, cfseq_list):
cfseq_algs.append(cfseq.filter)
for menuseq in cfseq.step.sequences:
- cfseq_algs, all_hypos, _ = menuseq.buildCFDot(cfseq_algs,
+ cfseq_algs, all_hypos, _ = menuseq.buildDFDot(cfseq_algs,
all_hypos,
True,
None,
file)
- #combo
if cfseq.step.isCombo:
if cfseq.step.combo is not None:
- file.write(" %s[color=%s]\n"%(cfseq.step.combo.Alg.getName(), algColor(cfseq.step.combo.Alg)))
+ file.write(" %s[color=%s]\n"%(compName(cfseq.step.combo.Alg), algColor(cfseq.step.combo.Alg)))
cfseq_algs.append(cfseq.step.combo)
file.write(' }\n')
@@ -208,7 +207,7 @@ def findConnections(alg_list):
dataIntersection = list(set(outs) & set(ins))
if len(dataIntersection) > 0:
for line in dataIntersection:
- lineconnect+=addConnection(nodeA.Alg.getName(),nodeB.Alg.getName(), line)
+ lineconnect+=addConnection(compName(nodeA.Alg), compName(nodeB.Alg), line)
# print "Data connections between %s and %s: %s"%(nodeA.Alg.getName(), nodeB.Alg.getName(), line)
return lineconnect
@@ -229,7 +228,7 @@ def findDHconnections(nodeA, nodeB):
dataIntersection = list(set(outs) & set(ins))
if len(dataIntersection) > 0:
for line in dataIntersection:
- lineconnect+=addConnection(nodeA.Alg.getName(),nodeB.Alg.getName(), line)
+ lineconnect+=addConnection(compName(nodeA.Alg), compName(nodeB.Alg), line)
#print 'Data DH connections between %s and %s: %s'%(nodeA.Alg.getName(), nodeB.Alg.getName(), line)
return lineconnect
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 25b8d02be82920125f967950647551f8871a8a9b..62bdac3838aa6b70c3fb4f9b1d51128bbdf8ab63 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -34,10 +34,9 @@ def setupMenu():
TriggerFlags.MuonSlice.signatures = TriggerFlags.MuonSlice.signatures() + [
#ART-19985
ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu6_mu6noL1_L1MU6', l1SeedThresholds=['MU6','FSNOSEED'], mergingStrategy='serial', groups=MultiMuonGroup),
- # Test chain for di-muon with full-scan, not yet working due to problem with FS seeding
- #ChainProp(name='HLT_mu6_mu6noL1_L1MU6', l1SeedThresholds=['MU6','FSNOSEED'], mergingStrategy='serial', groups=MultiMuonGroup),
#ATR-20049
ChainProp(name='HLT_mu6fast_L1MU6', groups=SingleMuonGroup),
@@ -46,8 +45,10 @@ def setupMenu():
ChainProp(name='HLT_mu20_ivar_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_ivarmedium_L1MU6', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu6noL1_L1MU6', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup),
+ # commented because it is conflict with dimuon noL1 serial chain
+ # ChainProp(name='HLT_mu6noL1_L1MU6', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup),
+
ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_2mu6_10invm70_L1MU6', groups=SingleMuonGroup),
@@ -72,6 +73,7 @@ def setupMenu():
# ATR-20650
ChainProp(name='HLT_mu0_muoncalib_L1MU4_EMPTY', groups=SingleMuonGroup),
ChainProp(name='HLT_mu0_muoncalib_L1MU20', groups=SingleMuonGroup),
+
]
TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 317a8da8b47e8bcc55ecb62c6530edcde4feed20..d9a556085df372034843fe16640b48c8c6a52e58 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -121,16 +121,14 @@ class AlgNode(Node):
def algColor(alg):
""" Set given color to Alg type"""
+ if isComboHypoAlg(alg):
+ return "darkorange"
if isHypoBase(alg):
return "darkorchid1"
if isInputMakerBase(alg):
return "cyan3"
if isFilterAlg(alg):
return "chartreuse3"
- if isEmptyAlg(alg):
- return "peachpuff3"
- if isComboHypoAlg(alg):
- return "darkorange"
return "cadetblue1"
@@ -271,7 +269,7 @@ class ComboMaker(AlgNode):
def getChains(self):
cval = self.Alg.getProperties()[self.prop]
- return cval
+ return cval.keys()
def createComboHypoTools(self, chainDict, comboToolConfs):
@@ -303,14 +301,9 @@ def isInputMakerBase(alg):
def isFilterAlg(alg):
return isinstance(alg, RoRSeqFilter)
-def isEmptyAlg(alg):
- if alg is None:
- return True
- else:
- return False
-
def isComboHypoAlg(alg):
- return isinstance(alg, ComboHypo)
+ return ('MultiplicitiesMap' in alg.__class__.__dict__)
+
@@ -323,11 +316,12 @@ class EmptyMenuSequence(object):
""" By construction it has no Hypo;"""
def __init__(self, name):
- Maker = CompFactory.InputMakerForRoI("IM"+name)
self._name = name
+ Maker = CompFactory.InputMakerForRoI("IM"+name)
self._maker = InputMakerNode( Alg = Maker )
self._seed=''
- self._sequence = Node( Alg = seqAND(name, [Maker]))
+ self._sequence = Node( Alg = seqAND(name, [Maker]))
+ log.debug("Making EmptySequence %s",name)
@property
def sequence(self):
@@ -356,7 +350,6 @@ class EmptyMenuSequence(object):
log.debug("This sequence is empty. No Hypo to conficure")
def addToSequencer(self, stepReco, seqAndView, already_connected):
- # menu sequence empty do not add to athena sequencer
log.debug("This sequence is empty. Adding Maker node only to athena sequencer")
ath_sequence = self.sequence.Alg
name = ath_sequence.getName()
@@ -368,12 +361,16 @@ class EmptyMenuSequence(object):
stepReco += ath_sequence
return stepReco, seqAndView, already_connected
- def buildCFDot(self, cfseq_algs, all_hypos, isCombo, last_step_hypo_nodes, file):
- file.write(" %s[fillcolor=%s]\n"%("none", algColor(None)))
+ def buildDFDot(self, cfseq_algs, all_hypos, isCombo, last_step_hypo_nodes, file):
+ cfseq_algs.append(self._maker)
+ cfseq_algs.append(self.sequence )
+
+ file.write(" %s[fillcolor=%s]\n"%(self._maker.Alg.getName(), algColor(self._maker.Alg)))
+ file.write(" %s[fillcolor=%s]\n"%(self.sequence.Alg.getName(), algColor(self.sequence.Alg)))
+
return cfseq_algs, all_hypos, last_step_hypo_nodes
def getTools(self):
- # No tools for empty sequences - needs to return empty list?
log.debug("No tools for empty menu sequences")
def setSeed( self, seed ):
@@ -381,7 +378,7 @@ class EmptyMenuSequence(object):
def __repr__(self):
return "MenuSequence::%s \n Hypo::%s \n Maker::%s \n Sequence::%s \n HypoTool::%s\n"\
- %("Empty", "Empty", "Empty", "Empty", None)
+ %(self.name(), "Empty", self._maker.Alg.getName(), self.sequence.Alg.getName(), "None")
@@ -422,7 +419,7 @@ class MenuSequence(object):
self._hypo.addOutput(hypo_output)
self._hypo.setPreviousDecision( input_maker_output)
- log.debug("MenuSequence.connect: connecting InputMaker and HypoAlg and OverlapRemoverAlg, adding: \n\
+ log.debug("MenuSequence.connect: connecting InputMaker and HypoAlg, adding: \n\
InputMaker::%s.output=%s",\
compName(self.maker.Alg), input_maker_output)
@@ -433,13 +430,13 @@ class MenuSequence(object):
[ hypo_output_total.extend( alg_node.Alg.getOutputList() ) for alg_node in self._hypo ]
for hp, hp_in, hp_out in zip( self._hypo, hypo_input_total, hypo_output_total):
- log.debug("HypoAlg::%s.previousDecision=%s, \n\
- HypoAlg::%s.output=%s",\
+ log.debug("HypoAlg::%s.HypoInputDecisions=%s, \n\
+ HypoAlg::%s.HypoOutputDecisions=%s",\
compName(hp.Alg), hp_in, compName(hp.Alg), hp_out)
else:
- log.debug("HypoAlg::%s.previousDecision=%s, \n \
- HypoAlg::%s.output=%s",\
- compName(self.hypo.Alg), input_maker_output, compName(self.hypo.Alg), self.hypo.readOutputList()[0])
+ log.debug("HypoAlg::%s.HypoInputDecisions=%s, \n \
+ HypoAlg::%s.HypoOutputDecisions=%s",\
+ compName(self.hypo.Alg), self.hypo.readInputList()[0], compName(self.hypo.Alg), self.hypo.readOutputList()[0])
@property
@@ -559,7 +556,7 @@ class MenuSequence(object):
return stepReco, seqAndView, already_connected
- def buildCFDot(self, cfseq_algs, all_hypos, isCombo, last_step_hypo_nodes, file):
+ def buildDFDot(self, cfseq_algs, all_hypos, isCombo, last_step_hypo_nodes, file):
cfseq_algs.append(self._maker)
cfseq_algs.append(self.sequence )
@@ -690,8 +687,8 @@ class Chain(object):
# TODO: check if the number of seeds is sufficient for all the seuqences, no action of no steps are configured
for step in self.steps:
for seed, seq in zip(self.L1decisions, step.sequences):
- seq.setSeed( seed )
- log.debug( "setSeedsToSequences: Chain %s adding seed %s to sequence in step %s", self.name, seed, step.name )
+ seq.setSeed( seed )
+ log.debug( "setSeedsToSequences: Chain %s adding seed %s to sequence in step %s", self.name, seed, step.name )
def getChainLegs(self):
""" This is extrapolating the chain legs from the chain dictionary"""
@@ -716,7 +713,7 @@ class Chain(object):
continue
if sum(step.multiplicity) >1 and not step.isCombo:
- log.error("This should be an error, because step mult > 1 (%s), but step is not combo", sum(step.multiplicity))
+ log.error("This should be an error, because step mult > 1 (%d), but step is not combo", sum(step.multiplicity))
if len(step.chainDicts) > 0:
# new way to configure hypo tools, works if the chain dictionaries have been attached to the steps
@@ -733,7 +730,7 @@ class Chain(object):
menu_mult = [ part['chainParts'][0]['multiplicity'] for part in listOfChainDictsLegs ]
if step_mult != menu_mult:
# Probably this shouldn't happen, but it currently does
- log.warning("Got multiplicty %s from chain parts, but have %s legs. This is expected only for jet chains, but it has happened for %s, using the first chain dict", menu_mult, sum(step.multiplicity), self.name)
+ log.warning("Got multiplicty %s from chain parts, but have %s multiplicity in this step. This is expected only for jet chains, but it has happened for %s, using the first chain dict", menu_mult, step.multiplicity, self.name)
firstChainDict = listOfChainDictsLegs[0]
firstChainDict['chainName']= self.name # rename the chaindict to remove the leg name
for seq in step.sequences:
@@ -747,7 +744,7 @@ class Chain(object):
def __repr__(self):
- return "--- Chain %s --- \n + Seeds: %s \n + Steps: \n %s \n"%(\
+ return "-*- Chain %s -*- \n + Seeds: %s \n + Steps: \n %s \n"%(\
self.name, ' '.join(map(str, self.L1decisions)), '\n '.join(map(str, self.steps)))
@@ -787,17 +784,15 @@ class CFSequence(object):
if a ChainStep contains the same sequence multiple times (for multi-object chains),
the filter is connected only once (to avoid multiple DH links)
"""
- #log.info("CFSequence: sequences %s", " ".join([ str(type(s)) for s in self.step.sequences ]))
log.debug("CFSequence: connect Filter %s with %d menuSequences of step %s, using %d connections", compName(self.filter.Alg), len(self.step.sequences), self.step.name, len(connections))
if len(connections) == 0:
log.error("ERROR, no filter outputs are set!")
- #raise("CFSequence: Invalid Filter Configuration")
if len(self.step.sequences):
# check whether the number of filter outputs are the same as the number of sequences in the step
if len(connections) != len(self.step.sequences):
log.error("Found %d connections and %d MenuSequences in Step %s", len(connections), len(self.step.sequences), self.step.name)
- #raise("CFSequence: Invalid Filter Configuration")
+
nseq=0
for seq in self.step.sequences:
filter_out = connections[nseq]
@@ -870,10 +865,18 @@ class ChainStep(object):
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
chainDict = TriggerConfigHLT.getChainDictFromChainName(chainName)
self.combo.createComboHypoTools(chainDict, self.comboToolConfs)
-
+
+ def getChainNames(self):
+ if not self.isCombo:
+ return [seq.getTools() for seq in self.sequences]
+ else:
+ return list(self.combo.getChains())
def __repr__(self):
- return "--- ChainStep %s ---\n + isCombo = %d, multiplicity = %d ChainDict = %s \n + MenuSequences = %s \n + ComboHypoTools = %s"%(self.name, self.isCombo, sum(self.multiplicity), ' '.join(map(str, [dic['chainName'] for dic in self.chainDicts])), ' '.join(map(str, [seq.name for seq in self.sequences]) ), ' '.join(map(str, [tool.__name__ for tool in self.comboToolConfs])))
+ if not self.isCombo:
+ return "--- ChainStep %s ---\n , multiplicity = %d ChainDict = %s \n + MenuSequences = %s "%(self.name, sum(self.multiplicity), ' '.join(map(str, [dic['chainName'] for dic in self.chainDicts])), ' '.join(map(str, [seq.name for seq in self.sequences]) ))
+ else:
+ return "--- ChainStep %s ---\n + isCombo, multiplicity = %d ChainDict = %s \n + MenuSequences = %s \n + ComboHypo = %s, ComboHypoTools = %s"%(self.name, sum(self.multiplicity), ' '.join(map(str, [dic['chainName'] for dic in self.chainDicts])), ' '.join(map(str, [seq.name for seq in self.sequences]) ), self.combo.Alg.name(), ' '.join(map(str, [tool.__name__ for tool in self.comboToolConfs])))
def createComboAlg(dummyFlags, name, multiplicity):
@@ -973,7 +976,7 @@ class InViewReco( ComponentAccumulator ):
def inputMaker( self ):
return self.viewMakerAlg
-#
+
class RecoFragmentsPool(object):
""" Class to host all the reco fragments that need to be reused """
fragments = {}
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py
index 5f3cece4fab3d3f800491502b1163d5740888abc..69b1ae0d476cc75df2db9b06e33fadc5f1f1ae40 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py
@@ -23,19 +23,17 @@ def generateChainConfigs(chainDict):
Muon = MuonChainConfiguration(subChainDict).assembleChain()
listOfChainDefs += [Muon]
-
if len(listOfChainDefs)>1:
- ## if 'noL1' in chainDict['chainName']:
- ## theChainDef = mergeSerial(listOfChainDefs)
- ## else:
- theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
+ theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
else:
theChainDef = listOfChainDefs[0]
return theChainDef
+
+# this is obsolete: can we remove ? FP
def mergeSerial(listOfChainDefs):
chaindef = listOfChainDefs[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index 03bba0544bdfb4116df40ff197bacaa6a13d3400..4a6584c393ab198cd4a51c8549ade4b935785023 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -196,11 +196,11 @@ class MuonChainConfiguration(ChainConfigurationBase):
# --------------------
def getFSmuEFSA(self):
- return self.getStep(4,'FSmuEFSA', [FSmuEFSASequenceCfg])
+ return self.getStep(5,'FSmuEFSA', [FSmuEFSASequenceCfg])
# --------------------
def getFSmuEFCB(self):
- return self.getStep(5,'FSmuEFCB', [FSmuEFCBSequenceCfg])
+ return self.getStep(6,'FSmuEFCB', [FSmuEFCBSequenceCfg])
#---------------------
def getmuEFIso(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py
index f67419b72d1150f113bc462b95eaa6bfbfbf0176..4938c465986834790393d0e2459b9477b227f8e4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py
@@ -5,12 +5,12 @@
###########################################################################
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Muon.generateChainConfigs' )
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Tau.generateChainConfigs' )
logging.getLogger().info("Importing %s",__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
from TriggerMenuMT.HLTMenuConfig.Tau.TauChainConfiguration import TauChainConfiguration as TauChainConfiguration
-
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
def generateChainConfigs(chainDict):
@@ -19,16 +19,14 @@ def generateChainConfigs(chainDict):
listOfChainDefs=[]
for subChainDict in listOfChainDicts:
-
+ log.debug('Assembling subChainsDict %s for chain %s', len(listOfChainDefs), subChainDict['chainName'] )
Tau = TauChainConfiguration(subChainDict).assembleChain()
listOfChainDefs += [Tau]
- log.debug('length of chaindefs %s', len(listOfChainDefs) )
if len(listOfChainDefs)>1:
- log.warning("Implement case for multi-electron chain!!")
- theChainDef = listOfChainDefs[0] #needs to be implemented properly
+ theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
else:
theChainDef = listOfChainDefs[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
index 1c2861a6151a573759bb7dfb9a7370151d1761a2..7a1dac079cdfe656b1d8c762c0e73f15f0362207 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
@@ -9,8 +9,7 @@ from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Tau.TauChainConfiguration")
-from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase, RecoFragmentsPool
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Tau.TauMenuSequences import tauCaloMenuSequence, tauCaloMVAMenuSequence, tauTwoStepTrackSeqCore, tauTwoStepTrackSeqIso, tauIdTrackSeq, tauTrackSeq, tauTrackTwoSeq, tauTrackTwoEFSeq
@@ -61,18 +60,19 @@ class TauChainConfiguration(ChainConfigurationBase):
# define here the names of the steps and obtain the chainStep configuration
# --------------------
stepDictionary = {
- "ptonly":[self.getCaloSeq(), self.getIdTrack()], #This should use calo only sequence
- "track":[self.getCaloSeq(), self.getTrack()], #This should use calo only sequence
- "tracktwo":[self.getCaloSeq(), self.getFastTrack(), self.getTrackTwo()], #This should use calo only sequence
- "tracktwoEF":[self.getCaloSeq(),self.getFastTrack(),self.getTrack2EF()], #This should use calo only sequence
- "tracktwoMVA":[self.getCaloMVASeq(),self.getFastTrack(), self.getTrackIso()], #This should use calo mva sequence
+ "ptonly":['getCaloSeq', 'getIdTrack'], #This should use calo only sequence
+ "track":['getCaloSeq', 'getTrack'], #This should use calo only sequence
+ "tracktwo":['getCaloSeq', 'getFastTrack', 'getTrackTwo'], #This should use calo only sequence
+ "tracktwoEF":['getCaloSeq','getFastTrack','getTrack2EF'], #This should use calo only sequence
+ "tracktwoMVA":['getCaloMVASeq','getFastTrack', 'getTrackIso'], #This should use calo mva sequence
}
# this should be extended by the signature expert to make full use of the dictionary!
key = self.chainPart['preselection']
steps=stepDictionary[key]
for step in steps:
- chainSteps+=[step]
+ chainstep = getattr(self, step)()
+ chainSteps+=[chainstep]
myChain = self.buildChain(chainSteps)
return myChain
@@ -80,56 +80,40 @@ class TauChainConfiguration(ChainConfigurationBase):
# --------------------
def getCaloSeq(self):
- stepName = 'Step1_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauCaloCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'tau'
+ return self.getStep(1,stepName, [getTauCaloCfg])
# --------------------
def getCaloMVASeq(self):
- stepName = 'Step1MVA_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauCaloMVACfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'MVA_tau'
+ return self.getStep(1,stepName, [getTauCaloMVACfg])
# --------------------
def getTrack(self):
- stepName = 'StepTrack_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauTrackCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'Track_tau'
+ return self.getStep(2,stepName, [getTauTrackCfg])
# --------------------
def getTrackTwo(self):
- stepName = 'StepTrackTwo_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauTrackTwoCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'TrackTwo_tau'
+ return self.getStep(3,stepName, [getTauTrackTwoCfg])
# --------------------
def getIdTrack(self):
- stepName = 'StepFTId_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauIdTrackCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'FTId_tau'
+ return self.getStep(2,stepName, [getTauIdTrackCfg])
# --------------------
def getFastTrack(self):
- stepName = 'Step2FT_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauFastTrackCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'FT_tau'
+ return self.getStep(2,stepName, [getTauFastTrackCfg])
# --------------------
def getTrackIso(self):
- stepName = 'Step2FTIso_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauIsoTrackCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'FTIso_tau'
+ return self.getStep(3,stepName, [getTauIsoTrackCfg])
# --------------------
def getTrack2EF(self):
- stepName = 'Step2FTEF_tau'
- log.debug("Configuring step " + stepName)
- tauSeq = RecoFragmentsPool.retrieve( getTauTrackTwoEFCfg, None)
- return ChainStep(stepName, [tauSeq])
+ stepName = 'FTEF_tau'
+ return self.getStep(3, stepName, [getTauTrackTwoEFCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh
index 01027534d8b4046f4b6c29d9ea84df6ee43d0ebf..bce1f232c39ffb24e91e73423ebffe21e662e314 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh
@@ -2,6 +2,6 @@
set -e
-athena --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TriggerMenuMT/generateMT.py;
+athena --config-only=config.pkl -l DEBUG --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TriggerMenuMT/generateMT.py;
verify_menu_config.py -f $PWD || { echo "ERROR: Menu verification failed" ; exit 1; }