diff --git a/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.h b/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.h
index a083d7e17da64f7b639c20a6898c1a66495691bf..eb1d2009dd280f7a25daa9edd8a7510cbc5e64d4 100755
--- a/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.h
+++ b/AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ForDetEnvelopeTool_h
@@ -8,7 +8,7 @@
#include "GeoModelUtilities/GeoModelTool.h"
class ForDetEnvelopeManager;
-class ForDetEnvelopeTool : public GeoModelTool
+class ForDetEnvelopeTool final : public GeoModelTool
{
public:
diff --git a/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h b/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h
index db0b28852b32a6f2263f2bcec1677900e846d038..38c44b229ae63b5e11aaf8fe4a860224280bb9a9 100644
--- a/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h
+++ b/Calorimeter/CaloBadChannelTool/CaloBadChannelTool/CaloBadChanTool.h
@@ -22,17 +22,25 @@ public:
CaloBadChanTool(const std::string& type, const std::string& name,
const IInterface* parent);
- virtual ~CaloBadChanTool();
+ virtual ~CaloBadChanTool() override;
- virtual StatusCode initialize();
-
- virtual CaloBadChannel caloStatus( Identifier id) const;
+ virtual StatusCode initialize() override;
+ using ICaloBadChanTool::caloStatus;
+ virtual CaloBadChannel caloStatus(const EventContext& ctx,
+ Identifier id) const override;
private:
-
- SG::ReadCondHandleKey<LArBadChannelCont> m_larBCKey{this, "LArBadChanKey", "LArBadChannel", "LAr bad channel SG key"};
- ToolHandle<ICaloBadChanTool> m_tileBCT{this, "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+ SG::ReadCondHandleKey<LArBadChannelCont> m_larBCKey{
+ this,
+ "LArBadChanKey",
+ "LArBadChannel",
+ "LAr bad channel SG key"
+ };
+ ToolHandle<ICaloBadChanTool> m_tileBCT{ this,
+ "TileBadChanTool",
+ "TileBadChanTool",
+ "Tile bad channel tool" };
const CaloCell_ID* m_caloID;
};
diff --git a/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx b/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx
index 9db108c108c322f476b2f67a7d5b50327bf7891d..70d49eb9916bdcadcc9d533af8f322e4f3cf4f62 100644
--- a/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx
+++ b/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx
@@ -6,7 +6,7 @@
//#include "GaudiKernel/MsgStream.h"
-CaloBadChanTool::CaloBadChanTool(const std::string& type, const std::string& name,
+CaloBadChanTool::CaloBadChanTool(const std::string& type, const std::string& name,
const IInterface* parent) :
AthAlgTool( type, name, parent),
m_caloID(nullptr)
@@ -26,7 +26,7 @@ StatusCode CaloBadChanTool::initialize()
if (sc.isFailure()) {
ATH_MSG_WARNING ( "Unable to initialize LAr bad channels key: no LAr bad channel info will be provided " );
}
- else
+ else
ATH_MSG_DEBUG ( "LAr bad channels key initialized" );
@@ -34,41 +34,40 @@ StatusCode CaloBadChanTool::initialize()
if (sc.isFailure()) {
ATH_MSG_WARNING ( "Unable to get TileBadChannelTool: no Tile bad channel info will be provided " );
}
- else
+ else
ATH_MSG_DEBUG ( "TileBadChannelTool retrieved" );
ATH_CHECK( detStore()->retrieve(m_caloID, "CaloCell_ID") );
return StatusCode::SUCCESS;
}
-CaloBadChannel CaloBadChanTool::caloStatus(Identifier id) const{
+CaloBadChannel
+CaloBadChanTool::caloStatus(const EventContext& ctx, Identifier id) const
+{
if (m_tileBCT && m_caloID->is_tile(id)) {
- return m_tileBCT->caloStatus(id);
- }
- else if(m_caloID->is_lar(id)) {
- SG::ReadCondHandle<LArBadChannelCont> bch{m_larBCKey};
- const LArBadChannelCont* bcCont{*bch};
- if(bcCont) {
- CaloBadChannel::BitWord res = 0;
- LArBadChannel lbc = bcCont->offlineStatus(id);
-
- if ( lbc.reallyNoisy() || lbc.sporadicBurstNoise()) {
- CaloBadChannel::setBit( CaloBadChannel::noisyBit, res);
- }
- if (lbc.deadReadout() || lbc.deadPhys()) {
- CaloBadChannel::setBit( CaloBadChannel::deadBit, res);
- }
- else if ( ! lbc.good()) {
- CaloBadChannel::setBit( CaloBadChannel::affectedBit, res);
- }
- return CaloBadChannel(res);
- } else {
- CaloBadChannel empty;
- return empty;
- }
- }
- else {
+ return m_tileBCT->caloStatus(ctx,id);
+ } else if (m_caloID->is_lar(id)) {
+ SG::ReadCondHandle<LArBadChannelCont> bch{ m_larBCKey, ctx };
+ const LArBadChannelCont* bcCont{ *bch };
+ if (bcCont) {
+ CaloBadChannel::BitWord res = 0;
+ LArBadChannel lbc = bcCont->offlineStatus(id);
+
+ if (lbc.reallyNoisy() || lbc.sporadicBurstNoise()) {
+ CaloBadChannel::setBit(CaloBadChannel::noisyBit, res);
+ }
+ if (lbc.deadReadout() || lbc.deadPhys()) {
+ CaloBadChannel::setBit(CaloBadChannel::deadBit, res);
+ } else if (!lbc.good()) {
+ CaloBadChannel::setBit(CaloBadChannel::affectedBit, res);
+ }
+ return CaloBadChannel(res);
+ } else {
CaloBadChannel empty;
return empty;
+ }
+ } else {
+ CaloBadChannel empty;
+ return empty;
}
}
diff --git a/Calorimeter/CaloClusterCorrection/src/CaloClusterBadChannelList.cxx b/Calorimeter/CaloClusterCorrection/src/CaloClusterBadChannelList.cxx
index c5bda73dddce237a31028aea9e6a61add20a0d90..920085af0c427587c8d8a40f130ea4c8a163abb4 100755
--- a/Calorimeter/CaloClusterCorrection/src/CaloClusterBadChannelList.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/CaloClusterBadChannelList.cxx
@@ -35,7 +35,7 @@ StatusCode CaloClusterBadChannelList::initialize()
}
-void CaloClusterBadChannelList::makeCorrection (const Context& /*myctx*/,
+void CaloClusterBadChannelList::makeCorrection (const Context& myctx,
CaloCluster* cluster) const
{
xAOD::CaloClusterBadChannelList badChanList;
@@ -44,8 +44,8 @@ void CaloClusterBadChannelList::makeCorrection (const Context& /*myctx*/,
CaloCluster::cell_iterator cellIterEnd = cluster->cell_end();
for( ;cellIter!=cellIterEnd;cellIter++) {
const CaloCell* cell = (*cellIter);
- const Identifier id = cell->ID();
- CaloBadChannel status = m_badChannelTool->caloStatus(id);
+ const Identifier id = cell->ID();
+ CaloBadChannel status = m_badChannelTool->caloStatus(myctx.ctx(),id);
bool isBad = cell->badcell();
if (status.dead() || status.noisy() || isBad ) {
const float eta = cell->eta();
@@ -56,8 +56,9 @@ void CaloClusterBadChannelList::makeCorrection (const Context& /*myctx*/,
if (isBad && !status.dead()) {
CaloBadChannel::setBit(CaloBadChannel::deadBit,myword,true);
}
- ATH_MSG_DEBUG(" bad channel found eta,phi,layer,status " << eta << " " << phi << " " << layer << " " << myword);
- badChanList.emplace_back(eta,phi,layer,myword);
+ ATH_MSG_DEBUG(" bad channel found eta,phi,layer,status "
+ << eta << " " << phi << " " << layer << " " << myword);
+ badChanList.emplace_back(eta, phi, layer, myword);
}
} // end loop over cells
cluster->setBadChannelList(badChanList);
diff --git a/Calorimeter/CaloConditions/CaloConditions/ICaloBadChanTool.h b/Calorimeter/CaloConditions/CaloConditions/ICaloBadChanTool.h
index 4aa9304052aff3b0c4ec4f319c03c80af7496791..11d50456c9cf6f18c069093194a0316273cc76c3 100644
--- a/Calorimeter/CaloConditions/CaloConditions/ICaloBadChanTool.h
+++ b/Calorimeter/CaloConditions/CaloConditions/ICaloBadChanTool.h
@@ -8,13 +8,22 @@
#include "Identifier/Identifier.h"
#include "CaloConditions/CaloBadChannel.h"
#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+
class ICaloBadChanTool : public virtual IAlgTool {
public:
virtual ~ICaloBadChanTool() {}
-
- virtual CaloBadChannel caloStatus( Identifier id) const = 0;
+
+ virtual CaloBadChannel caloStatus(const EventContext& ctx,
+ Identifier id) const = 0;
+
+ virtual CaloBadChannel caloStatus(Identifier id) const
+ {
+ return caloStatus(Gaudi::Hive::currentContext(), id);
+ }
static const InterfaceID& interfaceID() {
static const InterfaceID id("ICaloBadChanTool", 1 , 0);
diff --git a/Calorimeter/CaloG4Sim/CaloG4Sim/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloG4Sim/CaloG4Sim/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..bd029a61c8f975e53c6ba99cdaea0e49646e0942
--- /dev/null
+++ b/Calorimeter/CaloG4Sim/CaloG4Sim/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloG4Sim
diff --git a/Calorimeter/CaloG4Sim/CaloG4Sim/EscapedEnergyRegistry.h b/Calorimeter/CaloG4Sim/CaloG4Sim/EscapedEnergyRegistry.h
index d25bb6f0d59f34e87daa3eab40c94f672a1ab47f..8d82088b898c997dfa990b86d5a6e68de86e326f 100644
--- a/Calorimeter/CaloG4Sim/CaloG4Sim/EscapedEnergyRegistry.h
+++ b/Calorimeter/CaloG4Sim/CaloG4Sim/EscapedEnergyRegistry.h
@@ -1,11 +1,12 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CaloG4_EscapedEnergyRegistry_H
#define CaloG4_EscapedEnergyRegistry_H
#include "CaloG4Sim/VEscapedEnergyProcessing.h"
+#include "CxxUtils/checker_macros.h"
#include "globals.hh"
#include <map>
@@ -75,7 +76,7 @@ namespace CaloG4
// Thread-to-EscapeEnergyRegistry concurrent map type
using EERThreadMap_t = tbb::concurrent_unordered_map< std::thread::id, EscapedEnergyRegistry*, std::hash<std::thread::id> >;
// Concurrent map of EERs, one for each thread
- static EERThreadMap_t m_EERThreadMap;
+ static EERThreadMap_t m_EERThreadMap ATLAS_THREAD_SAFE;
// @brief Search inside m_EERThreadMap the element with the current threadID
// and return it or return a null pointer if the element is not found
static EscapedEnergyRegistry* getEER();
diff --git a/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc b/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc
index c0fd10089dfb6e5fc0b5c96c74626f4fe97caa34..a03b0a2db37c0a9c0a95ace44adfb4704bc79881 100644
--- a/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc
+++ b/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc
@@ -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
*/
// CalibrationDefaultProcessing
@@ -20,6 +20,7 @@
#include "CaloG4Sim/CalibrationDefaultProcessing.h"
#include "CaloG4Sim/SimulationEnergies.h"
+#include "CxxUtils/checker_macros.h"
// For the event-level flag
#include "MCTruth/AtlasG4EventUserInfo.h"
@@ -32,6 +33,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
+#include <atomic>
namespace G4UA
{
@@ -79,7 +81,9 @@ namespace G4UA
// this step. Note that we have to "cast away" const-ness for
// the G4Step*, due to how G4VSensitiveDetector::Hit() is
// defined.
- m_defaultSD->Hit( const_cast<G4Step*>(a_step) );
+ // Should be ok, since Geant doesn't do intra-event parallelism.
+ G4Step* step_nc ATLAS_THREAD_SAFE = const_cast<G4Step*> (a_step);
+ m_defaultSD->Hit( step_nc );
// Update the step info
atlasG4EvtUserInfo->SetLastProcessedBarcode( track->GetTrackID() );
@@ -88,10 +92,8 @@ namespace G4UA
}
else {
- // FIXME - thread unsafe static!!!
- static G4bool warningPrinted = false;
- if ( ! warningPrinted ) {
- warningPrinted = true;
+ static std::atomic_flag warningPrinted ATLAS_THREAD_SAFE = ATOMIC_FLAG_INIT;
+ if ( ! warningPrinted.test_and_set() ) {
G4cout << "CaloG4::CalibrationDefaultProcessing::SteppingAction - "
<< G4endl
<< " A default calibration sensitive detector was not defined."
diff --git a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
index f0e1d87ec017aa9d2d75883a8c1ed3f6378cb587..4a30d038f54906dd592d4f9a8ace786da6361c58 100644
--- a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
@@ -30,12 +30,12 @@ def LArCellMonConfigOld(inputFlags):
from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
CaloNoiseCondAlg()
- LArCellMonConfigCore(helper, LArCellMonAlg,inputFlags,isCosmics, isMC)
+ algo = LArCellMonConfigCore(helper, LArCellMonAlg,inputFlags,isCosmics, isMC)
from AthenaMonitoring.AtlasReadyFilterTool import GetAtlasReadyFilterTool
- helper.monSeq.LArCellMonAlg.ReadyFilterTool = GetAtlasReadyFilterTool()
+ algo.ReadyFilterTool = GetAtlasReadyFilterTool()
from AthenaMonitoring.BadLBFilterTool import GetLArBadLBFilterTool
- helper.monSeq.LArCellMonAlg.BadLBTool = GetLArBadLBFilterTool()
+ algo.BadLBTool = GetLArBadLBFilterTool()
return helper.result()
@@ -46,15 +46,15 @@ def LArCellMonConfig(inputFlags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags,'LArCellMonAlgCfg')
+ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ cfg=ComponentAccumulator()
+
if not inputFlags.DQ.enableLumiAccess:
mlog.warning('This algo needs Lumi access, returning empty config')
- from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
- cfg=ComponentAccumulator()
- cfg.merge(helper.result())
return cfg
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
- cfg = LArGMCfg(inputFlags)
+ cfg.merge(LArGMCfg(inputFlags))
from TileGeoModel.TileGMConfig import TileGMCfg
cfg.merge(TileGMCfg(inputFlags))
@@ -81,18 +81,17 @@ def LArCellMonConfig(inputFlags):
algname=algname+'Cosmics'
isCosmics = ( inputFlags.Beam.Type == 'cosmics' )
- LArCellMonConfigCore(helper, lArCellMonAlg,inputFlags, isCosmics, inputFlags.Input.isMC, algname)
-
- acc=helper.result()
+ algo = LArCellMonConfigCore(helper, lArCellMonAlg,inputFlags, isCosmics, inputFlags.Input.isMC, algname)
+ algo.useTrigger = inputFlags.DQ.useTrigger
from AthenaMonitoring.AtlasReadyFilterConfig import AtlasReadyFilterCfg
- acc.getEventAlgo(algname).ReadyFilterTool = cfg.popToolsAndMerge(AtlasReadyFilterCfg(inputFlags))
+ algo.ReadyFilterTool = cfg.popToolsAndMerge(AtlasReadyFilterCfg(inputFlags))
if not inputFlags.Input.isMC:
from AthenaMonitoring.BadLBFilterToolConfig import LArBadLBFilterToolCfg
- acc.getEventAlgo(algname).BadLBTool=cfg.popToolsAndMerge(LArBadLBFilterToolCfg(inputFlags))
+ algo.BadLBTool=cfg.popToolsAndMerge(LArBadLBFilterToolCfg(inputFlags))
- cfg.merge(acc)
+ cfg.merge(helper.result())
return cfg
@@ -494,6 +493,7 @@ def LArCellMonConfigCore(helper, algclass, inputFlags, isCosmics=False, isMC=Fal
cellMonGroup.defineTree('sporadicCellE,sporadicCellTime,sporadicCellQuality,sporadicCellID,lumiBlock,adoptedEThreshold;SporadicNoisyCellsTree', path=sporadic_hist_path,
treedef='sporadicCellE/F:sporadicCellTime/F:sporadicCellQuality/s:sporadicCellID/l:lumiBlock/i')
+ return LArCellMonAlg
if __name__=='__main__':
diff --git a/Calorimeter/CaloMonitoring/src/LArCellMonAlg.cxx b/Calorimeter/CaloMonitoring/src/LArCellMonAlg.cxx
index 044e8c6295af37856adaf2792ccab9a7a4d7176c..a01294498e3357086dc6af6a11540722106ee595 100644
--- a/Calorimeter/CaloMonitoring/src/LArCellMonAlg.cxx
+++ b/Calorimeter/CaloMonitoring/src/LArCellMonAlg.cxx
@@ -121,7 +121,7 @@ StatusCode LArCellMonAlg::initialize() {
}
//retrieve trigger decision tool and chain groups
- if( m_useTrigger) {
+ if( m_useTrigger && !getTrigDecisionTool().empty() ) {
const ToolHandle<Trig::TrigDecisionTool> trigTool=getTrigDecisionTool();
ATH_MSG_INFO("TrigDecisionTool retrieved");
for (size_t i=0;i<NOTA;++i) {
diff --git a/Control/AthContainers/AthContainers/AuxTypeRegistry.h b/Control/AthContainers/AthContainers/AuxTypeRegistry.h
index 79661353a42e241cc6004f917479bb6f7030e2e8..62a8b883078c14df07eb8a1077d700bb408ca617 100644
--- a/Control/AthContainers/AthContainers/AuxTypeRegistry.h
+++ b/Control/AthContainers/AthContainers/AuxTypeRegistry.h
@@ -1,10 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- 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: AuxTypeRegistry.h 784452 2016-11-15 21:40:41Z ssnyder $
/**
* @file AthContainers/AuxTypeRegistry.h
* @author scott snyder <snyder@bnl.gov>
@@ -23,6 +21,8 @@
#include "AthContainers/tools/AuxTypeVector.h"
#include "AthContainers/tools/AuxTypeVectorFactory.h"
#include "AthContainers/tools/threading.h"
+#include "CxxUtils/ConcurrentStrMap.h"
+#include "CxxUtils/SimpleUpdater.h"
#include "CxxUtils/bitmask.h"
#ifndef XAOD_STANDALONE
#include "AthenaKernel/IInputRename.h"
@@ -289,7 +289,7 @@ public:
* @brief Return the vector factory for a given vector element type.
* @param ti The type of the vector element.
*
- * Returns 0 if the type is not known.
+ * Returns nullptr if the type is not known.
* (Use @c addFactory to add new mappings.)
*/
const IAuxTypeVectorFactory* getFactory (const std::type_info& ti) const;
@@ -393,25 +393,12 @@ private:
* @brief Return the vector factory for a given auxid.
* @param auxid The desired aux data item.
*
- * Returns 0 if the type is not known.
+ * Returns nullptr if the type is not known.
* (Use @c addFactory to add new mappings.)
*/
const IAuxTypeVectorFactory* getFactory (SG::auxid_t auxid) const;
- /**
- * @brief Return the vector factory for a given vector element type.
- * (external locking)
- * @param lock The registry lock.
- * @param ti The type of the vector element.
- *
- * Returns 0 if the type is not known.
- * (Use @c addFactory to add new mappings.)
- */
- const IAuxTypeVectorFactory* getFactory (lock_t& lock,
- const std::type_info& ti) const;
-
-
/**
* @brief Add a new type -> factory mapping. (external locking)
* @param lock The registry lock.
@@ -447,6 +434,15 @@ private:
IAuxTypeVectorFactory* makeFactoryNull() const;
+ /**
+ * @brief Return the key used to look up an entry in m_auxids.
+ * @param name The name of the aux data item.
+ * @param clsname The name of its associated class. May be blank.
+ */
+ static std::string makeKey (const std::string& name,
+ const std::string& clsname);
+
+
/// Hold information about one aux data item.
struct typeinfo_t
{
@@ -472,30 +468,12 @@ private:
AthContainers_detail::concurrent_vector<typeinfo_t> m_types;
- /// Key used for name -> auxid lookup.
- /// First element is name, second is class name.
- typedef std::pair<std::string, std::string> key_t;
-
-
- /// Helper to hash the key type.
- struct stringpair_hash
- {
- size_t operator() (const key_t& key) const
- {
- return shash (key.first) + shash (key.second);
- }
- std::hash<std::string> shash;
- };
-
-
/// Map from name -> auxid.
- typedef std::unordered_map<key_t, SG::auxid_t, stringpair_hash>
- id_map_t;
+ using id_map_t = CxxUtils::ConcurrentStrMap<SG::auxid_t, CxxUtils::SimpleUpdater>;
id_map_t m_auxids;
/// Map from type_info name -> IAuxTypeVectorFactory.
- typedef std::unordered_map<std::string,
- const IAuxTypeVectorFactory*> ti_map_t;
+ using ti_map_t = CxxUtils::ConcurrentStrMap<const IAuxTypeVectorFactory*, CxxUtils::SimpleUpdater>;
ti_map_t m_factories;
/// Hold additional factory instances we need to delete.
diff --git a/Control/AthContainers/AthContainers/AuxTypeRegistry.icc b/Control/AthContainers/AthContainers/AuxTypeRegistry.icc
index f888377cebbacdf379784c5a802b5a7d5ad357c1..386ca1b5dd2f3ff8d1eec37bca14a479dea6581d 100644
--- a/Control/AthContainers/AthContainers/AuxTypeRegistry.icc
+++ b/Control/AthContainers/AthContainers/AuxTypeRegistry.icc
@@ -1,8 +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
*/
-
-// $Id: AuxTypeRegistry.icc 602003 2014-06-16 17:07:01Z ssnyder $
/**
* @file AthContainers/AuxTypeRegistry.icc
* @author scott snyder <snyder@bnl.gov>
@@ -38,7 +36,7 @@ AuxTypeRegistry::getAuxID (const std::string& name,
* @brief Return the vector factory for a given auxid.
* @param auxid The desired aux data item.
*
- * Returns 0 if the type is not known.
+ * Returns nullptr if the type is not known.
* (Use @c addFactory to add new mappings.)
*/
inline
diff --git a/Control/AthContainers/Root/AuxTypeRegistry.cxx b/Control/AthContainers/Root/AuxTypeRegistry.cxx
index 46da2502ef06d6064aee43b16df8b4ce1377f38c..0bf50e9e99bbac1d0f3eb24d7f060f3db11a328a 100644
--- a/Control/AthContainers/Root/AuxTypeRegistry.cxx
+++ b/Control/AthContainers/Root/AuxTypeRegistry.cxx
@@ -1,8 +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
*/
-
-// $Id$
/**
* @file AthContainers/AuxTypeRegistry.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -68,9 +66,12 @@ SG::auxid_t
AuxTypeRegistry::findAuxID( const std::string& name,
const std::string& clsname ) const
{
- lock_t lock (m_mutex);
- key_t key (name, clsname);
- id_map_t::const_iterator i = m_auxids.find (key);
+ // No locking needed here.
+ // The extra test here is to avoid having to copy a string
+ // in the common case where clsname is blank.
+ id_map_t::const_iterator i = m_auxids.find (clsname.empty() ?
+ name :
+ makeKey (name, clsname));
if (i != m_auxids.end()) {
return i->second;
}
@@ -121,6 +122,21 @@ AuxTypeRegistry::makeVectorFromData (SG::auxid_t auxid,
}
+/**
+ * @brief Return the key used to look up an entry in m_auxids.
+ * @param name The name of the aux data item.
+ * @param clsname The name of its associated class. May be blank.
+ */
+std::string AuxTypeRegistry::makeKey (const std::string& name,
+ const std::string& clsname)
+{
+ if (clsname.empty()) {
+ return name;
+ }
+ return clsname + "::" + name;
+}
+
+
/**
* @brief Return the name of an aux data item.
@@ -294,34 +310,16 @@ void AuxTypeRegistry::clear (SG::auxid_t auxid, void* dst, size_t dst_index)
* @brief Return the vector factory for a given vector element type.
* @param ti The type of the vector element.
*
- * Returns 0 if the type is not known.
+ * Returns nullptr if the type is not known.
* (Use @c addFactory to add new mappings.)
*/
const IAuxTypeVectorFactory*
AuxTypeRegistry::getFactory (const std::type_info& ti) const
-{
- lock_t lock (m_mutex);
- return getFactory (lock, ti);
-}
-
-
-/**
- * @brief Return the vector factory for a given vector element type.
- * (external locking)
- * @param lock The registry lock.
- * @param ti The type of the vector element.
- *
- * Returns 0 if the type is not known.
- * (Use @c addFactory to add new mappings.)
- */
-const IAuxTypeVectorFactory*
-AuxTypeRegistry::getFactory (lock_t& /*lock*/,
- const std::type_info& ti) const
{
ti_map_t::const_iterator it = m_factories.find (ti.name());
if (it != m_factories.end())
return it->second;
- return 0;
+ return nullptr;
}
@@ -358,7 +356,7 @@ void AuxTypeRegistry::addFactory (lock_t& /*lock*/,
const std::type_info& ti,
IAuxTypeVectorFactory* factory)
{
- ti_map_t::iterator it = m_factories.find (ti.name());
+ ti_map_t::const_iterator it = m_factories.find (ti.name());
if (it != m_factories.end()) {
if (it->second->isDynamic() && !factory->isDynamic()) {
// Replacing a dynamic factory with a non-dynamic one.
@@ -366,13 +364,13 @@ void AuxTypeRegistry::addFactory (lock_t& /*lock*/,
// Instead, push it on a vector to remember it so we can delete
// it later.
m_oldFactories.push_back (it->second);
- it->second = factory;
+ m_factories.insert_or_assign (ti.name(), factory);
}
else
delete factory;
}
else
- m_factories[ti.name()] = factory;
+ m_factories.insert_or_assign (ti.name(), factory);
}
@@ -382,6 +380,8 @@ void AuxTypeRegistry::addFactory (lock_t& /*lock*/,
* Populates the type -> factory mappings for standard C++ types.
*/
AuxTypeRegistry::AuxTypeRegistry()
+ : m_auxids (id_map_t::Updater_t()),
+ m_factories (ti_map_t::Updater_t())
{
m_types.reserve (auxid_set_size_hint);
@@ -419,7 +419,7 @@ AuxTypeRegistry::AuxTypeRegistry()
*/
AuxTypeRegistry::~AuxTypeRegistry()
{
- for (ti_map_t::value_type& p : m_factories)
+ for (auto& p : m_factories)
delete p.second;
for (const IAuxTypeVectorFactory* p : m_oldFactories)
delete p;
@@ -453,9 +453,9 @@ AuxTypeRegistry::findAuxID (const std::string& name,
const std::type_info& ti,
IAuxTypeVectorFactory* (AuxTypeRegistry::*makeFactory) () const)
{
- lock_t lock (m_mutex);
- key_t key (name, clsname);
- id_map_t::iterator i = m_auxids.find (key);
+ lock_t lock (m_mutex); // May be able to relax this lock.
+ std::string key = makeKey (name, clsname);
+ id_map_t::const_iterator i = m_auxids.find (key);
if (i != m_auxids.end()) {
typeinfo_t& m = m_types[i->second];
@@ -479,7 +479,7 @@ AuxTypeRegistry::findAuxID (const std::string& name,
IAuxTypeVectorFactory* fac2 = (*this.*makeFactory)();
if (fac2) {
addFactory (lock, ti, fac2);
- m.m_factory = getFactory (lock, ti);
+ m.m_factory = getFactory (ti);
}
}
return i->second;
@@ -490,12 +490,12 @@ AuxTypeRegistry::findAuxID (const std::string& name,
// fall through, get a new auxid and real type info
// new auxid needed so a new data vector is created in the AuxStore
}
- const IAuxTypeVectorFactory* fac = getFactory (lock, ti);
+ const IAuxTypeVectorFactory* fac = getFactory (ti);
if (!fac || fac->isDynamic()) {
IAuxTypeVectorFactory* fac2 = (*this.*makeFactory)();
if (fac2) {
addFactory (lock, ti, fac2);
- fac = getFactory (lock, ti);
+ fac = getFactory (ti);
}
}
if (!fac) return null_auxid;
@@ -508,7 +508,7 @@ AuxTypeRegistry::findAuxID (const std::string& name,
t.m_factory = fac;
t.m_flags = flags;
AthContainers_detail::fence_seq_cst();
- m_auxids[key] = auxid;
+ m_auxids.insert_or_assign (key, auxid);
return auxid;
}
diff --git a/Control/AthenaCommon/AthenaCommonEnvironmentConfig.cmake b/Control/AthenaCommon/AthenaCommonEnvironmentConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..2609c001f6854246efab9046aa73cb6355d86302
--- /dev/null
+++ b/Control/AthenaCommon/AthenaCommonEnvironmentConfig.cmake
@@ -0,0 +1,11 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# This module is used to set up the environment for AthenaCommon.
+#
+
+# Set the environment variable(s):
+set( ATHENACOMMONENVIRONMENT_ENVIRONMENT
+ SET GAUDI_PROPERTY_PARSING_ERROR_DEFAULT_POLICY "Exception" )
+
+# Silently declare the module found:
+set( ATHENACOMMONENVIRONMENT_FOUND TRUE )
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index b85eb17e3ec46267791e641f7a718b520024297f..78473d52f91b8c68aa19b4b1d7498025de5bf097 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -1,14 +1,20 @@
-################################################################################
-# Package: AthenaCommon
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaCommon )
+# External dependencies.
+find_package( future )
+
+# Set up specific Athena runtime environment:
+set( AthenaCommonEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+ CACHE PATH "Location of AthenaCommonEnvironmentConfig.cmake" )
+find_package( AthenaCommonEnvironment )
+
# Install files from the package:
atlas_install_python_modules( python/*.py python/Utils
POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
+atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
share/zeroJO.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py)
atlas_install_scripts( share/athena.py share/athena_preload.sh share/chappy.py share/test_cfg_pickling.py share/ThinCAWrapper.sh)
atlas_install_runtime(share/*.pkl)
@@ -16,20 +22,23 @@ atlas_install_runtime(share/*.pkl)
# Aliases:
atlas_add_alias( athena "athena.py" )
+# Tests:
atlas_add_test( AthAppMgrUnitTests SCRIPT test/test_AthAppMgrUnitTests.sh
PROPERTIES TIMEOUT 300
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in|built on" )
atlas_add_test( ConfigurableUnitTests SCRIPT test/test_ConfigurableUnitTests.sh
PROPERTIES TIMEOUT 300
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
-atlas_add_test( JobOptionsUnitTests SCRIPT test/test_JobOptionsUnitTests.sh
- LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
+if (NOT XAOD_ANALYSIS)
+ atlas_add_test( JobOptionsUnitTests SCRIPT test/test_JobOptionsUnitTests.sh
+ LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
+endif()
atlas_add_test( JobPropertiesUnitTests SCRIPT test/test_JobPropertiesUnitTests.sh
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
atlas_add_test( KeyStoreUnitTests SCRIPT test/test_KeyStoreUnitTests.sh
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in|^outFileName: " )
atlas_add_test( CFElementsTest SCRIPT python -m unittest -v AthenaCommon.CFElements
- POST_EXEC_SCRIPT nopost.sh )
+ POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( GenerateBootstrapTest
SCRIPT test/test_gen_bootstrap.sh
diff --git a/Control/AthenaCommon/share/athena.py b/Control/AthenaCommon/share/athena.py
index f114cbed608eb79a7bd63ea274e7d4cffc60339c..2140470dc9019f10a9995a392aee570bab31447b 100755
--- a/Control/AthenaCommon/share/athena.py
+++ b/Control/AthenaCommon/share/athena.py
@@ -27,7 +27,7 @@ do
--stdcmath) USEIMF=0;;
--imf) USEIMF=1;;
--preloadlib*) export ATHENA_ADD_PRELOAD=${a#*=};;
- --drop-and-reload) export ATHENA_DROP_RELOAD=1;;
+ --drop-and-reload) ATHENA_DROP_RELOAD=1;;
--CA) USECA=1;;
*) otherargs="$otherargs $a";;
esac
diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index fd94dd784b9c373c3bf20b1338e88ff0a18f4fa3..a4f11c6aec0798315acdc6ef1dcf9844b8b701ae 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -3,31 +3,35 @@
# Declare the package name:
atlas_subdir( AthenaConfiguration )
+# External dependencies.
+find_package( future )
+
# Install files from the package:
-atlas_install_python_modules( python/*.py python/iconfTool
+atlas_install_python_modules( python/*.py python/iconfTool
POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( share/confTool.py python/iconfTool/iconfTool python/CARunner.py)
-atlas_add_test( ComponentAccumulatorTest
- SCRIPT python -m unittest -v AthenaConfiguration.ComponentAccumulatorTest
- POST_EXEC_SCRIPT nopost.sh )
-
-
atlas_add_test( AthConfigFlagsTest
SCRIPT python -m unittest AthenaConfiguration.AthConfigFlags
POST_EXEC_SCRIPT nopost.sh )
-atlas_add_test( AllConfigFlagsTest_EVNT_test
- SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/python/testAllConfigFlags_EVNT.py
- PROPERTIES TIMEOUT 300 )
+if( NOT XAOD_ANALYSIS )
+ atlas_add_test( ComponentAccumulatorTest
+ SCRIPT python -m unittest -v AthenaConfiguration.ComponentAccumulatorTest
+ POST_EXEC_SCRIPT nopost.sh )
-if( NOT GENERATIONBASE )
+ atlas_add_test( AllConfigFlagsTest_EVNT_test
+ SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/python/testAllConfigFlags_EVNT.py
+ PROPERTIES TIMEOUT 300 )
+endif()
+
+if( NOT GENERATIONBASE AND NOT XAOD_ANALYSIS )
atlas_add_test( AllConfigFlagsTest_HITS_test
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/python/testAllConfigFlags_HITS.py
PROPERTIES TIMEOUT 300 )
endif()
-if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
+if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT XAOD_ANALYSIS )
atlas_add_test( AllConfigFlagsTest_RDO_test
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/python/testAllConfigFlags_RDO.py
PROPERTIES TIMEOUT 300 )
@@ -36,4 +40,3 @@ if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
SCRIPT python -m AthenaConfiguration.AllConfigFlags
POST_EXEC_SCRIPT nopost.sh )
endif()
-
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 137186d0313e87ab866d1817b0f29bec2e6752e3..8cbe2f60e718df79370c5535204ae9d1470bd064 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -4,7 +4,7 @@ from __future__ import print_function
from AthenaConfiguration.AthConfigFlags import AthConfigFlags
from AthenaCommon.SystemOfUnits import TeV
-from AthenaConfiguration.AutoConfigFlags import GetFileMD
+from AthenaConfiguration.AutoConfigFlags import GetFileMD, getInitialTimeStampsFromRunNumbers, getRunToTimestampDict
from PyUtils.moduleExists import moduleExists
@@ -29,8 +29,14 @@ def _createCfgFlags():
acf.addFlag('Input.Files', ["_ATHENA_GENERIC_INPUTFILE_NAME_",] ) # former global.InputFiles
acf.addFlag('Input.SecondaryFiles', []) # secondary input files for DoubleEventSelector
acf.addFlag('Input.isMC', lambda prevFlags : "IS_SIMULATION" in GetFileMD(prevFlags.Input.Files).get("eventTypes",[]) ) # former global.isMC
+ acf.addFlag('Input.OverrideRunNumber', False )
acf.addFlag('Input.RunNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("runNumbers",[]))) # former global.RunNumber
acf.addFlag('Input.LumiBlockNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("lumiBlockNumbers",[]))) # former global.RunNumber
+ acf.addFlag('Input.TimeStamp', lambda prevFlags : [] if not prevFlags.Input.OverrideRunNumber else getInitialTimeStampsFromRunNumbers(prevFlags.Input.RunNumber))
+ # Configure EvtIdModifierSvc with a list of dictionaries of the form:
+ # {'run': 152166, 'lb': 202, 'starttstamp': 1269948352889940910, 'dt': 104.496, 'evts': 1, 'mu': 0.005, 'force_new': False}
+ acf.addFlag("Input.RunAndLumiOverrideList", [])
+
acf.addFlag('Input.ProjectName', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("project_name","data17_13TeV") ) # former global.ProjectName
acf.addFlag('Input.Format', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("file_type","") ) # former global.InputFormat
@@ -42,8 +48,16 @@ def _createCfgFlags():
collections = [col for col in rawCollections if not col.endswith('Aux.') ]
return collections
+ def _typedInputCollections(inputFile):
+ if not inputFile:
+ return []
+
+ collections = ['%s#%s' % type_key for type_key in GetFileMD(inputFile).get("itemList",[])]
+ return collections
+
acf.addFlag('Input.Collections', lambda prevFlags : _inputCollections(prevFlags.Input.Files) )
acf.addFlag('Input.SecondaryCollections', lambda prevFlags : _inputCollections(prevFlags.Input.SecondaryFiles) )
+ acf.addFlag('Input.TypedCollections', lambda prevFlags : _typedInputCollections(prevFlags.Input.Files) )
acf.addFlag('Concurrency.NumProcs', 0)
acf.addFlag('Concurrency.NumThreads', 0)
@@ -67,6 +81,8 @@ def _createCfgFlags():
return "AthSimulation"
if "AthGeneration_DIR" in os.environ:
return "AthGeneration"
+ if "AthAnalysis_DIR" in os.environ:
+ return "AthAnalysis"
#TODO expand this method.
return "Athena"
acf.addFlag('Common.Project', _checkProject())
@@ -137,6 +153,10 @@ def _createCfgFlags():
acf.addFlag("IOVDb.GlobalTag",lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("IOVDbGlobalTag",None) or "CONDBR2-BLKPA-2017-05")
from IOVDbSvc.IOVDbAutoCfgFlags import getDatabaseInstanceDefault
acf.addFlag("IOVDb.DatabaseInstance",getDatabaseInstanceDefault)
+ # Run dependent simulation
+ # map from runNumber to timestamp; migrated from RunDMCFlags.py
+ acf.addFlag("IOVDb.RunToTimestampDict", lambda prevFlags: getRunToTimestampDict())
+
def __bfield():
from MagFieldConfig.BFieldConfigFlags import createBFieldConfigFlags
diff --git a/Control/AthenaConfiguration/python/AutoConfigFlags.py b/Control/AthenaConfiguration/python/AutoConfigFlags.py
index cc58a4fb4b8a4e48c1f70bb960b5d66a69ebd7a8..12958a31c184367eab2b4f79e02e8de938bf2329 100644
--- a/Control/AthenaConfiguration/python/AutoConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AutoConfigFlags.py
@@ -1,7 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from PyUtils.MetaReader import read_metadata
-from AtlasGeoModel.AtlasGeoDBInterface import AtlasGeoDBInterface
from AthenaCommon.Logging import logging
from functools import lru_cache
@@ -33,6 +32,7 @@ def _initializeGeometryParameters(geoTag):
from PixelGeoModel import PixelGeoDB
from LArGeoAlgsNV import LArGeoDB
from MuonGeoModel import MuonGeoDB
+ from AtlasGeoModel.AtlasGeoDBInterface import AtlasGeoDBInterface
dbGeomCursor = AtlasGeoDBInterface(geoTag)
dbGeomCursor.ConnectAndBrowseGeoDB()
@@ -55,3 +55,20 @@ def DetDescrInfo(geoTag):
detDescrInfo = _initializeGeometryParameters(geoTag)
detDescrInfo["geomTag"] = geoTag
return detDescrInfo
+
+
+# Based on RunDMCFlags.py
+def getRunToTimestampDict():
+ # this wrapper is intended to avoid an initial import
+ from .RunToTimestampData import RunToTimestampDict
+ return RunToTimestampDict
+
+
+def getInitialTimeStampsFromRunNumbers(runNumbers):
+ """This is used to hold a dictionary of the form
+ {152166:1269948352889940910, ...} to allow the
+ timestamp to be determined from the run.
+ """
+ run2timestampDict = getRunToTimestampDict()
+ timeStamps = [run2timestampDict.get(runNumber,1) for runNumber in runNumbers] # Add protection here?
+ return timeStamps
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 74d2ec9dbc945469758176660fe324f2f4cdd0ab..f4f751ae3e24991ca29d2e92a09fbb7a5ab64f94 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -898,7 +898,7 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
_log.warning( "%sComponent: \"%s\" is of type string, no conversion, some properties possibly not set?", indent, comp )
return comp
- _log.info( "%sConverting from GaudiConfig2 object %s type %s", indent, compName(comp), comp.__class__.__name__ )
+ _log.debug( "%sConverting from GaudiConfig2 object %s type %s", indent, compName(comp), comp.__class__.__name__ )
def __alreadyConfigured( instanceName ):
from AthenaCommon.Configurable import Configurable
@@ -1032,14 +1032,14 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
pvalue=pvalue.data
if pname not in alreadySetProperties:
- _log.info( "%sAdding property: %s for %s", indent, pname, newConf2Instance.getName() )
+ _log.debug( "%sAdding property: %s for %s", indent, pname, newConf2Instance.getName() )
try:
setattr(existingConfigurableInstance, pname, pvalue)
except AttributeError:
_log.info("%s Could not set attribute. Type of existingConfigurableInstance %s.",indent, type(existingConfigurableInstance) )
raise
elif alreadySetProperties[pname] != pvalue:
- _log.info( "%sMerging property: %s for %s", indent, pname, newConf2Instance.getName() )
+ _log.debug( "%sMerging property: %s for %s", indent, pname, newConf2Instance.getName() )
# create surrogate
clone = newConf2Instance.getInstance("Clone")
setattr(clone, pname, alreadySetProperties[pname])
@@ -1055,10 +1055,10 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
setattr(existingConfigurableInstance, pname, updatedPropValue)
del clone
- _log.info("%s invoked GaudiConf2 semantics to merge the %s and the %s to %s "
- "for property %s of %s",
- indent, alreadySetProperties[pname], pvalue, pname,
- updatedPropValue, existingConfigurable.getFullName())
+ _log.debug("%s invoked GaudiConf2 semantics to merge the %s and the %s to %s "
+ "for property %s of %s",
+ indent, alreadySetProperties[pname], pvalue, pname,
+ updatedPropValue, existingConfigurable.getFullName())
_log.debug( "%s Conf2 Full name: %s ", indent, comp.getFullJobOptName() )
existingConfigurable = __alreadyConfigured( comp.name )
diff --git a/Simulation/G4Atlas/G4AtlasApps/python/RunToTimestampData.py b/Control/AthenaConfiguration/python/RunToTimestampData.py
similarity index 100%
rename from Simulation/G4Atlas/G4AtlasApps/python/RunToTimestampData.py
rename to Control/AthenaConfiguration/python/RunToTimestampData.py
diff --git a/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx b/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx
index 922f6d8f5d3244447f6e989d756f972069c15ca2..0599d3965aca33a4a6d435464e5d66d32aa01515 100644
--- a/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx
+++ b/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx
@@ -1,5 +1,5 @@
/*
- 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 "HiveAlgL1.h"
@@ -18,10 +18,6 @@ HiveAlgL1::~HiveAlgL1() {}
StatusCode HiveAlgL1::initialize() {
ATH_MSG_DEBUG("initialize " << name());
- // setProperties();
-
- // ATH_MSG_INFO("time: " << sleep() );
-
ATH_CHECK( m_rdh1.initialize() );
ATH_CHECK( m_wrh1.initialize() );
diff --git a/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx b/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx
index 5c46484f21e9407f51ba01b1eaaa1fbe604191de..224f48fc98c60d64449ee76773da90efb7d9004e 100644
--- a/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx
+++ b/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx
@@ -356,7 +356,7 @@ StatusCode AthenaSharedMemoryTool::getObject(void** target, size_t& nbytes, int
}
//___________________________________________________________________________
-StatusCode AthenaSharedMemoryTool::clearObject(char** tokenString, int& num) const {
+StatusCode AthenaSharedMemoryTool::clearObject(const char** tokenString, int& num) const {
if (m_isClient) {
ShareEventHeader* evtH = static_cast<ShareEventHeader*>(m_status->get_address());
if (evtH->evtProcessStatus != ShareEventHeader::CLEARED) {
diff --git a/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.h b/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.h
index 182cda61b452b7affcef16bf1f6f541006038354..d629361ff115c0cfd26edabcd2d59ef8918d8222 100644
--- a/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.h
+++ b/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.h
@@ -53,7 +53,7 @@ public:
StatusCode putObject(const void* source, size_t nbytes, int num = 0) const;
StatusCode getObject(void** target, size_t& nbytes, int num = 0) const;
- StatusCode clearObject(char** tokenString, int& num) const;
+ StatusCode clearObject(const char** tokenString, int& num) const;
StatusCode lockObject(const char* tokenString, int num = 0) const;
private:
diff --git a/Control/AthenaIPCTools/src/AthenaYamplTool.cxx b/Control/AthenaIPCTools/src/AthenaYamplTool.cxx
index fea75d358e3007c68fe3c72c7cb70e967efd0f76..7ed8fc9a153bb372d0bd416eb8ed3bb4b31927a4 100644
--- a/Control/AthenaIPCTools/src/AthenaYamplTool.cxx
+++ b/Control/AthenaIPCTools/src/AthenaYamplTool.cxx
@@ -235,7 +235,7 @@ StatusCode AthenaYamplTool::getObject(void**, size_t&, int) const {
}
//___________________________________________________________________________
-StatusCode AthenaYamplTool::clearObject(char**, int&) const {
+StatusCode AthenaYamplTool::clearObject(const char**, int&) const {
return(StatusCode::FAILURE);
}
diff --git a/Control/AthenaIPCTools/src/AthenaYamplTool.h b/Control/AthenaIPCTools/src/AthenaYamplTool.h
index 51e91ed2c88ce2295a8eb58b74da59db03f3fd3d..440b47f6a8c2f0095d9a37125fdd896fe1936413 100644
--- a/Control/AthenaIPCTools/src/AthenaYamplTool.h
+++ b/Control/AthenaIPCTools/src/AthenaYamplTool.h
@@ -43,7 +43,7 @@ public:
StatusCode putObject(const void* source, size_t nbytes, int num = 0) const;
StatusCode getObject(void** target, size_t& nbytes, int num = 0) const;
- StatusCode clearObject(char** tokenString, int& num) const;
+ StatusCode clearObject(const char** tokenString, int& num) const;
StatusCode lockObject(const char* tokenString, int num = 0) const;
private:
diff --git a/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h b/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h
index b734fa1bc6251ebdc2b2aa9c601a0ec435070b1c..12e3353e39837e61fb4d4b8036f665329c713eb2 100644
--- a/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h
+++ b/Control/AthenaKernel/AthenaKernel/IAthenaIPCTool.h
@@ -24,7 +24,7 @@ public:
virtual StatusCode putObject(const void* source, size_t nbytes, int num = 0) const = 0;
virtual StatusCode getObject(void** target, size_t& nbytes, int num = 0) const = 0;
- virtual StatusCode clearObject(char** tokenString, int& num) const = 0;
+ virtual StatusCode clearObject(const char** tokenString, int& num) const = 0;
virtual StatusCode lockObject(const char* tokenString, int num = 0) const = 0;
};
diff --git a/Control/AthenaKernel/AthenaKernel/IDataShare.h b/Control/AthenaKernel/AthenaKernel/IDataShare.h
index d3921bccf338be6f88b3ffd506134ad2bb9581f4..81c244bdd7d4357cbe882b82c4ac0d4647b1831b 100644
--- a/Control/AthenaKernel/AthenaKernel/IDataShare.h
+++ b/Control/AthenaKernel/AthenaKernel/IDataShare.h
@@ -49,7 +49,7 @@ public:
/**
* @brief Read the data
*/
- virtual StatusCode readData() const = 0;
+ virtual StatusCode readData() = 0;
};
diff --git a/Control/AthenaKernel/AthenaKernel/RCUUpdater.h b/Control/AthenaKernel/AthenaKernel/RCUUpdater.h
index 52ad28d0b300927f978b4a946b109bd33190874d..1f36834bc0a17ebf309b9f34612d91cd2cd63621 100644
--- a/Control/AthenaKernel/AthenaKernel/RCUUpdater.h
+++ b/Control/AthenaKernel/AthenaKernel/RCUUpdater.h
@@ -1,6 +1,6 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * 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$
/**
@@ -81,7 +81,7 @@ public:
* @param p The object to delete.
*
* The object @c p will be queued for deletion once a grace period
- * has passed for all slots. In contrast to using @c updater,
+ * has passed for all slots. In contrast to using @c update,
* this does not change the current object. It also does not mark
* the current slot as having completed the grace period (so this can
* be called by a thread running outside of a slot context).
diff --git a/Control/AthenaKernel/python/EventIdOverrideConfig.py b/Control/AthenaKernel/python/EventIdOverrideConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..d49a61ab6280d465f921320587762b3e13960e21
--- /dev/null
+++ b/Control/AthenaKernel/python/EventIdOverrideConfig.py
@@ -0,0 +1,131 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+# based on https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Control/AthenaServices/python/Configurables.py#0247
+def add_modifier(run_nbr=None, evt_nbr=None, time_stamp=None, lbk_nbr=None, nevts=1):
+
+ if run_nbr is None:
+ modify_run_nbr = 0
+ run_nbr = 0
+ else:
+ modify_run_nbr = 1
+
+ if evt_nbr is None:
+ modify_evt_nbr = 0
+ evt_nbr = 0
+ else:
+ modify_evt_nbr = 1
+
+ if time_stamp is None:
+ modify_time_stamp = 0
+ time_stamp = 0
+ else:
+ modify_time_stamp = 1
+
+ if lbk_nbr is None:
+ modify_lbk_nbr = 0
+ lbk_nbr = 0
+ else:
+ modify_lbk_nbr = 1
+
+ mod_bit = int(0b0000
+ | (modify_run_nbr << 0)
+ | (modify_evt_nbr << 1)
+ | (modify_time_stamp << 2)
+ | (modify_lbk_nbr << 3))
+
+ return [run_nbr, evt_nbr, time_stamp, lbk_nbr, nevts, mod_bit]
+
+
+def buildListOfModifiers(ConfigFlags):
+ # migrated from RunDMCFlags.py
+ Modifiers = []
+ pDicts = ConfigFlags.Input.RunAndLumiOverrideList
+ DataRunNumber = ConfigFlags.Digitization.DataRunNumber
+
+ if pDicts:
+ for el in pDicts:
+ evt_nbr = el.get("evt_nbr", None)
+ Modifiers += add_modifier(run_nbr=el["run"], evt_nbr=evt_nbr, time_stamp=el["starttstamp"], lbk_nbr=el["lb"], nevts=el["evts"])
+ elif DataRunNumber>0:
+ assert DataRunNumber >= 0, (
+ "ConfigFlags.Digitization.DataRunNumber %d is negative. "
+ "Use a real run number from data." % DataRunNumber)
+
+ # Using event numbers to avoid "some very large number" setting
+ totalNumber = 1000000
+ if ConfigFlags.Exec.MaxEvents > 0:
+ totalNumber = ConfigFlags.Exec.MaxEvents + 1
+ if ConfigFlags.Exec.SkipEvents > 0:
+ totalNumber += ConfigFlags.Exec.SkipEvents
+
+ InitialTimeStamp = ConfigFlags.IOVDb.RunToTimestampDict.get(DataRunNumber, 1) # TODO fix repeated configuration
+
+ FirstLB = 1
+ Modifiers += add_modifier(run_nbr=DataRunNumber, lbk_nbr=FirstLB, time_stamp=InitialTimeStamp, nevts=totalNumber)
+ elif ConfigFlags.Input.RunNumber:
+ # Behaviour for Simulation jobs. For standard Simulation we
+ # override the run number once per job. TODO Still need to deal with the specific case of DataOverlay
+ myRunNumber = ConfigFlags.Input.RunNumber[0]
+ assert myRunNumber >= 0, (
+ "ConfigFlags.Input.RunNumber[0] %d is negative. "
+ "Use a real run number from data." % myRunNumber)
+ myFirstLB = ConfigFlags.Input.LumiBlockNumber[0]
+ myInitialTimeStamp = ConfigFlags.Input.TimeStamp[0]
+
+ # Using event numbers to avoid "some very large number" setting
+ totalNumber = 1000000
+ if ConfigFlags.Exec.MaxEvents > 0:
+ totalNumber = ConfigFlags.Exec.MaxEvents + 1
+ if ConfigFlags.Exec.SkipEvents > 0:
+ totalNumber += ConfigFlags.Exec.SkipEvents
+ Modifiers += add_modifier(run_nbr=myRunNumber, lbk_nbr=myFirstLB, time_stamp=myInitialTimeStamp, nevts=totalNumber)
+ return Modifiers
+
+
+def getMinMaxRunNumbers(ConfigFlags):
+ """Get a pair (firstrun,lastrun + 1) for setting ranges in IOVMetaData """
+ mini = 1
+ maxi = 2147483647
+ pDicts = ConfigFlags.Input.RunAndLumiOverrideList
+ if pDicts:
+ # Behaviour for Digitization jobs using RunAndLumiOverrideList
+ allruns = [element['run'] for element in pDicts]
+ mini = min(allruns) + 0
+ maxi = max(allruns) + 1
+ elif ConfigFlags.Digitization.DataRunNumber>0:
+ # Behaviour for Digitization jobs using DataRunNumber
+ DataRunNumber = ConfigFlags.Digitization.DataRunNumber
+ assert DataRunNumber >= 0, (
+ "ConfigFlags.Digitization.DataRunNumber %d is negative. "
+ "Use a real run number from data." % DataRunNumber)
+ mini = DataRunNumber
+ maxi = DataRunNumber+1
+ elif ConfigFlags.Input.RunNumber:
+ # Behaviour for Simulation jobs
+ myRunNumber = ConfigFlags.Input.RunNumber[0]
+ assert myRunNumber >= 0, (
+ "ConfigFlags.Input.RunNumber[0] %d is negative. "
+ "Use a real run number from data." % myRunNumber)
+ mini = myRunNumber
+ maxi = 2147483647
+ return (mini,maxi)
+
+
+def EvtIdModifierSvcCfg(ConfigFlags, name="EvtIdModifierSvc", **kwargs):
+ acc = ComponentAccumulator()
+ if ConfigFlags.Digitization.Pileup or ConfigFlags.Sim.DoFullChain:
+ kwargs.setdefault("EvtStoreName", "OriginalEvent_SG")
+ else:
+ kwargs.setdefault("EvtStoreName", "StoreGateSvc")
+
+ Modifiers = buildListOfModifiers(ConfigFlags)
+ if len(Modifiers) > 0:
+ kwargs.setdefault("Modifiers", Modifiers)
+ acc.addService(CompFactory.EvtIdModifierSvc(name, **kwargs), create=True)
+ iovDbMetaDataTool = CompFactory.IOVDbMetaDataTool()
+ iovDbMetaDataTool.MinMaxRunNumbers = getMinMaxRunNumbers(ConfigFlags)
+ acc.addPublicTool(iovDbMetaDataTool)
+ return acc
diff --git a/Control/AthenaMPTools/src/EvtRangeProcessor.cxx b/Control/AthenaMPTools/src/EvtRangeProcessor.cxx
index d9d8f01cabd84c8626dafea7d8a4e607701a9c51..c931f4f75b3defd948bba1ebd9a9728c810f2eb2 100644
--- a/Control/AthenaMPTools/src/EvtRangeProcessor.cxx
+++ b/Control/AthenaMPTools/src/EvtRangeProcessor.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
*/
#include "EvtRangeProcessor.h"
@@ -47,6 +47,7 @@ EvtRangeProcessor::EvtRangeProcessor(const std::string& type
, m_isPileup(false)
, m_rankId(-1)
, m_nEventsBeforeFork(0)
+ , m_activeWorkers(0)
, m_inpFile("")
, m_chronoStatSvc("ChronoStatSvc", name)
, m_incidentSvc("IncidentSvc", name)
@@ -120,6 +121,7 @@ int EvtRangeProcessor::makePool(int, int nprocs, const std::string& topdir)
}
m_nprocs = (nprocs==-1?sysconf(_SC_NPROCESSORS_ONLN):nprocs);
+ m_activeWorkers = m_nprocs;
m_subprocTopDir = topdir;
// Create rank queue and fill it
@@ -236,6 +238,15 @@ StatusCode EvtRangeProcessor::wait_once(pid_t& pid)
return StatusCode::FAILURE;
}
}
+ else {
+ // The worker finished successfully and it was the last worker. Release the Event Range Scatterer
+ if(--m_activeWorkers==0
+ && !m_sharedFailedPidQueue->send_basic<pid_t>(-1)) {
+ // To Do: how to report this error to the pilot?
+ ATH_MSG_ERROR("Failed to release the Event Range Scatterer");
+ return StatusCode::FAILURE;
+ }
+ }
// Erase the pid from m_procStates map
m_procStates.erase(itProcState);
diff --git a/Control/AthenaMPTools/src/EvtRangeProcessor.h b/Control/AthenaMPTools/src/EvtRangeProcessor.h
index 82b8268489d2fa780bf2968fdd25662379bbff50..ea997db121234623251205a380860d7d6ef76266 100644
--- a/Control/AthenaMPTools/src/EvtRangeProcessor.h
+++ b/Control/AthenaMPTools/src/EvtRangeProcessor.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENAMPTOOLS_EVTRANGEPROCESSOR_H
@@ -66,6 +66,7 @@ class EvtRangeProcessor final : public AthenaMPToolBase
bool m_isPileup; // Are we doing pile-up digitization?
int m_rankId; // Each worker has its own unique RankID from the range (0,...,m_nprocs-1)
int m_nEventsBeforeFork;
+ int m_activeWorkers; // Keep track of the number of workers
std::string m_inpFile; // Cached name of the input file. To avoid reopening
ServiceHandle<IChronoStatSvc> m_chronoStatSvc;
diff --git a/Control/AthenaMPTools/src/EvtRangeScatterer.cxx b/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
index 0c3da82ad342ddadc5605c62fe4293011c84b817..e40a15b132da6e9ebd54ea19741b681e11280d68 100644
--- a/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
+++ b/Control/AthenaMPTools/src/EvtRangeScatterer.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
*/
#include "EvtRangeScatterer.h"
@@ -23,8 +23,8 @@
#include <cstdlib>
EvtRangeScatterer::EvtRangeScatterer(const std::string& type
- , const std::string& name
- , const IInterface* parent)
+ , const std::string& name
+ , const IInterface* parent)
: AthenaMPToolBase(type,name,parent)
, m_processorChannel("")
, m_eventRangeChannel("")
@@ -212,6 +212,7 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
std::string strReady("Ready for events");
std::string strStopProcessing("No more events");
std::string processorWaitRequest("");
+ int workerPid{-1};
ATH_MSG_INFO("Starting main loop");
@@ -225,6 +226,12 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
usleep(1000);
}
ATH_MSG_INFO("One of the processors is ready for the next range");
+ // Get PID from the request and Update m_pid2RangeID
+ workerPid = std::atoi(processorWaitRequest.c_str());
+ auto it = m_pid2RangeID.find(workerPid);
+ if(it!=m_pid2RangeID.end()) {
+ m_pid2RangeID.erase(it);
+ }
}
// Signal the Pilot that AthenaMP is ready for event processing
@@ -239,7 +246,7 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
eventRange = eventRange.substr(0,carRet);
// Break the loop if no more ranges are expected
- if(eventRange.compare(strStopProcessing)==0) {
+ if(eventRange.find(strStopProcessing)!=std::string::npos) {
ATH_MSG_INFO("Stopped the loop. Last message from the Event Range Channel: " << eventRange);
break;
}
@@ -335,6 +342,12 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
usleep(1000);
}
ATH_MSG_INFO("One of the processors is ready for the next range");
+ // Get PID from the request and Update m_pid2RangeID
+ workerPid = std::atoi(processorWaitRequest.c_str());
+ auto it = m_pid2RangeID.find(workerPid);
+ if(it!=m_pid2RangeID.end()) {
+ m_pid2RangeID.erase(it);
+ }
}
// Send to the Processor: RangeID,evtToken[,evtToken]
@@ -344,8 +357,7 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
procReportPending++;
// Get PID from the request and Update m_pid2RangeID
- int pid = std::atoi(processorWaitRequest.c_str());
- m_pid2RangeID[pid] = rangeID;
+ m_pid2RangeID[workerPid] = rangeID;
processorWaitRequest.clear();
ATH_MSG_INFO("Sent response to the processor : " << message2ProcessorStr);
@@ -360,29 +372,32 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
// We already have one processor waiting for the answer
emptyMess4Processor = malloc(1);
socket2Processor->send(emptyMess4Processor,1);
- ATH_MSG_INFO("Set one processor free");
+ ATH_MSG_INFO("Set worker PID=" << workerPid << " free");
+ processorWaitRequest.clear();
}
- for(int i(0); i<(processorWaitRequest.empty()?m_nprocs:m_nprocs-1); ++i) {
+ bool endLoop{false};
+ while(true) {
ATH_MSG_DEBUG("Going to set another processor free");
- while(getNewRangeRequest(socket2Processor,socket2Pilot,procReportPending).empty()) {
- pollFailedPidQueue(sharedFailedPidQueue,socket2Pilot,procReportPending);
+ while(processorWaitRequest.empty()) {
+ processorWaitRequest = getNewRangeRequest(socket2Processor,socket2Pilot,procReportPending);
+ if(pollFailedPidQueue(sharedFailedPidQueue,socket2Pilot,procReportPending)==-1) {
+ endLoop = true;
+ break;
+ }
usleep(1000);
}
+ if(endLoop) break;
+ // Remove worker from m_pid2RangeID
+ workerPid = std::atoi(processorWaitRequest.c_str());
+ auto it = m_pid2RangeID.find(workerPid);
+ if(it!=m_pid2RangeID.end()) {
+ m_pid2RangeID.erase(it);
+ }
emptyMess4Processor = malloc(1);
socket2Processor->send(emptyMess4Processor,1);
- ATH_MSG_INFO("Set one processor free");
- }
-
- ATH_MSG_INFO("Still " << procReportPending << " pending reports");
-
- // Final round of colecting output file names from processors
- while(procReportPending>0) {
- std::string strProcessorRequest = getNewRangeRequest(socket2Processor,socket2Pilot,procReportPending);
- if(!strProcessorRequest.empty()) {
- ATH_MSG_WARNING("Unexpected message received from a processor at this stage : " << strProcessorRequest);
- }
- pollFailedPidQueue(sharedFailedPidQueue,socket2Pilot,procReportPending);
- usleep(1000);
+ ATH_MSG_INFO("Set worker PID=" << workerPid << " free");
+ ATH_MSG_INFO("Still " << procReportPending << " pending reports");
+ processorWaitRequest.clear();
}
}
@@ -509,22 +524,26 @@ std::string EvtRangeScatterer::getNewRangeRequest(yampl::ISocket* socket2Process
return strProcessorRequest;
}
-void EvtRangeScatterer::pollFailedPidQueue(AthenaInterprocess::SharedQueue* sharedFailedPidQueue
- , yampl::ISocket* socket2Pilot
- , int& procReportPending)
+pid_t EvtRangeScatterer::pollFailedPidQueue(AthenaInterprocess::SharedQueue* sharedFailedPidQueue
+ , yampl::ISocket* socket2Pilot
+ , int& procReportPending)
{
- pid_t pid;
- if(sharedFailedPidQueue->try_receive_basic<pid_t>(pid)) {
+ pid_t pid{0};
+ if(sharedFailedPidQueue->try_receive_basic<pid_t>(pid)
+ && pid!=-1) {
ATH_MSG_INFO("Procesor with PID=" << pid << " has failed!");
- if(m_pid2RangeID.find(pid)!=m_pid2RangeID.end()) {
+ auto itPid = m_pid2RangeID.find(pid);
+ if(itPid!=m_pid2RangeID.end()) {
ATH_MSG_WARNING("The failed RangeID = " << m_pid2RangeID[pid] << " will be reported to Pilot");
std::string errorStr("ERR_ATHENAMP_PROCESS " + m_pid2RangeID[pid] + ": Failed to process event range");
void* errorMessage = malloc(errorStr.size());
memcpy(errorMessage,errorStr.data(),errorStr.size());
socket2Pilot->send(errorMessage,errorStr.size());
+ --procReportPending;
+ m_pid2RangeID.erase(pid);
}
- procReportPending--;
ATH_MSG_INFO("Reports pending: " << procReportPending);
}
+ return pid;
}
diff --git a/Control/AthenaMPTools/src/EvtRangeScatterer.h b/Control/AthenaMPTools/src/EvtRangeScatterer.h
index b7b40e03f13db840ddbb7cca59005f2a15a9dca7..2b8a617e6dc3c5db5ae2d8d6a452f77660fa66c2 100644
--- a/Control/AthenaMPTools/src/EvtRangeScatterer.h
+++ b/Control/AthenaMPTools/src/EvtRangeScatterer.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENAMPTOOLS_TOKENSCATTERER_H
@@ -56,9 +56,9 @@ class EvtRangeScatterer final : public AthenaMPToolBase
, int& procReportPending);
// Poll the failed PID queue to see if any of the Processors has failed
- void pollFailedPidQueue(AthenaInterprocess::SharedQueue* sharedFailedPidQueue
- , yampl::ISocket* socket2Pilot
- , int& procReportPending);
+ pid_t pollFailedPidQueue(AthenaInterprocess::SharedQueue* sharedFailedPidQueue
+ , yampl::ISocket* socket2Pilot
+ , int& procReportPending);
StringProperty m_processorChannel;
StringProperty m_eventRangeChannel;
diff --git a/Control/AthenaMonitoring/share/Run3DQTestingDriver.py b/Control/AthenaMonitoring/share/Run3DQTestingDriver.py
index 30f6de92cb2dd569d34a6744149d52ff2f16f9e6..e8c450953d930697cb2cc826e4cff41c10cf3a44 100755
--- a/Control/AthenaMonitoring/share/Run3DQTestingDriver.py
+++ b/Control/AthenaMonitoring/share/Run3DQTestingDriver.py
@@ -92,12 +92,11 @@ if __name__=='__main__':
((ConfigFlags.DQ.Steering.InDet, "doGlobalMon") and ConfigFlags.DQ.Steering.InDet.doGlobalMon) or \
((ConfigFlags.DQ.Steering.InDet, "doPerfMon") and ConfigFlags.DQ.Steering.InDet.doPerfMon):
ConfigFlags.Detector.GeometryID = True
- if hasattr(ConfigFlags.DQ.Steering, "doPixelMon") and ConfigFlags.DQ.Steering.doPixelMon:
- ConfigFlags.Detector.GeometryPixel = True
- if hasattr(ConfigFlags.DQ.Steering, "doSCTMon") and ConfigFlags.DQ.Steering.doSCTMon:
- ConfigFlags.Detector.GeometrySCT = True
- if hasattr(ConfigFlags.DQ.Steering, "doTRTMon") and ConfigFlags.DQ.Steering.doTRTMon:
- ConfigFlags.Detector.GeometryTRT = True
+
+ # Just assume we want the full ID geometry, if we are reading in geometry
+ ConfigFlags.Detector.GeometryPixel = True
+ ConfigFlags.Detector.GeometrySCT = True
+ ConfigFlags.Detector.GeometryTRT = True
log.info('FINAL CONFIG FLAGS SETTINGS FOLLOW')
ConfigFlags.dump()
diff --git a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h
index ae260d3463fa348768a6442ed7b968aa7c45c0f2..dbae083546633bbcf0c6ea6c262fe2f4b16708c0 100644
--- a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h
+++ b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h
@@ -19,7 +19,7 @@ namespace Monitored {
std::string path; //!< booking path
std::string title; //!< title of the histogram
std::string opt; //!< options
- std::string tld{""}; //!< top level directory (below THistSvc stream)
+ std::string tld; //!< top level directory (below THistSvc stream)
std::string weight; //!< name of weight variable
std::string cutMask; //!< variable that defines whether event is accepted
@@ -40,33 +40,33 @@ namespace Monitored {
RunMode runmode = RunMode::Invalid; //!< online or offline
RunPeriod runperiod = RunPeriod::Invalid; //!< rebook period in offline monitoring
- bool Sumw2; //!< store sum of squares of weights
- int kLBNHistoryDepth; //!< length of lb history
- bool kAddBinsDynamically; //!< add new bins outside the existing range
- bool kRebinAxes; //!< increase the axis range without adding new bins
- bool kCanRebin; //!< allow all axes to be rebinned
- bool kVec; //!< add content to each bin from each element of a vector
- bool kVecUO; //!< add content to each bin from vector, including overflow/underflow
- bool kCumulative; //!< fill bin of monitored object's value, and every bin below it
+ bool Sumw2{false}; //!< store sum of squares of weights
+ int kLBNHistoryDepth{0}; //!< length of lb history
+ bool kAddBinsDynamically{false}; //!< add new bins outside the existing range
+ bool kRebinAxes{false}; //!< increase the axis range without adding new bins
+ bool kCanRebin{false}; //!< allow all axes to be rebinned
+ bool kVec{false}; //!< add content to each bin from each element of a vector
+ bool kVecUO{false}; //!< add content to each bin from vector, including overflow/underflow
+ bool kCumulative{false}; //!< fill bin of monitored object's value, and every bin below it
std::string xvar; //!< name of x variable
- int xbins; //!< number of y bins
- float xmin; //!< x axis minimum
- float xmax; //!< x axis maximum
+ int xbins{0}; //!< number of y bins
+ float xmin{0}; //!< x axis minimum
+ float xmax{0}; //!< x axis maximum
std::vector<std::string> xlabels; //!< labels for x axis
std::vector<double> xarray; //!< array of x bin edges
std::string yvar; //!< name of y variable
- int ybins; //!< number of y bins
- float ymin; //!< y axis minimum
- float ymax; //!< y axis maximum
+ int ybins{0}; //!< number of y bins
+ float ymin{0}; //!< y axis minimum
+ float ymax{0}; //!< y axis maximum
std::vector<std::string> ylabels; //!< labels for y axis
std::vector<double> yarray; //!< array of y bin edges
std::string zvar; //!< name of z variable
- int zbins; //!< number of z bins
- float zmin; //!< z axis minimum
- float zmax; //!< z axis maximum
+ int zbins{0}; //!< number of z bins
+ float zmin{0}; //!< z axis minimum
+ float zmax{0}; //!< z axis maximum
std::vector<std::string> zlabels; //!< labels for z axis
std::string treeDef; //!< defines output TTree of monitored quantities
diff --git a/Control/AthenaPython/CMakeLists.txt b/Control/AthenaPython/CMakeLists.txt
index 460c29c03f8317b7b19d6a67d53f07553d71b1cb..d4d3634330401e20ca0c7e5c0ac41049639d152d 100644
--- a/Control/AthenaPython/CMakeLists.txt
+++ b/Control/AthenaPython/CMakeLists.txt
@@ -7,6 +7,7 @@ atlas_subdir( AthenaPython )
find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core PyROOT ROOTTPython
cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
+find_package( future )
# Component(s) in the package:
atlas_add_library( AthenaPython
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index 3e2c884f502628548f9585f6c5f17756dffc7a0d..c594411e119b87eab1b7d96e74251261ceb19177 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -1,8 +1,7 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: AthMessageSvc.cpp,v 1.27 2008/10/21 16:25:55 marcocle Exp $
#include "GaudiKernel/Kernel.h"
#include "GaudiKernel/StatusCode.h"
@@ -124,10 +123,6 @@ StatusCode LoggedMessageSvc::initialize() {
SmartIF<IMessageSvc> &si = const_cast<SmartIF<IMessageSvc>&> (msgSvc());
si.reset();
- // Set my own properties
- sc = setProperties();
- if (sc.isFailure()) return sc;
-
#ifdef _WIN32
m_color = false;
#endif
diff --git a/Control/CxxUtils/CMakeLists.txt b/Control/CxxUtils/CMakeLists.txt
index bf26f6102a71d2ba3e049c38e72495dcd07bc480..ab2cbba9e4107406ef89731fbd889c47aa6678e1 100644
--- a/Control/CxxUtils/CMakeLists.txt
+++ b/Control/CxxUtils/CMakeLists.txt
@@ -97,6 +97,15 @@ if ( IS_DIRECTORY /usr/include/ck )
PRIVATE "-DHAVE_CK" )
endif()
+atlas_add_test( ConcurrentStrMap_test
+ SOURCES test/ConcurrentStrMap_test.cxx
+ INCLUDE_DIRS ${TBB_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CK_INCLUDE}
+ LINK_LIBRARIES CxxUtils TestTools ${TBB_LIBRARIES} ${Boost_LIBRARIES} ${CK_LIBRARIES} )
+if ( IS_DIRECTORY /usr/include/ck )
+ target_compile_definitions(CxxUtils_ConcurrentStrMap_test
+ PRIVATE "-DHAVE_CK" )
+endif()
+
atlas_add_test( exctrace2_test
SOURCES test/exctrace2_test.cxx
LINK_LIBRARIES CxxUtils
@@ -118,7 +127,8 @@ foreach( test sincos_test ArrayScanner_test Arrayrep_test
atomic_fetch_minmax_test
MurmurHash2_test bitmask_test crc64_test Ring_test
restrict_test vectorize_test get_unaligned_test aligned_vector_test
- vec_int_test vec_float_test vec_fb_int_test vec_fb_float_test)
+ vec_int_test vec_float_test vec_fb_int_test vec_fb_float_test
+ ConcurrentHashmapImpl_test SimpleUpdater_test )
atlas_add_test( ${test}
SOURCES test/${test}.cxx
LOG_IGNORE_PATTERN "no version information available"
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.h b/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.h
new file mode 100644
index 0000000000000000000000000000000000000000..04aeda1488cfaf9cca1507f06a4839feb99e5f0a
--- /dev/null
+++ b/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.h
@@ -0,0 +1,576 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/ConcurrentHashmapImpl.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Hash table allowing concurrent, lockless reads.
+ */
+
+
+
+#ifndef CXXUTILS_CONCURRENTHASHMAPIMPL_H
+#define CXXUTILS_CONCURRENTHASHMAPIMPL_H
+
+
+#include "CxxUtils/bitscan.h"
+#include "CxxUtils/atomic_fetch_minmax.h"
+#include <functional>
+#include <cstdint>
+#include <cstdlib>
+#include <atomic>
+#include <mutex>
+#include <memory>
+#include <new>
+
+
+class ConcurrentHashmapImplTest;
+
+
+namespace CxxUtils {
+namespace detail {
+
+
+/// Type used for keys and values --- an unsigned big enough to hold a pointer.
+/// Need to have this defined outside of ConcurrentHashmapImpl itself
+/// in order to avoid instantiation circularities, as the HASHER_ and MATCHER_
+/// classes will probably want to use it.
+using ConcurrentHashmapVal_t = uintptr_t;
+
+
+/**
+ * @brief Helper to generate hash probes.
+ *
+ * To search for an entry with hash code @c hash in the table pointed
+ * at by @c entries:
+ *@code
+ * CHMTableInterator<ENTRIES_PER_CACHELINE> it (hash, mask, maskBits, probleLimit);
+ * do {
+ * entry_t* ent = entries + it.offset();
+ * <<test if ent is the desired entry and handle if so>>
+ * } while (it.next());
+ * // Too many probes --- failed.
+ @endcode
+ *
+ * The template argument is the number of table entries per cache line.
+ * We try to be cache friendly by first searching all entries in a cache line,
+ * then moving to another line.
+ */
+template <unsigned ENTRIES_PER_CACHELINE>
+struct CHMTableIterator
+{
+ /// Mask for the within-cachline part of indices.
+ static constexpr size_t ENTRIES_PER_CACHELINE_MASK = ENTRIES_PER_CACHELINE-1;
+
+ /**
+ * @brief Constructor.
+ * @param hash The hash of the entry we're looking for.
+ * @param mask Table mask; i.e., the table capacity - 1.
+ * @param maskBits Number of 1 bits in mask.
+ * @param probeLimit Maximum number of probes to try before failing.
+ */
+ CHMTableIterator (size_t hash, size_t mask, size_t maskBits, size_t probeLimit);
+
+
+ /**
+ * @brief Offset of the element currently being probed.
+ */
+ size_t offset() const;
+
+
+ /**
+ * @brief Return the number of probes performed so far.
+ */
+ size_t nprobes() const;
+
+
+ /**
+ * @brief Move to the next probe.
+ * Returns true if we should continue, or false if we've hit the maximum
+ * number of probes.
+ */
+ bool next();
+
+
+private:
+ /// Mask for the table; i.e., capacity-1, but with the low bits
+ /// corresponding to ENTRIES_PER_CACHELINE also masked off.
+ const size_t m_mask;
+ /// Offset of the first entry we probe within its cacheline.
+ const size_t m_boffs;
+ /// Base increment between probes.
+ const size_t m_stride;
+ /// Maximum number of probes to try.
+ const size_t m_probeLimit;
+ /// Index of the start of the cacheline currently being probed.
+ size_t m_bucket;
+ /// Number of probes tried so far.
+ size_t m_nprobes;
+};
+
+
+/**
+ * @brief Hash table allowing concurrent, lockless reads.
+ *
+ * This class implements a simple hash map from uintptr_t to uintptr_t.
+ * This class isn't meant to be used directly; rather, a more user-friendly
+ * interface can be built on top of this. Although here we deal only
+ * with uintptr_t values, the hash and comparison operations are templated.
+ * This allows for handling more complex types, where the values
+ * stored in the map are pointers to the actual objects. We support
+ * inserting new items and modifying existing ones, but not deletion.
+ * One value of the key must be reserved to indicate null; no keys with
+ * that value may be inserted.
+ *
+ * There can be only one writer at a time; this is enforced with internal locks.
+ * However, there can be any number of concurrent readers at any time.
+ * The reads are lockless. So this is appropriate when reads
+ * are much more frequent than writes.
+ *
+ * Template arguments:
+ * UPDATER_ - Object used for memory management; see below.
+ * This has the same requirements as for ConcurrentRangeMap;
+ * see there for further details.
+ * HASHER_ - Functional to compute a hash value from a key.
+ * Defaults to std::hash.
+ * MATCHER_ - Functional to compare two keys for equality.
+ * Defaults to std::equal_to.
+ * NULLVAL_ - Value of the key to be considered null.
+ * A key with this value may not be inserted.
+ *
+ * Implementation notes:
+ * We use open addressing (see, eg, knuth AOCP 6.4), in which the payloads
+ * are kept in the hash table itself. We try to be cache friendly
+ * by probing all entries within a cache line before trying anything
+ * in a different cache line. If the table gets full, we make a new, larger,
+ * instance copying the data from the old one. The old table instances
+ * are then given to the Updater object to handle.
+ *
+ * The implementation here is inspired by the hash maps from ConcurrencyKit
+ * (http://concurrencykit.org), though the code is all new.
+ *
+ * nb. Can't use plain `MATCHER' as a template argument because it collides
+ * with gtest.
+ */
+template <template <class> class UPDATER_,
+ typename HASHER_ = std::hash<uintptr_t>,
+ typename MATCHER_ = std::equal_to<uintptr_t>,
+ uintptr_t NULLVAL_ = 0>
+class ConcurrentHashmapImpl
+{
+public:
+ /// Type used for keys and values --- an unsigned big enough to hold a pointer.
+ using val_t = ConcurrentHashmapVal_t;
+ /// Hash object.
+ using Hasher_t = HASHER_;
+ /// Key match object.
+ using Matcher_t = MATCHER_;
+ /// Null key value.
+ static constexpr uintptr_t nullval = NULLVAL_;
+ /// Used to represent an invalid table index.
+ static constexpr size_t INVALID = static_cast<size_t>(-1);
+
+
+private:
+ /// One entry in the hash table.
+ struct entry_t {
+ std::atomic<val_t> m_key;
+ std::atomic<val_t> m_val;
+ };
+
+ /// Assumed length in bytes of one cache line.
+ static constexpr size_t CACHELINE = 64;
+
+ // Ensure that entries will evenly pack a cache line.
+ // If CACHELINE is a power of two, this implies that sizeof(entry_t)
+ // is as well.
+ static_assert (CACHELINE >= sizeof (entry_t) &&
+ CACHELINE % sizeof(entry_t) == 0);
+
+ /// Number of entries in one cache line.
+ static constexpr size_t ENTRIES_PER_CACHELINE = CACHELINE / sizeof(entry_t);
+ /// Mask for the cache line part of an index.
+ static constexpr size_t ENTRIES_PER_CACHELINE_MASK = (ENTRIES_PER_CACHELINE-1);
+
+ /// For unit testing.
+ friend class ::ConcurrentHashmapImplTest;
+
+
+ /**
+ * @brief Table of hash entries.
+ *
+ * This is the actual table of hash entries. It consists of a fixed-size
+ * header, followed by the actual array of entries. We override new
+ * in order to be able to properly allocate the space for the array.
+ * The start of the array of entries need to be aligned on a cache line.
+ * We make a new instance of this if the table needs to be grown.
+ */
+ class alignas(CACHELINE) Table
+ {
+ public:
+ using TableIterator = CHMTableIterator<ENTRIES_PER_CACHELINE>;
+
+
+ /**
+ * @brief Constructor.
+ * @param capacity Number of entries in the table. Must be a power of 2.
+ * @param hasher Hash object to use.
+ * @param matcher Key match object to use.
+ */
+ Table (size_t capacity,
+ const Hasher_t& hasher = Hasher_t(),
+ const Matcher_t& matcher = Matcher_t());
+
+
+ /**
+ * @brief Allocator for table objects.
+ * @param capacity Size of the table (must be a power of 2).
+ *
+ * Allocate with enough space for the table of entries.
+ * Also align on a cache line.
+ */
+ static void* operator new (size_t, size_t capacity);
+
+
+ /**
+ * @brief Deallocator for table objects.
+ */
+ void operator delete (void* p);
+
+
+ /**
+ * @brief Find a table entry for reading.
+ * @param key The key for which to search.
+ * @param hash The hash of the key.
+ *
+ * Returns the matching entry, or nullptr. xxx
+ */
+ size_t probeRead (val_t key, size_t hash) const;
+
+
+ /**
+ * @brief Find a table entry for writing.
+ * @param key The key for which to search.
+ * @param hash The hash of the key.
+ * @param entry[out] The entry found.
+ *
+ * If we find the entry, return true with @c entry pointing at it.
+ * If we don't find it, and there's still room in the table, return false
+ * with @c entry pointing at the next empty entry.
+ * Otherwise, return false with @c entry set to nullptr.
+ */
+ size_t probeWrite (val_t key, size_t hash, bool& insert);
+
+
+ /**
+ * @brief The number of entries in the table.
+ */
+ size_t capacity() const;
+
+
+ /**
+ * @brief Return the entry for an offset.
+ * @param offset The index of the desired entry.
+ */
+ const entry_t& entry (size_t offset) const;
+
+
+ /**
+ * @brief Return the entry for an offset (non-const).
+ * @param offset The index of the desired entry.
+ */
+ entry_t& entry (size_t offset);
+
+
+ private:
+ /// Number of entries in the table. Must be a power of 2.
+ const size_t m_capacity;
+ /// Maximum number of probes allowed before resizing the table.
+ const size_t m_maxProbe;
+ /// Mask for table indices (capacity-1).
+ const size_t m_mask;
+ /// Number of bits in the mask.
+ const size_t m_maskBits;
+ /// The hash object.
+ const Hasher_t& m_hasher;
+ /// The key match object.
+ const Matcher_t& m_matcher;
+ /// Longest probe needed so far.
+ std::atomic<size_t> m_longestProbe;
+ /// The actual table entries.
+ alignas(CACHELINE) entry_t m_entries[1];
+ };
+
+
+public:
+ /// Updater object.
+ using Updater_t = UPDATER_<Table>;
+ /// Context type for the updater.
+ using Context_t = typename Updater_t::Context_t;
+
+
+
+ /**
+ * @brief Constructor.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity Minimum initial table size.
+ * @param hasher Hash object to use.
+ * @param matcher Key match object to use.
+ * @param ctx Execution context.
+ */
+ ConcurrentHashmapImpl (Updater_t&& updater,
+ size_t capacity_in,
+ const Hasher_t& hasher,
+ const Matcher_t& matcher,
+ const typename Updater_t::Context_t& ctx);
+
+
+ // Don't implment copying.
+ // This should be done by derived classes, if desired.
+ ConcurrentHashmapImpl (const ConcurrentHashmapImpl&) = delete;
+ ConcurrentHashmapImpl& operator= (const ConcurrentHashmapImpl&) = delete;
+
+
+ /**
+ * @brief Return the number of items currently stored.
+ * (not necessarity synced)
+ */
+ size_t size() const;
+
+
+ /**
+ * @brief Return the current table size.
+ */
+ size_t capacity() const;
+
+
+ /**
+ * @brief Return the hasher object.
+ */
+ const Hasher_t& hasher() const;
+
+
+ /**
+ * @brief Return the matcher object.
+ */
+ const Matcher_t& matcher() const;
+
+
+ /**
+ * @brief Bidirectional iterator over occupied table entries.
+ *
+ * This is not itself a compliant STL iterator.
+ * Derived classes are meant to build a user-facing iterator on top of this.
+ */
+ class const_iterator
+ {
+ public:
+ /**
+ * @brief Constructor.
+ * @param table The table instance we're referencing.
+ * @param end If true, initialize this to an end iterator.
+ * Otherwise, initialize it to a a begin iterator.
+ */
+ const_iterator (const Table& table, bool end);
+
+
+ /**
+ * @brief Constructor.
+ * @param table The table instance we're referencing.
+ * @param offset Offset of the iterator within the table.
+ * (Must point at an occupied entry.)
+ */
+ const_iterator (const Table& table, size_t offset);
+
+
+ /**
+ * @brief Advance the iterator to the next occupied entry.
+ */
+ void next();
+
+
+ /**
+ * @brief Move the iterator back to the previous occupied entry.
+ */
+ void prev();
+
+
+ /**
+ * @brief Return the key for this iterator.
+ */
+ val_t key() const;
+
+
+ /**
+ * @brief Return the value for this iterator.
+ */
+ val_t value() const;
+
+
+ /**
+ * @brief Compare two iterators.
+ */
+ bool operator!= (const const_iterator& other) const;
+
+
+ /**
+ * @brief Check that the iterator is valid (not pointing at the end).
+ */
+ bool valid() const;
+
+
+ private:
+ /// The table over which we're iterating.
+ const Table& m_table;
+ /// The current position in the table.
+ /// Set to -1 for an end iterator.
+ size_t m_offset;
+ };
+
+
+ /**
+ * @brief Add an entry to the table.
+ * @param key The key to insert.
+ * @param hash The hash of the key.
+ * @param val The value to insert.
+ * @param overwrite If true, then overwrite an existing entry.
+ * If false, an existing entry will not be changed.
+ * @param ctx Execution context.
+ *
+ * If the key already exists, then its value will be updated.
+ * Returns an iterator pointing at the entry and a flag which is
+ * true if a new element was added.
+ */
+ std::pair<const_iterator, bool>
+ put (val_t key, size_t hash, val_t val,
+ bool overwrite,
+ const typename Updater_t::Context_t& ctx);
+
+
+ /**
+ * @brief Look up an entry in the table.
+ * @param key The key to find.
+ * @param hash The hash of the key.
+ *
+ * Returns an iterator pointing at the found entry, or end().
+ */
+ const_iterator get (val_t key, size_t hash) const;
+
+
+ /// Two iterators defining a range.
+ using const_iterator_range = std::pair<const_iterator, const_iterator>;
+
+
+ /**
+ * @brief Return a range that can be used to iterate over the container.
+ */
+ const_iterator_range range() const;
+
+
+ /**
+ * @brief A begin iterator for the container.
+ */
+ const_iterator begin() const;
+
+
+ /**
+ * @brief An end iterator for the container.
+ */
+ const_iterator end() const;
+
+
+ /**
+ * @brief Erase the table and change the capacity.
+ * @param capacity The new table capacity.
+ * @param ctx Execution context.
+ *
+ * Returns an iterator pointing at the start of the old table.
+ */
+ const_iterator clear (size_t capacity,
+ const typename Updater_t::Context_t& ctx);
+
+
+ /**
+ * @brief Erase the table (don't change the capacity).
+ * @param ctx Execution context.
+ *
+ * Returns an iterator pointing at the start of the old table.
+ */
+ const_iterator clear (const typename Updater_t::Context_t& ctx);
+
+
+ /**
+ * @brief Increase the table capacity.
+ * @param capacity The new table capacity.
+ * @param ctx Execution context.
+ *
+ * No action will be taken in @c capacity is smaller
+ * than the current capacity.
+ */
+ void reserve (size_t capacity,
+ const typename Updater_t::Context_t& ctx);
+
+
+ /**
+ * @brief Called when this thread is no longer referencing anything
+ * from this container.
+ * @param ctx Execution context.
+ */
+ void quiescent (const typename Updater_t::Context_t& ctx);
+
+
+private:
+ using mutex_t = std::mutex;
+ using lock_t = std::lock_guard<mutex_t>;
+
+
+ /**
+ * @brief Make the table larger.
+ * @param ctx Execution context.
+ *
+ * Must be holding a lock on the mutex to call this.
+ */
+ bool grow (lock_t& /*lock*/, const typename Updater_t::Context_t& ctx);
+
+
+ /**
+ * @brief Make the table larger.
+ * @param new_capacity The new table capacity (must be a power of 2).
+ * @param ctx Execution context.
+ *
+ * Must be holding a lock on the mutex to call this.
+ */
+ bool grow (lock_t& /*lock*/, size_t new_capacity, const typename Updater_t::Context_t& ctx);
+
+
+ static uint64_t round_up (uint64_t);
+
+
+ /// Updater object managing memory. See above.
+ Updater_t m_updater;
+ /// The hash object.
+ const Hasher_t m_hasher;
+ /// The key match object.
+ const Matcher_t m_matcher;
+ /// The current table instance. Must be holding the mutex to access this.
+ Table* m_table;
+ /// Number of entries in the map.
+ std::atomic<size_t> m_size;
+ /// Mutex to serialize changes to the map.
+ std::mutex m_mutex;
+};
+
+
+} // namespace detail
+
+
+} // namespace CxxUtils
+
+
+#include "CxxUtils/ConcurrentHashmapImpl.icc"
+
+
+#endif // not CXXUTILS_CONCURRENTHASHMAPIMPL_H
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc b/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc
new file mode 100644
index 0000000000000000000000000000000000000000..0b07bef125324df4ba0524fcbbd6848c434ba7e0
--- /dev/null
+++ b/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc
@@ -0,0 +1,725 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/ConcurrentHashmapImpl.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Hash table allowing concurrent, lockless reads.
+ */
+
+
+#include <cassert>
+
+
+namespace CxxUtils {
+namespace detail {
+
+
+/**
+ * @brief Constructor.
+ * @param hash The hash of the entry we're looking for.
+ * @param mask Table mask; i.e., the table capacity - 1.
+ * @param maskBits Number of 1 bits in mask.
+ * @param probeLimit Maximum number of probes to try before failing.
+ */
+template <unsigned ENTRIES_PER_CACHELINE>
+inline
+CHMTableIterator<ENTRIES_PER_CACHELINE>::CHMTableIterator
+ (size_t hash, size_t mask, size_t maskBits, size_t probeLimit)
+ // Mask limited to the table. Also mask off the part within a cache line.
+ : m_mask ((mask & ~ENTRIES_PER_CACHELINE_MASK)),
+ // Offset of hash within a cache line.
+ m_boffs (hash & ENTRIES_PER_CACHELINE_MASK),
+ // Starting increment between hash probes.
+ // Must be large enough to go to a new cache line, which is why
+ // we or in ENTRIES_PER_CACHELINE.
+ m_stride (((hash >> maskBits) | hash | ENTRIES_PER_CACHELINE) & ENTRIES_PER_CACHELINE_MASK),
+ m_probeLimit (probeLimit),
+ // Index at the start of the cache line containing hash.
+ m_bucket (hash & m_mask),
+ m_nprobes (0)
+{
+}
+
+
+/**
+ * @brief Offset of the element currently being probed.
+ */
+template <unsigned ENTRIES_PER_CACHELINE>
+inline
+size_t CHMTableIterator<ENTRIES_PER_CACHELINE>::offset() const
+{
+ // m_bucket the starting index of the current cache line.
+ // Count within the cache line in a circular manner starting
+ // at m_boffs.
+ return m_bucket + ((m_nprobes + m_boffs)&ENTRIES_PER_CACHELINE_MASK);
+}
+
+
+/**
+ * @brief Return the number of probes performed so far.
+ */
+template <unsigned ENTRIES_PER_CACHELINE>
+inline
+size_t CHMTableIterator<ENTRIES_PER_CACHELINE>::nprobes() const
+{
+ return m_nprobes;
+}
+
+
+/**
+ * @brief Move to the next probe.
+ * Returns true if we should continue, or false if we've hit the maximum
+ * number of probes.
+ */
+template <unsigned ENTRIES_PER_CACHELINE>
+inline
+bool CHMTableIterator<ENTRIES_PER_CACHELINE>::next()
+{
+ // Increment number of probes and stop if we've hit the maximum.
+ if (++m_nprobes >= m_probeLimit) {
+ return false;
+ }
+ // We've finished a cache line if the low bits are back to 0.
+ if ((m_nprobes & ENTRIES_PER_CACHELINE_MASK) == 0) {
+ // Move to a different cacheline.
+ // cf knuth AOCP exercise 6.4.20.
+ // By contruction, the low bits (within the cacheline) of
+ // m_bucket, m_nprobes, and m_stride should all be 0.
+ m_bucket = (m_bucket + m_nprobes + m_stride) & m_mask;
+ }
+ return true;
+}
+
+
+//*****************************************************************************
+
+
+#define T_CHMIMPL \
+ template <template <class> class UPDATER_, \
+ typename HASHER_, \
+ typename MATCHER_, \
+ uintptr_t NULLVAL_>
+
+#define CHMIMPL ConcurrentHashmapImpl<UPDATER_, HASHER_, MATCHER_, NULLVAL_>
+
+
+/**
+ * @brief Constructor.
+ * @param capacity Number of entries in the table. Must be a power of 2.
+ * @param hasher Hash object to use.
+ * @param matcher Key match object to use.
+ */
+T_CHMIMPL
+CHMIMPL::Table::Table (size_t capacity,
+ const Hasher_t& hasher /*= Hasher_t()*/,
+ const Matcher_t& matcher /*= Matcher_t()*/)
+ : m_capacity (capacity),
+ m_maxProbe (capacity / 4),
+ m_mask (capacity-1),
+ m_maskBits (count_trailing_zeros (capacity)),
+ m_hasher (hasher),
+ m_matcher (matcher),
+ m_longestProbe (0)
+{
+ // Clear all the keys.
+ for (size_t i = 0; i < capacity; i++) {
+ m_entries[i].m_key = nullval;
+ }
+}
+
+
+/**
+ * @brief Allocator for table objects.
+ * @param capacity Size of the table (must be a power of 2).
+ *
+ * Allocate with enough space for the table of entries.
+ * Also align on a cache line.
+ */
+T_CHMIMPL
+void* CHMIMPL::Table::operator new (size_t, size_t capacity)
+{
+ void* memptr = nullptr;
+ // Allocate aligned memory block.
+ // The Table structure includes one entry at the end,
+ // so subtract 1 from capacity.
+ posix_memalign (&memptr, CACHELINE, sizeof(Table) + (capacity-1)*sizeof(entry_t));
+ if (!memptr) std::abort();
+ return memptr;
+}
+
+
+/**
+ * @brief Deallocator for table objects.
+ */
+T_CHMIMPL
+void CHMIMPL::Table::operator delete (void* p)
+{
+ free (p);
+}
+
+
+/**
+ * @brief Find a table entry for reading.
+ * @param key The key for which to search.
+ * @param hash The hash of the key.
+ *
+ * Returns the matching entry, or nullptr.
+ */
+T_CHMIMPL
+size_t CHMIMPL::Table::probeRead (val_t key, size_t hash) const
+{
+ // Iterate over table probes.
+ // We don't need to check more than the longest probe sequence
+ // used so far.
+ TableIterator it (hash, m_mask, m_maskBits, m_longestProbe);
+ do {
+ size_t offset = it.offset();
+ const entry_t* ent = m_entries + offset;
+ if (ent->m_key == nullval) {
+ // If we hit an empty key, report failure.
+ return INVALID;
+ }
+ if (m_matcher (ent->m_key, key)) {
+ // Found a matching key.
+ return offset;
+ }
+ } while (it.next());
+ // Too many probes --- return failure.
+ return INVALID;
+}
+
+
+/**
+ * @brief Find a table entry for writing.
+ * @param key The key for which to search.
+ * @param hash The hash of the key.
+ * @param entry[out] The entry found.
+ *
+ * If we find the entry, return true with @c entry pointing at it.
+ * If we don't find it, and there's still room in the table, return false
+ * with @c entry pointing at the next empty entry.
+ * Otherwise, return false with @c entry set to nullptr.
+ */
+T_CHMIMPL
+size_t CHMIMPL::Table::probeWrite (val_t key, size_t hash, bool& insert)
+{
+ // Iterate over table probes.
+ TableIterator it (hash, m_mask, m_maskBits, m_maxProbe);
+ do {
+ size_t offset = it.offset();
+ entry_t* ent = m_entries + offset;
+ if (ent->m_key == nullval) {
+ // We hit an empty key; a new entry could be added here.
+ // Update the longest probe count.
+ CxxUtils::atomic_fetch_max (&m_longestProbe, it.nprobes()+1);
+ insert = true;
+ return offset;
+ }
+ if (m_matcher (ent->m_key, key)) {
+ // Found a matching key.
+ insert = false;
+ return offset;
+ }
+ } while (it.next());
+ // Too many probes --- return failure.
+ return INVALID;
+}
+
+
+/**
+ * @brief The number of entries in the table.
+ */
+T_CHMIMPL
+inline
+size_t CHMIMPL::Table::capacity() const
+{
+ return m_capacity;
+}
+
+
+/**
+ * @brief Return the entry for an offset.
+ * @param offset The index of the desired entry.
+ */
+T_CHMIMPL
+inline
+const typename CHMIMPL::entry_t& CHMIMPL::Table::entry (size_t offset) const
+{
+ return m_entries[offset];
+}
+
+
+/**
+ * @brief Return the entry for an offset (non-const).
+ * @param offset The index of the desired entry.
+ */
+T_CHMIMPL
+inline
+typename CHMIMPL::entry_t& CHMIMPL::Table::entry (size_t offset)
+{
+ return m_entries[offset];
+}
+
+
+//*****************************************************************************
+
+
+/**
+ * @brief Constructor.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity Minimum initial table size.
+ * @param hasher Hash object to use.
+ * @param matcher Key match object to use.
+ * @param ctx Execution context.
+ */
+T_CHMIMPL
+CHMIMPL::ConcurrentHashmapImpl (Updater_t&& updater,
+ size_t capacity_in,
+ const Hasher_t& hasher,
+ const Matcher_t& matcher,
+ const typename Updater_t::Context_t& ctx)
+ : m_updater (std::move (updater)),
+ m_hasher (hasher),
+ m_matcher (matcher),
+ m_size (0)
+{
+ // Round up capacity to a power of 2.
+ size_t capacity = round_up (capacity_in);
+
+ m_table = new (capacity) Table (capacity, hasher, matcher);
+ m_updater.update (std::unique_ptr<Table> (m_table), ctx);
+}
+
+
+/**
+ * @brief Add an entry to the table.
+ * @param key The key to insert.
+ * @param hash The hash of the key.
+ * @param val The value to insert.
+ * @param overwrite If true, then overwrite an existing entry.
+ * If false, an existing entry will not be changed.
+ * @param ctx Execution context.
+ *
+ * If the key already exists, then its value will be updated.
+ * Returns an iterator pointing at the entry and a flag which is
+ * true if a new element was added.
+ */
+T_CHMIMPL
+std::pair<typename CHMIMPL::const_iterator, bool>
+CHMIMPL::put (val_t key, size_t hash, val_t val, bool overwrite,
+ const typename Updater_t::Context_t& ctx)
+{
+ assert (key != nullval);
+ lock_t lock (m_mutex);
+
+ do {
+ bool insert;
+ size_t offset = m_table->probeWrite (key, hash, insert);
+ if (offset != INVALID) {
+ entry_t& ent = m_table->entry (offset);
+ if (insert) {
+ // Found a place to put it.
+ // Be sure not to set the key until the value is in place.
+ ent.m_val = val;
+ ent.m_key = key;
+ ++m_size;
+ }
+ else {
+ // Found --- update the entry if wanted.
+ if (overwrite) {
+ if (val != ent.m_val) {
+ ent.m_val = val;
+ }
+ }
+ }
+ return std::make_pair (const_iterator (*m_table, offset), insert);
+ }
+
+ // Need to grow the table.
+ } while (grow (lock, ctx));
+
+ // grow() failed.
+ return std::make_pair (end(), false);
+}
+
+
+/**
+ * @brief Look up an entry in the table.
+ * @param key The key to find.
+ * @param hash The hash of the key.
+ *
+ * Returns an iterator pointing at the found entry, or end().
+ */
+T_CHMIMPL
+typename CHMIMPL::const_iterator CHMIMPL::get (val_t key, size_t hash) const
+{
+ const Table& table = m_updater.get();
+ size_t offset = table.probeRead (key, hash);
+ // Offset will be -1 if not found --- invalid iterator.
+ return const_iterator (table, offset);
+}
+
+
+/**
+ * @brief Return the number of items currently stored.
+ */
+T_CHMIMPL
+size_t CHMIMPL::size() const
+{
+ return m_size;
+}
+
+
+/**
+ * @brief Return the current table size.
+ */
+T_CHMIMPL
+size_t CHMIMPL::capacity() const
+{
+ const Table& table = m_updater.get();
+ return table.capacity();
+}
+
+
+/**
+ * @brief Return the hasher object.
+ */
+T_CHMIMPL
+inline
+const typename CHMIMPL::Hasher_t& CHMIMPL::hasher() const
+{
+ return m_hasher;
+}
+
+
+/**
+ * @brief Return the matcher object.
+ */
+T_CHMIMPL
+inline
+const typename CHMIMPL::Matcher_t& CHMIMPL::matcher() const
+{
+ return m_matcher;
+}
+
+
+/**
+ * @brief Constructor.
+ * @param table The table instance we're referencing.
+ * @param end If true, initialize this to an end iterator.
+ * Otherwise, initialize it to a a begin iterator.
+ */
+T_CHMIMPL
+inline
+CHMIMPL::const_iterator::const_iterator (const Table& table, bool end)
+ : m_table (table),
+ m_offset (INVALID)
+{
+ // For an end iterator, we want offset to be -1.
+ // For a begin iterator, we need to advance to the first non-null entry.
+ if (!end) {
+ next();
+ }
+}
+
+
+/**
+ * @brief Constructor.
+ * @param table The table instance we're referencing.
+ * @param offset Offset of the iterator within the table.
+ * (Must point at an occupied entry.)
+ */
+T_CHMIMPL
+CHMIMPL::const_iterator::const_iterator (const Table& table, size_t offset)
+ : m_table (table),
+ m_offset (offset)
+{
+ assert (offset == INVALID || m_table.entry (offset).m_key != nullval);
+}
+
+
+/**
+ * @brief Advance the iterator to the next occupied entry.
+ */
+T_CHMIMPL
+inline
+void CHMIMPL::const_iterator::next()
+{
+ do {
+ ++m_offset;
+ if (m_offset >= m_table.capacity()) {
+ m_offset = INVALID;
+ break;
+ }
+ } while (m_table.entry (m_offset).m_key == nullval);
+}
+
+
+/**
+ * @brief Move the iterator back to the previous occupied entry.
+ */
+T_CHMIMPL
+inline
+void CHMIMPL::const_iterator::prev()
+{
+ if (m_offset == INVALID) {
+ m_offset = m_table.capacity();
+ }
+ do {
+ --m_offset;
+ if (m_offset >= m_table.capacity()) {
+ m_offset = INVALID;
+ break;
+ }
+ } while (m_table.entry (m_offset).m_key == nullval);
+}
+
+
+/**
+ * @brief Return the key for this iterator.
+ */
+T_CHMIMPL
+inline
+typename CHMIMPL::val_t CHMIMPL::const_iterator::key() const
+{
+ return m_table.entry (m_offset).m_key;
+}
+
+
+/**
+ * @brief Return the value for this iterator.
+ */
+T_CHMIMPL
+inline
+typename CHMIMPL::val_t CHMIMPL::const_iterator::value() const
+{
+ return m_table.entry (m_offset).m_val;
+}
+
+
+/**
+ * @brief Compare two iterators.
+ */
+T_CHMIMPL
+inline
+bool CHMIMPL::const_iterator::operator!= (const const_iterator& other) const
+{
+ if (m_offset != other.m_offset) return true;
+ if (m_offset == INVALID) return false;
+ return &m_table != &other.m_table;
+}
+
+
+/**
+ * @brief Check that the iterator is valid (not pointing at the end).
+ */
+T_CHMIMPL
+inline
+bool CHMIMPL::const_iterator::valid() const
+{
+ return m_offset != INVALID;
+}
+
+
+/**
+ * @brief Return a range that can be used to iterate over the container.
+ */
+T_CHMIMPL
+inline
+typename CHMIMPL::const_iterator_range CHMIMPL::range() const
+{
+ const Table& table = m_updater.get();
+ return const_iterator_range (const_iterator (table, false),
+ const_iterator (table, true));
+}
+
+
+/**
+ * @brief A begin iterator for the container.
+ */
+T_CHMIMPL
+inline
+typename CHMIMPL::const_iterator CHMIMPL::begin() const
+{
+ const Table& table = m_updater.get();
+ return const_iterator (table, false);
+}
+
+
+/**
+ * @brief An end iterator for the container.
+ */
+T_CHMIMPL
+inline
+typename CHMIMPL::const_iterator CHMIMPL::end() const
+{
+ const Table& table = m_updater.get();
+ return const_iterator (table, true);
+}
+
+
+/**
+ * @brief Erase the table and change the capacity.
+ * @param capacity The new table capacity.
+ * @param ctx Execution context.
+ *
+ * Returns an iterator pointing at the start of the old table.
+ */
+T_CHMIMPL
+typename CHMIMPL::const_iterator
+CHMIMPL::clear (size_t capacity,
+ const typename Updater_t::Context_t& ctx)
+{
+ capacity = round_up (capacity);
+ lock_t lock (m_mutex);
+ std::unique_ptr<Table> new_table (new (capacity) Table (capacity,
+ m_hasher,
+ m_matcher));
+
+ // Save an iterator to the old table.
+ const_iterator it = begin();
+
+ // Publish the new table.
+ m_size = 0;
+ m_table = new_table.get();
+ m_updater.update (std::move (new_table), ctx);
+ return it;
+}
+
+
+/**
+ * @brief Erase the table (don't change the capacity).
+ * @param ctx Execution context.
+ *
+ * Returns an iterator pointing at the start of the old table.
+ */
+T_CHMIMPL
+typename CHMIMPL::const_iterator
+CHMIMPL::clear (const typename Updater_t::Context_t& ctx)
+{
+ const Table& table = m_updater.get();
+ // Possible race here in that the container capacity could increase
+ // before we take out the lock in clear(). In practice, this should
+ // not actually be a problem.
+ return clear (table.capacity(), ctx);
+}
+
+
+/**
+ * @brief Increase the table capacity.
+ * @param capacity The new table capacity.
+ * @param ctx Execution context.
+ *
+ * No action will be taken in @c capacity is smaller
+ * than the current capacity.
+ */
+T_CHMIMPL
+void CHMIMPL::reserve (size_t capacity,
+ const typename Updater_t::Context_t& ctx)
+{
+ lock_t lock (m_mutex);
+ if (capacity < m_table->capacity()) return;
+ grow (lock, round_up (capacity), ctx);
+}
+
+
+/**
+ * @brief Called when this thread is no longer referencing anything
+ * from this container.
+ * @param ctx Execution context.
+ */
+T_CHMIMPL
+void CHMIMPL::quiescent (const typename Updater_t::Context_t& ctx)
+{
+ m_updater.quiescent (ctx);
+}
+
+
+/**
+ * @brief Make the table larger.
+ * @param ctx Execution context.
+ *
+ * Must be holding a lock on the mutex to call this.
+ */
+T_CHMIMPL
+bool CHMIMPL::grow (lock_t& lock, const typename Updater_t::Context_t& ctx)
+{
+ // Allocate a new table with twice the capacity.
+ return grow (lock, 2*m_table->capacity(), ctx);
+}
+
+
+/**
+ * @brief Make the table larger.
+ * @param new_capacity The new table capacity (must be a power of 2).
+ * @param ctx Execution context.
+ *
+ * Must be holding a lock on the mutex to call this.
+ */
+T_CHMIMPL
+bool CHMIMPL::grow (lock_t& /*lock*/,
+ size_t new_capacity,
+ const typename Updater_t::Context_t& ctx)
+{
+ // The current table.
+ const Table& table = *m_table;
+
+ std::unique_ptr<Table> new_table (new (new_capacity) Table (new_capacity,
+ m_hasher,
+ m_matcher));
+
+ // Copy data from the existing table to the new one.
+ size_t capacity = table.capacity();
+ for (size_t i = 0; i < capacity; i++) {
+ const entry_t& ent = table.entry(i);
+ if (ent.m_key != nullval) {
+ size_t hash = m_hasher (ent.m_key);
+ bool insert;
+ size_t offset = new_table->probeWrite (ent.m_key, hash, insert);
+ if (offset == INVALID) {
+ std::abort();
+ }
+ entry_t& new_entry = new_table->entry (offset);
+ new_entry.m_key = static_cast<val_t> (ent.m_key);
+ new_entry.m_val = static_cast<val_t> (ent.m_val);
+ }
+ }
+
+ // Publish the new table.
+ m_table = new_table.get();
+ m_updater.update (std::move (new_table), ctx);
+
+ return true;
+}
+
+
+/**
+ * @brief Round up to a power of 2.
+ * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+ */
+T_CHMIMPL
+uint64_t CHMIMPL::round_up (uint64_t x)
+{
+ if (x <= 64) return 64;
+ --x;
+ x |= (x>>1);
+ x |= (x>>2);
+ x |= (x>>4);
+ x |= (x>>8);
+ x |= (x>>16);
+ x |= (x>>32);
+ ++x;
+ return x;
+}
+
+
+#undef CHMIMPL
+#undef T_CHMIMPL
+
+
+
+} // namespace detail
+} // namespace CxxUtils
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
index b4aaaef30ceeedca30744ec356b91638a8894281..b7b0a3c8292862c2aa9e9bd4f6e88dc89cb2e59a 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
+++ b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
@@ -390,7 +390,7 @@ public:
/**
* @brief Update all range objects.
- * @param rangeUpater Functional to call on each range object.
+ * @param rangeUpdater Functional to call on each range object.
* @param ctx Execution context.
*
* This will iterate through the list of entries and call @c rangeUpdater
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentStrMap.h b/Control/CxxUtils/CxxUtils/ConcurrentStrMap.h
new file mode 100644
index 0000000000000000000000000000000000000000..df1286a5eea64ab5a778c3a57256d36ffdc28ad7
--- /dev/null
+++ b/Control/CxxUtils/CxxUtils/ConcurrentStrMap.h
@@ -0,0 +1,527 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/ConcurrentStrMap.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Hash map from strings allowing concurrent, lockless reads.
+ */
+
+
+#ifndef CXXUTILS_CONCURRENTSTRMAP_H
+#define CXXUTILS_CONCURRENTSTRMAP_H
+
+
+#include "CxxUtils/ConcurrentHashmapImpl.h"
+#include "CxxUtils/concepts.h"
+#include "boost/iterator/iterator_facade.hpp"
+#include "boost/range/iterator_range.hpp"
+#include <type_traits>
+#include <stdexcept>
+
+
+namespace CxxUtils {
+
+
+/**
+ * @brief Hash map from strings allowing concurrent, lockless reads.
+ *
+ * This class implements a hash map from strings.
+ * The mapped type may be a pointer or any numeric type that can
+ * fit in a uintptr_t.
+ * It allows for concurrent access from many threads.
+ * Reads can proceed without taking out a lock, while writes are serialized
+ * with each other. Thus, this is appropriate for maps which are read-mostly.
+ *
+ * This is based on ConcurrentHashmapImpl.
+ *
+ * Besides the mapped value type,
+ * this class is templated on an UPDATER class, which is used to manage
+ * the underlying memory. The requirements are the same as for the
+ * UPDATER template argument of ConcurrentTangeMap; see there for
+ * further details. (AthenaKernel/RCUUpdater is a concrete version
+ * that should work in the context of Athena.)
+ *
+ * This mostly supports the interface of std::unordered_map, with a few
+ * differences / omissions:
+ *
+ * - Dereferencing the iterator returns a structure by value, not a reference.
+ * - No try_emplace.
+ * - No insert methods with hints.
+ * - No swap(). Could probably be implemented if really needed, but would
+ * require support in ConcurrentHashmapImpl and in the Updater classes.
+ * - No clear(). Could be implemented if really needed; we would need
+ * to be able to attach the key strings to be deleted to the old
+ * table instance.
+ * - No erase() methods. In addition to what's needed for clear(),
+ * the underlying hash table would need to support tombstones.
+ * - No operator==.
+ * - Nothing dealing with the bucket/node interface or merge().
+ *
+ * Possible improvements:
+ *
+ * - We could speed up lookups further by storing the hash along with
+ * the string. That way, we should almost always not have to do
+ * the full string comparison more than once.
+ *
+ * - We could use a more efficient allocator for the string keys
+ * that we need to save. That could in particular help for updates,
+ * where currently we always need to allocate a string, and then
+ * need to delete it if it turns out we're doing an update rather
+ * than in insertion.
+ */
+template <class VALUE, template <class> class UPDATER>
+// FIXME: Check UPDATER too.
+ATH_REQUIRES (std::is_pod_v<VALUE> &&
+ (sizeof (VALUE) <= sizeof (uintptr_t)))
+class ConcurrentStrMap
+{
+private:
+ /// The underlying uint->uint hash table.
+ struct Hasher;
+ struct Matcher;
+ using Impl_t = typename detail::ConcurrentHashmapImpl<UPDATER, Hasher, Matcher>;
+ /// Representation type in the underlying map.
+ using val_t = CxxUtils::detail::ConcurrentHashmapVal_t;
+
+
+public:
+ /// Standard STL types.
+ using key_type = std::string;
+ using mapped_type = VALUE;
+ using size_type = size_t;
+ /// Updater object.
+ using Updater_t = typename Impl_t::Updater_t;
+ /// Context type.
+ using Context_t = typename Updater_t::Context_t;
+
+ /// Ensure that the underlying map can store our mapped_type.
+ static_assert( sizeof(typename Impl_t::val_t) >= sizeof(mapped_type) );
+
+
+ /**
+ * @brief Constructor.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity The initial table capacity.
+ * (Will be rounded up to a power of two.)
+ * @param ctx Execution context.
+ */
+ ConcurrentStrMap (Updater_t&& updater,
+ size_type capacity = 64,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+ /**
+ * @brief Constructor from another map.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity The initial table capacity of the new table.
+ * (Will be rounded up to a power of two.)
+ * @param ctx Execution context.
+ *
+ * (Not really a copy constructor since we need to pass @c updater.)
+ */
+ ConcurrentStrMap (const ConcurrentStrMap& other,
+ Updater_t&& updater,
+ size_t capacity = 64,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+
+ /**
+ * @brief Constructor from a range.
+ * @param f Start iterator for the range.
+ * @param l End iterator for the range.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity The initial table capacity of the new table.
+ * (Will be rounded up to a power of two.)
+ * @param ctx Execution context.
+ *
+ * Constructor from a range of pairs.
+ */
+ template <class InputIterator>
+ ConcurrentStrMap (InputIterator f,
+ InputIterator l,
+ Updater_t&& updater,
+ size_type capacity = 64,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+
+ /// Copy / move / assign not supported.
+ ConcurrentStrMap (const ConcurrentStrMap& other) = delete;
+ ConcurrentStrMap (ConcurrentStrMap&& other) = delete;
+ ConcurrentStrMap& operator= (const ConcurrentStrMap& other) = delete;
+ ConcurrentStrMap& operator= (ConcurrentStrMap&& other) = delete;
+
+
+ /**
+ * @brief Destructor.
+ */
+ ~ConcurrentStrMap();
+
+
+ /**
+ * @brief Return the number of items currently in the map.
+ */
+ size_type size() const;
+
+
+ /**
+ * @brief Test if the map is currently empty.
+ */
+ bool empty() const;
+
+
+ /**
+ * @brief Return the current size (capacity) of the hash table.
+ */
+ size_t capacity() const;
+
+
+ /**
+ * @brief Value structure for iterators.
+ *
+ * For a map from K to V, a STL-style iterator should dereference
+ * to a std::pair<const K, V>. However, we don't actually store an object
+ * like that anywhere. In order to be able to have STL-like iterators,
+ * we instead use a pair where the first element is a const reference
+ * to the std::string key. We will
+ * return this _by value_ when we deference an iterator.
+ * (The compiler should be able to optimize out the redundant
+ * packing and unpacking of fields.)
+ */
+ using const_iterator_value = std::pair<const key_type&, mapped_type>;
+
+
+ /**
+ * @brief Iterator class.
+ *
+ * This uses boost::iterator_facade to define the methods required
+ * by an STL iterator in terms of the private methods below.
+ *
+ * Since dereference() will be returning a const_iterator_value by value,
+ * we also need to override the reference type.
+ */
+ class const_iterator
+ : public boost::iterator_facade<const_iterator,
+ const const_iterator_value,
+ std::bidirectional_iterator_tag,
+ const const_iterator_value>
+ {
+ public:
+ /**
+ * @brief Constructor.
+ * @param it Iterator of the underlying table.
+ */
+ const_iterator (typename Impl_t::const_iterator it);
+
+
+ /**
+ * @brief Test if this iterator is value.
+ *
+ * This should be the same as testing for != end().
+ */
+ bool valid() const;
+
+
+ private:
+ /// Required by iterator_facade.
+ friend class boost::iterator_core_access;
+
+
+ /**
+ * @brief iterator_facade requirement: Increment the iterator.
+ */
+ void increment();
+
+
+ /**
+ * @brief iterator_facade requirement: Decrement the iterator.
+ */
+ void decrement();
+
+
+ /**
+ * @brief iterator_facade requirement: Equality test.
+ */
+ bool equal (const const_iterator& other) const;
+
+
+ /**
+ * @brief iterator_facade requirement: Dereference the iterator.
+ */
+ const const_iterator_value dereference() const;
+
+
+ /// The iterator on the underlying table.
+ typename Impl_t::const_iterator m_impl;
+ };
+
+
+ /// A range defined by two iterators.
+ typedef boost::iterator_range<const_iterator> const_iterator_range;
+
+
+ /**
+ * @brief Return an interator range covering the entire map.
+ */
+ const_iterator_range range() const;
+
+
+ /**
+ * @brief Iterator at the start of the map.
+ */
+ const_iterator begin() const;
+
+
+ /**
+ * @brief Iterator at the end of the map.
+ */
+ const_iterator end() const;
+
+
+ /**
+ * @brief Iterator at the start of the map.
+ */
+ const_iterator cbegin() const;
+
+
+ /**
+ * @brief Iterator at the end of the map.
+ */
+ const_iterator cend() const;
+
+
+ /**
+ * @brief Test if a key is in the container.
+ * @param key The key to test.
+ */
+ bool contains (const key_type& key) const;
+
+
+ /**
+ * @brief Return the number of times a given key is in the container.
+ * @param key The key to test.
+ *
+ * Returns either 0 or 1, depending on whether or not the key is in the map.
+ */
+ size_type count (const key_type& key) const;
+
+
+ /**
+ * @brief Look up an element in the map.
+ * @param key The element to find.
+ *
+ * Returns either an iterator referencing the found element or end().
+ */
+ const_iterator find (const key_type& key) const;
+
+
+ /**
+ * @brief Look up an element in the map.
+ * @param key The element to find.
+ *
+ * Returns the value associated with the key.
+ * Throws @c std::out_of_range if the key does not exist in the map.
+ */
+ mapped_type at (const std::string& key) const;
+
+
+ /**
+ * @brief Return a range of iterators with entries matching @c key.
+ * @param key The element to find.
+ *
+ * As keys are unique in this container, this is either a single-element
+ * range, or both iterators are equal to end().
+ */
+ std::pair<const_iterator, const_iterator>
+ equal_range (const key_type& key) const;
+
+
+ /**
+ * @brief Add an element to the map.
+ * @param key The key of the new item to add.
+ * @param val The value of the new item to add.
+ * @param ctx Execution context.
+ *
+ * This will not overwrite an existing entry.
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+ std::pair<const_iterator, bool>
+ emplace (const key_type& key, mapped_type val,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+
+ /**
+ * @brief Add an element to the map, or overwrite an existing one.
+ * @param key The key of the new item to add.
+ * @param val The value of the new item to add.
+ * @param ctx Execution context.
+ *
+ * This will overwrite an existing entry.
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+ std::pair<const_iterator, bool>
+ insert_or_assign (const key_type& key, mapped_type val,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+
+ /**
+ * @break Add an element to the map.
+ * @param p The item to add.
+ * Should be a pair where first is the string key
+ * and second is the integer value.
+ *
+ * This will not overwrite an existing entry.
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+ template <class PAIR>
+ std::pair<const_iterator, bool> insert (const PAIR& p);
+
+
+ /**
+ * @brief Insert a range of elements to the map.
+ * @param first Start of the range.
+ * @param last End of the range.
+ *
+ * The range should be a sequence of pairs where first is the string key
+ * and second is the integer value.
+ */
+ template <class InputIterator>
+ void insert (InputIterator first, InputIterator last);
+
+
+ /**
+ * @brief Increase the table capacity.
+ * @param capacity The new table capacity.
+ * @param ctx Execution context.
+ *
+ * No action will be taken in @c capacity is smaller
+ * than the current capacity.
+ */
+ void reserve (size_type capacity,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+
+ /**
+ * @brief Increase the table capacity.
+ * @param capacity The new table capacity.
+ *
+ * No action will be taken in @c capacity is smaller
+ * than the current capacity.
+ */
+ void rehash (size_type capacity);
+
+
+ /**
+ * @brief Called when this thread is no longer referencing anything
+ * from this container.
+ * @param ctx Execution context.
+ */
+ void quiescent (const Context_t& ctx);
+
+
+private:
+ /**
+ * @brief Convert an underlying key value to a string pointer.
+ * @param val The underlying key value.
+ */
+ static const std::string* keyAsString (val_t val);
+
+
+ /**
+ * @brief Convert a string pointer to an underlying key value.
+ * @param val The string pointer.
+ */
+ static val_t keyAsVal (const std::string* s);
+
+
+ /**
+ * @brief Convert an underlying mapped value to this type's mapped value.
+ * @param val The underlying mapped value.
+ */
+ static mapped_type mappedAsMapped (val_t val);
+
+
+ /**
+ * @brief Convert this type's mapped value to an underlying mapped value.
+ * @param val THe mapped value.
+ */
+ static val_t mappedAsVal (mapped_type val);
+
+
+ /**
+ * @brief Do a lookup in the table.
+ * @param key The key to look up.
+ *
+ * Returns an iterator of the underlying map pointing at the found
+ * entry or end();
+ */
+ typename Impl_t::const_iterator get (const key_type& key) const;
+
+
+ /**
+ * @brief Insert / overwrite an entry in the table.
+ * @param key The key of the new item to add.
+ * @param val The value of the new item to add.
+ * @param overwrite If true, allow overwriting an existing entry.
+ * @param ctx Execution context.
+ *
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+ std::pair<const_iterator, bool>
+ put (const key_type& key,
+ mapped_type val,
+ bool overwrite = true,
+ const Context_t& ctx = Updater_t::defaultContext());
+
+
+ /**
+ * @brief Hash functional for keys.
+ *
+ * The key can be either a std::string or the representation type
+ * used by the underlying map.
+ */
+ struct Hasher
+ {
+ /// Hash function from the underlying representation type.
+ size_t operator() (const val_t p) const;
+ /// Hash function from a std::string.
+ size_t operator() (const std::string& s) const;
+ /// Hash functional.
+ std::hash<std::string> m_hash;
+ };
+
+
+ /**
+ * @brief Matching functional for keys.
+ */
+ struct Matcher
+ {
+ /// Compare two keys (as the underlying representation type) for equality.
+ bool operator() (const val_t a, const val_t b) const;
+ };
+
+
+ /// The underlying hash table.
+ Impl_t m_impl;
+};
+
+
+} // namespace CxxUtils
+
+
+#include "CxxUtils/ConcurrentStrMap.icc"
+
+
+#endif // not CXXUTILS_CONCURRENTSTRMAP_H
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentStrMap.icc b/Control/CxxUtils/CxxUtils/ConcurrentStrMap.icc
new file mode 100644
index 0000000000000000000000000000000000000000..0dcb244ebbecd69a44cd86746b5869b8b7be9887
--- /dev/null
+++ b/Control/CxxUtils/CxxUtils/ConcurrentStrMap.icc
@@ -0,0 +1,619 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/ConcurrentStrMap.icc
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Hash map from strings to integers allowing concurrent, lockless reads.
+ */
+
+
+namespace CxxUtils {
+
+
+#define T_CONCURRENTSTRMAP template <class VALUE, template <class> class UPDATER>
+#define CONCURRENTSTRMAP ConcurrentStrMap<VALUE, UPDATER>
+
+
+/**
+ * @brief Constructor.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity The initial table capacity.
+ * (Will be rounded up to a power of two.)
+ * @param ctx Execution context.
+ */
+T_CONCURRENTSTRMAP
+CONCURRENTSTRMAP::ConcurrentStrMap (Updater_t&& updater,
+ size_type capacity /*= 64*/,
+ const Context_t& ctx
+ /* = Updater_t::defaultContext()*/)
+ : m_impl (std::move (updater),
+ capacity,
+ Hasher(),
+ Matcher(),
+ ctx)
+{
+}
+
+
+/**
+ * @brief Constructor from another map.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity The initial table capacity of the new table.
+ * (Will be rounded up to a power of two.)
+ * @param ctx Execution context.
+ *
+ * (Not really a copy constructor since we need to pass @c updater.)
+ */
+T_CONCURRENTSTRMAP
+CONCURRENTSTRMAP::ConcurrentStrMap (const ConcurrentStrMap& other,
+ Updater_t&& updater,
+ size_type capacity /*= 64*/,
+ const Context_t& ctx
+ /*= Updater_t::defaultContext()*/)
+ : m_impl (std::move (updater),
+ capacity,
+ Hasher(),
+ Matcher(),
+ ctx)
+{
+ for (const auto& p : other) {
+ this->put (p.first, p.second, true, ctx);
+ }
+}
+
+
+/**
+ * @brief Constructor from a range.
+ * @param f Start iterator for the range.
+ * @param l End iterator for the range.
+ * @param updater Object used to manage memory
+ * (see comments at the start of the class).
+ * @param capacity The initial table capacity of the new table.
+ * (Will be rounded up to a power of two.)
+ * @param ctx Execution context.
+ *
+ * Constructor from a range of pairs.
+ */
+T_CONCURRENTSTRMAP
+template <class InputIterator>
+CONCURRENTSTRMAP::ConcurrentStrMap (InputIterator f,
+ InputIterator l,
+ Updater_t&& updater,
+ size_t capacity /*= 64*/,
+ const Context_t& ctx
+ /*= Updater_t::defaultContext()*/)
+ : m_impl (std::move (updater),
+ capacity,
+ Hasher(),
+ Matcher(),
+ ctx)
+{
+ for (; f != l; ++f) {
+ this->put (f->first, f->second, true, ctx);
+ }
+}
+
+
+/**
+ * @brief Destructor.
+ */
+T_CONCURRENTSTRMAP
+CONCURRENTSTRMAP::~ConcurrentStrMap()
+{
+ // Need to delete the strings that we've stored.
+ auto [begin, end] = m_impl.range();
+ while (begin != end) {
+ if (begin.key() != Impl_t::nullval) {
+ delete keyAsString (begin.key());
+ }
+ begin.next();
+ }
+}
+
+
+/**
+ * @brief Return the number of items currently in the map.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::size() const -> size_type
+{
+ return m_impl.size();
+}
+
+
+/**
+ * @brief Test if the map is currently empty.
+ */
+T_CONCURRENTSTRMAP
+inline
+bool CONCURRENTSTRMAP::empty() const
+{
+ return !m_impl.size();
+}
+
+
+/**
+ * @brief Return the current size (capacity) of the hash table.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::capacity() const -> size_t
+{
+ return m_impl.capacity();
+}
+
+
+/**
+ * @brief Constructor.
+ * @param it Iterator of the underlying table.
+ */
+T_CONCURRENTSTRMAP
+inline
+CONCURRENTSTRMAP::const_iterator::const_iterator (typename Impl_t::const_iterator it)
+ : m_impl (it)
+{
+}
+
+
+/**
+ * @brief Test if this iterator is value.
+ *
+ * This should be the same as testing for != end().
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::const_iterator::valid() const -> bool
+{
+ return m_impl.valid();
+}
+
+
+/**
+ * @brief iterator_facade requirement: Increment the iterator.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::const_iterator::increment() -> void
+{
+ m_impl.next();
+}
+
+
+/**
+ * @brief iterator_facade requirement: Decrement the iterator.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::const_iterator::decrement() -> void
+{
+ m_impl.prev();
+}
+
+
+/**
+ * @brief iterator_facade requirement: Dereference the iterator.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::const_iterator::dereference() const
+ -> const const_iterator_value
+{
+ return const_iterator_value (*keyAsString (m_impl.key()),
+ mappedAsMapped (m_impl.value()));
+}
+
+
+/**
+ * @brief iterator_facade requirement: Equality test.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::const_iterator::equal (const const_iterator& other) const
+ -> bool
+{
+ return !(m_impl != other.m_impl);
+}
+
+
+/**
+ * @brief Return an interator range covering the entire map.
+ */
+T_CONCURRENTSTRMAP
+auto CONCURRENTSTRMAP::range() const -> const_iterator_range
+{
+ auto [begin, end] = m_impl.range();
+ return const_iterator_range (begin, end);
+}
+
+
+/**
+ * @brief Iterator at the start of the map.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::begin() const -> const_iterator
+{
+ return const_iterator (m_impl.begin());
+}
+
+
+/**
+ * @brief Iterator at the end of the map.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::end() const -> const_iterator
+{
+ return const_iterator (m_impl.end());
+}
+
+
+/**
+ * @brief Iterator at the start of the map.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::cbegin() const -> const_iterator
+{
+ return begin();
+}
+
+
+/**
+ * @brief Iterator at the end of the map.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::cend() const -> const_iterator
+{
+ return end();
+}
+
+
+/**
+ * @brief Test if a key is in the container.
+ * @param key The key to test.
+ */
+T_CONCURRENTSTRMAP
+inline
+bool CONCURRENTSTRMAP::contains (const key_type& key) const
+{
+ return get(key).valid();
+}
+
+
+/**
+ * @brief Return the number of times a given key is in the container.
+ * @param key The key to test.
+ *
+ * Returns either 0 or 1, depending on whether or not the key is in the map.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::count (const key_type& key) const -> size_type
+{
+ return contains (key) ? 1 : 0;
+}
+
+
+/**
+ * @brief Look up an element in the map.
+ * @param key The element to find.
+ *
+ * Returns either an iterator referencing the found element or end().
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::find (const key_type& key) const -> const_iterator
+{
+ return const_iterator (this->get (key));
+}
+
+
+/**
+ * @brief Look up an element in the map.
+ * @param key The element to find.
+ *
+ * Returns the value associated with the key.
+ * Throws @c std::out_of_range if the key does not exist in the map.
+ */
+T_CONCURRENTSTRMAP
+auto CONCURRENTSTRMAP::at (const key_type& key) const -> mapped_type
+{
+ typename Impl_t::const_iterator it = this->get (key);
+ if (!it.valid()) {
+ throw std::out_of_range ("ConcurrentStrMap::at");
+ }
+ return mappedAsMapped (it.value());
+}
+
+
+/**
+ * @brief Return a range of iterators with entries matching @c key.
+ * @param key The element to find.
+ *
+ * As keys are unique in this container, this is either a single-element
+ * range, or both iterators are equal to end().
+ */
+T_CONCURRENTSTRMAP
+auto CONCURRENTSTRMAP::equal_range (const key_type& key) const
+ -> std::pair<const_iterator, const_iterator>
+{
+ const_iterator i1 = find (key);
+ const_iterator i2 = i1;
+ if (i2.valid()) {
+ ++i2;
+ }
+ return std::make_pair (i1, i2);
+}
+
+
+/**
+ * @brief Add an element to the map.
+ * @param key The key of the new item to add.
+ * @param val The value of the new item to add.
+ * @param ctx Execution context.
+ *
+ * This will not overwrite an existing entry.
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::emplace (const key_type& key,
+ mapped_type val,
+ const Context_t& ctx
+ /*= Updater_t::defaultContext()*/)
+ -> std::pair<const_iterator, bool>
+{
+ return put (key, val, false, ctx);
+}
+
+
+/**
+ * @brief Add an element to the map, or overwrite an existing one.
+ * @param key The key of the new item to add.
+ * @param val The value of the new item to add.
+ * @param ctx Execution context.
+ *
+ * This will overwrite an existing entry.
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::insert_or_assign (const key_type& key,
+ mapped_type val,
+ const Context_t& ctx
+ /*= Updater_t::defaultContext()*/)
+ -> std::pair<const_iterator, bool>
+{
+ return put (key, val, true, ctx);
+}
+
+
+/**
+ * @break Add an element to the map.
+ * @param p The item to add.
+ * Should be a pair where first is the string key
+ * and second is the integer value.
+ *
+ * This will not overwrite an existing entry.
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+T_CONCURRENTSTRMAP
+template <class PAIR>
+inline
+auto CONCURRENTSTRMAP::insert (const PAIR& p)
+ -> std::pair<const_iterator, bool>
+{
+ return emplace (p.first, p.second);
+}
+
+
+/**
+ * @brief Insert a range of elements to the map.
+ * @param first Start of the range.
+ * @param last End of the range.
+ *
+ * The range should be a sequence of pairs where first is the string key
+ * and second is the integer value.
+ */
+T_CONCURRENTSTRMAP
+template <class InputIterator>
+void CONCURRENTSTRMAP::insert (InputIterator first, InputIterator last)
+{
+ for (; first != last; ++first) {
+ emplace (first->first, first->second);
+ }
+}
+
+
+/**
+ * @brief Increase the table capacity.
+ * @param capacity The new table capacity.
+ * @param ctx Execution context.
+ *
+ * No action will be taken in @c capacity is smaller
+ * than the current capacity.
+ */
+T_CONCURRENTSTRMAP
+inline
+void CONCURRENTSTRMAP::reserve (size_type capacity,
+ const Context_t& ctx
+ /*= Updater_t::defaultContext()*/)
+{
+ return m_impl.reserve (capacity, ctx);
+}
+
+
+/**
+ * @brief Increase the table capacity.
+ * @param capacity The new table capacity.
+ *
+ * No action will be taken in @c capacity is smaller
+ * than the current capacity.
+ */
+T_CONCURRENTSTRMAP
+inline
+void CONCURRENTSTRMAP::rehash (size_type capacity)
+{
+ return reserve (capacity);
+}
+
+
+/**
+ * @brief Called when this thread is no longer referencing anything
+ * from this container.
+ * @param ctx Execution context.
+ */
+T_CONCURRENTSTRMAP
+inline
+void CONCURRENTSTRMAP::quiescent (const Context_t& ctx)
+{
+ return m_impl.quiescent (ctx);
+}
+
+
+/**
+ * @brief Convert an underlying key value to a string pointer.
+ * @param val The underlying key value.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::keyAsString (val_t val) -> const std::string*
+{
+ return reinterpret_cast<std::string*> (val);
+}
+
+
+/**
+ * @brief Convert a string pointer to an underlying key value.
+ * @param val The string pointer.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::keyAsVal (const std::string* s) -> val_t
+{
+ return reinterpret_cast<val_t> (s);
+}
+
+
+/**
+ * @brief Convert an underlying mapped value to this type's mapped value.
+ * @param val The underlying mapped value.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::mappedAsMapped (val_t val) -> mapped_type
+{
+ return reinterpret_cast<mapped_type> (val);
+}
+
+
+/**
+ * @brief Convert this type's mapped value to an underlying mapped value.
+ * @param val THe mapped value.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::mappedAsVal (mapped_type val) -> val_t
+{
+ return reinterpret_cast<val_t> (val);
+}
+
+
+/**
+ * @brief Do a lookup in the table.
+ * @param key The key to look up.
+ *
+ * Returns an iterator of the underlying map pointing at the found
+ * entry or end();
+ */
+T_CONCURRENTSTRMAP
+auto CONCURRENTSTRMAP::get (const key_type& key) const
+ -> typename Impl_t::const_iterator
+{
+ size_t hash = m_impl.hasher() (key);
+ return m_impl.get (keyAsVal(&key), hash);
+}
+
+
+/**
+ * @brief Insert / overwrite an entry in the table.
+ * @param key The key of the new item to add.
+ * @param val The value of the new item to add.
+ * @param overwrite If true, allow overwriting an existing entry.
+ * @param ctx Execution context.
+ *
+ * The first element in the returned pair is an iterator referencing
+ * the added item. The second is a flag that is true if a new element
+ * was added.
+ */
+T_CONCURRENTSTRMAP
+auto CONCURRENTSTRMAP::put (const key_type& key,
+ mapped_type val,
+ bool overwrite /*= true*/,
+ const Context_t& ctx /*= Updater_t::defaultContext()*/)
+ -> std::pair<const_iterator, bool>
+{
+ size_t hash = m_impl.hasher() (key);
+ std::string* newkey = new std::string (key);
+ auto [it, flag] = m_impl.put (keyAsVal(newkey), hash,
+ mappedAsVal (val),
+ overwrite, ctx);
+ if (!flag) delete newkey;
+ return std::make_pair (const_iterator (it), flag);
+}
+
+
+/**
+ * @brief Hash function from the underlying representation type.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::Hasher::operator() (const val_t p) const -> size_t
+{
+ return m_hash (*keyAsString(p));
+}
+
+
+/**
+ * @brief Hash function from a std::string.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::Hasher::operator() (const std::string& s) const -> size_t
+{
+ return m_hash (s);
+}
+
+
+/**
+ * @brief Compare two keys (as the underlying representation type) for equality.
+ */
+T_CONCURRENTSTRMAP
+inline
+auto CONCURRENTSTRMAP::Matcher::operator() (const val_t a, const val_t b) const -> bool
+{
+ // First test if the keys (pointers) themselves are equal.
+ if (a == b) return true;
+ // Otherwise, need to test the strings to which they point.
+ return *keyAsString(a) == *keyAsString(b);
+}
+
+
+#undef T_CONCURRENTSTRMAP
+#undef CONCURRENTSTRMAP
+
+
+} // namespace CxxUtils
diff --git a/Control/CxxUtils/CxxUtils/MurmurHash2.h b/Control/CxxUtils/CxxUtils/MurmurHash2.h
index f07a1e86b92b6dcddc2f35764665f46c8fd7ea23..27169c86d279e0165b62516a0309d6a121ad1560 100644
--- a/Control/CxxUtils/CxxUtils/MurmurHash2.h
+++ b/Control/CxxUtils/CxxUtils/MurmurHash2.h
@@ -1,7 +1,4 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
/*
* Public domain; see below.
*/
@@ -21,7 +18,7 @@
//-----------------------------------------------------------------------------
// MurmurHash2 was written by Austin Appleby, and is placed in the public
-
+// domain. The author hereby disclaims copyright to this source code.
//-----------------------------------------------------------------------------
// Platform-specific functions and macros
diff --git a/Control/CxxUtils/CxxUtils/SimpleUpdater.h b/Control/CxxUtils/CxxUtils/SimpleUpdater.h
new file mode 100644
index 0000000000000000000000000000000000000000..393b62b0cbdaae996efd3d39cc4bb392be296ee0
--- /dev/null
+++ b/Control/CxxUtils/CxxUtils/SimpleUpdater.h
@@ -0,0 +1,109 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/SimpleUpdater.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Simple (non-deleting) Updater implementation.
+ */
+
+
+#ifndef CXXUTILS_SIMPLEUPDATER_H
+#define CXXUTILS_SIMPLEUPDATER_H
+
+
+#include <atomic>
+#include <vector>
+#include <memory>
+
+
+namespace CxxUtils {
+
+
+/**
+ * @brief Simple (non-deleting) Updater implementation.
+ *
+ * This is a simple implementation of the Updater interface as described
+ * in @c ConcurrentRangeMap that does not delete any memory until
+ * the @c SimpleUpdater itself is deleted. This can be useful for,
+ * say, a @c ConcurrentStrMap if you have a good initial guess
+ * for the size of the table.
+ */
+template <class T>
+class SimpleUpdater
+{
+public:
+ /// Context object. Required by the interface, though we don't
+ /// really use it.
+ struct Context_t {};
+
+ /// We need a default constructor.
+ SimpleUpdater() = default;
+
+
+ /**
+ * @brief Move constructor.
+ */
+ SimpleUpdater (SimpleUpdater&& other);
+
+
+ /**
+ * @brief Return a reference to the current object.
+ */
+ const T& get() const;
+
+
+ /**
+ * @brief Install a new object.
+ * @param p The new object to install.
+ * @param ctx Current execution context.
+ *
+ * The existing object should not be deleted until it can no longer
+ * be referenced by any thread.
+ */
+ void update (std::unique_ptr<T> p, const Context_t&);
+
+
+ /**
+ * @brief Queue an object for later deletion.
+ * @param p The object to delete.
+ *
+ * The object @c p will be queued for deletion once a grace period
+ * has passed for all slots. In contrast to using @c update,
+ * this does not change the current object.
+ */
+ void discard (std::unique_ptr<T> p);
+
+
+ /**
+ * @brief Mark that an event slot is not referencing this object.
+ *
+ * A no-op for @c SimpleUpdater.
+ */
+ void quiescent (const Context_t&);
+
+
+ /**
+ * @brief Return the current event context.
+ */
+ static const Context_t defaultContext();
+
+
+private:
+ /// Pointer to the current object.
+ std::atomic<const T*> m_obj = 0;
+
+ /// List of all allocated objects.
+ std::vector<std::unique_ptr<T> > m_objs;
+};
+
+
+} // namespace CxxUtils
+
+
+#include "CxxUtils/SimpleUpdater.icc"
+
+
+#endif // not CXXUTILS_SIMPLEUPDATER_H
diff --git a/Control/CxxUtils/CxxUtils/SimpleUpdater.icc b/Control/CxxUtils/CxxUtils/SimpleUpdater.icc
new file mode 100644
index 0000000000000000000000000000000000000000..3332fab5958ac4b87761d1b71f29fecf2f1c066b
--- /dev/null
+++ b/Control/CxxUtils/CxxUtils/SimpleUpdater.icc
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/SimpleUpdater.icc
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Simple (non-deleting) Updater implementation.
+ */
+
+
+namespace CxxUtils {
+
+
+/**
+ * @brief Move constructor.
+ */
+template <class T>
+SimpleUpdater<T>::SimpleUpdater (SimpleUpdater&& other)
+ : m_obj (static_cast<const T*> (other.m_obj)),
+ m_objs (std::move (other.m_objs))
+{
+}
+
+
+/**
+ * @brief Return a reference to the current object.
+ */
+template <class T>
+inline
+const T& SimpleUpdater<T>::get() const
+{
+ return *m_obj;
+}
+
+
+/**
+ * @brief Install a new object.
+ * @param p The new object to install.
+ * @param ctx Current execution context.
+ *
+ * The existing object should not be deleted until it can no longer
+ * be referenced by any thread.
+ */
+template <class T>
+void SimpleUpdater<T>::update (std::unique_ptr<T> p, const Context_t&)
+{
+ m_objs.push_back (std::move (p));
+ m_obj = m_objs.back().get();
+}
+
+
+/**
+ * @brief Queue an object for later deletion.
+ * @param p The object to delete.
+ *
+ * The object @c p will be queued for deletion once a grace period
+ * has passed for all slots. In contrast to using @c update,
+ * this does not change the current object.
+ */
+template <class T>
+void SimpleUpdater<T>::discard (std::unique_ptr<T> p)
+{
+ m_objs.push_back (std::move (p));
+}
+
+
+/**
+ * @brief Mark that an event slot is not referencing this object.
+ *
+ * A no-op for @c SimpleUpdater.
+ */
+template <class T>
+void SimpleUpdater<T>::quiescent (const Context_t&)
+{
+}
+
+
+/**
+ * @brief Return the current event context.
+ */
+template <class T>
+const typename SimpleUpdater<T>::Context_t SimpleUpdater<T>::defaultContext()
+{
+ return Context_t();
+}
+
+
+} // namespace CxxUtils
+
diff --git a/Control/CxxUtils/CxxUtils/vec.h b/Control/CxxUtils/CxxUtils/vec.h
index 3ab1c057ea22d5f8706e0ad97e5793f807c97ae2..1b072d8098814b70f8f29e439ab93fa1cca3d91d 100644
--- a/Control/CxxUtils/CxxUtils/vec.h
+++ b/Control/CxxUtils/CxxUtils/vec.h
@@ -166,7 +166,7 @@ using ivec = vec_fb<typename boost::int_t<sizeof(T)*8>::exact, N>;
vec_fb<T, N> operator op (const vec_fb<T, N>& a, const vec_fb<T, N>& b) \
{ \
vec_fb<T, N> c; \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
c.m_arr[i] = a.m_arr[i] op b.m_arr[i]; \
return c; \
} \
@@ -175,7 +175,7 @@ using ivec = vec_fb<typename boost::int_t<sizeof(T)*8>::exact, N>;
vec_fb<T, N> operator op (const vec_fb<T, N>& a, U b) \
{ \
vec_fb<T, N> c; \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
c.m_arr[i] = a.m_arr[i] op b; \
return c; \
} \
@@ -184,7 +184,7 @@ using ivec = vec_fb<typename boost::int_t<sizeof(T)*8>::exact, N>;
vec_fb<T, N> operator op (U a, const vec_fb<T, N>& b) \
{ \
vec_fb<T, N> c; \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
c.m_arr[i] = a op b.m_arr[i]; \
return c; \
} \
@@ -192,7 +192,7 @@ using ivec = vec_fb<typename boost::int_t<sizeof(T)*8>::exact, N>;
inline \
vec_fb<T, N>& operator op ## = (vec_fb<T, N>& a, const vec_fb<T, N>& b) \
{ \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
a.m_arr[i] op ## = b.m_arr[i]; \
return a; \
} \
@@ -200,7 +200,7 @@ using ivec = vec_fb<typename boost::int_t<sizeof(T)*8>::exact, N>;
inline \
vec_fb<T, N>& operator op ## = (vec_fb<T, N>& a, U b) \
{ \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
a.m_arr[i] op ## = b; \
return a; \
}
@@ -229,7 +229,7 @@ BINOP(<<)
vec_fb<T, N> operator op (const vec_fb<T, N>& a) \
{ \
vec_fb<T, N> c; \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
c.m_arr[i] = op a.m_arr[i]; \
return c; \
} \
@@ -251,7 +251,7 @@ UNOP(~)
ivec<T, N> operator op (const vec_fb<T, N>& a, const vec_fb<T, N>& b) \
{ \
ivec<T, N> c; \
- for (size_t i = 0; i < N; i++) \
+ for (size_t i = 0; i < N; ++i) \
c.m_arr[i] = a.m_arr[i] op b.m_arr[i]; \
return c; \
}
@@ -273,7 +273,7 @@ inline
ivec<T, N> operator! (const vec_fb<T, N>& a)
{
ivec<T, N> c;
- for (size_t i = 0; i < N; i++)
+ for (size_t i = 0; i < N; ++i)
c.m_arr[i] = a.m_arr[i] == 0;
return c;
}
@@ -285,7 +285,7 @@ inline
ivec<T, N> operator&& (const vec_fb<T, N>& a, const vec_fb<T, N>& b)
{
ivec<T, N> c;
- for (size_t i = 0; i < N; i++)
+ for (size_t i = 0; i < N; ++i)
c.m_arr[i] = (a.m_arr[i]!=0) & (b.m_arr[i]!=0);
return c;
}
@@ -297,7 +297,7 @@ inline
ivec<T, N> operator&& (U a, const vec_fb<T, N>& b)
{
ivec<T, N> c;
- for (size_t i = 0; i < N; i++)
+ for (size_t i = 0; i < N; ++i)
c.m_arr[i] = a ? b.m_arr[i] != 0 : 0;
return c;
}
@@ -309,7 +309,7 @@ inline
ivec<T, N> operator&& (const vec_fb<T, N>& a, U b)
{
ivec<T, N> c;
- for (size_t i = 0; i < N; i++)
+ for (size_t i = 0; i < N; ++i)
c.m_arr[i] = (a.m_arr[i]!=0) & (b ? -1 : 0);
return c;
}
@@ -321,7 +321,7 @@ inline
ivec<T, N> operator|| (const vec_fb<T, N>& a, const vec_fb<T, N>& b)
{
ivec<T, N> c;
- for (size_t i = 0; i < N; i++)
+ for (size_t i = 0; i < N; ++i)
c.m_arr[i] = (a.m_arr[i]!=0) | (b.m_arr[i]!=0);
return c;
}
@@ -416,7 +416,7 @@ vbroadcast(VEC& v, T x)
// This may look inefficient, but the loop goes away when we
// compile with optimization.
constexpr size_t N = CxxUtils::vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
+ for (size_t i = 0; i < N; ++i) {
v[i] = x;
}
#else
@@ -461,7 +461,7 @@ vselect(VEC& dst, const VEC& a, const VEC& b, const mask_type_t<VEC>& mask)
{
#if !HAVE_VECTOR_TERNARY_OPERATOR || WANT_VECTOR_FALLBACK
constexpr size_t N = vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
+ for (size_t i = 0; i < N; ++i) {
dst[i] = mask[i] ? a[i] : b[i];
}
#else
@@ -479,7 +479,7 @@ vmin(VEC& dst, const VEC& a, const VEC& b)
{
#if !HAVE_VECTOR_TERNARY_OPERATOR || WANT_VECTOR_FALLBACK
constexpr size_t N = vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
+ for (size_t i = 0; i < N; ++i) {
dst[i] = a[i] < b[i] ? a[i] : b[i];
}
#else
@@ -497,7 +497,7 @@ vmax(VEC& dst, const VEC& a, const VEC& b)
{
#if !HAVE_VECTOR_TERNARY_OPERATOR || WANT_VECTOR_FALLBACK
constexpr size_t N = vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
+ for (size_t i = 0; i < N; ++i) {
dst[i] = a[i] > b[i] ? a[i] : b[i];
}
#else
diff --git a/Control/CxxUtils/Root/MurmurHash2.cxx b/Control/CxxUtils/Root/MurmurHash2.cxx
index 64d27e4a11857983c5d298e2edb52bad07347586..4311c5b2a00e11f9e7282b00d041d5822a863799 100644
--- a/Control/CxxUtils/Root/MurmurHash2.cxx
+++ b/Control/CxxUtils/Root/MurmurHash2.cxx
@@ -1,6 +1,3 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
/*
* Public domain; see below.
*/
@@ -16,6 +13,7 @@
//-----------------------------------------------------------------------------
// MurmurHash2 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
// Note - This code makes a few assumptions about how your machine behaves -
diff --git a/Control/CxxUtils/share/ConcurrentHashmapImpl_test.ref b/Control/CxxUtils/share/ConcurrentHashmapImpl_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..e5e8e03457422125cab65d8e31a9802901a186c4
--- /dev/null
+++ b/Control/CxxUtils/share/ConcurrentHashmapImpl_test.ref
@@ -0,0 +1,5 @@
+CxxUtils/ConcurrentHashmapImpl_test
+test1
+test2
+test3
+test4
diff --git a/Control/CxxUtils/share/ConcurrentStrMap_test.ref b/Control/CxxUtils/share/ConcurrentStrMap_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..446c7706dc0f3347f46aa6200cab09e7929ada47
--- /dev/null
+++ b/Control/CxxUtils/share/ConcurrentStrMap_test.ref
@@ -0,0 +1,5 @@
+CxxUtils/ConcurrentStrMap_test
+test1
+test2
+test3
+test4
diff --git a/Control/CxxUtils/share/SimpleUpdater_test.ref b/Control/CxxUtils/share/SimpleUpdater_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..01c775296286f863185c240121c995fb515e2a95
--- /dev/null
+++ b/Control/CxxUtils/share/SimpleUpdater_test.ref
@@ -0,0 +1,2 @@
+CxxUtils/SimpleUpdater_test
+test1
diff --git a/Control/CxxUtils/test/ConcurrentHashmapImpl_test.cxx b/Control/CxxUtils/test/ConcurrentHashmapImpl_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..a76085545fd817328540c4c1d0dc9fde9274ad3f
--- /dev/null
+++ b/Control/CxxUtils/test/ConcurrentHashmapImpl_test.cxx
@@ -0,0 +1,571 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/test/ConcurrentHashmapImpl_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Tests for ConcurrentHashmapImpl.
+ */
+
+
+#undef NDEBUG
+#include "CxxUtils/ConcurrentHashmapImpl.h"
+#include <mutex>
+#include <thread>
+#include <shared_mutex>
+#include <vector>
+#include <memory>
+#include <iostream>
+#include <cassert>
+#include <unistd.h>
+
+
+const int nslots = 4;
+
+
+// Needed to access internals of ConcurrentHashmapImpl.
+class ConcurrentHashmapImplTest
+{
+public:
+ static void test2();
+};
+
+
+struct Context_t
+{
+ Context_t (int the_slot = 0) : slot (the_slot) {}
+ int slot;
+};
+
+
+template <class T>
+class TestUpdater
+{
+public:
+ using Context_t = ::Context_t;
+
+ TestUpdater()
+ : m_p (nullptr),
+ m_inGrace (0)
+ {
+ }
+
+ TestUpdater (TestUpdater&& other)
+ : m_p (static_cast<T*> (other.m_p)),
+ m_inGrace (0)
+ {
+ }
+
+ TestUpdater& operator= (const TestUpdater&) = delete; // coverity
+
+ ~TestUpdater()
+ {
+ delete m_p;
+ for (T* p : m_garbage) delete p;
+ }
+
+ void update (std::unique_ptr<T> p, const Context_t& ctx)
+ {
+ std::lock_guard<std::mutex> g (m_mutex);
+ if (m_p) m_garbage.push_back (m_p);
+ m_p = p.release();
+ m_inGrace = (~(1<<ctx.slot)) & ((1<<nslots)-1);
+ }
+
+ void discard (std::unique_ptr<T> p)
+ {
+ std::lock_guard<std::mutex> g (m_mutex);
+ m_garbage.push_back (p.release());
+ m_inGrace = ((1<<nslots)-1);
+ }
+
+ const T& get() const { return *m_p; }
+
+ void quiescent (const Context_t& ctx)
+ {
+ unsigned int mask = (1<<ctx.slot);
+ std::lock_guard<std::mutex> g (m_mutex);
+ if ((m_inGrace & mask) == 0) return;
+ m_inGrace &= ~mask;
+ if (!m_inGrace) {
+ for (T* p : m_garbage) delete p;
+ m_garbage.clear();
+ }
+ }
+
+ static Context_t defaultContext() { return 0; }
+
+
+private:
+ std::mutex m_mutex;
+ std::atomic<T*> m_p;
+ std::vector<T*> m_garbage;
+ unsigned int m_inGrace;
+};
+
+
+struct TestHash
+{
+ size_t operator() (size_t x) const { return x; }
+};
+
+
+using CHMImpl = CxxUtils::detail::ConcurrentHashmapImpl<TestUpdater, TestHash>;
+
+
+// Test CHMTableIterator
+void test1()
+{
+ std::cout << "test1\n";
+ using TableIterator = CxxUtils::detail::CHMTableIterator<4>;
+ // table capacity = 64
+ TableIterator it (12345, 0x3f, 6, 16);
+ std::vector<size_t> offsets;
+ do {
+ offsets.push_back (it.offset());
+ } while (it.next());
+ assert ((std::vector<size_t> {57, 58, 59, 56, 61, 62, 63, 60, 5, 6, 7, 4, 17, 18, 19, 16 }) == offsets);
+}
+
+
+// Test ConcurrentHashmapImpl::Table.
+void ConcurrentHashmapImplTest::test2()
+{
+ std::cout << "test2\n";
+ using entry_t = CHMImpl::entry_t;
+ using Table = CHMImpl::Table;
+ std::unique_ptr<Table> table (new (16) Table (16));
+
+ assert (table->capacity() == 16);
+
+ size_t nstored = 0;
+ while (true) {
+ size_t key = 23*nstored + 100;
+ size_t hash = TestHash() (key);
+
+ bool insert;
+ size_t offset = table->probeWrite (key, hash, insert);
+ if (offset == CHMImpl::INVALID) {
+ break;
+ }
+ assert (insert);
+ entry_t& ent = table->entry (offset);
+ ent.m_val = key+1;
+ ent.m_key = key;
+ const Table* ctable = table.get();
+ const entry_t& cent = ctable->entry (offset);
+ assert (cent.m_val == key+1);
+ assert (cent.m_key == key);
+ ++nstored;
+ }
+ assert (nstored == 16);
+
+ for (size_t i = 0; i < nstored; ++i) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+ {
+ size_t offset = table->probeRead (key, hash);
+ assert (offset != CHMImpl::INVALID);
+ const entry_t& ent = table->entry (offset);
+ assert (ent.m_key == key && ent.m_val == key+1);
+ }
+ {
+ bool insert;
+ size_t offset = table->probeWrite (key, hash, insert);
+ assert (offset != CHMImpl::INVALID);
+ assert (!insert);
+ entry_t& ent = table->entry (offset);
+ assert (ent.m_key == key && ent.m_val == key+1);
+ }
+ }
+
+ size_t key = 23*nstored + 100;
+ size_t hash = TestHash() (key);
+ assert (table->probeRead (key, hash) == CHMImpl::INVALID);
+ bool insert;
+ assert (table->probeWrite (key, hash, insert) == CHMImpl::INVALID);
+}
+
+
+void test3()
+{
+ std::cout << "test3\n";
+ CHMImpl chm (CHMImpl::Updater_t(), 50,
+ CHMImpl::Hasher_t(),
+ CHMImpl::Matcher_t(),
+ CHMImpl::Context_t());
+
+ assert (chm.size() == 0);
+ assert (chm.capacity() == 64);
+
+ assert (chm.hasher()(12345) == CHMImpl::Hasher_t()(12345));
+ assert (chm.matcher() (4321, 4321));
+ assert (!chm.matcher() (4321, 4322));
+
+ {
+ auto [begin, end] = chm.range();
+ assert (!(begin != end));
+ }
+
+ for (size_t i = 0; i < 1000; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+
+ auto [it, flag] = chm.put (key, hash, key+1, true, Context_t());
+ assert (flag);
+ assert (it.valid());
+ assert (it.key() == key);
+ assert (it.value() == key+1);
+ }
+ assert (chm.size() == 1000);
+ assert (chm.capacity() == 1024);
+
+ for (size_t i = 0; i < 1000; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+
+ CHMImpl::const_iterator it = chm.get (key, hash);
+ assert (it.valid());
+ assert (it.value() == key+1);
+ }
+
+ for (size_t i = 0; i < 1000; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+
+ auto [it, flag] = chm.put (key, hash, key+2, true, Context_t());
+ assert (!flag);
+ assert (it.valid());
+ assert (it.key() == key);
+ assert (it.value() == key+2);
+ }
+ assert (chm.size() == 1000);
+ assert (chm.capacity() == 1024);
+
+ std::vector<size_t> exp;
+ for (size_t i = 0; i < 1000; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+
+ CHMImpl::const_iterator it = chm.get (key, hash);
+ assert (it.valid());
+ assert (it.value() == key+2);
+
+ exp.push_back (key);
+ }
+ std::sort (exp.begin(), exp.end());
+
+ std::vector<size_t> seen;
+ {
+ auto [begin, end] = chm.range();
+ for (auto it = begin; it != end; it.next()) {
+ assert (it.key()+2 == it.value());
+ seen.push_back (it.key());
+ }
+ }
+ std::sort (seen.begin(), seen.end());
+ assert (exp == seen);
+
+ seen.clear();
+ {
+ CHMImpl::const_iterator begin = chm.begin();
+ CHMImpl::const_iterator it = chm.end();
+ assert (it != begin);
+ do {
+ it.prev();
+ assert (it.key()+2 == it.value());
+ seen.push_back (it.key());
+ } while (it != begin);
+ }
+
+ std::sort (seen.begin(), seen.end());
+ assert (exp == seen);
+
+ {
+ size_t key = 23*500 + 100;
+ size_t hash = TestHash() (key);
+ auto [it, flag] = chm.put (key, hash, 200, false, Context_t());
+ assert (!flag);
+ assert (it.valid());
+ assert (it.key() == key);
+ assert (it.value() == key+2);
+
+ CHMImpl::const_iterator it2 = chm.get (key, hash);
+ assert (it2.valid());
+ assert (it2.value() == key+2);
+ }
+
+ {
+ size_t key = 23*1500 + 100;
+ size_t hash = TestHash() (key);
+ auto [it, flag] = chm.put (key, hash, 200, false, Context_t());
+ assert (flag);
+ assert (it.valid());
+ assert (it.key() == key);
+ assert (it.value() == 200);
+
+ CHMImpl::const_iterator it2 = chm.get (key, hash);
+ assert (it2.valid());
+ assert (it2.value() == 200);
+ }
+
+ assert (chm.size() == 1001);
+ assert (chm.capacity() == 1024);
+
+ {
+ size_t iseen = 0;
+ CHMImpl::const_iterator it = chm.clear (Context_t());
+ while (it.valid()) {
+ ++iseen;
+ it.next();
+ }
+ assert (iseen == 1001);
+ }
+ assert (chm.size() == 0);
+ assert (chm.capacity() == 1024);
+
+ chm.clear (200, Context_t());
+ assert (chm.size() == 0);
+ assert (chm.capacity() == 256);
+
+ chm.reserve (100, Context_t());
+ assert (chm.size() == 0);
+ assert (chm.capacity() == 256);
+
+ chm.reserve (300, Context_t());
+ assert (chm.size() == 0);
+ assert (chm.capacity() == 512);
+}
+
+
+//***************************************************************************
+// Threaded test.
+//
+
+
+std::shared_timed_mutex start_mutex;
+
+
+class test4_Base
+{
+public:
+ static constexpr size_t nwrites = 10000;
+
+ test4_Base (int slot);
+ int ctx() const { return m_slot; }
+ void setContext();
+
+
+private:
+ int m_slot;
+};
+
+
+test4_Base::test4_Base (int slot)
+ : m_slot (slot)
+{
+}
+
+
+void test4_Base::setContext()
+{
+}
+
+
+
+class test4_Writer
+ : public test4_Base
+{
+public:
+ test4_Writer (int slot, CHMImpl& map);
+ void operator()();
+
+private:
+ CHMImpl& m_map;
+};
+
+
+test4_Writer::test4_Writer (int slot, CHMImpl& map)
+ : test4_Base (slot),
+ m_map (map)
+{
+}
+
+
+void test4_Writer::operator()()
+{
+ setContext();
+ std::shared_lock<std::shared_timed_mutex> lock (start_mutex);
+
+ for (size_t i=0; i < nwrites; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+ assert (m_map.put (key, hash, key+2, true, Context_t()).second);
+ m_map.quiescent (ctx());
+ if (((i+1)%128) == 0) {
+ usleep (1000);
+ }
+ }
+
+ for (size_t i=0; i < nwrites; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+ assert (!m_map.put (key, hash, key+3, true, Context_t()).second);
+ m_map.quiescent (ctx());
+ if (((i+1)%128) == 0) {
+ usleep (1000);
+ }
+ }
+
+ for (size_t i=0; i < nwrites; i++) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+ assert (!m_map.put (key, hash, key+4, true, Context_t()).second);
+ m_map.quiescent (ctx());
+ if (((i+1)%128) == 0) {
+ usleep (1000);
+ }
+ }
+
+ {
+ size_t key = 23*nwrites + 100;
+ size_t hash = TestHash() (key);
+ assert (m_map.put (key, hash, key+3, true, Context_t()).second);
+ }
+}
+
+
+
+class test4_Iterator
+ : public test4_Base
+{
+public:
+ test4_Iterator (int slot, CHMImpl& map);
+ void operator()();
+
+private:
+ CHMImpl& m_map;
+};
+
+
+test4_Iterator::test4_Iterator (int slot, CHMImpl& map)
+ : test4_Base (slot),
+ m_map (map)
+{
+}
+
+
+void test4_Iterator::operator()()
+{
+ setContext();
+ std::shared_lock<std::shared_timed_mutex> lock (start_mutex);
+
+ while (true) {
+ auto [begin, end] = m_map.range();
+ while (begin != end) {
+ size_t key = begin.key();
+ size_t val = begin.value();
+ assert (val == key+2 || val == key+3 || val == key+4);
+ begin.next();
+ }
+
+ auto [begin2, end2] = m_map.range();
+ if (begin2 != end2) {
+ do {
+ end2.prev();
+ size_t key = end2.key();
+ size_t val = end2.value();
+ assert (val == key+2 || val == key+3 || val == key+4);
+ } while (begin2 != end2);
+ }
+
+ m_map.quiescent (ctx());
+ if (m_map.size() > nwrites) break;
+ }
+}
+
+
+class test4_Reader
+ : public test4_Base
+{
+public:
+ test4_Reader (int slot, CHMImpl& map);
+ void operator()();
+
+private:
+ CHMImpl& m_map;
+};
+
+
+test4_Reader::test4_Reader (int slot, CHMImpl& map)
+ : test4_Base (slot),
+ m_map (map)
+{
+}
+
+
+void test4_Reader::operator()()
+{
+ setContext();
+ std::shared_lock<std::shared_timed_mutex> lock (start_mutex);
+
+ while (true) {
+ for (size_t i = 0; ; ++i) {
+ size_t key = 23*i + 100;
+ size_t hash = TestHash() (key);
+ CHMImpl::const_iterator it = m_map.get (key, hash);
+ if (!it.valid()) {
+ break;
+ }
+ assert(it.value() == key+2 || it.value() == key+3 || it.value() == key+4);
+ }
+
+ m_map.quiescent (ctx());
+ if (m_map.size() > nwrites) break;
+ }
+}
+
+
+void test4_iter()
+{
+ CHMImpl chm (CHMImpl::Updater_t(), 50,
+ CHMImpl::Hasher_t(),
+ CHMImpl::Matcher_t(),
+ CHMImpl::Context_t());
+
+ const int nthread = 4;
+ std::thread threads[nthread];
+ start_mutex.lock();
+
+ threads[0] = std::thread (test4_Writer (0, chm));
+ threads[1] = std::thread (test4_Iterator (1, chm));
+ threads[2] = std::thread (test4_Reader (2, chm));
+ threads[3] = std::thread (test4_Reader (3, chm));
+
+ // Try to get the threads starting as much at the same time as possible.
+ start_mutex.unlock();
+ for (int i=0; i < nthread; i++)
+ threads[i].join();
+}
+
+
+void test4()
+{
+ std::cout << "test4\n";
+
+ for (int i=0; i < 5; i++) {
+ test4_iter();
+ }
+}
+
+
+int main()
+{
+ std::cout << "CxxUtils/ConcurrentHashmapImpl_test\n";
+ test1();
+ ConcurrentHashmapImplTest::test2();
+ test3();
+ test4();
+ return 0;
+}
diff --git a/Control/CxxUtils/test/ConcurrentStrMap_test.cxx b/Control/CxxUtils/test/ConcurrentStrMap_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4ab25b1eedf86d6b55ea1d402250f1b2ed67469c
--- /dev/null
+++ b/Control/CxxUtils/test/ConcurrentStrMap_test.cxx
@@ -0,0 +1,925 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/test/ConcurrentStrMap_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Tests for ConcurrenStrMap.
+ */
+
+
+#undef NDEBUG
+#include "CxxUtils/ConcurrentStrMap.h"
+#include "CxxUtils/StrFormat.h"
+#include "CxxUtils/MurmurHash2.h"
+#include "CxxUtils/checker_macros.h"
+#include "TestTools/expect_exception.h"
+#include "TestTools/random.h"
+#include "tbb/concurrent_unordered_map.h"
+#include "boost/timer/timer.hpp"
+#ifdef HAVE_CK
+extern "C" {
+#include "ck_ht.h"
+}
+#endif
+#include <unordered_map>
+#include <mutex>
+#include <thread>
+#include <shared_mutex>
+#include <vector>
+#include <memory>
+#include <iostream>
+#include <sstream>
+#include <cassert>
+
+
+const int nslots = 4;
+
+struct Context_t
+{
+ Context_t (int the_slot = 0) : slot (the_slot) {}
+ int slot;
+};
+
+
+template <class T>
+class TestUpdater
+{
+public:
+ using Context_t = ::Context_t;
+
+ TestUpdater()
+ : m_p (nullptr),
+ m_inGrace (0)
+ {
+ }
+
+ TestUpdater (TestUpdater&& other)
+ : m_p (static_cast<T*> (other.m_p)),
+ m_inGrace (0)
+ {
+ }
+
+ TestUpdater& operator= (const TestUpdater&) = delete; // coverity
+
+ ~TestUpdater()
+ {
+ delete m_p;
+ for (T* p : m_garbage) delete p;
+ }
+
+ void update (std::unique_ptr<T> p, const Context_t& ctx)
+ {
+ std::lock_guard<std::mutex> g (m_mutex);
+ if (m_p) m_garbage.push_back (m_p);
+ m_p = p.release();
+ m_inGrace = (~(1<<ctx.slot)) & ((1<<nslots)-1);
+ }
+
+ void discard (std::unique_ptr<T> p)
+ {
+ std::lock_guard<std::mutex> g (m_mutex);
+ m_garbage.push_back (p.release());
+ m_inGrace = ((1<<nslots)-1);
+ }
+
+ const T& get() const { return *m_p; }
+
+ void quiescent (const Context_t& ctx)
+ {
+ unsigned int mask = (1<<ctx.slot);
+ std::lock_guard<std::mutex> g (m_mutex);
+ if ((m_inGrace & mask) == 0) return;
+ m_inGrace &= ~mask;
+ if (!m_inGrace) {
+ for (T* p : m_garbage) delete p;
+ m_garbage.clear();
+ }
+ }
+
+ static Context_t defaultContext() { return 0; }
+
+
+private:
+ std::mutex m_mutex;
+ std::atomic<T*> m_p;
+ std::vector<T*> m_garbage;
+ unsigned int m_inGrace;
+};
+
+
+using TestMap = CxxUtils::ConcurrentStrMap<size_t, TestUpdater>;
+
+
+void test1()
+{
+ std::cout << "test1\n";
+ TestMap map {TestMap::Updater_t()};
+
+ const size_t MAXKEYS = 1000;
+ std::vector<std::string> keys;
+
+ for (size_t i = 0; i < MAXKEYS; i++) {
+ std::ostringstream ss;
+ ss << i;
+ keys.push_back (ss.str());
+ }
+
+ assert (map.size() == 0);
+ assert (map.capacity() == 64);
+ assert (map.empty());
+
+ for (size_t i = 0; i < MAXKEYS; i++) {
+ auto [it, flag] = map.emplace (keys[i], i);
+ assert (flag);
+ assert (it.valid());
+ assert (it->first == keys[i]);
+ assert (it->second == i);
+ }
+
+ assert (map.size() == MAXKEYS);
+ assert (map.capacity() == 1024);
+ assert (!map.empty());
+
+ for (size_t i = 0; i < MAXKEYS; i++) {
+ TestMap::const_iterator it = map.find (keys[i]);
+ assert (it.valid());
+ assert (it != map.end());
+ assert (it->first == keys[i]);
+ assert (it->second == i);
+ }
+ assert (map.count (keys[10]) == 1);
+ assert (map.count ("foobar") == 0);
+ assert (map.contains (keys[10]));
+ assert (!map.contains ("foobar"));
+ assert (map.find ("foobar") == map.end());
+ assert (!map.find ("foobar").valid());
+
+ {
+ auto [i1, i2] = map.equal_range (keys[10]);
+ assert (i1.valid());
+ assert (i1 != i2);
+ assert (i1->first == keys[10]);
+ assert (i1->second == 10);
+ ++i1;
+ assert (i1 == i2);
+ }
+
+ {
+ auto [i1, i2] = map.equal_range ("foobar");
+ assert (!i1.valid());
+ assert (i1 == map.end());
+ assert (i1 == i2);
+ }
+
+ assert (map.at (keys[10]) == 10);
+ EXPECT_EXCEPTION (std::out_of_range, map.at ("fooabr"));
+
+ for (size_t i = 0; i < MAXKEYS; i++) {
+ auto [it, flag] = map.insert_or_assign (keys[i], i+10000);
+ assert (!flag);
+ assert (it.valid());
+ assert (it->first == keys[i]);
+ assert (it->second == i+10000);
+ }
+
+ assert (map.size() == MAXKEYS);
+ assert (map.capacity() == 1024);
+
+ for (size_t i = 0; i < MAXKEYS; i++) {
+ TestMap::const_iterator it = map.find (keys[i]);
+ assert (it.valid());
+ assert (it != map.end());
+ assert (it->first == keys[i]);
+ assert (it->second == i+10000);
+ }
+
+ std::vector<size_t> exp;
+ for (size_t i = 0; i < MAXKEYS; i++) {
+ exp.push_back (i);
+ }
+
+ std::vector<size_t> seen;
+ for (const auto& p : map.range()) {
+ size_t i = p.second - 10000;
+ assert (i < MAXKEYS);
+ assert (p.first == keys[i]);
+ seen.push_back (i);
+ }
+
+ std::sort (seen.begin(), seen.end());
+ assert (seen == exp);
+
+ seen.clear();
+ for (const auto& p : map) {
+ size_t i = p.second - 10000;
+ assert (i < MAXKEYS);
+ assert (p.first == keys[i]);
+ seen.push_back (i);
+ }
+
+ std::sort (seen.begin(), seen.end());
+ assert (seen == exp);
+
+ {
+ auto [it, flag] = map.insert (std::make_pair ("baz", 99999));
+ assert (flag);
+ assert (it.valid());
+ assert (it->first == "baz");
+ assert (it->second == 99999);
+ }
+ {
+ auto [it, flag] = map.insert (std::make_pair ("baz", 99998));
+ assert (!flag);
+ assert (it.valid());
+ assert (it->first == "baz");
+ assert (it->second == 99999);
+ }
+}
+
+
+// Bulk copy / insert.
+void test2()
+{
+ std::cout << "test2\n";
+ std::vector<std::pair<std::string, size_t> > data
+ { {"zero", 0},
+ {"one", 1},
+ {"two", 2},
+ {"three", 3},
+ {"four", 4},
+ {"five", 5},
+ {"six", 6},
+ {"seven", 7},
+ {"eight", 8},
+ {"nine", 9},
+ };
+
+ TestMap map1 (data.begin(), data.end(), TestMap::Updater_t());
+ assert (map1.size() == 10);
+ {
+ TestMap::const_iterator it = map1.find ("four");
+ assert (it.valid());
+ assert (it != map1.end());
+ assert (it->first == "four");
+ assert (it->second == 4);
+ }
+
+ TestMap map2 (map1, TestMap::Updater_t());
+ assert (map2.size() == 10);
+ {
+ TestMap::const_iterator it = map2.find ("six");
+ assert (it.valid());
+ assert (it != map2.end());
+ assert (it->first == "six");
+ assert (it->second == 6);
+ }
+
+ TestMap map3 {TestMap::Updater_t()};
+ assert (map3.capacity() == 64);
+ assert (map3.size() == 0);
+
+ map3.reserve (200);
+ assert (map3.capacity() == 256);
+ map3.reserve (100);
+ assert (map3.capacity() == 256);
+ map3.quiescent (Context_t());
+ assert (map3.size() == 0);
+
+ map3.insert (std::begin(data), std::end(data));
+ assert (map3.size() == 10);
+ assert (map3.at ("five") == 5);
+}
+
+
+// With a pointer value.
+void test3()
+{
+ std::cout << "test3\n";
+
+ using PtrMap = CxxUtils::ConcurrentStrMap<const int*, TestUpdater>;
+ PtrMap map {PtrMap::Updater_t()};
+
+ int v[10] = {0};
+
+ map.emplace ("one", &v[1]);
+ map.emplace ("three", &v[3]);
+ map.emplace ("five", &v[5]);
+
+ assert (map.at("three") == &v[3]);
+ assert (map.find("three")->first == "three");
+ assert (map.find("three")->second == &v[3]);
+}
+
+
+//***************************************************************************
+// Threaded test.
+//
+
+
+std::shared_timed_mutex start_mutex;
+
+
+class test4_Base
+{
+public:
+ static constexpr size_t nwrites = 10000;
+
+ test4_Base (int slot);
+ int ctx() const { return m_slot; }
+ const std::string& key (size_t i) const { return m_keys[i]; }
+ void setContext();
+
+
+private:
+ int m_slot;
+ std::vector<std::string> m_keys;
+};
+
+
+test4_Base::test4_Base (int slot)
+ : m_slot (slot)
+{
+ for (size_t i = 0; i < nwrites; i++) {
+ std::ostringstream ss;
+ ss << i;
+ m_keys.push_back (ss.str());
+ }
+}
+
+
+void test4_Base::setContext()
+{
+}
+
+
+
+class test4_Writer
+ : public test4_Base
+{
+public:
+ test4_Writer (int slot, TestMap& map);
+ void operator()();
+
+private:
+ TestMap& m_map;
+};
+
+
+test4_Writer::test4_Writer (int slot, TestMap& map)
+ : test4_Base (slot),
+ m_map (map)
+{
+}
+
+
+void test4_Writer::operator()()
+{
+ setContext();
+ std::shared_lock<std::shared_timed_mutex> lock (start_mutex);
+
+ for (size_t i=0; i < nwrites; i++) {
+ assert (m_map.emplace (key(i), i).second);
+ m_map.quiescent (ctx());
+ if (((i+1)%128) == 0) {
+ usleep (1000);
+ }
+ }
+
+ for (size_t i=0; i < nwrites; i++) {
+ assert (!m_map.insert_or_assign (key(i), i + 10*nwrites).second);
+ m_map.quiescent (ctx());
+ if (((i+1)%128) == 0) {
+ usleep (1000);
+ }
+ }
+
+ for (size_t i=0; i < nwrites; i++) {
+ assert (!m_map.insert_or_assign (key(i), i + 20*nwrites).second);
+ m_map.quiescent (ctx());
+ if (((i+1)%128) == 0) {
+ usleep (1000);
+ }
+ }
+
+ assert (m_map.emplace ("fin", nwrites).second);
+}
+
+
+class test4_Iterator
+ : public test4_Base
+{
+public:
+ test4_Iterator (int slot, TestMap& map);
+ void operator()();
+
+private:
+ TestMap& m_map;
+};
+
+
+test4_Iterator::test4_Iterator (int slot, TestMap& map)
+ : test4_Base (slot),
+ m_map (map)
+{
+}
+
+
+void test4_Iterator::operator()()
+{
+ setContext();
+ std::shared_lock<std::shared_timed_mutex> lock (start_mutex);
+
+ while (true) {
+ for (const auto& p : m_map) {
+ if (p.second == nwrites) continue;
+ size_t i = p.second % nwrites;
+ assert (key(i) == p.first);
+ assert (p.second == i || p.second == i+10*nwrites || p.second == i +20*nwrites);
+ }
+
+ TestMap::const_iterator_range range = m_map.range();
+ TestMap::const_iterator begin2 = range.begin();
+ TestMap::const_iterator end2 = range.end();
+ while (begin2 != end2) {
+ --end2;
+ if (end2->second == nwrites) continue;
+ size_t i = end2->second % nwrites;
+ assert (key(i) == end2->first);
+ assert (end2->second == i || end2->second == i+10*nwrites || end2->second == i +20*nwrites);
+ }
+
+ m_map.quiescent (ctx());
+ if (m_map.size() > nwrites) break;
+ }
+}
+
+
+class test4_Reader
+ : public test4_Base
+{
+public:
+ test4_Reader (int slot, TestMap& map);
+ void operator()();
+
+private:
+ TestMap& m_map;
+};
+
+
+test4_Reader::test4_Reader (int slot, TestMap& map)
+ : test4_Base (slot),
+ m_map (map)
+{
+}
+
+
+void test4_Reader::operator()()
+{
+ setContext();
+ std::shared_lock<std::shared_timed_mutex> lock (start_mutex);
+
+ while (true) {
+ for (size_t i = 0; ; ++i) {
+ TestMap::const_iterator it = m_map.find (key(i));
+ if (it == m_map.end()) break;
+ assert(it->second == i || it->second == i+10*nwrites || it->second == i+20*nwrites);
+ }
+
+ m_map.quiescent (ctx());
+ if (m_map.size() > nwrites) break;
+ }
+}
+
+
+void test4_iter()
+{
+ TestMap map {TestMap::Updater_t()};
+
+ const int nthread = 4;
+ std::thread threads[nthread];
+ start_mutex.lock();
+
+ threads[0] = std::thread (test4_Writer (0, map));
+ threads[1] = std::thread (test4_Iterator (1, map));
+ threads[2] = std::thread (test4_Reader (2, map));
+ threads[3] = std::thread (test4_Reader (3, map));
+
+ // Try to get the threads starting as much at the same time as possible.
+ start_mutex.unlock();
+ for (int i=0; i < nthread; i++)
+ threads[i].join();
+}
+
+
+void test4()
+{
+ std::cout << "test4\n";
+
+ for (int i=0; i < 5; i++) {
+ test4_iter();
+ }
+}
+
+
+//***************************************************************************
+// Optional performance test test.
+//
+
+
+class ConcurrentStrMapAdapter
+ : public TestMap
+{
+public:
+ ConcurrentStrMapAdapter()
+ : TestMap (TestMap::Updater_t(), 512)
+ {
+ }
+ static std::string name() { return "ConcurrentStrMap"; }
+
+ uintptr_t get (const std::string& s) const
+ {
+ auto it = find (s);
+ if (it.valid()) return it->second;
+ return 0;
+ }
+
+ static const std::string& key (const const_iterator& i)
+ { return i->first; }
+ static uintptr_t value (const const_iterator& i)
+ { return i->second; }
+};
+
+
+class UnorderedMapAdapter
+{
+public:
+ typedef std::unordered_map<std::string, uintptr_t> map_t;
+ typedef map_t::const_iterator const_iterator;
+
+ static std::string name() { return "UnorderedMap"; }
+
+ void emplace (const std::string& s, uintptr_t p)
+ {
+ lock_t lock (m_mutex);
+ m_map.emplace (s, p);
+ }
+
+
+ uintptr_t get (const std::string& s) const
+ {
+ lock_t lock (m_mutex);
+ auto it = m_map.find (s);
+ if (it != m_map.end()) return it->second;
+ return 0;
+ }
+
+ const_iterator begin() const { return m_map.begin(); }
+ const_iterator end() const { return m_map.end(); }
+ static const std::string& key (const const_iterator& i)
+ { return i->first; }
+ static uintptr_t value (const const_iterator& i)
+ { return i->second; }
+
+
+private:
+ map_t m_map;
+
+ typedef std::mutex mutex_t;
+ typedef std::lock_guard<mutex_t> lock_t;
+ mutable mutex_t m_mutex;
+};
+
+
+class ConcurrentUnorderedMapAdapter
+{
+public:
+ typedef tbb::concurrent_unordered_map<std::string, uintptr_t> map_t;
+ typedef map_t::const_iterator const_iterator;
+
+ static std::string name() { return "concurrent_unordered_map"; }
+
+ void emplace (const std::string& s, uintptr_t p)
+ {
+ m_map.emplace (s, p);
+ }
+
+
+ uintptr_t get (const std::string& s) const
+ {
+ auto it = m_map.find (s);
+ if (it != m_map.end()) return it->second;
+ return 0;
+ }
+
+ const_iterator begin() const { return m_map.begin(); }
+ const_iterator end() const { return m_map.end(); }
+ static const std::string& key (const const_iterator& i)
+ { return i->first; }
+ static uintptr_t value (const const_iterator& i)
+ { return i->second; }
+
+private:
+ map_t m_map;
+};
+
+
+#ifdef HAVE_CK
+class CKHTAdapter
+{
+public:
+ CKHTAdapter();
+ static std::string name() { return "ck_ht"; }
+
+ struct const_iterator
+ {
+ const_iterator (ck_ht_t* ht)
+ : m_ht (ht)
+ {
+ if (m_ht) {
+ ck_ht_iterator_init (&m_it);
+ if (!ck_ht_next (m_ht, &m_it, &m_entry)) {
+ m_entry = nullptr;
+ }
+ }
+ else {
+ m_entry = nullptr;
+ }
+ }
+
+ const_iterator& operator++()
+ {
+ if (!ck_ht_next (m_ht, &m_it, &m_entry)) {
+ m_entry = nullptr;
+ }
+ return *this;
+ }
+
+ bool operator!= (const const_iterator& other) const
+ {
+ return m_entry != other.m_entry;
+ }
+
+ ck_ht_t* m_ht;
+ ck_ht_iterator_t m_it;
+ ck_ht_entry_t* m_entry;
+ };
+
+ void emplace (const std::string& s, uintptr_t p)
+ {
+ ck_ht_entry_t entry;
+ ck_ht_hash_t h;
+ ck_ht_hash (&h, &m_ht, s.c_str(), s.size());
+ ck_ht_entry_set (&entry, h, s.c_str(), s.size(),
+ reinterpret_cast<const void*>(p));
+ ck_ht_put_spmc (&m_ht, h, &entry);
+ }
+
+
+ uintptr_t get (const std::string& s) const
+ {
+ ck_ht_entry_t entry;
+ ck_ht_hash_t h;
+ ck_ht_hash (&h, &m_ht, s.c_str(), s.size());
+ ck_ht_entry_key_set (&entry, s.c_str(), s.size());
+ if (ck_ht_get_spmc (&m_ht, h, &entry)) {
+ return reinterpret_cast<uintptr_t>(ck_ht_entry_value (&entry));
+ }
+ return 0;
+ }
+
+ static const std::string key (const const_iterator& i)
+ {
+ void* key = ck_ht_entry_key (i.m_entry);
+ uint16_t len = ck_ht_entry_key_length (i.m_entry);
+ return std::string (reinterpret_cast<const char*>(key), len);
+ }
+ static uintptr_t value (const const_iterator& i)
+ { return reinterpret_cast<uintptr_t>(ck_ht_entry_value(i.m_entry)); }
+
+ const_iterator begin() const
+ {
+ return const_iterator (&m_ht);
+ }
+
+ const_iterator end() const
+ {
+ return const_iterator (nullptr);
+ }
+
+
+private:
+ static void hash (ck_ht_hash_t* h,
+ const void* key,
+ size_t key_length,
+ uint64_t seed)
+ {
+ // Same as used by libstdc++.
+ h->value = CxxUtils::MurmurHash64A (key, key_length, seed);
+ }
+
+ static void ht_free (void *p, size_t /*b*/, bool /*r*/) { free(p); }
+
+ ck_malloc m_alloc;
+ mutable ck_ht_t m_ht ATLAS_THREAD_SAFE;
+};
+
+
+CKHTAdapter::CKHTAdapter()
+{
+ m_alloc.malloc = malloc;
+ m_alloc.free = ht_free;
+ if (!ck_ht_init (&m_ht,
+ CK_HT_MODE_BYTESTRING,
+ hash, // ck_ht_hash_cb_t
+ &m_alloc, // ck_malloc*
+ 128, // initial size
+ 6602834))
+ {
+ std::cout << "ck_hs_init error\n";
+ }
+}
+#endif // HAVE_CK
+
+
+class Timer
+{
+public:
+ Timer();
+
+ class RunTimer
+ {
+ public:
+ RunTimer (boost::timer::cpu_timer& timer) : m_timer (&timer)
+ { timer.resume(); }
+ RunTimer (RunTimer&& other) : m_timer (other.m_timer) { other.m_timer = nullptr; }
+ ~RunTimer() { if (m_timer) m_timer->stop(); }
+ private:
+ boost::timer::cpu_timer* m_timer;
+ };
+ RunTimer run() { return RunTimer (m_timer); }
+
+ std::string format() const { return m_timer.format(3); }
+
+private:
+ boost::timer::cpu_timer m_timer;
+};
+
+
+Timer::Timer()
+{
+ m_timer.stop();
+}
+
+
+class TesterBase
+{
+public:
+ TesterBase();
+
+ Timer::RunTimer run_lookup_timer() { return m_lookup_timer.run(); }
+ Timer::RunTimer run_iterate_timer() { return m_iterate_timer.run(); }
+
+ void report();
+
+private:
+ Timer m_lookup_timer;
+ Timer m_iterate_timer;
+};
+
+
+TesterBase::TesterBase()
+{
+}
+
+
+void TesterBase::report()
+{
+ std::cout << "lookup: " << m_lookup_timer.format();
+ std::cout << "iterate: " << m_iterate_timer.format();
+}
+
+
+template <class CONT>
+class Tester
+ : public TesterBase
+{
+public:
+ static constexpr size_t NCONT = 1000;
+ static constexpr size_t NEACH = 10000;
+ static constexpr size_t LOG_NENT = 11;
+ static constexpr size_t NENT = 1<<LOG_NENT;
+ static constexpr size_t ENT_MASK = NENT-1;
+
+ Tester();
+ void lookup_test();
+ void iterate_test();
+
+ void test();
+ std::string name() { return CONT::name(); }
+
+private:
+ std::vector<std::string> m_keys[NCONT];
+ CONT m_cont[NCONT];
+ uint32_t m_seed;
+};
+
+
+template <class CONT>
+Tester<CONT>::Tester()
+ : m_seed (1235)
+{
+ for (size_t j=0; j < NCONT; j++) {
+ for (size_t i = 0; i < NENT; i++) {
+ m_keys[j].push_back (CxxUtils::strformat ("key%03lu%08lu", j, i));
+ }
+ for (size_t i = 0; i < NENT; i++) {
+ m_cont[j].emplace (m_keys[j][i],
+ reinterpret_cast<uintptr_t>(&m_keys[j][i]));
+ }
+ }
+}
+
+
+template <class CONT>
+void Tester<CONT>::lookup_test()
+{
+ auto timer = run_lookup_timer();
+ for (size_t irep = 0; irep < NEACH; irep++) {
+ for (size_t icont = 0; icont < NCONT; icont++) {
+ uint32_t ient = Athena_test::rng_seed (m_seed) & ENT_MASK;
+ const std::string& key = m_keys[icont][ient];
+ uintptr_t val = m_cont[icont].get (key);
+ assert (val == reinterpret_cast<uintptr_t>(&key));
+ }
+ }
+}
+
+
+template <class CONT>
+void Tester<CONT>::iterate_test()
+{
+ auto timer = run_iterate_timer();
+ int icount = 0;
+ for (size_t irep = 0; irep < 100; irep++) {
+ for (size_t icont = 0; icont < NCONT; icont++) {
+ const CONT& cont = m_cont[icont];
+ typename CONT::const_iterator it = cont.begin();
+ typename CONT::const_iterator end = cont.end();
+ while (it != end) {
+ const std::string& key = CONT::key (it);
+ const uintptr_t val= CONT::value (it);
+ if (((++icount) % 128) == 0) {
+ assert (key == *reinterpret_cast<const std::string*>(val));
+ }
+ ++it;
+ }
+ }
+ }
+}
+
+
+template <class CONT>
+void Tester<CONT>::test()
+{
+ lookup_test();
+ iterate_test();
+}
+
+
+template <class CONT>
+void perftest_one()
+{
+ Tester<CONT> tester;
+ std::cout << tester.name() << "\n";
+ tester.test();
+ tester.report();
+}
+
+
+void perftest()
+{
+ perftest_one<ConcurrentStrMapAdapter>();
+ perftest_one<UnorderedMapAdapter>();
+ perftest_one<ConcurrentUnorderedMapAdapter>();
+#ifdef HAVE_CK
+ perftest_one<CKHTAdapter>();
+#endif
+}
+
+
+int main (int argc, char** argv)
+{
+ if (argc >= 2 && strcmp (argv[1], "--perf") == 0) {
+ perftest();
+ return 0;
+ }
+
+ std::cout << "CxxUtils/ConcurrentStrMap_test\n";
+ test1();
+ test2();
+ test3();
+ test4();
+ return 0;
+}
diff --git a/Control/CxxUtils/test/SimpleUpdater_test.cxx b/Control/CxxUtils/test/SimpleUpdater_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..5b4780ef7b2664e2c3e0e7f925087f328f4c6c06
--- /dev/null
+++ b/Control/CxxUtils/test/SimpleUpdater_test.cxx
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file CxxUtils/test/SimpleUpdater_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Dec, 2020
+ * @brief Tests for SimpleUpdater.
+ */
+
+
+#undef NDEBUG
+#include "CxxUtils/SimpleUpdater.h"
+#include <algorithm>
+#include <vector>
+#include <memory>
+#include <iostream>
+#include <cassert>
+
+
+class Payload
+{
+public:
+ typedef std::vector<int> vec_t;
+ Payload (vec_t& vec, int x) : m_vec(vec), m_x (x)
+ { vec.push_back (x); }
+ ~Payload()
+ {
+ vec_t::iterator i = std::find (m_vec.begin(), m_vec.end(), m_x);
+ if (i != m_vec.end()) m_vec.erase (i);
+ }
+ vec_t& m_vec;
+ int m_x;
+};
+
+
+void test1()
+{
+ std::cout << "test1\n";
+ std::vector<int> log;
+
+ {
+ using SU = CxxUtils::SimpleUpdater<Payload>;
+ SU su;
+ su.update (std::make_unique<Payload> (log, 1), SU::defaultContext());
+ assert (su.get().m_x == 1);
+ su.discard (std::make_unique<Payload> (log, 2));
+ su.update (std::make_unique<Payload> (log, 3), SU::defaultContext());
+ assert (su.get().m_x == 3);
+ su.quiescent (SU::defaultContext());
+ assert (log == (std::vector<int> {1, 2, 3}));
+ }
+ assert (log.empty());
+}
+
+
+int main()
+{
+ std::cout << "CxxUtils/SimpleUpdater_test\n";
+ test1();
+ return 0;
+}
diff --git a/Control/IOVSvc/src/IOVSvc.cxx b/Control/IOVSvc/src/IOVSvc.cxx
index 131db47d71cb00d149de9305d1627d66921f09c5..e968fe7af8499926cc998177cf589f9ed1cb3c64 100755
--- a/Control/IOVSvc/src/IOVSvc.cxx
+++ b/Control/IOVSvc/src/IOVSvc.cxx
@@ -855,7 +855,7 @@ IOVSvc::createCondObj(CondContBase* ccb, const DataObjID& id,
// In that case, when we delete the address, it will
// follow an invalid pointer. So be sure to delete
// the address before the object is added to CondCont.
- ioa.release();
+ ioa.reset();
// DataObject *d2 = static_cast<DataObject*>(v);
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
index bd14c1b9e88c3ac564aea0d78ff255503fcc4b38..59cafdc5ecef4adf6ce329dbbf5af9daa6e39d85 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
@@ -13,10 +13,15 @@
// PerfMonComps includes
#include "PerfMonMTSvc.h"
#include "PerfMonUtils.h" // borrow from existing code
+#include "SemiDetMisc.h" // borrow from existing code
// STD includes
#include <algorithm>
+// Boost includes
+#include "boost/format.hpp"
+#include "boost/filesystem.hpp"
+
/*
* Constructor
*/
@@ -137,7 +142,7 @@ void PerfMonMTSvc::startAud(const std::string& stepName, const std::string& comp
if (!m_doComponentLevelMonitoring) return;
// Start component auditing
- auto ctx = Gaudi::Hive::currentContext();
+ auto ctx = Gaudi::Hive::currentContext();
startCompAud(stepName, compName, ctx);
}
}
@@ -155,7 +160,7 @@ void PerfMonMTSvc::stopAud(const std::string& stepName, const std::string& compN
if (!m_doComponentLevelMonitoring) return;
// Stop component auditing
- auto ctx = Gaudi::Hive::currentContext();
+ auto ctx = Gaudi::Hive::currentContext();
stopCompAud(stepName, compName, ctx);
}
}
@@ -207,8 +212,8 @@ void PerfMonMTSvc::startCompAud(const std::string& stepName, const std::string&
// Generate State
PMonMT::StepComp currentState = generate_state(stepName, compName);
- // Check if this is the first time calling if so create the mesurement data if not use the existing one.
- // Metrics are collected per slot then aggregated before reporting
+ // Check if this is the first time calling if so create the mesurement data if not use the existing one.
+ // Metrics are collected per slot then aggregated before reporting
data_map_t& compLevelDataMap = m_compLevelDataMapVec[ctx.valid() ? ctx.slot() : 0];
if(compLevelDataMap.find(currentState) == compLevelDataMap.end()) {
compLevelDataMap[currentState] = new PMonMT::MeasurementData();
@@ -312,6 +317,33 @@ bool PerfMonMTSvc::isPower(uint64_t input, uint64_t base) {
return (input == 1);
}
+/*
+ * Helper finction to estimate CPU efficiency
+ */
+int PerfMonMTSvc::getCpuEfficiency() const {
+
+ // In AthenaMT only the event-loop is executed concurrently
+ // In this metric, we scale the event-loop wall-time by
+ // the number of slots to take the concurrency into account
+ // Then we divide the total cpu-time by this number
+ // It's A metric not THE metric...
+
+ const float totalCpuTime =
+ m_snapshotData[CONFIGURE].getDeltaCPU() +
+ m_snapshotData[INITIALIZE].getDeltaCPU() +
+ m_snapshotData[EXECUTE].getDeltaCPU() +
+ m_snapshotData[FINALIZE].getDeltaCPU();
+
+ const float scaledWallTime =
+ m_snapshotData[CONFIGURE].getDeltaWall() * 1. +
+ m_snapshotData[INITIALIZE].getDeltaWall() * 1. +
+ m_snapshotData[EXECUTE].getDeltaWall() * m_numberOfSlots +
+ m_snapshotData[FINALIZE].getDeltaWall() * 1.;
+
+ return ( scaledWallTime > 0 ? totalCpuTime / scaledWallTime * 100. : 0 );
+
+}
+
/*
* Report the results to the log and the JSON file
*/
@@ -345,6 +377,7 @@ void PerfMonMTSvc::report2Log() {
// Summary and system information
report2Log_Summary();
report2Log_CpuInfo();
+ report2Log_EnvInfo();
}
/*
@@ -377,7 +410,7 @@ void PerfMonMTSvc::report2Log_ComponentLevel() {
ATH_MSG_INFO(" Component Level Monitoring ");
ATH_MSG_INFO("=======================================================================================");
- ATH_MSG_INFO(format("%1% %|15t|%2% %|25t|%3% %|40t|%4% %|55t|%5% %|75t|%6%") % "Step" % "Count" % "CPU Time [ms]" %
+ ATH_MSG_INFO(format("%1% %|15t|%2% %|25t|%3% %|40t|%4% %|55t|%5% %|75t|%6%") % "Step" % "Count" % "CPU Time [ms]" %
"Vmem [kB]" % "Malloc [kB]" % "Component");
ATH_MSG_INFO("---------------------------------------------------------------------------------------");
@@ -408,7 +441,7 @@ void PerfMonMTSvc::report2Log_ComponentLevel() {
it.second->getCallCount() % it.second->getDeltaCPU() % it.second->getDeltaVmem() %
it.second->getDeltaMalloc() % it.first.compName);
}
- if(counter>0) {
+ if(counter>0) {
ATH_MSG_INFO("=======================================================================================");
}
}
@@ -426,8 +459,8 @@ void PerfMonMTSvc::report2Log_EventLevel_instant() const {
long pss = m_eventLevelData.getEventLevelPss(m_eventCounter);
long swap = m_eventLevelData.getEventLevelSwap(m_eventCounter);
- ATH_MSG_INFO("Event [" << std::setw(5) << m_eventCounter << "] CPU Time: " << scaleTime(cpu_time) <<
- ", Wall Time: " << scaleTime(wall_time) << ", Vmem: " << scaleMem(vmem) <<
+ ATH_MSG_INFO("Event [" << std::setw(5) << m_eventCounter << "] CPU Time: " << scaleTime(cpu_time) <<
+ ", Wall Time: " << scaleTime(wall_time) << ", Vmem: " << scaleMem(vmem) <<
", Rss: " << scaleMem(rss) << ", Pss: " << scaleMem(pss) << ", Swap: " << scaleMem(swap));
}
@@ -438,8 +471,8 @@ void PerfMonMTSvc::report2Log_EventLevel() {
using boost::format;
ATH_MSG_INFO(" Event Level Monitoring ");
- ATH_MSG_INFO(" (Only first " << m_eventLoopMsgLimit.toString() <<
- " measurements are explicitly printed)");
+ ATH_MSG_INFO(" (Only the first " << m_eventLoopMsgLimit.toString() <<
+ " and the last measurements are explicitly printed)");
ATH_MSG_INFO("=======================================================================================");
ATH_MSG_INFO(format("%1% %|16t|%2% %|28t|%3% %|40t|%4% %|52t|%5% %|64t|%6% %|76t|%7%") % "Event" % "CPU [s]" %
@@ -448,14 +481,19 @@ void PerfMonMTSvc::report2Log_EventLevel() {
ATH_MSG_INFO("---------------------------------------------------------------------------------------");
m_eventLoopMsgCounter = 0; // reset counter
+ unsigned long nMeasurements = m_eventLevelData.getNMeasurements();
for (const auto& it : m_eventLevelData.getEventLevelData()) {
- if(m_eventLoopMsgCounter < m_eventLoopMsgLimit) {
+ // Print
+ if(m_eventLoopMsgCounter < m_eventLoopMsgLimit || m_eventLoopMsgCounter == nMeasurements - 1) {
+ if(m_eventLoopMsgCounter > m_eventLoopMsgLimit) {
+ ATH_MSG_INFO(format("%|=87|") % "...");
+ }
ATH_MSG_INFO(format("%1% %|16t|%2$.2f %|28t|%3$.2f %|40t|%4% %|52t|%5% %|64t|%6% %|76t|%7%") % it.first %
(it.second.cpu_time * 0.001) % (it.second.wall_time * 0.001) % it.second.mem_stats.at("vmem") %
it.second.mem_stats.at("rss") % it.second.mem_stats.at("pss") % it.second.mem_stats.at("swap"));
- m_eventLoopMsgCounter++;
}
+ m_eventLoopMsgCounter++;
// Add to leak estimate
if (it.first >= 25) {
m_fit_vmem.addPoint(it.first, it.second.mem_stats.at("vmem"));
@@ -471,7 +509,7 @@ void PerfMonMTSvc::report2Log_EventLevel() {
void PerfMonMTSvc::report2Log_Summary() {
using boost::format;
- ATH_MSG_INFO(" Snaphots Summary ");
+ ATH_MSG_INFO(" Snapshots Summary ");
ATH_MSG_INFO("=======================================================================================");
ATH_MSG_INFO(format("%1% %|13t|%2% %|25t|%3% %|37t|%4% %|44t|%5% %|55t|%6% %|66t|%7% %|77t|%8%") % "Step" %
@@ -495,6 +533,7 @@ void PerfMonMTSvc::report2Log_Summary() {
(m_snapshotData[EXECUTE].getDeltaCPU() / m_eventCounter));
ATH_MSG_INFO(format("%1% %|35t|%2$.3f ") % "Events per second:" %
(m_eventCounter / m_snapshotData[EXECUTE].getDeltaWall() * 1000.));
+ ATH_MSG_INFO(format("%1% %|35t|%2% ") % "CPU utilization efficiency [%]:" % getCpuEfficiency());
if (m_doEventLoopMonitoring) {
ATH_MSG_INFO("***************************************************************************************");
@@ -523,10 +562,28 @@ void PerfMonMTSvc::report2Log_CpuInfo() const {
ATH_MSG_INFO(format("%1% %|34t|%2% ") % "CPU Model:" % get_cpu_model_info());
ATH_MSG_INFO(format("%1% %|35t|%2% ") % "Number of Available Cores:" % get_cpu_core_info());
+ ATH_MSG_INFO(format("%1% %|35t|%2% ") % "Total Memory:" % scaleMem(get_memory_info()));
ATH_MSG_INFO("=======================================================================================");
}
+/*
+ * Report run-time enviroment information
+ */
+void PerfMonMTSvc::report2Log_EnvInfo() const {
+ using boost::format;
+ using boost::filesystem::path;
+
+ ATH_MSG_INFO(" Environment Information ");
+ ATH_MSG_INFO("=======================================================================================");
+
+ ATH_MSG_INFO(format("%1% %|35t|%2% ") % "Malloc Library:" % path(PMonSD::symb2lib("malloc")).filename().string());
+ ATH_MSG_INFO(format("%1% %|35t|%2% ") % "Math Library:" % path(PMonSD::symb2lib("atan2")).filename().string());
+
+ ATH_MSG_INFO("=======================================================================================");
+
+}
+
/*
* Report data to JSON
*/
@@ -569,7 +626,7 @@ void PerfMonMTSvc::report2JsonFile() {
* Report summary data to JSON
*/
void PerfMonMTSvc::report2JsonFile_Summary(nlohmann::json& j) const {
-
+
// Report snapshot level results
for(int i=0; i < NSNAPSHOTS; i++){
@@ -617,29 +674,43 @@ void PerfMonMTSvc::report2JsonFile_Summary(nlohmann::json& j) const {
// Report Sys info
const std::string cpuModel = get_cpu_model_info();
const int coreNum = get_cpu_core_info();
+ const long totMem = get_memory_info();
j["summary"]["sysInfo"] = {{"cpuModel", cpuModel},
- {"coreNum", coreNum}};
+ {"coreNum", coreNum},
+ {"totMem", totMem}};
+
+ // Report Enviroment info
+ const std::string mallocLib = boost::filesystem::path(PMonSD::symb2lib("malloc")).filename().string();
+ const std::string mathLib = boost::filesystem::path(PMonSD::symb2lib("atan2")).filename().string();
+
+ j["summary"]["envInfo"] = {{"mallocLib", mallocLib},
+ {"mathLib", mathLib}};
+
+ // Report CPU utilization efficiency;
+ const int cpuUtilEff = getCpuEfficiency();
+ j["summary"]["misc"] = {{"cpuUtilEff", cpuUtilEff}};
+
}
void PerfMonMTSvc::report2JsonFile_ComponentLevel(nlohmann::json& j) const {
for (const auto& dataMapPerStep : m_stdoutVec_serial) {
-
+
for(const auto& meas : dataMapPerStep){
const std::string step = meas.first.stepName;
- const std::string component = meas.first.compName;
+ const std::string component = meas.first.compName;
const uint64_t count = meas.second->getCallCount();
const double cpuTime = meas.second->getDeltaCPU();
- const long vmem = meas.second->getDeltaVmem();
+ const long vmem = meas.second->getDeltaVmem();
const int mall = meas.second->getDeltaMalloc();
j["componentLevel"][step][component] = {{"count", count},
{"cpuTime", cpuTime},
{"vmem", vmem},
{"malloc", mall}};
- }
+ }
}
@@ -648,7 +719,7 @@ void PerfMonMTSvc::report2JsonFile_ComponentLevel(nlohmann::json& j) const {
void PerfMonMTSvc::report2JsonFile_EventLevel(nlohmann::json& j) const {
for (const auto& it : m_eventLevelData.getEventLevelData()) {
-
+
const uint64_t event = it.first;
const double cpuTime = it.second.cpu_time;
const double wallTime = it.second.wall_time;
@@ -724,7 +795,7 @@ void PerfMonMTSvc::divideData2Steps() {
std::string PerfMonMTSvc::scaleTime(double timeMeas) const {
// Not a huge fan of this, we should eventually unify the types
// Just want to be explicit about what's happening
- long ms = (long) timeMeas;
+ long ms = (long) timeMeas;
// Compute hrs and offset
auto hrs = ms / 3600000;
@@ -739,13 +810,18 @@ std::string PerfMonMTSvc::scaleTime(double timeMeas) const {
// Primarily care about H:M:S
std::stringstream ss;
ss.fill('0');
- ss << std::setw(2) << hrs << "h" <<
- std::setw(2) << mins << "m" <<
+ ss << std::setw(2) << hrs << "h" <<
+ std::setw(2) << mins << "m" <<
std::setw(2) << secs << "s";
return ss.str();
}
std::string PerfMonMTSvc::scaleMem(long memMeas) const {
+ // The memory measurements should be positive
+ // Only delta(A,B) can go negative but this method
+ // is not used for those cases, at least for now
+ if (memMeas<0) return "NA";
+
std::ostringstream ss;
ss << std::fixed;
ss << std::setprecision(2);
@@ -789,43 +865,48 @@ std::string PerfMonMTSvc::scaleMem(long memMeas) const {
/*
* Collect some hardware information
*/
-std::string PerfMonMTSvc::get_cpu_model_info() const {
- std::string cpu_model;
-
- std::ifstream file("/proc/cpuinfo");
- std::string line;
- if (file.is_open()) {
- std::string delimiter = ":";
- while (getline(file, line)) {
- std::string key = line.substr(0, line.find(delimiter));
- if (key == "model name ") {
- cpu_model = line.substr(line.find(delimiter) + 1, line.length());
- break;
+std::string PerfMonMTSvc::get_info_from_file(const std::string& fileName,
+ const std::string& fieldName) const {
+ // Helper function to read files of type Key : Value
+ // Returns the last instance if there are multiple matches
+ // This is because we use this method to get the processor count
+ std::string result{""};
+
+ std::ifstream file{fileName};
+ std::string line{""};
+
+ while (std::getline(file, line)) {
+ if (line.empty()) continue;
+ size_t splitIdx = line.find(":");
+ if (splitIdx != std::string::npos) {
+ std::string val = line.substr(splitIdx + 1);
+ if (val.empty()) continue;
+ if (line.size() >= fieldName.size() &&
+ line.compare(0, fieldName.size(), fieldName) == 0) {
+ result = val;
}
}
- file.close();
- return cpu_model;
- } else {
- return "Unable to open /proc/cpuinfo";
}
+
+ file.close();
+
+ return result;
+}
+
+std::string PerfMonMTSvc::get_cpu_model_info() const {
+ return get_info_from_file("/proc/cpuinfo","model name") +
+ get_info_from_file("/proc/cpuinfo","cache size");
}
int PerfMonMTSvc::get_cpu_core_info() const {
- int logical_core_num = 0;
-
- std::ifstream file("/proc/cpuinfo");
- std::string line;
- if (file.is_open()) {
- std::string delimiter = ":";
- while (getline(file, line)) {
- std::string key = line.substr(0, line.find(delimiter));
- if (key == "processor ") {
- logical_core_num++;
- }
- }
- file.close();
- return logical_core_num;
- } else {
- return -1;
- }
+ std::string val = get_info_from_file("/proc/cpuinfo","processor");
+ if (val.empty()) return 0;
+ return std::stoi(val) + 1;
+}
+
+long PerfMonMTSvc::get_memory_info() const {
+ std::string val = get_info_from_file("/proc/meminfo","MemTotal");
+ if (val.empty()) return 0;
+ val = val.substr(0, val.size() - 3); // strip the trailing kB
+ return std::stol(val);
}
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.h b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.h
index d825d8a6a1b282488a3ff80001ffbe350a62f500..b432a7484918ea7c8aea91cd5c5c8cae30375edf 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.h
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.h
@@ -28,8 +28,6 @@
#include <iomanip>
#include <nlohmann/json.hpp>
-#include "boost/format.hpp"
-
// Other Libraries
#include <algorithm>
#include <cmath>
@@ -86,6 +84,7 @@ class PerfMonMTSvc : virtual public IPerfMonMTSvc, virtual public IIncidentListe
void report2Log_EventLevel();
void report2Log_Summary(); // make it const
void report2Log_CpuInfo() const;
+ void report2Log_EnvInfo() const;
/// Report to the JSON File
void report2JsonFile();
@@ -104,8 +103,12 @@ class PerfMonMTSvc : virtual public IPerfMonMTSvc, virtual public IIncidentListe
bool isCheckPoint();
+ /// A few helper methods to get system information
+ /// These should be carried to PerfMonMTUtils at some point
+ std::string get_info_from_file(const std::string& fileName, const std::string& fieldName) const;
std::string get_cpu_model_info() const;
int get_cpu_core_info() const;
+ long get_memory_info() const;
PMonMT::StepComp generate_state(const std::string& stepName, const std::string& compName) const;
@@ -196,6 +199,9 @@ class PerfMonMTSvc : virtual public IPerfMonMTSvc, virtual public IIncidentListe
PerfMon::LinFitSglPass m_fit_vmem;
PerfMon::LinFitSglPass m_fit_pss;
+ // Estimate CPU efficiency
+ int getCpuEfficiency() const;
+
}; // class PerfMonMTSvc
#endif // PERFMONCOMPS_PERFMONMTSVC_H
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTUtils.h b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTUtils.h
index 2b592779bd74a260f3e934ad866936450b5f584d..26b0cdb49c0730ca1dc988634b35109dcb7296a8 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTUtils.h
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTUtils.h
@@ -191,6 +191,8 @@ struct MeasurementData {
event_meas_map_t getEventLevelData() const { return m_eventLevel_delta_map; }
+ unsigned long getNMeasurements() const { return m_eventLevel_delta_map.size(); }
+
double getEventLevelCpuTime(unsigned long long event_count) const {
return m_eventLevel_delta_map.at(event_count).cpu_time;
}
diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
index 73c04aa2a0a5a9bacef2f0880f2b873ef9bee47c..d8104ae892a43b0b3b66a17a4379770ae09882ad 100644
--- a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
+++ b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -122,20 +122,6 @@ PileUpEventLoopMgr::~PileUpEventLoopMgr() {}
//=========================================================================
StatusCode PileUpEventLoopMgr::initialize()
{
- //-------------------------------------------------------------------------
- // Process Properties
- //-------------------------------------------------------------------------
- try
- {
- CHECK(setProperties());
- // configure our MsgStream
- m_msg.get().setLevel( m_outputLevel.value() );
- }
- catch (...)
- {
- ATH_MSG_WARNING ( "Caught exception thrown reading in properties" );
- }
-
ATH_MSG_INFO ( "Initializing " << this->name() << " - package version " << PACKAGE_VERSION ) ;
if(!m_allowSerialAndMPToDiffer)
{
diff --git a/Control/SGTools/src/DataStore.cxx b/Control/SGTools/src/DataStore.cxx
index d7e596184fb368da9ba7d40bc25b212a6e792d9d..125bf7a485f4cac2c772ecb60188e7fdf01e268f 100755
--- a/Control/SGTools/src/DataStore.cxx
+++ b/Control/SGTools/src/DataStore.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
*/
#include "SGTools/DataStore.h"
@@ -208,12 +208,17 @@ DataStore::removeProxy(DataProxy* proxy, bool forceRemove, bool hard)
int index = it->second.first;
sc = StatusCode::SUCCESS;
+ // Remove primary entry.
m_keyMap.erase (it);
if (storeIter != m_storeMap.end()) {
if (1 == storeIter->second.erase(name)) {
proxy->release();
}
}
+ else {
+ // A dummy proxy.
+ proxy->release();
+ }
// Remove all symlinks too.
for (CLID symclid : clids)
diff --git a/Control/SGTools/test/DataStore_test.cxx b/Control/SGTools/test/DataStore_test.cxx
index ce081b63da65389d5c81a2cd9bd4c8851113ffe9..2223c6dc42755a78c549fafc33090e7b7fd30447 100644
--- a/Control/SGTools/test/DataStore_test.cxx
+++ b/Control/SGTools/test/DataStore_test.cxx
@@ -1,8 +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
*/
-
-// $Id$
/**
* @file DataStore_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -512,6 +510,24 @@ void test_dummy ATLAS_NOT_THREAD_SAFE ()
assert (dp2->clID() == 456);
assert (dp2->name() == "dp2");
assert (dp2->refCount() == 1);
+
+ SG::StringPool::sgkey_t sgkey3 = pool.stringToKey ("dp3", 456);
+ SG::DataProxy* dp3 = make_proxy (0, "", sgkey3);
+ assert (store.addToStore (0, dp3).isSuccess());
+ assert (dp3->refCount() == 1);
+ assert (store.proxy_exact (sgkey3) == dp3);
+
+ dp1->addRef();
+ dp2->addRef();
+ dp3->addRef();
+ assert (dp1->refCount() == 2);
+ assert (dp2->refCount() == 2);
+ assert (dp3->refCount() == 2);
+
+ store.clearStore (true, false, nullptr);
+ assert (dp1->refCount() == 1);
+ assert (dp2->refCount() == 1);
+ assert (dp3->refCount() == 1);
}
diff --git a/Control/StoreGateBindings/python/Bindings.py b/Control/StoreGateBindings/python/Bindings.py
index 07d8c9b46fd535518d3ff5fd6992be3c07a04fb1..9797e0490a0b5680d9a634963ee8259d10f35c4c 100644
--- a/Control/StoreGateBindings/python/Bindings.py
+++ b/Control/StoreGateBindings/python/Bindings.py
@@ -85,7 +85,7 @@ def _setup():
ret = py_sg_getitem(self, str(key).encode())
except LookupError as err:
raise KeyError(str(err))
- if ret and hasattr(ret,'setStore') and not ret.hasStore():
+ if ret and hasattr(ret,'setStore') and hasattr(ret,'hasStore') and not ret.hasStore():
if not hasattr(ret,'trackIndices') or ret.trackIndices():
if py_sg_contains (self, 'SG::IConstAuxStore', key + 'Aux.'):
aux = py_retrieve (self, 'SG::IConstAuxStore', key + 'Aux.')
diff --git a/Control/xAODRootAccess/Root/Init.cxx b/Control/xAODRootAccess/Root/Init.cxx
index 2b0f02b4374b66cdf588af0ed0e83978701c3f55..3375db647492e61f2a104b5b2bf68d15c7c1be15 100644
--- a/Control/xAODRootAccess/Root/Init.cxx
+++ b/Control/xAODRootAccess/Root/Init.cxx
@@ -74,7 +74,8 @@ namespace xAOD {
"xAOD::TauJet_v1",
"xAOD::PFO_v1",
"xAOD::TrigElectron_v1",
- "xAOD::L2CombinedMuon_v1"}) {
+ "xAOD::L2CombinedMuon_v1",
+ "xAOD::Particle_v1"}) {
// silently ignore missing classes, because this gets used in
// all projects, and not all projects contain all xAOD classes
static constexpr Bool_t LOAD = kTRUE;
diff --git a/Control/xAODRootAccess/Root/TEvent.cxx b/Control/xAODRootAccess/Root/TEvent.cxx
index 71b4b7090f09757a3aaee0ba38a41eaf45245995..2a417946663183bb282ccffe8d49e5c84b96d074 100644
--- a/Control/xAODRootAccess/Root/TEvent.cxx
+++ b/Control/xAODRootAccess/Root/TEvent.cxx
@@ -305,8 +305,8 @@ namespace xAOD {
// Get the type:
::TClass* cl =
::TClass::GetClass( ef_itr->second.className().c_str() );
- const std::type_info* ti = cl->GetTypeInfo();
- if( ( ! cl->IsLoaded() ) || ( ! ti ) ) {
+ const std::type_info* ti = ( cl ? cl->GetTypeInfo() : nullptr );
+ if( ( ! cl ) || ( ! cl->IsLoaded() ) || ( ! ti ) ) {
Warning( "xAOD::TEvent::dump",
"Unknown type (%s) found in the event format",
ef_itr->second.className().c_str() );
@@ -424,7 +424,7 @@ namespace xAOD {
}
// Check if the EventFormat branch is available:
- static const std::string eventFormatBranchName =
+ const std::string eventFormatBranchName =
Utils::getFirstBranchMatch( m_inMetaTree, "EventFormat");
if( ! m_inMetaTree->GetBranch( eventFormatBranchName.c_str() ) ) {
// This can happen when the file was produced by an Athena job that
diff --git a/Control/xAODRootAccess/test/ut_xaodrootaccess_proxydict_test.cxx b/Control/xAODRootAccess/test/ut_xaodrootaccess_proxydict_test.cxx
index d4ef762974ab781fcf14da27aff25297a2f932ea..a89c2e8801d1df919bf215c0c230557233dd9769 100644
--- a/Control/xAODRootAccess/test/ut_xaodrootaccess_proxydict_test.cxx
+++ b/Control/xAODRootAccess/test/ut_xaodrootaccess_proxydict_test.cxx
@@ -65,7 +65,7 @@ int main() {
// The auxiliary variable to access later on. Tried to select something
// that should be a dynamic variable in any type of input file.
static const SG::auxid_t auxid =
- SG::AuxTypeRegistry::instance().getAuxID< float >( "ptcone20" );
+ SG::AuxTypeRegistry::instance().getAuxID< float >( "ptvarcone20" );
// The clid for the auxiliary stores.
static const CLID auxClid = ClassID_traits< SG::IConstAuxStore >::ID();
diff --git a/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_copy_test.cxx b/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_copy_test.cxx
index 176b00d2264aad33110541804e79f81adcda6375..ab48f41cf999076f10826830b37f342b6e70f753 100644
--- a/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_copy_test.cxx
+++ b/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_copy_test.cxx
@@ -17,7 +17,7 @@
#include "xAODRootAccess/tools/ReturnCheck.h"
/// Helper macro
-#define CHECK( CONTEXT, EXP ) \
+#define TEST_CHECK( CONTEXT, EXP ) \
do { \
const StatusCode result = EXP; \
if( ! result.isSuccess() ) { \
@@ -36,12 +36,12 @@ int main() {
static const char* APP_NAME = "ut_xaodrootaccess_tevent_copy_test";
// Initialise the environment:
- CHECK( APP_NAME, xAOD::Init() );
+ TEST_CHECK( APP_NAME, xAOD::Init() );
// Test the copying in class access mode:
- CHECK( APP_NAME, copyObjects( xAOD::TEvent::kClassAccess ) );
+ TEST_CHECK( APP_NAME, copyObjects( xAOD::TEvent::kClassAccess ) );
// Test the copying in athena access mode:
- CHECK( APP_NAME, copyObjects( xAOD::TEvent::kAthenaAccess ) );
+ TEST_CHECK( APP_NAME, copyObjects( xAOD::TEvent::kAthenaAccess ) );
// Return gracefully:
return 0;
diff --git a/Database/APR/RootStorageSvc/src/RootTreeContainer.h b/Database/APR/RootStorageSvc/src/RootTreeContainer.h
index 106e01a0dab679736d7107869324cf289c176efb..cc72b055ed769e3f75e087f041c4e922a34d4758 100755
--- a/Database/APR/RootStorageSvc/src/RootTreeContainer.h
+++ b/Database/APR/RootStorageSvc/src/RootTreeContainer.h
@@ -18,6 +18,7 @@
// Framework include files
#include "StorageSvc/DbDatabase.h"
#include "StorageSvc/DbContainerImp.h"
+#include "RootAuxDynIO/RootAuxDynIO.h"
#include <map>
#include <vector>
@@ -72,7 +73,7 @@ namespace pool {
// extra variables used by Aux dynamic
size_t rows_written = 0;
// AuxDyn reader if used by this branch
- IRootAuxDynReader*aux_reader = nullptr;
+ std::unique_ptr<IRootAuxDynReader> aux_reader;
int aux_iostore_IFoffset = -1;
bool is_basic_type = false;
bool written = false;
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/IAthenaPoolCnvSvc.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/IAthenaPoolCnvSvc.h
index 99284d0f00301af32b2db10adfdfe179fd9bdf50..3ba23ed770231a06eb50d27e006dcad354a1980a 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/IAthenaPoolCnvSvc.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/IAthenaPoolCnvSvc.h
@@ -54,7 +54,7 @@ public:
/// @param obj [OUT] pointer to the Data Object.
/// @param token [IN] string token of the Data Object for which a Pool Ref is filled.
- virtual void setObjPtr(void*& obj, const Token* token) const = 0;
+ virtual void setObjPtr(void*& obj, const Token* token) = 0;
/// @return a boolean for using detailed time and size statistics.
virtual bool useDetailChronoStat() const = 0;
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py
index de15a350b0e8945e522dd06ac2f2268a2ae3323a..8779b2921140672bfffeb0aa8187ef9381036860 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py
@@ -2,6 +2,50 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaKernel.EventIdOverrideConfig import EvtIdModifierSvcCfg
+
+def EventSelectorAthenaPoolCfg(configFlags):
+ result=ComponentAccumulator()
+ EventSelectorAthenaPool=CompFactory.EventSelectorAthenaPool
+ evSel=EventSelectorAthenaPool("EventSelector",
+ InputCollections = configFlags.Input.Files,
+ SkipEvents=configFlags.Exec.SkipEvents)
+ if configFlags.Input.OverrideRunNumber:
+ if not configFlags.Input.RunAndLumiOverrideList:
+ DataRunNumber = -1
+ FirstLB = 1
+ InitialTimeStamp = 1
+ OldRunNumber = -1
+ if configFlags.Digitization.DataRunNumber>0:
+ # Behaviour for Digitization jobs using DataRunNumber
+ DataRunNumber = configFlags.Digitization.DataRunNumber
+ FirstLB = 1
+ InitialTimeStamp = configFlags.IOVDb.RunToTimestampDict.get(DataRunNumber, 1) # TODO fix repeated configuration
+ if not configFlags.Sim.DoFullChain:
+ OldRunNumber = configFlags.Input.RunNumber[0] # CHECK this should be the Run Number from the HITS file
+ elif configFlags.Input.RunNumber:
+ # Behaviour for Simulation jobs
+ DataRunNumber = configFlags.Input.RunNumber[0]
+ FirstLB = configFlags.Input.LumiBlockNumber[0]
+ InitialTimeStamp = configFlags.Input.TimeStamp[0]
+ assert DataRunNumber >= 0, (
+ "configFlags.Input.OverrideRunNumber was True, but provided DataRunNumber (%d) is negative. "
+ "Use a real run number from data." % DataRunNumber)
+ evSel.OverrideRunNumber = configFlags.Input.OverrideRunNumber
+ evSel.RunNumber = DataRunNumber
+ evSel.FirstLB = FirstLB
+ evSel.InitialTimeStamp = InitialTimeStamp # Necessary to avoid a crash
+ if hasattr(evSel, "OverrideRunNumberFromInput"):
+ evSel.OverrideRunNumberFromInput = configFlags.Input.OverrideRunNumber
+ if OldRunNumber > 0:
+ evSel.OldRunNumber = OldRunNumber
+ else:
+ # Behaviour for Digitization jobs using RunAndLumiOverrideList
+ pass
+ result.merge(EvtIdModifierSvcCfg(configFlags))
+ result.addService(evSel)
+ return result
+
def PoolReadCfg(configFlags):
"""
@@ -70,17 +114,15 @@ def PoolReadCfg(configFlags):
IsSecondary=True,
InputCollections=filenamesSecondary)
result.addService(secondarySel)
+ result.addService(evSel)
else:
# We have only primary inputs
apaps=AthenaPoolAddressProviderSvc()
result.addService(apaps)
result.addService(ProxyProviderSvc(ProviderNames=[apaps.getFullJobOptName(),])) #No service handle yet???
+ result.merge(EventSelectorAthenaPoolCfg(configFlags))
+ evSel = result.getService("EventSelector")
- evSel=EventSelectorAthenaPool("EventSelector",
- InputCollections = filenames,
- SkipEvents=configFlags.Exec.SkipEvents)
-
- result.addService(evSel)
result.setAppProperty("EvtSel",evSel.getFullJobOptName())
#(possibly) missing: MetaDataSvc
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index 6ee02a6d051705c79a097931c87ffe7437ac773c..2134f4c0206d5143858950e51956791ec7b9a0c7 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -424,7 +424,7 @@ StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpe
&& m_outputStreamingTool[m_streamServer]->isServer()) {
auto& streamingTool = m_outputStreamingTool[m_streamServer];
// Clear object to get Placements for all objects in a Stream
- char* placementStr = nullptr;
+ const char* placementStr = nullptr;
int num = -1;
StatusCode sc = streamingTool->clearObject(&placementStr, num);
if (sc.isSuccess() && placementStr != nullptr && strlen(placementStr) > 6 && num > 0) {
@@ -778,7 +778,7 @@ Token* AthenaPoolCnvSvc::registerForWrite(Placement* placement, const void* obj,
return(nullptr);
}
// Get Token back from Server
- char* tokenStr = nullptr;
+ const char* tokenStr = nullptr;
int num = -1;
sc = m_outputStreamingTool[streamClient]->clearObject(&tokenStr, num);
while (sc.isRecoverable()) {
@@ -846,11 +846,16 @@ Token* AthenaPoolCnvSvc::registerForWrite(Placement* placement, const void* obj,
return(token);
}
//______________________________________________________________________________
-void AthenaPoolCnvSvc::setObjPtr(void*& obj, const Token* token) const {
+void AthenaPoolCnvSvc::setObjPtr(void*& obj, const Token* token) {
ATH_MSG_VERBOSE("Requesting object for: " << token->toString());
if (m_doChronoStat) {
m_chronoStatSvc->chronoStart("cObjR_ALL");
}
+ if (m_makeStreamingToolClient.value() > 0 && !m_inputStreamingTool.empty() && !m_inputStreamingTool->isServer() && !m_inputStreamingTool->isClient()) {
+ if (!makeClient(-m_makeStreamingToolClient.value()).isSuccess()) {
+ ATH_MSG_ERROR("Could not make AthenaPoolCnvSvc a Share Client");
+ }
+ }
if (!m_outputStreamingTool.empty() && m_streamServer < m_outputStreamingTool.size()
&& m_outputStreamingTool[m_streamServer]->isServer()) {
if (token->dbID() == Guid::null()) {
@@ -888,7 +893,7 @@ void AthenaPoolCnvSvc::setObjPtr(void*& obj, const Token* token) const {
}
}
if (!m_inputStreamingTool.empty() && m_inputStreamingTool->isClient()) {
- ATH_MSG_VERBOSE("Requesting object for: " << token->toString());
+ ATH_MSG_VERBOSE("Requesting remote object for: " << token->toString());
if (!m_inputStreamingTool->lockObject(token->toString().c_str()).isSuccess()) {
ATH_MSG_ERROR("Failed to lock Data for " << token->toString());
obj = nullptr;
@@ -940,6 +945,12 @@ StatusCode AthenaPoolCnvSvc::createAddress(long svcType,
ATH_MSG_ERROR("createAddress: svcType != POOL_StorageType " << svcType << " " << POOL_StorageType);
return(StatusCode::FAILURE);
}
+ if (m_makeStreamingToolClient.value() > 0 && !m_inputStreamingTool.empty() && !m_inputStreamingTool->isServer() && !m_inputStreamingTool->isClient()) {
+ if (!makeClient(-m_makeStreamingToolClient.value()).isSuccess()) {
+ ATH_MSG_ERROR("Could not make AthenaPoolCnvSvc a Share Client");
+ return(StatusCode::FAILURE);
+ }
+ }
Token* token = nullptr;
if (par[0].substr(0, 3) == "SHM") {
token = new Token();
@@ -968,7 +979,7 @@ StatusCode AthenaPoolCnvSvc::createAddress(long svcType,
return(StatusCode::FAILURE);
}
token = new Token();
- token->fromString(static_cast<char*>(buffer)); buffer = nullptr;
+ token->fromString(static_cast<const char*>(buffer)); buffer = nullptr;
if (token->classID() == Guid::null()) {
delete token; token = nullptr;
}
@@ -1103,11 +1114,11 @@ StatusCode AthenaPoolCnvSvc::makeClient(int num) {
return(m_inputStreamingTool->makeClient(num));
}
//________________________________________________________________________________
-StatusCode AthenaPoolCnvSvc::readData() const {
+StatusCode AthenaPoolCnvSvc::readData() {
if (m_inputStreamingTool.empty()) {
return(StatusCode::FAILURE);
}
- char* tokenStr = nullptr;
+ const char* tokenStr = nullptr;
int num = -1;
StatusCode sc = m_inputStreamingTool->clearObject(&tokenStr, num);
if (sc.isSuccess() && tokenStr != nullptr && strlen(tokenStr) > 0 && num > 0) {
@@ -1189,7 +1200,7 @@ StatusCode AthenaPoolCnvSvc::abortSharedWrClients(int client_n)
if (client_n >= 0) {
sc = streamingTool->lockObject("ABORT", client_n);
}
- char* dummy;
+ const char* dummy;
sc = streamingTool->clearObject(&dummy, client_n);
while (sc.isRecoverable()) {
sc = streamingTool->clearObject(&dummy, client_n);
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
index 630766b5b972b8be53234925947df356cb49e18a..ff4e651dddae0b276b3e99f2431793193fa3d2b8 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
@@ -99,7 +99,7 @@ public:
/// @param obj [OUT] pointer to the Data Object.
/// @param token [IN] string token of the Data Object for which a Pool Ref is filled.
- void setObjPtr(void*& obj, const Token* token) const;
+ void setObjPtr(void*& obj, const Token* token);
/// @return a boolean for using detailed time and size statistics.
bool useDetailChronoStat() const;
@@ -152,7 +152,7 @@ public:
virtual StatusCode makeClient(int num);
/// Read the next data object
- virtual StatusCode readData() const;
+ virtual StatusCode readData();
/// Send abort to SharedWriter clients if the server quits on error
/// @param client_n [IN] number of the current client, -1 if no current
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AuxDiscoverySvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AuxDiscoverySvc.cxx
index a45a0580a3a83c880eaf70f54706fe686a1c5bde..643354ddd27f40fb52ed5b972b63035a4e3c39b0 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AuxDiscoverySvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AuxDiscoverySvc.cxx
@@ -166,25 +166,25 @@ StatusCode AuxDiscoverySvc::receiveStore(const IAthenaSerializeSvc* serSvc, cons
return(StatusCode::SUCCESS);
}
Guid classId;
- classId.fromString(static_cast<char*>(buffer));
+ classId.fromString(static_cast<const char*>(buffer));
if (!ipcTool->getObject(&buffer, nbytes, num).isSuccess() || nbytes == 0) {
return(StatusCode::FAILURE);
}
- const std::string contName = std::string(static_cast<char*>(buffer));
+ const std::string contName = std::string(static_cast<const char*>(buffer));
if (classId != Guid::null() && this->getAuxStore(obj, classId, contName)) {
- void* attrName = nullptr;
- void* typeName = nullptr;
- void* elemName = nullptr;
+ void* nameData = nullptr;
// StreamingTool owns buffer, will stay around until last dynamic attribute is copied
- while (ipcTool->getObject(&attrName, nbytes, num).isSuccess() && nbytes > 0 &&
- ipcTool->getObject(&typeName, nbytes, num).isSuccess() && nbytes > 0 &&
- ipcTool->getObject(&elemName, nbytes, num).isSuccess() && nbytes > 0) {
+ while (ipcTool->getObject(&nameData, nbytes, num).isSuccess() && nbytes > 0) {
+ const char* del1 = static_cast<const char*>(memchr(nameData, '\n', nbytes));
+ const char* del2 = static_cast<const char*>(memchr(del1 + 1, '\n', nbytes - (del1 - static_cast<const char*>(nameData) - 1)));
+ const std::string dataStr(static_cast<const char*>(nameData));
+ const std::string& attrName = dataStr.substr(0, del1 - static_cast<const char*>(nameData));
+ const std::string& typeName = dataStr.substr(del1 - static_cast<const char*>(nameData) + 1, del2 - del1 - 1);
+ const std::string& elemName = dataStr.substr(del2 - static_cast<const char*>(nameData) + 1);
if (ipcTool->getObject(&buffer, nbytes, num).isSuccess()) {
- SG::auxid_t auxid = this->getAuxID(static_cast<char*>(attrName),
- static_cast<char*>(elemName),
- static_cast<char*>(typeName));
+ SG::auxid_t auxid = this->getAuxID(attrName, elemName, typeName);
if (auxid != SG::null_auxid) {
- const RootType type(std::string(static_cast<char*>(typeName)));
+ const RootType type(typeName);
void* dynAttr = nullptr;
if (type.IsFundamental()) {
dynAttr = new char[nbytes];
@@ -218,12 +218,8 @@ StatusCode AuxDiscoverySvc::sendStore(const IAthenaSerializeSvc* serSvc,
}
}
for (SG::auxid_set_t::const_iterator iter = auxIDs.begin(), last = auxIDs.end(); iter != last; iter++) {
- const std::string& attrName = this->getAttrName(*iter);
- const std::string& typeName = this->getTypeName(*iter);
- const std::string& elemName = this->getElemName(*iter);
- if (!ipcTool->putObject(attrName.c_str(), attrName.size() + 1, num).isSuccess() ||
- !ipcTool->putObject(typeName.c_str(), typeName.size() + 1, num).isSuccess() ||
- !ipcTool->putObject(elemName.c_str(), elemName.size() + 1, num).isSuccess()) {
+ const std::string& dataStr = this->getAttrName(*iter) + "\n" + this->getTypeName(*iter) + "\n" + this->getElemName(*iter);
+ if (!ipcTool->putObject(dataStr.c_str(), dataStr.size() + 1, num).isSuccess()) {
return(StatusCode::FAILURE);
}
const std::type_info* tip = this->getType(*iter);
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolAuxContainerCnv_test.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolAuxContainerCnv_test.cxx
index ff8d44c2bd68904ffebbf7cd6ab10c5a370e9789..c82597113a1b805e9072796011beda6025b8959a 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolAuxContainerCnv_test.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolAuxContainerCnv_test.cxx
@@ -49,7 +49,7 @@ public:
m_pers2 (nullptr)
{}
- virtual void setObjPtr(void*& obj, const Token* /*token*/) const override
+ virtual void setObjPtr(void*& obj, const Token* /*token*/) override
{
if (m_pers2) {
obj = new YAuxCont_v2 (*m_pers2);
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolTPCnvCnv_test.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolTPCnvCnv_test.cxx
index ac964f1fb8fe4281a87b7b9ca9c476a23819b139..a75b13c22154cdf0f8bda9abeca35cef5fb22753 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolTPCnvCnv_test.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolTPCnvCnv_test.cxx
@@ -44,7 +44,7 @@ public:
m_pers2 (nullptr)
{}
- virtual void setObjPtr(void*& obj, const Token* /*token*/) const override
+ virtual void setObjPtr(void*& obj, const Token* /*token*/) override
{
if (m_pers2) {
obj = new XCont_p2 (*m_pers2);
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolViewVectorCnv_test.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolViewVectorCnv_test.cxx
index 03d9e441712982d54c83594399a62cb27a11ed3b..ba57e7647d90f74693da766fff1838ab2adde096 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolViewVectorCnv_test.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolViewVectorCnv_test.cxx
@@ -100,7 +100,7 @@ public:
m_pers_old (nullptr)
{}
- virtual void setObjPtr(void*& obj, const Token* token) const override
+ virtual void setObjPtr(void*& obj, const Token* token) override
{
if (m_pers) {
auto vvb = new ViewVector<DataVector<Y_v2> > (*m_pers);
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolxAODCnv_test.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolxAODCnv_test.cxx
index 8c85da607c8af48f46874f67383c92b98fd9929a..ad32a48ed6950af9d0c971245eba06c6c0db8f65 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolxAODCnv_test.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/T_AthenaPoolxAODCnv_test.cxx
@@ -47,7 +47,7 @@ public:
m_pers2 (nullptr)
{}
- virtual void setObjPtr(void*& obj, const Token* /*token*/) const override
+ virtual void setObjPtr(void*& obj, const Token* /*token*/) override
{
if (m_pers2) {
DataVector<Y_v2>* v = new DataVector<Y_v2>;
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/TestCnvSvcBase.icc b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/TestCnvSvcBase.icc
index 8b9cdf0739a9551160b434548e1eb496cca56e41..6a820b1c01c7ff6889f31bd4bd95e10667c21272 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/test/TestCnvSvcBase.icc
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/test/TestCnvSvcBase.icc
@@ -105,7 +105,7 @@ public:
{ std::abort(); }
virtual StatusCode connectOutput(const std::string& /*outputFile*/) override
{ std::abort(); }
- virtual StatusCode readData() const override
+ virtual StatusCode readData() override
{ std::abort(); }
virtual const std::string& name() const override
{ return m_name; }
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
index d2a9fd62a6d37c846696cda44b9c2ca98f21f30c..56bebd2cf50813b7c322fdf5874380fec70c8ffb 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
@@ -230,7 +230,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventInfo_p4
@@ -242,7 +242,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleHitContainer_p1_MyHits'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleHitContainer_p1/MyHits) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:ExampleHitContainer_p1
@@ -254,7 +254,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:DataHeader_p6
@@ -266,7 +266,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:DataHeaderForm_p6
@@ -278,7 +278,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:Token
@@ -290,7 +290,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsSimulation'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsSimulation) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:bool
@@ -300,14 +300,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsCalibration'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsCalibration) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(IsTestBeam)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsTestBeam'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsTestBeam) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO unsigned int [????]
@@ -316,7 +316,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'McChannel'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(McChannel) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:unsigned int
@@ -326,7 +326,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO unsigned long long [????]
@@ -335,7 +335,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:unsigned long long
@@ -345,35 +345,35 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'LumiBlockN'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(LumiBlockN) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(ConditionsRun)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'ConditionsRun'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(ConditionsRun) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(EventTime)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventTime'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventTime) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(EventTimeNanoSec)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventTimeNanoSec'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventTimeNanoSec) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(BunchId)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'BunchId'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(BunchId) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO float [????]
@@ -382,7 +382,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventWeight'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventWeight) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:float
@@ -438,7 +438,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventInfo_p4
@@ -450,7 +450,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleTrackContainer_p1_MyTracks'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleTrackContainer_p1/MyTracks) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:ExampleTrackContainer_p1
@@ -460,7 +460,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:DataHeader_p6
@@ -470,7 +470,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:DataHeaderForm_p6
@@ -1658,7 +1658,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1670,7 +1670,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventStreamInfo_p3
@@ -1682,7 +1682,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1694,7 +1694,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[12 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1704,14 +1704,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
@@ -1752,7 +1752,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (7 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1762,7 +1762,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream2'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream2) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [203] (8 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
@@ -1772,7 +1772,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1782,7 +1782,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream2'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream2) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (a , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1792,14 +1792,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (b , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
index 72d5c878fb4d0ff2ca758e8cb111a8a114255592..61744aeb1cf7b62f95ee4ae6a73a6e963eb17c9d 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
@@ -79,33 +79,33 @@ SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile1... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -191,9 +191,9 @@ AthenaPoolCnvSvc DEBUG setAttribute TREE_CACHE to -1 for db: SimplePoolFile1.
Stream1.FileMet... INFO Invalid "/TagInfo" handle
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -270,7 +270,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:EventInfo_p4
@@ -280,7 +280,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleHitContainer_p1_MyHits'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleHitContainer_p1/MyHits) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:ExampleHitContainer_p1
@@ -290,7 +290,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:DataHeader_p6
@@ -300,7 +300,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:DataHeaderForm_p6
@@ -310,7 +310,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:Token
@@ -322,7 +322,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsSimulation'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsSimulation) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:bool
@@ -332,21 +332,21 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsCalibration'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsCalibration) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(IsTestBeam)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsTestBeam'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsTestBeam) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(McChannel)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'McChannel'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(McChannel) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:unsigned int
@@ -356,7 +356,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO unsigned long long [????]
@@ -365,7 +365,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:unsigned long long
@@ -375,35 +375,35 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'LumiBlockN'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(LumiBlockN) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(ConditionsRun)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'ConditionsRun'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(ConditionsRun) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(EventTime)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventTime'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventTime) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(EventTimeNanoSec)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventTimeNanoSec'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventTimeNanoSec) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(BunchId)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'BunchId'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(BunchId) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO float [????]
@@ -412,7 +412,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventWeight'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventWeight) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:float
@@ -424,9 +424,9 @@ Stream1.FileMet... DEBUG set xAOD::FileMetaData::dataType to Stream1
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -448,9 +448,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -472,9 +472,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -496,9 +496,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -520,9 +520,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -544,9 +544,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -568,9 +568,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -592,9 +592,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -616,9 +616,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -640,9 +640,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -664,9 +664,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -688,9 +688,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -712,9 +712,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -736,9 +736,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -760,9 +760,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -784,9 +784,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -808,9 +808,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -832,9 +832,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -856,9 +856,9 @@ Stream1 DEBUG connectOutput done for SimplePoolReplica1.root
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -918,7 +918,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -930,7 +930,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:EventStreamInfo_p3
@@ -942,7 +942,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -954,7 +954,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[12 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -964,14 +964,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
index 6ab064a1bd33d23ee58741753223307b0a5fe1a3..68bd01c5b92c2fb103a5285cd95f7503c60fd73f 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
@@ -92,51 +92,51 @@ SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile1... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 24 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -192,11 +192,11 @@ SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile4... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) [20?] (3 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) [203] (3 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -227,9 +227,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -273,11 +273,11 @@ SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile4... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) [20?] (3 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) [203] (3 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -341,10 +341,10 @@ ReadData INFO Hit x = 30.1245 y = 46.5449 z = 43.831 detector = Dumm
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -375,9 +375,9 @@ ReadData INFO Hit x = 130.125 y = 46.5449 z = -56.169 detector = Dum
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -408,9 +408,9 @@ ReadData INFO Hit x = 230.125 y = 46.5449 z = -156.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -441,9 +441,9 @@ ReadData INFO Hit x = 330.125 y = 46.5449 z = -256.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -474,9 +474,9 @@ ReadData INFO Hit x = 430.125 y = 46.5449 z = -356.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -507,9 +507,9 @@ ReadData INFO Hit x = 530.125 y = 46.5449 z = -456.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -540,9 +540,9 @@ ReadData INFO Hit x = 630.125 y = 46.5449 z = -556.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -573,9 +573,9 @@ ReadData INFO Hit x = 730.125 y = 46.5449 z = -656.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -606,9 +606,9 @@ ReadData INFO Hit x = 830.125 y = 46.5449 z = -756.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -639,9 +639,9 @@ ReadData INFO Hit x = 930.125 y = 46.5449 z = -856.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -672,9 +672,9 @@ ReadData INFO Hit x = 1030.12 y = 46.5449 z = -956.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -705,9 +705,9 @@ ReadData INFO Hit x = 1130.12 y = 46.5449 z = -1056.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -738,9 +738,9 @@ ReadData INFO Hit x = 1230.12 y = 46.5449 z = -1156.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -771,9 +771,9 @@ ReadData INFO Hit x = 1330.12 y = 46.5449 z = -1256.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -804,9 +804,9 @@ ReadData INFO Hit x = 1430.12 y = 46.5449 z = -1356.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -837,9 +837,9 @@ ReadData INFO Hit x = 1530.12 y = 46.5449 z = -1456.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -870,9 +870,9 @@ ReadData INFO Hit x = 1630.12 y = 46.5449 z = -1556.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -903,9 +903,9 @@ ReadData INFO Hit x = 1730.12 y = 46.5449 z = -1656.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -936,9 +936,9 @@ ReadData INFO Hit x = 1830.12 y = 46.5449 z = -1756.17 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
index 4265520c8b57faee7209b007e77b8500e947e232..62d7dbe9ca0f1970b43751df4ada39e4c5890531 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
@@ -89,53 +89,53 @@ SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile5... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [202] (14 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [20?] (15 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [202] (15 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (16 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [202] (16 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (17 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [202] (17 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (18 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [202] (18 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (19 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [202] (19 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (1a , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [202] (1a , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 25 Entries in total.
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -195,10 +195,10 @@ MetaData(Exampl... DEBUG Opened container MetaData(ExampleHitContainer_p1/Pedes
ToolSvc.AthPool... INFO Pedestal x = 193136 y = -5580.01 z = -175208 string = <..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o>
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
ClassIDSvc INFO getRegistryEntries: read 6 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -249,10 +249,10 @@ ReadData INFO Hit x = 30.1245 y = -53.4551 z = 43.831 detector = Dum
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
ClassIDSvc INFO getRegistryEntries: read 15 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -281,9 +281,9 @@ ReadData INFO Hit x = 130.125 y = -53.4551 z = -56.169 detector = Du
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #0 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -312,9 +312,9 @@ ReadData INFO Hit x = 230.125 y = -53.4551 z = -156.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #0 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -343,9 +343,9 @@ ReadData INFO Hit x = 330.125 y = -53.4551 z = -256.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #0 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -374,9 +374,9 @@ ReadData INFO Hit x = 430.125 y = -53.4551 z = -356.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #0 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -405,9 +405,9 @@ ReadData INFO Hit x = 530.125 y = -53.4551 z = -456.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #0 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -436,9 +436,9 @@ ReadData INFO Hit x = 630.125 y = -53.4551 z = -556.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #0 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -467,9 +467,9 @@ ReadData INFO Hit x = 730.125 y = -53.4551 z = -656.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #0 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -498,9 +498,9 @@ ReadData INFO Hit x = 830.125 y = -53.4551 z = -756.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #0 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -529,9 +529,9 @@ ReadData INFO Hit x = 930.125 y = -53.4551 z = -856.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #0 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -560,9 +560,9 @@ ReadData INFO Hit x = 1030.12 y = -53.4551 z = -956.169 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #0 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -591,9 +591,9 @@ ReadData INFO Hit x = 1130.12 y = -53.4551 z = -1056.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #0 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -622,9 +622,9 @@ ReadData INFO Hit x = 1230.12 y = -53.4551 z = -1156.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #0 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -653,9 +653,9 @@ ReadData INFO Hit x = 1330.12 y = -53.4551 z = -1256.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #0 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -684,9 +684,9 @@ ReadData INFO Hit x = 1430.12 y = -53.4551 z = -1356.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #0 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -715,9 +715,9 @@ ReadData INFO Hit x = 1530.12 y = -53.4551 z = -1456.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #0 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -746,9 +746,9 @@ ReadData INFO Hit x = 1630.12 y = -53.4551 z = -1556.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #0 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -777,9 +777,9 @@ ReadData INFO Hit x = 1730.12 y = -53.4551 z = -1656.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #0 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -808,9 +808,9 @@ ReadData INFO Hit x = 1830.12 y = -53.4551 z = -1756.17 detector = D
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #0 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
index f59c16bcdff41d561582eba1e1191a4f62eda969..7dbd1a0dd9f5d2785b466bcbf67f513fb69fb572 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
@@ -84,33 +84,33 @@ SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile1... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -221,9 +221,9 @@ MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
Stream1.FileMet... INFO Invalid "/TagInfo" handle
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -357,7 +357,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventInfo_p4
@@ -369,7 +369,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleTrackContainer_p1_MyTracks'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleTrackContainer_p1/MyTracks) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:ExampleTrackContainer_p1
@@ -379,7 +379,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:DataHeader_p6
@@ -389,7 +389,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:DataHeaderForm_p6
@@ -399,7 +399,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:Token
@@ -409,7 +409,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:unsigned int
@@ -419,14 +419,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(MagicNumber)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
@@ -439,9 +439,9 @@ Stream1.FileMet... DEBUG set xAOD::FileMetaData::dataType to Stream1
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -516,9 +516,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -593,9 +593,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -670,9 +670,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -747,9 +747,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -824,9 +824,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -901,9 +901,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -978,9 +978,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1055,9 +1055,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1132,9 +1132,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1209,9 +1209,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1286,9 +1286,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1363,9 +1363,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1440,9 +1440,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1517,9 +1517,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1594,9 +1594,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1671,9 +1671,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1748,9 +1748,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1825,9 +1825,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1954,7 +1954,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1966,7 +1966,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
@@ -1978,7 +1978,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1990,7 +1990,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -2000,14 +2000,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
index 69b1edba3e59a9b46ad353bf310f8fb66333c3ad..4d45eebc078aaa27e653b8688fefafc5786d891a 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
@@ -90,51 +90,51 @@ SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolRepli... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 24 Entries in total.
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -245,9 +245,9 @@ MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
Stream1.FileMet... INFO Invalid "/TagInfo" handle
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -380,7 +380,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventInfo_p4
@@ -392,7 +392,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleTrackContainer_p1_MyTracks'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleTrackContainer_p1/MyTracks) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:ExampleTrackContainer_p1
@@ -402,7 +402,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:DataHeader_p6
@@ -412,7 +412,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:DataHeaderForm_p6
@@ -422,7 +422,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:Token
@@ -432,7 +432,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:unsigned int
@@ -442,14 +442,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(MagicNumber)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
@@ -462,9 +462,9 @@ Stream1.FileMet... DEBUG set xAOD::FileMetaData::dataType to Stream1
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -539,9 +539,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -616,9 +616,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -693,9 +693,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -770,9 +770,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -847,9 +847,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -924,9 +924,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1001,9 +1001,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1078,9 +1078,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1155,9 +1155,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1232,9 +1232,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1309,9 +1309,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1386,9 +1386,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1463,9 +1463,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1540,9 +1540,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1617,9 +1617,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1694,9 +1694,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1771,9 +1771,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1848,9 +1848,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1977,7 +1977,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1989,7 +1989,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
@@ -2001,7 +2001,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -2013,7 +2013,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -2023,14 +2023,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
index f3db9bc8957631eca47bc2cbf72bd25797649bd9..0947d23907002dc41313920a3b361ccf70a0725e 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
@@ -84,33 +84,33 @@ SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile3... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -221,9 +221,9 @@ MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
Stream1.FileMet... INFO Invalid "/TagInfo" handle
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -325,7 +325,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:EventInfo_p4
@@ -335,7 +335,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleTrackContainer_p1_MyTracks'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleTrackContainer_p1/MyTracks) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:ExampleTrackContainer_p1
@@ -345,7 +345,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:DataHeader_p6
@@ -355,7 +355,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:DataHeaderForm_p6
@@ -365,7 +365,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:Token
@@ -375,7 +375,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:unsigned int
@@ -385,14 +385,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(MagicNumber)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
@@ -405,9 +405,9 @@ Stream1.FileMet... DEBUG set xAOD::FileMetaData::dataType to Stream1
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -450,9 +450,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -495,9 +495,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -540,9 +540,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -585,9 +585,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -630,9 +630,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -675,9 +675,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -720,9 +720,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -765,9 +765,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -810,9 +810,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -855,9 +855,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -900,9 +900,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -945,9 +945,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -990,9 +990,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1035,9 +1035,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1080,9 +1080,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1125,9 +1125,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1170,9 +1170,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1215,9 +1215,9 @@ Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1312,7 +1312,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1324,7 +1324,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:EventStreamInfo_p3
@@ -1336,7 +1336,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1348,7 +1348,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1358,14 +1358,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
index 8a75c9f577ca22948d5deb3f7aa4dc55f3190e8d..27f7aeb810c13ddb6a72f3ad57972ed9ef388aea 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
@@ -72,17 +72,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -137,33 +137,33 @@ SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile1... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -229,17 +229,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -300,9 +300,9 @@ EventSelector INFO skipping event 9
EventSelector INFO skipping event 10
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -361,10 +361,10 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -395,9 +395,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -428,9 +428,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -461,9 +461,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -494,9 +494,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -527,9 +527,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -560,9 +560,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -593,9 +593,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -626,9 +626,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -691,17 +691,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -764,31 +764,31 @@ SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile2... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (6 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (6 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (7 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (7 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (8 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (8 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (9 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (f , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -827,9 +827,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000]
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -869,9 +869,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 11 events processed so far <<<===
@@ -891,9 +891,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 12 events processed so far <<<===
@@ -913,9 +913,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 13 events processed so far <<<===
@@ -935,9 +935,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #4, run #1 14 events processed so far <<<===
@@ -957,9 +957,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #5, run #1 15 events processed so far <<<===
@@ -979,9 +979,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #6, run #1 16 events processed so far <<<===
@@ -1001,9 +1001,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #7, run #1 17 events processed so far <<<===
@@ -1023,9 +1023,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #8, run #1 18 events processed so far <<<===
@@ -1045,9 +1045,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #9, run #1 19 events processed so far <<<===
@@ -1067,9 +1067,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 20 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #10, run #1 20 events processed so far <<<===
@@ -1089,9 +1089,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 21 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #11, run #1 21 events processed so far <<<===
@@ -1111,9 +1111,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 22 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #12, run #1 22 events processed so far <<<===
@@ -1133,9 +1133,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 23 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #13, run #1 23 events processed so far <<<===
@@ -1155,9 +1155,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 24 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #14, run #1 24 events processed so far <<<===
@@ -1177,9 +1177,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 25 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #15, run #1 25 events processed so far <<<===
@@ -1199,9 +1199,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 26 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #16, run #1 26 events processed so far <<<===
@@ -1221,9 +1221,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 27 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #17, run #1 27 events processed so far <<<===
@@ -1243,9 +1243,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 28 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #18, run #1 28 events processed so far <<<===
@@ -1265,9 +1265,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 29 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #19, run #1 29 events processed so far <<<===
@@ -1327,33 +1327,33 @@ SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile3... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -1392,9 +1392,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -1443,9 +1443,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 31 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1469,9 +1469,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 32 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1495,9 +1495,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 33 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1521,9 +1521,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 34 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1547,9 +1547,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 35 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1573,9 +1573,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 36 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1599,9 +1599,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 37 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1625,9 +1625,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 38 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1651,9 +1651,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 39 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1677,9 +1677,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 40 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1703,9 +1703,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 41 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1729,9 +1729,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 42 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1755,9 +1755,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 43 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1781,9 +1781,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 44 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1807,9 +1807,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 45 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1833,9 +1833,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 46 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1859,9 +1859,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 47 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1885,9 +1885,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 48 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1911,9 +1911,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 49 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
index 3b284314ed1505f31931de19fb94925ae853360b..cee43fc01fd9379db0f98ebe3249407883924048 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
@@ -73,17 +73,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -144,51 +144,51 @@ SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolRepli... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 24 Entries in total.
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -259,17 +259,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -330,9 +330,9 @@ EventSelector INFO skipping event 9
EventSelector INFO skipping event 10
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -391,10 +391,10 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -425,9 +425,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -458,9 +458,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -491,9 +491,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -524,9 +524,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -557,9 +557,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -590,9 +590,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -623,9 +623,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -656,9 +656,9 @@ PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CAL
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -721,17 +721,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -794,31 +794,31 @@ SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile2... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (6 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (6 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (7 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (7 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (8 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (8 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (9 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (f , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -857,9 +857,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000]
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -899,9 +899,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 11 events processed so far <<<===
@@ -921,9 +921,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 12 events processed so far <<<===
@@ -943,9 +943,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 13 events processed so far <<<===
@@ -965,9 +965,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #4, run #1 14 events processed so far <<<===
@@ -987,9 +987,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #5, run #1 15 events processed so far <<<===
@@ -1009,9 +1009,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #6, run #1 16 events processed so far <<<===
@@ -1031,9 +1031,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #7, run #1 17 events processed so far <<<===
@@ -1053,9 +1053,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #8, run #1 18 events processed so far <<<===
@@ -1075,9 +1075,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #9, run #1 19 events processed so far <<<===
@@ -1097,9 +1097,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 20 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #10, run #1 20 events processed so far <<<===
@@ -1119,9 +1119,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 21 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #11, run #1 21 events processed so far <<<===
@@ -1141,9 +1141,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 22 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #12, run #1 22 events processed so far <<<===
@@ -1163,9 +1163,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 23 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #13, run #1 23 events processed so far <<<===
@@ -1185,9 +1185,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 24 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #14, run #1 24 events processed so far <<<===
@@ -1207,9 +1207,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 25 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #15, run #1 25 events processed so far <<<===
@@ -1229,9 +1229,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 26 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #16, run #1 26 events processed so far <<<===
@@ -1251,9 +1251,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 27 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #17, run #1 27 events processed so far <<<===
@@ -1273,9 +1273,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 28 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #18, run #1 28 events processed so far <<<===
@@ -1295,9 +1295,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 29 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #19, run #1 29 events processed so far <<<===
@@ -1357,33 +1357,33 @@ SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile4... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -1422,9 +1422,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -1473,9 +1473,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 31 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1499,9 +1499,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 32 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1525,9 +1525,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 33 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1551,9 +1551,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 34 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1577,9 +1577,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 35 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1603,9 +1603,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 36 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1629,9 +1629,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 37 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1655,9 +1655,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 38 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1681,9 +1681,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 39 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1707,9 +1707,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 40 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1733,9 +1733,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 41 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1759,9 +1759,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 42 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1785,9 +1785,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 43 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1811,9 +1811,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 44 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1837,9 +1837,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 45 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1863,9 +1863,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 46 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1889,9 +1889,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 47 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1915,9 +1915,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 48 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1941,9 +1941,9 @@ PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 49 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
index 4e10b02a962334bb14611a98d40e4aa2836a82bc..263b1c53a6c148a02419b81faa97f6addc035e45 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
@@ -72,17 +72,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -143,51 +143,51 @@ SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile1... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 24 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -253,17 +253,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -324,9 +324,9 @@ EventSelector INFO skipping event 9
EventSelector INFO skipping event 10
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -379,10 +379,10 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -413,9 +413,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -446,9 +446,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -479,9 +479,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -512,9 +512,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -545,9 +545,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -578,9 +578,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -611,9 +611,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -644,9 +644,9 @@ PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -709,17 +709,17 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -782,31 +782,31 @@ SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile2... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (6 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (6 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (7 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (7 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (8 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (8 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [20?] (9 , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (f , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -845,9 +845,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000000]
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -888,9 +888,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 11 events processed so far <<<===
@@ -910,9 +910,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 12 events processed so far <<<===
@@ -932,9 +932,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 13 events processed so far <<<===
@@ -954,9 +954,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #4, run #1 14 events processed so far <<<===
@@ -976,9 +976,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #5, run #1 15 events processed so far <<<===
@@ -998,9 +998,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #6, run #1 16 events processed so far <<<===
@@ -1020,9 +1020,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #7, run #1 17 events processed so far <<<===
@@ -1042,9 +1042,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #8, run #1 18 events processed so far <<<===
@@ -1064,9 +1064,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #9, run #1 19 events processed so far <<<===
@@ -1086,9 +1086,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 20 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #10, run #1 20 events processed so far <<<===
@@ -1108,9 +1108,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 21 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #11, run #1 21 events processed so far <<<===
@@ -1130,9 +1130,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 22 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #12, run #1 22 events processed so far <<<===
@@ -1152,9 +1152,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 23 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #13, run #1 23 events processed so far <<<===
@@ -1174,9 +1174,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 24 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #14, run #1 24 events processed so far <<<===
@@ -1196,9 +1196,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 25 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #15, run #1 25 events processed so far <<<===
@@ -1218,9 +1218,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 26 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #16, run #1 26 events processed so far <<<===
@@ -1240,9 +1240,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 27 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #17, run #1 27 events processed so far <<<===
@@ -1262,9 +1262,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 28 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #18, run #1 28 events processed so far <<<===
@@ -1284,9 +1284,9 @@ PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 29 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000004-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000004-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 2 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaEventLoopMgr INFO ===>>> start processing event #19, run #1 29 events processed so far <<<===
@@ -1342,25 +1342,25 @@ SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile3... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [20?] (4 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/CollectionTree(ExampleTrackContainer_p1/MyTracks) [203] (4 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (7 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (8 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (a , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (b , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -1404,9 +1404,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainerForm(DataHeaderForm)
POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
@@ -1450,9 +1450,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 31 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1476,9 +1476,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 32 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1502,9 +1502,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 33 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1528,9 +1528,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 34 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1554,9 +1554,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 35 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1580,9 +1580,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 36 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1606,9 +1606,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 37 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1632,9 +1632,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 38 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1658,9 +1658,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 39 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1684,9 +1684,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 40 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1710,9 +1710,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 41 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1736,9 +1736,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 42 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1762,9 +1762,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 43 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1788,9 +1788,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 44 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1814,9 +1814,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 45 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1840,9 +1840,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 46 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1866,9 +1866,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 47 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1892,9 +1892,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 48 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
@@ -1918,9 +1918,9 @@ PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 49 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 0
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9103, name = MyTracks
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
index deb12fd3bf5156c8001aa26c1f8454251b627f71..9d9107bd030cbd90340ebada710ca546af4ad7d6 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
@@ -91,51 +91,51 @@ SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opened container ##Links of type ROOT_Tree
SimplePoolFile1... DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (19 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
##Links DEBUG No objects passing selection criteria... Container has 24 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
@@ -193,9 +193,9 @@ MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000]
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
@@ -258,10 +258,10 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -302,9 +302,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000002]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000002]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -345,9 +345,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000003]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000003]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -388,9 +388,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000004]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000004]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -431,9 +431,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000005]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000005]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -474,9 +474,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000006]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000006]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -517,9 +517,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000007]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000007]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -560,9 +560,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000008]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000008]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -603,9 +603,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000009]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000009]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -646,9 +646,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 10 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000A]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000A]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -689,9 +689,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -732,9 +732,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000C]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000C]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -775,9 +775,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000D]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000D]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -818,9 +818,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000E]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000E]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -861,9 +861,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000F]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-0000000F]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -904,9 +904,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000010]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000010]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -947,9 +947,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000011]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000011]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -990,9 +990,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000012]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000012]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1033,9 +1033,9 @@ WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
-EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013].
-EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000013]
+EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013].
+EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000013]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
@@ -1117,7 +1117,7 @@ ConditionsConta... DEBUG Opening
ConditionsConta... DEBUG attributes# = 1
ConditionsConta... DEBUG Branch container 'ExampleHitContainer_p1_PedestalWriteData'
ConditionsConta... DEBUG Opened container ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) [20?] (3 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/ConditionsContainer(ExampleHitContainer_p1/PedestalWriteData) [203] (3 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:ExampleHitContainer_p1
@@ -1129,7 +1129,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:DataHeader_p6
@@ -1141,7 +1141,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:DataHeaderForm_p6
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
index a3596372151a52f08b03b9d9ba7878d701ade20b..d062ff0f0ce7eb0b9eab64dab782f4dbe0e49049 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
@@ -167,7 +167,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:EventInfo_p4
@@ -179,7 +179,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleHitContainer_p1_MyHits'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleHitContainer_p1/MyHits) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:ExampleHitContainer_p1
@@ -191,7 +191,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:DataHeader_p6
@@ -203,7 +203,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:DataHeaderForm_p6
@@ -215,7 +215,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:Token
@@ -227,7 +227,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsSimulation'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsSimulation) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsSimulation) [20?] (8 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsSimulation) [202] (8 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:bool
@@ -237,14 +237,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsCalibration'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsCalibration) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsCalibration) [20?] (9 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsCalibration) [202] (9 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(IsTestBeam)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'IsTestBeam'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(IsTestBeam) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsTestBeam) [20?] (a , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(IsTestBeam) [202] (a , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO unsigned int [????]
@@ -253,7 +253,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'McChannel'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(McChannel) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(McChannel) [20?] (b , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(McChannel) [202] (b , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:unsigned int
@@ -263,7 +263,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (c , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (c , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO unsigned long long [????]
@@ -272,7 +272,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (d , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (d , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:unsigned long long
@@ -282,35 +282,35 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'LumiBlockN'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(LumiBlockN) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(LumiBlockN) [20?] (e , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(LumiBlockN) [202] (e , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(ConditionsRun)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'ConditionsRun'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(ConditionsRun) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(ConditionsRun) [20?] (f , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(ConditionsRun) [202] (f , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(EventTime)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventTime'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventTime) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTime) [20?] (10 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTime) [202] (10 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(EventTimeNanoSec)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventTimeNanoSec'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventTimeNanoSec) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTimeNanoSec) [20?] (11 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventTimeNanoSec) [202] (11 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(BunchId)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'BunchId'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(BunchId) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(BunchId) [20?] (12 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(BunchId) [202] (12 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO float [????]
@@ -319,7 +319,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventWeight'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventWeight) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventWeight) [20?] (13 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:float
@@ -963,7 +963,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (14 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [202] (14 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -973,7 +973,7 @@ MetaData(Exampl... DEBUG Opening
MetaData(Exampl... DEBUG attributes# = 1
MetaData(Exampl... DEBUG Branch container 'ExampleHitContainer_p1_PedestalWriteData'
MetaData(Exampl... DEBUG Opened container MetaData(ExampleHitContainer_p1/PedestalWriteData) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [20?] (15 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [202] (15 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
@@ -982,7 +982,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (16 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [202] (16 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:EventStreamInfo_p3
@@ -994,7 +994,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (17 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [202] (17 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1006,7 +1006,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (18 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [202] (18 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[12 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1016,14 +1016,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (19 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [202] (19 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (1a , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [202] (1a , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
index e95598dcdbf1c328f7b2c4650f58c602b8649d9f..3c365a9908599104d36abf747bac81bbecc87e48 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
@@ -215,7 +215,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventInfo_p4
@@ -227,7 +227,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'ExampleHitContainer_p1_MyHits'
CollectionTree(... DEBUG Opened container CollectionTree(ExampleHitContainer_p1/MyHits) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [20?] (4 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/CollectionTree(ExampleHitContainer_p1/MyHits) [203] (4 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:ExampleHitContainer_p1
@@ -239,7 +239,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (5 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (5 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:DataHeader_p6
@@ -251,7 +251,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (6 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (6 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:DataHeaderForm_p6
@@ -263,7 +263,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (7 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (7 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:Token
@@ -275,7 +275,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (8 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (8 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:unsigned int
@@ -285,14 +285,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (9 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (9 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(MagicNumber)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [20?] (a , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
ClassIDSvc INFO getRegistryEntries: read 83 CLIDRegistry entries for module ALL
Stream1.FileMet... DEBUG Valid 'EventInfoKey':'EventInfo' handle
@@ -344,7 +344,7 @@ CollectionTree(... DEBUG Opening
CollectionTree(... DEBUG attributes# = 1
CollectionTree(... DEBUG Branch container 'EventInfo_p4_McEventInfo'
CollectionTree(... DEBUG Opened container CollectionTree(EventInfo_p4/McEventInfo) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [20?] (3 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/CollectionTree(EventInfo_p4/McEventInfo) [203] (3 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:EventInfo_p4
@@ -354,7 +354,7 @@ POOLContainer(D... DEBUG Opening
POOLContainer(D... DEBUG attributes# = 1
POOLContainer(D... DEBUG Branch container 'DataHeader'
POOLContainer(D... DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [20?] (4 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLContainer(DataHeader) [203] (4 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:DataHeader_p6
@@ -364,7 +364,7 @@ POOLContainerFo... DEBUG Opening
POOLContainerFo... DEBUG attributes# = 1
POOLContainerFo... DEBUG Branch container 'DataHeaderForm'
POOLContainerFo... DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [20?] (5 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLContainerForm(DataHeaderForm) [203] (5 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:DataHeaderForm_p6
@@ -374,7 +374,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'Token'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(Token) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [20?] (6 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(Token) [202] (6 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:Token
@@ -384,7 +384,7 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'RunNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(RunNumber) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [20?] (7 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(RunNumber) [202] (7 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:unsigned int
@@ -394,14 +394,14 @@ POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'EventNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(EventNumber) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [20?] (8 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(EventNumber) [202] (8 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] POOLCollectionTree(MagicNumber)
POOLCollectionT... DEBUG Opening
POOLCollectionT... DEBUG attributes# = 1
POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [20?] (9 , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
Stream2.FileMet... DEBUG Valid 'EventInfoKey':'EventInfo' handle
Stream2.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
@@ -1220,7 +1220,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1232,7 +1232,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventStreamInfo_p3
@@ -1244,7 +1244,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1256,7 +1256,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1266,14 +1266,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (10 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
@@ -1314,7 +1314,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1324,7 +1324,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream2'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream2) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:EventStreamInfo_p3
@@ -1334,7 +1334,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1344,7 +1344,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream2'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream2) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1354,14 +1354,14 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (f , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
MetaData(xAOD::... DEBUG Attributes= 1
@@ -1402,7 +1402,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [20?] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
@@ -1412,7 +1412,7 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream3'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream3) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:EventStreamInfo_p3
@@ -1422,7 +1422,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:xAOD::FileMetaData_v1
@@ -1432,7 +1432,7 @@ MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream3'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream3) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:xAOD::EventFormat_v1
@@ -1442,7 +1442,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:DataHeader_p6
@@ -1452,7 +1452,7 @@ MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (8 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:DataHeaderForm_p6
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in
index 947680d2cf2d0a88fee2adb2f98264e1481ca0d8..fb6503e414f08b6c1deaec0df80d73a7bcec0794 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in
@@ -20,7 +20,6 @@ s/\\\\[00000000/[/g
s/-000000000/-0/g
s/=00000000/=/g
s/ ffffffff/ /g
-s/20[23]/20?/g
s/INFO CLID = 222376821, key = Stream[12]/INFO CLID = 222376821, key = StreamX/g
s/0x[0-9a-f]\\\\{7,12\\\\}/0x????/g
s/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]00*//g
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
index aee61872909d128686ece41b642695d85229971b..7c31a9aa3473b50c7155ec39063592cfdbf6bb62 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
@@ -114,6 +114,8 @@ public:
/// channel number for index: (index = 0 to size-1)
ChanNum chanNum(unsigned int index) const;
+
+ bool fixChanNum(ChanNum oldChan, ChanNum newChan);
/// attribute list for a given channel number
const AttributeList& attributeList(ChanNum chanNum) const;
@@ -674,6 +676,26 @@ CondAttrListCollection::isSameButMinRange ( const CondAttrListCollection& rhs,
}
+inline bool
+ CondAttrListCollection::fixChanNum(const ChanNum oldChan,
+ const ChanNum newChan) {
+ auto attrRet = m_attrMap.emplace(newChan, m_attrMap[oldChan]);
+ // if a new element was inserted, erase the old one
+ if (attrRet.second) m_attrMap.erase(oldChan);
+
+ auto iovRet = m_iovMap.emplace(newChan, m_iovMap[oldChan]);
+ // if a new element was inserted, erase the old one
+ if (iovRet.second) m_iovMap.erase(oldChan);
+
+ auto nameRet = m_nameMap.emplace(newChan, m_nameMap[oldChan]);
+ // if a new element was inserted, erase the old one
+ if (nameRet.second) m_nameMap.erase(oldChan);
+
+ return attrRet.first->first == newChan
+ && iovRet.first->first == newChan
+ && nameRet.first->first == newChan;
+ }
+
#endif // DBDATAOBJECTS_CONDATTRLISTCOLLECTION_H
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/python/TPCnvTestConfig.py b/Database/AthenaPOOL/AthenaPoolUtilities/python/TPCnvTestConfig.py
index e17f2dfe3bb3bc7bce73485b80ad69e0d2394578..5d7f3d6df640cdf0a0aba95e88eaa4847adf37cb 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/python/TPCnvTestConfig.py
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/python/TPCnvTestConfig.py
@@ -8,13 +8,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg
from AthenaPoolUtilities.DumperConfig import Dumper, find_file
-from AtlasGeoModel.GeoModelConfig import GeoModelCfg
-from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
-from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
-from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
-from LArGeoAlgsNV.LArGMConfig import LArGMCfg
-from TileGeoModel.TileGMConfig import TileGMCfg
-from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
#from AtlasGeoModel.ForDetGeoModelConfig import ForDetGeometryCfg
Configurable.configurableRun3Behavior = True
@@ -62,24 +55,31 @@ def TPCnvTest(infile, keys, useGeoModelSvc=False, useIOVDbSvc=False, doPixel=Fal
EventCnvSuperTool = None
if useGeoModelSvc:
if ConfigFlags.Detector.GeometryPixel:
+ from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
acc.merge(PixelGeometryCfg(ConfigFlags))
useGeoModelSvc = True
if ConfigFlags.Detector.GeometrySCT:
+ from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
acc.merge(SCT_GeometryCfg(ConfigFlags))
useGeoModelSvc = True
if ConfigFlags.Detector.GeometryTRT:
+ from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
acc.merge(TRT_GeometryCfg(ConfigFlags))
useGeoModelSvc = True
if ConfigFlags.Detector.GeometryLAr:
+ from LArGeoAlgsNV.LArGMConfig import LArGMCfg
acc.merge(LArGMCfg(ConfigFlags))
useGeoModelSvc = True
if ConfigFlags.Detector.GeometryTile:
+ from TileGeoModel.TileGMConfig import TileGMCfg
acc.merge(TileGMCfg(ConfigFlags))
useGeoModelSvc = True
if ConfigFlags.Detector.GeometryMuon:
+ from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
acc.merge(MuonGeoModelCfg(ConfigFlags))
useGeoModelSvc = True
#acc.merge(ForDetGeometryCfg(ConfigFlags))
+ from AtlasGeoModel.GeoModelConfig import GeoModelCfg
acc.merge(GeoModelCfg(ConfigFlags))
acc.getService("GeoModelSvc").IgnoreTagDifference = True
if doTracks:
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/share/post_tpcnvtest.sh b/Database/AthenaPOOL/AthenaPoolUtilities/share/post_tpcnvtest.sh
index b016ef4abbb835af4b1d273e43347ef0c9cdf57e..ffcc54830bdbb514ac911dbc24f355610b1ddbf2 100755
--- a/Database/AthenaPOOL/AthenaPoolUtilities/share/post_tpcnvtest.sh
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/share/post_tpcnvtest.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#/** @file post.sh
-# @brief sh script that check the return code of an executable and compares
+# @brief sh script that check the return code of an executable and compares
# its output with a reference (if available).
-# @param test_name
+# @param test_name
#
# @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration.
# $Id: post_check.sh,v 1.32 2009-05-06 18:10:12 ssnyder Exp $
@@ -248,11 +248,13 @@ PP="$PP"'|WARNING: new xAOD variables '
# From MuonCondAlg.
PP="$PP"'|Empty temporary A-line container'
+# Warnings from mini-projects, not holding all the EDM classes.
+PP="$PP"'|^RootAuxDynReader::init.*Could not find auxid for'
test=$1
if [ -z "$testStatus" ]; then
echo "post.sh> Warning: athena exit status is not available "
-else
+else
# check exit status
joblog=${test}.log
if [ -r ${test}-SKIPPED ]; then
@@ -316,4 +318,3 @@ fi
joblog=${test}.log
exit $testStatus
-
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
index 03ea3fae542cdd26813e12df03dcc72a331d2e6d..1496c4d919f41c3ccc1cd826b16cd6d049f2b96b 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
@@ -166,6 +166,11 @@ StatusCode EventSelectorAthenaPool::initialize() {
if (!m_eventStreamingTool.empty() && !m_eventStreamingTool.retrieve().isSuccess()) {
ATH_MSG_FATAL("Cannot get " << m_eventStreamingTool.typeAndName() << "");
return(StatusCode::FAILURE);
+ } else if (m_makeStreamingToolClient.value() == -1) {
+ if (!m_eventStreamingTool->makeClient(m_makeStreamingToolClient.value()).isSuccess()) {
+ ATH_MSG_ERROR("Could not make AthenaPoolCnvSvc a Share Client");
+ return(StatusCode::FAILURE);
+ }
}
// Ensure the xAODCnvSvc is listed in the EventPersistencySvc
@@ -478,6 +483,15 @@ StatusCode EventSelectorAthenaPool::createContext(IEvtSelector::Context*& ctxt)
StatusCode EventSelectorAthenaPool::next(IEvtSelector::Context& ctxt) const {
std::lock_guard<CallMutex> lockGuard(m_callLock);
if (!m_eventStreamingTool.empty() && m_eventStreamingTool->isClient()) {
+ if (m_makeStreamingToolClient.value() == -1) {
+ StatusCode sc = m_eventStreamingTool->lockEvent(m_evtCount);
+ while (sc.isRecoverable()) {
+ usleep(1000);
+ sc = m_eventStreamingTool->lockEvent(m_evtCount);
+ }
+ }
+ // Increase event count
+ ++m_evtCount;
void* tokenStr = nullptr;
unsigned int status = 0;
if (!m_eventStreamingTool->getLockedEvent(&tokenStr, status).isSuccess()) {
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
index b04379fd2cc361c19bd189b209a66697df9352c7..6f340f063b12123fdbea363468c1c7054d81d0ca 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
@@ -209,6 +209,8 @@ private: // properties
ToolHandleArray<IAthenaSelectorTool> m_helperTools{this};
ToolHandle<IAthenaSelectorTool> m_counterTool{this, "CounterTool", "", ""};
ToolHandle<IAthenaIPCTool> m_eventStreamingTool{this, "SharedMemoryTool", "", ""};
+ /// Make this instance a Streaming Client during first iteration automatically
+ IntegerProperty m_makeStreamingToolClient{this,"MakeStreamingToolClient",0};
/// The following are included for compatibility with McEventSelector and are not really used.
/// However runNo, oldRunNo and overrideRunNumberFromInput are used to reset run number for
diff --git a/Database/AthenaRoot/RootAuxDynIO/RootAuxDynIO/RootAuxDynIO.h b/Database/AthenaRoot/RootAuxDynIO/RootAuxDynIO/RootAuxDynIO.h
index 5fee81018ec3facdd06e197b57dcce6ae9a1e103..02c896cda5fd46435f40cd35efb93b0ffa906b17 100644
--- a/Database/AthenaRoot/RootAuxDynIO/RootAuxDynIO/RootAuxDynIO.h
+++ b/Database/AthenaRoot/RootAuxDynIO/RootAuxDynIO/RootAuxDynIO.h
@@ -29,9 +29,9 @@ namespace RootAuxDynIO {
* @brief Crate RootAuxDynReader for a given TBranch
* @param branch TBranch in which AuxStore objects are
- Will return nullptr in case of problems
+ Will return null in case of problems
*/
- IRootAuxDynReader* getReaderForBranch(TBranch *branch);
+ std::unique_ptr<IRootAuxDynReader> getReaderForBranch(TBranch *branch);
/**
* @brief Construct branch name for a given dynamic attribute
diff --git a/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynReader.cxx b/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynReader.cxx
index 224d7755bfed3730111c9f359bb70906d89622a3..bd6d4b85da946b24b94e15ed564d4117b1328f5c 100644
--- a/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynReader.cxx
+++ b/Database/AthenaRoot/RootAuxDynIO/src/RootAuxDynReader.cxx
@@ -174,7 +174,7 @@ namespace RootAuxDynIO
}
- IRootAuxDynReader*
+ std::unique_ptr<IRootAuxDynReader>
getReaderForBranch(TBranch *branch)
{
if( isAuxDynBranch(branch) ) {
@@ -188,7 +188,7 @@ namespace RootAuxDynIO
TClass *storeTC = tc->GetBaseClass("SG::IAuxStoreHolder");
if( storeTC ) {
int store_holder_offset = tc->GetBaseClassOffset( storeTC );
- return new RootAuxDynReader(branch, store_holder_offset);
+ return std::make_unique<RootAuxDynReader>(branch, store_holder_offset);
}
}
return nullptr;
diff --git a/Database/IOVDbSvc/CMakeLists.txt b/Database/IOVDbSvc/CMakeLists.txt
index d82a9365547c00c65748462fbd3e9db6d5bf5139..622f884c1d7a53f60714fc44b9aa51b463b35b2e 100644
--- a/Database/IOVDbSvc/CMakeLists.txt
+++ b/Database/IOVDbSvc/CMakeLists.txt
@@ -183,7 +183,7 @@ atlas_add_test( Base64Codec_test
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES}
POST_EXEC_SCRIPT "nopost.sh" )
-if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
+if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT XAOD_ANALYSIS )
atlas_add_test( IOVDbSvcCfgTest
SCRIPT python -m IOVDbSvc.IOVDbSvcConfig
POST_EXEC_SCRIPT "nopost.sh" )
diff --git a/DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx b/DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx
index 33e37600e2e2087b89a340f21feb8c15fcde46b6..c82b8bad0f77f6e4ac9c6a20aacb4b9c3e42b0be 100644
--- a/DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx
+++ b/DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx
@@ -368,19 +368,21 @@ using Trk::distDepth;
// use aligned transform if available
const GeoTrf::Transform3D* ptrXf;
-
+ GeoTrf::Transform3D geotrf;
+
if (m_geoAlignStore){
ptrXf = m_geoAlignStore->getAbsPosition(getMaterialGeom());
if (ptrXf) {
- m_transformHit = (*ptrXf) * m_design->SiHitToGeoModel();
+ m_transformHit = (*ptrXf) * m_design->SiHitToGeoModel(); //need .linear()?
+ geotrf = (*ptrXf);
}
}
else{
- m_transformHit = (getMaterialGeom()->getAbsoluteTransform() * m_design->SiHitToGeoModel());
+ m_transformHit = (getMaterialGeom()->getAbsoluteTransform() * m_design->SiHitToGeoModel()); //need .linear()?
+ geotrf = getMaterialGeom()->getAbsoluteTransform();
}
- const GeoTrf::Transform3D& geoTransform = m_transformHit;
-
+ const GeoTrf::Transform3D& geoTransform = geotrf;
m_baseCacheValid = true;
bool firstTimeBaseTmp = m_firstTimeBase;
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index beac64668773fe63b08f5d79e7e313a9f3f6e1ba..ec40719560ee102d66e9811d487607451ac38d21 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -157,6 +157,61 @@ def ByteStreamWriteCfg(flags, type_names=None):
return result
+def TransientByteStreamCfg(flags, item_list=None, type_names=None, extra_inputs=None):
+ """Set up transient ByteStream output stream
+
+ Configure components responsible for writing bytestream format. Write the
+ specified objects to ByteStream into the cache of the ROBDataProviderSvc.
+ The data can then be read downstream as if they were coming from a BS file.
+
+ Args:
+ flags: Job configuration, usually derived from ConfigFlags
+ item_list: (optional) List of objects to be written to transient ByteStream
+ type_names: (optional) List of types/names to register in BS conversion service
+ as available to be read from (transient) ByteStream
+ extra_inputs: (optional) List of objects which need to be produced before transient
+ ByteStream streaming is scheduled - ensures correct scheduling
+
+ Returns:
+ A component accumulator fragment containing the components required to
+ write transient bytestream. Should be merged into main job configuration.
+ """
+
+ result = ComponentAccumulator()
+ comp_factory = AthenaConfiguration.ComponentFactory.CompFactory
+
+ rdp = comp_factory.ROBDataProviderSvc()
+ result.addService(rdp)
+
+ rdp_output = comp_factory.ByteStreamRDP_OutputSvc()
+ result.addService(rdp_output)
+
+ bytestream_conversion = comp_factory.ByteStreamCnvSvc(
+ name="ByteStreamCnvSvc",
+ ByteStreamOutputSvcList=[rdp_output.getName()],
+ )
+ result.addService(bytestream_conversion)
+
+ output_stream = comp_factory.AthenaOutputStream(
+ name="TransBSStreamAlg",
+ EvtConversionSvc=bytestream_conversion.name,
+ OutputFile="ByteStreamRDP_OutputSvc",
+ ItemList=item_list if item_list else list(),
+ ExtraInputs=extra_inputs if extra_inputs else list(),
+ )
+ result.addEventAlgo(output_stream, primary=True)
+
+ address_provider = comp_factory.ByteStreamAddressProviderSvc(
+ TypeNames=type_names if type_names else list(),
+ )
+ result.addService(address_provider)
+
+ proxy = comp_factory.ProxyProviderSvc()
+ proxy.ProviderNames += [address_provider.name]
+ result.addService(proxy)
+
+ return result
+
def main():
"""Run a functional test if module is executed"""
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
index bc20c5f82e7b6cef0af03b8103317d444d044ff0..a86f46bb8b8635c59f41d77e440f85824336cc10 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
@@ -736,9 +736,8 @@ StatusCode EventSelectorByteStream::recordAttributeListImpl(lock_t& lock) const
}
}
- // build spec and the new attr list
- coral::AttributeListSpecification* spec = new coral::AttributeListSpecification(); // the newly created attribute list owns the spec
- auto attrList = std::make_unique<AthenaAttributeList>(*spec);
+ // build the new attr list
+ auto attrList = std::make_unique<AthenaAttributeList>();
// fill the attr list
ATH_CHECK(fillAttributeListImpl(attrList.get(), "", false, lock));
diff --git a/Event/EventBookkeeperTools/CMakeLists.txt b/Event/EventBookkeeperTools/CMakeLists.txt
index 1ce5b56d3970485a436af39f11234534a89ebb7c..35d4ceee59b91efc6c08e9d5bbad9665b1a2afa1 100644
--- a/Event/EventBookkeeperTools/CMakeLists.txt
+++ b/Event/EventBookkeeperTools/CMakeLists.txt
@@ -75,8 +75,10 @@ if( NOT XAOD_STANDALONE )
PROPERTIES TIMEOUT 300
POST_EXEC_SCRIPT nopost.sh )
- atlas_add_test( CutFlowSvcOutputMP
- SCRIPT athena EventBookkeeperTools/TestCutFlowSvcOutput.py --nprocs=2
- PROPERTIES TIMEOUT 300
- POST_EXEC_SCRIPT nopost.sh )
+ if( NOT XAOD_ANALYSIS )
+ atlas_add_test( CutFlowSvcOutputMP
+ SCRIPT athena EventBookkeeperTools/TestCutFlowSvcOutput.py --nprocs=2
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh )
+ endif()
endif()
diff --git a/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx b/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx
index 05da271a408bd6d91f0b414fed0e38312d58d664..8bfc710ce92f892b2d96a1bbb7d7e8e60a2efe65 100644
--- a/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx
+++ b/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx
@@ -65,12 +65,19 @@ StatusCode BookkeeperTool::beginInputFile(const SG::SourceID &source)
ATH_MSG_DEBUG("Determining number of weight variations");
#ifndef GENERATIONBASE
if (inputMetaStore()->contains<xAOD::TruthMetaDataContainer>("TruthMetaData")) {
- ATH_CHECK(loadXAODMetaData());
+ StatusCode status = loadXAODMetaData();
+ if (!status.isSuccess()) {
+ if (status.isRecoverable()) {
+ ATH_CHECK(loadPOOLMetaData());
+ } else {
+ return StatusCode::FAILURE;
+ }
+ }
} else {
-#endif
ATH_CHECK(loadPOOLMetaData());
-#ifndef GENERATIONBASE
}
+#else
+ ATH_CHECK(loadPOOLMetaData());
#endif
if (m_numberOfWeightVariations == 0) {
@@ -256,7 +263,7 @@ StatusCode BookkeeperTool::copyCutflowFromService()
StatusCode BookkeeperTool::loadXAODMetaData()
{
#ifdef GENERATIONBASE
- return StatusCode::SUCCESS;
+ return StatusCode::RECOVERABLE;
#else
// Try to load MC channel number from file metadata
@@ -271,8 +278,12 @@ StatusCode BookkeeperTool::loadXAODMetaData()
}
}
if (mcChannelNumber == uint32_t(-1)) {
- ATH_MSG_WARNING("... MC channel number could not be loaded");
+ ATH_MSG_WARNING("... MC channel number could not be loaded from FileMetaData");
+#ifdef XAOD_STANDALONE
mcChannelNumber = 0;
+#else
+ return StatusCode::RECOVERABLE;
+#endif
}
// Find the correct truth meta data object
@@ -292,9 +303,14 @@ StatusCode BookkeeperTool::loadXAODMetaData()
// If no such object is found then return
if (itTruthMetaDataPtr == metaDataContainer->end()) {
+#ifdef XAOD_STANDALONE
m_numberOfWeightVariations = 1;
ATH_MSG_DEBUG("Could not load weight meta data! Assumming 1 variation.");
return StatusCode::SUCCESS;
+#else
+ ATH_MSG_DEBUG("Could not load weight meta data from TruthMetaData!");
+ return StatusCode::RECOVERABLE;
+#endif
}
// Update cached weight data
diff --git a/Event/EventBookkeeperTools/python/CutFlowHelpers.py b/Event/EventBookkeeperTools/python/CutFlowHelpers.py
index deda3827fb6412372315f6582181ecc818152dbf..2e6b78f02778a57ebcfe30e25c78c77fa475b2bd 100644
--- a/Event/EventBookkeeperTools/python/CutFlowHelpers.py
+++ b/Event/EventBookkeeperTools/python/CutFlowHelpers.py
@@ -15,8 +15,12 @@ def GetCurrentStreamName( msg ):
msg.info("Couldn't get input stream name from the RecFlags... trying AthFile directly.")
from PyUtils.MetaReader import read_metadata
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- input_file = svcMgr.EventSelector.InputCollections[0]
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ try:
+ input_file = svcMgr.EventSelector.InputCollections[0]
+ except AttributeError:
+ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+ input_file = athenaCommonFlags.FilesInput()[0]
metadata = read_metadata(input_file)
metadata = metadata[input_file] # promote all keys one level up
diff --git a/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py b/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py
index adf6506b2c8eb0eec6afea92fcb1c45eac895347..f595e41d00a648c8e697b569fac18763cd5ff971 100644
--- a/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py
+++ b/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py
@@ -43,8 +43,11 @@ from AthenaCommon.AppMgr import theApp
import AthenaPoolCnvSvc.ReadAthenaPool # noqa: F401
# setup some configuration
-from RecExConfig.RecFlags import rec
-rec.mergingStreamName = 'Stream1'
+try:
+ from RecExConfig.RecFlags import rec
+ rec.mergingStreamName = 'Stream1'
+except ModuleNotFoundError:
+ pass
# setup the CutFlowSvc and corresponding tools
from EventBookkeeperTools.CutFlowHelpers import CreateCutFlowSvc
diff --git a/Event/EventBookkeeperTools/test/test_CutFlowSvc.py b/Event/EventBookkeeperTools/test/test_CutFlowSvc.py
index 9f54cc7e543b537f3443dc6dda1355c2c08a5fdc..3eced20b9df7144d5dc6b1d187555a8621b370ac 100755
--- a/Event/EventBookkeeperTools/test/test_CutFlowSvc.py
+++ b/Event/EventBookkeeperTools/test/test_CutFlowSvc.py
@@ -20,6 +20,8 @@ from EventBookkeeperTools.EventBookkeeperToolsConfig import CutFlowSvcCfg, CutFl
parser = ArgumentParser(prog='test_CutFlowSvc')
parser.add_argument('input', type=str, nargs='?',
help='Specify the input file')
+parser.add_argument('-t', '--threads', default=2, type=int,
+ help='The number of concurrent threads to run. 0 uses serial Athena.')
args = parser.parse_args()
# Setup configuration
@@ -31,9 +33,11 @@ else:
ConfigFlags.Output.AODFileName = "testAOD.pool.root"
# Flags relating to multithreaded execution
-threads = 2
+threads = args.threads
+maxEvents = 10
ConfigFlags.Concurrency.NumThreads = threads
if threads > 0:
+ maxEvents = 10 * threads
ConfigFlags.Scheduler.ShowDataDeps = True
ConfigFlags.Scheduler.ShowDataFlow = True
ConfigFlags.Scheduler.ShowControlFlow = True
@@ -62,7 +66,7 @@ acc.getPublicTool('CutBookkeepersTool').OutputLevel = VERBOSE
acc.getEventAlgo('AllExecutedEventsCounterAlg').OutputLevel = VERBOSE
# Execute and finish
-sc = acc.run(maxEvents=10*threads)
+sc = acc.run(maxEvents=maxEvents)
# Success should be 0
sys.exit(not sc.isSuccess())
diff --git a/Event/xAOD/xAODBTagging/Root/xAODBTaggingAuxVariableInit.cxx b/Event/xAOD/xAODBTagging/Root/xAODBTaggingAuxVariableInit.cxx
index 6b571ead0bad41a9acc2f47ae99e71c5c9b82efa..059d36975016084c9515bae1b9f4e19a7b2dfcde 100644
--- a/Event/xAOD/xAODBTagging/Root/xAODBTaggingAuxVariableInit.cxx
+++ b/Event/xAOD/xAODBTagging/Root/xAODBTaggingAuxVariableInit.cxx
@@ -30,3 +30,27 @@ AUX_VAR( MV2c20_discriminant );
AUX_VAR( MV2c10mu_discriminant );
AUX_VAR( MV2c10rnn_discriminant );
AUX_VAR( SMT_discriminant );
+
+AUX_VAR( IP2D_pb );
+AUX_VAR( IP2D_pc );
+AUX_VAR( IP2D_pu );
+
+AUX_VAR( IP3D_pb );
+AUX_VAR( IP3D_pc );
+AUX_VAR( IP3D_pu );
+
+AUX_VAR( IP2D_cu );
+AUX_VAR( IP2D_bu );
+AUX_VAR( IP2D_bc );
+
+AUX_VAR( IP3D_cu );
+AUX_VAR( IP3D_bu );
+AUX_VAR( IP3D_bc );
+
+AUX_VAR( DL1rmu_pb );
+AUX_VAR( DL1rmu_pc );
+AUX_VAR( DL1rmu_pu );
+
+AUX_VAR( softMuon_pb );
+AUX_VAR( softMuon_pc );
+AUX_VAR( softMuon_pu );
diff --git a/Event/xAOD/xAODBTaggingAthenaPool/test/xAODBTaggingAthenaPool_21.0.79_test.py b/Event/xAOD/xAODBTaggingAthenaPool/test/xAODBTaggingAthenaPool_21.0.79_test.py
index 1586a515aae1dfa369c3250a60d6e65c6f36b43e..5dbe62db82c8ddfa0cc6bb6cb32e7a4ea4782882 100755
--- a/Event/xAOD/xAODBTaggingAthenaPool/test/xAODBTaggingAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODBTaggingAthenaPool/test/xAODBTaggingAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::BTaggingAuxContainer_v1
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt b/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
index c9651a3619579e8522eb4e3bffe3dda5f2f9d5c2..5901acedf5bb5eed03cd14439426dc95880890f7 100644
--- a/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
@@ -26,6 +26,12 @@ atlas_add_poolcnv_library( xAODCaloEventAthenaPoolPoolCnv
atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# In AthAnalysis xAOD::CaloCluster doesn't know about its CaloCell link. Which
+# makes the converter tests fail in that project...
+if( XAOD_ANALYSIS )
+ return()
+endif()
+
# Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest )
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py
index 2e4154e6f8708821b2188c28e720b72c0c577b3a..5d39af506619fc6d8ce975fce0573895d0fb1c9e 100755
--- a/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#xAOD::CaloCluster
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py
index 2f7e4720ba467a38b793b5339e120cf7628f438f..2bd06fe7ecc13fcc98159cee0af5fd6fb1485227 100755
--- a/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::CaloCluster
diff --git a/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_20.1.7.2_test.py
index 1a002c879aa1b5c3a44f061e5c658886408ebfce..56410043ddac05499e1132e590cdd184d51c1c62 100755
--- a/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#xAOD::ElectronAuxContainer
diff --git a/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_21.0.79_test.py b/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_21.0.79_test.py
index 6d1e56c27f7471cd176adda7111c1885365f6cb6..7321ff27d18312e80adbb073599a9e7982370122 100755
--- a/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODEgammaAthenaPool/test/xAODEgammaAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::ElectronAuxContainer_v3
diff --git a/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt b/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt
index c799b37dbb38c40a25a820de48872c797b63fbeb..04e7b723247c3b70bb1f1c0f912b5a075a58d2a8 100644
--- a/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt
@@ -5,7 +5,7 @@ atlas_subdir( xAODEventInfoCnv )
# Optional dependencies:
set( extra_libs )
-if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
+if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT XAOD_ANALYSIS )
set( extra_libs BeamSpotConditionsData LumiBlockData )
endif()
@@ -22,15 +22,19 @@ atlas_install_python_modules( python/*.py
atlas_install_joboptions( share/*.py )
# Setup and run tests
+set( _extraFlags )
+if( SIMULATIONBASE OR GENERATIONBASE OR XAOD_ANALYSIS )
+ set( _extraFlags --noBeamSpot )
+endif()
atlas_add_test( EvenInfoCnvConfigTest
- SCRIPT test/EventInfoCnv_test.py
+ SCRIPT test/EventInfoCnv_test.py ${_extraFlags}
PROPERTIES TIMEOUT 300 )
atlas_add_test( EvenInfoCnvConfigTestMT
- SCRIPT test/EventInfoCnv_test.py -n 25 -t 3
+ SCRIPT test/EventInfoCnv_test.py -n 25 -t 3 ${_extraFlags}
PROPERTIES TIMEOUT 300 )
-if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
+if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT XAOD_ANALYSIS )
atlas_add_test( EventInfoOverlayConfigTest
SCRIPT test/EventInfoOverlay_test.py
PROPERTIES TIMEOUT 300 )
diff --git a/Event/xAOD/xAODEventInfoCnv/python/xAODEventInfoCnvConfig.py b/Event/xAOD/xAODEventInfoCnv/python/xAODEventInfoCnvConfig.py
index 65ab4f5ac488126306af4779c063ad2a4bfa5e0d..63a47365a81dbd74844ed94f0a71d9ccb2241432 100644
--- a/Event/xAOD/xAODEventInfoCnv/python/xAODEventInfoCnvConfig.py
+++ b/Event/xAOD/xAODEventInfoCnv/python/xAODEventInfoCnvConfig.py
@@ -21,7 +21,7 @@ def EventInfoCnvAlgCfg(flags, name="EventInfoCnvAlg",
# TODO: luminosity
- if not disableBeamSpot and flags.Common.Project not in ["AthSimulation", "AthGeneration"]:
+ if not disableBeamSpot:
from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg
acc.merge(BeamSpotCondAlgCfg(flags))
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
index f73ec006e4a5203076ad1e7034cec165fe354e51..6902395cab1b63a9d2beb1c23177f00401fbd10c 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
@@ -24,6 +24,7 @@ from argparse import ArgumentParser
parser = ArgumentParser()
parser.add_argument("-n", "--maxEvents", default=3, type=int, help="The number of events to run. 0 skips execution")
parser.add_argument("-t", "--threads", default=1, type=int, help="The number of concurrent threads to run. 0 uses serial Athena.")
+parser.add_argument("-b", "--noBeamSpot", default=False, action="store_true", help="Don't try to use beamspot information in the conversion test")
parser.add_argument("-V", "--verboseAccumulators", default=False, action="store_true", help="Print full details of the AlgSequence for each accumulator")
args = parser.parse_args()
@@ -43,7 +44,7 @@ if args.threads > 0:
ConfigFlags.lock()
# Function tests
-accAlg = EventInfoCnvAlgCfg(ConfigFlags)
+accAlg = EventInfoCnvAlgCfg(ConfigFlags, disableBeamSpot=args.noBeamSpot)
# reset to prevent errors on deletion
accAlg.__init__()
@@ -52,7 +53,7 @@ acc = MainServicesCfg(ConfigFlags)
acc.merge(PoolReadCfg(ConfigFlags))
# Add event info overlay
-acc.merge(EventInfoCnvAlgCfg(ConfigFlags))
+acc.merge(EventInfoCnvAlgCfg(ConfigFlags, disableBeamSpot=args.noBeamSpot))
# Add output
acc.merge(OutputStreamCfg(ConfigFlags, "HITS"))
diff --git a/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_20.7.2.2_test.py
index ce7b77031206319da6d9fbfac3ad138f3b9bfc8f..3f28b32a09b6eb0318d1eb9df392fe47d1e4a089 100755
--- a/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_20.7.2.2_test.py
+++ b/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_20.7.2.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
keys = [
#xAOD::JetTrigAuxContainer_v2
diff --git a/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_21.0.79_test.py b/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_21.0.79_test.py
index 98994b79d3bd046ad8f3c17035d254ff0c99656e..8fe437f40e5a319865d797249eb492532a4b4b44 100755
--- a/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODJetAthenaPool/test/xAODJetAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::JetTrigAuxContainer_v2
diff --git a/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py b/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
index a2e4c548764c45c2981394020ce9f146499dbeb0..917276fa7582779da04c51c7b941889c8c2aba17 100644
--- a/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
+++ b/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
@@ -23,7 +23,7 @@ def writeFileMetaData(flags):
accumulator.merge(
xAODEventInfoCnvConfig.EventInfoCnvAlgCfg(
- flags=flags, inputKey="",
+ flags=flags, inputKey="", disableBeamSpot=flags.Common.Project!="Athena"
)
)
diff --git a/Event/xAOD/xAODMissingET/Root/MissingET_v1.cxx b/Event/xAOD/xAODMissingET/Root/MissingET_v1.cxx
index c76ee8387db53126a4f16830dfb07090558b25a4..1ea40279b06071c21ad161fbff5a074d6ff3fcf2 100644
--- a/Event/xAOD/xAODMissingET/Root/MissingET_v1.cxx
+++ b/Event/xAOD/xAODMissingET/Root/MissingET_v1.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
*/
@@ -20,8 +20,6 @@ MissingET_v1::MissingET_v1( bool createStore )
createPrivateStore();
setName(this->name());
}
- else
- m_nameHash = 0;
}
MissingET_v1::MissingET_v1( const std::string& name,
diff --git a/Event/xAOD/xAODMissingET/xAODMissingET/selection.xml b/Event/xAOD/xAODMissingET/xAODMissingET/selection.xml
index 781949aae28e37c11a61a29a9cc654cbd8de74e9..5caac7fccb78e9bda7a8f2f8a5c78cadc3d06bb7 100644
--- a/Event/xAOD/xAODMissingET/xAODMissingET/selection.xml
+++ b/Event/xAOD/xAODMissingET/xAODMissingET/selection.xml
@@ -5,6 +5,12 @@
<class name="xAOD::MissingET_v1" >
<field name="m_nameHash" transient="true" />
</class>
+ <read sourceClass="xAOD::MissingET_v1" version="[1-]"
+ targetClass="xAOD::MissingET_v1" source="" target="m_nameHash" >
+ <![CDATA[
+ m_nameHash.reset();
+ ]]>
+ </read>
<class name="DataVector<xAOD::MissingET_v1>" />
<class name="xAOD::MissingETContainer_v1"
id="F49162FE-6BC0-49BC-A7DA-A792136BD939" />
diff --git a/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.h b/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.h
index c11056709e94508f23e417d3d45f70287852834e..8b273fa702aac04ffe30cfaade0f7efd28d2a221 100644
--- a/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.h
+++ b/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- 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 XAODMISSINGET_VERSIONS_MISSINGET_V1_H
@@ -9,8 +9,9 @@
#include "AthContainers/AuxElement.h"
-#include "xAODBase/IParticle.h"
+#include "CxxUtils/CachedValue.h"
+#include "xAODBase/IParticle.h"
#include "xAODMissingET/versions/MissingETBase.h"
#include <string>
@@ -108,12 +109,12 @@ namespace xAOD
float& f_mpy(); /*!< @brief Returns reference to @f$ p_{y} @f$ store */
float& f_sumet(); /*!< @brief Returns reference to @f$ \Sigma E_{\rm T} @f$ store */
std::string& f_name(); /*!< @brief Returns reference to MET object name store */
- const std::string& f_nameConst(); /*!< @brief Returns const reference to the MET object name store*/
+ const std::string& f_nameConst() const; /*!< @brief Returns const reference to the MET object name store*/
MissingETBase::Types::bitmask_t& f_source(); /*!< @brief Returns reference to MET object source store */
/*!@}*/
private:
- std::size_t m_nameHash;/*!< @brief Stores the hash for the current f_name string */
+ CxxUtils::CachedValue<std::size_t> m_nameHash; /*!< @brief Stores the hash for the current f_name string */
static const SG::AuxElement::Accessor<float> m_acc_mpx;
static const SG::AuxElement::Accessor<float> m_acc_mpy;
diff --git a/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.icc b/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.icc
index 5dbe64ade328efe712c289957836859af299ef0d..4d4360ce8c611b3f2f7f1f9e35f47c57e2d39cdf 100644
--- a/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.icc
+++ b/Event/xAOD/xAODMissingET/xAODMissingET/versions/MissingET_v1.icc
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -16,7 +16,10 @@ inline float xAOD::MissingET_v1::mpy() const { return m_acc_mpy(*this); }
inline float xAOD::MissingET_v1::sumet() const { return m_acc_sumet(*this); }
inline const std::string& xAOD::MissingET_v1::name() const { static const SG::AuxElement::Accessor<std::string> acc("name"); return acc(*this); }
-inline std::size_t xAOD::MissingET_v1::nameHash() const { return m_nameHash; }
+inline std::size_t xAOD::MissingET_v1::nameHash() const {
+ if (!m_nameHash.isValid()) { m_nameHash.set(std::hash<std::string>()(this->f_nameConst())); }
+ return *m_nameHash.ptr();
+}
inline MissingETBase::Types::bitmask_t xAOD::MissingET_v1::source() const { static const SG::AuxElement::Accessor<MissingETBase::Types::bitmask_t> acc("source"); return acc(*this); }
////////////////////////////////////////////
@@ -28,7 +31,7 @@ inline float& xAOD::MissingET_v1::f_mpy() { return m_acc_mpy(*this); }
inline float& xAOD::MissingET_v1::f_sumet() { return m_acc_sumet(*this); }
inline std::string& xAOD::MissingET_v1::f_name() { static const SG::AuxElement::Accessor<std::string> acc("name"); return acc(*this); }
-inline const std::string& xAOD::MissingET_v1::f_nameConst() { static const SG::AuxElement::ConstAccessor<std::string> acc("name"); return acc(*this); }
+inline const std::string& xAOD::MissingET_v1::f_nameConst() const { static const SG::AuxElement::ConstAccessor<std::string> acc("name"); return acc(*this); }
inline MissingETBase::Types::bitmask_t& xAOD::MissingET_v1::f_source() { static const SG::AuxElement::Accessor<MissingETBase::Types::bitmask_t> acc("source"); return acc(*this); }
inline void xAOD::MissingET_v1::setMpx(float mpx) { this->f_mpx() = mpx; }
@@ -40,7 +43,10 @@ inline void xAOD::MissingET_v1::setName(const std::string& name) {
updateHash();
}
-inline void xAOD::MissingET_v1::updateHash() { m_nameHash = std::hash<std::string>()(this->f_nameConst()); }
+inline void xAOD::MissingET_v1::updateHash() {
+ m_nameHash.reset();
+ m_nameHash.set(std::hash<std::string>()(this->f_nameConst()));
+}
inline void xAOD::MissingET_v1::setSource(MissingETBase::Types::bitmask_t src) { this->f_source() = src; }
///////////////////////////////////////////////////
diff --git a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.cxx b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.cxx
index 86faffcd9b55d78697489df27d1e6a6fc3080df2..4ec4bf69026bd30f103ac912d5887814688076ce 100644
--- a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.cxx
+++ b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.cxx
@@ -1,15 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// Local include(s):
-#include "xAODMissingETContainerCnv.h"
-
-xAOD::MissingETContainer*
-xAODMissingETContainerCnv::createTransientWithKey (const std::string& key)
-{
- xAOD::MissingETContainer* c = xAODMissingETContainerCnvBase::createTransientWithKey (key);
- for(xAOD::MissingET* metObj : *c) metObj->updateHash();
- return c;
-}
+// Dummy source file so that the build system knows that this
+// is a custom converter.
diff --git a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.h b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.h
index 9319756a26e0760fdc7361a7f884fe6b180a2cb5..aeb417649fff988b8cc2f2f8f2de40e7b43eb285 100644
--- a/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.h
+++ b/Event/xAOD/xAODMissingETAthenaPool/src/xAODMissingETContainerCnv.h
@@ -1,41 +1,21 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: xAODMissingETContainerCnv.h 795699 2017-02-05 23:26:05Z khoo $
#ifndef XAODMISSINGETATHENAPOOL_XAODMISSINGETCONTAINERCNV_H
#define XAODMISSINGETATHENAPOOL_XAODMISSINGETCONTAINERCNV_H
-// System include(s):
-#include <string>
-
// Gaudi/Athena include(s):
#include "AthenaPoolCnvSvc/T_AthenaPoolxAODCnv.h"
// EDM include(s):
-#include "xAODMissingET/MissingET.h"
#include "xAODMissingET/MissingETContainer.h"
/// Type definition for the converter's base
typedef T_AthenaPoolxAODCnv< xAOD::MissingETContainer >
- xAODMissingETContainerCnvBase;
-
-/**
- * @short POOL converter for the xAOD::MissingETContainer class
- *
- * We need to extend the default version to handle maintaining the name hashing
- * in the interface class.
- */
-class xAODMissingETContainerCnv : public xAODMissingETContainerCnvBase
-{
-public:
- using xAODMissingETContainerCnvBase::xAODMissingETContainerCnvBase;
-
- /// Function reading in the persistent object
- virtual xAOD::MissingETContainer* createTransientWithKey (const std::string& key) override;
-}; // class xAODMissingETContainerCnv
-
+ xAODMissingETContainerCnv;
#endif // XAODMISSINGETATHENAPOOL_XAODMISSINGETCONTAINERCNV_H
diff --git a/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_20.1.7.2_test.py
index d933826d07db2910580b61f48f585389c6d06673..eb457c8a619c26a9a2ec662217378adb5819e042 100755
--- a/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#xAOD::MissingETAssociationMap
diff --git a/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_21.0.79_test.py b/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_21.0.79_test.py
index f43f7b83428de67aec5ec387c0e06b53167e21e6..3b2e3aad5648b4586d8974274ee11be4fbbd114a 100755
--- a/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODMissingETAthenaPool/test/xAODMissingETAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::MissingETAuxAssociationMap_v2
diff --git a/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt b/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt
index 353c84b01d8fb00e4c460f3258bff8c38329a5e3..9c8f759fcd66f1ecb68f82e564090c1b8a97667a 100644
--- a/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt
@@ -25,6 +25,12 @@ atlas_add_poolcnv_library( xAODMuonAthenaPoolPoolCnv
atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# In AthAnalysis xAOD::Muon doesn't know about its MuonSegment link. Which
+# makes the converter tests fail in that project...
+if( XAOD_ANALYSIS )
+ return()
+endif()
+
# Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest )
diff --git a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.1.7.2_test.py
index 0b989d4954b64599f82cfc380e395dec528b5aa1..d2748c20b966e3334f5667c2e9e02a810dfa28bf 100755
--- a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#Muons...
diff --git a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.2.2_test.py
index cc7882cc2a83d372fcf454278d7c798728de93bd..b732ce2c7a97d6736d7dd299ee0d3e0c708b8c0c 100755
--- a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.2.2_test.py
+++ b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.2.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
keys = [
#xAOD::MuonAuxContainer_v2
diff --git a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.9.9_test.py b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.9.9_test.py
index 35210998e699087a468ddd8f5b06a1a7e6f0605d..784da1fbdb695fc06067b96c1094a6a6eabdf75e 100755
--- a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.9.9_test.py
+++ b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_20.7.9.9_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.7.9.9/AOD-20.7.9.9-full.pool.root'
keys = [
#xAOD::MuonAuxContainer_v4
diff --git a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_21.0.79_test.py b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_21.0.79_test.py
index 742918ebc9beb69965302fed65419742b3a9e1b3..95cf862fec0af841db18f523c5c55e2eee7f5221 100755
--- a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::MuonAuxContainer_v4
diff --git a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_master-20190911_test.py b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_master-20190911_test.py
index 70a4d1ae5123035dff28f3f43a7a6ba8a2ec629b..81a183add39e9ac01f99d7b86489a3e628c10250 100755
--- a/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_master-20190911_test.py
+++ b/Event/xAOD/xAODMuonAthenaPool/test/xAODMuonAthenaPool_master-20190911_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
keys = [
#xAOD::MuonAuxContainer_v5
diff --git a/Event/xAOD/xAODMuonCnv/src/MuonSegmentCnvAlg.h b/Event/xAOD/xAODMuonCnv/src/MuonSegmentCnvAlg.h
index ed64557d5427f86fba0719898f608ed8953fc11e..08f850428c44d1f42e4180662798fa65efbf10dc 100644
--- a/Event/xAOD/xAODMuonCnv/src/MuonSegmentCnvAlg.h
+++ b/Event/xAOD/xAODMuonCnv/src/MuonSegmentCnvAlg.h
@@ -36,7 +36,7 @@ namespace xAODMaker {
private:
// the following segments do NOT contain MuGirl segments
- SG::ReadHandleKey<Trk::SegmentCollection> m_muonSegmentLocation{this,"SegmentContainerName","MuonSegments"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_muonSegmentLocation{this,"SegmentContainerName","TrackMuonSegments"};
SG::WriteHandleKey<xAOD::MuonSegmentContainer> m_xaodContainerName{this,"xAODContainerName","MuonSegments"};
ToolHandle<xAODMaker::IMuonSegmentConverterTool> m_muonSegmentConverterTool{this,"MuonSegmentConverterTool","Muon::MuonSegmentConverterTool/MuonSegmentConverterTool"};
diff --git a/Event/xAOD/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py b/Event/xAOD/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py
index a3d3f81fa19f93da8190294cac437f14f96a7c72..3a2042e8dd8f47f5084c05dfd978ad21f7813f22 100755
--- a/Event/xAOD/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::PFOAuxContainer_v1
diff --git a/Event/xAOD/xAODParticleEventAthenaPool/test/xAODParticleAthenaPool_21.0.79_test.py b/Event/xAOD/xAODParticleEventAthenaPool/test/xAODParticleAthenaPool_21.0.79_test.py
index eaaf9cc1d31ca0478855941277bf98dc91b017ba..67fad4ce1b7c25a472fad730927dc34b3ac552f1 100755
--- a/Event/xAOD/xAODParticleEventAthenaPool/test/xAODParticleAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODParticleEventAthenaPool/test/xAODParticleAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::ParticleAuxContainer_v1
diff --git a/Event/xAOD/xAODTau/Root/TauJetAccessors_v3.icc b/Event/xAOD/xAODTau/Root/TauJetAccessors_v3.icc
index 34c935fffec362d2cf62a9ecc5d05f9fcb5fc644..519d09dd71bad94859a9961bbc2e7b96d487453f 100644
--- a/Event/xAOD/xAODTau/Root/TauJetAccessors_v3.icc
+++ b/Event/xAOD/xAODTau/Root/TauJetAccessors_v3.icc
@@ -1,11 +1,9 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: TauJetAccessors_v2.icc 638520 2015-01-09 13:21:05Z janus $
-
#ifndef XAODTAU_TAUACCESSORS_V3_ICC
#define XAODTAU_TAUACCESSORS_V3_ICC
@@ -226,6 +224,7 @@ break;
DEFINE_TAUJETPARAMETER_ACCESSOR( int, nChargedTracks );
DEFINE_TAUJETPARAMETER_ACCESSOR( int, nIsolatedTracks );
DEFINE_TAUJETPARAMETER_ACCESSOR( int, nModifiedIsolationTracks );
+ DEFINE_TAUJETPARAMETER_ACCESSOR( int, nAllTracks );
default:
std::cerr << "xAOD::TauJetParameters ERROR Unknown integer detail ("
@@ -267,5 +266,3 @@ break;
#endif //TAUTRACK_V1_ACCESSORS to aid with link issues
#endif // XAODTAU_TAUJETACCESSORS_V3_ICC
-
-// LocalWords: EMPOverTrkSysPCorrected
diff --git a/Event/xAOD/xAODTau/Root/TauJetAuxContainer_v3.cxx b/Event/xAOD/xAODTau/Root/TauJetAuxContainer_v3.cxx
index 32dc32e9af27cbcd9e23eebe6d079ea0d00c1544..3569d9073728c4b63d010c1894874d4f8ad821ef 100644
--- a/Event/xAOD/xAODTau/Root/TauJetAuxContainer_v3.cxx
+++ b/Event/xAOD/xAODTau/Root/TauJetAuxContainer_v3.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TauJetAuxContainer_v3.cxx 725228 2016-02-19 22:59:42Z griffith $
@@ -270,7 +270,8 @@ namespace xAOD {
//RNN tau eVeto
AUX_VARIABLE( RNNEleScore );
AUX_VARIABLE( RNNEleScoreSigTrans );
-
+
+ AUX_VARIABLE( nAllTracks );
}
} // namespace xAOD
diff --git a/Event/xAOD/xAODTau/Root/TauJet_v3.cxx b/Event/xAOD/xAODTau/Root/TauJet_v3.cxx
index ec71140fae76dfc090615eeae8bc7d074fcde206..f95105c8a988b3dc8f6393bd0bdbf1a36c14b006 100644
--- a/Event/xAOD/xAODTau/Root/TauJet_v3.cxx
+++ b/Event/xAOD/xAODTau/Root/TauJet_v3.cxx
@@ -1,10 +1,7 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: TauJet_v3.cxx 725228 2016-02-19 22:59:42Z griffith $
-
-
// System include(s):
#include <cstdint>
#include <bitset>
@@ -27,19 +24,19 @@ namespace xAOD {
}
+ //primitive setters and getters for default 4-vector
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, pt)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, eta)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phi)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, m)
-
- //primitive setters and getters for jetseed 4-vector
+ //primitive setters and getters for JetSeed 4-vector
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptJetSeed)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaJetSeed)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiJetSeed)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, mJetSeed)
- //primitive setters and getters for jetseed 4-vector
+ //primitive setters and getters for DetectorAxis 4-vector
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptDetectorAxis)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaDetectorAxis)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiDetectorAxis)
@@ -56,38 +53,32 @@ namespace xAOD {
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaTauEnergyScale)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiTauEnergyScale)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, mTauEnergyScale)
- // double TauJet_v3::etaTauEnergyScale() const { return etaIntermediateAxis(); }
- // double TauJet_v3::phiTauEnergyScale() const { return phiIntermediateAxis(); }
- // double TauJet_v3::mTauEnergyScale() const { return 0; }
-
- //primitive setters and getters for jetseed 4-vector
+ //primitive setters and getters for ptTauEtaCalib 4-vector - deprecated in R22
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptTauEtaCalib)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaTauEtaCalib)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiTauEtaCalib)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, mTauEtaCalib)
- // double TauJet_v3::phiTauEtaCalib() const { return phiIntermediateAxis(); }
- // double TauJet_v3::mTauEtaCalib() const { return 0; }
- //primitive setters and getters for jetseed 4-vector
+ //primitive setters and getters for PanTauCellBasedProto 4-vector - deprecated in R22
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptPanTauCellBasedProto)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaPanTauCellBasedProto)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiPanTauCellBasedProto)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, mPanTauCellBasedProto)
- //primitive setters and getters for jetseed 4-vector
+ //primitive setters and getters for PanTauCellBased 4-vector
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptPanTauCellBased)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaPanTauCellBased)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiPanTauCellBased)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, mPanTauCellBased)
- //primitive setters and getters for HLT 4-vector
+ //primitive setters and getters for TrigCaloOnly 4-vector
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptTrigCaloOnly)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaTrigCaloOnly)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiTrigCaloOnly)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, mTrigCaloOnly)
- //primitive setters and getters for HLT 4-vector
+ //primitive setters and getters for FinalCalib 4-vector
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, ptFinalCalib)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, etaFinalCalib)
AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( TauJet_v3, float, double, phiFinalCalib)
@@ -280,16 +271,14 @@ namespace xAOD {
//-------------------------------------------------------------------------
// Accept
//-------------------------------------------------------------------------
- bool TauJet_v3::isTau(
- TauJetParameters::IsTauFlag flag ) const
+ bool TauJet_v3::isTau( TauJetParameters::IsTauFlag flag ) const
{
static const Accessor< uint32_t > acc( "isTauFlags" );
std::bitset<32> isTauFlags( acc( *this ) );
return isTauFlags[flag];
}
- void TauJet_v3::setIsTau(
- TauJetParameters::IsTauFlag flag, bool value )
+ void TauJet_v3::setIsTau( TauJetParameters::IsTauFlag flag, bool value )
{
static const Accessor< uint32_t > acc( "isTauFlags" );
std::bitset<32> isTauFlags( acc( *this ) );
@@ -297,28 +286,6 @@ namespace xAOD {
acc( *this ) = isTauFlags.to_ulong();
}
- //r21 cleanup
- // //-------------------------------------------------------------------------
- // // Veto flags accessors
- // //-------------------------------------------------------------------------
- // void TauJet_v3::setFlag(
- // TauJetParameters::VetoFlags flag, bool value )
- // {
- // static const Accessor< uint32_t > acc( "vetoFlags" );
- // std::bitset<32> vetoFlags( acc( *this ) );
- // vetoFlags[flag] = value;
- // acc( *this ) = vetoFlags.to_ulong();
- // }
-
- // bool TauJet_v3::flag(
- // TauJetParameters::VetoFlags flag ) const
- // {
- // static const Accessor< uint32_t > acc( "vetoFlags" );
- // std::bitset<32> vetoFlags( acc( *this ) );
- // return vetoFlags[flag];
- // }
-
-
//-------------------------------------------------------------------------
// Get int detail via enum
@@ -468,6 +435,8 @@ namespace xAOD {
const TauJet_v3::TauTrackLinks_t TauJet_v3::tauTrackLinksWithMask(unsigned int mask) const{
TauJet_v3::TauTrackLinks_t links;
for(const ElementLink< xAOD::TauTrackContainer >& link : tauTrackAcc(*this) ){
+ // protection against tau track thinning
+ if(!link.isValid()) continue;
if( (*link)->flagWithMask(mask))
links.push_back(link);
}
@@ -488,6 +457,8 @@ namespace xAOD {
uint tracks_pass_mask=0;
for(const ElementLink< xAOD::TauTrackContainer >& link : tauTrackAcc(*this) ){
+ // protection against tau track thinning
+ if(!link.isValid()) continue;
const TauTrack* trk = *link;
if(trk->flagWithMask(mask)){
if(tracks_pass_mask==i) {
@@ -526,9 +497,11 @@ namespace xAOD {
}
/// Get the v<const pointer> to a given tauTrack collection associated with this tau
- std::vector<const TauTrack*> TauJet_v3::tracksWithMask(unsigned int mask )const {
+ std::vector<const TauTrack*> TauJet_v3::tracksWithMask( unsigned int mask ) const {
std::vector<const TauTrack*> trks;
for(const ElementLink< xAOD::TauTrackContainer >& link : tauTrackAcc(*this) ){
+ // protection against tau track thinning
+ if(!link.isValid()) continue;
const TauTrack* trk = *link;
if(trk->flagWithMask(mask)){
trks.push_back(trk);
@@ -585,6 +558,8 @@ namespace xAOD {
size_t TauJet_v3::nTracksWithMask(unsigned int flags) const{
size_t n(0);
for(const ElementLink< xAOD::TauTrackContainer >& link : tauTrackAcc(*this) ){
+ // protection against tau track thinning
+ if(!link.isValid()) continue;
const TauTrack* trk = *link;
if(trk->flagWithMask(flags)) n++;
}
@@ -593,7 +568,11 @@ namespace xAOD {
//all tracks regardless of classification or lack thereof
size_t TauJet_v3::nAllTracks() const{
- return tauTrackAcc( *this ).size();
+ // unsafe w.r.t. tau track thinning
+ //return tauTrackAcc( *this ).size();
+ // return the number of tracks with valid element link
+ TauTrack::TrackFlagType mask=0;
+ return nTracksWithMask( mask );
}
/// add a TauTrack to the tau
@@ -1021,4 +1000,3 @@ namespace xAOD {
} // namespace xAOD
-// LocalWords: panTauDetail mJetSeed
diff --git a/Event/xAOD/xAODTau/xAODTau/TauDefs.h b/Event/xAOD/xAODTau/xAODTau/TauDefs.h
index 67715716a56ed27fce210d24e59235c410f815e8..141d50ddce863dd2344ed206ef76e32465d79f6a 100644
--- a/Event/xAOD/xAODTau/xAODTau/TauDefs.h
+++ b/Event/xAOD/xAODTau/xAODTau/TauDefs.h
@@ -1,10 +1,9 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: TauDefs.h 796092 2017-02-08 00:14:16Z griffith $
#ifndef XAODTAU_TAUDEFS_H
#define XAODTAU_TAUDEFS_H
@@ -327,6 +326,7 @@ namespace TauJetParameters
nChargedTracks=109,
nIsolatedTracks=110,
nModifiedIsolationTracks=111,//no static variable for now
+ nAllTracks=112,
//Tau/Ele BDTVars
diff --git a/Event/xAOD/xAODTau/xAODTau/versions/TauJetAuxContainer_v3.h b/Event/xAOD/xAODTau/xAODTau/versions/TauJetAuxContainer_v3.h
index 58fa1316fe762f6772f00b882afda8ec06d21a6b..e8821912be525b7a152ccd62fa7e39fa5447aa46 100644
--- a/Event/xAOD/xAODTau/xAODTau/versions/TauJetAuxContainer_v3.h
+++ b/Event/xAOD/xAODTau/xAODTau/versions/TauJetAuxContainer_v3.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODTAU_VERSIONS_TAUJETAUXCONTAINER_V3_H
@@ -117,6 +117,7 @@ namespace xAOD {
//after the first pass of TauTrackFinder
std::vector< int > nChargedTracks;
std::vector< int > nIsolatedTracks;
+ std::vector< int > nAllTracks;
typedef std::vector< ElementLink< IParticleContainer > > IParticleLink_t;
std::vector< IParticleLink_t > clusterLinks;//actually xAOD::CaloClusters
diff --git a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py
index 8b2bbfeb04767ef744464ef3bebf111a1ac48e3d..32ed933c6642dc476145dc12d77e5e34d71af5bc 100755
--- a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#xAOD::TauJetAuxContainer
diff --git a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py
index dae8e87fa0d6f06e7c2528da2517d9bd6679a3c8..1a7a0f7667c175cf98233b96c1c053d31a868a67 100755
--- a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py
+++ b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_20.7.2.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
keys = [
#xAOD::DiTauJetAuxContainer_v1
diff --git a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py
index a65bbb30733d1edce03179bc48e1a596ec69df24..2248314778861a709e01045f615b914b5e3b07dd 100755
--- a/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODTauAthenaPool/test/xAODTauAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::DiTauJetAuxContainer_v1
diff --git a/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
index dd31c801fa8220ba98d3f937e6fb01e77865c414..de3f338d3359b554551fecc25f01eeaf79c49330 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
@@ -37,6 +37,12 @@ atlas_add_poolcnv_library( xAODTrackingAthenaPoolPoolCnv
atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# In AthAnalysis xAOD::TrackParticle doesn't know about its Trk::Track link.
+# Which makes the converter tests fail in that project...
+if( XAOD_ANALYSIS )
+ return()
+endif()
+
# Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest )
diff --git a/Event/xAOD/xAODTrackingCnv/src/TrackParticleCnvAlg.cxx b/Event/xAOD/xAODTrackingCnv/src/TrackParticleCnvAlg.cxx
index 4a1d5be5fb4f21b120050cfe12cb64c1904588cb..ed6f51ccc6618c1754eb495e56b7576b6d614c1f 100644
--- a/Event/xAOD/xAODTrackingCnv/src/TrackParticleCnvAlg.cxx
+++ b/Event/xAOD/xAODTrackingCnv/src/TrackParticleCnvAlg.cxx
@@ -256,7 +256,11 @@ namespace xAODMaker {
<< " eta " << (*link)->eta() << " phi " << (*link)->phi());
// if configured also get truth classification
if( result->second.particleLink().cptr() && !m_truthClassifier.empty() ){
+#ifdef HEPMC3
+ auto truthClass = m_truthClassifier->particleTruthClassifier(result->second.particleLink().scptr());
+#else
auto truthClass = m_truthClassifier->particleTruthClassifier(result->second.particleLink().cptr());
+#endif
type = truthClass.first;
origin = truthClass.second;
ATH_MSG_VERBOSE("Got truth type " << static_cast<int>(type) << " origin " << static_cast<int>(origin));
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_20.0.0.3_test.py b/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_20.0.0.3_test.py
index 91c4eb7011bba12f2597d127a9625130bf099da1..4c854f1614d086f8e36eeba9fb69a64a1db9be6c 100755
--- a/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_20.0.0.3_test.py
+++ b/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_20.0.0.3_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.0.0.3/AOD-20.0.0.3-full.pool.root'
keys = [
#xAOD::TrigCaloClusterAuxContainer_v1
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_21.0.79_test.py
index 3687da81dbeed9ba870d4aa3505fe0226687c84c..5596c4ad8c9cd18507318f2dd7044db0aad27a1a 100755
--- a/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODTrigCaloAthenaPool/test/xAODTrigCaloAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::CaloClusterTrigAuxContainer_v1
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/test/xAODTrigEgammaAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigEgammaAthenaPool/test/xAODTrigEgammaAthenaPool_21.0.79_test.py
index 7564d3e52771a3eec6b32a62351e4ba3c8e1c4a5..8e88594ce85d119ea648b1ef671e4e0ad9b19dff 100755
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/test/xAODTrigEgammaAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/test/xAODTrigEgammaAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::ElectronTrigAuxContainer_v1
diff --git a/Event/xAOD/xAODTrigMissingETAthenaPool/test/xAODTrigMissingETAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigMissingETAthenaPool/test/xAODTrigMissingETAthenaPool_21.0.79_test.py
index 658ee021b7aef76e392f9f6050dd98cff9961714..05e7b59a195c2a4df7ec75c9ddfd6797593ae2d6 100755
--- a/Event/xAOD/xAODTrigMissingETAthenaPool/test/xAODTrigMissingETAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODTrigMissingETAthenaPool/test/xAODTrigMissingETAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::TrigMissingETAuxContainer_v1
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_20.1.7.2_test.py
index a728cd13361608125123ea102fca4c6f2847a673..31b049dbc6e70b224fda458efc04875133e45ce5 100755
--- a/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#xAOD::L2CombinedMuonAuxContainer
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_21.0.79_test.py
index 0e157b4bf1af1bdd0e924929872bbc56c339fb06..296f9eeb42912dce21501d4d6ffa8f35f6a6db89 100755
--- a/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/test/xAODTrigMuonAthenaPool_21.0.79_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::L2CombinedMuonAuxContainer_v1
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.cxx b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.cxx
index ee4b285cf5568bef201764acf674fdf1fdde681f..b80b57a647604b8e09df97c0592a15649c820fed 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.cxx
+++ b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.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
*/
#include "MuonFeatureCnvTestAlg.h"
@@ -29,12 +29,6 @@ StatusCode MuonFeatureCnvTestAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode MuonFeatureCnvTestAlg::finalize() {
-
- // Return gracefully:
- return StatusCode::SUCCESS;
-}
-
StatusCode MuonFeatureCnvTestAlg::execute() {
// Retrieve MuonFeatureContainer
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.h b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.h
index e495f0ad92135317e570beb8f2b5bb1beabbb633..e994db39493cd5645363d58cf11864b7d3ef3ec6 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.h
+++ b/Event/xAOD/xAODTrigMuonCnv/src/MuonFeatureCnvTestAlg.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
*/
//
@@ -34,8 +34,6 @@ class MuonFeatureCnvTestAlg : public AthAlgorithm {
/// Function initialising the algorithm
virtual StatusCode initialize();
- /// Function initialising the algorithm
- virtual StatusCode finalize();
/// Function executing the algorithm
virtual StatusCode execute();
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.cxx b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.cxx
index 453039354bb26b86274c78711d64286b97205c80..feeebc4c9f533e4ece89b15531c550583a80d44e 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.cxx
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.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
*/
#include "TrigMuonEFInfoCnvTestAlg.h"
@@ -35,12 +35,6 @@ StatusCode TrigMuonEFInfoCnvTestAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigMuonEFInfoCnvTestAlg::finalize() {
-
- // Return gracefully:
- return StatusCode::SUCCESS;
-}
-
StatusCode TrigMuonEFInfoCnvTestAlg::execute() {
// Retrieve the TrigMuonEFInfoContainer
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.h b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.h
index 4f11662daad3f6412ef40256715cb8a0a19b874d..d381e7e9ad095206c3e144e48f6b44aadec5c14c 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.h
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoCnvTestAlg.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
*/
//
@@ -43,8 +43,6 @@ class TrigMuonEFInfoCnvTestAlg : public AthAlgorithm {
/// Function initialising the algorithm
virtual StatusCode initialize();
- /// Function initialising the algorithm
- virtual StatusCode finalize();
/// Function executing the algorithm
virtual StatusCode execute();
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.cxx b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.cxx
index 7d13d09ee0094b5f164d3e47c262f65b922bf90a..ab8623d436c4b9c1ecb177075221e72a123a0c9e 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.cxx
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.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
*/
//
@@ -26,13 +26,6 @@ TrigMuonEFInfoToMuonCnvTool::TrigMuonEFInfoToMuonCnvTool(const std::string& type
declareProperty( "xAODEFInDetTrackParticleContainerName", m_inDetTrackParticles = "EFInDetTrackParticles" );
}
-/**
- * Destructor - nothing to do so far.
- */
-TrigMuonEFInfoToMuonCnvTool::~TrigMuonEFInfoToMuonCnvTool() {
-
-}
-
/**
* Initialize the tool
*/
@@ -45,13 +38,6 @@ StatusCode TrigMuonEFInfoToMuonCnvTool::initialize() {
return StatusCode::SUCCESS;
}
-/**
- * Finalize the tool
- */
-StatusCode TrigMuonEFInfoToMuonCnvTool::finalize() {
- return StatusCode::SUCCESS;
-}
-
/**
* Convert input TrigMuonEFInfo object into multuple xAOD::Muon objects.
* The xAOD::Muon objects are stored into the MuonContainer passed to the function.
diff --git a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.h b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.h
index 7bd1eff060d8a3b2344df1aa5372c6e95d23d400..7a1ac63fd1a7fe0e5c1d10ed4c7034fd14586746 100644
--- a/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.h
+++ b/Event/xAOD/xAODTrigMuonCnv/src/TrigMuonEFInfoToMuonCnvTool.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
*/
//
@@ -30,14 +30,11 @@ public:
TrigMuonEFInfoToMuonCnvTool(const std::string& type, const std::string& name, const IInterface* parent);
/// Destructor
- virtual ~TrigMuonEFInfoToMuonCnvTool();
+ virtual ~TrigMuonEFInfoToMuonCnvTool()=default;
/// initialize the tool
virtual StatusCode initialize() override;
- /// finalize the tool
- virtual StatusCode finalize() override;
-
/// Convert a single TrigMuonEFInfo object into (maybe multiple) xAOD::Muon objects.
virtual StatusCode convertTrigMuonEFInfo(const TrigMuonEFInfo& efinfo,
xAOD::MuonContainer& muoncontainer,
diff --git a/Event/xAOD/xAODTrigger/CMakeLists.txt b/Event/xAOD/xAODTrigger/CMakeLists.txt
index d17cde620896397a048b4617ee83377f8900bcee..65c91c4d1c952c41c2f6b9e48ca2d56223efbf37 100644
--- a/Event/xAOD/xAODTrigger/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigger/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_add_library( xAODTrigger
xAODTrigger/*.h xAODTrigger/versions/*.h xAODTrigger/versions/*.icc
Root/*.cxx
PUBLIC_HEADERS xAODTrigger
- LINK_LIBRARIES AthContainers AthLinks xAODCore xAODBase TrigNavStructure CxxUtils
+ LINK_LIBRARIES AthContainers AthLinks xAODCore xAODBase TrigNavStructure CxxUtils TrigT1MuctpiBits
${extra_libs} )
atlas_add_xaod_smart_pointer_dicts(
diff --git a/Event/xAOD/xAODTrigger/Root/MuonRoI_v1.cxx b/Event/xAOD/xAODTrigger/Root/MuonRoI_v1.cxx
index 6982f6fa6e0721cfacc9db2795867cd8709eceb7..604203161879df6769cb9f13190c9cb34ab705da 100644
--- a/Event/xAOD/xAODTrigger/Root/MuonRoI_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/MuonRoI_v1.cxx
@@ -10,6 +10,9 @@
// Local include(s):
#include "xAODTrigger/versions/MuonRoI_v1.h"
+// get bitsmasks from common definition source:
+#include "TrigT1MuctpiBits/MuCTPI_Bits.h"
+
namespace xAOD{
MuonRoI_v1::MuonRoI_v1()
@@ -70,7 +73,8 @@ namespace xAOD{
///
int MuonRoI_v1::getThrNumber() const {
- return ( ( roiWord() >> 11 ) & 0x7 );
+ if (isRun3()) return ( ( roiWord() >> RUN3_CAND_PT_SHIFT ) & RUN3_CAND_PT_MASK );
+ else return ( ( roiWord() >> CAND_PT_SHIFT ) & CAND_PT_MASK );
}
/// A muon's spacial location is identified from the sector number and the
@@ -82,15 +86,26 @@ namespace xAOD{
///
int MuonRoI_v1::getRoI() const {
- if( this->getSource() == Forward ) {
- return ( ( roiWord() >> 2 ) & 0x3f );
- } else if( this->getSource() == Endcap ) {
- return ( ( roiWord() >> 2 ) & 0xff );
- } else if( this->getSource() == Barrel ) {
- return ( ( roiWord() >> 2 ) & 0x1f );
- }
-
- return 0;
+ if (isRun3()) {
+ if( this->getSource() == Forward ) {
+ return ( ( roiWord() >> RUN3_ROI_SHIFT ) & FORWARD_ROI_MASK );
+ } else if( this->getSource() == Endcap ) {
+ return ( ( roiWord() >> RUN3_ROI_SHIFT ) & ENDCAP_ROI_MASK );
+ } else if( this->getSource() == Barrel ) {
+ return ( ( roiWord() >> RUN3_ROI_SHIFT ) & BARREL_ROI_MASK );
+ }
+ }
+ else
+ {
+ if( this->getSource() == Forward ) {
+ return ( ( roiWord() >> ROI_SHIFT ) & FORWARD_ROI_MASK );
+ } else if( this->getSource() == Endcap ) {
+ return ( ( roiWord() >> ROI_SHIFT ) & ENDCAP_ROI_MASK );
+ } else if( this->getSource() == Barrel ) {
+ return ( ( roiWord() >> ROI_SHIFT ) & BARREL_ROI_MASK );
+ }
+ }
+ return 0;
}
/// The sector address is an 8-bit identifier of the sector. For its detailed
@@ -105,7 +120,8 @@ namespace xAOD{
///
int MuonRoI_v1::getSectorAddress() const {
- return ( ( roiWord() >> 14 ) & 0xff );
+ if (isRun3()) return ( ( roiWord() >> RUN3_CAND_SECTOR_ADDRESS_SHIFT ) & CAND_SECTOR_ADDRESS_MASK );
+ else return ( ( roiWord() >> CAND_SECTOR_ADDRESS_SHIFT ) & CAND_SECTOR_ADDRESS_MASK );
}
/// Each muon trigger sector can only send information about a maximum of
@@ -114,9 +130,11 @@ namespace xAOD{
/// assigned to it in its sector. If it's <code>false</code>, it was the
/// <i>second candidate</i> in its sector.
///
+ /// actually v1 only ...
bool MuonRoI_v1::isFirstCandidate() const {
- return ( ( roiWord() >> 22 ) & 0x1 );
+ if (isRun3()) return true; // undefined in run3, return default true
+ else return ( ( roiWord() >> CAND_HIGHEST_PT_SHIFT ) & CAND_HIGHEST_PT_MASK );
}
/// One RoI (one part of the trigger sector) can only send information about
@@ -126,7 +144,10 @@ namespace xAOD{
///
bool MuonRoI_v1::isMoreCandInRoI() const {
- return ( ( roiWord() >> 1 ) & 0x1 );
+ if (isRun3()) {
+ if (getSource() == Barrel) return ( ( roiWord() >> RUN3_ROI_OVERFLOW_SHIFT ) & ROI_OVERFLOW_MASK );
+ else return false; // Endcap + Fwd have no flag for this
+ } else return ( ( roiWord() >> ROI_OVERFLOW_SHIFT ) & ROI_OVERFLOW_MASK );
}
/// This flag is set to <code>true</code> if the sector that this muon
@@ -136,7 +157,8 @@ namespace xAOD{
///
bool MuonRoI_v1::isMoreCandInSector() const {
- return ( roiWord() & 0x1 );
+ if (isRun3()) return ( ( roiWord() >> RUN3_CAND_OVERFLOW_SHIFT ) & CAND_OVERFLOW_MASK );
+ else return ( ( roiWord() >> CAND_OVERFLOW_SHIFT ) & CAND_OVERFLOW_MASK );
}
/// The function decodes the sector type encoded in the 8-bit sector address
@@ -147,9 +169,10 @@ namespace xAOD{
///
MuonRoI_v1::RoISource MuonRoI_v1::getSource() const {
- if( this->getSectorAddress() & 0x80 ) {
+ //same mask for run2 and run3
+ if( this->getSectorAddress() & ENDCAP_ADDRESS_MASK ) {
return Endcap;
- } else if( this->getSectorAddress() & 0x40 ) {
+ } else if( this->getSectorAddress() & FORWARD_ADDRESS_MASK ) {
return Forward;
} else {
return Barrel;
@@ -164,7 +187,8 @@ namespace xAOD{
///
MuonRoI_v1::Hemisphere MuonRoI_v1::getHemisphere() const {
- if( this->getSectorAddress() & 0x1 ) {
+ //same mask for run2 and run3
+ if( this->getSectorAddress() & SECTOR_HEMISPHERE_MASK ) {
return Positive;
} else {
return Negative;
@@ -181,10 +205,18 @@ namespace xAOD{
if( getSource() == Barrel ) return Undef;
- if( roiWord() & 0x8000000 ) {
- return Pos;
+ if (isRun3()) {
+ if( ( roiWord() >> RUN3_CAND_TGC_CHARGE_SIGN_SHIFT) & 0x1 ) {
+ return Pos;
+ } else {
+ return Neg;
+ }
} else {
- return Neg;
+ if( ( roiWord() >> CAND_TGC_CHARGE_SIGN_SHIFT) & 0x1 ) {
+ return Pos;
+ } else {
+ return Neg;
+ }
}
}
@@ -194,7 +226,16 @@ namespace xAOD{
///
bool MuonRoI_v1::isVetoed() const {
- return ( roiWord() & 0x10000000 );
+ if (isRun3()) return ( ( roiWord() >> RUN3_CAND_VETO_SHIFT) & 0x1 );
+ else return ( ( roiWord() >> CAND_VETO_SHIFT) & 0x1 );
+ }
+
+ /// An extra bit is added at the end of the RoI word for run3 candidates
+ /// in the EDM for technical purposes to distinguish whether we want to use
+ /// the run2 or run3 bitmasks in decoding the word
+ bool MuonRoI_v1::isRun3() const {
+
+ return ( roiWord() >> 31 & 0x1 );
}
//
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/MuonRoI_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/MuonRoI_v1.h
index 0976fec9c85f952ba4443024d28a37ecd23ffbfd..d017a9ec9230743800a78eb0ac6b3d066e8fe507 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/MuonRoI_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/MuonRoI_v1.h
@@ -111,6 +111,8 @@ namespace xAOD {
Charge getCharge() const;
/// Returns the veto flag for the candidate
bool isVetoed() const;
+ /// Returns extra flag at end of RoI word indicating that it's in Run3 format
+ bool isRun3() const;
/// @}
diff --git a/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_20.1.7.2_test.py
index 476752fdba8e029a9290089ed6814087fe37a982..67e184e1ae59c911499c048078135c2d8be51bf9 100755
--- a/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_20.1.7.2_test.py
+++ b/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_20.1.7.2_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
keys = [
#EmTauRoI
diff --git a/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_master-20190911_test.py b/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_master-20190911_test.py
index 7f2c7e0ceb2d2277624fbc47753adcfe88e384a2..ff34d84ada5681786e6af3d93e892623ee015ae6 100755
--- a/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_master-20190911_test.py
+++ b/Event/xAOD/xAODTriggerAthenaPool/test/xAODTriggerAthenaPool_master-20190911_test.py
@@ -3,10 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
keys = [
#EmTauRoI_v2
diff --git a/Event/xAOD/xAODTruthAthenaPool/test/xAODTruthAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTruthAthenaPool/test/xAODTruthAthenaPool_21.0.79_test.py
index 0f6816c00729dbce9fe0819189ab505c2c4aeb88..22c15e5c3052972d52c8f0ce758862c46a45dc97 100755
--- a/Event/xAOD/xAODTruthAthenaPool/test/xAODTruthAthenaPool_21.0.79_test.py
+++ b/Event/xAOD/xAODTruthAthenaPool/test/xAODTruthAthenaPool_21.0.79_test.py
@@ -3,11 +3,15 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+import ROOT
from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
if __name__ == "__main__":
- infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
+ # Force-load some dictionaries. Needed to work around ROOT-10940.
+ ROOT.xAOD.CaloCluster()
+
+ infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
keys = [
#xAOD::TruthEventAuxContainer_v1
'TruthEvents',
@@ -19,4 +23,4 @@ if __name__ == "__main__":
'TruthVertices',
]
- TPCnvTest(infile, keys)#, useGeoModelSvc=True, doLAr=True, doTile=True)
+ TPCnvTest(infile, keys)
diff --git a/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h b/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h
index 02220ccc846d15399c614494c4d16961ad631aa2..78c21f3fddf904ac629bfa13dc61f4f07850b826 100644
--- a/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h
+++ b/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h
@@ -55,6 +55,7 @@ inline void line(std::ostream& os,const GenVertex& v) {v.print(os);}
inline void line(std::ostream& os,const GenVertex* v) {v->print(os);}
}
inline int barcode(ConstGenVertexPtr p) { return p->barcode();}
+inline int barcode(const GenVertex p) { return p.barcode();}
inline void* raw_pointer(GenVertexPtr p) { return p;}
inline const void* raw_pointer(ConstGenVertexPtr p) { return p;}
inline std::ostream& operator<<( std::ostream& os, const GenVertex* v ) { if (v) return os<<(*v); else return os;}
diff --git a/Generators/Charybdis_i/CMakeLists.txt b/Generators/Charybdis_i/CMakeLists.txt
deleted file mode 100644
index 37ff118e17c963bca50a3d466ed989ab2c5fec7a..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( Charybdis_i )
-
-# External dependencies:
-find_package( Herwig )
-find_package( Lhapdf )
-
-# Remove the --as-needed linker flags:
-atlas_disable_as_needed()
-
-# Component(s) in the package:
-atlas_add_library( Charybdis_i
- Charybdis_i/*.h Charybdis_i/*.inc src/*.cxx src/*.F
- PUBLIC_HEADERS Charybdis_i
- PRIVATE_INCLUDE_DIRS ${HERWIG_INCLUDE_DIRS} ${LHAPDF_INCLUDE_DIRS}
- LINK_LIBRARIES GeneratorFortranCommonLib
- PRIVATE_LINK_LIBRARIES ${HERWIG_LIBRARIES} ${LHAPDF_LIBRARIES} )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
diff --git a/Generators/Charybdis_i/Charybdis_i/CharybdisInterface.h b/Generators/Charybdis_i/Charybdis_i/CharybdisInterface.h
deleted file mode 100644
index 9cc61f657ec09d86a0f0f8627ccca74f7f6977e7..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/Charybdis_i/CharybdisInterface.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-/**
-@class CharybdisInterface
-
-@author Nick Brett [ n.brett1@physics.ox.ac.uk ] - 03-02-05
-
- a set of c++ functions that act as an interface between
- Athenas C++ herwig command sting handeler and charybdis
- (a FORTRAN program for simulation of Micro Black Holes)
-*/
-#ifndef CHARYBDISINTERFACE_H
-#define CHARYBDISINTERFACE_H
-
-extern void WriteCharybdisParam(int,int,double);
-extern "C" void readcharybdisparamint_(int*,int*);
-extern "C" void readcharybdisparamdbl_(int*,double*);
-
-#endif
-
-
diff --git a/Generators/Charybdis_i/Charybdis_i/charybdis1001.inc b/Generators/Charybdis_i/Charybdis_i/charybdis1001.inc
deleted file mode 100644
index ee1ca352316fc1e94217f023be6f800c40da4b16..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/Charybdis_i/charybdis1001.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-C--include file for Black Hole generator
- IMPLICIT NONE
-C--common block for the probabilities of SM particles
- DOUBLE PRECISION PQUARK,PLEPT,PNEUT,PGLUON,PGAMMA,PWBOSN,
- & PZBOSN,PHIGGS,PFERM(3),PBOSON(5)
- COMMON /BHPROB/PQUARK,PLEPT,PNEUT,PGLUON,PGAMMA,PWBOSN,
- & PZBOSN,PHIGGS,PFERM,PBOSON
-C--common block for the main parameters
- INTEGER MSSDEF,NBODY,IPRINT,MSSDEC
- DOUBLE PRECISION MPLNCK,MINMSS,MAXMSS,INTMPL
- LOGICAL TIMVAR,GTSCA,GRYBDY,KINCUT
- COMMON /BHPARM/MPLNCK,MINMSS,MAXMSS,INTMPL,MSSDEF,NBODY,IPRINT,
- & MSSDEC,TIMVAR,GTSCA,GRYBDY,KINCUT
-C--common block for decay of the black hole
- DOUBLE PRECISION RHFACT,BHMASS
- INTEGER TOTDIM
- COMMON /BLACKH/ RHFACT,BHMASS,TOTDIM
diff --git a/Generators/Charybdis_i/Charybdis_i/charybdis1003.inc b/Generators/Charybdis_i/Charybdis_i/charybdis1003.inc
deleted file mode 100644
index 751fd43e65b1e094fbfa139cdf45d96bf5821f1b..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/Charybdis_i/charybdis1003.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-C--include file for Black Hole generator
-C--common block for the probabilities of SM particles
- DOUBLE PRECISION PQUARK,PLEPT,PNEUT,PGLUON,PGAMMA,PWBOSN,
- & PZBOSN,PHIGGS,PFERM(3),PBOSON(5)
- COMMON /BHPROB/PQUARK,PLEPT,PNEUT,PGLUON,PGAMMA,PWBOSN,
- & PZBOSN,PHIGGS,PFERM,PBOSON
-C--common block for the main parameters
- INTEGER MSSDEF,NBODY,IBHPRN,MSSDEC
- DOUBLE PRECISION MPLNCK,MINMSS,MAXMSS,INTMPL
- LOGICAL TIMVAR,GTSCA,GRYBDY,KINCUT
-C--BW mod 16/08/06: changed IPRINT to IBHPRN (conflict with HERWIG)
- COMMON /BHPARM/MPLNCK,MINMSS,MAXMSS,INTMPL,MSSDEF,NBODY,IBHPRN,
- & MSSDEC,TIMVAR,GTSCA,GRYBDY,KINCUT
-C--common block for decay of the black hole
- DOUBLE PRECISION RHFACT,BHMASS
- INTEGER TOTDIM
- COMMON /BLACKH/RHFACT,BHMASS,TOTDIM
-C--BW mod 16/08/06: new common for version 1.003
- DOUBLE PRECISION THWMAX,RMMINM
- LOGICAL YRCSEC,RMBOIL
- COMMON /BH1003/THWMAX,RMMINM,RMBOIL,YRCSEC
-
diff --git a/Generators/Charybdis_i/doc/Charybdis.pdf b/Generators/Charybdis_i/doc/Charybdis.pdf
deleted file mode 100644
index 99fe972509863df77ba12ea88d1d03f479dc9f4b..0000000000000000000000000000000000000000
Binary files a/Generators/Charybdis_i/doc/Charybdis.pdf and /dev/null differ
diff --git a/Generators/Charybdis_i/doc/Charybdis.tex b/Generators/Charybdis_i/doc/Charybdis.tex
deleted file mode 100644
index 9e594d9bc403ac50a905317cbe83b8eeb74e95f8..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/doc/Charybdis.tex
+++ /dev/null
@@ -1,152 +0,0 @@
-\documentclass[11pt]{article}
-\newdimen\SaveHeight \SaveHeight=\textheight
-\textwidth=6.5in
-\textheight=8.9in
-\textwidth=6.5in
-\textheight=9.0in
-\hoffset=-.5in
-\voffset=-1in
-\def\topfraction{1.}
-\def\textfraction{0.}
-\def\topfraction{1.}
-\def\textfraction{0.}
-
-\title{Chayrbdis\_i: An interface between the Charybdis and Athena }
-\author{ Nick Brett (n.brett1@physics.ox.ac.uk) }
-
-\begin{document}
-
-\thispagestyle{empty}
-
-\maketitle
-
-\section*{Introduction}
-
-This pacakge runs the Charybdis Micro Black Hole Monte Carlo Generator
-from within Athena. The Charybdis generator has been configured to use Herwig for
-hadronisation and interacts with it via the Les Houches accord.
-
-\section*{Available Input Parameters}
-
-Charybdis has a number of user defined input parameters which can be used to alter its behavior. Some but not all of these parameters can be modified through a jobOptions file using the Athena interface to Charybdis. Those that are available are listed bellow.
-
-\subsection*{Plank Mass}
-
-This is the fundamental Plank mass as experienced by any physics on length scales smaller than the size of the extra dimensions. Current collider limits place the fundamental Plank mass above ~800 GeV. If extra dimensions are to solve the hierarchy problem then the fundamental Plank mass would ideally be on the order of 1 TeV.
-
-\subsection*{Total Number of Dimensions}
-
-This is the total number of large dimensions including the (3+1) dimensions that are apparent in current physics.
-
-\subsection*{Black Hole Mass}
-
-Micro Black Holes produced through particles collisions will have a range of masses defined by the range of center of mass energies of those collisions.
-
-\subsection*{Number of Particles in Remnant Decay}
-
-Micro Black Holes may be considered to follow the normal rules of
-General Relativity and Hawking radiation provided that their mass is
-more than a few multiples of the fundamental Plank mass. As a Micro
-Black Hole decays via Hawking radiation its mass falls until
-eventually ( $\sim 10^{-26}$ seconds later !) it can no longer be considered
-as a "classical" object. At this point some new unknown physics must
-begin to define the Black Holes behavior. The Black Hole However, will
-still have some mass and possibly carry some other conserved
-quantities such as electric charge. The Charybdis Monte Carlo program
-deals with this remaining object (a Remnant of a black hole) by
-causing it to spontaneously decay into a user defined number of
-Standard model particles. This option sets the number of those particles.
-
-\subsection*{Time Variation of Black Hole Temperature}
-
-A Black Holes Hawking temperature if defined by its mass and the
-number of dimensions in which it exists. As a Black Hole evaporates
-(by emitting particles via the Hawking process) its mass falls and so
-its temperature increases. However, because Micro Black Holes have a
-very high Hawking temperature the time between particle emissions is
-extremely short. This leads to the question of whether or not a Micro
-Black Hole has time to reach thermal equilibrium in between each
-particle emission. When this option is set to true the Charybdis
-assumes that the Black Hole decays in quasi-static equilibrium and
-its temperature is always a function of its immediate mass. When it is
-false the Black Holes temperature remains constant throughout its decay.
-
-\subsection*{Grey Body Factors}
-
-To first order a Black Hole behaves like a perfect black body thermal
-emitter. However, the gravitational field surrounding a Black Hole as
-well as any charge or angular momentum it may have define a set of
-potentials in its vicinity. Particles emitted by the black hole
-interact with this potential in different ways depending on their
-charge, spin etc. As a result the spectra of emitted particles is
-modified, transforming the black body spectrum into what is know as a
-Grey body spectrum. Setting this option true causes Charybdis to take
-account of these Grey body factors.
-
-\subsection*{Kinematic Cut}
-
-This parameter determines whether Charybdis conserves energy and
-momentum as it decays. When set true any generated decays which exceed
-the kinematic limit will be disregarded and replaced by a newly
-generated decay.
-
-\section*{How to Write a JobOptions File}
-
-All the parameters detailed above can be configured through a
-JobOptions file using the Herwig Command string. Commands consist of
-two integers proceeded by the phrase "charyb", as in the following example:
-
-\begin{verbatim}
-Herwig.HerwigCommand += [ "charyb 2 6" ] # Total number of dimensions
-\end{verbatim}
-
-The phrase "charyb" indicates that the command should be interpreted by the Charybdis interface rather than any other part of Herwig\_i. The first of the two integers indicates which parameter is to be modified and the second provides the value which should be assigned to the parameter.
-
-Each of the parameters has a default value which will be passed to Charybdis unless a modified value is defined by the user.
-Table of Parameters
-
-\subsection*{Command Summary}
-
-The table bellow lists all available parameters along with the relevant number and the default values:
-
-\begin{tabular}{ l c c }
-Option & Number & Default\\
-\hline
-Plank Mass & 1 & 1000 (GeV)\\
-Total number of dimensions & 2 & 8\\
-Minimum Black Hole Mass & 3 & 5000 (GeV)\\
-Maximum Black Hole Mass & 4 & 14000 (GeV)\\
-Number of particles in remnant decay & 5 & 2\\
-Time variation of Black hole temperature & 6 & 1 (true)\\
-Grey Body factors & 7 & 1 (true)\\
-Kinematic cut enabled & 8 & 0 (false)\\
-\end{tabular}
-
-\subsection*{Example Configuration}
-
-Bellow is an example of a complete Charybdis configuration. Herwig is selected as a generator and provided with random number seeds as usual, then options are passed to Charybdis as described above:
-
-\begin{verbatim}
-AtRndmGenSvc = Service( "AtRndmGenSvc" )
-AtRndmGenSvc.Seeds =["HERWIG 1804289383 846930886", "HERWIG\_INIT 1681692777 1714636915"];
-
-theApp.TopAlg += ["Herwig"]
-
-Herwig = Algorithm( "Herwig" )
-Herwig.OutputLevel = INFO
-Herwig.HerwigCommand = [ "iproc charybdis" ] # Set Herwig to run charybdis
-
-Herwig.HerwigCommand += [ "charyb 2 6" ] # Total number of dimensions
-Herwig.HerwigCommand += [ "charyb 3 6000" ] # Min Black Hole mass
-Herwig.HerwigCommand += [ "charyb 4 6500" ] # Max Black Hole mass
-Herwig.HerwigCommand += [ "charyb 6 0" ] # Time Variation of mass
-Herwig.HerwigCommand += [ "charyb 7 0" ] # Grey body factors
-\end{verbatim}
-
-\section*{Further Reading}
-\begin{description}
-\item[ATLAS TWiki page] https://twiki.cern.ch/twiki/bin/view/AtlasProtected/CharybdisForAtlas
-\item[Charybdis Authors website] http://www.ippp.dur.ac.uk/montecarlo/leshouches/generators/charybdis/
-\end{description}
-
-\end{document}
diff --git a/Generators/Charybdis_i/doc/packagedoc.h b/Generators/Charybdis_i/doc/packagedoc.h
deleted file mode 100644
index 37833d98f1643e4d9479290d6a0df98de47384c5..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/doc/packagedoc.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
- <i>This pacakge runs the Charybdis Micro Black Hole Monte Carlo Generator
-from within Athena. The Charybdis generator has been configured to use Herwig for
-hadronisation and interacts with it via the Les Houches accord.
-More information about the generator can be found here:
-https://svnweb.cern.ch/trac/atlasoff/browser/Generators/Charybdis_i/trunk/doc/Charybdis.pdf
-
-@author Nick Brett (n.brett1@physics.ox.ac.uk)
-</i>
-
-@page Charybdis_i_page
-
-
-
-*/
diff --git a/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py b/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py
deleted file mode 100644
index aa3286d6516bb3a749ebe56d502e5fd5a3d65ddb..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/share/jobOptions.CharybdisHerwig.py
+++ /dev/null
@@ -1,99 +0,0 @@
-###################################################
-# Job options to run Charybdis/Herwig/Jimmy with
-# release 13.0.X and after
-#
-# Modified: K.Loureiro, August 29, 2008
-# Added additional parameters for Charybdis_i
-#
-# It also runs well wiht 14.0.0.Y (April 3, 2008)
-###################################################
-###############################################################
-#
-# Job options file
-#
-#==============================================================
-#
-# last modified - 11/05/08 - Cano Ay [aycano@cern.ch]
-# last modified - 9/09/2008 - Karina Loureiro [karina.Loureiro@cern.ch]
-
-#--------------------------------------------------------------
-# General Application Configuration options
-#--------------------------------------------------------------
-import AthenaCommon.AtlasUnixGeneratorJob
-
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ServiceMgr
-
-# make sure we are loading the ParticleProperty service
-from PartPropSvc.PartPropSvcConf import PartPropSvc
-ServiceMgr += PartPropSvc()
-
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-ServiceMgr.MessageSvc.OutputLevel = INFO
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-# Number of events to be processed (default is 10)
-theApp.EvtMax = 50
-#--------------------------------------------------------------
-# Algorithms Private Options
-#--------------------------------------------------------------
-from AthenaServices.AthenaServicesConf import AtRndmGenSvc
-ServiceMgr += AtRndmGenSvc()
-ServiceMgr.AtRndmGenSvc.Seeds = ["HERWIG 468703135 2145174067", "HERWIG_INIT 468703135 2145174067"]
-# AtRndmGenSvc.ReadFromFile = true;
-
-from AthenaCommon.AlgSequence import AlgSequence
-job=AlgSequence()
-from Herwig_i.Herwig_iConf import Herwig
-job += Herwig()
-job.Herwig.HerwigCommand = ["modpdf 10042",
- "maxpr 5",
- "autpdf HWLHAPDF",
- "msflag 1", #calls jimmy
- "jmbug 0",
- "iproc charybdis", # select user process
- "charyb 2 6", # total number of dimensions
- "charyb 3 5000", # minimum mass
- "charyb 4 14000", # maximum mass
- "charyb 5 2", # number of partiles in remant decay
- "charyb 6 1", # time variation of temperature
- "charyb 7 1", # grey body factors
- "charyb 8 1", # kinematic limit
- #Options below have their default values assigned to them
- "charyb 13 2", # MSSDEF=1 -> M_GT, MSSDEF=2 ->M_DL and MSSDEF=3 -> M_D
- "charyb 14 0", # Momentum scale for calling PDFs
- "charyb 15 3", # =1 no heavy particles, =2 t,W,Z, =3 t,W,Z,Higgs
- "charyb 16 1", # 0=no printout, 1=errors only, 2=errors+info
- "charyb 17 5000" # setting the beam energy
- ]
-
-from TruthExamples.TruthExamplesConf import DumpMC
-job += DumpMC()
-
-
-#---------------------------------------------------------------
-# Pool Persistency
-#---------------------------------------------------------------
-from PoolSvc.PoolSvcConf import PoolSvc
-ServiceMgr += PoolSvc()
-
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "StreamEVGEN" )
-Stream1.OutputFile = "charybdisHerwig.evgen.pool.root"
-Stream1.ItemList += [ "EventInfo#*", "McEventCollection#*" ]
-
-#---------------------------------------------------------------
-
-#---------------------------------------------------------------
-# Ntuple service output
-#---------------------------------------------------------------
-#==============================================================
-#
-# End of job options file
-#
-###############################################################
diff --git a/Generators/Charybdis_i/src/CharybdisInterface.cxx b/Generators/Charybdis_i/src/CharybdisInterface.cxx
deleted file mode 100644
index 9ca578cce5d5c79d9bca1dcac377359d7e5de4ca..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/src/CharybdisInterface.cxx
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// CharybdisInterface.cxx
-//
-// Nick Brett [ n.brett1@physics.ox.ac.uk ] - 03-02-05
-//
-// a set of c++ functions that act as an interface between
-// Athenas C++ herwig command sting handeler and charybdis
-// (a FORTRAN program for simulation of Micro Black Holes)
-
-#ifndef CHARYBDIS_INTERFACE
-#define CHARYBDIS_INTERFACE
-
-#include <cstdlib>
-#include <cstdio>
-
-#include "Charybdis_i/CharybdisInterface.h"
-
-int WriteCharybdisParamInit=0;
-
-struct CharybdisParams
-{
- double Mplank;
- int TotDim;
- double MinMbh;
- double MaxMbh;
- int RemnantDecay;
- int TimeVariation;
- int GreyBodyFactor;
- int KinCut;
- int Yrcsec;
- double Thwmax;
- int Rmboil;
- double Rmminm;
- int MssDef;
- int Gtsca;
- int MssDec;
- int IbhPrn;
- double Ebmup;
-
-};
-
-struct CharybdisParams param;
-
-
-
-
-// This function should be called from c++ and used to write parameters
-// to a temporary store
-extern void WriteCharybdisParam( int index, int iparameter, double dparameter )
-{
- // Write default values into CharybdisParam when function is run for the first time
- if(WriteCharybdisParamInit < 1)
- {
- WriteCharybdisParamInit = 10;
-
- param.Mplank=1000; // 1
- param.TotDim=8; // 2
- param.MinMbh=5000; // 3
- param.MaxMbh=14000; // 4
- param.RemnantDecay=2; // 5
- param.TimeVariation=1; // 6
- param.GreyBodyFactor=1; // 7
- param.KinCut=0; // 8
- param.Yrcsec=0; // 9
- param.Thwmax=1000; //10
- param.Rmboil=0; //11
- param.Rmminm=1000; //12
- param.MssDef=2; //13
- param.Gtsca=1; //14 Boolean
- param.MssDec=3; //15
- param.IbhPrn=1; //16
- param.Ebmup=7000; //17
-
-
-
- }
-
- if(index == 1)
- {
- param.Mplank = dparameter;
- }
-
- else if(index == 2)
- {
- param.TotDim = iparameter;
- }
-
- else if(index == 3)
- {
- param.MinMbh = dparameter;
- }
-
- else if(index == 4)
- {
- param.MaxMbh = dparameter;
- }
-
- else if(index == 5)
- {
- param.RemnantDecay = iparameter;
- }
-
- else if(index == 6)
- {
- param.TimeVariation = iparameter;
- }
-
- else if(index == 7)
- {
- param.GreyBodyFactor = iparameter;
- }
-
- else if(index == 8)
- {
- param.KinCut = iparameter;
- }
- else if(index == 9)
- {
- param.Yrcsec = iparameter;
- }
- else if(index == 10)
- {
- param.Thwmax = dparameter;
- }
- else if(index == 11)
- {
- param.Rmboil = iparameter;
- }
- else if(index == 12)
- {
- param.Rmminm = dparameter;
- }
- else if(index == 13)
- {
- param.MssDef = iparameter;
- }
- else if(index == 14)
- {
- param.Gtsca = iparameter;
- }
- else if(index == 15)
- {
- param.MssDec = iparameter;
- }
- else if(index == 16)
- {
- param.IbhPrn = iparameter;
- }
- else if(index == 17)
- {
- param.Ebmup = dparameter;
- }
-
-}
-
-// This function should be called from FORTRAN and used to read parameters
-// stored by the write function
-extern "C" void readcharybdisparamint_(int* index, int* parameter)
-{
- // Write default values into CharybdisParam if WriteCharybdisParam has never been run
- if(WriteCharybdisParamInit < 1)
- {
- WriteCharybdisParamInit = 10;
-
- param.Mplank=1; //1
- param.TotDim=2; //2
- param.MinMbh=5000; //3
- param.MaxMbh=14000; //4
- param.RemnantDecay=2; //5
- param.TimeVariation=1; //6
- param.GreyBodyFactor=1; //7
- param.KinCut=0; //8
- param.Yrcsec=0; //9
- param.Thwmax=1000; //10
- param.Rmboil=0; //11
- param.Rmminm=1000; //12
- param.MssDef=2; //13
- param.Gtsca=1; //14
- param.MssDec=3; //15
- param.IbhPrn=1; //16
- param.Ebmup=7000; //17
- }
-
-
- if(*index == 2)
- {
- *parameter = param.TotDim;
- }
-
- else if(*index == 5)
- {
- *parameter = param.RemnantDecay;
- }
-
- else if(*index == 6)
- {
- *parameter = param.TimeVariation;
- }
-
- else if(*index == 7)
- {
- *parameter = param.GreyBodyFactor;
- }
-
- else if(*index == 8)
- {
- *parameter = param.KinCut;
- }
-
- else if(*index == 9)
- {
- *parameter = param.Yrcsec;
- }
-
- else if(*index == 11)
- {
- *parameter = param.Rmboil;
- }
-
- else if(*index == 13)
- {
- *parameter = param.MssDef;
- }
- else if(*index == 14)
- {
- *parameter = param.Gtsca;
- }
- else if(*index == 15)
- {
- *parameter = param.MssDec;
- }
- else if(*index == 16)
- {
- *parameter = param.IbhPrn;
- }
-
-
-
- else
- {
- //log << MSG:: INFO << " Charybdis Interface -> Incorrect type cast for charybdis variable OR Incorrect index\n" << endmsg;
- }
-
-}
-
-extern "C" void readcharybdisparamdbl_(int* index, double* parameter)
-{
- // Write default values into CharybdisParam if WriteCharybdisParam has never been run
- if(WriteCharybdisParamInit < 1)
- {
- WriteCharybdisParamInit = 10;
-
- param.Mplank=1; //1
- param.TotDim=2; //2
- param.MinMbh=5000; //3
- param.MaxMbh=14000; //4
- param.RemnantDecay=2; //5
- param.TimeVariation=1; //6
- param.GreyBodyFactor=1; //7
- param.KinCut=0; //8
- param.Yrcsec=0; //9
- param.Thwmax=1000; //10
- param.Rmboil=0; //11
- param.Rmminm=1000; //12
- param.MssDef=2; //13
- param.Gtsca=1; //14
- param.MssDec=3; //15
- param.IbhPrn=1; //16
- param.Ebmup=7000; //17
- }
-
- if(*index == 1)
- {
- *parameter = param.Mplank;
- }
-
- else if(*index == 3)
- {
- *parameter = param.MinMbh;
- }
-
- else if(*index == 4)
- {
- *parameter = param.MaxMbh;
- }
-
- else if(*index == 10)
- {
- *parameter = param.Thwmax;
- }
-
- else if(*index == 12)
- {
- *parameter = (double)(param.Rmminm);
- }
- else if(*index == 17)
- {
- *parameter = (double)(param.Ebmup);
- }
-
-
-
- else
- {
- //log << MSG:: INFO << " Charybdis Interface -> Incorrect type cast for charybdis variable OR Incorrect index\n" << endmsg;
- }
-
-
-}
-
-
-#endif
diff --git a/Generators/Charybdis_i/src/initcharybdis.F b/Generators/Charybdis_i/src/initcharybdis.F
deleted file mode 100644
index 7b6588297de511b98ad7256b24cc73cd3b143ff5..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/src/initcharybdis.F
+++ /dev/null
@@ -1,401 +0,0 @@
-CDECK ID>, INITUSER.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris and Peter Richardson
-C----------------------------------------------------------------------
- SUBROUTINE INITCHARYBDIS
-C----------------------------------------------------------------------
-C Les Houches initialisation routine
-C----------------------------------------------------------------------
-#include "Charybdis_i/charybdis1003.inc"
- external chdata
-
-C--Les Houches run common block
- INTEGER MAXPUP
- PARAMETER(MAXPUP=100)
- INTEGER IDBMUP,PDFGUP,PDFSUP,IDWTUP,NPRUP,LPRUP
- DOUBLE PRECISION EBMUP,XSECUP,XERRUP,XMAXUP
- COMMON /HEPRUP/ IDBMUP(2),EBMUP(2),PDFGUP(2),PDFSUP(2),
- & IDWTUP,NPRUP,XSECUP(MAXPUP),XERRUP(MAXPUP),
- & XMAXUP(MAXPUP),LPRUP(MAXPUP)
-C--event common block
- INTEGER MAXNUP
- PARAMETER (MAXNUP=500)
- INTEGER NUP,IDPRUP,IDUP,ISTUP,MOTHUP,ICOLUP
- DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,PUP,VTIMUP,SPINUP
- COMMON/HEPEUP/NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,
- & IDUP(MAXNUP),ISTUP(MAXNUP),MOTHUP(2,MAXNUP),
- & ICOLUP(2,MAXNUP),PUP(5,MAXNUP),VTIMUP(MAXNUP),
- & SPINUP(MAXNUP)
-C--local variables
- INTEGER NCHSRCH,I
- DOUBLE PRECISION CHWSUM,CHWSQ,SPNZRO,SPNHLF,SPNONE,PTOTAL
- DOUBLE PRECISION PPROBS(6,3)
- DATA PPROBS /1.0d0, 1.0d0, 1.0d0, 1.0d0, 1.0d0, 1.0d0,
- & 0.773d0, 0.776d0, 0.761d0, 0.743d0, 0.726d0, 0.711d0,
- & 0.688d0, 0.827d0, 0.909d0, 0.959d0, 0.990d0, 1.011d0/
-
-C--DEV added by nick brett
- INTEGER arg
- INTEGER index
-C--DEV end
-
-C--parameters for the initial maximum weight search
- DATA NCHSRCH /10000/
-C--BW mod 16/08/06: set default values in BLOCK DATA CHDATA,
-C so that they can be reset in main program.
-C--You can still change them here instead if you want.
-C--Beam particles and energies (only proton=2212 and antiproton=-2212)
-C--N.B.for HERWIG these are overidden by the values in the main program
- IDBMUP(1) = 2212
- IDBMUP(2) = 2212
-C-- EBMUP(1) = 7000.0D0
-C-- EBMUP(2) = 7000.0D0
-C-- EBMUP(1) = 5000.0D0
-C-- EBMUP(2) = 5000.0D0
- index=17
- CALL readcharybdisparamdbl(index,EBMUP(1))
- CALL readcharybdisparamdbl(index,EBMUP(2))
-
-
-
-C--Set MPLNCK and define what is meant by it:
-C--MSSDEF=1 means M_GT, MSSDEF=2 means M_DL and MSSDEF=3 means M_D
-C MPLNCK=1000.0D0
-C MSSDEF=2
- index=1
- CALL readcharybdisparamdbl(index,MPLNCK)
- index=13
- CALL readcharybdisparamint(index,MSSDEF)
-C--Set number of dimensions (number of EXTRA dimensions is n=TOTDIM-4)
-C--TOTDIM can be in the range 6-11
-C TOTDIM=6
- index=2
- CALL readcharybdisparamint(index,TOTDIM)
-C--Use Giddings+Thomas momentum scale for calling pdfs?
-C--(See page 12 of hep-ph/0106219)
-C GTSCA=.FALSE.
- index=14
- CALL readcharybdisparamint(index,arg)
- if(arg.EQ.0)then
- GTSCA=.FALSE.
- else
- GTSCA=.TRUE.
- endif
-C--Set mass window for black holes produced
-C MINMSS=5000.0D0
-C MAXMSS=EBMUP(1)+EBMUP(2)
- index=3
- CALL readcharybdisparamdbl(index,MINMSS)
- index=4
- CALL readcharybdisparamdbl(index,MAXMSS)
-C--Set NBODY decay of BH remnant - NBODY can be in range 2-5.
-C NBODY=2
- index=5
- CALL readcharybdisparamint(index,NBODY)
-C--Turn time variation of BH Hawking temperature in decay on or off
-C TIMVAR=.TRUE.
- index=6
- CALL readcharybdisparamint(index,arg)
- if(arg.EQ.0)then
- TIMVAR=.FALSE.
- else
- TIMVAR=.TRUE.
- endif
-C--Set which decay products are to be used:
-C--MSSDEC=1 gives no heavy particles
-C--MSSDEC=2 gives t, W and Z as well
-C--MSSDEC=3 gives t, W, Z and Higgs as well
-C MSSDEC=3
- index=15
- CALL readcharybdisparamint(index,MSSDEC)
-
-C--Turn grey-body factors on/off
-C GRYBDY=.TRUE.
- index=7
- CALL readcharybdisparamint(index,arg)
- if(arg.EQ.0)then
- GRYBDY=.FALSE.
- else
- GRYBDY=.TRUE.
- endif
-C--Turn kinematic cut-off of decay on (rather than M=MPLANCK cut-off)
-C KINCUT=.FALSE.
- index=8
- CALL readcharybdisparamint(index,arg)
- if(arg.EQ.0)then
- KINCUT=.FALSE.
- else
- KINCUT=.TRUE.
- endif
-C--BW mod 16/08/06: new parameters for version 1.003
-C--Use Yoshino-Rychkov factors in cross-section
-C YRCSEC= .FALSE.
- index=9
- CALL readcharybdisparamint(index,arg)
- if(arg.EQ.0)then
- YRCSEC=.FALSE.
- else
- YRCSEC=.TRUE.
- endif
-C--Max Hawking temperature
-C THWMAX =1000.0D0
- index=10
- CALL readcharybdisparamdbl(index,THWMAX)
-C--Remnant decay model: boiling at THWMAX
-C RMBOIL = .FALSE.
- index=11
- CALL readcharybdisparamint(index,arg)
- if(arg.EQ.0)then
- RMBOIL=.FALSE.
- else
- RMBOIL=.TRUE.
- endif
-C--Min BH mass, ends boiling
-C RMMINM = 1000.D0
- index=12
- CALL readcharybdisparamdbl(index,RMMINM)
-C--print out option (0=no printout, 1 =errors only, 2=errors+info)
-C IBHPRN = 1
- index=16
- CALL readcharybdisparamint(index,IBHPRN)
-C--pdf's for the beams (use the generator default)
-C--MUST BE THE SAME FOR BOTH BEAMS
- PDFGUP(1) = -1
- PDFGUP(2) = -1
- PDFSUP(1) = -1
- PDFSUP(2) = -1
-C--------------------------------------------------------------------
-C END OF USER VARIABLES DON'T TOUCH ANYTHING BELOW HERE
-C--------------------------------------------------------------------
-c#if !defined(PYTHIA)
-C--HERWIG beams now passed from main program
-c CALL HWUIDT(3,IDBMUP(1),I,PART1)
-c CALL HWUIDT(3,IDBMUP(2),I,PART2)
-c EBMUP(1)=PBEAM1
-c EBMUP(2)=PBEAM2
-c#endif
-C--end mod
-C--probabilities for particles of different spin
-C--(arbitrary normalisation)
- IF (GRYBDY) THEN
- SPNZRO = PPROBS(TOTDIM-5,1)
- SPNHLF = PPROBS(TOTDIM-5,2)
- SPNONE = PPROBS(TOTDIM-5,3)
- ELSE
- SPNZRO = 1d0
- SPNHLF = 0.750d0
- SPNONE = 1d0
- ENDIF
-C--calculation of probability of emission for different particle types
-C--only light SM particles
- IF (MSSDEC.EQ.1) THEN
- PTOTAL = (78.0d0*SPNHLF)+(18.0d0*SPNONE)
- PQUARK = (60.0d0*SPNHLF)/PTOTAL
- PLEPT = (12.0d0*SPNHLF)/PTOTAL
- PNEUT = (6.0d0*SPNHLF)/PTOTAL
- PGLUON = (16.0d0*SPNONE)/PTOTAL
- PGAMMA = (2.0d0*SPNONE)/PTOTAL
- PWBOSN = 0.0D0
- PZBOSN = 0.0D0
- PHIGGS = 0.0D0
-C--light SM partcles + top W/Z
- ELSEIF (MSSDEC.EQ.2) THEN
- PTOTAL = (3.0d0*SPNZRO)+(90.0d0*SPNHLF)+(24.0d0*SPNONE)
- PQUARK = (72.0d0*SPNHLF)/PTOTAL
- PLEPT = (12.0d0*SPNHLF)/PTOTAL
- PNEUT = (6.0d0*SPNHLF)/PTOTAL
- PGLUON = (16.0d0*SPNONE)/PTOTAL
- PGAMMA = (2.0d0*SPNONE)/PTOTAL
- PZBOSN = (SPNZRO+(2.0d0*SPNONE))/PTOTAL
- PWBOSN = 2.0d0*PZBOSN
- PHIGGS = 0.0D0
-C--light SM particles +top W/Z and Higgs
- ELSE
- PTOTAL = (4.0d0*SPNZRO)+(90.0d0*SPNHLF)+(24.0d0*SPNONE)
- PQUARK = (72.0d0*SPNHLF)/PTOTAL
- PLEPT = (12.0d0*SPNHLF)/PTOTAL
- PNEUT = (6.0d0*SPNHLF)/PTOTAL
- PGLUON = (16.0d0*SPNONE)/PTOTAL
- PGAMMA = (2.0d0*SPNONE)/PTOTAL
- PZBOSN = (SPNZRO+(2.0d0*SPNONE))/PTOTAL
- PWBOSN = 2.0d0*PZBOSN
- PHIGGS = SPNZRO/PTOTAL
- ENDIF
-C--what do do with the weights(here are generating weighted events)
- IDWTUP = 1
-C--only one process
- NPRUP = 1
-C--communication code
- LPRUP(1) = 1
-C--calculate the maximum weight
- CHWSUM = 0.0D0
- CHWSQ = 0.0D0
- XMAXUP(1) = 0.0D0
- DO I=1,NCHSRCH
- CALL CHEVNT(.FALSE.)
- CHWSUM = CHWSUM+XWGTUP
- CHWSQ = CHWSQ+XWGTUP**2
- XMAXUP(1) = MAX(XMAXUP(1),XWGTUP)
- ENDDO
- CHWSUM = CHWSUM/DBLE(NCHSRCH)
- CHWSQ = MAX(CHWSQ/DBLE(NCHSRCH)-CHWSUM**2,0.0D0)
- CHWSQ = SQRT(CHWSQ/ DBLE(NCHSRCH))
-C--cross section
- XSECUP(1) = CHWSUM
-C--error on the cross section
- XERRUP(1) = CHWSQ
-C--output initialisation information
-C--header
- WRITE(*,10)
-C--beam parameters
- WRITE(*,11) IDBMUP(1),EBMUP(1),IDBMUP(2),EBMUP(2)
-C--basic parameters
- WRITE(*,12) MINMSS,MAXMSS,MPLNCK,THWMAX,RMMINM,MSSDEF,TOTDIM,
- & YRCSEC,TIMVAR,GRYBDY,KINCUT,RMBOIL
- IF (RMBOIL) THEN
- IF (KINCUT) THEN
- WRITE (*,8)
- 8 FORMAT(/10X,'KINEMATIC CUT INCONSISTENT'/
- & 10X,'WITH BOILING REMNANT MODEL:'/
- & 10X,'RESETTING KINCUT = .FALSE.'/)
- KINCUT=.FALSE.
- ENDIF
- ELSE
- IF (RMMINM.LT.MPLNCK) THEN
- WRITE (*,9)
- 9 FORMAT(/10X,'BOILING REMNANT MODEL NOT USED:'/
- & 10X,'RESETTING MIN REMNANT MASS = MPLNCK'/)
- RMMINM=MPLNCK
- ENDIF
- ENDIF
-C--choice of outgoing particles
- IF(MSSDEC.EQ.1) THEN
- WRITE(*,13)
- ELSEIF(MSSDEC.EQ.2) THEN
- WRITE(*,14)
- ELSEIF(MSSDEC.EQ.3) THEN
- WRITE(*,15)
- ENDIF
-C--choice of scale
- IF(GTSCA) THEN
- WRITE(*,17)
- ELSE
- WRITE(*,18)
- ENDIF
-C--information on the cross section
- WRITE(*,19) XSECUP(1),XERRUP(1),XMAXUP(1)
-C--particle production probabilites
- WRITE(*,20) PQUARK,PLEPT,PNEUT,PGLUON,PGAMMA,PZBOSN,PWBOSN,PHIGGS
- RETURN
-C--format statements for the output
- 10 FORMAT(//10X,' CHARYBDIS 1.003 August 2006 ',//,
- & 10X,'Please reference: C.M.Harris, P.Richardson &',/,
- & 10X,'B.R.Webber,JHEP0308(2003)033 [hep-ph/0307305]'/)
- 11 FORMAT(/10X,'INPUT CONDITIONS FOR THIS RUN'//
- & 10X,'BEAM 1 (',I8,') ENG. =',F10.2/
- & 10X,'BEAM 2 (',I8,') ENG. =',F10.2/)
- 12 FORMAT(
- & 10X,'MINIMUM BH MASS =',F11.2/
- & 10X,'MAXIMUM BH MASS =',F11.2/
- & 10X,'PLANCK MASS =',F11.2/
- & 10X,'MAX HAWKING TEMP =',F11.2/
- & 10X,'MIN REMNANT MASS =',F11.2/
- & 10X,'DEFN OF PLANCK MASS=',I5/
- & 10X,'NO. OF DIMENSIONS =',I5/
- & 10X,'YOSHINO-RYCHKOV C-S=',L5/
- & 10X,'TIME VARIATION =',L5/
- & 10X,'GREY BODY EFFECTS =',L5/
- & 10X,'KINEMATIC CUT =',L5/
- & 10X,'BOILING REMN. MODEL=',L5)
- 13 FORMAT(
- & 10X,'ONLY LIGHT SM PARTICLES PRODUCED')
- 14 FORMAT(
- & 10X,'ALL SM PARTICLES BUT HIGGS PRODUCED')
- 15 FORMAT(
- & 10X,'ALL SM PARTICLES PRODUCED')
- WRITE(*,16) NBODY
- 16 FORMAT(
- & 10X,'PRODUCING ',I1,' PARTICLES IN REMNANT DECAY')
- 17 FORMAT(
- & 10X,'USING BLACK HOLE RADIUS AS SCALE')
- 18 FORMAT(
- & 10X,'USING BLACK HOLE MASS AS SCALE')
- 19 FORMAT(
- & 10X,'CROSS SECTION (PB) =',G12.4/
- & 10X,'ERROR IN C-S (PB) =',G12.4/
- & 10X,'MAXIMUM WEIGHT =',E12.4)
- 20 FORMAT(/10X,'PARTICLE PRODUCTION PROBABILITIES'//
- & 10X,'QUARK =',F10.4/
- & 10X,'CHARGED LEPTON =',F10.4/
- & 10X,'NEUTRINO =',F10.4/
- & 10X,'GLUON =',F10.4/
- & 10X,'PHOTON =',F10.4/
- & 10X,'Z BOSON =',F10.4/
- & 10X,'W BOSON =',F10.4/
- & 10X,'HIGGS BOSON =',F10.4)
- END
-
-*DECK ID>, CHDATA.
-*CMZ :- -21/08/06 10.33.53 by Peter Richardson
-*-- Author :
-C-----------------------------------------------------------------------
- BLOCK DATA CHDATA
-C-----------------------------------------------------------------------
-C BLOCK DATA TO SET INITIAL VALUES OF PARAMETERS
-C-----------------------------------------------------------------------
- IMPLICIT NONE
-#include "Charybdis_i/charybdis1003.inc"
-C--Les Houches run common block
- INTEGER MAXPUP
- PARAMETER(MAXPUP=100)
- INTEGER IDBMUP,PDFGUP,PDFSUP,IDWTUP,NPRUP,LPRUP
- DOUBLE PRECISION EBMUP,XSECUP,XERRUP,XMAXUP
- COMMON /HEPRUP/ IDBMUP(2),EBMUP(2),PDFGUP(2),PDFSUP(2),
- & IDWTUP,NPRUP,XSECUP(MAXPUP),XERRUP(MAXPUP),
- & XMAXUP(MAXPUP),LPRUP(MAXPUP)
-C--event common block
-C--Set MPLNCK and define what is meant by it:
-C--MSSDEF=1 means M_GT, MSSDEF=2 means M_DL and MSSDEF=3 means M_D
- DATA MPLNCK /1000.0D0/
- DATA MSSDEF /2/
-C--Set number of dimensions (number of EXTRA dimensions is n=TOTDIM-4)
-C--TOTDIM can be in the range 6-11
- DATA TOTDIM/6/
-C--Use Giddings+Thomas momentum scale for calling pdfs?
-C--(See page 12 of hep-ph/0106219)
- DATA GTSCA /.FALSE./
-C--Set mass window for black holes produced
- DATA MINMSS /5000.0D0/
- DATA MAXMSS /14000.0D0/
-C--Set NBODY decay of BH remnant - NBODY can be in range 2-5.
- DATA NBODY /2/
-C--Turn time variation of BH Hawking temperature in decay on or off
- DATA TIMVAR /.TRUE./
-C--Set which decay products are to be used:
-C--MSSDEC=1 gives no heavy particles
-C--MSSDEC=2 gives t, W and Z as well
-C--MSSDEC=3 gives t, W, Z and Higgs as well
- DATA MSSDEC /3/
-C--Turn grey-body factors on/off
- DATA GRYBDY /.TRUE./
-C--Turn kinematic cut-off of decay on (rather than M=MPLANCK cut-off)
- DATA KINCUT /.FALSE./
-C--BW mod 16/08/06: new parameters for version 1.003
-C--Use Yoshino-Rychkov factors in cross-section
- DATA YRCSEC /.FALSE./
-C--Max Hawking temperature
- DATA THWMAX /1000.0D0/
-C--Remnant decay model: boiling at THWMAX
- DATA RMBOIL /.FALSE./
-C--Min BH mass, ends boiling
- DATA RMMINM /1000.D0/
-C--print out option (0=no printout, 1 =errors only, 2=errors+info)
- DATA IBHPRN /1/
-C--pdf's for the beams (use the generator default)
-C--MUST BE THE SAME FOR BOTH BEAMS
- DATA PDFGUP /-1,-1/
- DATA PDFSUP /-1,-1/
-C--Beam particles and energies (only proton and/or antiproton)
- DATA IDBMUP /2212,2212/
- DATA EBMUP /7000.0D0,7000.0D0/
- END
diff --git a/Generators/Charybdis_i/src/usecharybdis.F b/Generators/Charybdis_i/src/usecharybdis.F
deleted file mode 100644
index 53ae3e7bd5e5f8b69cc9657dbbe60d972d64775f..0000000000000000000000000000000000000000
--- a/Generators/Charybdis_i/src/usecharybdis.F
+++ /dev/null
@@ -1,2083 +0,0 @@
-CDECK ID>, USEUSER.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris and Peter Richardson
-C----------------------------------------------------------------------
- SUBROUTINE USECHARYBDIS
-C----------------------------------------------------------------------
-C Les Houches event routine
-C----------------------------------------------------------------------
- IMPLICIT NONE
- CALL CHEVNT(.TRUE.)
- END
-
-CDECK ID>, CHDFIV.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Ian Knowles
-C-----------------------------------------------------------------------
- SUBROUTINE CHDFIV(P0,P1,P2,P3,P4,P5,OKDEC)
-C-----------------------------------------------------------------------
-C Generates 5-body decay 0->1+2+3+4+5 using pure phase space
-C (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRGEN,P0(5),P1(5),P2(5),P3(5),P4(5),P5(5),B,C,
- & AA,BB,CC,DD,EE,FF,TT,S1,RS1,GG,S2,RS2,HH,S3,PP,QQ,RR,SS,P1CM,
- & P2345(5),P2CM,P345(5),P3CM,P45(5),P4CM
- DOUBLE PRECISION TWO
- INTEGER MTRY,NTRY
- PARAMETER (MTRY=1000000)
- PARAMETER (TWO=2.D0)
- EXTERNAL CHRGEN
- LOGICAL OKDEC
- OKDEC=.FALSE.
- B=P0(5)-P1(5)
- C=P2(5)+P3(5)+P4(5)+P5(5)
- IF (B.LT.C) RETURN
- AA=(P0(5)+P1(5))**2
- BB=B**2
- CC=C**2
- DD=(P3(5)+P4(5)+P5(5))**2
- EE=(P4(5)+P5(5))**2
- FF=(P4(5)-P5(5))**2
- TT=(B-C)*P0(5)**11/729
- NTRY=0
-C Select squared masses S1, S2 and S3 of 2345, 345 and 45 subsystems
- 10 S1=BB+CHRGEN(1)*(CC-BB)
- NTRY=NTRY+1
- IF (NTRY.GT.MTRY) RETURN
- RS1=SQRT(S1)
- GG=(RS1-P2(5))**2
- S2=DD+CHRGEN(2)*(GG-DD)
- RS2=SQRT(S2)
- HH=(RS2-P3(5))**2
- S3=EE+CHRGEN(3)*(HH-EE)
- PP=(AA-S1)*(BB-S1)
- QQ=((RS1+P2(5))**2-S2)*(GG-S2)/S1
- RR=((RS2+P3(5))**2-S3)*(HH-S3)/S2
- SS=(S3-EE)*(S3-FF)/S3
- IF (PP*QQ*RR*SS*((GG-DD)*(HH-EE))**2.LT.TT*S1*S2*S3*CHRGEN(4)**2)
- & GOTO 10
-C Do two body decays: 0-->1+2345, 2345-->2+345, 345-->3+45 and 45-->4+5
- P1CM=SQRT(PP/4)/P0(5)
- P2345(5)=RS1
- P2CM=SQRT(QQ/4)
- P345(5)=RS2
- P3CM=SQRT(RR/4)
- P45(5)=SQRT(S3)
- P4CM=SQRT(SS/4)
- CALL CHDTWO(P0 ,P1,P2345,P1CM,TWO,.TRUE.)
- CALL CHDTWO(P2345,P2,P345 ,P2CM,TWO,.TRUE.)
- CALL CHDTWO(P345 ,P3,P45 ,P3CM,TWO,.TRUE.)
- CALL CHDTWO(P45 ,P4,P5 ,P4CM,TWO,.TRUE.)
- OKDEC=.TRUE.
- END
-CDECK ID>, CHDFOR.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Ian Knowles
-C-----------------------------------------------------------------------
- SUBROUTINE CHDFOR(P0,P1,P2,P3,P4,OKDEC)
-C-----------------------------------------------------------------------
-C Generates 4-body decay 0->1+2+3+4 using pure phase space
-C (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRGEN,P0(5),P1(5),P2(5),P3(5),P4(5),B,C,AA,BB,
- & CC,DD,EE,TT,S1,RS1,FF,S2,PP,QQ,RR,P1CM,P234(5),P2CM,P34(5),P3CM
- DOUBLE PRECISION TWO
- INTEGER MTRY,NTRY
- PARAMETER (MTRY=1000000)
- PARAMETER (TWO=2.D0)
- EXTERNAL CHRGEN
- LOGICAL OKDEC
- OKDEC=.FALSE.
- B=P0(5)-P1(5)
- C=P2(5)+P3(5)+P4(5)
- IF (B.LT.C) RETURN
- AA=(P0(5)+P1(5))**2
- BB=B**2
- CC=C**2
- DD=(P3(5)+P4(5))**2
- EE=(P3(5)-P4(5))**2
- TT=(B-C)*P0(5)**7/16
- NTRY=0
-C Select squared masses S1 and S2 of 234 and 34 subsystems
- 10 S1=BB+CHRGEN(1)*(CC-BB)
- NTRY=NTRY+1
- IF (NTRY.GT.MTRY) RETURN
- RS1=SQRT(S1)
- FF=(RS1-P2(5))**2
- S2=DD+CHRGEN(2)*(FF-DD)
- PP=(AA-S1)*(BB-S1)
- QQ=((RS1+P2(5))**2-S2)*(FF-S2)/S1
- RR=(S2-DD)*(S2-EE)/S2
- IF (PP*QQ*RR*(FF-DD)**2.LT.TT*S1*S2*CHRGEN(3)**2) GOTO 10
-C Do two body decays: 0-->1+234, 234-->2+34 and 34-->3+4
- P1CM=SQRT(PP/4)/P0(5)
- P234(5)=RS1
- P2CM=SQRT(QQ/4)
- P34(5)=SQRT(S2)
- P3CM=SQRT(RR/4)
- CALL CHDTWO(P0 ,P1,P234,P1CM,TWO,.TRUE.)
- CALL CHDTWO(P234,P2,P34 ,P2CM,TWO,.TRUE.)
- CALL CHDTWO(P34 ,P3,P4 ,P3CM,TWO,.TRUE.)
- OKDEC=.TRUE.
- END
-CDECK ID>, CHDTHR.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHDTHR(P0,P1,P2,P3,OKDEC)
-C-----------------------------------------------------------------------
-C GENERATES THREE-BODY DECAY 0->1+2+3 DISTRIBUTED
-C ACCORDING TO PHASE SPACE * WEIGHT
-C (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRGEN,CHRUNI,A,B,C,D,AA,BB,CC,DD,EE,FF,PP,QQ,WW,
- & RR,PCM1,PC23,P0(5),P1(5),P2(5),P3(5),P23(5),TWO,ONE
- EXTERNAL CHRGEN,CHRUNI
- PARAMETER (ONE=1.0D0,TWO=2.D0)
- INTEGER MTRY,NTRY
- PARAMETER (MTRY=1000000)
- LOGICAL OKDEC
- OKDEC=.FALSE.
- A=P0(5)+P1(5)
- B=P0(5)-P1(5)
- C=P2(5)+P3(5)
- IF (B.LT.C) RETURN
- D=ABS(P2(5)-P3(5))
- AA=A*A
- BB=B*B
- CC=C*C
- DD=D*D
- EE=(B-C)*(A-D)
- A=0.5D0*(AA+BB)
- B=0.5D0*(CC+DD)
- C=4.0D0/(A-B)**2
- NTRY=0
-C
-C CHOOSE MASS OF SUBSYSTEM 23 WITH PRESCRIBED DISTRIBUTION
-C
- 10 FF=CHRUNI(0,BB,CC)
- NTRY=NTRY+1
- IF (NTRY.GT.MTRY) RETURN
- PP=(AA-FF)*(BB-FF)
- QQ=(CC-FF)*(DD-FF)
- WW=ONE
- RR=EE*FF*CHRGEN(0)
- IF (PP*QQ*WW.LT.RR*RR) GOTO 10
-C
-C FF IS MASS SQUARED OF SUBSYSTEM 23.
-C
-C DO 2-BODY DECAYS 0->1+23, 23->2+3
-C
- P23(5)=SQRT(FF)
- PCM1=SQRT(PP)*0.5D0/P0(5)
- PC23=SQRT(QQ)*0.5D0/P23(5)
- CALL CHDTWO(P0,P1,P23,PCM1,TWO,.TRUE.)
- CALL CHDTWO(P23,P2,P3,PC23,TWO,.TRUE.)
- OKDEC=.TRUE.
- END
-CDECK ID>, CHDTWO.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber & Mike Seymour
-C-----------------------------------------------------------------------
- SUBROUTINE CHDTWO(P0,P1,P2,PCM,COSTH,ZAXIS)
-C-----------------------------------------------------------------------
-C GENERATES DECAY 0 -> 1+2
-C
-C PCM IS CM MOMENTUM
-C
-C COSTH = COS THETA IN P0 REST FRAME (>1 FOR ISOTROPIC)
-C IF ZAXIS=.TRUE., COS THETA IS MEASURED FROM THE ZAXIS
-C IF .FALSE., IT IS MEASURED FROM P0'S DIRECTION
-C (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRUNI,ONE,ZERO,PCM,COSTH,C,S,P0(5),P1(5),P2(5),
- & PP(5),R(9)
- LOGICAL ZAXIS
- EXTERNAL CHRUNI
- PARAMETER (ZERO=0.D0, ONE=1.D0)
-C--CHOOSE C.M. ANGLES
- C=COSTH
- IF (C.GT.ONE) C=CHRUNI(0,-ONE,ONE)
- S=SQRT(ONE-C*C)
- CALL CHRAZM(PCM*S,PP(1),PP(2))
-C--PP IS MOMENTUM OF 2 IN C.M.
- PP(3)=-PCM*C
- PP(4)=SQRT(P2(5)**2+PCM**2)
- PP(5)=P2(5)
-C--ROTATE IF NECESSARY
- IF (COSTH.LE.ONE.AND..NOT.ZAXIS) THEN
- CALL CHUROT(P0,ONE,ZERO,R)
- CALL CHUROB(R,PP,PP)
- ENDIF
-C--BOOST FROM C.M. TO LAB FRAME
- CALL CHULOB(P0,PP,P2)
- CALL CHVDIF(4,P0,P2,P1)
- END
-CDECK ID>, CHEVNT.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris
-C----------------------------------------------------------------------
- SUBROUTINE CHEVNT(GENEVT)
-C----------------------------------------------------------------------
-C Black Hole Production and Decay
-C----------------------------------------------------------------------
- IMPLICIT NONE
-c INCLUDE 'charybdis1003.inc'
-#include "Charybdis_i/charybdis1003.inc"
-C--Les Houches run common block
-#include "GeneratorFortranCommon/heprup.inc"
-#include "GeneratorFortranCommon/hepeup.inc"
-C--Local Variables
- DOUBLE PRECISION ECMS,ONE,TWO,PIFAC,THREE,ZERO,
- & CHRGEN,RPOW,A0,A1,EMJ,FACT,QSQ,HCS,PROB,
- & FACTR,RCS,BHPOW,DISF1,DISF2,OMEGAD,DL2GT,PSTEST,
- & RHORSQ,PLPOW,MPFACT,PA(5),PB(5),PC(5),PCM,CHUPCM,PCMF(5),
- & XXMIN,XLMIN,EMSCA,XX(2),DISF(13,2),GEV2PB,CHFMAS,YRF(7)
- INTEGER STAT,IBARYN,IQRK(MAXPUP),IGLU(MAXPUP),IQBR(MAXPUP),MTRY,
- & NQRK,NGLU,NQBR,JQRK,JGLU,JQBR,J,ISTART,CHST,iline,FSTAT(5),
- & IP,IQ,PT,I,BHCHRG,IDN(2),NTRY,NHTRY,SAVCHR,SAVBRN,ID(5),
- & MHTRY,LTRY,LHTRY,CHFCHG,SPIN,FSPIN(5)
- LOGICAL GENEVT,CHRLOG,FIRST,OKDEC
- EXTERNAL CHFMAS,CHRGEN,CHUPCM,CHRLOG,CHFCHG
- PARAMETER(ONE=1.0D0,TWO=2.0D0,THREE=3.0D0,ZERO=0.0D0,NHTRY=200)
- PARAMETER(MHTRY=20,LHTRY=200,GEV2PB=389379.D3)
- SAVE HCS,BHPOW,PLPOW,RPOW,A0,A1,FACT,MPFACT
- DATA FIRST/.TRUE./
-C--BW mod 16/08/06: Yoshino-Rychkov factors for cross section,
-C from Phys.Rev.D71:104028,2005 [hep-th/0503171]
- DATA YRF/1.54,2.15,2.52,2.77,2.95,3.09,3.20/
-C--end mod
- PIFAC = ACOS(-ONE)
- IF(FIRST) THEN
-C--Convert MPLNCK to M_GT if above value is M_DL
- IF (MSSDEF.EQ.2) THEN
- DL2GT=(TWO**(TOTDIM-6)*PIFAC**(TOTDIM-5))**(1/(TOTDIM-TWO))
- INTMPL=DL2GT*MPLNCK
-C--Convert MPLNCK to M_GT if above value is M_D
- ELSEIF (MSSDEF.EQ.3) THEN
- INTMPL=MPLNCK*TWO**(1/(TOTDIM-TWO))
- ELSE
- INTMPL=MPLNCK
- ENDIF
-C--Calculate other parameters
- PLPOW=TWO/(TOTDIM-THREE)
- BHPOW=PLPOW-7.0D0
- RPOW=1/BHPOW
- A0=MINMSS**BHPOW
- A1=(MAXMSS**BHPOW-A0)
- IF (TOTDIM.EQ.11) THEN
- OMEGAD=(PIFAC**5)/12
- ELSEIF (TOTDIM.EQ.10) THEN
- OMEGAD=(32*PIFAC**4)/105
- ELSEIF (TOTDIM.EQ.9) THEN
- OMEGAD=(PIFAC**4)/3
- ELSEIF (TOTDIM.EQ.8) THEN
- OMEGAD=(16*PIFAC**3)/15
- ELSEIF (TOTDIM.EQ.7) THEN
- OMEGAD=PIFAC**3
- ELSEIF(TOTDIM.EQ.6) THEN
- OMEGAD=(8*PIFAC**2)/3
- ENDIF
- MPFACT=INTMPL**(TOTDIM-2)
- RHFACT=(4*(2*PIFAC)**(TOTDIM-4))/((TOTDIM-2)*OMEGAD*MPFACT)
- FIRST = .FALSE.
- ENDIF
-C--Select a mass for the produced black hole
- ECMS = 2.0D0*SQRT(EBMUP(1)*EBMUP(2))
- EMSCA=(A0+A1*CHRGEN(1))**RPOW
- BHMASS=EMSCA
- QSQ=EMSCA**2
- EMJ=EMSCA**(1-BHPOW)/BHPOW*A1
-C--Calculate (r_h)**2 and initial T_H
- RHORSQ=(RHFACT*EMSCA)**PLPOW
-C--Select initial momentum fractions
- XXMIN=QSQ/ECMS**2
- XLMIN=LOG(XXMIN)
- FACT=-GEV2PB*PIFAC*RHORSQ*EMJ*XLMIN*TWO/EMSCA
-C--BW mod 16/08/06: include Yoshino-Rychkov factor
- IF (YRCSEC) FACT=FACT*YRF(TOTDIM-4)
-C--end mod
-C--Change momentum scale for calling pdfs (see comment above)
- IF (GTSCA) EMSCA=1/SQRT(RHORSQ)
- SCALUP = EMSCA
- CALL CHPDF(XXMIN,XLMIN,EMSCA,XX,DISF)
- HCS=ZERO
- DISF1=ZERO
- DISF2=ZERO
- DO 30 IP=1,13
- DISF1=DISF1+DISF(IP,1)
- 30 DISF2=DISF2+DISF(IP,2)
- FACTR=FACT*DISF1*DISF2
- HCS=FACTR
- XWGTUP = HCS
- IF(.NOT.GENEVT) RETURN
- RCS=HCS*CHRGEN(0)
- HCS = 0.0D0
- DO 20 IP=1,13
- DO 10 IQ=1,13
- FACTR=FACT*DISF(IP,1)*DISF(IQ,2)
- HCS=HCS+FACTR
- IF (HCS.GT.RCS) GOTO 99
- 10 CONTINUE
- 20 CONTINUE
-C--Generate event
- 99 IDN(1)=IP
- IDN(2)=IQ
-C--put the incoming particles in the Les Houches common block
- NUP = 2
- DO I=1,2
- IF(IDN(I).GT.6.AND.IDN(I).LE.12) THEN
- IDN(I) = -MOD(IDN(I)-1,6)-1
- ELSEIF(IDN(I).EQ.13) THEN
- IDN(I) = 21
- ENDIF
- IDUP(I) = IDN(I)
- PUP(1,I) = 0.0D0
- PUP(2,I) = 0.0D0
- PUP(3,I) = XX(I)*EBMUP(I)
- PUP(4,I) = XX(I)*EBMUP(I)
- ISTUP(I) = -1
- ENDDO
- PUP(3,2) = -PUP(3,2)
- CALL CHVSUM(4,PUP(1,1),PUP(1,2),PCMF)
- CALL CHUMAS(PCMF)
-C--Calculate BH charge (actually 3*charge)
- BHCHRG=CHFCHG(IDN(1))+CHFCHG(IDN(2))
-C--Black Hole decay
- MTRY = 0
- CHST = BHCHRG
- 35 MTRY = MTRY+1
- BHCHRG = CHST
- NUP = 2
- CALL CHVEQU(5,PCMF,PA)
- 40 NUP = NUP+1
-C--BW mod 16/08/06: allow BH mass down to RMMINM
-C--Check that BH mass > RMMINM if not using KINCUT
- IF ((.NOT.KINCUT).AND.(PA(5).LT.RMMINM)) GOTO 55
-C--end mod
-C--Set BHMASS to correct value (necessary in time varying case)
- IF (TIMVAR) BHMASS=PA(5)
-C--Select the decay product
- LTRY=0
- 45 IF (MSSDEC.EQ.1) THEN
- CALL CHHBH1(PT,STAT,SPIN,BHCHRG)
- ELSEIF (MSSDEC.EQ.2) THEN
- CALL CHHBH2(PT,STAT,SPIN,BHCHRG)
- ELSE
- CALL CHHBH3(PT,STAT,SPIN,BHCHRG)
- ENDIF
-C--Obtain energy of emitted parton
- CALL CHUBHS(PC(4),STAT,SPIN)
- PC(5)=CHFMAS(PT)
-C--Check energy > mass for selected parton
- IF (PC(4).LT.PC(5)) THEN
- BHCHRG=BHCHRG+CHFCHG(PT)
- IF(IBHPRN.EQ.2) WRITE (*,*) 'Not enough energy'
- GOTO 45
- ENDIF
-C--Check that emission is kinematically allowed
- IF (PC(4).GT.(PA(5)**2+PC(5)**2)/(TWO*PA(5))) THEN
- IF (KINCUT.OR.LTRY.GT.LHTRY) THEN
- GOTO 50
- ELSE
- LTRY=LTRY+1
- BHCHRG=BHCHRG+CHFCHG(PT)
- GOTO 45
- ENDIF
- ENDIF
-C--Use 2-body phase space decay
- PB(5)=SQRT(PA(5)**2+PC(5)**2-TWO*PA(5)*PC(4))
-C--Calculate centre of mass momentum for decay
- PCM=SQRT(PC(4)**2-PC(5)**2)
-C--PA is BH 5-momentum before, PB after decay
- CALL CHDTWO(PA,PB,PC,PCM,TWO,.TRUE.)
-C--Add emitted particle to event record
- CALL CHVEQU(5,PC,PUP(1,NUP))
- IDUP(NUP)=PT
- ISTUP(NUP) = 1
- MOTHUP(1,NUP) = 1
- MOTHUP(2,NUP) = 2
-C--Change BH 5-momentum back to PA
- CALL CHVEQU(5,PB,PA)
- GOTO 40
- 50 BHCHRG=BHCHRG+CHFCHG(PT)
- 55 NUP = NUP-1
-C--Calculate the baryon number violation
-C--Find the baryon number of the inital state
- IBARYN = 0
- DO I=1,2
- IF(ABS(IDUP(I)).LE.6) IBARYN = IBARYN-SIGN(1,IDUP(I))
- ENDDO
-C--and the final state
- DO I=3,NUP
- IF(ABS(IDUP(I)).LE.6) IBARYN = IBARYN+SIGN(1,IDUP(I))
- ENDDO
-C--Try to balance this out
- NTRY = 0
- SAVCHR = BHCHRG
- SAVBRN = IBARYN
- 60 NTRY = NTRY+1
- PCM = PA(5)
- DO I=1,NBODY
- IF (MSSDEC.EQ.1) THEN
- CALL CHHBH1(ID(I),FSTAT(I),FSPIN(I),BHCHRG)
- ELSEIF (MSSDEC.EQ.2) THEN
- CALL CHHBH2(ID(I),FSTAT(I),FSPIN(I),BHCHRG)
- ELSE
- CALL CHHBH3(ID(I),FSTAT(I),FSPIN(I),BHCHRG)
- ENDIF
- IF(ABS(ID(I)).LE.6) THEN
- IBARYN = IBARYN+SIGN(1,ID(I))
- ENDIF
- PCM = PCM-CHFMAS(ID(I))
- ENDDO
- IF(((IBARYN.NE.0.OR.BHCHRG.NE.0).OR.
- & PCM.LT.0.0D0).AND.NTRY.LE.NHTRY) THEN
- BHCHRG = SAVCHR
- IBARYN = SAVBRN
- GOTO 60
- ENDIF
-C--Go back if needed
- IF(NTRY.GT.NHTRY) THEN
- IF(MTRY.LE.MHTRY) THEN
- IF(IBHPRN.EQ.2) THEN
- WRITE (*,*) 'Attempt',MTRY,' failed.'
- WRITE (*,*) 'Starting whole decay again'
- ENDIF
- GOTO 35
- ELSE
- IF(IBHPRN.GT.1)
- & PRINT *,'WARNING TOO MANY TRIES NEEDED'
- XWGTUP = 0.0D0
- RETURN
- ENDIF
- ENDIF
-C--Perform the NBODY decay of the remnant
-C--BW mod 18/08/06: check if there is phase space
- PSTEST=PA(5)
- DO I=1,NBODY
- PUP(5,NUP+I) = CHFMAS(ID(I))
- PSTEST=PSTEST-PUP(5,NUP+I)
- ISTUP(NUP+I) = 1
- IDUP(NUP+I) = ID(I)
- MOTHUP(1,NUP+I) = 1
- MOTHUP(2,NUP+I) = 2
- ENDDO
-C--check if decay is allowed
- IF (PSTEST.LE.0D0) GOTO 100
- OKDEC=.TRUE.
-C--end mod
- IF (NBODY.EQ.2) THEN
- PCM = CHUPCM(PA(5),PUP(5,NUP+1),PUP(5,NUP+2))
- CALL CHDTWO(PA,PUP(1,NUP+1),PUP(1,NUP+2),PCM,TWO,.TRUE.)
- ELSEIF (NBODY.EQ.3) THEN
- CALL CHDTHR(PA,PUP(1,NUP+1),PUP(1,NUP+2),PUP(1,NUP+3),OKDEC)
- ELSEIF (NBODY.EQ.4) THEN
- CALL CHDFOR(PA,PUP(1,NUP+1),PUP(1,NUP+2),PUP(1,NUP+3),
- & PUP(1,NUP+4),OKDEC)
- ELSEIF (NBODY.EQ.5) THEN
- CALL CHDFIV(PA,PUP(1,NUP+1),PUP(1,NUP+2),PUP(1,NUP+3),
- & PUP(1,NUP+4),PUP(1,NUP+5),OKDEC)
- ENDIF
- IF (OKDEC) GOTO 110
- 100 IF(IBHPRN.GE.1)
- & PRINT *,'FAILED',NBODY,'-BODY REMNANT DECAY: M,Q=',
- & PA(5),PSTEST
- GOTO 35
- 110 NUP = NUP+NBODY
-C--Now sort out the colour connections
-C--First the initial state
- NQRK = 0
- NGLU = 0
- NQBR = 0
- DO I=1,2
- IF(IDUP(I).GT.0.AND.IDUP(I).LE.6) THEN
- NQBR = NQBR+1
- IQBR(NQBR) = I
- ELSEIF(IDUP(I).LT.0.AND.IDUP(I).GE.-6) THEN
- NQRK = NQRK+1
- IQRK(NQRK) = I
- ELSEIF(IDUP(I).EQ.21) THEN
- NGLU = NGLU+1
- IGLU(NGLU) = I
- ENDIF
- ENDDO
-C--Then the final state
- DO I=3,NUP
- IF(IDUP(I).GT.0.AND.IDUP(I).LE.6) THEN
- NQRK = NQRK+1
- IQRK(NQRK) = I
- ELSEIF(IDUP(I).LT.0.AND.IDUP(I).GE.-6) THEN
- NQBR = NQBR+1
- IQBR(NQBR) = I
- ELSEIF(IDUP(I).EQ.21) THEN
- NGLU = NGLU+1
- IGLU(NGLU) = I
- ENDIF
- ENDDO
-C--zero the colour connections
- DO I=1,NUP
- DO J=1,2
- ICOLUP(J,I) = 0
- ENDDO
- ENDDO
-C--Now make the colour connections
- JGLU = 0
- JQBR = 0
- JQRK = 0
- IF(NQRK.GT.0) THEN
- I = IQRK(1)
- JQRK = 1
- J = 1
- ELSEIF(NGLU.GT.0) THEN
- I = IGLU(1)
- JGLU = 1
- J = 2
- ELSE
- GOTO 200
- ENDIF
- ISTART = I
- ILINE = 500
-C--Find an antiquark or gluon to pair this with
- 150 IF(J.EQ.1.OR.J.EQ.2) THEN
- IF(JQBR.EQ.NQBR.and.JGLU.EQ.NGLU) THEN
- GOTO 250
- ELSE
- PROB = DBLE(NQBR-JQBR)/DBLE(NQBR+NGLU-JQBR-JGLU)
-C--Pair with an antiquark
- IF(CHRLOG(PROB)) THEN
- IF(JQBR.NE.NQBR) THEN
- IF(NGLU.NE.JGLU.and.NQBR-JQBR.EQ.1) GOTO 150
- JQBR = JQBR+1
- IF(I.LE.2) THEN
- ICOLUP(2,I ) = ILINE
- ELSE
- ICOLUP(1,I ) = ILINE
- ENDIF
- IF(IQBR(JQBR).LE.2) THEN
- ICOLUP(1,IQBR(JQBR)) = ILINE
- ELSE
- ICOLUP(2,IQBR(JQBR)) = ILINE
- ENDIF
- ILINE = ILINE+1
- I = IQBR(JQBR)
- J = 3
- GOTO 150
- ELSE
- GOTO 250
- ENDIF
-C--Pair with a gluon
- ELSE
- IF(JGLU.NE.NGLU) THEN
- JGLU = JGLU+1
- IF(I.LE.2) THEN
- ICOLUP(2,I ) = ILINE
- ELSE
- ICOLUP(1,I ) = ILINE
- ENDIF
- IF(IGLU(JGLU).LE.2) THEN
- ICOLUP(1,IGLU(JGLU)) = ILINE
- ELSE
- ICOLUP(2,IGLU(JGLU)) = ILINE
- ENDIF
- ILINE = ILINE+1
- I = IGLU(JGLU)
- J = 2
- GOTO 150
- ELSE
- GOTO 250
- ENDIF
- ENDIF
- ENDIF
-C--Find a quark to pair this with
- ELSEIF(J.EQ.3) THEN
- IF(JQRK.NE.NQRK) THEN
- JQRK = JQRK+1
- IF(I.LE.2) THEN
- ICOLUP(2,I ) = ILINE
- ELSE
- ICOLUP(1,I ) = ILINE
- ENDIF
- IF(IQRK(JQRK).LE.2) THEN
- ICOLUP(1,IQRK(JQRK)) = ILINE
- ELSE
- ICOLUP(2,IQRK(JQRK)) = ILINE
- ENDIF
- ILINE = ILINE+1
- I = IQRK(JQRK)
- J = 1
- GOTO 150
- ELSE
- GOTO 250
- ENDIF
- ENDIF
- 250 IF(I.LE.2) THEN
- ICOLUP(2,I) = ILINE
- ELSE
- ICOLUP(1,I) = ILINE
- ENDIF
- IF(ISTART.LE.2) THEN
- ICOLUP(1,ISTART) = ILINE
- ELSE
- ICOLUP(2,ISTART) = ILINE
- ENDIF
-C--zero the flavours
- 200 DO I=1,NUP
- IF(IDUP(I).GT.0.AND.IDUP(I).LE.6) THEN
- ICOLUP(2,I) = 0
- ELSEIF(IDUP(I).GE.-6.AND.IDUP(I).lt.0) THEN
- ICOLUP(1,I) = 0
- ELSEIF(IDUP(I).NE.21) THEN
- ICOLUP(1,I) = 0
- ICOLUP(2,I) = 0
- ENDIF
- ENDDO
- END
-CDECK ID>, CHFCHG.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Peter Richardson
-C----------------------------------------------------------------------
- FUNCTION CHFCHG(ID)
-C----------------------------------------------------------------------
-C Function to return the charge of a SM particle input is PDG code
-C----------------------------------------------------------------------
- IMPLICIT NONE
- INTEGER CHFCHG,ID
- IF(ABS(ID).LE.6) THEN
- IF(MOD(ID,2).EQ.0) THEN
- CHFCHG = 2
- ELSE
- CHFCHG = -1
- ENDIF
- ELSEIF(ABS(ID).GE.11.AND.ABS(ID).LE.16) THEN
- IF(MOD(ID,2).EQ.0) THEN
- CHFCHG = 0
- ELSE
- CHFCHG = -3
- ENDIF
- ELSEIF((ID.GE.21.AND.ID.LE.23).OR.ID.EQ.25) THEN
- CHFCHG = 0
- ELSEIF(ABS(ID).EQ.24) THEN
- CHFCHG = 3
- ELSE
- print *,'CHFCHG WARNING UNKNOWN PARTICLE',ID
- STOP
- ENDIF
- IF(ID.LT.0) CHFCHG = -CHFCHG
- END
-CDECK ID>, CHFMAS.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Peter Richardson
-C----------------------------------------------------------------------
- FUNCTION CHFMAS(ID)
-C----------------------------------------------------------------------
-C Function to return the mass of a SM particle input is PDG code
-C This is generator dependent
-C----------------------------------------------------------------------
-C--get the masses from the HERWIG common block
-#include "HERWIG65.INC"
- INTEGER ID
- DOUBLE PRECISION CHFMAS
- IF(ABS(ID).LE.6) THEN
- CHFMAS = RMASS(ABS(ID))
- ELSEIF(ABS(ID).GE.11.AND.ABS(ID).LE.16) THEN
- CHFMAS = RMASS(110+ABS(ID))
- ELSEIF(ID.EQ.21) THEN
- CHFMAS = RMASS(13)
- ELSEIF(ID.EQ.22) THEN
- CHFMAS = 0.0D0
- ELSEIF(ID.EQ.23) THEN
- CHFMAS = RMASS(200)
- ELSEIF(ABS(ID).EQ.24) THEN
- CHFMAS = RMASS(198)
- ELSEIF(ID.EQ.25) THEN
- CHFMAS = RMASS(201)
- ELSE
- PRINT *,'CHFMAS WARNING UNKNOWN PARTICLE',ID
- STOP
- ENDIF
- END
-CDECK ID>, CHHBH1.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris
-C---------------------------------------------------------------------
- SUBROUTINE CHHBH1(PT,STAT,SPIN,BHCHRG)
-C---------------------------------------------------------------------
-C Subroutine to select the type of the next particle
-C---------------------------------------------------------------------
- IMPLICIT NONE
-#include "Charybdis_i/charybdis1003.inc"
- INTEGER PT,STAT,SPIN,BHCHRG,CHFCHG,I
- DOUBLE PRECISION PTYPE,CHRGEN,EPS
- LOGICAL FIRST
- DATA FIRST/.TRUE./
- EXTERNAL CHRGEN,CHFCHG
- PARAMETER(EPS=1.0D-6)
-C--initialisation on first call
- IF(FIRST) THEN
- PFERM (1) = PQUARK
- PFERM (2) = PFERM(1)+PLEPT
- PFERM (3) = PFERM(2)+PNEUT
- PBOSON(1) = PFERM(3)+PGLUON
- PBOSON(2) = PBOSON(1)+PGAMMA
-C--check the sum
- IF(ABS(PBOSON(2)-1.0D0).GT.EPS) THEN
- IF(IBHPRN.GE.1) THEN
- print *,'WARNING PROBABILITIES DO NOT SUM TO ONE'
- print *,'RENORMALISING'
- ENDIF
- DO I=1,3
- PFERM(I) = PFERM(I)/PBOSON(2)
- ENDDO
- PBOSON(1) = PBOSON(1)/PBOSON(2)
- PQUARK = PQUARK/PBOSON(2)
- PLEPT = PLEPT /PBOSON(2)
- PNEUT = PNEUT /PBOSON(2)
- PGLUON = PGLUON/PBOSON(2)
- PGAMMA = PGAMMA/PBOSON(2)
- PBOSON(2) = 1.0D0
- ENDIF
- FIRST = .FALSE.
- ENDIF
-C--Assume decay product is a fermion
- STAT=-1
- SPIN=1
-C--Choose decay product
- PTYPE=CHRGEN(2)
-C--Change STAT to 1 and SPIN to 2 if we have a boson instead
- IF (PTYPE.GE.PFERM(3)) THEN
- STAT=1
- SPIN=2
- ENDIF
-C--Choose particle type
- IF (PTYPE.LT.PFERM(1)) THEN
-C--Quarks
- PT=1+INT(5*PTYPE/PFERM(1))
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PFERM(2)) THEN
-C--Leptons
- PT=11+2*INT(3*(PTYPE-PFERM(1))/PLEPT)
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PFERM(3)) THEN
-C--Neutrinos
- PT=12+2*INT(3*(PTYPE-PFERM(2))/PNEUT)
- IF(CHRGEN(4).LT.0.5D0) PT = -PT
- ELSEIF (PTYPE.LT.PBOSON(1)) THEN
-C--Gluons
- PT=21
- ELSE
-C--Photons
- PT=22
- ENDIF
-C--Calculate new charge of BH
- BHCHRG=BHCHRG-CHFCHG(PT)
- END
-CDECK ID>, CHHBH2.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris
-C---------------------------------------------------------------------
- SUBROUTINE CHHBH2(PT,STAT,SPIN,BHCHRG)
-C---------------------------------------------------------------------
-C Subroutine to select the type of the next particle
-C---------------------------------------------------------------------
- IMPLICIT NONE
-#include "Charybdis_i/charybdis1003.inc"
- INTEGER PT,STAT,SPIN,BHCHRG,CHFCHG,I
- DOUBLE PRECISION PTYPE,CHRGEN,EPS
- LOGICAL FIRST
- DATA FIRST/.TRUE./
- EXTERNAL CHRGEN,CHFCHG
- PARAMETER(EPS=1.0D-6)
-C--initialisation on first call
- IF(FIRST) THEN
- PFERM (1) = PQUARK
- PFERM (2) = PFERM(1)+PLEPT
- PFERM (3) = PFERM(2)+PNEUT
- PBOSON(1) = PFERM(3)+PGLUON
- PBOSON(2) = PBOSON(1)+PWBOSN
- PBOSON(3) = PBOSON(2)+PZBOSN
- PBOSON(4) = PBOSON(3)+PGAMMA
-C--check the sum
- IF(ABS(PBOSON(4)-1.0D0).GT.EPS) THEN
- IF(IBHPRN.GE.1) THEN
- print *,'WARNING PROBABILITIES DO NOT SUM TO ONE'
- print *,'RENORMALISING'
- ENDIF
- DO I=1,3
- PFERM(I) = PFERM(I)/PBOSON(4)
- PBOSON(I) = PBOSON(I)/PBOSON(4)
- ENDDO
- PQUARK = PQUARK/PBOSON(4)
- PLEPT = PLEPT /PBOSON(4)
- PNEUT = PNEUT /PBOSON(4)
- PGLUON = PGLUON/PBOSON(4)
- PGAMMA = PGAMMA/PBOSON(4)
- PZBOSN = PZBOSN/PBOSON(4)
- PWBOSN = PWBOSN/PBOSON(4)
- PBOSON(4) = 1.0D0
- ENDIF
- FIRST = .FALSE.
- ENDIF
-C--Assume decay product is a fermion
- STAT=-1
- SPIN=1
-C--Choose decay product
- PTYPE=CHRGEN(2)
-C--Change STAT to 1 and SPIN to 2 if we have a boson instead
-C--except for one degree of freedom of massive gauge bosons
- IF (PTYPE.GE.PFERM(3)) THEN
- STAT=1
- SPIN=2
- IF ((PTYPE.GE.PBOSON(1)).AND.(PTYPE.LT.PBOSON(3))) THEN
- IF (3*CHRGEN(3).LT.1.0d0) SPIN=0
- ENDIF
- ENDIF
-C--Choose particle type
- IF (PTYPE.LT.PFERM(1)) THEN
-C--Quarks
- PT=1+INT(6*PTYPE/PFERM(1))
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PFERM(2)) THEN
-C--Leptons
- PT=11+2*INT(3*(PTYPE-PFERM(1))/PLEPT)
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PFERM(3)) THEN
-C--Neutrinos
- PT=12+2*INT(3*(PTYPE-PFERM(2))/PNEUT)
- IF(CHRGEN(4).LT.0.5D0) PT = -PT
- ELSEIF (PTYPE.LT.PBOSON(1)) THEN
-C--Gluons
- PT=21
- ELSEIF (PTYPE.LT.PBOSON(2)) THEN
-C--W+/W-
- PT=24
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PBOSON(3)) THEN
-C--Z0
- PT=23
- ELSE
-C--Photons
- PT=22
- ENDIF
-C--Calculate new charge of BH
- BHCHRG=BHCHRG-CHFCHG(PT)
- END
-CDECK ID>, CHHBH3.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris
-C---------------------------------------------------------------------
- SUBROUTINE CHHBH3(PT,STAT,SPIN,BHCHRG)
-C---------------------------------------------------------------------
-C Subroutine to select the type of the next particle
-C---------------------------------------------------------------------
- IMPLICIT NONE
-#include "Charybdis_i/charybdis1003.inc"
- INTEGER PT,STAT,SPIN,BHCHRG,CHFCHG,I
- DOUBLE PRECISION PTYPE,CHRGEN,EPS
- LOGICAL FIRST
- DATA FIRST/.TRUE./
- EXTERNAL CHRGEN,CHFCHG
- PARAMETER(EPS=1.0D-6)
-C--initialisation on first call
- IF(FIRST) THEN
- PFERM (1) = PQUARK
- PFERM (2) = PFERM(1)+PLEPT
- PFERM (3) = PFERM(2)+PNEUT
- PBOSON(1) = PFERM(3)+PGLUON
- PBOSON(2) = PBOSON(1)+PWBOSN
- PBOSON(3) = PBOSON(2)+PZBOSN
- PBOSON(4) = PBOSON(3)+PHIGGS
- PBOSON(5) = PBOSON(4)+PGAMMA
-C--check the sum
- IF(ABS(PBOSON(5)-1.0D0).GT.EPS) THEN
- IF(IBHPRN.GE.1) THEN
- print *,'WARNING PROBABILITIES DO NOT SUM TO ONE'
- print *,'RENORMALISING'
- ENDIF
- DO I=1,3
- PFERM(I) = PFERM(I)/PBOSON(5)
- PBOSON(I) = PBOSON(I)/PBOSON(5)
- ENDDO
- PBOSON(4) = PBOSON(4)/PBOSON(5)
- PQUARK = PQUARK/PBOSON(5)
- PLEPT = PLEPT /PBOSON(5)
- PNEUT = PNEUT /PBOSON(5)
- PGLUON = PGLUON/PBOSON(5)
- PGAMMA = PGAMMA/PBOSON(5)
- PZBOSN = PZBOSN/PBOSON(5)
- PWBOSN = PWBOSN/PBOSON(5)
- PHIGGS = PHIGGS/PBOSON(5)
- PBOSON(5) = 1.0D0
- ENDIF
- FIRST = .FALSE.
- ENDIF
-C--Assume decay product is a fermion
- STAT=-1
- SPIN=1
-C--Choose decay product
- PTYPE=CHRGEN(2)
-C--Change STAT to 1 and SPIN to 2 if we have a boson instead
-C--except for one degree of freedom of massive gauge bosons
- IF (PTYPE.GE.PFERM(3)) THEN
- STAT=1
- SPIN=2
- IF ((PTYPE.GE.PBOSON(1)).AND.(PTYPE.LT.PBOSON(3))) THEN
- IF (3*CHRGEN(3).LT.1.0d0) SPIN=0
- ENDIF
- ENDIF
-C--Choose particle type
- IF (PTYPE.LT.PFERM(1)) THEN
-C--Quarks
- PT=1+INT(6*PTYPE/PFERM(1))
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PFERM(2)) THEN
-C--Leptons
- PT=11+2*INT(3*(PTYPE-PFERM(1))/PLEPT)
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PFERM(3)) THEN
-C--Neutrinos
- PT=12+2*INT(3*(PTYPE-PFERM(2))/PNEUT)
- IF(CHRGEN(4).LT.0.5D0) PT = -PT
- ELSEIF (PTYPE.LT.PBOSON(1)) THEN
-C--Gluons
- PT=21
- ELSEIF (PTYPE.LT.PBOSON(2)) THEN
-C--W+/W-
- PT=24
-C--Ensure BH charge remains close to 0, and antiparticles half time
- IF (((CHFCHG(PT)*BHCHRG).LT.0).OR.
- & ((BHCHRG.EQ.0).AND.(CHRGEN(4).LT.0.5D0))) THEN
- PT=-PT
- ENDIF
- ELSEIF (PTYPE.LT.PBOSON(3)) THEN
-C--Z0
- PT=23
- ELSEIF (PTYPE.LT.PBOSON(4)) THEN
-C--Higgs
- PT=25
- SPIN=0
- ELSE
-C--Photons
- PT=22
- ENDIF
-C--Calculate new charge of BH
- BHCHRG=BHCHRG-CHFCHG(PT)
- END
-CDECK ID>, CHPDF.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Peter Richardson
-C----------------------------------------------------------------------
- SUBROUTINE CHPDF(XXMINB,XLMINB,EMSCAB,XXB,DISFB)
-C----------------------------------------------------------------------
-C Subroutine to calculate the pdfs
-C generator dependent
-C----------------------------------------------------------------------
-#include "HERWIG65.INC"
- DOUBLE PRECISION EMSCAB,XXB(2),DISFB(13,2),XXMINB,XLMINB,
- & CHRUNI,UPV,DNV,USEA,DSEA,STR,CHM,BTM,TOP,GLU
- INTEGER IDB(2),I,J
- CHARACTER *8 DUMMY
- DOUBLE PRECISION VALUE(20)
- CHARACTER*20 PARM(20)
- LOGICAL FIRST
- EXTERNAL CHRUNI
- DATA VALUE/20*0D0/,PARM/20*' '/
- DATA FIRST/.TRUE./
-C--Les Houches run common block
-#include "GeneratorFortranCommon/heprup.inc"
-C--use generator internal pdfs
- IF(PDFGUP(1).LT.0) THEN
-C---SET UP INITIAL STATE
- CALL HWUIDT(1,IDBMUP(1),IDB(1),DUMMY)
- PART1=DUMMY
- CALL HWUIDT(1,IDBMUP(2),IDB(2),DUMMY)
- PART2=DUMMY
- IPART1 = IDB(1)
- IPART2 = IDB(2)
- NHEP=1
- ISTHEP(NHEP)=101
- PHEP(1,NHEP)=0.0D0
- PHEP(2,NHEP)=0.0D0
- PHEP(3,NHEP)=EBMUP(1)
- PHEP(4,NHEP)=EBMUP(1)
- PHEP(5,NHEP)=RMASS(IDB(1))
- JMOHEP(1,NHEP)=0
- JMOHEP(2,NHEP)=0
- JDAHEP(1,NHEP)=0
- JDAHEP(2,NHEP)=0
- IDHW(NHEP)=IPART1
- IDHEP(NHEP)=IDPDG(IDB(1))
- NHEP=NHEP+1
- ISTHEP(NHEP)=102
- PHEP(1,NHEP)=0.0D0
- PHEP(2,NHEP)=0.0D0
- PHEP(3,NHEP)=-EBMUP(2)
- PHEP(4,NHEP)=EBMUP(2)
- PHEP(5,NHEP)=RMASS(IDB(2))
- JMOHEP(1,NHEP)=0
- JMOHEP(2,NHEP)=0
- JDAHEP(1,NHEP)=0
- JDAHEP(2,NHEP)=0
- IDHW(NHEP)=IPART2
- IDHEP(NHEP)=IDPDG(IPART2)
-C---NEXT ENTRY IS OVERALL CM FRAME
- NHEP=NHEP+1
- IDHW(NHEP)=14
- IDHEP(NHEP)=0
- ISTHEP(NHEP)=103
- JMOHEP(1,NHEP)=NHEP-2
- JMOHEP(2,NHEP)=NHEP-1
- JDAHEP(1,NHEP)=0
- JDAHEP(2,NHEP)=0
- CALL CHVSUM(4,PHEP(1,NHEP-1),PHEP(1,NHEP-2),PHEP(1,NHEP))
- CALL CHUMAS(PHEP(1,NHEP))
- XLMIN = XLMINB
- EMSCA = EMSCAB
- XXMIN = XXMINB
- CALL HWSGEN(.TRUE.)
- DO I=1,2
- XXB(I) = XX(I)
- DO J=1,13
- DISFB(J,I) = DISF(J,I)
- ENDDO
- ENDDO
- ELSE
-C--initialisation
- IF(FIRST) THEN
- IF(PDFGUP(1).NE.PDFGUP(2).OR.PDFSUP(1).NE.PDFSUP(2)) THEN
- print *,'MUST HAVE SAME PDF FOR BOTH BEAMS'
- STOP
- ENDIF
- PARM(1)='NPTYPE'
- VALUE(1)=1
- PARM(2)='NGROUP'
- VALUE(2)=PDFGUP(1)
- PARM(3)='NSET'
- VALUE(3)=PDFSUP(1)
- CALL PDFSET(PARM,VALUE)
- FIRST = .FALSE.
- ENDIF
- XXB(1)=EXP(CHRUNI(0,0.0D0,XLMINB))
- XXB(2)=XXMINB/XXB(1)
- DO I=1,2
- CALL STRUCTM(XXB(I),EMSCAB,
- & UPV,DNV,USEA,DSEA,STR,CHM,BTM,TOP,GLU)
- DISFB( 3,I) = STR
- DISFB( 4,I) = CHM
- DISFB( 5,I) = BTM
- DISFB( 6,I) = TOP
- DISFB( 9,I) = STR
- DISFB(10,I) = CHM
- DISFB(11,I) = BTM
- DISFB(12,I) = TOP
- DISFB(13,I) = GLU
- IF(IDBMUP(I).GT.0) THEN
- DISFB(1,I) = DNV+DSEA
- DISFB(2,I) = UPV+USEA
- DISFB(7,I) = DSEA
- DISFB(8,I) = USEA
- ELSE
- DISFB(1,I) = DSEA
- DISFB(2,I) = USEA
- DISFB(7,I) = DNV+DSEA
- DISFB(8,I) = UPV+USEA
- ENDIF
- ENDDO
- ENDIF
- END
-CDECK ID>, CHRAZM.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHRAZM(PT,PX,PY)
-C-----------------------------------------------------------------------
-C RANDOMLY ROTATED 2-VECTOR (PX,PY) OF LENGTH PT
-C (taken from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRGEN,PT,PX,PY,C,S,CS,QT,ONE,ZERO
- PARAMETER(ONE=1.0D0, ZERO=0.0D0)
- EXTERNAL CHRGEN
- 10 C=2.0D0*CHRGEN(1)-1.0D0
- S=2.0D0*CHRGEN(2)-1.0D0
- CS=C*C+S*S
- IF (CS.GT.ONE .OR. CS.EQ.ZERO) GOTO 10
- QT=PT/CS
- PX=(C*C-S*S)*QT
- PY=2.0D0*C*S*QT
- END
-CDECK ID>, CHRGEN.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Peter Richardson
-C-----------------------------------------------------------------------
- FUNCTION CHRGEN(I)
-C-----------------------------------------------------------------------
-C random number generator (just calls HERWIG or PYTHIA one)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRGEN
- INTEGER I
-C--use HERWIG random number generator
- DOUBLE PRECISION HWRGEN
- EXTERNAL HWRGEN
- CHRGEN = HWRGEN(I)
- END
-CDECK ID>, CHRLOG.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- FUNCTION CHRLOG(A)
-C-----------------------------------------------------------------------
-C Returns .TRUE. with probability A
-C (taken from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHRGEN,A,R
- LOGICAL CHRLOG
- EXTERNAL CHRGEN
- CHRLOG=.TRUE.
- R=CHRGEN(0)
- IF(R.GT.A) CHRLOG=.FALSE.
- END
-CDECK ID>, CHRUNI.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- FUNCTION CHRUNI(I,A,B)
-C-----------------------------------------------------------------------
-C Uniform random random number in range [A,B]
-C (taken from HERWIG)
-C-----------------------------------------------------------------------
- DOUBLE PRECISION CHRUNI,CHRGEN,A,B,RN
- INTEGER I
- EXTERNAL CHRGEN
- RN=CHRGEN(I)
- CHRUNI=A+RN*(B-A)
- END
-CDECK ID>, CHUBHS.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Chris Harris
-C---------------------------------------------------------------------
- SUBROUTINE CHUBHS(ENERGY,STAT,SPIN)
-C---------------------------------------------------------------------
-C Calculates energy spectrum for a black hole of given radius
-C---------------------------------------------------------------------
- IMPLICIT NONE
-#include "Charybdis_i/charybdis1003.inc"
- DOUBLE PRECISION ENERGY,SPCMAX,SPCVAL,RADHOR,HWKTMP,ETRAT
- DOUBLE PRECISION MXARRY(6,3),CHRGEN,CHRUNI,CHUTAB
- DOUBLE PRECISION FLUX(200,6,3),ETVALS(200,6)
- INTEGER NARRAY(6),STAT,SPIN,POINTS,I
- EXTERNAL CHRGEN,CHRUNI,CHUTAB
- DOUBLE PRECISION ONE,TWO,THREE,ZERO,PIFAC,HALF
- PARAMETER(ONE=1.0D0,TWO=2.0D0,THREE=3.0D0,ZERO=0.0D0,HALF=0.5D0)
- DATA NARRAY /151,121,131,141,119,151/
- DATA MXARRY /0.021d0,0.032d0,0.045d0,0.061d0,0.081d0,0.11d0,
- & 0.017d0,0.026d0,0.036d0,0.045d0,0.056d0,0.068d0,
- & 0.017d0,0.033d0,0.053d0,0.076d0,0.11d0,0.13d0/
- DATA (ETVALS(I,1),I=1,151) /0.00837758, 0.0837758, 0.167552,
- &0.251327, 0.335103, 0.418879, 0.502655, 0.586431, 0.670206,
- &0.753982, 0.837758, 0.921534, 1.00531, 1.08909, 1.17286,
- &1.25664, 1.34041, 1.42419, 1.50796, 1.59174, 1.67552,
- &1.75929, 1.84307, 1.92684, 2.01062, 2.0944, 2.17817,
- &2.26195, 2.34572, 2.4295, 2.51327, 2.59705, 2.68083,
- &2.7646, 2.84838, 2.93215, 3.01593, 3.0997, 3.18348,
- &3.26726, 3.35103, 3.43481, 3.51858, 3.60236, 3.68614,
- &3.76991, 3.85369, 3.93746, 4.02124, 4.10501, 4.18879,
- &4.27257, 4.35634, 4.44012, 4.52389, 4.60767, 4.69145,
- &4.77522, 4.859, 4.94277, 5.02655, 5.11032, 5.1941,
- &5.27788, 5.36165, 5.44543, 5.5292, 5.61298, 5.69675,
- &5.78053, 5.86431, 5.94808, 6.03186, 6.11563, 6.19941,
- &6.28319, 6.36696, 6.45074, 6.53451, 6.61829, 6.70206,
- &6.78584, 6.86962, 6.95339, 7.03717, 7.12094, 7.20472,
- &7.28849, 7.37227, 7.45605, 7.53982, 7.6236, 7.70737,
- &7.79115, 7.87493, 7.9587, 8.04248, 8.12625, 8.21003,
- &8.2938, 8.37758, 8.46136, 8.54513, 8.62891, 8.71268,
- &8.79646, 8.88024, 8.96401, 9.04779, 9.13156, 9.21534,
- &9.29911, 9.38289, 9.46667, 9.55044, 9.63422, 9.71799,
- &9.80177, 9.88554, 9.96932, 10.0531, 10.1369, 10.2206,
- &10.3044, 10.3882, 10.472, 10.5558, 10.6395, 10.7233,
- &10.8071, 10.8909, 10.9746, 11.0584, 11.1422, 11.226,
- &11.3097, 11.3935, 11.4773, 11.5611, 11.6448, 11.7286,
- &11.8124, 11.8962, 11.9799, 12.0637, 12.1475, 12.2313,
- &12.315, 12.3988, 12.4826, 12.5664/
- DATA (FLUX(I,1,1),I=1,151) /0.000302416, 0.00291566, 0.00558027,
- &0.00800197, 0.0101859, 0.0121371, 0.0138614, 0.015365, 0.0166554,
- &0.0177408, 0.0186311, 0.0193371, 0.0198712, 0.0202464, 0.0204769,
- &0.0205776, 0.0205633, 0.0204495, 0.0202512, 0.0199826, 0.0196575,
- &0.0192887, 0.0188876, 0.0184644, 0.018028, 0.017586, 0.0171441,
- &0.0167072, 0.0162784, 0.0158598, 0.0154524, 0.0150562, 0.0146703,
- &0.0142933, 0.0139233, 0.0135581, 0.0131954, 0.0128329, 0.0124687,
- &0.012101, 0.0117287, 0.0113511, 0.0109679, 0.0105796, 0.010187,
- &0.0097913, 0.00939432, 0.00899787, 0.00860399, 0.00821478,
- &0.00783223, 0.00745829, 0.00709462, 0.00674274, 0.00640377,
- &0.00607866, 0.005768, 0.00547213, 0.00519109, 0.00492474,
- &0.00467268, 0.00443436, 0.0042091, 0.0039961, 0.00379453,
- &0.0036035, 0.00342213, 0.00324959, 0.00308509, 0.00292792,
- &0.00277747, 0.00263322, 0.00249476, 0.00236175, 0.00223397,
- &0.00211127, 0.00199352, 0.0018807, 0.00177276, 0.00166969,
- &0.0015715, 0.00147816, 0.00138963, 0.00130586, 0.00122677,
- &0.00115224, 0.00108214, 0.00101631, 0.000954559, 0.000896698,
- &0.000842512, 0.000791779, 0.000744269, 0.000699762, 0.000658029,
- &0.000618861, 0.000582052, 0.000547413, 0.000514771, 0.000483972,
- &0.000454876, 0.000427365, 0.000401333, 0.000376696, 0.000353375,
- &0.000332, 0.000310443, 0.00029073, 0.000272125, 0.000254591,
- &0.000238088, 0.000222578, 0.000208022, 0.000194382, 0.000181617,
- &0.000169684, 0.0001588, 0.000148148, 0.000138454, 0.0001295,
- &0.000121, 0.000113152, 0.000105834, 9.90067e-05, 9.26315e-05,
- &8.66729e-05, 8.10985e-05, 7.5878e-05, 7.0984e-05, 6.63922e-05,
- &6.20809e-05, 5.80306e-05, 5.42246e-05, 5.06479e-05, 4.72874e-05,
- &4.41314e-05, 4.11692e-05, 3.83912e-05, 3.57884e-05, 3.33521e-05,
- &3.10742e-05, 2.89466e-05, 2.69615e-05, 2.51111e-05, 2.33879e-05,
- &2.17842e-05, 2.02926e-05, 1.8906e-05, 1.76171e-05, 1.64192e-05,
- &1.52e-05/
- DATA (FLUX(I,1,2),I=1,151) /9.9924e-07, 9.62357e-05, 0.000370872,
- &0.000803897, 0.00137345, 0.0020564, 0.00283305, 0.00368963,
- &0.00461454, 0.00559229, 0.00660209, 0.00762302, 0.00864035,
- &0.00964574, 0.0106307, 0.0115808, 0.0124765, 0.0133006, 0.014044,
- &0.0147037, 0.0152769, 0.0157563, 0.0161325, 0.0164003, 0.0165624,
- &0.0166267, 0.0166009, 0.0164899, 0.0162981, 0.0160326, 0.0157045,
- &0.0153266, 0.0149102, 0.0144638, 0.0139948, 0.0135109, 0.0130204,
- &0.0125304, 0.0120465, 0.0115724, 0.0111114, 0.0106658, 0.0102376,
- &0.00982739, 0.00943497, 0.00905983, 0.00870158, 0.00835955,
- &0.0080324, 0.00771795, 0.00741412, 0.00711948, 0.00683327,
- &0.00655479, 0.00628292, 0.0060163, 0.00575402, 0.00549595,
- &0.00524262, 0.00499461, 0.00475223, 0.00451558, 0.00428494,
- &0.00406101, 0.00384461, 0.00363646, 0.00343697, 0.00324628,
- &0.00306453, 0.00289183, 0.00272826, 0.00257377, 0.00242813,
- &0.00229105, 0.00216213, 0.00204095, 0.00192704, 0.00181987,
- &0.00171899, 0.00162396, 0.00153434, 0.00144968, 0.0013695,
- &0.00129338, 0.00122102, 0.0011522, 0.00108673, 0.0010244,
- &0.000964981, 0.000908321, 0.00085433, 0.000802968, 0.000754197,
- &0.000707961, 0.000664175, 0.000622759, 0.000583662, 0.000546835,
- &0.000512222, 0.00047975, 0.000449325, 0.000420846, 0.00039421,
- &0.000369318, 0.000346067, 0.000324354, 0.000304076, 0.000285131,
- &0.000267413, 0.000250822, 0.000235264, 0.000220659, 0.000206942,
- &0.000194046, 0.000181911, 0.000170475, 0.00015969, 0.000149516,
- &0.000139925, 0.00013089, 0.000122383, 0.000114375, 0.000106842,
- &9.97618e-05, 9.31189e-05, 8.68953e-05, 8.10729e-05, 7.56304e-05,
- &7.05476e-05, 6.5805e-05, 6.13842e-05, 5.72669e-05, 5.3435e-05,
- &4.98696e-05, 4.65523e-05, 4.34649e-05, 4.05893e-05, 3.79096e-05,
- &3.54108e-05, 3.30793e-05, 3.09023e-05, 2.88673e-05, 2.69624e-05,
- &2.51775e-05, 2.35042e-05, 2.19355e-05, 2.04652e-05, 1.90868e-05,
- &1.77945e-05, 1.6583e-05, 1.54479e-05/
- DATA (FLUX(I,1,3),I=1,151) /2.36467e-09, 2.27485e-06, 1.74831e-05,
- &5.67478e-05, 0.000129498, 0.00024372, 0.000406154, 0.000622444,
- &0.000897231, 0.00123422, 0.00163621, 0.00210503, 0.00264154,
- &0.00324549, 0.00391542, 0.00464852, 0.00544043, 0.00628508,
- &0.00717462, 0.00809913, 0.00904674, 0.0100036, 0.010954,
- &0.0118809, 0.0127664, 0.0135921, 0.0143404, 0.014995, 0.015542,
- &0.0159706, 0.0162738, 0.0164486, 0.0164966, 0.0164228, 0.016236,
- &0.0159478, 0.0155716, 0.015122, 0.0146141, 0.0140622, 0.0134802,
- &0.0128807, 0.0122745, 0.011671, 0.011078, 0.0105017, 0.00994673,
- &0.00941661, 0.00891352, 0.00843877, 0.00799277, 0.00757527,
- &0.00718537, 0.00682182, 0.00648292, 0.00616677, 0.00587134,
- &0.00559445, 0.00533398, 0.00508784, 0.0048541, 0.00463095,
- &0.00441687, 0.00421054, 0.00401094, 0.00381727, 0.00362905,
- &0.00344597, 0.00326794, 0.003095, 0.00292736, 0.00276523,
- &0.0026089, 0.00245866, 0.00231475, 0.0021774, 0.00204674,
- &0.00192284, 0.00180574, 0.00169536, 0.00159159, 0.00149424,
- &0.0014031, 0.00131786, 0.00123824, 0.00116391, 0.00109451,
- &0.00102969, 0.000969093, 0.000912375, 0.000859198, 0.000809247,
- &0.000762232, 0.00071789, 0.000675986, 0.000636318, 0.000598712,
- &0.000563024, 0.000529139, 0.000496956, 0.000466402, 0.000437415,
- &0.000409939, 0.000383934, 0.000359358, 0.000336172, 0.000314336,
- &0.00029381, 0.000274549, 0.000256505, 0.000239628, 0.000223864,
- &0.000209157, 0.000195449, 0.00018268, 0.000170793, 0.000159724,
- &0.000149417, 0.000139815, 0.000130862, 0.000122505, 0.000114698,
- &0.000107393, 0.000100551, 9.41333e-05, 8.81074e-05, 8.24435e-05,
- &7.7117e-05, 7.21049e-05, 6.73879e-05, 6.29497e-05, 5.87753e-05,
- &5.48516e-05, 5.11669e-05, 4.77097e-05, 4.44701e-05, 4.14379e-05,
- &3.86033e-05, 3.59566e-05, 3.34882e-05, 3.11885e-05, 2.9048e-05,
- &2.70572e-05, 2.52068e-05, 2.34873e-05, 2.189e-05, 2.0406e-05,
- &1.90271e-05, 1.7745e-05, 1.65523e-05, 1.54419e-05/
- DATA (ETVALS(I,2),I=1,121) /0.00628319, 0.0628319, 0.125664,
- &0.188496, 0.251327, 0.314159, 0.376991, 0.439823, 0.502655,
- &0.565487, 0.628319, 0.69115, 0.753982, 0.816814, 0.879646,
- &0.942478, 1.00531, 1.06814, 1.13097, 1.19381, 1.25664,
- &1.31947, 1.3823, 1.44513, 1.50796, 1.5708, 1.63363,
- &1.69646, 1.75929, 1.82212, 1.88496, 1.94779, 2.01062,
- &2.07345, 2.13628, 2.19911, 2.26195, 2.32478, 2.38761,
- &2.45044, 2.51327, 2.57611, 2.63894, 2.70177, 2.7646,
- &2.82743, 2.89027, 2.9531, 3.01593, 3.07876, 3.14159,
- &3.20442, 3.26726, 3.33009, 3.39292, 3.45575, 3.51858,
- &3.58142, 3.64425, 3.70708, 3.76991, 3.83274, 3.89557,
- &3.95841, 4.02124, 4.08407, 4.1469, 4.20973, 4.27257,
- &4.3354, 4.39823, 4.46106, 4.52389, 4.58673, 4.64956,
- &4.71239, 4.77522, 4.83805, 4.90088, 4.96372, 5.02655,
- &5.08938, 5.15221, 5.21504, 5.27788, 5.34071, 5.40354,
- &5.46637, 5.5292, 5.59203, 5.65487, 5.7177, 5.78053,
- &5.84336, 5.90619, 5.96903, 6.03186, 6.09469, 6.15752,
- &6.22035, 6.28319, 6.59734, 6.9115, 7.22566, 7.53982,
- &7.85398, 8.16814, 8.4823, 8.79646, 9.11062, 9.42478,
- &9.73894, 10.0531, 10.3673, 10.6814, 10.9956, 11.3097,
- &11.6239, 11.9381, 12.2522, 12.5664/
- DATA (FLUX(I,2,1),I=1,121) /0.000404009, 0.00392351, 0.00758112,
- &0.0109642, 0.0140671, 0.0168871, 0.019425, 0.0216845, 0.0236723,
- &0.0253982, 0.0268742, 0.0281145, 0.0291353, 0.0299539, 0.0305884,
- &0.0310576, 0.0313803, 0.0315749, 0.0316592, 0.0316499, 0.0315629,
- &0.0314126, 0.0312118, 0.0309721, 0.0307032, 0.0304133, 0.0301092,
- &0.0297962, 0.0294781, 0.0291573, 0.0288354, 0.0285125, 0.0281883,
- &0.0278615, 0.0275302, 0.0271924, 0.0268457, 0.0264877, 0.0261159,
- &0.0257285, 0.0253236, 0.0249, 0.0244569, 0.0239942, 0.0235121,
- &0.0230115, 0.0224938, 0.0219609, 0.0214148, 0.0208582, 0.0202936,
- &0.0197239, 0.019152, 0.0185805, 0.0180121, 0.0174493, 0.0168942,
- &0.0163489, 0.0158149, 0.0152936, 0.0147861, 0.014293, 0.0138149,
- &0.0133518, 0.0129037, 0.0124703, 0.0120513, 0.0116459, 0.0112534,
- &0.0108733, 0.0105045, 0.0101465, 0.00979838, 0.00945948,
- &0.0091292, 0.00880703, 0.0084925, 0.00818535, 0.0078853,
- &0.00759225, 0.00730615, 0.00702705, 0.006755, 0.00649014,
- &0.00623262, 0.00598259, 0.00574022, 0.00550565, 0.00527895,
- &0.00506023, 0.00484951, 0.00464678, 0.00445198, 0.00426498,
- &0.00408567, 0.00391383, 0.00374925, 0.00359166, 0.00344078,
- &0.00329631, 0.00315796, 0.0025469, 0.00204557, 0.00163075,
- &0.0012906, 0.00101732, 0.000801626, 0.000632102, 0.00049774,
- &0.000390215, 0.000304261, 0.000236379, 0.000183518, 0.000142612,
- &0.000110818, 8.5892e-05, 6.62998e-05, 5.10081e-05, 3.92052e-05,
- &3.01586e-05, 2.32131e-05/
- DATA (FLUX(I,2,2),I=1,121) /1.26e-06, 0.000122431, 0.000476022,
- &0.00104, 0.00178939, 0.00269598, 0.003735, 0.00488878, 0.00614213,
- &0.00747465, 0.0088588, 0.0102671, 0.0116812, 0.0130912, 0.0144878,
- &0.0158537, 0.0171651, 0.018402, 0.0195553, 0.0206245, 0.0216077,
- &0.0224957, 0.0232756, 0.0239401, 0.0244915, 0.0249384, 0.0252869,
- &0.0255375, 0.0256892, 0.0257458, 0.0257172, 0.0256153, 0.0254495,
- &0.0252251, 0.0249472, 0.0246228, 0.0242616, 0.0238724, 0.0234616,
- &0.0230335, 0.0225927, 0.0221441, 0.0216922, 0.0212403, 0.0207899,
- &0.0203422, 0.0198992, 0.0194625, 0.0190324, 0.0186078, 0.0181871,
- &0.0177698, 0.0173567, 0.016948, 0.0165423, 0.0161373, 0.0157316,
- &0.0153252, 0.0149193, 0.0145143, 0.0141098, 0.0137047, 0.0132989,
- &0.0128937, 0.0124907, 0.0120913, 0.011696, 0.0113049, 0.0109185,
- &0.0105384, 0.0101659, 0.00980213, 0.00944741, 0.00910205,
- &0.00876643, 0.00844109, 0.00812641, 0.00782259, 0.00752948,
- &0.007247, 0.00697494, 0.00671296, 0.0064607, 0.0062176,
- &0.00598332, 0.00575754, 0.00553982, 0.00532963, 0.00512633,
- &0.00492941, 0.00473864, 0.00455387, 0.00437493, 0.00420146,
- &0.00403308, 0.00386959, 0.00371103, 0.00355747, 0.00340894,
- &0.00326531, 0.00312645, 0.0025038, 0.00199701, 0.00159259,
- &0.00127038, 0.0010106, 0.000799155, 0.000627867, 0.000491358,
- &0.000384293, 0.000300776, 0.000235218, 0.000183312, 0.000142194,
- &0.000109933, 8.49344e-05, 6.56842e-05, 5.08066e-05, 3.92136e-05,
- &3.01523e-05, 2.31118e-05/
- DATA (FLUX(I,2,3),I=1,121) /3.71013e-09, 3.60137e-06, 2.79421e-05,
- &9.15076e-05, 0.000210575, 0.000399441, 0.000670605, 0.0010349,
- &0.00150158, 0.00207833, 0.00277124, 0.00358477, 0.00452156,
- &0.00558228, 0.00676548, 0.00806727, 0.00948115, 0.0109977,
- &0.0126046, 0.0142862, 0.0160239, 0.017796, 0.0195783, 0.0213443,
- &0.0230663, 0.024716, 0.0262659, 0.02769, 0.0289652, 0.0300722,
- &0.0309962, 0.0317278, 0.0322628, 0.0326024, 0.0327526, 0.0327237,
- &0.0325297, 0.0321871, 0.0317142, 0.03113, 0.0304537, 0.0297042,
- &0.028899, 0.0280543, 0.027185, 0.0263039, 0.0254221, 0.0245488,
- &0.0236917, 0.0228568, 0.0220487, 0.0212707, 0.0205247, 0.0198119,
- &0.0191324, 0.0184857, 0.0178703, 0.0172848, 0.016727, 0.0161945,
- &0.0156848, 0.0151952, 0.0147233, 0.0142665, 0.0138225, 0.0133894,
- &0.0129653, 0.0125488, 0.0121387, 0.0117343, 0.0113352, 0.010941,
- &0.010552, 0.0101684, 0.00979058, 0.00941927, 0.0090551,
- &0.00869877, 0.00835099, 0.00801245, 0.0076837, 0.00736531,
- &0.00705769, 0.00676116, 0.00647592, 0.00620205, 0.00593957,
- &0.00568833, 0.00544816, 0.00521873, 0.00499969, 0.00479062,
- &0.00459105, 0.0044005, 0.00421842, 0.00404429, 0.00387761,
- &0.00371786, 0.00356457, 0.00341728, 0.00327558, 0.00263989,
- &0.00210751, 0.00166763, 0.00131391, 0.00103573, 0.000818073,
- &0.000645765, 0.000507411, 0.000396169, 0.000307892, 0.000239034,
- &0.000185837, 0.000144605, 0.000112303, 8.68411e-05, 6.68717e-05,
- &5.14003e-05, 3.95356e-05, 3.04482e-05, 2.3439e-05/
- DATA (ETVALS(I,3),I=1,131) /0.00502655, 0.0502655, 0.100531,
- &0.150796, 0.201062, 0.251327, 0.301593, 0.351858, 0.402124,
- &0.452389, 0.502655, 0.55292, 0.603186, 0.653451, 0.703717,
- &0.753982, 0.804248, 0.854513, 0.904779, 0.955044, 1.00531,
- &1.05558, 1.10584, 1.15611, 1.20637, 1.25664, 1.3069,
- &1.35717, 1.40743, 1.4577, 1.50796, 1.55823, 1.6085,
- &1.65876, 1.70903, 1.75929, 1.80956, 1.85982, 1.91009,
- &1.96035, 2.01062, 2.06088, 2.11115, 2.16142, 2.21168,
- &2.26195, 2.31221, 2.36248, 2.41274, 2.46301, 2.51327,
- &2.56354, 2.61381, 2.66407, 2.71434, 2.7646, 2.81487,
- &2.86513, 2.9154, 2.96566, 3.01593, 3.06619, 3.11646,
- &3.16673, 3.21699, 3.26726, 3.31752, 3.36779, 3.41805,
- &3.46832, 3.51858, 3.56885, 3.61911, 3.66938, 3.71965,
- &3.76991, 3.82018, 3.87044, 3.92071, 3.97097, 4.02124,
- &4.0715, 4.12177, 4.17204, 4.2223, 4.27257, 4.32283,
- &4.3731, 4.42336, 4.47363, 4.52389, 4.57416, 4.62442,
- &4.67469, 4.72496, 4.77522, 4.82549, 4.87575, 4.92602,
- &4.97628, 5.02655, 5.27788, 5.5292, 5.78053, 6.03186,
- &6.28319, 6.53451, 6.78584, 7.03717, 7.28849, 7.53982,
- &7.79115, 8.04248, 8.2938, 8.54513, 8.79646, 9.04779,
- &9.29911, 9.55044, 9.80177, 10.0531, 10.3044, 10.5558,
- &10.8071, 11.0584, 11.3097, 11.5611, 11.8124, 12.0637,
- &12.315, 12.5664/
- DATA (FLUX(I,3,1),I=1,131) /0.000505327, 0.0049346, 0.00959093,
- &0.0139491, 0.0179937, 0.0217143, 0.0251057, 0.0281676, 0.0309046,
- &0.0333259, 0.0354444, 0.0372764, 0.038841, 0.0401591, 0.0412527,
- &0.0421447, 0.0428579, 0.0434145, 0.0438363, 0.0441431, 0.044354,
- &0.0444859, 0.0445537, 0.0445708, 0.0445487, 0.0444965, 0.0444215,
- &0.04433, 0.0442256, 0.0441111, 0.0439875, 0.0438552, 0.0437129,
- &0.043559, 0.043391, 0.0432061, 0.0430015, 0.042774, 0.0425203,
- &0.0422381, 0.0419248, 0.0415786, 0.0411982, 0.0407828, 0.0403324,
- &0.0398476, 0.0393294, 0.0387796, 0.0382003, 0.0375943, 0.0369644,
- &0.0363139, 0.0356461, 0.0349645, 0.0342726, 0.0335736, 0.0328707,
- &0.0321668, 0.0314647, 0.0307669, 0.0300755, 0.0293922, 0.0287185,
- &0.0280556, 0.0274042, 0.0267649, 0.026138, 0.0255234, 0.024921,
- &0.0243305, 0.0237512, 0.0231829, 0.0226246, 0.0220758, 0.0215358,
- &0.021004, 0.0204799, 0.019963, 0.0194529, 0.0189494, 0.0184521,
- &0.0179612, 0.0174766, 0.0169985, 0.0165271, 0.0160627, 0.0156055,
- &0.0151559, 0.0147145, 0.0142814, 0.013857, 0.0134419, 0.0130361,
- &0.0126401, 0.012254, 0.0118779, 0.011512, 0.0111562, 0.0108106,
- &0.010475, 0.0101493, 0.00866104, 0.00737802, 0.00626206,
- &0.00528708, 0.00444089, 0.00371704, 0.00310645, 0.00259473,
- &0.00216484, 0.00180149, 0.00149375, 0.00123447, 0.00101818,
- &0.000839256, 0.00069163, 0.000569436, 0.000467843, 0.000383349,
- &0.000313423, 0.000255983, 0.000209043, 0.00017069, 0.000139245,
- &0.000113386, 9.21391e-05, 7.47678e-05, 6.06441e-05, 4.91935e-05,
- &3.98982e-05, 3.23278e-05/
- DATA (FLUX(I,3,2),I=1,131) /1.44805e-06, 0.000141467, 0.00055311,
- &0.00121462, 0.00209962, 0.00317696, 0.00441866, 0.00580455,
- &0.00731715, 0.00893248, 0.0106181, 0.0123416, 0.0140814, 0.015827,
- &0.0175681, 0.0192849, 0.0209504, 0.0225421, 0.024051, 0.0254782,
- &0.0268224, 0.0280734, 0.0292158, 0.0302412, 0.0311526, 0.03196,
- &0.032669, 0.0332779, 0.0337827, 0.0341856, 0.0344962, 0.0347265,
- &0.0348843, 0.0349723, 0.0349925, 0.0349516, 0.0348587, 0.0347233,
- &0.0345502, 0.0343425, 0.0341041, 0.0338403, 0.033557, 0.0332574,
- &0.0329433, 0.0326158, 0.0322779, 0.0319328, 0.0315816, 0.0312234,
- &0.0308568, 0.0304819, 0.0301012, 0.0297154, 0.0293238, 0.0289232,
- &0.0285119, 0.0280904, 0.027661, 0.0272247, 0.0267802, 0.0263253,
- &0.0258593, 0.0253843, 0.0249027, 0.0244162, 0.0239244, 0.0234269,
- &0.0229242, 0.0224188, 0.0219133, 0.0214091, 0.0209067, 0.0204063,
- &0.0199091, 0.0194168, 0.0189307, 0.0184522, 0.0179811, 0.017518,
- &0.0170634, 0.0166178, 0.0161817, 0.0157549, 0.0153376, 0.0149296,
- &0.0145312, 0.0141418, 0.0137611, 0.0133886, 0.013024, 0.0126676,
- &0.012319, 0.0119777, 0.011643, 0.0113145, 0.0109922, 0.0106765,
- &0.0103672, 0.010064, 0.00976629, 0.00836625, 0.00711991,
- &0.00603413, 0.00510372, 0.00431049, 0.00363159, 0.00304777,
- &0.00254654, 0.00212009, 0.0017616, 0.00146279, 0.00121399,
- &0.0010058, 0.000830862, 0.00068412, 0.000561979, 0.000461173,
- &0.000378353, 0.000310252, 0.000254053, 0.000207585, 0.000169256,
- &0.000137826, 0.000112199, 9.13435e-05, 7.43267e-05, 6.03912e-05,
- &4.89718e-05, 3.96479e-05, 3.20759e-05/
- DATA (FLUX(I,3,3),I=1,131) /5.0498e-09, 4.92905e-06, 3.84715e-05,
- &0.000126715, 0.00029321, 0.000559154, 0.000943548, 0.00146328,
- &0.00213315, 0.00296582, 0.00397172, 0.00515891, 0.00653277,
- &0.00809581, 0.00984729, 0.0117829, 0.0138944, 0.0161692,
- &0.0185905, 0.0211371, 0.0237826, 0.0264973, 0.0292472, 0.0319957,
- &0.0347041, 0.0373332, 0.0398443, 0.0422007, 0.0443696, 0.0463222,
- &0.0480361, 0.0494951, 0.0506894, 0.0516166, 0.05228, 0.0526887,
- &0.0528572, 0.0528034, 0.0525478, 0.0521132, 0.0515233, 0.0508015,
- &0.0499707, 0.0490532, 0.0480688, 0.0470364, 0.0459726, 0.0448917,
- &0.0438063, 0.0427271, 0.0416623, 0.0406194, 0.0396032, 0.0386175,
- &0.0376649, 0.0367467, 0.035863, 0.0350132, 0.0341959, 0.0334092,
- &0.0326506, 0.0319176, 0.0312069, 0.0305158, 0.0298411, 0.0291798,
- &0.0285297, 0.0278879, 0.0272524, 0.0266217, 0.0259942, 0.0253692,
- &0.024746, 0.0241244, 0.0235045, 0.022887, 0.0222723, 0.0216615,
- &0.0210554, 0.0204554, 0.0198626, 0.019278, 0.018703, 0.0181386,
- &0.0175858, 0.0170454, 0.0165183, 0.0160049, 0.0155058, 0.0150213,
- &0.0145514, 0.0140963, 0.0136557, 0.0132296, 0.0128175, 0.012419,
- &0.0120336, 0.0116609, 0.0113001, 0.0109506, 0.010612, 0.00905965,
- &0.0077, 0.00650119, 0.00545587, 0.00456275, 0.00381295,
- &0.00318752, 0.00266297, 0.00221879, 0.00184112, 0.00152188,
- &0.00125524, 0.00103485, 0.000853342, 0.000703293, 0.000578464,
- &0.000474399, 0.000388042, 0.000316975, 0.000258894, 0.000211499,
- &0.000172685, 0.000140756, 0.000114472, 9.29277e-05, 7.53814e-05,
- &6.11556e-05, 4.96218e-05, 4.02384e-05, 3.258e-05/
- DATA (ETVALS(I,4),I=1,141) /0.00418879, 0.0418879, 0.0837758,
- &0.125664, 0.167552, 0.20944, 0.251327, 0.293215, 0.335103,
- &0.376991, 0.418879, 0.460767, 0.502655, 0.544543, 0.586431,
- &0.628319, 0.670206, 0.712094, 0.753982, 0.79587, 0.837758,
- &0.879646, 0.921534, 0.963422, 1.00531, 1.0472, 1.08909,
- &1.13097, 1.17286, 1.21475, 1.25664, 1.29852, 1.34041,
- &1.3823, 1.42419, 1.46608, 1.50796, 1.54985, 1.59174,
- &1.63363, 1.67552, 1.7174, 1.75929, 1.80118, 1.84307,
- &1.88496, 1.92684, 1.96873, 2.01062, 2.05251, 2.0944,
- &2.13628, 2.17817, 2.22006, 2.26195, 2.30383, 2.34572,
- &2.38761, 2.4295, 2.47139, 2.51327, 2.55516, 2.59705,
- &2.63894, 2.68083, 2.72271, 2.7646, 2.80649, 2.84838,
- &2.89027, 2.93215, 2.97404, 3.01593, 3.05782, 3.0997,
- &3.14159, 3.18348, 3.22537, 3.26726, 3.30914, 3.35103,
- &3.39292, 3.43481, 3.4767, 3.51858, 3.56047, 3.60236,
- &3.64425, 3.68614, 3.72802, 3.76991, 3.8118, 3.85369,
- &3.89557, 3.93746, 3.97935, 4.02124, 4.06313, 4.10501,
- &4.1469, 4.18879, 4.39823, 4.60767, 4.81711, 5.02655,
- &5.23599, 5.44543, 5.65487, 5.86431, 6.07375, 6.28319,
- &6.49262, 6.70206, 6.9115, 7.12094, 7.33038, 7.53982,
- &7.74926, 7.9587, 8.16814, 8.37758, 8.58702, 8.79646,
- &9.0059, 9.21534, 9.42478, 9.63422, 9.84366, 10.0531,
- &10.2625, 10.472, 10.6814, 10.8909, 11.1003, 11.3097,
- &11.5192, 11.7286, 11.9381, 12.1475, 12.3569, 12.5664/
- DATA (FLUX(I,4,1),I=1,141) /0.000606647, 0.00594603, 0.0116033,
- &0.016942, 0.0219381, 0.0265737, 0.0308375, 0.0347254, 0.0382389,
- &0.0413862, 0.0441804, 0.0466395, 0.0487846, 0.0506398, 0.0522308,
- &0.0535844, 0.0547275, 0.0556864, 0.0564866, 0.057152, 0.0577045,
- &0.0581642, 0.0585486, 0.0588735, 0.0591516, 0.0593938, 0.0596084,
- &0.0598017, 0.0599782, 0.0601405, 0.0602892, 0.0604241, 0.0605434,
- &0.0606449, 0.0607249, 0.0607799, 0.0608058, 0.0607984, 0.0607539,
- &0.0606688, 0.0605397, 0.060364, 0.0601398, 0.0598657, 0.0595413,
- &0.0591669, 0.0587431, 0.0582717, 0.057755, 0.0571957, 0.0565971,
- &0.0559623, 0.0552955, 0.0546007, 0.0538817, 0.0531424, 0.052387,
- &0.0516188, 0.0508418, 0.0500589, 0.049273, 0.0484868, 0.0477025,
- &0.0469218, 0.0461463, 0.0453773, 0.0446153, 0.0438612, 0.0431151,
- &0.0423769, 0.0416466, 0.040924, 0.0402085, 0.0394994, 0.0387965,
- &0.0380988, 0.0374063, 0.0367179, 0.0360334, 0.0353527, 0.0346753,
- &0.0340011, 0.0333301, 0.0326625, 0.0319982, 0.031338, 0.030682,
- &0.0300307, 0.0293846, 0.0287446, 0.0281108, 0.0274843, 0.0268655,
- &0.0262549, 0.0256533, 0.0250609, 0.0244783, 0.023906, 0.0233442,
- &0.0227931, 0.0222527, 0.0197156, 0.0174381, 0.0153863, 0.0135276,
- &0.0118437, 0.0103304, 0.00898649, 0.00780568, 0.00677302,
- &0.00586881, 0.00507424, 0.00437536, 0.00376301, 0.00323036,
- &0.0027702, 0.00237405, 0.00203276, 0.00173797, 0.00148308,
- &0.00126318, 0.00107444, 0.000913232, 0.000775886, 0.000658809,
- &0.0005588, 0.000473283, 0.000400276, 0.000338187, 0.000285581,
- &0.000241095, 0.000203455, 0.000171549, 0.00014448, 0.000121544,
- &0.000102169, 8.58513e-05, 7.21281e-05, 6.058e-05, 5.0847e-05,
- &4.2637e-05/
- DATA (FLUX(I,4,2),I=1,141) /1.58875e-06, 0.000155777, 0.000611358,
- &0.00134723, 0.0023364, 0.00354585, 0.00494547, 0.00651345,
- &0.00823075, 0.0100709, 0.0119976, 0.013975, 0.0159792, 0.0179987,
- &0.0200228, 0.02203, 0.0239905, 0.0258797, 0.027689, 0.0294203,
- &0.0310734, 0.0326368, 0.0340936, 0.0354346, 0.0366637, 0.0377918,
- &0.0388251, 0.0397602, 0.0405913, 0.0413194, 0.0419549, 0.04251,
- &0.0429916, 0.0434002, 0.0437363, 0.0440055, 0.0442177, 0.0443814,
- &0.0445006, 0.0445768, 0.0446126, 0.0446138, 0.0445866, 0.0445339,
- &0.0444561, 0.0443542, 0.0442311, 0.0440908, 0.043935, 0.0437623,
- &0.0435705, 0.0433601, 0.043134, 0.0428947, 0.0426409, 0.0423686,
- &0.0420758, 0.0417632, 0.0414342, 0.0410905, 0.0407298, 0.0403491,
- &0.0399471, 0.0395261, 0.0390897, 0.0386397, 0.0381749, 0.0376934,
- &0.0371956, 0.0366852, 0.0361651, 0.0356373, 0.0351016, 0.0345574,
- &0.0340063, 0.033451, 0.0328941, 0.0323369, 0.0317793, 0.0312216,
- &0.0306655, 0.0301121, 0.0295629, 0.029018, 0.0284776, 0.0279423,
- &0.0274126, 0.026889, 0.0263711, 0.025859, 0.0253526, 0.0248524,
- &0.0243586, 0.0238707, 0.0233881, 0.0229102, 0.0224376, 0.0219708,
- &0.0215097, 0.0210537, 0.0206023, 0.01842, 0.0163737, 0.014485,
- &0.0127713, 0.0112347, 0.00986244, 0.00863503, 0.00753484,
- &0.00655095, 0.0056776, 0.00491003, 0.00424072, 0.00365878,
- &0.00315218, 0.00271025, 0.00232498, 0.00199046, 0.00170169,
- &0.00145362, 0.00124088, 0.00105822, 0.00090105, 0.000765812,
- &0.000649816, 0.000550817, 0.000466651, 0.000395186, 0.00033444,
- &0.000282732, 0.00023872, 0.000201334, 0.000169683, 0.000142962,
- &0.000120422, 0.000101383, 8.52738e-05, 7.16414e-05, 6.01294e-05,
- &5.04382e-05, 4.22984e-05/
- DATA (FLUX(I,4,3),I=1,141) /6.3726e-09, 6.24338e-06, 4.89273e-05,
- &0.000161789, 0.000375805, 0.000719346, 0.00121828, 0.001896,
- &0.00277341, 0.00386878, 0.00519756, 0.00677209, 0.00860124,
- &0.01069, 0.0130391, 0.0156443, 0.0184961, 0.0215794, 0.024873,
- &0.0283496, 0.0319762, 0.0357137, 0.0395186, 0.0433433, 0.0471377,
- &0.0508503, 0.0544308, 0.0578313, 0.0610079, 0.0639223, 0.0665436,
- &0.0688485, 0.0708218, 0.0724567, 0.0737543, 0.0747229, 0.0753767,
- &0.0757352, 0.0758217, 0.0756625, 0.075285, 0.0747175, 0.0739879,
- &0.0731235, 0.0721494, 0.0710899, 0.069966, 0.0687977, 0.0676016,
- &0.0663924, 0.0651828, 0.0639829, 0.0628008, 0.0616432, 0.0605145,
- &0.0594179, 0.0583553, 0.0573268, 0.0563321, 0.0553697, 0.0544376,
- &0.0535328, 0.0526524, 0.0517929, 0.0509508, 0.0501227, 0.0493051,
- &0.0484947, 0.0476888, 0.0468848, 0.0460805, 0.0452743, 0.0444649,
- &0.0436515, 0.042834, 0.042012, 0.0411865, 0.0403581, 0.0395277,
- &0.0386968, 0.0378669, 0.0370395, 0.0362164, 0.035399, 0.0345891,
- &0.0337884, 0.0329982, 0.0322198, 0.0314545, 0.0307031, 0.0299666,
- &0.0292456, 0.0285406, 0.0278519, 0.0271795, 0.0265236, 0.0258838,
- &0.0252599, 0.0246516, 0.0240583, 0.0234793, 0.0207791, 0.0183468,
- &0.0161285, 0.0141068, 0.0122877, 0.0106782, 0.00927219,
- &0.00804831, 0.00697838, 0.00603684, 0.00520644, 0.00447737,
- &0.00384297, 0.0032956, 0.00282521, 0.00242045, 0.00207078,
- &0.00176801, 0.00150635, 0.00128146, 0.00108933, 0.000925749,
- &0.000786426, 0.00066745, 0.000565638, 0.000478595, 0.000404457,
- &0.000341594, 0.000288443, 0.000243503, 0.000205427, 0.000173112,
- &0.000145696, 0.000122502, 0.000102951, 8.65082e-05, 7.26804e-05,
- &6.10319e-05, 5.12045e-05, 4.29157e-05/
- DATA (ETVALS(I,5),I=1,119) /0.00359039, 0.0359039, 0.0718078,
- &0.107712, 0.143616, 0.17952, 0.215423, 0.251327, 0.287231,
- &0.323135, 0.359039, 0.394943, 0.430847, 0.466751, 0.502655,
- &0.538559, 0.574463, 0.610367, 0.64627, 0.682174, 0.718078,
- &0.753982, 0.789886, 0.82579, 0.861694, 0.897598, 0.933502,
- &0.969406, 1.00531, 1.04121, 1.07712, 1.11302, 1.14893,
- &1.18483, 1.22073, 1.25664, 1.29254, 1.32844, 1.36435,
- &1.40025, 1.43616, 1.47206, 1.50796, 1.54387, 1.57977,
- &1.61568, 1.65158, 1.68748, 1.72339, 1.75929, 1.7952,
- &1.8311, 1.867, 1.90291, 1.93881, 1.97472, 2.01062,
- &2.04652, 2.08243, 2.11833, 2.15423, 2.33375, 2.51327,
- &2.69279, 2.87231, 3.05183, 3.23135, 3.41087, 3.59039,
- &3.76991, 3.94943, 4.12895, 4.30847, 4.48799, 4.66751,
- &4.84703, 5.02655, 5.20607, 5.38559, 5.56511, 5.74463,
- &5.92415, 6.10367, 6.28319, 6.4627, 6.64222, 6.82174,
- &7.00126, 7.18078, 7.3603, 7.53982, 7.71934, 7.89886,
- &8.07838, 8.2579, 8.43742, 8.61694, 8.79646, 8.97598,
- &9.1555, 9.33502, 9.51454, 9.69406, 9.87358, 10.0531,
- &10.2326, 10.4121, 10.5917, 10.7712, 10.9507, 11.1302,
- &11.3097, 11.4893, 11.6688, 11.8483, 12.0278, 12.2073,
- &12.3869, 12.5664/
- DATA (FLUX(I,5,1),I=1,119) /0.000707742, 0.00696306, 0.013622,
- &0.0199438, 0.0258963, 0.0314543, 0.0366008, 0.0413272, 0.0456326,
- &0.0495235, 0.0530132, 0.0561204, 0.0588688, 0.061285, 0.0633984,
- &0.0652395, 0.0668391, 0.0682279, 0.0694351, 0.0704883, 0.0714134,
- &0.0722334, 0.0729684, 0.0736363, 0.0742525, 0.0748286, 0.0753746,
- &0.0758971, 0.0764006, 0.0768889, 0.0773613, 0.0778171, 0.0782538,
- &0.0786693, 0.0790574, 0.0794139, 0.0797338, 0.0800119, 0.0802432,
- &0.0804228, 0.0805463, 0.0806106, 0.0806132, 0.0805515, 0.0804249,
- &0.080233, 0.0799768, 0.0796578, 0.0792777, 0.0788402, 0.0783479,
- &0.0778052, 0.0772162, 0.0765849, 0.0759168, 0.0752153, 0.074486,
- &0.0737326, 0.0729594, 0.07217, 0.0713688, 0.0672747, 0.0631895,
- &0.0591664, 0.0551559, 0.0511155, 0.0470694, 0.0431013, 0.0393084,
- &0.0357573, 0.0324669, 0.0294194, 0.0266, 0.0239432, 0.0215,
- &0.0192369, 0.0171849, 0.0153311, 0.0136605, 0.012153, 0.0107899,
- &0.00955817, 0.00844947, 0.00745744, 0.00657441, 0.0057905,
- &0.00509428, 0.00447488, 0.00392336, 0.00345015, 0.00301986,
- &0.00264098, 0.00230825, 0.00201616, 0.00175951, 0.00153379,
- &0.00133545, 0.00116159, 0.00100965, 0.000877169, 0.000761744,
- &0.000661112, 0.000573298, 0.000496682, 0.000429944, 0.000371949,
- &0.000321654, 0.000278075, 0.000240297, 0.000207523, 0.000179083,
- &0.000154432, 0.000133102, 0.000114682, 9.87872e-05, 8.5069e-05,
- &7.3221e-05, 6.29832e-05, 5.41427e-05/
- DATA (FLUX(I,5,2),I=1,119) /1.69752e-06, 0.000166876, 0.000656692,
- &0.00145079, 0.0025219, 0.00383575, 0.00536073, 0.0070739,
- &0.00895512, 0.010976, 0.0130975, 0.0152809, 0.0175005, 0.0197445,
- &0.0220015, 0.0242486, 0.0264539, 0.0285917, 0.030653, 0.0326409,
- &0.0345556, 0.036385, 0.038111, 0.0397236, 0.0412279, 0.0426358,
- &0.0439534, 0.0451766, 0.0462981, 0.0473188, 0.0482497, 0.0491032,
- &0.0498854, 0.0505955, 0.0512329, 0.0518027, 0.0523152, 0.0527787,
- &0.053196, 0.053567, 0.053894, 0.0541827, 0.0544391, 0.0546662,
- &0.0548626, 0.0550287, 0.0551678, 0.0552839, 0.0553792, 0.0554513,
- &0.0554971, 0.0555166, 0.0555143, 0.0554926, 0.0554502, 0.0553821,
- &0.0552856, 0.055162, 0.0550154, 0.0548479, 0.0546569, 0.0532957,
- &0.051347, 0.0489391, 0.0462389, 0.0434023, 0.0405365, 0.0376939,
- &0.0348892, 0.0321298, 0.0294357, 0.026842, 0.0243855, 0.022091,
- &0.0199665, 0.0180056, 0.0161949, 0.0145232, 0.0129848, 0.0115789,
- &0.0103044, 0.00915607, 0.00812422, 0.00719702, 0.00636366,
- &0.00561573, 0.00494694, 0.0043518, 0.00382449, 0.00335844,
- &0.0029466, 0.00258226, 0.00225987, 0.00197508, 0.0017243,
- &0.00150417, 0.00131132, 0.00114241, 0.000994366, 0.000864575,
- &0.000750893, 0.000651563, 0.00056502, 0.000489769, 0.000424368,
- &0.00036749, 0.000318001, 0.000274961, 0.000237584, 0.000205188,
- &0.000177153, 0.000152904, 0.000131918, 0.000113742, 9.79971e-05,
- &8.43751e-05, 7.26128e-05, 6.24714e-05, 5.3733e-05/
- DATA (FLUX(I,5,3),I=1,119) /7.67881e-09, 7.54357e-06, 5.92886e-05,
- &0.000196611, 0.00045797, 0.000879024, 0.0014927, 0.00232918,
- &0.00341578, 0.00477676, 0.00643302, 0.00840168, 0.0106956,
- &0.0133228, 0.0162858, 0.0195811, 0.0231985, 0.0271202, 0.0313215,
- &0.0357694, 0.0404231, 0.0452356, 0.0501528, 0.0551159, 0.0600627,
- &0.06493, 0.0696545, 0.0741767, 0.0784408, 0.082399, 0.086011,
- &0.0892462, 0.0920832, 0.0945115, 0.0965297, 0.0981441, 0.0993701,
- &0.100229, 0.100746, 0.10095, 0.100875, 0.100552, 0.100014,
- &0.0992936, 0.0984218, 0.097427, 0.0963357, 0.0951719, 0.093957,
- &0.0927098, 0.0914464, 0.0901803, 0.0889224, 0.0876818, 0.0864652,
- &0.0852772, 0.0841213, 0.0829988, 0.08191, 0.0808538, 0.0798285,
- &0.0750509, 0.0705011, 0.0657913, 0.0608118, 0.0557087, 0.0507283,
- &0.0460694, 0.0418151, 0.0379423, 0.0343766, 0.0310499, 0.0279327,
- &0.025033, 0.0223728, 0.0199657, 0.0178044, 0.0158648, 0.0141164,
- &0.0125338, 0.0111013, 0.00981121, 0.00865793, 0.00763366,
- &0.00672658, 0.00592251, 0.00520797, 0.00457206, 0.00400705,
- &0.00350824, 0.0030683, 0.00268218, 0.00234346, 0.00204591,
- &0.00178415, 0.00155392, 0.0013519, 0.00117523, 0.00102119,
- &0.000887018, 0.000770095, 0.000668061, 0.000578992, 0.000501331,
- &0.000433784, 0.000375185, 0.000324413, 0.000280419, 0.000242259,
- &0.000209136, 0.000180402, 0.00015552, 0.000134018, 0.000115463,
- &9.9454e-05, 8.56321e-05, 7.36885e-05, 6.33696e-05, 5.44653e-05/
- DATA (ETVALS(I,6),I=1,151) /0.00314159, 0.0314159, 0.0628319,
- &0.0942478, 0.125664, 0.15708, 0.188496, 0.219911, 0.251327,
- &0.282743, 0.314159, 0.345575, 0.376991, 0.408407, 0.439823,
- &0.471239, 0.502655, 0.534071, 0.565487, 0.596903, 0.628319,
- &0.659734, 0.69115, 0.722566, 0.753982, 0.785398, 0.816814,
- &0.84823, 0.879646, 0.911062, 0.942478, 0.973894, 1.00531,
- &1.03673, 1.06814, 1.09956, 1.13097, 1.16239, 1.19381,
- &1.22522, 1.25664, 1.28805, 1.31947, 1.35088, 1.3823,
- &1.41372, 1.44513, 1.47655, 1.50796, 1.53938, 1.5708,
- &1.60221, 1.63363, 1.66504, 1.69646, 1.72788, 1.75929,
- &1.79071, 1.82212, 1.85354, 1.88496, 1.91637, 1.94779,
- &1.9792, 2.01062, 2.04204, 2.07345, 2.10487, 2.13628,
- &2.1677, 2.19911, 2.23053, 2.26195, 2.29336, 2.32478,
- &2.35619, 2.38761, 2.41903, 2.45044, 2.48186, 2.51327,
- &2.54469, 2.57611, 2.60752, 2.63894, 2.67035, 2.70177,
- &2.73319, 2.7646, 2.79602, 2.82743, 2.85885, 2.89027,
- &2.92168, 2.9531, 2.98451, 3.01593, 3.04734, 3.07876,
- &3.11018, 3.14159, 3.29867, 3.45575, 3.61283, 3.76991,
- &3.92699, 4.08407, 4.24115, 4.39823, 4.55531, 4.71239,
- &4.86947, 5.02655, 5.18363, 5.34071, 5.49779, 5.65487,
- &5.81195, 5.96903, 6.12611, 6.28319, 6.44026, 6.59734,
- &6.75442, 6.9115, 7.06858, 7.22566, 7.38274, 7.53982,
- &7.6969, 7.85398, 8.01106, 8.16814, 8.32522, 8.4823,
- &8.63938, 8.79646, 8.95354, 9.11062, 9.2677, 9.42478,
- &9.73894, 10.0531, 10.3673, 10.6814, 10.9956, 11.3097,
- &11.6239, 11.9381, 12.2522, 12.5664/
- DATA (FLUX(I,6,1),I=1,151) /0.000809285, 0.0079693, 0.0156311,
- &0.022938, 0.0298497, 0.0363344, 0.0423699, 0.0479426, 0.0530494,
- &0.0576952, 0.0618929, 0.0656626, 0.0690295, 0.0720232, 0.0746762,
- &0.0770231, 0.0790985, 0.0809368, 0.0825719, 0.0840346, 0.0853549,
- &0.0865583, 0.0876687, 0.088706, 0.0896874, 0.0906267, 0.0915347,
- &0.0924189, 0.0932841, 0.0941337, 0.0949672, 0.0957836, 0.0965798,
- &0.0973506, 0.0980911, 0.0987955, 0.099457, 0.100069, 0.100626,
- &0.10112, 0.101549, 0.101906, 0.102188, 0.102393, 0.102519,
- &0.102566, 0.102533, 0.102423, 0.102238, 0.101979, 0.101652,
- &0.101261, 0.100809, 0.100302, 0.0997452, 0.0991436, 0.0985024,
- &0.0978265, 0.0971203, 0.0963888, 0.0956363, 0.094866, 0.0940814,
- &0.0932857, 0.092481, 0.0916692, 0.090853, 0.0900324, 0.0892086,
- &0.0883826, 0.087554, 0.0867231, 0.0858899, 0.0850532, 0.0842132,
- &0.0833692, 0.0825207, 0.0816667, 0.080807, 0.0799407, 0.079068,
- &0.0781883, 0.0773019, 0.0764082, 0.0755076, 0.0746006, 0.0736877,
- &0.0727694, 0.0718463, 0.0709193, 0.0699895, 0.0690574, 0.068124,
- &0.0671912, 0.0662592, 0.065329, 0.0644021, 0.0634791, 0.0625611,
- &0.061649, 0.060743, 0.0563301, 0.0521382, 0.0481676, 0.0443965,
- &0.0408061, 0.037396, 0.03418, 0.0311759, 0.0283927, 0.0258257,
- &0.0234595, 0.0212756, 0.0192593, 0.0174016, 0.0156973, 0.014142,
- &0.0127284, 0.0114458, 0.0102822, 0.00922554, 0.00826637,
- &0.00739746, 0.00661279, 0.00590658, 0.00527226, 0.00470284,
- &0.0041915, 0.00373215, 0.00331982, 0.00295038, 0.0026202,
- &0.00232572, 0.00206331, 0.00182949, 0.00162103, 0.0014352,
- &0.00126972, 0.00112262, 0.000992099, 0.000876413, 0.000683056,
- &0.000531116, 0.000412083, 0.000319294, 0.000247034, 0.000190749,
- &0.000147057, 0.00011326, 8.71096e-05, 6.6887e-05/
- DATA (FLUX(I,6,2),I=1,151) /1.78396e-06, 0.000175716, 0.000692887,
- &0.00153366, 0.0026707, 0.00406879, 0.00569523, 0.00752629,
- &0.00954095, 0.0117094, 0.0139905, 0.0163431, 0.0187403, 0.0211698,
- &0.02362, 0.0260668, 0.0284768, 0.030823, 0.0330963, 0.035301,
- &0.0374375, 0.0394932, 0.0414492, 0.043295, 0.0450364, 0.0466863,
- &0.0482513, 0.0497262, 0.051103, 0.0523826, 0.053576, 0.0546968,
- &0.0557502, 0.0567343, 0.0576477, 0.0584957, 0.0592887, 0.0600346,
- &0.0607356, 0.0613902, 0.0620003, 0.0625719, 0.0631111, 0.0636198,
- &0.0640962, 0.0645394, 0.0649529, 0.0653413, 0.0657063, 0.0660451,
- &0.0663531, 0.0666306, 0.0668822, 0.0671113, 0.0673159, 0.0674904,
- &0.0676309, 0.0677389, 0.0678196, 0.0678756, 0.0679033, 0.0678972,
- &0.0678551, 0.0677799, 0.0676778, 0.0675501, 0.0673939, 0.0672048,
- &0.066983, 0.066733, 0.0664597, 0.0661647, 0.0658456, 0.0655,
- &0.0651299, 0.0647396, 0.064333, 0.0639106, 0.0634715, 0.0630148,
- &0.062543, 0.0620595, 0.0615657, 0.0610623, 0.0605486, 0.0600253,
- &0.0594937, 0.0589563, 0.0584128, 0.057863, 0.0573069, 0.0567457,
- &0.0561806, 0.0556118, 0.0550388, 0.0544604, 0.053878, 0.0532926,
- &0.0527051, 0.0521146, 0.0515202, 0.0485068, 0.0454498, 0.0423943,
- &0.0393923, 0.036488, 0.0337105, 0.0310715, 0.0285714, 0.0262057,
- &0.0239722, 0.0218738, 0.0199158, 0.018101, 0.0164264, 0.0148842,
- &0.0134648, 0.0121592, 0.0109605, 0.00986385, 0.00886488,
- &0.00795832, 0.00713765, 0.00639526, 0.0057237, 0.00511655,
- &0.00456864, 0.00407545, 0.00363267, 0.00323588, 0.0028806,
- &0.00256244, 0.00227744, 0.00202224, 0.00179408, 0.00159053,
- &0.00140929, 0.00124804, 0.00110459, 0.000976957, 0.000863437,
- &0.000673092, 0.000523742, 0.000406926, 0.000315524, 0.000244201,
- &0.000188768, 0.000145714, 0.000112263, 8.63566e-05, 6.6358e-05/
- DATA (FLUX(I,6,3),I=1,151) /8.97104e-09, 8.83026e-06, 6.95537e-05,
- &0.000231151, 0.000539569, 0.00103781, 0.00176596, 0.00276113,
- &0.00405724, 0.0056848, 0.00767043, 0.0100363, 0.0127997, 0.015972,
- &0.019558, 0.0235552, 0.0279528, 0.0327314, 0.0378621, 0.0433069,
- &0.049018, 0.0549392, 0.0610064, 0.0671499, 0.0732951, 0.0793657,
- &0.0852866, 0.0909847, 0.0963937, 0.101454, 0.106117, 0.110344,
- &0.114107, 0.117392, 0.120194, 0.122518, 0.124381, 0.125804,
- &0.126815, 0.127449, 0.127742, 0.127729, 0.12745, 0.126942,
- &0.12624, 0.125378, 0.124389, 0.123299, 0.122136, 0.120921,
- &0.119676, 0.118415, 0.117153, 0.115902, 0.114669, 0.113462,
- &0.112286, 0.111142, 0.110031, 0.108953, 0.107906, 0.106888,
- &0.105894, 0.104921, 0.103964, 0.103018, 0.102079, 0.101142,
- &0.100203, 0.0992566, 0.0983002, 0.0973301, 0.0963441, 0.0953403,
- &0.094317, 0.0932737, 0.0922101, 0.0911269, 0.0900243, 0.0889043,
- &0.0877678, 0.0866176, 0.0854555, 0.0842843, 0.0831059, 0.0819233,
- &0.0807391, 0.0795555, 0.0783748, 0.0771996, 0.0760317, 0.0748732,
- &0.0737254, 0.0725897, 0.0714675, 0.0703598, 0.0692667, 0.0681891,
- &0.0671271, 0.0660808, 0.0650502, 0.0601166, 0.0554934, 0.0511039,
- &0.0469081, 0.0429128, 0.0391519, 0.0356579, 0.0324431, 0.0294951,
- &0.026786, 0.0242869, 0.0219771, 0.0198474, 0.0178946, 0.0161153,
- &0.0145015, 0.0130401, 0.0117155, 0.0105126, 0.00942002,
- &0.00842961, 0.00753512, 0.00673031, 0.00600798, 0.00536004,
- &0.00477832, 0.00425563, 0.00378616, 0.00336528, 0.00298896,
- &0.00265334, 0.00235437, 0.00208804, 0.00185062, 0.0016389,
- &0.00145026, 0.00128246, 0.00113351, 0.00100149, 0.000884528,
- &0.000688981, 0.000535337, 0.00041517, 0.000321595, 0.000248695,
- &0.000191937, 0.000147936, 0.000113911, 8.75761e-05, 6.72234e-05/
- PIFAC = ACOS(-ONE)
-C Spectrum
- RADHOR = (RHFACT*BHMASS)**(ONE/(TOTDIM-THREE))
- HWKTMP = (TOTDIM-THREE)/(4.0D0*PIFAC*RADHOR)
- IF (HWKTMP.GT.THWMAX) HWKTMP=THWMAX
- IF(GRYBDY) THEN
- SPCMAX=MXARRY(TOTDIM-5,SPIN+1)
- ELSE
- IF (STAT.EQ.-1) THEN
- SPCMAX=HALF*HWKTMP**2
- ELSE
- SPCMAX=(TWO/THREE)*HWKTMP**2
- ENDIF
- ENDIF
- POINTS=NARRAY(TOTDIM-5)
-C MC for energy
- 10 ETRAT=CHRUNI(0,ZERO,ETVALS(POINTS,TOTDIM-5))
- ENERGY=HWKTMP*ETRAT
- IF (GRYBDY) THEN
- SPCVAL=CHUTAB(FLUX(1,TOTDIM-5,SPIN+1),ETVALS(1,TOTDIM-5),
- & POINTS,ETRAT,4)
- ELSE
- SPCVAL=(ENERGY**2)/(EXP(ETRAT)-STAT)
- ENDIF
- IF (SPCVAL.LT.SPCMAX*CHRGEN(1)) GOTO 10
- END
-CDECK ID>, CHULB4.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Adapted by Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHULB4(PS,PI,PF)
-C-----------------------------------------------------------------------
-C TRANSFORMS PI (GIVEN IN REST FRAME OF PS) INTO PF (IN LAB)
-C N.B. P(1,2,3,4) = (PX,PY,PZ,E); PS(5)=M
-C (taken from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION PF4,FN,PS(5),PI(4),PF(4)
- IF (PS(4).EQ.PS(5)) THEN
- PF(1)= PI(1)
- PF(2)= PI(2)
- PF(3)= PI(3)
- PF(4)= PI(4)
- ELSE
- PF4 = (PI(1)*PS(1)+PI(2)*PS(2)
- & +PI(3)*PS(3)+PI(4)*PS(4))/PS(5)
- FN = (PF4+PI(4)) / (PS(4)+PS(5))
- PF(1)= PI(1) + FN*PS(1)
- PF(2)= PI(2) + FN*PS(2)
- PF(3)= PI(3) + FN*PS(3)
- PF(4)= PF4
- END IF
- END
-CDECK ID>, CHULOB.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Adapted by Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHULOB(PS,PI,PF)
-C-----------------------------------------------------------------------
-C TRANSFORMS PI (GIVEN IN REST FRAME OF PS) INTO PF (IN LAB)
-C N.B. P(1,2,3,4,5) = (PX,PY,PZ,E,M)
-C (taken from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION PS(5),PI(5),PF(5)
- CALL CHULB4(PS,PI,PF)
- PF(5)= PI(5)
- END
-CDECK ID>, CHUMAS.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHUMAS(P)
-C-----------------------------------------------------------------------
-C PUTS INVARIANT MASS IN 5TH COMPONENT OF VECTOR
-C (NEGATIVE SIGN IF SPACELIKE) (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHUSQR,P(5)
- EXTERNAL CHUSQR
- P(5)=CHUSQR((P(4)+P(3))*(P(4)-P(3))-P(1)**2-P(2)**2)
- END
-CDECK ID>, CHUPCM.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- FUNCTION CHUPCM(EM0,EM1,EM2)
-C-----------------------------------------------------------------------
-C C.M. MOMENTUM FOR DECAY MASSES EM0 -> EM1 + EM2
-C SET TO -1 BELOW THRESHOLD (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHUPCM,EM0,EM1,EM2,EMS,EMD
- EMS=ABS(EM1+EM2)
- EMD=ABS(EM1-EM2)
- IF (EM0.LT.EMS.OR.EM0.LT.EMD) THEN
- CHUPCM=-1.0D0
- ELSEIF (EM0.EQ.EMS.OR.EM0.EQ.EMD) THEN
- CHUPCM=0.0D0
- ELSE
- CHUPCM=SQRT((EM0+EMD)*(EM0-EMD)*
- & (EM0+EMS)*(EM0-EMS))*0.5D0/EM0
- ENDIF
- END
-CDECK ID>, CHUROB.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHUROB(R,P,Q)
-C-----------------------------------------------------------------------
-C ROTATES VECTORS BY INVERSE OF ROTATION MATRIX R
-C (taken from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION S1,S2,S3,R(3,3),P(3),Q(3)
- S1=P(1)*R(1,1)+P(2)*R(2,1)+P(3)*R(3,1)
- S2=P(1)*R(1,2)+P(2)*R(2,2)+P(3)*R(3,2)
- S3=P(1)*R(1,3)+P(2)*R(2,3)+P(3)*R(3,3)
- Q(1)=S1
- Q(2)=S2
- Q(3)=S3
- END
-CDECK ID>, CHUROT.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHUROT(P,CP,SP,R)
-C-----------------------------------------------------------------------
-C R IS ROTATION MATRIX TO GET FROM VECTOR P TO Z AXIS, FOLLOWED BY
-C A ROTATION BY PSI ABOUT Z AXIS, WHERE CP = COS-PSI, SP = SIN-PSI
-C (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION WN,CP,SP,PTCUT,PP,PT,CT,ST,CF,SF,P(3),R(3,3)
- DATA WN,PTCUT/1.D0,1.D-20/
- PT=P(1)**2+P(2)**2
- PP=P(3)**2+PT
- IF (PT.LE.PP*PTCUT) THEN
- CT=SIGN(WN,P(3))
- ST=0.0D0
- CF=1.0D0
- SF=0.0D0
- ELSE
- PP=SQRT(PP)
- PT=SQRT(PT)
- CT=P(3)/PP
- ST=PT/PP
- CF=P(1)/PT
- SF=P(2)/PT
- END IF
- R(1,1)= CP*CF*CT+SP*SF
- R(1,2)= CP*SF*CT-SP*CF
- R(1,3)=-CP*ST
- R(2,1)=-CP*SF+SP*CF*CT
- R(2,2)= CP*CF+SP*SF*CT
- R(2,3)=-SP*ST
- R(3,1)= CF*ST
- R(3,2)= SF*ST
- R(3,3)= CT
- END
-CDECK ID>, CHUSQR.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- FUNCTION CHUSQR(X)
-C-----------------------------------------------------------------------
-C SQUARE ROOT WITH SIGN RETENTION (extracted from HERWIG)
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- DOUBLE PRECISION CHUSQR,X
- CHUSQR=SIGN(SQRT(ABS(X)),X)
- END
-CDECK ID>, CHUTAB.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Adapted by Bryan Webber
-C-----------------------------------------------------------------------
- FUNCTION CHUTAB(F,A,NN,X,MM)
-C-----------------------------------------------------------------------
-C MODIFIED CERN INTERPOLATION ROUTINE DIVDIF
-C-----------------------------------------------------------------------
- IMPLICIT NONE
- INTEGER NN,MM,MMAX,N,M,MPLUS,IX,IY,MID,NPTS,IP,I,J,L,ISUB
- DOUBLE PRECISION CHUTAB,SUM,X,F(NN),A(NN),T(20),D(20)
- LOGICAL EXTRA
- DATA MMAX/10/
- N=NN
- M=MIN(MM,MMAX,N-1)
- MPLUS=M+1
- IX=0
- IY=N+1
- IF (A(1).GT.A(N)) GOTO 4
- 1 MID=(IX+IY)/2
- IF (X.GE.A(MID)) GOTO 2
- IY=MID
- GOTO 3
- 2 IX=MID
- 3 IF (IY-IX.GT.1) GOTO 1
- GOTO 7
- 4 MID=(IX+IY)/2
- IF (X.LE.A(MID)) GOTO 5
- IY=MID
- GOTO 6
- 5 IX=MID
- 6 IF (IY-IX.GT.1) GOTO 4
- 7 NPTS=M+2-MOD(M,2)
- IP=0
- L=0
- GOTO 9
- 8 L=-L
- IF (L.GE.0) L=L+1
- 9 ISUB=IX+L
- IF ((1.LE.ISUB).AND.(ISUB.LE.N)) GOTO 10
- NPTS=MPLUS
- GOTO 11
- 10 IP=IP+1
- T(IP)=A(ISUB)
- D(IP)=F(ISUB)
- 11 IF (IP.LT.NPTS) GOTO 8
- EXTRA=NPTS.NE.MPLUS
- DO 14 L=1,M
- IF (.NOT.EXTRA) GOTO 12
- ISUB=MPLUS-L
- D(M+2)=(D(M+2)-D(M))/(T(M+2)-T(ISUB))
- 12 I=MPLUS
- DO 13 J=L,M
- ISUB=I-L
- D(I)=(D(I)-D(I-1))/(T(I)-T(ISUB))
- I=I-1
- 13 CONTINUE
- 14 CONTINUE
- SUM=D(MPLUS)
- IF (EXTRA) SUM=0.5D0*(SUM+D(M+2))
- J=M
- DO 15 L=1,M
- SUM=D(J)+(X-T(J))*SUM
- J=J-1
- 15 CONTINUE
- CHUTAB=SUM
- END
-CDECK ID>, CHVDIF.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHVDIF(N,P,Q,R)
-C-----------------------------------------------------------------------
-C VECTOR DIFFERENCE (extracted from HERWIG)
-C-----------------------------------------------------------------------
- DOUBLE PRECISION P(N),Q(N),R(N)
- INTEGER N,I
- DO 10 I=1,N
- 10 R(I)=P(I)-Q(I)
- END
-CDECK ID>, CHVEQU.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHVEQU(N,P,Q)
-C-----------------------------------------------------------------------
-C VECTOR EQUALITY (extracted from HERWIG)
-C-----------------------------------------------------------------------
- DOUBLE PRECISION P(N),Q(N)
- INTEGER N,I
- DO 10 I=1,N
- 10 Q(I)=P(I)
- END
-CDECK ID>, CHVSUM.
-*CMZ :- -17/07/03 18.11.30 by Peter Richardson
-*-- Author : Bryan Webber
-C-----------------------------------------------------------------------
- SUBROUTINE CHVSUM(N,P,Q,R)
-C-----------------------------------------------------------------------
-C VECTOR SUM (extracted from HERWIG)
-C-----------------------------------------------------------------------
- DOUBLE PRECISION P(N),Q(N),R(N)
- DO 10 I=1,N
- 10 R(I)=P(I)+Q(I)
- END
diff --git a/Generators/EvgenJobTransforms/CMakeLists.txt b/Generators/EvgenJobTransforms/CMakeLists.txt
index 8736b66f00e777de4bf9cb00187f38ead37cc1dd..4b9ece4430687013a03c91c8206d29422ae6a1cc 100644
--- a/Generators/EvgenJobTransforms/CMakeLists.txt
+++ b/Generators/EvgenJobTransforms/CMakeLists.txt
@@ -6,4 +6,4 @@ atlas_subdir( EvgenJobTransforms )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-atlas_install_runtime( scripts/*.py )
+atlas_install_runtime( scripts/*.py share/file/*.txt )
diff --git a/Generators/EvgenJobTransforms/scripts/Gen_tf.py b/Generators/EvgenJobTransforms/scripts/Gen_tf.py
index ee7ba47953fc365169ecc3d885a77fe4fc6f68dc..91bd3d84c4f45c409a972e7c78cbb5e7351df3d1 100755
--- a/Generators/EvgenJobTransforms/scripts/Gen_tf.py
+++ b/Generators/EvgenJobTransforms/scripts/Gen_tf.py
@@ -118,19 +118,39 @@ class EvgenExecutor(athenaExecutor):
# copy config files to cwd
FIRST_DIR = (os.environ['JOBOPTSEARCHPATH']).split(":")[0]
configFiles = [f for f in os.listdir(FIRST_DIR) if ( "GRID" in f)]
+ confFile=None
if len(configFiles) == 1:
confFile = os.path.join(FIRST_DIR, configFiles[0])
expand_if_archive(confFile)
msg.info('Configuration input found: %s' % confFile)
elif len(configFiles) >1:
- msg.error("Too many *GRID* config files, please check = '%s'" % dsidparam)
+ msg.info("more then one gridpack ! ")
+ if "--ecmEnergy" in str(sys.argv[1:]):
+ ener=str(sys.argv[1:]).split("ecmEnergy",1)[1]
+ energy=str(ener)[:4].strip(" =0\']")
+ printfunc("Should be used gridpack for energy "+energy)
+ else:
+ energy="13"
+ for x in configFiles:
+ gridS="mc_"+energy+"TeV"
+ printfunc("Gridpack should start from "+gridS)
+ if x.startswith(gridS):
+ confFile = os.path.join(FIRST_DIR, x)
+ msg.info("using gridpack = "+confFile)
+ if confFile is None:
+ msg.error("No *GRID* config files, for requested energy = '%s' please check = '%s'" %(energy,dsidparam))
+
+ if confFile is not None:
+ expand_if_archive(confFile)
+# os.system("cp %s ." % confFile)
+ printfunc("Configuration input gridpack found " + confFile)
#Expand if a tarball is found in local directory
loc_files = os.listdir(os.getcwd())
- for loc_file in loc_files:
- expand_if_archive(loc_file)
-
-
+ for loc_file in loc_files:
+ if "GRID" not in loc_file:
+ expand_if_archive(loc_file)
+
## Expand tarball input event and generator conf files, if provided
if "inputGeneratorFile" in self._trf.argdict:
# expand_if_archive(self._trf.argdict["inputGeneratorFile"].value)
@@ -159,6 +179,10 @@ def getTransform():
if "--outputEVNTFile" in str(sys.argv[1:]):
exeSet.add(EvgenExecutor(name="generate", skeleton="EvgenJobTransforms/skel.GENtoEVGEN.py", inData=["inNULL"], outData=["EVNT", "EVNT_Pre", "TXT" ]))
msg.info("Output EVNT file")
+ elif "--outputYODAFile" in str(sys.argv[1:]):
+ exeSet.add(EvgenExecutor(name="generate", skeleton="EvgenJobTransforms/skel.GENtoEVGEN.py", inData=["inNULL"], outData=["outNULL", "TXT"
+]))
+ msg.info("Output EVNT file")
elif "--outputTXTFile" in str(sys.argv[1:]):
exeSet.add(EvgenExecutor(name="generate", skeleton="EvgenJobTransforms/skel.GENtoTXT.py", inData=["inNULL"], outData=["TXT"]))
msg.info("Output TXT file")
diff --git a/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py b/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py
index 6b5c098e20033b925f879010112b2b4ab249d3f2..beae3cff24499a542319a792018901e63376cd93 100644
--- a/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py
+++ b/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py
@@ -79,11 +79,21 @@ if hasattr(runArgs, "runNumber"):
if hasattr(runArgs, "inputGenConfFile"):
raise RuntimeError("inputGenConfFile is invalid !! Gridpacks and config. files/links to be put into DSID directory ")
+
+if hasattr(runArgs, "inputGeneratorFile"):
+ evgenLog.info("inputGeneratorFile used " + runArgs.inputGeneratorFile)
+
+if hasattr(runArgs, "outputYODAFile"):
+ evgenLog.info("outputYODAFile specified " + runArgs.outputYODAFile)
## Ensure that an output name has been given
# TODO: Allow generation without writing an output file (if outputEVNTFile is None)?
if not hasattr(runArgs, "outputEVNTFile") and not hasattr(runArgs, "outputEVNT_PreFile"):
- raise RuntimeError("No output evgen EVNT or EVNT_Pre file provided.")
+ if hasattr(runArgs, "outputYODAFile"):
+ evgenLog.info("No outputEVNTFile specified but outputYODAFile is used")
+ evgenLog.info("Will run GENtoEVGEN without saving the output EVNT file, asuming a valid outputYODAFile will be produced")
+ else:
+ raise RuntimeError("No output evgen EVNT or EVNT_Pre file provided.")
## Ensure that mandatory args have been supplied (complain before processing the includes)
if not hasattr(runArgs, "ecmEnergy"):
@@ -166,6 +176,8 @@ if hasattr(runArgs, "rivetAnas"):
anaSeq += Rivet_i()
anaSeq.Rivet_i.Analyses = runArgs.rivetAnas
anaSeq.Rivet_i.DoRootHistos = True
+ if hasattr(runArgs, "outputYODAFile"):
+ anaSeq.Rivet_i.HistoFile = runArgs.outputYODAFile
##==============================================================
## Pre- and main config parsing
@@ -249,6 +261,9 @@ include(jofile)
## Announce start of JO checking
evgenLog.debug("****************** CHECKING EVGEN CONFIGURATION *****************")
+if hasattr(runArgs,'inputGeneratorFile') and int(evgenConfig.inputFilesPerJob) == 0 :
+ evgenConfig.inputFilesPerJob = 1
+
## Print out options
for opt in str(evgenConfig).split(os.linesep):
evgenLog.info(opt)
@@ -311,15 +326,29 @@ rounding = 0
if hasattr(runArgs,'inputGeneratorFile') and ',' in runArgs.inputGeneratorFile: multiInput = runArgs.inputGeneratorFile.count(',')+1
else:
multiInput = 0
-
-if evgenConfig.nEventsPerJob < 1:
- raise RunTimeError("evgenConfig.nEventsPerJob must be at least 1")
+
+# check if default nEventsPerJob used
+if not evgenConfig.nEventsPerJob:
+ evgenLog.info('#############################################################')
+ evgenLog.info(' !!!! no nEventsPerJob set !!! The default 10000 used. !!! ')
+ evgenLog.info('#############################################################')
+else:
+ evgenLog.info(' nEventsPerJob set to ' + str(evgenConfig.nEventsPerJob) )
+
+if evgenConfig.minevents > 0 :
+ raise RuntimeError("evgenConfig.minevents is obsolete and should be removed from the JOs")
+elif evgenConfig.nEventsPerJob > 100000:
+ raise RuntimeError("evgenConfig.nEventsPerJob can be max. 100000")
else:
allowed_nEventsPerJob_lt1000 = [1, 2, 5, 10, 20, 25, 50, 100, 200, 500, 1000]
msg = "evgenConfig.nEventsPerJob = %d: " % evgenConfig.nEventsPerJob
- if evgenConfig.nEventsPerJob >= 1000 and evgenConfig.nEventsPerJob % 1000 != 0 and 10000 % evgenConfig.nEventsPerJob != 0 :
- msg += "nEventsPerJob in range >= 1K must be a multiple of 1K and a divisor of 10K"
+ if evgenConfig.nEventsPerJob >= 1000 and evgenConfig.nEventsPerJob <=10000 and (evgenConfig.nEventsPerJob % 1000 != 0 or 10000 %
+evgenConfig.nEventsPerJob != 0) :
+ msg += "nEventsPerJob in range [1K, 10K] must be a multiple of 1K and a divisor of 10K"
+ raise RuntimeError(msg)
+ elif evgenConfig.nEventsPerJob > 10000 and evgenConfig.nEventsPerJob % 10000 != 0:
+ msg += "nEventsPerJob >10K must be a multiple of 10K"
raise RuntimeError(msg)
elif evgenConfig.nEventsPerJob < 1000 and evgenConfig.nEventsPerJob not in allowed_nEventsPerJob_lt1000:
msg += "nEventsPerJob in range <= 1000 must be one of %s" % allowed_nEventsPerJob_lt1000
@@ -331,9 +360,9 @@ else:
if evgenConfig.keywords:
## Get the allowed keywords file from the JO package if possibe
# TODO: Make the package name configurable
- kwfile = "EvgenJobTransforms/evgenkeywords.txt"
+ kwfile = "evgenkeywords.txt"
kwpath = None
- for p in os.environ["JOBOPTSEARCHPATH"].split(":"):
+ for p in os.environ["DATAPATH"].split(":"):
kwpath = os.path.join(p, kwfile)
if os.path.exists(kwpath):
break
@@ -356,15 +385,15 @@ if evgenConfig.keywords:
if officialJO:
sys.exit(1)
else:
- evgenLog.warning("Could not find evgenkeywords.txt file %s in $JOBOPTSEARCHPATH" % kwfile)
+ evgenLog.warning("Could not find evgenkeywords.txt file %s in DATAPATH" % kwfile )
## Check that the L1 and L2 keywords pairs are in the list of allowed words pairs (and exit if processing an official JO)
if evgenConfig.categories:
## Get the allowed categories file from the JO package if possibe
# TODO: Make the package name configurable
- lkwfile = "EvgenJobTransforms/CategoryList.txt"
+ lkwfile = "CategoryList.txt"
lkwpath = None
- for p in os.environ["JOBOPTSEARCHPATH"].split(":"):
+ for p in os.environ["DATAPATH"].split(":"):
lkwpath = os.path.join(p, lkwfile)
if os.path.exists(lkwpath):
break
@@ -397,7 +426,7 @@ if evgenConfig.categories:
if officialJO:
sys.exit(1)
else:
- evgenLog.warning("Could not find CategoryList.txt file %s in $JOBOPTSEARCHPATH" % lkwfile)
+ evgenLog.warning("Could not find CategoryList.txt file %s in $DATAPATH" % lkwfile)
## Configure POOL streaming to the output EVNT format file
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
@@ -465,6 +494,38 @@ if hasattr(testSeq, "TestHepMC") and not gens_testhepmc(evgenConfig.generators):
evgenLog.info("Removing TestHepMC sanity checker")
del testSeq.TestHepMC
+##=============================================================
+## Check release number
+##=============================================================
+# Function to check blacklist (from Spyros'es logParser.py)
+def checkBlackList(relFlavour,cache,generatorName) :
+ isError = None
+ with open('/cvmfs/atlas.cern.ch/repo/sw/Generators/MC16JobOptions/common/BlackList_caches.txt') as bfile:
+ for line in bfile.readlines():
+ if not line.strip():
+ continue
+ # Blacklisted release flavours
+ badRelFlav=line.split(',')[0].strip()
+ # Blacklisted caches
+ badCache=line.split(',')[1].strip()
+ # Blacklisted generators
+ badGens=line.split(',')[2].strip()
+
+ used_gens = ','.join(generatorName)
+ #Match Generator and release type e.g. AtlasProduction, MCProd
+ if relFlavour==badRelFlav and cache==badCache and re.search(badGens,used_gens) is not None:
+ if badGens=="": badGens="all generators"
+ isError=relFlavour+","+cache+" is blacklisted for " + badGens
+ return isError
+ return isError
+## Announce start of JO checkingrelease number checking
+evgenLog.debug("****************** CHECKING RELEASE IS NOT BLACKLISTED *****************")
+rel = os.popen("echo $AtlasVersion").read()
+rel = rel.strip()
+errorBL = checkBlackList("AthGeneration",rel,gennames)
+if (errorBL):
+ raise RuntimeError("This run is blacklisted for this generator, please use a different one !! "+ errorBL)
+# evgenLog.warning("This run is blacklisted for this generator, please use a different one !! "+ errorBL )
##==============================================================
## Handling of a post-include/exec args at the end of standard configuration
@@ -659,12 +720,6 @@ else:
raise RuntimeError("evgenConfig.inputfilecheck specified in %s, but generators %s do not require an input file" %
(runArgs.jobConfig, str(gennames)))
-## Check conf files, as above but for a different command line arg, and with omission allowed
-if hasattr(runArgs, "inputGenConfFile") and runArgs.inputGenConfFile != "NONE":
- if evgenConfig.inputconfcheck and not re.search(evgenConfig.inputconfcheck, runArgs.inputGenConfFile):
- raise RuntimeError("inputGenConfFile=%s is incompatible with inputconfcheck (%s) in %s" %
- (runArgs.inputGenConfFile, evgenConfig.inputconfcheck, runArgs.jobConfig))
-
## Do the aux-file copying
if evgenConfig.auxfiles:
from PyJobTransformsCore.trfutil import get_files
@@ -683,6 +738,19 @@ def _checkattr(attr, required=False):
return False
return True
+if hasattr(runArgs, "outputTXTFile"):
+ # counting the number of events in LHE output
+ with open(eventsFile) as f:
+ contents = f.read()
+ count_ev = contents.count("<event>")
+ printfunc("MetaData: %s = %s" % ("Number of produced LHE events ", count_ev))
+elif hasattr(runArgs, "inputGeneratorFile"):
+ # counting the number of events in LHE output
+ with open(eventsFile) as f:
+ contents = f.read()
+ count_ev = contents.count("<event>")
+ printfunc("MetaData: %s = %s" % ("Number of input LHE events ", count_ev))
+
if _checkattr("description", required=True):
msg = evgenConfig.description
if _checkattr("notes"):
diff --git a/Generators/EvgenJobTransforms/share/skel.GENtoTXT.py b/Generators/EvgenJobTransforms/share/skel.GENtoTXT.py
index db20bad83f6800d2c1d4ca612d37abf33551d9b3..f213345143a1056cebded25142d47a36413e41dd 100644
--- a/Generators/EvgenJobTransforms/share/skel.GENtoTXT.py
+++ b/Generators/EvgenJobTransforms/share/skel.GENtoTXT.py
@@ -33,7 +33,7 @@ testSeq = acam.athMasterSeq.EvgenTestSeq
## NOTE: LogicalExpressionFilter is an algorithm, not a sequence
from EvgenProdTools.LogicalExpressionFilter import LogicalExpressionFilter
acam.athMasterSeq += LogicalExpressionFilter("EvgenFilterSeq")
-filtSeq = acam.athMsterSeq.EvgenFilterSeq
+filtSeq = acam.athMasterSeq.EvgenFilterSeq
topSeq = acas.AlgSequence()
anaSeq = topSeq
topSeq += acas.AlgSequence("EvgenPostSeq")
@@ -61,7 +61,7 @@ jobproperties.AthenaCommonFlags.AllowIgnoreConfigError = False
## Set up a standard logger
from AthenaCommon.Logging import logging
-evgenLog = logging.getLogger('Gen_tf_txt')
+evgenLog = logging.getLogger('Gen_tf')
##==============================================================
## Run arg handling
@@ -155,7 +155,7 @@ def OutputTXTFile():
## Only permit one jobConfig argument for evgen: does more than one _ever_ make sense?
if len(runArgs.jobConfig) != 1:
- evgenLog.info("runArgs.jobConfig %s ", % runArgs.jobConfig)
+ evgenLog.info("runArgs.jobConfig " + runArgs.jobConfig)
evgenLog.error("You must supply one and only one jobConfig file argument. It has to start from mc. and end with .py")
sys.exit(1)
@@ -169,7 +169,7 @@ evgenLog.info("dsid " + dsid)
jofiles = [f for f in os.listdir(FIRST_DIR) if (f.startswith('mc') and f.endswith('.py'))]
## Only permit one JO file in each dsid folder
if len(jofiles) !=1:
- evgenLog.info("runArgs.jobConfig wrong %s ", % runArgs.jobConfig)
+ evgenLog.info("runArgs.jobConfig wrong " + runArgs.jobConfig)
evgenLog.error("You must supply one and only one jobOption file in DSID directory. It has to start with mc. and end with .py")
sys.exit(1)
jofile = jofiles[0]
@@ -277,21 +277,14 @@ rounding = 0
if hasattr(runArgs,'inputGeneratorFile') and ',' in runArgs.inputGeneratorFile: multiInput = runArgs.inputGeneratorFile.count(',')+1
else:
multiInput = 0
+
+
if evgenConfig.nEventsPerJob < 1:
- raise RunTimeError("evgenConfig.nEventsPerJob must be at least 0")
-else:
- allowed_nEventsPerJob_lt1000 = [1, 2, 5, 10, 20, 25, 50, 100, 200, 500, 1000]
- msg = "evgenConfig.nEventsPerJob = %d: " % evgenConfig.nEventsPerJob
-
- if evgenConfig.nEventsPerJob >= 1000 and evgenConfig.nEventsPerJob % 1000 != 0 and 10000 % evgenConfig.nEventsPerJob != 0:
- msg += "nEventsPerJob in range >= 1000 must be a multiple of 1000 and a divisor of 10000"
- raise RuntimeError(msg)
- elif evgenConfig.nEventsPerJob < 1000 and evgenConfig.nEventsPerJob not in allowed_nEventsPerJob_lt1000:
- msg += "nEventsPerJob in range <= 1000 must be one of %s" % allowed_nEventsPerJob_lt1000
- raise RuntimeError(msg)
- postSeq.CountHepMC.RequestedOutput = evgenConfig.nEventsPerJob if runArgs.maxEvents == -1 else runArgs.maxEvents
- evgenLog.info('Requested output events '+str(postSeq.CountHepMC.RequestedOutput))
+ raise RunTimeError("evgenConfig.nEventsPerJob must be at least 1")
+else:
+ evgenLog.info("evgenConfig.nEventsPerJob = {}, but only {} (dummy) event(s) will be generated by Pythia8 for lhe-only production".format(evgenConfig.nEventsPerJob, postSeq.CountHepMC.RequestedOutput))
+### NB: postSeq.CountHepMC.RequestedOutput is set to 1 in LHEonly.py
## Check that the keywords list is not empty:
if not evgenConfig.keywords:
@@ -373,6 +366,9 @@ if evgenConfig.categories:
evgenLog.warning("Could not find CategoryList.txt file %s in $JOBOPTSEARCHPATH" % lkwfile)
## Set the run numbers
+dsid = os.path.basename(runArgs.jobConfig[0])
+if not dsid.isdigit():
+ dsid = "999999"
svcMgr.EventSelector.RunNumber = int(dsid)
## Include information about generators in metadata
@@ -398,6 +394,39 @@ include("EvgenJobTransforms/Generate_ecmenergies.py")
## Process random seed arg and pass to generators
include("EvgenJobTransforms/Generate_randomseeds.py")
+##=============================================================
+## Check release number
+##=============================================================
+# Function to check blacklist (from Spyros'es logParser.py)
+def checkBlackList(relFlavour,cache,generatorName) :
+ isError = None
+ with open('/cvmfs/atlas.cern.ch/repo/sw/Generators/MC16JobOptions/common/BlackList_caches.txt') as bfile:
+ for line in bfile.readlines():
+ if not line.strip():
+ continue
+ # Blacklisted release flavours
+ badRelFlav=line.split(',')[0].strip()
+ # Blacklisted caches
+ badCache=line.split(',')[1].strip()
+ # Blacklisted generators
+ badGens=line.split(',')[2].strip()
+
+ used_gens = ','.join(generatorName)
+ #Match Generator and release type e.g. AtlasProduction, MCProd
+ if relFlavour==badRelFlav and cache==badCache and re.search(badGens,used_gens) is not None:
+ if badGens=="": badGens="all generators"
+ isError=relFlavour+","+cache+" is blacklisted for " + badGens
+ return isError
+ return isError
+## Announce start of JO checkingrelease nimber checking
+evgenLog.debug("****************** CHECKING RELEASE IS NOT BLACKLISTED *****************")
+rel = os.popen("echo $AtlasVersion").read()
+rel = rel.strip()
+errorBL = checkBlackList("AthGeneration",rel,gennames)
+if (errorBL):
+# evgenLog.warning("This run is blacklisted for this generator, please use a different one !! "+ errorBL )
+ raise RuntimeError("This run is blacklisted for this generator, please use a different one !! "+ errorBL)
+
## Add special config option (extended model info for BSM scenarios)
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["specialConfiguration", evgenConfig.specialConfig ]
@@ -595,12 +624,6 @@ else:
raise RuntimeError("evgenConfig.inputfilecheck specified in %s, but generators %s do not require an input file" %
(runArgs.jobConfig, str(gennames)))
-## Check conf files, as above but for a different command line arg, and with omission allowed
-if hasattr(runArgs, "inputGenConfFile") and runArgs.inputGenConfFile != "NONE":
- if evgenConfig.inputconfcheck and not re.search(evgenConfig.inputconfcheck, runArgs.inputGenConfFile):
- raise RuntimeError("inputGenConfFile=%s is incompatible with inputconfcheck (%s) in %s" %
- (runArgs.inputGenConfFile, evgenConfig.inputconfcheck, runArgs.jobConfig))
-
## Do the aux-file copying
if evgenConfig.auxfiles:
from PyJobTransformsCore.trfutil import get_files
diff --git a/Generators/EvgenProdTools/CMakeLists.txt b/Generators/EvgenProdTools/CMakeLists.txt
index a15920cd613ca9791369f4c68a76fc5824308252..6ff81b8bc62bed06cae425a81159bbf49bce08ea 100644
--- a/Generators/EvgenProdTools/CMakeLists.txt
+++ b/Generators/EvgenProdTools/CMakeLists.txt
@@ -12,11 +12,11 @@ atlas_add_library( EvgenProdToolsLib
PUBLIC_HEADERS EvgenProdTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib AtlasHepMCsearchLib AthenaBaseComps TruthHelper GeneratorModulesLib GenInterfacesLib
- PRIVATE_LINK_LIBRARIES AthenaKernel EventInfo GaudiKernel TruthUtils )
+ PRIVATE_LINK_LIBRARIES AthenaKernel EventInfo GaudiKernel TruthUtils IOVDbDataModel AthenaPoolUtilities )
atlas_add_component( EvgenProdTools
src/components/*.cxx
- LINK_LIBRARIES EvgenProdToolsLib )
+ LINK_LIBRARIES EvgenProdToolsLib IOVDbDataModel AthenaPoolUtilities )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Generators/EvgenProdTools/EvgenProdTools/CountHepMC.h b/Generators/EvgenProdTools/EvgenProdTools/CountHepMC.h
index 1e4e196cfd59c7be53ca76aec3a8569e89880c0a..16bab10dfbdca75ddbd609a723d00c2963ba20d9 100644
--- a/Generators/EvgenProdTools/EvgenProdTools/CountHepMC.h
+++ b/Generators/EvgenProdTools/EvgenProdTools/CountHepMC.h
@@ -28,6 +28,8 @@ public:
private:
+ ServiceHandle< StoreGateSvc > m_metaDataStore{
+ "StoreGateSvc/MetaDataStore", name()};
int m_nPass;
int m_nCount;
diff --git a/Generators/EvgenProdTools/src/CountHepMC.cxx b/Generators/EvgenProdTools/src/CountHepMC.cxx
index 3e40238d18041fad0e974735e8723de730e375df..c8d7dafda5eee009860eddb21f74df8ead4d6a05 100644
--- a/Generators/EvgenProdTools/src/CountHepMC.cxx
+++ b/Generators/EvgenProdTools/src/CountHepMC.cxx
@@ -14,6 +14,10 @@
#include "AthenaKernel/errorcheck.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
+#include "EventInfo/EventType.h"
+#include "IOVDbDataModel/IOVMetaDataContainer.h"
+#include "IOVDbDataModel/IOVPayloadContainer.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include <cmath>
#include <cassert>
@@ -95,21 +99,89 @@ else{
}
}
-if (m_corRunNumber) {
+ if (m_corRunNumber) {
// Change the EventID in the eventinfo header
const EventInfo* pInputEvt(0);
ATH_MSG_INFO("Set new run number called !!" << m_newRunNumber);
+ unsigned int oldRunNumber = 0;
if (evtStore()->retrieve(pInputEvt).isSuccess()) {
assert(pInputEvt);
EventID* eventID = const_cast<EventID*>(pInputEvt->event_ID());
ATH_MSG_INFO("git eventid !! " );
+ oldRunNumber = eventID->run_number();
eventID->set_run_number(m_newRunNumber);
ATH_MSG_INFO("Set new run number" << m_newRunNumber);
ATH_MSG_DEBUG("Set new run number in event_ID");
+
+ // also set the MC channel number
+ EventType* event_type = const_cast<EventType*>(pInputEvt->event_type());
+ ATH_MSG_INFO("got event_type !! " );
+ event_type->set_mc_channel_number(m_newRunNumber);
+ ATH_MSG_INFO("Set new MC channel number" << event_type->mc_channel_number());
+ ATH_MSG_DEBUG("Set new mc_channel_number in event_type");
} else {
ATH_MSG_ERROR("No EventInfo object found");
return StatusCode::SUCCESS;
}
+
+ {
+ // change the channel number where /Generation/Parameters are found
+ auto newChannelNumber =
+ static_cast< CondAttrListCollection::ChanNum >(m_newRunNumber);
+ auto oldChannelNumber =
+ static_cast< CondAttrListCollection::ChanNum >(oldRunNumber);
+
+ const char* key = "/Generation/Parameters";
+ const IOVMetaDataContainer * iovContainer = nullptr;
+ if (m_metaDataStore->retrieve(iovContainer, key).isSuccess()
+ && iovContainer) {
+ // get a hold of the payload
+ const IOVPayloadContainer * payloadContainer =
+ iovContainer->payloadContainer();
+
+ // Grab the attribute list
+ for (CondAttrListCollection* collection : *payloadContainer) {
+ for(unsigned int index = 0; index < collection->size(); ++index) {
+ if (collection->chanNum(index) != oldChannelNumber) {
+ ATH_MSG_INFO("Not updating \"" << key << "\" on channel number "
+ << collection->chanNum(index));
+ continue;
+ }
+
+ if (collection->fixChanNum(oldChannelNumber, newChannelNumber))
+ ATH_MSG_INFO("Updated \"" << key << "\" channel number from "
+ << oldChannelNumber << " to " << newChannelNumber);
+ else
+ ATH_MSG_ERROR("Channel number update from " << oldChannelNumber
+ << " to " << newChannelNumber << " on \"" << key
+ << "\" FAILED");
+ }
+ }
+
+ {
+ // Update the MC channel number in the "/TagInfo"
+ const char* key = "/TagInfo";
+ const IOVMetaDataContainer * iovContainer = nullptr;
+ if (m_metaDataStore->retrieve(iovContainer, key).isSuccess()
+ && iovContainer) {
+ // get a hold of the payload
+ const IOVPayloadContainer * payloadContainer =
+ iovContainer->payloadContainer();
+
+ // Grab the attribute list
+ for (CondAttrListCollection* collection : *payloadContainer) {
+ for (auto pair : *collection) {
+ // pair is a pair of Channel number and AttributeList
+ if (pair.second.exists("mc_channel_number"))
+ pair.second["mc_channel_number"].setValue(m_newRunNumber);
+ }
+ }
+ }
+ }
+ } else {
+ ATH_MSG_INFO("Could not retrieve \"" << key << "\" from MetaDataStore");
+ }
+ }
}
diff --git a/Generators/GeneratorObjects/GeneratorObjects/HepMcParticleLink.h b/Generators/GeneratorObjects/GeneratorObjects/HepMcParticleLink.h
index 5cde62711dc8ffd9f47d04fe14c10316d55368a6..6f59b1fc552247335db42e04bd782d1ca6ae9833 100644
--- a/Generators/GeneratorObjects/GeneratorObjects/HepMcParticleLink.h
+++ b/Generators/GeneratorObjects/GeneratorObjects/HepMcParticleLink.h
@@ -489,6 +489,13 @@ public:
*/
const HepMC::GenParticle* cptr() const;
+#ifdef HEPMC3
+ /**
+ * @brief Dereference/smart pointer.
+ */
+ HepMC3::ConstGenParticlePtr scptr() const;
+#endif
+
/**
* @brief Validity check. Dereference and check for null.
diff --git a/Generators/GeneratorObjects/src/HepMcParticleLink.cxx b/Generators/GeneratorObjects/src/HepMcParticleLink.cxx
index be4e96ac8016353de23aff647852556661c29620..716971ee1a7e7a85aba117ab7bde46e69ac15e06 100644
--- a/Generators/GeneratorObjects/src/HepMcParticleLink.cxx
+++ b/Generators/GeneratorObjects/src/HepMcParticleLink.cxx
@@ -237,6 +237,76 @@ const HepMC::GenParticle* HepMcParticleLink::cptr() const
}
return p;
}
+#ifdef HEPMC3
+/**
+ * @brief Dereference/smart pointer.
+ */
+HepMC3::ConstGenParticlePtr HepMcParticleLink::scptr() const
+{
+ HepMC3::ConstGenParticlePtr pp{nullptr};
+ const IProxyDict* sg = nullptr;
+ auto p = m_ptrs.get (sg);
+ if (!p) {
+ if (0 == barcode()) {
+#if 0
+ MsgStream log (Athena::getMessageSvc(), "HepMcParticleLink");
+ log << MSG::DEBUG
+ << "scptr: no truth particle associated with this hit (barcode==0)."
+ << " Probably this is a noise hit" << endmsg;
+#endif
+ return nullptr;
+ }
+ if (!sg) {
+ sg = SG::CurrentEventStore::store();
+ }
+ if (const McEventCollection* pEvtColl = retrieveMcEventCollection(sg)) {
+ const HepMC::GenEvent *pEvt = nullptr;
+ index_type index, position;
+ m_extBarcode.eventIndex (index, position);
+ if (index == 0) {
+ pEvt = pEvtColl->at(0);
+ }
+ else if (position != ExtendedBarCode::UNDEFINED) {
+ if (position < pEvtColl->size()) {
+ pEvt = pEvtColl->at (position);
+ }
+ else {
+#if 0
+ MsgStream log (Athena::getMessageSvc(), "HepMcParticleLink");
+ log << MSG::WARNING << "scptr: position = " << position << ", McEventCollection size = "<< pEvtColl->size() << endmsg;
+#endif
+ return nullptr;
+ }
+ }
+ else {
+ pEvt = pEvtColl->find (index);
+ }
+ if (0 != pEvt) {
+ pp = HepMC::barcode_to_particle(pEvt,barcode());
+ if (position != ExtendedBarCode::UNDEFINED) {
+ m_extBarcode.makeIndex (pEvt->event_number(), position);
+ }
+ } else {
+ MsgStream log (Athena::getMessageSvc(), "HepMcParticleLink");
+ if (position != ExtendedBarCode::UNDEFINED) {
+ log << MSG::WARNING
+ << "scptr: Mc Truth not stored for event at " << position
+ << endmsg;
+ } else {
+ log << MSG::WARNING
+ << "scptr: Mc Truth not stored for event with event number " << index
+ << endmsg;
+ }
+ }
+ } else {
+ MsgStream log (Athena::getMessageSvc(), "HepMcParticleLink");
+ log << MSG::WARNING << "scptr: McEventCollection not found" << endmsg;
+ }
+ }
+ return pp;
+}
+
+#endif
/**
diff --git a/Generators/Herwig7_i/CMakeLists.txt b/Generators/Herwig7_i/CMakeLists.txt
index 65d4fb39621a199f1057fb30f3634c46106b51b2..3c9ed90737ddbc198c9f6eb862c279fb941fc234 100644
--- a/Generators/Herwig7_i/CMakeLists.txt
+++ b/Generators/Herwig7_i/CMakeLists.txt
@@ -8,13 +8,17 @@ find_package( Boost )
find_package( Herwig3 COMPONENTS HerwigAPI )
find_package( ThePEG )
find_package( GSL )
-# find_package( OpenLoops )
-find_package( VBFNLO )
+find_package( OpenLoops )
+# find_package( VBFNLO )
find_package( hepmc3 )
# Remove the --as-needed linker flags:
atlas_disable_as_needed()
+# Add extra flag for H7 versions >=7.2
+set( _extraDefs )
+list( APPEND _extraDefs -DHWVER_IS_72=1 )
+
# Component(s) in the package:
if (HEPMC3_USE)
atlas_add_component( Herwig7_i
@@ -32,14 +36,15 @@ else()
atlas_add_component( Herwig7_i
Herwig7_i/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS}
- ${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${VBFNLO_INCLUDE_DIRS}
+ ${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${OPENLOOPS_INCLUDE_DIRS}
DEFINITIONS -DHWVERSION=\"${HERWIG3_LCGVERSION}\"
-DHWVER_IS_72=\"${HW3_VER_IS_72}\"
LINK_LIBRARIES ${HERWIG3_LIBRARIES} ${Boost_LIBRARIES}
- ${THEPEG_LIBRARIES} ${GSL_LIBRARIES} ${VBFNLO_LIBRARIES}
+ ${THEPEG_LIBRARIES} ${GSL_LIBRARIES} ${OPENLOOPS_LIBRARIES}
GeneratorModulesLib EventInfo GaudiKernel PathResolver AtlasHepMCLib )
endif()
-# ${OPENLOOPS_INCLUDE_DIRS} ${OPENLOOPS_LIBRARIES}
+
+# ${VBFNLO_INCLUDE_DIRS} ${VBFNLO_LIBRARIES}
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
@@ -50,3 +55,5 @@ atlas_install_runtime( share/file/*.pdt share/file/*.dat )
set( Herwig7Environment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of Herwig7Environment.cmake" )
find_package( Herwig7Environment )
+
+
diff --git a/Generators/Herwig7_i/python/Herwig72ConfigLHEF.py b/Generators/Herwig7_i/python/Herwig72ConfigLHEF.py
new file mode 100644
index 0000000000000000000000000000000000000000..4ca4153d04472b6f7ab5f7cd614d0d3886d67e98
--- /dev/null
+++ b/Generators/Herwig7_i/python/Herwig72ConfigLHEF.py
@@ -0,0 +1,293 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+## \file Herwig7ConfigLHEF.py
+## \brief Configuration class for showering LHE files from MG5_aMC@NLO or PowhegBox
+## \author Daniel Rauch (daniel.rauch@desy.de)
+
+import os
+
+import Herwig7Config as hw7Config
+import Herwig7Control as hw7Control
+import Herwig7Utils as hw7Utils
+
+
+## Configuration class for showering LHE files from MG5_aMC@NLO or PowhegBox
+##
+## Example JobOptions are available in [`examples/LHEF`](https://svnweb.cern.ch/trac/atlasoff/browser/Generators/Herwig7_i/trunk/examples/LHEF) and [`tests/athenaLHEF/jobOptions`](https://svnweb.cern.ch/trac/atlasoff/browser/Generators/Herwig7_i/trunk/tests/athenaLHEF/jobOptions).
+##
+##
+## Process Setup and Generator Configuration
+## =========================================
+##
+## The LHE files have to follow a specific naming scheme which is detailed
+## [here](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/PreparingLesHouchesEven).
+## The name of the LHE file is added as the command line parameter `--inputGeneratorFile`
+## to the `Generate_tf.py` command and can be accessed using the variable
+## `runArgs.inputGeneratorFile` in the JobOptions where they can be passed to the
+## functions [lhef_mg5amc_commands](\ref Herwig7ConfigLHEF::Hw7ConfigLHEF#lhef_mg5amc_commands)
+## or [lhef_powhegbox_commands](\ref Herwig7ConfigLHEF::Hw7ConfigLHEF#lhef_powhegbox_commands)
+## in order to communicate the LHE file names to %Herwig7, e.g.
+##
+## \code{.py}
+## generator.lhef_mg5amc_commands(lhe_filename=runArgs.inputGeneratorFile, me_pdf_order="NLO")
+## \endcode
+##
+## or
+##
+## \code{.py}
+## generator.lhef_powhegbox_commands(lhe_filename=runArgs.inputGeneratorFile, me_pdf_order="NLO")
+## \endcode
+##
+##
+## Event Generation
+## ================
+##
+## To trigger the actual running of %Herwig7 in Athena please end the JobOptions with
+##
+## \code{.py}
+## # run the generator
+## generator.run()
+## \endcode
+##
+## More specifically, the `run()` function triggers the creation of the %Herwig7 input
+## file and the preparation of the run (i.e. the `Herwig read` step).
+## This means, that no %Herwig7 settings should be modified after calling the
+## `run()` function because the changed settings would not be applied during the
+## event generation.
+##
+class Hw72ConfigLHEF(hw7Config.Hw7Config):
+
+
+ def __init__(self, genSeq, runArgs, run_name="Herwig", beams="pp"):
+
+ beams = beams.upper()
+ if beams not in ["EE", "EP" , "PP"]:
+ raise RuntimeError(hw7Utils.ansi_format_error("Parameter 'beams' must be one of the following: ['EE', 'EP' , 'PP']"))
+
+ ## provide variables initialized by the parent class
+ super(Hw72ConfigLHEF, self).__init__(genSeq, runArgs, run_name)
+
+ self.beams = beams
+
+ self.set_lhef_mg5amc_commands = False
+ self.set_lhef_powhegbox_commands = False
+
+
+ def local_pre_commands(self):
+
+ return """
+## ============================================
+## Local Pre-Commands from Herwig7ConfigLHEF.py
+## ============================================
+
+# > no local pre-commands at the moment
+"""
+
+
+ def local_post_commands(self):
+
+ return """
+## =============================================
+## Local Post-Commands from Herwig7ConfigLHEF.py
+## =============================================
+
+saverun {} /Herwig/Generators/EventGenerator
+""".format(self.run_name)
+
+
+
+ ## High-level function for triggering the process setup and the event generation.
+ ##
+ ## \warning Please do not modify the generator configuration in the job options after calling the `run()` function as
+ ## the modified settings would not be applied in the event generation
+ ##
+ def run(self):
+
+ ## add default settings if they were not overwritten in the JobOptions
+
+ self.default_commands += self.beam_commands()
+ self.default_commands += self.random_seed_commands()
+
+ if not self.set_printout_commands:
+ self.default_commands += self.printout_commands()
+ if not self.set_physics_parameter_commands:
+ self.default_commands += self.physics_parameter_commands()
+ if not self.set_technical_parameter_commands:
+ self.default_commands += self.technical_parameter_commands()
+
+ ## check for configuration errors
+
+ if self.set_lhef_mg5amc_commands and self.set_lhef_powhegbox_commands:
+ raise RuntimeError(hw7Utils.ansi_format_error("Please do not use both 'lhef_mg5amc_commands()' and 'lhef_powhegbox_commands()' at the same time!"))
+ if not self.set_lhef_mg5amc_commands and not self.set_lhef_powhegbox_commands:
+ raise RuntimeError(hw7Utils.ansi_format_error("Please use either 'lhef_mg5amc_commands()' or 'lhef_powhegbox_commands()' in the JobOptions!"))
+
+ ## do read and run step in one go
+
+ hw7Control.run(self)
+
+
+ ## Sets up reading of events from an LHE file
+ ##
+ ## \param usespin Use the spin of tau leptons from the LHE file (spins of other particles are ignored anyways)
+ ## \param usepwghlhereader Uses a different LHE reader, which is able to propagte multiple event weights
+ def __lhef_commands(self, lhe_filename="events.lhe", me_pdf_order="NLO", usespin=True, usepwghlhereader=False):
+
+ if me_pdf_order not in ["LO", "NLO"]:
+ raise RuntimeError(hw7Utils.ansi_format_error("Herwig7ConfigLHEF.py:__lhef_commands: Parameter 'me_pdf_order' must either be 'LO' or 'NLO'!"))
+
+ if lhe_filename.endswith(".tar.gz"): # athena will decompress the LHE file for us
+ lhe_filename = lhe_filename.replace(".tar.gz", ".events")
+ if not os.path.isfile(lhe_filename):
+ raise RuntimeError(hw7Utils.ansi_format_error("Herwig7ConfigLHEF.py:__lhef_commands: Could not find decompressed LHE file '{}'!".format(lhe_filename)))
+
+ momentum_treatment = ""
+ beam_commands = ""
+ if self.beams == "EE":
+ momentum_treatment = "Accept"
+ elif self.beams == "EP":
+ momentum_treatment = "RescaleEnergy"
+ beam_commands = """
+## Set the PDF for the LHE reader
+# set /Herwig/EventHandlers/LHEReader:PDFA /Herwig/Partons/Hard{MEPDFOrder}PDF
+""".format(MEPDFOrder = me_pdf_order)
+ elif self.beams == "PP":
+ momentum_treatment = "RescaleEnergy"
+ beam_commands = """
+## Set the PDF for the LHE reader
+# set /Herwig/EventHandlers/LHEReader:PDFA /Herwig/Partons/Hard{MEPDFOrder}PDF
+# set /Herwig/EventHandlers/LHEReader:PDFB /Herwig/Partons/Hard{MEPDFOrder}PDF
+""".format(MEPDFOrder = me_pdf_order)
+
+ pwg_reader_lib = "library powhegHerwig.so"
+
+
+ self.commands += """
+## ----------------------------
+## Read in Events from LHE File
+## ----------------------------
+
+## Create the Handler and Reader
+{PwgReaderLib}
+library LesHouches.so
+create ThePEG::{PwgReader}LesHouchesFileReader /Herwig/EventHandlers/LHEReader
+create ThePEG::LesHouchesEventHandler /Herwig/EventHandlers/LHEHandler
+
+## Set LHE filename
+set /Herwig/EventHandlers/LHEReader:FileName {FileName}
+
+## Setup LHE event handler and LHE reader
+set /Herwig/Generators/EventGenerator:EventHandler /Herwig/EventHandlers/LHEHandler
+insert /Herwig/EventHandlers/LHEHandler:LesHouchesReaders 0 /Herwig/EventHandlers/LHEReader
+set /Herwig/EventHandlers/LHEHandler:PartonExtractor /Herwig/Partons/{Beams}Extractor
+set /Herwig/EventHandlers/LHEHandler:CascadeHandler /Herwig/Shower/ShowerHandler
+set /Herwig/EventHandlers/LHEHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
+set /Herwig/EventHandlers/LHEHandler:DecayHandler /Herwig/Decays/DecayHandler
+set /Herwig/EventHandlers/LHEHandler:WeightNormalization CrossSection
+set /Herwig/EventHandlers/LHEHandler:WeightOption VarNegWeight
+set /Herwig/EventHandlers/LHEReader:IncludeSpin {IncludeSpin}
+set /Herwig/EventHandlers/LHEReader:MomentumTreatment {MomentumTreatment}
+set /Herwig/EventHandlers/LHEReader:AllowedToReOpen No
+
+## Parton shower settings
+set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
+set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
+# treatment of wide angle radiation
+set /Herwig/Shower/PartnerFinder:PartnerMethod Random
+set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
+
+## Don't use any cuts on LHE files
+create ThePEG::Cuts /Herwig/Cuts/NoCuts
+set /Herwig/EventHandlers/LHEReader:Cuts /Herwig/Cuts/NoCuts
+
+{BeamCommands}
+""".format(FileName = lhe_filename,
+ PwgReaderLib = pwg_reader_lib if usepwghlhereader is True else "",
+ PwgReader = "powheg" if usepwghlhereader is True else "",
+ Beams = self.beams,
+ IncludeSpin = "Yes" if usespin is True else "No",
+ MomentumTreatment = momentum_treatment,
+ BeamCommands = beam_commands)
+
+
+ ## Commands specific to showering of events produced with MG5_aMC@NLO
+ ##
+ ## \param[in] lhe_filename name of the LHE file that is to be showered
+ ## \param[in] me_pdf_order order (either `LO` or `NLO`) of the matrix element PDF.
+ ## This has to be consistent with the PDF used in the
+ ## hard process generation and the PDF set with
+ ## generator.me_pdf_commands.
+ ##
+ ## The reason for these specific settings is that for MC@NLO-like matching schemes
+ ## the subtraction of the parton shower contribution in the hard process and the
+ ## parton shower settings have to be consistent in order to recover the
+ ## correct terms at the NLO.
+ ##
+ ## For showering of previously existing LHE files
+ ##
+ ## generator.lhef_powhegbox_commands(lhe_filename=runArgs.inputGeneratorFile)
+ ##
+ ## will work.
+ ##
+ def lhef_mg5amc_commands(self, lhe_filename="events.lhe", me_pdf_order="NLO", usespin=True):
+
+ if me_pdf_order not in ["LO", "NLO"]:
+ raise RuntimeError(hw7Utils.ansi_format_error("Herwig7ConfigLHEF.py:lhef_mg5amc_commands: Parameter 'me_pdf_order' must either be 'LO' or 'NLO'!"))
+
+ self.set_lhef_mg5amc_commands = True
+
+ self.__lhef_commands(lhe_filename, me_pdf_order, usespin)
+
+ self.commands += """
+## Commands specific to showering of events produced with MG5_aMC@NLO
+set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption General
+set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBoost
+set /Herwig/Shower/KinematicsReconstructor:InitialStateReconOption Rapidity
+# this option is not available anymore in Herwig 7.2:
+# set /Herwig/Shower/KinematicsReconstructor:FinalStateReconOption Default
+set /Herwig/Shower/ShowerHandler:SpinCorrelations No
+"""
+
+
+ ## Commands specific to showering of events produced with PowhegBox
+ ##
+ ## \param[in] lhe_filename name of the LHE file that is to be showered
+ ## \param[in] me_pdf_order order (either `LO` or `NLO`) of the matrix element PDF.
+ ## This has to be consistent with the PDF used in the
+ ## hard process generation and the PDF set with
+ ## generator.me_pdf_commands.
+ ## \param[in] usespin
+ ## \param[in] usepwghlhereader
+ ##
+ ## Specifying the LHE file name with
+ ##
+ ## generator.lhef_powhegbox_commands(lhe_filename=runArgs.inputGeneratorFile)
+ ##
+ ## should work both for showering existing LHE files as well as for on-the-fly (OTF)
+ ## running of PowhegBox and %Herwig7.
+ ##
+ ## Since for OTF running the LHE file generated by PowhegBox is usually
+ ## called `PowhegOTF._1.events` using
+ ##
+ ## generator.lhef_powhegbox_commands(lhe_filename="PowhegOTF._1.events")
+ ##
+ ## will normally also work in this case. If a different name for the LHE file
+ ## generated by PowhegBox is specified with the `--outputTXTFile` argument to
+ ## `Generate_tf.py` then `PowhegControl` will update the value of
+ ## `runArgs.inputGeneratorFile` accordingly and
+ ##
+ ## generator.lhef_powhegbox_commands(lhe_filename=runArgs.inputGeneratorFile)
+ ##
+ ## should still work.
+ ##
+ ## If you want to use the pwglhereader, needed to propagte multiple event weights
+ ## you need to use a gridpack contains the powhegHerwig.so
+ ##
+ def lhef_powhegbox_commands(self, lhe_filename="events.lhe", me_pdf_order="NLO", usespin=True, usepwhglhereader=False):
+
+ if me_pdf_order not in ["LO", "NLO"]:
+ raise RuntimeError(hw7Utils.ansi_format_error("Herwig7ConfigLHEF.py:lhef_powhegbox_commands: Parameter 'me_pdf_order' must either be 'LO' or 'NLO'!"))
+
+ self.set_lhef_powhegbox_commands = True
+
+ self.__lhef_commands(lhe_filename, me_pdf_order, usespin, usepwhglhereader)
diff --git a/Generators/Herwig7_i/python/Herwig7Config.py b/Generators/Herwig7_i/python/Herwig7Config.py
index 31255e346973772ef2a7d7a3583156b58307b872..5c283c879b28ece5594c0f1531b3cf317c1274ff 100644
--- a/Generators/Herwig7_i/python/Herwig7Config.py
+++ b/Generators/Herwig7_i/python/Herwig7Config.py
@@ -25,11 +25,11 @@ class Hw7Config(object):
self.set_printout_commands = False
self.set_physics_parameter_commands = False
self.set_technical_parameter_commands = False
+ self.use_PDGparams = False
self.default_commands = hw7Utils.ConfigurationCommands()
self.commands = hw7Utils.ConfigurationCommands()
-
## \brief Commands applied to all configuration classes before commands from the JobOptions
## \todo Remove `AngularOrdered` settungs once they are included in %Herwig7 by default
def global_pre_commands(self):
@@ -38,19 +38,6 @@ class Hw7Config(object):
## Global Pre-Commands from Herwig7Config.py
## =========================================
-## fix for global default settings until released with Herwig7 itself
-set /Herwig/Shower/GtoQQbarSplitFn:AngularOrdered Yes
-set /Herwig/Shower/GammatoQQbarSplitFn:AngularOrdered Yes
-
-## fix for GeV-mass photon radiation until released with Herwig7 itself
-set /Herwig/Shower/GammatoQQbarSudakov:Alpha /Herwig/Shower/AlphaQED
-
-## fix for initial-state (backward evolution) splitting (AGENE-1384)
-set /Herwig/Shower/QtoGammaQSudakov:Alpha /Herwig/Shower/AlphaQED
-
-## fix for QED lepton radiation scale (ATLMCPROD-5138)
-set /Herwig/Shower/LtoLGammaSudakov:pTmin 0.000001
-
## ensure JetFinder uses AntiKt with R=0.4
set /Herwig/Cuts/JetFinder:Variant AntiKt
set /Herwig/Cuts/JetFinder:ConeRadius 0.4
@@ -121,28 +108,63 @@ set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy {}
def printout_commands(self):
self.set_printout_commands = True
-
+
return("""
+
## Verbosity and printout settings
set /Herwig/Generators/EventGenerator:DebugLevel 1
set /Herwig/Generators/EventGenerator:PrintEvent 2
set /Herwig/Generators/EventGenerator:UseStdout Yes
set /Herwig/Generators/EventGenerator:NumberOfEvents 1000000000
-set /Herwig/Generators/EventGenerator:MaxErrors 1000000
+set /Herwig/Generators/EventGenerator:MaxErrors 500
## Make sampler print out cross sections for each subprocess
set /Herwig/Samplers/Sampler:Verbose Yes
""")
+ ## Before there were used the ATLAS MC15 default parameters for particle masses and widths and Weinberg angle
+ ##
+ ## As specified in https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/McProductionCommonParametersMC15
+ ## Now the PDG API is used to set the parameters via the python file Generators/EvgenProdTools/python/physics_parameters.py that generates the dictionary offline_dict.py with the parameters
- ## ATLAS MC15 default parameters for particle masses and widths and Weinberg angle
- ##
- ## As specified in https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/McProductionCommonParametersMC15
def physics_parameter_commands(self):
+ if self.use_PDGparams:
+ paramlist = []
+ self.physics_parameter_commands = True
+
+ paramlist.append("## Masses and widths: PDG 2019 values")
+
+ ## Load the dictionary and extract the values of the variables that were defined here before (top quark, W and Z boson)
+ from EvgenProdTools.offline_dict import parameters
+ for k,v in parameters.items():
+ if k == 'particles':
+ for key,value in v.items():
+ if int(key) == 24:
+ paramlist.append("set /Herwig/Particles/"+value['name']+"+:NominalMass "+value['mass'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+"+:Width "+value['width'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+"-:NominalMass "+value['mass'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+"-:Width "+value['width'])
+ if int(key) == 23:
+ paramlist.append("set /Herwig/Particles/"+value['name']+"0:NominalMass "+value['mass'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+"0:Width "+value['width'])
+ if int(key) == 6:
+ paramlist.append("set /Herwig/Particles/"+value['name']+"bar:NominalMass "+value['mass'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+"bar:Width "+value['width'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+":NominalMass "+value['mass'])
+ paramlist.append("set /Herwig/Particles/"+value['name']+":Width "+value['width'])
+
+ ## Take the value of sin2thetaW from the EW_parameters dictionary
+ if k == 'EW_parameters':
+ for key,value in v.items():
+ if key[2] == "Sin2ThetaW":
+ paramlist.append("set /Herwig/Model:EW/"+str(key[2])+" "+str(value))
+ paramstring = '\n'.join(paramlist)
+ return(paramstring)
- self.physics_parameter_commands = True
+ else:
+ self.physics_parameter_commands = True
- return("""
+ return("""
## Masses and widths: PDG 2010 values (except TOP mass; kept at PDG2007)
set /Herwig/Particles/t:NominalMass 172.5*GeV
set /Herwig/Particles/tbar:NominalMass 172.5*GeV
@@ -157,7 +179,6 @@ set /Herwig/Particles/Z0:Width 2.4952*GeV
set /Herwig/Model:EW/Sin2ThetaW 0.23113
""")
-
def technical_parameter_commands(self):
self.set_technical_parameter_commands = True
@@ -168,10 +189,6 @@ set /Herwig/Particles/pomeron:PDF /Herwig/Partons/NoPDF
## Set long-lived particles stable
set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
-
-# Turn off intermediate photons inserted explicitly into the event record with an incorrect life length in the pi0 -> e+e-e+e- decay mode
-# This is the default from H++ 2.6.1
-set /Herwig/Decays/PScalar4f:GenerateIntermediates 0
""")
@@ -291,7 +308,7 @@ set /Herwig/Partons/RemnantPDF:MaxFlav {}
## \param[in] ps_tune_name name identifying the PS/hadronization tune
## \param[in] ue_tune_name name identifying the UE/MPI tune
## \return Nothing, adds the corresponding commands directly to the generator configuration object
- def tune_commands(self, ps_tune_name = "H7-PS-MMHT2014LO", ue_tune_name = "H7-UE-MMHT"):
+ def tune_commands(self, ps_tune_name = "H7-PS-MMHT2014LO", ue_tune_name = "H7.1-Default"):
cmds = """
## -------------
@@ -299,7 +316,7 @@ set /Herwig/Partons/RemnantPDF:MaxFlav {}
## -------------
"""
self.commands += cmds
- self.ps_tune_commands(tune_name = ps_tune_name)
+ # self.ps_tune_commands(tune_name = ps_tune_name) # the name of the default PS tune may be obsolete
self.ue_tune_commands(tune_name = ue_tune_name)
@@ -337,15 +354,15 @@ set /Herwig/Partons/RemnantPDF:MaxFlav {}
##
## \param[in] tune_name name identifying the UE/MPI tune
## \return Nothing, adds the corresponding commands directly to the generator configuration object
- def ue_tune_commands(self, tune_name = "H7-UE-MMHT"):
+ def ue_tune_commands(self, tune_name = "H7.1-Default"):
cmds = """
## Underlying event tune settings
"""
- if tune_name == "H7-UE-MMHT":
+ if tune_name == "H7.1-Default":
cmds += """
-# > The underlying event tune "H7-UE-MMHT" is already
+# > The underlying event tune "H7.1-Default" is already
# > configured in Herwig7 via the default settings.
"""
# elif tune_name == "some-other-name":
@@ -399,7 +416,7 @@ set /Herwig/Particles/pomeron:PDF /Herwig/Partons/PomeronPDF
# Technical parameters for this run
set /Herwig/Generators/EventGenerator:EventHandler:Sampler:Ntry 100000
-set /Herwig/Generators/EventGenerator:MaxErrors 100000
+set /Herwig/Generators/EventGenerator:MaxErrors 500
# MPI doesn't work
# TODO: Is this a problem?
@@ -433,5 +450,3 @@ set /Herwig/Particles/pbar-:PDF /Herwig/Partons/BudnevPDF
set /Herwig/Generators/EventGenerator:EventHandler:CascadeHandler:MPIHandler NULL
"""
-
-
diff --git a/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx b/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
index 4d3245aedbb349fb973f239891b325195767ca52..1f320b61862006144565a56398d3ed72eedb5d06 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
+++ b/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// McAsciiCnvSvc.cxx
@@ -60,7 +60,6 @@ StatusCode McAsciiCnvSvc::initialize()
<< endmsg;
return StatusCode::FAILURE;
}
- setProperties().ignore();
// retrieve tool
setupCnvTool();
diff --git a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx
index 58c7a5f46c8b2851547dc7c59e2abd426a23a21c..40882516b535d53c35bcf2369e758607dd1411c8 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx
+++ b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// McAsciiEventSelector.cxx
@@ -84,9 +84,6 @@ StatusCode McAsciiEventSelector::initialize()
{
ATH_MSG_INFO( "Enter McAsciiEventSelector initialization..." );
- ATH_CHECK( AthService::initialize() );
- setProperties().ignore();
-
const std::size_t nbrAsciiFiles = m_asciiFileNames.value().size();
if ( nbrAsciiFiles <= 0 ) {
ATH_MSG_ERROR( "You need to give at least 1 input file !!"
diff --git a/Generators/McEventSelector/McEventSelector/McEventSelector.h b/Generators/McEventSelector/McEventSelector/McEventSelector.h
index 3bd969807e33b874e32a7ed94eea7e6f3670a473..542d4397aed9df65acc16ca5a10bf497e0af0e3c 100644
--- a/Generators/McEventSelector/McEventSelector/McEventSelector.h
+++ b/Generators/McEventSelector/McEventSelector/McEventSelector.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
*/
//====================================================================
@@ -26,7 +26,6 @@
#include "GaudiKernel/IEvtSelector.h"
#include "AthenaBaseComps/AthService.h"
#include "Gaudi/Property.h" /*no forward decl: typedef*/
-#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
@@ -35,12 +34,6 @@ class EventSource;
class ISvcLocator;
class McContext;
-#ifdef WIN32
-// Disable warning C4786: identifier was truncated to '255' characters in the debug information
-#pragma warning ( disable : 4786 )
-#endif
-
-
//--------------------------------------------------------------------
// Event Selector
//--------------------------------------------------------------------
@@ -52,8 +45,7 @@ public:
virtual StatusCode initialize() override;
virtual StatusCode stop() override;
- virtual StatusCode finalize() override;
- virtual StatusCode queryInterface(const InterfaceID& riid,
+ virtual StatusCode queryInterface(const InterfaceID& riid,
void** ppvInterface) override;
virtual StatusCode createContext(Context*& refpCtxt) const override;
diff --git a/Generators/McEventSelector/src/McEventSelector.cxx b/Generators/McEventSelector/src/McEventSelector.cxx
index 7c27696c5140b2185c0e0a97db666429408b4642..d158fea79c208745ec7a8e75b6426cf6db0a7fce 100644
--- a/Generators/McEventSelector/src/McEventSelector.cxx
+++ b/Generators/McEventSelector/src/McEventSelector.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
*/
//====================================================================
@@ -272,18 +272,7 @@ McEventSelector::createContext(Context*& refpCtxt) const
StatusCode McEventSelector::initialize() {
ATH_MSG_INFO (" Enter McEventSelector Initialization ");
- StatusCode sc = AthService::initialize();
- msg().setLevel( m_outputLevel.value() );
- if( sc.isSuccess() ) {
- setProperties().ignore();
- } else {
- ATH_MSG_ERROR ("Unable to initialize service ");
- return sc;
- }
-
- ATH_MSG_DEBUG (" McEventSelector Initialized Properly ... ");
-
- return sc;
+ return StatusCode::SUCCESS;
}
StatusCode McEventSelector::stop() {
@@ -301,11 +290,6 @@ StatusCode McEventSelector::stop() {
return StatusCode::SUCCESS;
}
-StatusCode McEventSelector::finalize() {
- ATH_MSG_INFO ("finalize");
-
- return StatusCode::SUCCESS;
-}
// IEvtSelector::next
StatusCode
diff --git a/Generators/Pythia8_i/src/Pythia8_i.cxx b/Generators/Pythia8_i/src/Pythia8_i.cxx
index 3b4206af8779c34b798c078206af80f6af7dbf63..a45a52a3bbd8bd086b82c1aba2849e859b7f7a29 100644
--- a/Generators/Pythia8_i/src/Pythia8_i.cxx
+++ b/Generators/Pythia8_i/src/Pythia8_i.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "Pythia8_i/Pythia8_i.h"
#include "Pythia8_i/UserProcessFactory.h"
@@ -76,7 +76,7 @@ m_failureCount(0),
m_procPtr(0),
m_userHooksPtrs(),
m_doLHE3Weights(false),
-m_athenaTool("IPythia8Custom")
+m_athenaTool("")
{
declareProperty("Commands", m_commands);
declareProperty("CollisionEnergy", m_collisionEnergy = 14000.0);
@@ -175,23 +175,23 @@ StatusCode Pythia8_i::genInitialize() {
}
}
- for(const std::pair<std::string, double> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<double>()){
+ for(const std::pair<const std::string, double> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<double>()){
m_pythia->settings.addParm(param.first, param.second, false, false, 0., 0.);
}
- for(const std::pair<std::string, int> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<int>()){
+ for(const std::pair<const std::string, int> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<int>()){
m_pythia->settings.addMode(param.first, param.second, false, false, 0., 0.);
}
- for(const std::pair<std::string, int> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<bool>()){
+ for(const std::pair<const std::string, bool> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<bool>()){
m_pythia->settings.addFlag(param.first, param.second);
}
- for(const std::pair<std::string, std::string> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<std::string>()){
+ for(const std::pair<const std::string, std::string> ¶m : Pythia8_UserHooks::UserHooksFactory::userSettings<std::string>()){
m_pythia->settings.addWord(param.first, param.second);
}
- if(m_athenaTool.typeAndName() != "IPythia8Custom"){
+ if( ! m_athenaTool.empty() ){
if(m_athenaTool.retrieve().isFailure()){
ATH_MSG_ERROR("Unable to retrieve Athena Tool for custom Pythia processing");
return StatusCode::FAILURE;
@@ -202,7 +202,6 @@ StatusCode Pythia8_i::genInitialize() {
}
}
-
// Now apply the settings from the JO
for(const std::string &cmd : m_commands){
@@ -386,7 +385,8 @@ StatusCode Pythia8_i::callGenerator(){
}
}
- if(m_athenaTool.typeAndName() != "IPythia8Custom"){
+ ATH_MSG_DEBUG("Now checking with Tool.empty() second time");
+ if( ! m_athenaTool.empty() ){
StatusCode stat = m_athenaTool->ModifyPythiaEvent(*m_pythia);
if(stat != StatusCode::SUCCESS) returnCode = stat;
}
@@ -570,7 +570,7 @@ StatusCode Pythia8_i::genFinalize(){
std::cout << "Using FxFx cross section recipe: xs = "<< m_sigmaTotal << " / " << 1e9*info.nTried() << std::endl;
}
- if(m_athenaTool.typeAndName() != "IPythia8Custom"){
+ if( ! m_athenaTool.empty()){
double xsmod = m_athenaTool->CrossSectionScaleFactor();
ATH_MSG_DEBUG("Multiplying cross-section by Pythia Modifier tool factor " << xsmod );
xs *= xsmod;
@@ -606,6 +606,26 @@ StatusCode Pythia8_i::genFinalize(){
////////////////////////////////////////////////////////////////////////////////
void Pythia8_i::addLHEToHepMC(HepMC::GenEvent *evt){
+#ifdef HEPMC3
+ HepMC::GenEvent *procEvent = new HepMC::GenEvent();
+
+ // Adding the LHE event to the HepMC results in undecayed partons in the event record.
+ // Pythia's HepMC converter throws up undecayed partons, so we ignore that
+ // (expected) exception this time
+ m_pythiaToHepMC.fill_next_event(m_pythia->process, procEvent, evt->event_number(), &m_pythia->info, &m_pythia->settings);
+
+ for(auto p: *procEvent){
+ p->set_status(1003);
+ }
+
+ //This code and the HepMC2 version below assume a correct input, e.g. beams[0]->end_vertex() exists.
+ for(auto v: procEvent->vertices()) v->set_status(1);
+ auto beams=evt->beams();
+ auto procBeams=procEvent->beams();
+ if(beams[0]->momentum().pz() * procBeams[0]->momentum().pz() < 0.) std::swap(procBeams[0],procBeams[1]);
+ for (auto p: procBeams[0]->end_vertex()->particles_out()) beams[0]->end_vertex()->add_particle_out(p);
+ for (auto p: procBeams[1]->end_vertex()->particles_out()) beams[1]->end_vertex()->add_particle_out(p);
+#else
HepMC::GenEvent *procEvent = new HepMC::GenEvent(evt->momentum_unit(), evt->length_unit());
// Adding the LHE event to the HepMC results in undecayed partons in the event record.
@@ -668,6 +688,7 @@ void Pythia8_i::addLHEToHepMC(HepMC::GenEvent *evt){
vit = vtxCopies.find((*p)->end_vertex());
if(vit != vtxCopies.end()) vit->second->add_particle_in(pCopy);
}
+#endif
return;
}
diff --git a/Generators/Starlight_i/CMakeLists.txt b/Generators/Starlight_i/CMakeLists.txt
index 8dfb8fbf4e65aecb9dd092a6cf2c7f108640d4ab..018b4756c1ab9f2e816ea18e7fe63c0dfafe4c0f 100644
--- a/Generators/Starlight_i/CMakeLists.txt
+++ b/Generators/Starlight_i/CMakeLists.txt
@@ -27,4 +27,7 @@ atlas_add_component( Starlight_i
LINK_LIBRARIES Starlight_iLib )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/common/*.py
+ share/example/*.py )
+
+
diff --git a/Generators/Starlight_i/share/common/Starlight_Common.py b/Generators/Starlight_i/share/common/Starlight_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..e6e724e814df2c24d7d8cd606ea95677de3abbf6
--- /dev/null
+++ b/Generators/Starlight_i/share/common/Starlight_Common.py
@@ -0,0 +1,13 @@
+from Starlight_i.Starlight_iConf import Starlight_i
+genSeq += Starlight_i("Starlight")
+genSeq.Starlight.McEventKey = "GEN_EVENT"
+
+evgenConfig.generators += ["Starlight"]
+
+## Extra stream persistency
+## 2101 == EventInfo, 133273 == MCTruth (HepMC)
+from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
+_evgenstream = AthenaPoolOutputStream("StreamEVGEN")
+_evgenstream.ItemList = ["2101#*","133273#GEN_EVENT"]
+del _evgenstream
+
diff --git a/Generators/Starlight_i/share/starlight.example.joboption.py b/Generators/Starlight_i/share/example/starlight.example.joboption.py
similarity index 100%
rename from Generators/Starlight_i/share/starlight.example.joboption.py
rename to Generators/Starlight_i/share/example/starlight.example.joboption.py
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx
index 14c8adee43aff44937b00d8b5374f88333dfeb45..83f609f0ff60418b42ad264571659974c3ad4622 100644
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,6 @@
// Geometry Stuff
#include "Identifier/Identifier.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetIdentifier/SCT_ID.h"
#include "InDetIdentifier/TRT_ID.h"
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/InDetAlignFillTrack.cxx b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/InDetAlignFillTrack.cxx
index af237112034a97477bfc93f19f050af7dee3c930..ff7f5b5351c81c703c56a48e044c3f5813afff3b 100644
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/InDetAlignFillTrack.cxx
+++ b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/InDetAlignFillTrack.cxx
@@ -300,7 +300,11 @@ StatusCode InDetAlignFillTrack::FillTrack() {
HepMcParticleLink HMPL = trkTruth.particleLink();
if (HMPL.isValid()) {
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genParticle = HMPL.scptr();
+#else
const HepMC::GenParticle* genParticle = HMPL.cptr();
+#endif
double charge = 1.0;
if (genParticle->pdg_id() < 0) charge = -charge;
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx
index 492211acc5cdd3202e6438b58f5f0a3c03264844..3583cf8e947063acf1df220d50fab1d5eed9a76b 100644
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx
@@ -401,7 +401,11 @@ namespace InDet {
HepMcParticleLink HMPL = trtruth.particleLink();
if (HMPL.isValid()) {
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genparptr = HMPL.scptr();
+#else
const HepMC::GenParticle* genparptr = HMPL.cptr();
+#endif
if (genparptr) {
if (genparptr->production_vertex()) {
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/TTrainedNetwork.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/TTrainedNetwork.cxx
index ab3922e10fe143d2f30efffdb3d5ef158140217b..56ba586a369221a0f29db47e9608f53496b88328 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/TTrainedNetwork.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/TTrainedNetwork.cxx
@@ -1,11 +1,10 @@
/*
- 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 "TTrainedNetwork.h"
#include <iostream>
-#include <iostream>
#include <vector>
using namespace std;
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/errors/trainNN.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/errors/trainNN.cxx
index 6e9fb23a9721caa7c1ece89f29fc1469468ce048..465e41bbb1c874bbe5bd07e969e455b5cd8b25c1 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/errors/trainNN.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/errors/trainNN.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
*/
#include <TChain.h>
@@ -22,8 +22,6 @@
#include "../TTrainedNetwork.h"
-#include <iostream>
-
#include "TMatrixD.h"
#include "TVectorD.h"
#include "trainNN.h"
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/number/trainNN.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/number/trainNN.cxx
index a9db60f15ac8a0433be45ec95a096463e130ebc9..87a17f6e1efdc83f50bbb5033c694673adefa974 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/number/trainNN.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/number/trainNN.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
*/
#include <TTree.h>
@@ -21,8 +21,6 @@
#include "../TTrainedNetwork.h"
#include "TChain.h"
-#include <iostream>
-
#include "TMatrixD.h"
#include "TVectorD.h"
#include "trainNN.h"
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/positions/trainNN.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/positions/trainNN.cxx
index 1e744717bfa17befe685837c72443467e740f56d..843d149a19e3e09522e86ce14de9751a6ababeb7 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/positions/trainNN.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/positions/trainNN.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
*/
#include <TTree.h>
@@ -22,8 +22,6 @@
#include "../TTrainedNetwork.h"
-#include <iostream>
-
#include "TMatrixD.h"
#include "TVectorD.h"
#include "trainNN.h"
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/validateNNnum.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/validateNNnum.cxx
index 51702260c6ad2acbf759b17ec3923db40c892625..122f20e7df5e0ee3414a44f9f7acd245b0cf3f2b 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/validateNNnum.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/validateNNnum.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
*/
#include <TTree.h>
@@ -21,7 +21,6 @@
#include "../TTrainedNetwork.h"
-#include <iostream>
#include <sstream>
#include "TMatrixD.h"
#include "TVectorD.h"
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/writeNtuple.C b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/writeNtuple.C
index 893b9c7cbfed3cae80a7f3b90b62fa1c53982c24..35d94bcdebd599e3959137be509f7bd4b8f8ec18 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/writeNtuple.C
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/writeNtuple.C
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#define writeNtuple_cxx
@@ -9,7 +9,6 @@
#include <TCanvas.h>
#include <TTree.h>
#include <TFile.h>
-#include <TCanvas.h>
#include <TH1F.h>
#include <TLegend.h>
#include <iostream>
@@ -26,8 +25,6 @@
#include "../TTrainedNetwork.h"
-#include <iostream>
-
#include "TMatrixD.h"
#include "TVectorD.h"
//#include "trainNN.h"
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapOverlayWriter.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapOverlayWriter.cxx
index f313a1bff54c25f90990ed85cbb207ca951951f8..e1995693d209149ff98f6da787510dedd764d1d3 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapOverlayWriter.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapOverlayWriter.cxx
@@ -7,7 +7,6 @@
#include "PixelConditionsData/SpecialPixelMap.h"
#include "PixelConditionsTools/ISpecialPixelMapSvc.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "PixelConditionsTools/ISpecialPixelMapSvc.h"
// geometry
#include "InDetIdentifier/PixelID.h"
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/makeplots.cpp b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/makeplots.cpp
index 7eb4f4b2fe560df1b68f2ce8048b0c4c65749cff..4ed60ab1059fdea728a9dc750df7a7a054b4c686 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/makeplots.cpp
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/makeplots.cpp
@@ -19,7 +19,6 @@
#include <TLine.h>
#include <TLegend.h>
#include <TLegendEntry.h>
-#include <THStack.h>
#include <TEventList.h>
#include <TPad.h>
#include <TPaveText.h>
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx
index 83ec8b08bd3ce8602b3c26ca133b2f30595ac830..cf21c217211f20680e7682a9a2e5fddd94d94a7e 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx
@@ -16,7 +16,6 @@
#include "TrkTrack/Track.h"
#include "TrkTrack/TrackCollection.h"
-#include "InDetPrepRawData/TRT_DriftCircle.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx
index 1db966294169f598ec92986a55999598e58e31bb..ebb9ea397e5adec83640e984a8e1c20481d3d357 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -21,7 +21,6 @@ PURPOSE: Tool
#include "FillAlignTRTHits.h"
#include "TRT_CalibData/TrackInfo.h"
#include "TrkTrack/Track.h"
-#include "TrkParameters/TrackParameters.h"
#include "TrkEventPrimitives/LocalParameters.h"
#include "EventPrimitives/EventPrimitives.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/TRT_BSErrContainer_p1.h b/InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/TRT_BSErrContainer_p1.h
index 7419411281b4b04068d7f2bd03a7307e15b5ca88..855645a4a8b53e7145b901af85bc382c6ae7e93c 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/TRT_BSErrContainer_p1.h
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/TRT_BSErrContainer_p1.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
*/
/***************************************************************************
@@ -14,7 +14,6 @@
#include <stdint.h>
#include "AthContainers/DataVector.h"
#include "AthenaKernel/CLASS_DEF.h"
-#include <stdint.h>
typedef DataVector<std::pair<uint8_t, uint32_t> > TRT_BSErrContainer_p1; // <type, index>
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index f26f7beab959df653de0e9843790f9620c82cdb7..12c245e32090dbd6d0ca53d29b607a306ffde78c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -61,9 +61,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
FEI3BarrelHitDuplication2016 = [ False, False, False, False],
FEI3BarrelSmallHitToT2016 = [ -1, -1, -1, -1],
FEI3BarrelTimingSimTune2016 = [ -1, 2015, 2015, 2015],
- BarrelCrossTalk2016 = [ 0.30, 0.06, 0.06, 0.06],
+ BarrelCrossTalk2016 = [ 0.30, 0.12, 0.12, 0.12],
BarrelNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbability2016 = [ 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltage2016 = [ 80.0, 350.0, 200.0, 150.0],
BarrelFluence2016 = [0.80e14,1.61e14,0.71e14,0.48e14],
BarrelFluenceMap2016 = ["PixelDigitization/maps_IBL_PL_80V_fl0_8e14.root",
@@ -78,6 +79,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalk2016 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbability2016 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0],
DBMToTThreshold2016 = [ -1, -1, -1],
DBMCrossTalk2016 = [ 0.06, 0.06, 0.06],
DBMNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8],
@@ -100,9 +102,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
FEI3BarrelHitDuplication2017 = [ False, False, False, False],
FEI3BarrelSmallHitToT2017 = [ -1, -1, -1, -1],
FEI3BarrelTimingSimTune2017 = [ -1, 2018, 2018, 2018],
- BarrelCrossTalk2017 = [ 0.30, 0.06, 0.06, 0.06],
+ BarrelCrossTalk2017 = [ 0.30, 0.12, 0.12, 0.12],
BarrelNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbability2017 = [ 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltage2017 = [ 350.0, 350.0, 200.0, 150.0],
BarrelFluence2017 = [3.18e14,3.42e14,1.50e14,1.01e14],
BarrelFluenceMap2017 = ["PixelDigitization/maps_IBL_PL_350V_fl3_18e14.root",
@@ -117,6 +120,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalk2017 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbability2017 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0],
DBMToTThreshold2017 = [ -1, -1, -1],
DBMCrossTalk2017 = [ 0.06, 0.06, 0.06],
DBMNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8],
@@ -134,9 +138,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
FEI3BarrelHitDuplication2018 = [ False, False, False, False],
FEI3BarrelSmallHitToT2018 = [ -1, -1, -1, -1],
FEI3BarrelTimingSimTune2018 = [ -1, 2018, 2018, 2018],
- BarrelCrossTalk2018 = [ 0.30, 0.06, 0.06, 0.06],
+ BarrelCrossTalk2018 = [ 0.30, 0.12, 0.12, 0.12],
BarrelNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbability2018 = [ 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltage2018 = [ 400.0, 400.0, 250.0, 250.0],
BarrelFluence2018 = [5.50e14,5.19e14,2.28e14,1.53e14],
BarrelFluenceMap2018 = ["PixelDigitization/maps_IBL_PL_400V_fl5_5e14.root",
@@ -151,6 +156,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalk2018 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbability2018 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0],
DBMToTThreshold2018 = [ -1, -1, -1],
DBMCrossTalk2018 = [ 0.06, 0.06, 0.06],
DBMNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8],
@@ -170,9 +176,10 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
BarrelCrossTalkRUN1 = [ 0.06, 0.06, 0.06],
BarrelNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8],
BarrelDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltageRUN1 = [ 150.0, 150.0, 150.0],
BarrelFluenceRUN1 = [1.01e14,0.44e14,0.30e14],
- BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_250V_fl1_01e14.root",
+ BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_150V_fl1_01e14.root",
"PixelDigitization/maps_PIX_150V_fl0_44e14.root",
"PixelDigitization/maps_PIX_150V_fl0_3e14.root"],
EndcapToTThresholdRUN1 = [ 3, 3, 3],
@@ -183,6 +190,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalkRUN1 = [ 0.06, 0.06, 0.06],
EndcapNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8],
EndcapDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
BLayerNoiseShapeRUN1 = [0.0, 0.0, 0.0, 0.0, 0.2204, 0.5311, 0.7493, 0.8954, 0.9980, 1.0],
PixelNoiseShapeRUN1 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.2418, 0.4397, 0.5858, 0.6949, 0.7737, 0.8414, 0.8959, 0.9414, 0.9828, 1.0],
)
@@ -193,6 +201,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
BarrelCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06],
BarrelNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8],
BarrelDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3],
+ BarrelLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0],
DefaultBarrelBiasVoltageITK = [ 150.0, 150.0, 150.0, 150.0, 150.0],
BarrelFluenceITK = [0.0e14,0.0e14,0.0e14,0.0e14,0.0e14],
BarrelFluenceMapITK = ["PixelDigitization/maps_IBL_PL_80V_fl0e14.root",
@@ -204,10 +213,25 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
EndcapCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06],
EndcapNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8],
EndcapDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3],
+ EndcapLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
InnermostNoiseShapeITK = [0.0, 1.0],
NextInnermostNoiseShapeITK = [0.0, 1.0],
PixelNoiseShapeITK = [0.0, 1.0]
)
+ else:
+ # for data, make sure no Lorentz angle correction
+ CondArgs.update(
+ BarrelLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0],
+ BarrelLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0],
+ EndcapLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+ )
# Charge calibration parameters
CondArgs.update(
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
index db1962721e3ff97aad9fbb85b89adfb705091b3e..7024b858a1a6bd0a29b07e0465a0dfb83280c57a 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
@@ -174,6 +174,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
// mapping files for radiation damage simulation
std::vector<std::string> mapsPath_list;
+
int currentRunNumber = ctx.eventID().run_number();
if (currentRunNumber<222222) {
writeCdo -> setBarrelToTThreshold(m_BarrelToTThresholdRUN1);
@@ -184,6 +185,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalkRUN1);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancyRUN1);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbabilityRUN1);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorrRUN1);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltageRUN1);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThresholdRUN1);
@@ -194,6 +196,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalkRUN1);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancyRUN1);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbabilityRUN1);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorrRUN1);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltageRUN1);
// This is ad-hoc solution.
@@ -221,6 +224,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2016);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2016);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2016);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2016);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2016);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2016);
@@ -231,6 +235,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2016);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2016);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2016);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2016);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2016);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2016);
@@ -274,12 +279,14 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalkITK);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancyITK);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbabilityITK);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorrITK);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltageITK);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThresholdITK);
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalkITK);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancyITK);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbabilityITK);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorrITK);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltageITK);
// This is ad-hoc solution.
@@ -309,6 +316,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2016);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2016);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2016);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2016);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2016);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2016);
@@ -319,6 +327,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2016);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2016);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2016);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2016);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2016);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2016);
@@ -357,6 +366,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2017);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2017);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2017);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2017);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2017);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2017);
@@ -367,6 +377,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2017);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2017);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2017);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2017);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2017);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2017);
@@ -405,6 +416,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setBarrelCrossTalk(m_BarrelCrossTalk2018);
writeCdo -> setBarrelNoiseOccupancy(m_BarrelNoiseOccupancy2018);
writeCdo -> setBarrelDisableProbability(m_BarrelDisableProbability2018);
+ writeCdo -> setBarrelLorentzAngleCorr(m_BarrelLorentzAngleCorr2018);
writeCdo -> setDefaultBarrelBiasVoltage(m_BarrelBiasVoltage2018);
writeCdo -> setEndcapToTThreshold(m_EndcapToTThreshold2018);
@@ -415,6 +427,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
writeCdo -> setEndcapCrossTalk(m_EndcapCrossTalk2018);
writeCdo -> setEndcapNoiseOccupancy(m_EndcapNoiseOccupancy2018);
writeCdo -> setEndcapDisableProbability(m_EndcapDisableProbability2018);
+ writeCdo -> setEndcapLorentzAngleCorr(m_EndcapLorentzAngleCorr2018);
writeCdo -> setDefaultEndcapBiasVoltage(m_EndcapBiasVoltage2018);
writeCdo -> setDBMToTThreshold(m_DBMToTThreshold2018);
@@ -453,7 +466,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
for (unsigned int i=0; i<mapsPath_list.size(); i++) {
ATH_MSG_INFO("Using maps located in: "<<mapsPath_list.at(i) << " for layer No." << i);
- std::unique_ptr<TFile> mapsFile(new TFile((mapsPath_list.at(i)).c_str())); //this is the ramo potential.
+ TFile* mapsFile = new TFile((mapsPath_list.at(i)).c_str()); //this is the ramo potential.
//Setup ramo weighting field map
TH3F* ramoPotentialMap_hold = 0;
@@ -465,15 +478,10 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
}
ramoPotentialMap.push_back(ramoPotentialMap_hold);
- std::unique_ptr<TH2F> lorentzMap_e_hold((TH2F*)mapsFile->Get("lorentz_map_e"));
- std::unique_ptr<TH2F> lorentzMap_h_hold((TH2F*)mapsFile->Get("lorentz_map_h"));
- std::unique_ptr<TH2F> distanceMap_h_hold((TH2F*)mapsFile->Get("edistance"));
- std::unique_ptr<TH2F> distanceMap_e_hold((TH2F*)mapsFile->Get("hdistance"));
-
- lorentzMap_e.push_back(lorentzMap_e_hold.get());
- lorentzMap_h.push_back(lorentzMap_h_hold.get());
- distanceMap_e.push_back(distanceMap_e_hold.get());
- distanceMap_h.push_back(distanceMap_h_hold.get());
+ lorentzMap_e.push_back((TH2F*)mapsFile->Get("lorentz_map_e"));
+ lorentzMap_h.push_back((TH2F*)mapsFile->Get("lorentz_map_h"));
+ distanceMap_e.push_back((TH2F*)mapsFile->Get("edistance"));
+ distanceMap_h.push_back((TH2F*)mapsFile->Get("hdistance"));
}
writeCdo -> setLorentzMap_e(lorentzMap_e);
writeCdo -> setLorentzMap_h(lorentzMap_h);
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index 458eb01203751236cf324404dc2997b48c893e1b..9dca7e04393b4fea74b45628437d2c5aec8216b0 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -186,7 +186,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "FEI3BarrelTimingSimTune2016", {-1,2015,2015,2015}, "FEI3 timing tuning set of barrel pixel layers in 2015/2016"};
Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2016
- {this, "BarrelCrossTalk2016", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2015/2016"};
+ {this, "BarrelCrossTalk2016", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2015/2016"};
Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2016
{this, "BarrelNoiseOccupancy2016", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2015/2016"};
@@ -194,6 +194,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbability2016
{this, "BarrelDisableProbability2016", {9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in 2015/2016"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorr2016
+ {this, "BarrelLorentzAngleCorr2016", {1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in 2015/2016"};
+
// So far, Gaudi::Property does not support 2D vector.
// Gaudi::Property<std::vector<std::vector<float>>> m_BarrelNoiseShape2016
// {this, "BarrelNoiseShape", {{0.0,1.0},{0.0,1.0},{0.0,1.0},{0.0,1.0}}, "Noise shape of barrel pixel layers"};
@@ -236,6 +239,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbability2016
{this, "EndcapDisableProbability2016", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in 2015/2016"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorr2016
+ {this, "EndcapLorentzAngleCorr2016", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in 2015/2016"};
+
// DBM RUN2 2015/2016
Gaudi::Property<std::vector<int>> m_DBMToTThreshold2016
{this, "DBMToTThreshold2016", {-1,-1,-1}, "ToT thresholds for DBM layers in 2015/2016"};
@@ -283,7 +289,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "FEI3BarrelTimingSimTune2017", {-1,2018,2018,2018}, "FEI3 timing tuning set of barrel pixel layers in 2017"};
Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2017
- {this, "BarrelCrossTalk2017", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2017"};
+ {this, "BarrelCrossTalk2017", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2017"};
Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2017
{this, "BarrelNoiseOccupancy2017", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2017"};
@@ -291,6 +297,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbability2017
{this, "BarrelDisableProbability2017", {9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in 2017"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorr2017
+ {this, "BarrelLorentzAngleCorr2017", {1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in 2017"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_IBLNoiseShape2017
{this, "IBLNoiseShape2017", {0.0,1.0}, "Noise shape for IBL in 2017"};
@@ -329,6 +338,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbability2017
{this, "EndcapDisableProbability2017", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in 2017"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorr2017
+ {this, "EndcapLorentzAngleCorr2017", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in 2017"};
+
// DBM RUN2 2017
Gaudi::Property<std::vector<int>> m_DBMToTThreshold2017
{this, "DBMToTThreshold2017", {-1,-1,-1}, "ToT thresholds for DBM layers in 2017"};
@@ -376,7 +388,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "FEI3BarrelTimingSimTune2018", {-1,2018,2018,2018}, "FEI3 timing tuning set of barrel pixel layers in 2018"};
Gaudi::Property<std::vector<double>> m_BarrelCrossTalk2018
- {this, "BarrelCrossTalk2018", {0.30,0.06,0.06,0.06}, "Cross-talk fraction of barrel pixel layers in 2018"};
+ {this, "BarrelCrossTalk2018", {0.30,0.12,0.12,0.12}, "Cross-talk fraction of barrel pixel layers in 2018"};
Gaudi::Property<std::vector<double>> m_BarrelNoiseOccupancy2018
{this, "BarrelNoiseOccupancy2018", {5e-8,5e-8,5e-8,5e-8}, "Noise occupancy of barrel pixel layers in 2018"};
@@ -384,6 +396,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbability2018
{this, "BarrelDisableProbability2018", {9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in 2018"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorr2018
+ {this, "BarrelLorentzAngleCorr2018", {1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in 2018"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_IBLNoiseShape2018
{this, "IBLNoiseShape2018", {0.0,1.0}, "Noise shape for IBL in 2018"};
@@ -422,6 +437,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbability2018
{this, "EndcapDisableProbability2018", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in 2018"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorr2018
+ {this, "EndcapLorentzAngleCorr2018", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in 2018"};
+
// DBM RUN2 2018
Gaudi::Property<std::vector<int>> m_DBMToTThreshold2018
{this, "DBMToTThreshold2018", {-1,-1,-1}, "ToT thresholds for DBM layers in 2018"};
@@ -450,7 +468,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "BarrelFluenceRUN1", {1.01e14, 0.44e14, 0.30e14}, "Barrel fluence for radiation damage in RUN1"};
Gaudi::Property<std::vector<std::string>> m_BarrelFluenceMapRUN1
- {this, "BarrelFluenceMapRUN1", {"PixelDigitization/maps_PIX_250V_fl1_01e14.root", // this needs to be updated
+ {this, "BarrelFluenceMapRUN1", {"PixelDigitization/maps_PIX_150V_fl1_01e14.root", // this needs to be updated
"PixelDigitization/maps_PIX_150V_fl0_44e14.root",
"PixelDigitization/maps_PIX_150V_fl0_3e14.root"},
"Barrel fluence map for radiation damage in RUN1"};
@@ -476,6 +494,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbabilityRUN1
{this, "BarrelDisableProbabilityRUN1", {9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in RUN1"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorrRUN1
+ {this, "BarrelLorentzAngleCorrRUN1", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in RUN1"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_BLayerNoiseShapeRUN1
{this, "BLayerNoiseShapeRUN1", {0.0,1.0}, "Noise shape for b-layer in RUN1"};
@@ -511,6 +532,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbabilityRUN1
{this, "EndcapDisableProbabilityRUN1", {9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in RUN1"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorrRUN1
+ {this, "EndcapLorentzAngleCorrRUN1", {1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in RUN1"};
+
//====================================================================================
// Barrel ITK
Gaudi::Property<std::vector<int>> m_BarrelToTThresholdITK
@@ -539,6 +563,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_BarrelDisableProbabilityITK
{this, "BarrelDisableProbabilityITK", {9e-3,9e-3,9e-3,9e-3,9e-3}, "Disable probability of barrel pixel layers in ITK"};
+ Gaudi::Property<std::vector<double>> m_BarrelLorentzAngleCorrITK
+ {this, "BarrelLorentzAngleCorrITK", {1.0,1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of barrel pixel layers in ITK"};
+
// This is ad-hoc solution.
Gaudi::Property<std::vector<float>> m_InnermostNoiseShapeITK
{this, "InnermostNoiseShapeITK", {0.0,1.0}, "Noise shape for IBL in ITK"};
@@ -565,6 +592,9 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
Gaudi::Property<std::vector<double>> m_EndcapDisableProbabilityITK
{this, "EndcapDisableProbabilityITK", {9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3,9e-3}, "Disable probability of endcap pixel layers in ITK"};
+ Gaudi::Property<std::vector<double>> m_EndcapLorentzAngleCorrITK
+ {this, "EndcapLorentzAngleCorrITK", {1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0}, "Scale factor for Lorentz angle of endcap pixel layers in ITK"};
+
//====================================================================================
// The following parameters are default values which will be overwritten by the one
// from the conditions DB. Otherwise the DB is not retrieved nor available, these
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
index be5a24afc8a43c6c923beb43104c8d61b6e69426..e1efb342b00c5038223ed7eb4917f80083297610 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
+++ b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
@@ -139,6 +139,11 @@ class PixelModuleData {
float getDefaultQ2TotE() const;
float getDefaultQ2TotC() const;
+ // Lorentz angle correction
+ void setBarrelLorentzAngleCorr(std::vector<double> BarrelLorentzAngleCorr);
+ void setEndcapLorentzAngleCorr(std::vector<double> EndcapLorentzAngleCorr);
+ double getLorentzAngleCorr(int bec, int layer) const;
+
// DCS parameters
void setDefaultBiasVoltage(float biasVoltage);
float getDefaultBiasVoltage() const;
@@ -283,6 +288,9 @@ class PixelModuleData {
float m_paramE;
float m_paramC;
+ std::vector<double> m_BarrelLorentzAngleCorr;
+ std::vector<double> m_EndcapLorentzAngleCorr;
+
float m_biasVoltage;
float m_temperature;
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
index 558bca2c312d1b7e1b3d39068040964fdbc1c16c..16da803924fcd45e2b570b9451e491b4fdcceaea 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
@@ -280,6 +280,16 @@ float PixelModuleData::getDefaultQ2TotA() const { return m_paramA; }
float PixelModuleData::getDefaultQ2TotE() const { return m_paramE; }
float PixelModuleData::getDefaultQ2TotC() const { return m_paramC; }
+// Lorentz angle correction
+void PixelModuleData::setBarrelLorentzAngleCorr(std::vector<double> BarrelLorentzAngleCorr) { m_BarrelLorentzAngleCorr = BarrelLorentzAngleCorr; }
+void PixelModuleData::setEndcapLorentzAngleCorr(std::vector<double> EndcapLorentzAngleCorr) { m_EndcapLorentzAngleCorr = EndcapLorentzAngleCorr; }
+double PixelModuleData::getLorentzAngleCorr(int bec, int layer) const {
+ double LAcorr = 1.0;
+ if (std::abs(bec)==0 && layer<(int)m_BarrelLorentzAngleCorr.size()) { LAcorr=m_BarrelLorentzAngleCorr.at(layer); }
+ if (std::abs(bec)==2 && layer<(int)m_EndcapLorentzAngleCorr.size()) { LAcorr=m_EndcapLorentzAngleCorr.at(layer); }
+ return LAcorr;
+}
+
// DCS parameters
void PixelModuleData::setDefaultBiasVoltage(float biasVoltage) { m_biasVoltage=biasVoltage; }
float PixelModuleData::getDefaultBiasVoltage() const { return m_biasVoltage; }
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
index 5a31f5d9d9b40acba815feec38330249d65fd19e..d11364eb6e9ec706783346f11033a35ab65d2f01 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
@@ -22,8 +22,6 @@ PixelConditionsSummaryTool::~PixelConditionsSummaryTool(){}
StatusCode PixelConditionsSummaryTool::initialize(){
ATH_MSG_DEBUG("PixelConditionsSummaryTool::initialize()");
- ATH_CHECK(setProperties());
-
ATH_CHECK(m_condDCSStateKey.initialize());
ATH_CHECK(m_condDCSStatusKey.initialize());
ATH_CHECK(m_BSErrContReadKey.initialize(SG::AllowEmpty));
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx
index 146f84f61b6d2af50ebeddc07d4374800650ee7f..d83aff93106f74d5dfdd1b59ad45fdbc4ef98379 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx
@@ -1,5 +1,5 @@
/*
- 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 "SCT_RadDamageSummaryTool.h"
@@ -16,8 +16,6 @@ SCT_RadDamageSummaryTool::SCT_RadDamageSummaryTool(const std::string& type, cons
StatusCode SCT_RadDamageSummaryTool::initialize() {
ATH_MSG_INFO("Initializing SCT_RadDamageSummaryTool");
- ATH_CHECK(setProperties());
-
ATH_CHECK(m_chargeTrappingTool.retrieve());
ATH_MSG_INFO("SCT_ChargeTrappingTool retrieved");
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
index 5ad66b6dd64164b5f52799e58857298fc6dfa683..e3fd0bba45b25ade8889a769fa240a45fee052a6 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
@@ -25,6 +25,7 @@ StatusCode PixelSiLorentzAngleCondAlg::initialize() {
ATH_CHECK(m_condSvc.retrieve());
+ ATH_CHECK(m_moduleDataKey.initialize());
ATH_CHECK(m_readKeyTemp.initialize());
ATH_CHECK(m_readKeyHV.initialize());
ATH_CHECK(m_writeKey.initialize());
@@ -56,6 +57,8 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
return StatusCode::SUCCESS;
}
+ SG::ReadCondHandle<PixelModuleData>moduleData(m_moduleDataKey, ctx);
+
// Read Cond Handle (temperature)
SG::ReadCondHandle<PixelDCSTempData> readHandleTemp(m_readKeyTemp, ctx);
const PixelDCSTempData* readCdoTemp(*readHandleTemp);
@@ -137,6 +140,13 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
}
const InDetDD::PixelModuleDesign* p_design = dynamic_cast<const InDetDD::PixelModuleDesign*>(&element->design());
+
+ const PixelID* pixelId = static_cast<const PixelID *>(element->getIdHelper());
+ int barrel_ec = pixelId->barrel_ec(element->identify());
+ int layerIndex = pixelId->layer_disk(element->identify());
+
+ double LACorr = moduleData->getLorentzAngleCorr(barrel_ec,layerIndex);
+
if (not p_design){
ATH_MSG_FATAL("Dynamic cast to PixelModuleDesign* failed in PixelSiLorentzAngleCondAlg::execute");
return StatusCode::FAILURE;
@@ -157,25 +167,25 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
// The hit depth axis is pointing from the readout side to the backside if m_design->readoutSide() < 0
// The hit depth axis is pointing from the backside to the readout side if m_design->readoutSide() > 0
double tanLorentzAnglePhi = forceLorentzToZero*element->design().readoutSide()*mobility*element->hitDepthDirection()*element->hitPhiDirection()*(element->normal().cross(magneticField)).dot(element->phiAxis());
- writeCdo->setTanLorentzAngle(elementHash, m_correctionFactor*tanLorentzAnglePhi);
+ writeCdo->setTanLorentzAngle(elementHash, LACorr*tanLorentzAnglePhi);
// This gives the effective correction in the reconstruction frame hence the extra hitPhiDirection()
// as the angle above is in the hit frame.
double lorentzCorrectionPhi = -0.5*element->hitPhiDirection()*tanLorentzAnglePhi*depletionDepth;
- writeCdo->setLorentzShift(elementHash, m_correctionFactor*lorentzCorrectionPhi);
+ writeCdo->setLorentzShift(elementHash, LACorr*lorentzCorrectionPhi);
// The Lorentz eta shift very small and so can be ignored, but we include it for completeness.
double tanLorentzAngleEta = forceLorentzToZero*element->design().readoutSide()*mobility*element->hitDepthDirection()*element->hitEtaDirection()*(element->normal().cross(magneticField)).dot(element->etaAxis());
- writeCdo->setTanLorentzAngleEta(elementHash, m_correctionFactor*tanLorentzAngleEta);
+ writeCdo->setTanLorentzAngleEta(elementHash, LACorr*tanLorentzAngleEta);
double lorentzCorrectionEta = -0.5*element->hitPhiDirection()*tanLorentzAngleEta*depletionDepth;
- writeCdo->setLorentzShiftEta(elementHash, m_correctionFactor*lorentzCorrectionEta);
+ writeCdo->setLorentzShiftEta(elementHash, LACorr*lorentzCorrectionEta);
// Monitoring value
writeCdo->setBiasVoltage(elementHash, biasVoltage/CLHEP::volt);
writeCdo->setTemperature(elementHash, temperature-273.15);
writeCdo->setDepletionVoltage(elementHash, deplVoltage/CLHEP::volt);
- ATH_MSG_DEBUG("Hash = " << elementHash << " tanPhi = " << lorentzCorrectionPhi << " shiftPhi = " << writeCdo->getLorentzShift(elementHash) << " Factor = " << m_correctionFactor << "Depletion depth = " << depletionDepth);
+ ATH_MSG_DEBUG("Hash = " << elementHash << " tanPhi = " << lorentzCorrectionPhi << " shiftPhi = " << writeCdo->getLorentzShift(elementHash) << " Factor = " << LACorr << " Depletion depth = " << depletionDepth);
ATH_MSG_DEBUG("Hash = " << elementHash << " tanPhi = " << lorentzCorrectionPhi << " shiftPhi = " << writeCdo->getLorentzShift(elementHash) << "Depletion depth = " << depletionDepth);
ATH_MSG_VERBOSE("Temperature (C), bias voltage, depletion voltage: " << temperature-273.15 << ", " << biasVoltage/CLHEP::volt << ", " << deplVoltage/CLHEP::volt);
ATH_MSG_VERBOSE("Depletion depth: " << depletionDepth/CLHEP::mm);
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
index 0ac808add49895d7f1708d07ed526851eca20ead..3ecb7efcdec92396b34ced773e2dd5eab4dd465a 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
@@ -18,6 +18,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
+#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelDCSHVData.h"
#include "PixelConditionsData/PixelDCSTempData.h"
#include "GaudiKernel/ICondSvc.h"
@@ -44,6 +45,9 @@ class PixelSiLorentzAngleCondAlg: public AthReentrantAlgorithm {
private:
ServiceHandle<ICondSvc> m_condSvc;
+ SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
+ {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
+
SG::ReadCondHandleKey<PixelDCSTempData> m_readKeyTemp
{this, "ReadKeyeTemp", "PixelDCSTempCondData", "Key of input sensor temperature conditions folder"};
@@ -66,7 +70,7 @@ class PixelSiLorentzAngleCondAlg: public AthReentrantAlgorithm {
DoubleProperty m_nominalField {this, "NominalField", 2.0834*Gaudi::Units::tesla, "Default nominal field"};
BooleanProperty m_useMagFieldCache{this, "UseMagFieldCache", true};
BooleanProperty m_useMagFieldDcs{this, "UseMagFieldDcs", true};
- DoubleProperty m_correctionFactor{this, "CorrectionFactor", 0.9, "Lorentz angle correction factor"};
+
unsigned int m_maxHash;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx
index d33b6115896169da2f587d6923d76508ed4b2132..690d72008c538d9bb8480592ec867b124b59fe49 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_AlignDbSvc.cxx
@@ -23,7 +23,6 @@
#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
#include "TRT_ConditionsData/FloatArrayStore.h"
-#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
#include "AthenaKernel/IOVSvcDefs.h"
// Amg
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h
index 0749d168c0052793223d59d3451fbe1c15197558..d83190a2638bc47397b270b7e24fb734a904e83c 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DCS_ConditionsSvc.h
@@ -15,7 +15,6 @@
#include "CxxUtils/checker_macros.h"
#include "TRT_ConditionsServices/ITRT_DCS_ConditionsSvc.h"
#include "TRT_ConditionsServices/ITRT_ConditionsSvc.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ICondSvc.h"
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx
index f43b215dd2563de7350ab2824e10d20e9c34bfea..9bc3c8c479001c5898df9b391a7944bc77ab91c1 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx
@@ -13,7 +13,6 @@
#include "InDetServMatGeoModel/ConvertStaveServices.h"
#include <map>
-#include <iostream>
#include <iostream> // for DEBUG only
using namespace std;
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx
index 4821bdba4e4a5f817d51606b1defdcb7569adbe2..50d448df154f77c52b969836c88dbad1d8992d38 100755
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx
@@ -22,7 +22,6 @@
#include "TrkDetDescrUtils/BinnedArray2D.h"
#include "TrkDetDescrUtils/BinnedArray1D.h"
#include "TrkDetDescrUtils/BinUtility.h"
-#include "TrkDetDescrUtils/BinUtility.h"
// GeoPrimitives
#include "GeoPrimitives/GeoPrimitivesHelpers.h"
#include "GeoPrimitives/GeoPrimitivesToStringConverter.h"
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx
index 874a6a622ddb6988d26e670610eaa94e5dcedc7c..832f106603ec294f960b5781a0396f1e0a221f5b 100755
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx
@@ -22,7 +22,6 @@
#include "TrkDetDescrUtils/BinnedArray2D.h"
#include "TrkDetDescrUtils/BinnedArray1D.h"
#include "TrkDetDescrUtils/BinUtility.h"
-#include "TrkDetDescrUtils/BinUtility.h"
// GeoPrimitives
#include "GeoPrimitives/GeoPrimitivesHelpers.h"
#include "GeoPrimitives/GeoPrimitivesToStringConverter.h"
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx
index 5c8be1c4430fdc464efef932526d8a9e4ead7cca..63330a7192e262c15bb4e8651a581dd427390072 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx
@@ -29,7 +29,6 @@
#include "GeoModelKernel/GeoTransform.h"
#include "GeoModelKernel/GeoTubs.h"
-#include "GeoModelKernel/GeoPhysVol.h"
#include "GaudiKernel/SystemOfUnits.h"
#include <sstream>
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx
index d438c6eccc8f111d24dcca3c3556eb0a826d55f9..17cc25a65907cceb104480d6e5c64662da8b6f25 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx
@@ -11,7 +11,6 @@
#include "GeoModelUtilities/GeoAlignmentStore.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
-#include "GeoModelUtilities/GeoAlignmentStore.h"
#include "InDetIdentifier/TRT_ID.h"
#include <vector>
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
index 122ae59933a35c0244ed35951ff4a0837d65a036..7b857eac6d450fdf72db9e64a4287a6628f77672 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
@@ -22,8 +22,6 @@
#include "TRT_ConditionsData/ExpandedIdentifier.h"
#include "TRT_ConditionsData/StrawDxContainer.h"
-#include "GeoModelUtilities/GeoAlignmentStore.h"
-
namespace InDetDD {
TRT_EndcapElement::TRT_EndcapElement(const GeoVFullPhysVol* volume,
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx
index 6f65b86848d6175e63440697fdf30b4b1ec68bbf..a0e27bc23205b86e1dcc7645a3237c4112b6c88e 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx
@@ -17,8 +17,6 @@
#include "xAODEventInfo/EventInfo.h" // NEW EDM
#include "xAODEventInfo/EventAuxInfo.h" // NEW EDM
-#include "CLHEP/Random/RandomEngine.h"
-
//----------------------------------------------------------------------
// Constructor with parameters:
//----------------------------------------------------------------------
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
index 1764ddfdd4b64c6246263e717060557a8eb7eb68..0f2051120e6227e975a61e3ec58c1f24cabbd45c 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
@@ -30,7 +30,6 @@
// Pile-up
-#include "InDetReadoutGeometry/SiDetectorDesign.h"
#include "PixelReadoutGeometry/PixelModuleDesign.h"
// Fatras
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx
index 470093020a18f52c403cf0e22a69848c6b2054eb..48cbc95c5b24877dc3f07b99a9cb2ea5b1e0dabc 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx
@@ -35,7 +35,6 @@
// Pile-up
#include "PileUpTools/PileUpMergeSvc.h"
-#include "InDetReadoutGeometry/SiDetectorDesign.h"
#include "PixelReadoutGeometry/PixelModuleDesign.h"
#include "SCT_ReadoutGeometry/SCT_ModuleSideDesign.h"
#include "SCT_ReadoutGeometry/SCT_BarrelModuleSideDesign.h"
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx
index 38913f15bc9ce534587bec497789da59283e92fa..cd88c2d970c4bbecb6f664dbbc739093d1d96b52 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -391,7 +391,7 @@ StatusCode TRTFastDigitizationTool::produceDriftCircles(const EventContext& ctx)
if ( m_useTrtElectronPidTool ) {
- double position = ( fabs(BEC) == 1 ? hitGlobalPosition.z() : hitGlobalPosition.perp() );
+ double position = ( std::abs(BEC) == 1 ? hitGlobalPosition.z() : hitGlobalPosition.perp() );
double probability;
if ( abs( particleEncoding ) == 11 && kineticEnergy > 5000. ) { // electron
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 7015d588204d9d6bb41189907f0d9674368a6627..926160070e0a5aa2dab751140f00f26c3e211e34 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -202,9 +202,10 @@ def PixelConfigCondAlg_MC():
alg.FEI3BarrelHitDuplication2016 = [ False, False, False, False]
alg.FEI3BarrelSmallHitToT2016 = [ -1, -1, -1, -1]
alg.FEI3BarrelTimingSimTune2016 = [ -1, 2015, 2015, 2015]
- alg.BarrelCrossTalk2016 = [ 0.30, 0.06, 0.06, 0.06]
+ alg.BarrelCrossTalk2016 = [ 0.30, 0.12, 0.12, 0.12]
alg.BarrelNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbability2016 = [ 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltage2016 = [ 80.0, 350.0, 200.0, 150.0]
alg.BarrelFluence2016 = [0.80e14,1.61e14,0.71e14,0.48e14]
@@ -221,6 +222,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalk2016 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancy2016 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbability2016 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorr2016 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltage2016 = [150.0,150.0,150.0]
alg.DBMToTThreshold2016 = [ -1, -1, -1]
@@ -247,9 +249,10 @@ def PixelConfigCondAlg_MC():
alg.FEI3BarrelHitDuplication2017 = [ False, False, False, False]
alg.FEI3BarrelSmallHitToT2017 = [ -1, -1, -1, -1]
alg.FEI3BarrelTimingSimTune2017 = [ -1, 2018, 2018, 2018]
- alg.BarrelCrossTalk2017 = [ 0.30, 0.06, 0.06, 0.06]
+ alg.BarrelCrossTalk2017 = [ 0.30, 0.12, 0.12, 0.12]
alg.BarrelNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbability2017 = [ 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltage2017 = [ 350.0, 350.0, 200.0, 150.0]
alg.BarrelFluence2017 = [3.18e14,3.42e14,1.50e14,1.01e14]
@@ -266,6 +269,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalk2017 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancy2017 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbability2017 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorr2017 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltage2017 = [150.0,150.0,150.0]
alg.DBMToTThreshold2017 = [ -1, -1, -1]
@@ -286,9 +290,10 @@ def PixelConfigCondAlg_MC():
alg.FEI3BarrelHitDuplication2018 = [ False, False, False, False]
alg.FEI3BarrelSmallHitToT2018 = [ -1, -1, -1, -1]
alg.FEI3BarrelTimingSimTune2018 = [ -1, 2018, 2018, 2018]
- alg.BarrelCrossTalk2018 = [ 0.30, 0.06, 0.06, 0.06]
+ alg.BarrelCrossTalk2018 = [ 0.30, 0.12, 0.12, 0.12]
alg.BarrelNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbability2018 = [ 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltage2018 = [ 400.0, 400.0, 250.0, 250.0]
alg.BarrelFluence2018 = [5.50e14,5.19e14,2.28e14,1.53e14]
@@ -305,6 +310,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalk2018 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancy2018 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbability2018 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorr2018 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltage2018 = [250.0,250.0,250.0]
alg.DBMToTThreshold2018 = [ -1, -1, -1]
@@ -327,10 +333,11 @@ def PixelConfigCondAlg_MC():
alg.BarrelCrossTalkRUN1 = [ 0.06, 0.06, 0.06]
alg.BarrelNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltageRUN1 = [ 150.0, 150.0, 150.0]
alg.BarrelFluenceRUN1 = [1.01e14,0.44e14,0.30e14]
- alg.BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_250V_fl1_01e14.root",
+ alg.BarrelFluenceMapRUN1 = ["PixelDigitization/maps_PIX_150V_fl1_01e14.root",
"PixelDigitization/maps_PIX_150V_fl0_44e14.root",
"PixelDigitization/maps_PIX_150V_fl0_3e14.root"]
@@ -342,6 +349,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalkRUN1 = [ 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancyRUN1 = [ 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbabilityRUN1 = [ 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorrRUN1 = [ 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltageRUN1 = [150.0,150.0,150.0]
alg.BLayerNoiseShapeRUN1 = [0.0, 0.0, 0.0, 0.0, 0.2204, 0.5311, 0.7493, 0.8954, 0.9980, 1.0]
@@ -353,6 +361,7 @@ def PixelConfigCondAlg_MC():
alg.BarrelCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06]
alg.BarrelNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8]
alg.BarrelDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.BarrelLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0]
alg.DefaultBarrelBiasVoltageITK = [ 150.0, 150.0, 150.0, 150.0, 150.0]
alg.BarrelFluenceITK = [0.0e14,0.0e14,0.0e14,0.0e14,0.0e14]
@@ -366,6 +375,7 @@ def PixelConfigCondAlg_MC():
alg.EndcapCrossTalkITK = [ 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06, 0.06]
alg.EndcapNoiseOccupancyITK = [ 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8, 5e-8]
alg.EndcapDisableProbabilityITK = [ 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3, 9e-3]
+ alg.EndcapLorentzAngleCorrITK = [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
alg.DefaultEndcapBiasVoltageITK = [150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0,150.0]
alg.InnermostNoiseShapeITK = [0.0, 1.0]
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
index 4444967edfbca94fb9f6f4be8adf5a6e473c649a..da8ac64821e5fa0c48b38fa9e5db109c58c170a6 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
@@ -205,7 +205,7 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit> &phit, SiC
double collectionDist = 0.2*CLHEP::mm;
double smearScale = 1. + 0.35*smearRand;
double tanLorentz = m_lorentzAngleTool->getTanLorentzAngle(Module.identifyHash());
- double coLorentz=sqrt(1+pow(tanLorentz,2));
+ double coLorentz=std::sqrt(1.0+pow(tanLorentz,2));
const EBC_EVCOLL evColl = EBC_MAINEVCOLL;
const HepMcParticleLink::PositionFlag idxFlag = (phit.eventId()==0) ? HepMcParticleLink::IS_POSITION: HepMcParticleLink::IS_INDEX;
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimTool.h
index adb5b1a68d522f00a43125a20f7633f560b32876..849cb7cacb3666f65d56ca14d3451789ea0c6f03 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimTool.h
@@ -19,7 +19,6 @@
#include "HitManagement/TimedHitPtr.h"
#include "SiDigitization/SiChargedDiodeCollection.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "SiDigitization/SiChargedDiodeCollection.h"
#include "PixelReadoutGeometry/PixelModuleDesign.h"
#include "SiPropertiesTool/ISiPropertiesTool.h"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx
index 23711b4ea8a99e792447980ff9a1c1bf38158f94..adb1988e8216b5b95d808ee9fa08e29e58625094 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.cxx
@@ -213,13 +213,13 @@ float SCT_SurfaceChargesGenerator::driftTime(float zhit, const SiDetectorElement
ATH_MSG_ERROR("driftTime: negative argument X for log(X) " << zhit);
}
return -1.0;
- } else {
+ } else {
// (m_biasVoltage<m_depletionVoltage) can happen with underdepleted sensors, lose charges in that volume
return -10.0;
}
}
- float t_drift{log((depletionVoltage + biasVoltage) / denominator)};
+ float t_drift{std::log((depletionVoltage + biasVoltage) / denominator)};
t_drift *= thickness * thickness / (2.0 * m_siPropertiesTool->getSiProperties(hashId).holeDriftMobility() * depletionVoltage);
return t_drift;
}
@@ -236,7 +236,7 @@ float SCT_SurfaceChargesGenerator::diffusionSigma(float zhit, const SiDetectorEl
const float t{driftTime(zhit, element)}; // in ns
if (t > 0.0) {
- const float sigma{static_cast<float>(sqrt(2. * m_siPropertiesTool->getSiProperties(hashId).holeDiffusionConstant() * t))}; // in mm
+ const float sigma{static_cast<float>(std::sqrt(2. * m_siPropertiesTool->getSiProperties(hashId).holeDiffusionConstant() * t))}; // in mm
return sigma;
} else {
return 0.0;
@@ -351,7 +351,7 @@ void SCT_SurfaceChargesGenerator::processSiHit(const SiDetectorElement* element,
const float cPhi{static_cast<float>(endPos[SiHit::xPhi]) - xPhi};
const float cDep{static_cast<float>(endPos[SiHit::xDep]) - xDep};
- const float LargeStep{sqrt(cEta*cEta + cPhi*cPhi + cDep*cDep)};
+ const float LargeStep{std::sqrt(cEta*cEta + cPhi*cPhi + cDep*cDep)};
const int numberOfSteps{static_cast<int>(LargeStep / m_smallStepLength) + 1};
const float steps{static_cast<float>(m_numberOfCharges * numberOfSteps)};
const float e1{static_cast<float>(phit.energyLoss() / steps)};
@@ -394,7 +394,7 @@ void SCT_SurfaceChargesGenerator::processSiHit(const SiDetectorElement* element,
const float StepX{cEta / numberOfSteps};
const float StepY{cPhi / numberOfSteps};
const float StepZ{cDep / numberOfSteps};
-
+
// check the status of truth information for this SiHit
// some Truth information is cut for pile up events
const EBC_EVCOLL evColl = EBC_MAINEVCOLL;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetEventTPCnvDict.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetEventTPCnvDict.h
index 4a8d1785c30049eafd6c3fffbd7a0460fb3d69ef..3483029751408f6fcf520a6b313bc4c76d8fad69 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetEventTPCnvDict.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetEventTPCnvDict.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 INDETEVENTTPCNV_INDETEVENTTPCNVDICT_H
@@ -28,11 +28,9 @@
#include "InDetEventTPCnv/PixelClusterContainer_p3.h"
#include "InDetEventTPCnv/SCT_ClusterContainer_p2.h"
#include "InDetEventTPCnv/SCT_ClusterContainer_p3.h"
-#include "InDetEventTPCnv/PixelClusterContainer_tlp1.h"
#include "InDetEventTPCnv/SCT_ClusterContainer_tlp1.h"
#include "InDetEventTPCnv/TRT_DriftCircleContainer_tlp1.h"
#include "InDetEventTPCnv/InDetPrepRawData/PixelGangedClusterAmbiguities_p1.h"
-#include "InDetEventTPCnv/TRT_DriftCircleContainer_tlp1.h"
#include "InDetEventTPCnv/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack_p1.h"
#include "InDetEventTPCnv/InDetCompetingRIOsOnTrack/CompetingSCT_ClustersOnTrack_p1.h"
#include "InDetEventTPCnv/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetEventTPCnv.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetEventTPCnv.cxx
index c828f40b610cfbfea281cef6568acd78ae3a0d6f..70eb5c3ffcf72d50df6ca31d9d1eafa1dcd75fb4 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetEventTPCnv.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetEventTPCnv.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
*/
// generate the T/P converter entries
@@ -22,11 +22,9 @@
#include "InDetEventTPCnv/PixelClusterContainer_p2.h"
#include "InDetEventTPCnv/PixelClusterContainer_p3.h"
#include "InDetEventTPCnv/SCT_ClusterContainer_p2.h"
-#include "InDetEventTPCnv/PixelClusterContainer_tlp1.h"
#include "InDetEventTPCnv/SCT_ClusterContainer_tlp1.h"
#include "InDetEventTPCnv/TRT_DriftCircleContainer_tlp1.h"
#include "InDetEventTPCnv/InDetPrepRawData/PixelGangedClusterAmbiguities_p1.h"
-#include "InDetEventTPCnv/TRT_DriftCircleContainer_tlp1.h"
#include "InDetEventTPCnv/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack_p1.h"
#include "InDetEventTPCnv/InDetCompetingRIOsOnTrack/CompetingSCT_ClustersOnTrack_p1.h"
#include "InDetEventTPCnv/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
index 93cc1a051d1674e4770654dc5b8a8200e0a975fa..4a1b60f89962cb514afa9297408fc81385462a58 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
@@ -23,6 +23,7 @@
#include "TrkTruthData/PRD_MultiTruthCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
#include "InDetSimEvent/SiHit.h"
#include "InDetSimData/InDetSimDataCollection.h"
@@ -1040,14 +1041,24 @@ void PixelPrepDataToxAOD::addNNTruthInfo( xAOD::TrackMeasurementValidation* xp
auto particle = siHit.particleLink();
pdgid[hitNumber] = particle->pdg_id();
- truep[hitNumber] = particle->momentum().rho();
- if ( particle->production_vertex() ){
- auto vertex = particle->production_vertex();
+ HepMC::FourVector mom=particle->momentum();
+ truep[hitNumber] = std::sqrt(mom.x()*mom.x()+mom.y()*mom.y()+mom.z()*mom.z());
+ auto vertex = particle->production_vertex();
+//AV Please note that taking the first particle as a mother is ambiguous.
+#ifdef HEPMC3
+ if ( vertex && vertex->particles_in().size()>0){
+ auto mother_of_particle=vertex->particles_in().at(0);
+ motherBarcode[hitNumber] = HepMC::barcode(mother_of_particle);
+ motherPdgid[hitNumber] = mother_of_particle->pdg_id();
+ }
+#else
+ if ( vertex ){
if( vertex->particles_in_const_begin() != vertex->particles_in_const_end() ){
motherBarcode[hitNumber] = (*vertex->particles_in_const_begin())->barcode();
motherPdgid[hitNumber] = (*vertex->particles_in_const_begin())->pdg_id();
}
}
+#endif
}
chargeDep[hitNumber] = siHit.energyLoss() ;
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h b/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
index 2e154abdc609045199d276a8395abb7257b973c8..ebaa7849c82043226d94ef5154abdb683b216245 100755
--- a/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
@@ -66,6 +66,7 @@ public:
const SCT_ID * m_sctIdHelper;
bool m_first;
+ bool m_printProbePositions;
};
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx
index 9c2c334de76a9eeb123b3c8e84ca4d8b207eea9e..ea8efdcc62fdf0e3abec1272259ae02706b84301 100755
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx
@@ -53,6 +53,7 @@ ReadSiDetectorElements::ReadSiDetectorElements(const std::string& name, ISvcLoca
declareProperty("DoInitialize", m_doInit = false);
declareProperty("DoExecute", m_doExec = true);
declareProperty("UseConditionsTools", m_useConditionsTools = false);
+ declareProperty("PrintProbePositions", m_printProbePositions = true);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -150,8 +151,14 @@ void ReadSiDetectorElements::printAllElements(const bool accessDuringInitializat
// element->getIdHelper()->show(element->identify());
//
- ATH_MSG_ALWAYS(" center (x,y,z) = " << element->center().x() << "," << element->center().y() << "," << element->center().z());
+ ATH_MSG_ALWAYS(" center (x,y,z) = " << element->center().x() << "," << element->center().y() << "," << element->center().z());
ATH_MSG_ALWAYS(" center (r,phi,z) = " << element->center().perp() << "," << element->center().phi() << "," <<element->center().z());
+ if(m_printProbePositions){
+ ATH_MSG_ALWAYS(" global (r,phi,z) position of (1,1) = " <<element->globalPosition(Amg::Vector2D(1,1)).perp() << "," << element->globalPosition(Amg::Vector2D(1,1)).phi() <<","<< element->globalPosition(Amg::Vector2D(1,1)).z());
+ ATH_MSG_ALWAYS(" global (r,phi,z) position of (-1,-1) = " <<element->globalPosition(Amg::Vector2D(-1,-1)).perp() << "," << element->globalPosition(Amg::Vector2D(-1,-1)).phi() <<","<< element->globalPosition(Amg::Vector2D(-1,-1)).z());
+ ATH_MSG_ALWAYS(" global (r,phi,z) hit position of (1,1,0) = " <<element->globalPositionHit(Amg::Vector3D(1,1,0)).perp() << "," << element->globalPositionHit(Amg::Vector3D(1,1,0)).phi() <<","<< element->globalPositionHit(Amg::Vector3D(1,1,0)).z());
+ ATH_MSG_ALWAYS(" global (r,phi,z) hit position of (-1,-1,0) = " <<element->globalPositionHit(Amg::Vector3D(-1,-1,0)).perp() << "," << element->globalPositionHit(Amg::Vector3D(-1,-1,0)).phi() <<","<< element->globalPositionHit(Amg::Vector3D(-1,-1,0)).z());
+ }
ATH_MSG_ALWAYS(" sin(tilt), sin(stereo) = " << element->sinTilt() << " "
<< element->sinStereo());
ATH_MSG_ALWAYS(" width, minWidth, maxWidth, length (mm) = "
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index bf315e2c2a919dbaacbf93edc77c14200d5de215..7b9068cff2f8200fdbb2a69e38a4ab9049548b90 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -1192,13 +1192,18 @@ class nnCutLargeD0Threshold(InDetFlagsJobProperty):
allowedTypes = ['float']
StoredValue = -1.0
+class writeSeedValNtuple(InDetFlagsJobProperty):
+ """Turn writing of seed validation ntuple on and off"""
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class doTRTPIDNN(InDetFlagsJobProperty):
"""calculate NN-based TRT electron probability"""
statusOn = True
allowedTypes = ['bool']
StoredValue = True
-
##-----------------------------------------------------------------------------
## 2nd step
## Definition of the InDet flag container
@@ -2794,6 +2799,7 @@ _list_InDetJobProperties = [Enabled,
doDigitalROTCreation,
nnCutLargeD0Threshold,
useMuForTRTErrorScaling,
+ writeSeedValNtuple,
doTRTPIDNN
]
for j in _list_InDetJobProperties:
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index 761913acf116c19969b1f994c19b59084829ef5d..1512c01c43b28e5e753f5b0d082193c059730c30 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -325,6 +325,10 @@ def getNnClusterizationFactory(name='NnClusterizationFactory', **kwargs) :
useTTrainedNetworks = InDetFlags.useNNTTrainedNetworks()
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
do_runI = geoFlags.Run() not in ["RUN2", "RUN3"]
+
+ if do_runI and not useTTrainedNetworks:
+ log.debug("useNNTTrainedNetworks must be True for Run I. Contact CTIDE for questions.")
+ useTTrainedNetworks = True
if useTTrainedNetworks :
log.debug("Setting up TTrainedNetworks")
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
index 64b02d8db7904188de6f18f391deb15ecb961391..5a6650eeed510b01cd74cd0bc154b1e76490dcc0 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
@@ -61,7 +61,10 @@ class ConfiguredNewTrackingSiPattern:
#
# ------------------------------------------------------------
+ doSeedMakerValidation = InDetFlags.writeSeedValNtuple()
+
if InDetFlags.doSiSPSeededTrackFinder():
+
#
# --- Space points seeds maker, use different ones for cosmics and collisions
#
@@ -95,6 +98,17 @@ class ConfiguredNewTrackingSiPattern:
SpacePointsOverlapName = InDetKeys.OverlapSpacePoints(),
radMax = NewTrackingCuts.radMax(),
RapidityCut = NewTrackingCuts.maxEta())
+
+ if doSeedMakerValidation:
+
+ InDetSiSpacePointsSeedMaker.WriteNtuple = True
+
+ from AthenaCommon.AppMgr import ServiceMgr
+ if not hasattr(ServiceMgr, 'THistSvc'):
+ from GaudiSvc.GaudiSvcConf import THistSvc
+ ServiceMgr += THistSvc()
+
+ ServiceMgr.THistSvc.Output = ["valNtuples DATAFILE='SeedMakerValidation.root' OPT='RECREATE'"]
if NewTrackingCuts.mode() == "Offline" or InDetFlags.doHeavyIon() or NewTrackingCuts.mode() == "ForwardTracks":
InDetSiSpacePointsSeedMaker.maxdImpactPPS = NewTrackingCuts.maxdImpactPPSSeeds()
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
index 2d4a1366434582d2c78bd060e06bc1ed0b0e5278..f795da2578d471874f7c2f66aaa46bb0abb19380 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
@@ -82,9 +82,9 @@ if DetFlags.detdescr.pixel_on() and not 'PixelCabling' in dir():
if (conddb.dbdata=="CONDBR2" or (conddb.dbmc=="OFLP200" and geoFlags.isIBL()==True)) and not conddb.folderRequested("/PIXEL/HitDiscCnfg"):
conddb.addFolderSplitMC("PIXEL","/PIXEL/HitDiscCnfg","/PIXEL/HitDiscCnfg", className="AthenaAttributeList")
- if not hasattr(condSeq, 'PixelHitDiscCnfgAlg'):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelHitDiscCnfgAlg
- condSeq += PixelHitDiscCnfgAlg(name="PixelHitDiscCnfgAlg")
+ if not hasattr(condSeq, 'PixelHitDiscCnfgAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelHitDiscCnfgAlg
+ condSeq += PixelHitDiscCnfgAlg(name="PixelHitDiscCnfgAlg")
if not conddb.folderRequested("/PIXEL/ReadoutSpeed"):
if not (globalflags.DataSource() == 'geant4'):
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
index 0af2fb4750b9db2589a326d02cf2a08f6da20b8f..65e66dd9831ebb4e5232de55dd9b92af032585d8 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
@@ -551,7 +551,6 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
//if ( newLowStatFlag ) { }
//if ( newLumiBlockFlag() ) { }
if ( newRunFlag() ) {
-
//if user environment specified we don't want to book new histograms at every run boundary
//we instead want one histogram per job
if(m_histosBooked!=0 && AthenaMonManager::environment()==AthenaMonManager::user) return StatusCode::SUCCESS;
@@ -593,28 +592,37 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
//###############
- m_nhits_per_event = TH1F_LW::create("Nhits_per_event","Number of hits per event",1024,-0.5,1023.5);
+ m_nhits_per_event = TH1F_LW::create("Nhits_per_event","Number of hits per event", 1024, -0.5, 1023.5);
RegisterHisto(al_mon,m_nhits_per_event) ;
m_nhits_per_event->GetXaxis()->SetTitle("Number of Hits on Tracks per Event");
- m_nhits_per_event->GetYaxis()->SetTitle("Number of Events");
- m_ntrk = TH1F_LW::create("ntracks","Number of Tracks",m_NTracksRange+1, -0.5, m_NTracksRange+0.5);
+ m_nhits_per_event->GetYaxis()->SetTitle("Number of Events");
+
+ m_ntrk = TH1F_LW::create("ntracks","Number of Tracks", m_NTracksRange+1, -0.5, m_NTracksRange+0.5);
RegisterHisto(al_mon,m_ntrk);
+ m_ntrk->GetXaxis()->SetTitle("Number of Tracks");
+ m_ntrk->GetYaxis()->SetTitle("Number of Events");
+
m_ngtrk = TH1F_LW::create("ngtracks","Number of Good Tracks",m_NTracksRange+1, -0.5, m_NTracksRange+0.5);
RegisterHisto(al_mon,m_ngtrk);
- m_nhits_per_track = TH1F_LW::create("Nhits_per_track","Number of hits per track",101,-0.5, 100.5);
+ m_ngtrk->GetXaxis()->SetTitle("Number of Good Tracks");
+ m_ngtrk->GetYaxis()->SetTitle("Number of Events");
+
+ m_nhits_per_track = TH1F_LW::create("Nhits_per_track","Number of hits per track", 101, -0.5, 100.5);
RegisterHisto(al_mon,m_nhits_per_track) ;
m_nhits_per_track->GetXaxis()->SetTitle("Number of Hits per Track");
m_nhits_per_track->GetYaxis()->SetTitle("Number of Tracks");
- m_npixhits_per_track_barrel = TH1F_LW::create("Npixhits_per_track_barrel","Number of pixhits per track (Barrel)",14,-0.5,13.5);
+ m_npixhits_per_track_barrel = TH1F_LW::create("Npixhits_per_track_barrel","Number of pixhits per track (Barrel)", 14,-0.5,13.5);
RegisterHisto(al_mon,m_npixhits_per_track_barrel) ;
m_npixhits_per_track_barrel->GetXaxis()->SetTitle("Number of Pixel Hits per Track in Barrel");
m_npixhits_per_track_barrel->GetYaxis()->SetTitle("Number of Tracks");
- m_nscthits_per_track_barrel = TH1F_LW::create("Nscthits_per_track_barrel","Number of scthits per track (Barrel)",30,-0.5,29.5);
+
+ m_nscthits_per_track_barrel = TH1F_LW::create("Nscthits_per_track_barrel","Number of scthits per track (Barrel)", 30,-0.5,29.5);
RegisterHisto(al_mon,m_nscthits_per_track_barrel) ;
m_nscthits_per_track_barrel->GetXaxis()->SetTitle("Number of SCT Hits per Track in Barrel");
m_nscthits_per_track_barrel->GetYaxis()->SetTitle("Number of Tracks");
- m_ntrthits_per_track_barrel = TH1F_LW::create("Ntrthits_per_track_barrel","Number of trthits per track (Barrel)",100,-0.5,99.5);
+
+ m_ntrthits_per_track_barrel = TH1F_LW::create("Ntrthits_per_track_barrel","Number of trthits per track (Barrel)", 100,-0.5,99.5);
RegisterHisto(al_mon,m_ntrthits_per_track_barrel) ;
m_ntrthits_per_track_barrel->GetXaxis()->SetTitle("Number of TRT Hits per Track in Barrel");
m_ntrthits_per_track_barrel->GetYaxis()->SetTitle("Number of Tracks");
@@ -623,10 +631,12 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
RegisterHisto(al_mon,m_npixhits_per_track_eca) ;
m_npixhits_per_track_eca->GetXaxis()->SetTitle("Number of Pixel Hits per Track in ECA");
m_npixhits_per_track_eca->GetYaxis()->SetTitle("Number of Tracks");
+
m_nscthits_per_track_eca = TH1F_LW::create("Nscthits_per_track_eca","Number of scthits per track (Eca)",30,-0.5,29.5);
RegisterHisto(al_mon,m_nscthits_per_track_eca) ;
m_nscthits_per_track_eca->GetXaxis()->SetTitle("Number of SCT Hits per Track in ECA");
m_nscthits_per_track_eca->GetYaxis()->SetTitle("Number of Tracks");
+
m_ntrthits_per_track_eca = TH1F_LW::create("Ntrthits_per_track_eca","Number of trthits per track (Eca)",100,-0.5,99.5);
RegisterHisto(al_mon,m_ntrthits_per_track_eca) ;
m_ntrthits_per_track_eca->GetXaxis()->SetTitle("Number of TRT Hits per Track in ECA");
@@ -636,10 +646,12 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
RegisterHisto(al_mon,m_npixhits_per_track_ecc) ;
m_npixhits_per_track_ecc->GetXaxis()->SetTitle("Number of Pixel Hits per Track in ECC");
m_npixhits_per_track_ecc->GetYaxis()->SetTitle("Number of Tracks");
+
m_nscthits_per_track_ecc = TH1F_LW::create("Nscthits_per_track_ecc","Number of scthits per track (Ecc)",30,-0.5,29.5);
RegisterHisto(al_mon,m_nscthits_per_track_ecc) ;
m_nscthits_per_track_ecc->GetXaxis()->SetTitle("Number of SCT Hits per Track in ECC");
m_nscthits_per_track_ecc->GetYaxis()->SetTitle("Number of Tracks");
+
m_ntrthits_per_track_ecc = TH1F_LW::create("Ntrthits_per_track_ecc","Number of trthits per track (Ecc)",100,-0.5,99.5);
RegisterHisto(al_mon,m_ntrthits_per_track_ecc) ;
m_ntrthits_per_track_ecc->GetXaxis()->SetTitle("Number of TRT Hits per Track in ECC");
@@ -648,30 +660,34 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
///////////////////////////////////////////////////////////////////////////////////////////////////
//Monitoring plots shown in the dqm web page
///////////////////////////////////////////////////////////////////////////////////////////////////
- m_chi2oDoF = TH1F_LW::create("chi2oDoF","chi2oDoF",100,0,10);
+ m_chi2oDoF = TH1F_LW::create("chi2oDoF","chi2oDoF", 100, 0., 10.);
RegisterHisto(al_mon,m_chi2oDoF) ;
m_chi2oDoF->GetXaxis()->SetTitle("Track #chi^{2} / NDoF");
m_chi2oDoF->GetYaxis()->SetTitle("Number of Tracks");
- m_eta = TH1F_LW::create("eta","eta",100,-m_etaRange,m_etaRange);
+
+ m_eta = TH1F_LW::create("eta","eta", 80,-m_etaRange,m_etaRange);
RegisterHisto(al_mon_ls,m_eta) ;
m_eta->GetXaxis()->SetTitle("Track #eta");
- m_eta->GetYaxis()->SetTitle("Number of Tracks");
- m_phi = TH1F_LW::create("phi","phi",100,0,2*M_PI); m_phi->SetMinimum(0);
+ m_eta->GetYaxis()->SetTitle("Number of Tracks");
+
+ m_phi = TH1F_LW::create("phi","phi", 80, 0,2*M_PI);
RegisterHisto(al_mon_ls,m_phi) ;
+ m_phi->SetMinimum(0);
m_phi->GetXaxis()->SetTitle("Track #phi");
m_phi->GetYaxis()->SetTitle("Number of Tracks");
- m_d0_bscorr = TH1F_LW::create("d0_bscorr","d0 (corrected for beamspot); [mm]",400,-m_d0BsRange,m_d0BsRange);
+
+ m_d0_bscorr = TH1F_LW::create("d0_bscorr","d0 (corrected for beamspot); d0 [mm]",200,-m_d0BsRange,m_d0BsRange);
RegisterHisto(al_mon_ls,m_d0_bscorr) ;
m_z0 = TH1F_LW::create("z0","z0;[mm]",100,-m_z0Range,m_z0Range);
RegisterHisto(al_mon,m_z0) ;
m_z0sintheta = TH1F_LW::create("z0sintheta","z0sintheta",100,-m_z0Range,m_z0Range);
RegisterHisto(al_mon,m_z0sintheta) ;
+
m_d0 = TH1F_LW::create("d0","d0;[mm]",400,-m_d0Range,m_d0Range);
RegisterHisto(al_mon,m_d0) ;
-
m_npixhits_per_track = TH1F_LW::create("Npixhits_per_track","Number of pixhits per track",14,-0.5,13.5);
RegisterHisto(al_mon_ls,m_npixhits_per_track) ;
m_npixhits_per_track->GetXaxis()->SetTitle("Number of Pixel Hits per Track");
@@ -750,8 +766,6 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_trk_pT_asym_ecc = TH1F_LW::create("trk_pT_asym_ecc","Track Charge Asymmetry versus pT (Endcap C) ",50,0,100);
RegisterHisto(al_mon,m_trk_pT_asym_ecc);
-
-
if(m_extendedPlots){
@@ -781,7 +795,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
RegisterHisto(al_mon, m_trk_pT_vs_eta_eca );
m_trk_d0_barrel = TH1F_LW::create("trk_d0_barrel","Impact parameter: all tracks (Barrel); d_{0} [mm]",100, -m_d0Range, m_d0Range);
- m_trk_d0c_barrel = TH1F_LW::create("trk_d0c_barrel","Impact parameter (corrected for vertex): all tracks (Barrel)",100, -5, 5);
+ m_trk_d0c_barrel = TH1F_LW::create("trk_d0c_barrel","Impact parameter (corrected for vertex): all tracks (Barrel)",100, -4., 4.);
m_trk_z0_barrel = TH1F_LW::create("trk_z0_barrel","Track z0: all tracks (Barrel)",100, -m_z0Range, m_z0Range);
m_trk_d0_eca = TH1F_LW::create("trk_d0_eca","Impact parameter: all tracks (Endcap A)",100, -m_d0Range, m_d0Range);
m_trk_d0c_eca = TH1F_LW::create("trk_d0c_eca","Impact parameter (corrected for vertex): all tracks (Endcap A)",100, -m_d0Range, m_d0Range);
@@ -808,8 +822,6 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_trk_chi2Prob = new TProfile("trk_chi2Prob","chi2Prob versus eta",100,-m_etaRange,m_etaRange,-5,5);
RegisterHisto(al_mon,m_trk_chi2Prob) ;
-
-
//Detailed IP Plots. All the PV Corrected are broken and need to be fixed.
m_trk_d0_barrel_zoomin = TH1F_LW::create("trk_d0_barrel_zoomin","Impact parameter: all tracks (Barrel)",100,-5,5);
@@ -887,7 +899,6 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
-
//PV corrected plots. Broken.
m_d0_pvcorr = TH1F_LW::create("d0_pvcorr","d0 (corrected for primVtx); [mm]",400,-m_d0Range,m_d0Range);
RegisterHisto(al_mon,m_d0_pvcorr) ;
@@ -939,32 +950,32 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_trk_chi2ProbDist->GetYaxis()->SetTitle("Number of Tracks");
RegisterHisto(al_mon,m_trk_chi2ProbDist) ;
- m_errCotTheta = TH1F_LW::create("errCotTheta","Error of CotTheta",50,0,0.02);
+ m_errCotTheta = TH1F_LW::create("errCotTheta","Error of CotTheta", 40, 0, 0.02);
RegisterHisto(al_mon,m_errCotTheta);
m_errCotTheta->GetXaxis()->SetTitle("Track #Delta(cot(#theta))");
m_errCotTheta->GetYaxis()->SetTitle("Number of Tracks");
- m_errCotThetaVsD0BS = new TH2F("errCotThetaVsD0BS","Error of CotTheta vs d0BS",-m_d0BsRange,m_d0BsRange,40,50,0 ,0.02);
+ m_errCotThetaVsD0BS = new TH2F("errCotThetaVsD0BS","Error of CotTheta vs d0BS", 50, -m_d0BsRange, m_d0BsRange, 40, 0. ,0.02);
RegisterHisto(al_mon,m_errCotThetaVsD0BS) ;
m_errCotThetaVsD0BS->GetXaxis()->SetTitle("d0 (mm)");
m_errCotThetaVsD0BS->GetYaxis()->SetTitle("Track #Delta(cot(#theta))");
- m_errCotThetaVsPt = new TH2F("errCotThetaVsPt","Error of CotTheta vs Pt",50,0,40,50,0 ,0.02);
+ m_errCotThetaVsPt = new TH2F("errCotThetaVsPt","Error of CotTheta vs Pt",50,0,40, 40, 0. ,0.02);
RegisterHisto(al_mon,m_errCotThetaVsPt) ;
m_errCotThetaVsPt->GetXaxis()->SetTitle("Pt (GeV/c)");
m_errCotThetaVsPt->GetYaxis()->SetTitle("Track #Delta(cot(#theta))");
- m_errCotThetaVsP = new TH2F("errCotThetaVsP","Error of CotTheta vs P",50,0,40,50,0 ,0.02);
+ m_errCotThetaVsP = new TH2F("errCotThetaVsP","Error of CotTheta vs P",50,0,40, 40, 0. ,0.02);
RegisterHisto(al_mon,m_errCotThetaVsP) ;
m_errCotThetaVsP->GetXaxis()->SetTitle("P (GeV/c)");
m_errCotThetaVsP->GetYaxis()->SetTitle("Track #Delta(cot(#theta))");
- m_errCotThetaVsPhi = new TH2F("errCotThetaVsPhi","Error of CotTheta vs Phi",50,0,2*M_PI,50, 0 ,0.02);
+ m_errCotThetaVsPhi = new TH2F("errCotThetaVsPhi","Error of CotTheta vs Phi",50,0,2*M_PI, 40, 0. ,0.02);
RegisterHisto(al_mon,m_errCotThetaVsPhi) ;
m_errCotThetaVsPhi->GetXaxis()->SetTitle("#phi0");
m_errCotThetaVsPhi->GetYaxis()->SetTitle("Track #Delta(cot(#theta))");
- m_errCotThetaVsEta = new TH2F("errCotThetaVsEta","Error of CotTheta vs Eta",50,-3., 3.,50, 0 ,0.02);
+ m_errCotThetaVsEta = new TH2F("errCotThetaVsEta","Error of CotTheta vs Eta",50,-3., 3., 40, 0. ,0.02);
RegisterHisto(al_mon,m_errCotThetaVsEta) ;
m_errCotThetaVsEta->GetXaxis()->SetTitle("#eta");
m_errCotThetaVsEta->GetYaxis()->SetTitle("Track #Delta(cot(#theta))");
@@ -973,12 +984,12 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
RegisterHisto(al_mon,m_errTheta);
m_errTheta->GetXaxis()->SetTitle("Track #Delta(#theta)");
m_errTheta->GetYaxis()->SetTitle("Number of Tracks");
-
+
m_errThetaVsD0BS = new TH2F("errThetaVsD0BS","Error of Theta vs d0BS",50,-m_d0BsRange,m_d0BsRange,50,0 ,0.02);
RegisterHisto(al_mon,m_errThetaVsD0BS) ;
m_errThetaVsD0BS->GetXaxis()->SetTitle("d0 (mm)");
m_errThetaVsD0BS->GetYaxis()->SetTitle("Track #delta(#theta)");
-
+
m_errThetaVsPt = new TH2F("errThetaVsPt","Error of Theta vs Pt",50,0,50,50,0 ,0.02);
RegisterHisto(al_mon,m_errThetaVsPt) ;
m_errThetaVsPt->GetXaxis()->SetTitle("Pt (GeV/c)");
@@ -1134,7 +1145,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
RegisterHisto(al_mon,m_PtVsPhi0Neg);
m_PtVsPhi0Neg->GetXaxis()->SetTitle("#phi0 (rad)");
m_PtVsPhi0Neg->GetYaxis()->SetTitle("Pt (GeV/c)");
-
+
m_errPtVsEta = new TH2F("errPtVsEta", "Error of Pt Vs Eta", 50, -3., 3.,50, 0., 0.5);
RegisterHisto(al_mon,m_errPtVsEta);
m_errPtVsEta->GetXaxis()->SetTitle("#eta");
@@ -1188,7 +1199,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_QPtVsEta->GetXaxis()->SetTitle("#eta");
RegisterHisto(al_mon,m_QPtVsEta);
m_QPtVsEta->GetYaxis()->SetTitle("qPt (GeV)");
-
+
//Plots to check the BeamSpot
// versus Phi0
m_D0bsVsPhi0 = new TH2F("D0bsVsPhi0", "d0_{bs} Vs #phi0 ", 50, 0, 2*M_PI, 400, -m_d0BsRange, m_d0BsRange);
@@ -1237,7 +1248,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_D0bsVsPtBarrel->GetXaxis()->SetTitle("qPt (GeV)");
RegisterHisto(al_mon,m_D0bsVsPtBarrel);
m_D0bsVsPtBarrel->GetYaxis()->SetTitle("d0_{bs} mm )");
-
+
//BeamSpot Position histos
m_YBs_vs_XBs = new TH2F("YBs_vs_XBs","BeamSpot Position: y vs x",100, -0.9,-0.1, 100, -0.9,-0.1);
RegisterHisto(al_mon,m_YBs_vs_XBs);
@@ -1307,7 +1318,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_BeamSpotTiltY_vs_LumiBlock->GetYaxis()->SetRangeUser(-1,1);
}
-
+
//These plots are broken. Have to be passed to the PVbiases tool
m_trk_d0_wrtPV = TH1F_LW::create("d0_pvcorr_est","d0 (corrected for primVtx v2); [mm]",400,-0.2,0.2);
@@ -1551,7 +1562,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_eta_asym->GetYaxis()->SetTitle("(pos-neg)/(pos+neg)");
-
+
// msg(MSG::INFO) << "lumiblock histos done " <<endmsg;
@@ -1559,27 +1570,27 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
// lumiblock histos
- m_LumiBlock = TH1F_LW::create("LumiBlock","Lumi block",1024,-0.5,1023.5);
+ m_LumiBlock = TH1F_LW::create("LumiBlock","Lumi block", 1024, -0.5, 1023.5);
RegisterHisto(al_mon,m_LumiBlock) ;
m_LumiBlock->GetXaxis()->SetTitle("Lumi block ID");
m_LumiBlock->GetYaxis()->SetTitle("# events");
- m_Tracks_per_LumiBlock = TH1F_LW::create("TracksPerLumiBlock","Tracks per Lumi block",1024,-0.5,1023.5);
+ m_Tracks_per_LumiBlock = TH1F_LW::create("TracksPerLumiBlock","Tracks per Lumi block", 1024, -0.5, 1023.5);
RegisterHisto(al_mon,m_Tracks_per_LumiBlock) ;
m_Tracks_per_LumiBlock->GetXaxis()->SetTitle("Lumi block ID");
m_Tracks_per_LumiBlock->GetYaxis()->SetTitle("# tracks");
- m_NPIX_per_LumiBlock = TH1F_LW::create("NPixPerLumiBlock","N pixel hits per Lumi block",1024,-0.5,1023.5);
+ m_NPIX_per_LumiBlock = TH1F_LW::create("NPixPerLumiBlock","N pixel hits per Lumi block", 1024, -0.5, 1023.5);
RegisterHisto(al_mon, m_NPIX_per_LumiBlock) ;
m_NPIX_per_LumiBlock->GetXaxis()->SetTitle("Lumi block ID");
m_NPIX_per_LumiBlock->GetYaxis()->SetTitle("# pixel hits");
- m_NSCT_per_LumiBlock = TH1F_LW::create("NSCTPerLumiBlock","N SCT hits per Lumi block",1024,-0.5,1023.5);
+ m_NSCT_per_LumiBlock = TH1F_LW::create("NSCTPerLumiBlock","N SCT hits per Lumi block", 1024, -0.5, 1023.5);
RegisterHisto(al_mon, m_NSCT_per_LumiBlock) ;
m_NSCT_per_LumiBlock->GetXaxis()->SetTitle("Lumi block ID");
m_NSCT_per_LumiBlock->GetYaxis()->SetTitle("# SCT hits");
- m_NTRT_per_LumiBlock = TH1F_LW::create("NTRTPerLumiBlock","N TRT hits per Lumi block",1024,-0.5,1023.5);
+ m_NTRT_per_LumiBlock = TH1F_LW::create("NTRTPerLumiBlock","N TRT hits per Lumi block", 1024, -0.5, 1023.5);
RegisterHisto(al_mon, m_NTRT_per_LumiBlock) ;
m_NTRT_per_LumiBlock->GetXaxis()->SetTitle("Lumi block ID");
m_NTRT_per_LumiBlock->GetYaxis()->SetTitle("# TRT hits");
@@ -1587,7 +1598,7 @@ StatusCode IDAlignMonGenericTracks::bookHistograms()
m_histosBooked++;
}
return StatusCode::SUCCESS;
-
+
}
void IDAlignMonGenericTracks::RegisterHisto(MonGroup& mon, TH1F_LW* histo) {
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx
index 5f017a380f96ac9b1d07afe60eed585b81531d3d..5f61e61409791d893229867ddc409de7dedaffc8 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx
@@ -590,7 +590,11 @@ StatusCode IDAlignMonNtuple::fillHistograms()
HepMcParticleLink HMPL = trkTruth.particleLink();
if ( HMPL.isValid()) {
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genParticle = HMPL.scptr();
+#else
const HepMC::GenParticle *genParticle = HMPL.cptr();
+#endif
if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Particle with PDG "<< genParticle->pdg_id() << " Status "<< genParticle->status()<<" mass "<< genParticle->momentum().m() <<" pt "<<genParticle->momentum().perp()<<" eta "<<genParticle->momentum().eta()<<" phi "<<genParticle->momentum().phi()<<endmsg;
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
index 18caef478a26e9cd81aa02a2f0027cd7cd654ce0..2cf31f6da2da4a224464f9732a8e6d5dd2b7162d 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
@@ -20,7 +20,6 @@
#include "TMath.h"
#include "TProfile2D.h"
#include "TGraphErrors.h"
-#include "TF1.h"
#include "TFitResult.h"
#include "TFitResultPtr.h"
@@ -177,6 +176,9 @@ struct IDAlignMonResiduals::TRTEndcapHistograms{
TH2F* aveResVsPhiWheel[2]{};
TH2F* rmsResVsPhiWheel[2]{};
+ TH3F* resVsPhiWheelPos[2]{};
+ TH3F* resVsPhiWheelNeg[2]{};
+
/** Residual maps for low pT tracks separated by charge in the TRT Endcap */
TH3F* resVsRadiusWheelPos[2]{};
TH2F* aveResVsRadiusWheelPos[2]{};
@@ -184,6 +186,9 @@ struct IDAlignMonResiduals::TRTEndcapHistograms{
TH3F* resVsRadiusWheelNeg[2]{};
TH2F* aveResVsRadiusWheelNeg[2]{};
TH2F* rmsResVsRadiusWheelNeg[2]{};
+
+ // Residual vs pt and vs wheel in the endcap
+ TH3F* resVsqPtWheel[2]{};
};
////////////////////////////////////////
@@ -307,6 +312,7 @@ void IDAlignMonResiduals::InitializeHistograms()
{
m_totalEvents = 0;
+ m_hTotalTracks = 0;
m_oldlumiblock = 0;
m_sirescalcfailure =0;
m_pix_eca_xresvsmodphidisk_3d = 0;
@@ -315,7 +321,7 @@ void IDAlignMonResiduals::InitializeHistograms()
m_pix_ecc_yresvsmodphidisk_3d = 0;
m_dbm_xresvsmodphi_2d = 0;
m_sct_b_pullx_pt = 0;
- m_sct_eca_pullx_pt = 0 ;
+ m_sct_eca_pullx_pt = 0;
m_sct_ecc_pullx_pt = 0;
m_sct_b0_xresvsmodetaphi_3d = 0;
m_sct_b1_xresvsmodetaphi_3d = 0;
@@ -842,6 +848,9 @@ StatusCode IDAlignMonResiduals::bookHistograms()
m_totalEvents = new TH1F("TotalEvents","TotalEvents", 1, -0.5, 0.5);
RegisterHisto(al_mon,m_totalEvents);
+ m_hTotalTracks = new TH1F("TotalTracks","TotalTracks", 1, -0.5, 0.5);
+ RegisterHisto(al_mon,m_hTotalTracks);
+
m_mu_perEvent = new TH1F("mu_perEvent","<#mu> per event", m_nBinsMuRange, m_muRangeMin, m_muRangeMax);
RegisterHisto(al_mon,m_mu_perEvent);
}
@@ -849,13 +858,17 @@ StatusCode IDAlignMonResiduals::bookHistograms()
//All modules
m_pix_b0_resXvsetaLumiBlock = new TProfile2D("pix_b0_resXvsetaLumiBlock","2D profile of X unbiased residuals vs IBL eta module per Lumi Block; LumiBlock;Module Eta",
- m_nBinsLB,m_LBRangeMin,m_LBRangeMax, 20,-10.5,9.5, m_minPIXResXFillRange,m_maxPIXResXFillRange);
+ m_nBinsLB, m_LBRangeMin, m_LBRangeMax,
+ 20, -10.5, 9.5,
+ m_minPIXResXFillRange, m_maxPIXResXFillRange);
RegisterHisto(al_mon,m_pix_b0_resXvsetaLumiBlock);
//Only planars
m_pix_b0_resXvsetaLumiBlock_planars = new TProfile2D("pix_b0_resXvsetaLumiBlock_planars","2D profile of X unbiased residuals vs IBL eta module per Lumi Block;LumiBlock; Module Eta",
- m_nBinsLB,m_LBRangeMin,m_LBRangeMax, 12,-6.5,5.5, m_minPIXResXFillRange,m_maxPIXResXFillRange);
+ m_nBinsLB,m_LBRangeMin,m_LBRangeMax,
+ 12, -6.5, 5.5,
+ m_minPIXResXFillRange, m_maxPIXResXFillRange);
RegisterHisto(al_mon,m_pix_b0_resXvsetaLumiBlock_planars);
@@ -935,7 +948,7 @@ StatusCode IDAlignMonResiduals::bookHistograms()
RegisterHisto(al_mon,m_base_vs_LB_planars);
- if(msgLvl(MSG::VERBOSE)) msg() << " INITIALIZED GENERALHISTOS FOR RESIDUALS "<< endmsg;
+ ATH_MSG_VERBOSE (" INITIALIZED GENERALHISTOS FOR RESIDUALS ");
//PrintIBLGeometry();
MakePIXBarrelHistograms (al_mon);
MakePIXEndCapsHistograms(al_mon);
@@ -946,8 +959,9 @@ StatusCode IDAlignMonResiduals::bookHistograms()
MakeTRTHistograms(al_mon);
MakeSiliconHistograms(al_mon);
- if(msgLvl(MSG::VERBOSE)) msg() << " INITIALIZED GENERALHISTOS FOR RESIDUALS "<< endmsg;
+ ATH_MSG_VERBOSE (" INITIALIZED GENERALHISTOS FOR RESIDUALS ");
++m_histosBooked;
+
}
ATH_MSG_VERBOSE(" Residual histograms booking COMPLETED");
@@ -1060,10 +1074,15 @@ StatusCode IDAlignMonResiduals::fillHistograms()
SG::ReadHandle<xAOD::EventInfo> eventInfo (m_eventInfoKey, ctx);
m_changedlumiblock = false;
- m_lumiblock = eventInfo->lumiBlock();
- if (m_lumiblock!=m_oldlumiblock){ //Changes every m_LBGranularity
- m_oldlumiblock=m_lumiblock;
- m_changedlumiblock=true;
+ if (eventInfo.isValid()) {
+ m_lumiblock = eventInfo->lumiBlock();
+ if (m_lumiblock!=m_oldlumiblock){ //Changes every m_LBGranularity
+ m_oldlumiblock=m_lumiblock;
+ m_changedlumiblock=true;
+ }
+ }
+ else {
+ ATH_MSG_DEBUG ("IDAlignMonResiduals::fillHistograms ** eventInfo retrieving failure");
}
if (!m_hasBeenCalledThisEvent){
@@ -1073,10 +1092,13 @@ StatusCode IDAlignMonResiduals::fillHistograms()
else {
m_mu = -999;
}
+ ATH_MSG_DEBUG ("IDAlignMonResiduals::fillHistograms ** run number: " << eventInfo->runNumber()
+ << " event number: " << eventInfo->eventNumber()
+ << " lumiblock: " << m_lumiblock << " mu: " << m_mu);
if (m_extendedPlots){
m_mu_perEvent->Fill(m_mu);
- m_totalEvents->Fill(0);
+ m_totalEvents->Fill(0.);
}
float timeCor = 0.;
@@ -1094,15 +1116,18 @@ StatusCode IDAlignMonResiduals::fillHistograms()
SG::ReadHandle<TrackCollection> inputTracks{m_tracksName};
if (not inputTracks.isValid()) {
- ATH_MSG_DEBUG ("IDAlignMonResiduals::fillHistograms() -- " << m_tracksName.key() << " could not be retrieved");
+ ATH_MSG_WARNING ("IDAlignMonResiduals::fillHistograms ** " << m_tracksName.key() << " could not be retrieved");
return StatusCode::RECOVERABLE;
}
const DataVector<Trk::Track>* tracks = m_trackSelection->selectTracks(inputTracks);
- ATH_MSG_DEBUG ("IDAlignMonResiduals::fillHistograms() -- event: " << m_events
- << " with Track collection " << m_tracksName.key()
- << " has size =" << tracks->size());
-
+ ATH_MSG_DEBUG ("IDAlignMonResiduals::fillHistograms ** event: " << m_events
+ << " run: " << eventInfo->runNumber()
+ << " event: " << eventInfo->eventNumber()
+ << " LB: " << m_lumiblock
+ << " --> Track collection " << m_tracksName.key()
+ << " has size =" << tracks->size());
+
int nTracks = 0;
int nHitsEvent = 0;
@@ -1111,8 +1136,8 @@ StatusCode IDAlignMonResiduals::fillHistograms()
//need to get the Trk::Track object from which the TrackParticle object was created
//this has the hit information
const Trk::Track* track = *trackItr;
- if(track == NULL){
- ATH_MSG_WARNING("** IDAlignMonResiduals::fillHistograms ** No associated Trk::Track object found for track "<< nTracks);
+ if(track == nullptr){
+ ATH_MSG_DEBUG("** IDAlignMonResiduals::fillHistograms ** No associated Trk::Track object found for track "<< nTracks);
continue;
}
@@ -1136,6 +1161,7 @@ StatusCode IDAlignMonResiduals::fillHistograms()
float trkpt = -999;
float trkqoverp2 = -999;
float trketa_w = -999;
+ bool countedTrack = false;
if(m_extendedPlots) {
trkqoverp2 = track->perigeeParameters()->parameters()[Trk::qOverP]*fabs(track->perigeeParameters()->parameters()[Trk::qOverP])*1000000.;
@@ -1151,36 +1177,47 @@ StatusCode IDAlignMonResiduals::fillHistograms()
}
//looping over the hits of this track
ATH_MSG_DEBUG ("** track " << nTracks << "/" << tracks->size()
- << " pt: " << trkpt << " eta: " << trketa_w << " weight: " << hweight
- << " ** start looping on hits/TSOS ");
+ << " pt: " << trkpt
+ << " eta: " << trketa_w
+ << " weight: " << hweight
+ << " ** start looping on hits/TSOS ** ");
for (const Trk::TrackStateOnSurface* tsos : *track->trackStateOnSurfaces()) {
++nTSOS;
- if (tsos == NULL) {
+ ATH_MSG_DEBUG (" ====> dealing with hit " << nTSOS << "/" << track->trackStateOnSurfaces()->size() << " of track: " << nTracks << "/" << tracks->size());
+ if (tsos == nullptr) {
ATH_MSG_DEBUG (" TSOS (hit) = " << nTSOS << " is NULL ");
continue;
}
- ATH_MSG_DEBUG ("** IDAlignMonResiduals::fillHistograms() ** track: " << nTracks << " dealing with TSOS (hit) = " << nTSOS);
//skipping outliers
+ ATH_MSG_DEBUG (" --> testing hit " << nTSOS << "/" << track->trackStateOnSurfaces()->size() << " to be measurement type");
if(!tsos->type(Trk::TrackStateOnSurface::Measurement)) {
ATH_MSG_DEBUG ("Skipping TSOS " << nTSOS << " because it is an outlier (or the first TSOS on the track)");
continue;
}
+
const Trk::MeasurementBase* mesh =tsos->measurementOnTrack();
- ATH_MSG_DEBUG ("Defined hit MeasurementBase for hit " << nTSOS);
+ ATH_MSG_DEBUG ( " --> Defined hit measurementOnTrack() for hit: " << nTSOS <<"/" << track->trackStateOnSurfaces()->size() << " of track " << nTracks);
+ if (!countedTrack) {
+ ATH_MSG_DEBUG ( " --> going to fill: m_hTotalTracks->Fill(0.) ");
+ // m_hTotalTracks->Fill(0.); // count only once
+ countedTrack = true;
+ }
//Trk::RIO_OnTrack object contains information on the hit used to fit the track at this surface
+ ATH_MSG_DEBUG (" --> Going to retrive the Trk::RIO_OnTrack for hit " << nTSOS);
const Trk::RIO_OnTrack* hit = dynamic_cast <const Trk::RIO_OnTrack*>(mesh);
- if (hit== NULL) {
+ if (hit == nullptr) {
//for some reason the first tsos has no associated hit - maybe because this contains the defining parameters?
- if (nHits > 0 && msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "No hit associated with TSOS "<< nTSOS << endmsg;
+ if (nHits > 0) ATH_MSG_DEBUG ("No hit associated with TSOS "<< nTSOS);
continue;
}
+ ATH_MSG_DEBUG (" --> Going to retrive the track parameters of this TSOS: " << nTSOS);
const Trk::TrackParameters* trackParameter = tsos->trackParameters();
- if(trackParameter==NULL) {
+ if(trackParameter== nullptr) {
//if no TrackParameters for TSOS we cannot define residuals
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Skipping TSOS " << nTSOS << " because does not have TrackParameters" << endmsg;
+ ATH_MSG_DEBUG (" Skipping TSOS " << nTSOS << " because it does not have TrackParameters");
continue;
}
@@ -1189,10 +1226,10 @@ StatusCode IDAlignMonResiduals::fillHistograms()
float incidencePhi = -999;
float incidenceTheta = -999;
+ ATH_MSG_DEBUG (" --> going for hit->detectorElement() of hit " << nTSOS << "/" << track->trackStateOnSurfaces()->size());
const Trk::TrkDetElementBase *de = hit->detectorElement(); // rio is the measurment at a particular suface
- const InDetDD::SiDetectorElement *side = dynamic_cast<const
- InDetDD::SiDetectorElement *>(de);
- if(side){
+ const InDetDD::SiDetectorElement *side = dynamic_cast<const InDetDD::SiDetectorElement *>(de);
+ if (side){
Amg::Vector3D mytrack = trackParameter->momentum(); // track parameters at that surface
Amg::Vector3D mynormal = side->normal();
Amg::Vector3D myphiax = side->phiAxis();
@@ -1206,12 +1243,13 @@ StatusCode IDAlignMonResiduals::fillHistograms()
const AmgSymMatrix(5)* TrackParCovariance = trackParameter ? trackParameter->covariance() : NULL;
- if(TrackParCovariance==NULL) {
+ if( TrackParCovariance == nullptr) {
//if no MeasuredTrackParameters the hit will not have associated convariance error matrix and will not
//be able to define a pull or unbiased residual (errors needed for propagation)
ATH_MSG_DEBUG ("Skipping TSOS " << nTSOS << " because does not have MeasuredTrackParameters");
continue;
}
+ ATH_MSG_DEBUG (" --> going to define residuals and everything of TSOS #" << nTSOS << "/" << track->trackStateOnSurfaces()->size());
float residualX = 9999.0;
float residualY = 9999.0;
@@ -1251,14 +1289,14 @@ StatusCode IDAlignMonResiduals::fillHistograms()
int ClusSize = -999;
const Identifier & hitId = hit->identify();
- ATH_MSG_DEBUG ( "Defined hit Identifier ");
+ ATH_MSG_DEBUG ( "Defining hit Identifier ");
if (m_idHelper->is_trt(hitId)) detType = 2;
else if (m_idHelper->is_sct(hitId)) detType = 1;
else detType = 0;
// TRT hits: detType = 2
if(detType==2){
- ATH_MSG_DEBUG("** IDAlignMonResiduals::fillHistograms() ** Hit is from the TRT, finding residuals... ");
+ ATH_MSG_DEBUG ("** IDAlignMonResiduals::fillHistograms() ** Hit is from the TRT, finding residuals... ");
bool isTubeHit = (mesh->localCovariance()(Trk::locX,Trk::locX) > 1.0) ? 1 : 0;
const Trk::TrackParameters* trackParameter = tsos->trackParameters();
float hitR = hit->localParameters()[Trk::driftRadius];
@@ -1285,7 +1323,7 @@ StatusCode IDAlignMonResiduals::fillHistograms()
if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Cannot define unbiased parameters for hit, skipping it." << endmsg;
continue;
}
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found UnBiased TrackParameters" << endmsg;
+ ATH_MSG_DEBUG (" --> TRT UnBiased TrackParameters of hit " << nTSOS << " FOUND");
float perdictR = trackParameterUnbiased->parameters()[Trk::locR];
@@ -1304,7 +1342,7 @@ StatusCode IDAlignMonResiduals::fillHistograms()
pullR = residualPull->pull()[Trk::locR];
}
else {
- if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " no covariance of the track parameters given, can not calc pull!" << endmsg;
+ ATH_MSG_DEBUG (" no covariance of the track parameters given, can not calculate pull!");
}
delete trackParameterUnbiased;
@@ -1317,17 +1355,17 @@ StatusCode IDAlignMonResiduals::fillHistograms()
const InDet::TRT_DriftCircle *RawDriftCircle(NULL);
if (trtCircle!=NULL) {
- ATH_MSG_DEBUG("Getting RawDriftCircle");
+ ATH_MSG_DEBUG(" --> Getting TRT RawDriftCircle");
RawDriftCircle = dynamic_cast<const InDet::TRT_DriftCircle*>(trtCircle->prepRawData());
}
else {
ATH_MSG_DEBUG("trtCircle is a NULL pointer");
}
- if ( trtCircle != NULL){
+ if ( trtCircle != nullptr){
bool isValid;
float leadingEdge = -999;
- if (RawDriftCircle != NULL) {
+ if (RawDriftCircle != nullptr) {
leadingEdge=RawDriftCircle->driftTime(isValid);
}
else {
@@ -4909,11 +4947,13 @@ void IDAlignMonResiduals::MakeTRTEndcapHistograms(MonGroup& al_mon){
RegisterHisto(al_mon,m_trt_ec_hist->pullR_notube_pt[endcap]);
/** Residuals vs pt per wheel */
- for (int iWheel=0; iWheel < 40; iWheel++) {
- m_trt_ec_hist->residualR_ptwheel[endcap][iWheel] = MakeProfile("trt_"+endcapName[endcap]+"_resvspt_wheel_"+intToString(iWheel),
+ for (int iWheel=0; iWheel < 40; iWheel++) {
+ m_trt_ec_hist->residualR_ptwheel[endcap][iWheel] = MakeProfile("trt_ec_resVspt_wheel_"+intToString(iWheel)+"_"+endcapName[endcap],
"Residual vs p_{T} for TRT "+endcapName[endcap]+" "+intToString(iWheel),
m_nBinsPtRange, -m_PtRange, m_PtRange,
- m_minTRTResWindow, m_maxTRTResWindow, "Track p_{T} [GeV]","Residual [mm]");
+ m_minTRTResWindow, m_maxTRTResWindow,
+ "Track p_{T} [GeV]","Residual [mm]");
+ SetMinWindow(m_trt_ec_hist->residualR_ptwheel[endcap][iWheel], -0.025, 0.025);
RegisterHisto(al_mon,m_trt_ec_hist->residualR_ptwheel[endcap][iWheel]);
}
@@ -4921,13 +4961,13 @@ void IDAlignMonResiduals::MakeTRTEndcapHistograms(MonGroup& al_mon){
m_trt_ec_hist->residualR_mu[endcap] = MakeHist("trt_ec_residualR_mu_"+endcapName[endcap],
"UnBiased Residual vs mu for TRT "+endcapName[endcap],
m_nBinsMuRange, m_muRangeMin, m_muRangeMax,
- 100, m_minTRTResWindow, m_maxTRTResWindow,
+ 50, m_minTRTResWindow, m_maxTRTResWindow,
"#mu ","Residual [mm]");
RegisterHisto(al_mon,m_trt_ec_hist->residualR_mu[endcap]);
m_trt_ec_hist->pullR_mu[endcap] = MakeHist("trt_ec_pullR_mu_"+endcapName[endcap],"Unbiased residual pull vs mu for TRT "+endcapName[endcap],
m_nBinsMuRange, m_muRangeMin, m_muRangeMax,
- 100, -m_RangeOfPullHistos,m_RangeOfPullHistos,
+ 50, -m_RangeOfPullHistos,m_RangeOfPullHistos,
"#mu","Pull");
RegisterHisto(al_mon,m_trt_ec_hist->pullR_mu[endcap]);
}
@@ -4940,50 +4980,80 @@ void IDAlignMonResiduals::MakeTRTEndcapHistograms(MonGroup& al_mon){
32, -0.5, 31.5,
50, m_minTRTResWindow, m_maxTRTResWindow);
RegisterHisto(al_mon,m_trt_ec_hist->resVsPhiWheel[endcap]);
+
m_trt_ec_hist->aveResVsPhiWheel[endcap] = MakeHist("trt_ec_aveResVsPhiWheel_"+endcapName[endcap],
"Average Residual vs Phi Sector & Wheel for TRT "+endcapName[endcap],
40, -0.5, 39.5,
32, -0.5, 31.5,
"End-cap 4-plane wheel","#phi Sector");
RegisterHisto(al_mon,m_trt_ec_hist->aveResVsPhiWheel[endcap]);
+
m_trt_ec_hist->rmsResVsPhiWheel[endcap] = MakeHist("trt_ec_rmsResVsPhiWheel_"+endcapName[endcap],"Residual RMS vs Phi Sector & Wheel for TRT "+endcapName[endcap],
40, -0.5, 39.5,
32, -0.5, 31.5,
"End-cap 4-plane wheel","#phi Sector");
RegisterHisto(al_mon,m_trt_ec_hist->rmsResVsPhiWheel[endcap]);
+ // same for positive and negative charged particles
+ m_trt_ec_hist->resVsPhiWheelPos[endcap] = new TH3F(("trt_ec_resVsPhiWheelPos_"+endcapName[endcap]).c_str(),
+ ("Residual Distribution vs Phi Sector & Wheel for TRT "+endcapName[endcap]+" positive;Wheel;#phi sector;Residual [mm]").c_str(),
+ 40, -0.5, 39.5,
+ 32, -0.5, 31.5,
+ 50, m_minTRTResWindow, m_maxTRTResWindow);
+ RegisterHisto(al_mon,m_trt_ec_hist->resVsPhiWheelPos[endcap]);
+ m_trt_ec_hist->resVsPhiWheelNeg[endcap] = new TH3F(("trt_ec_resVsPhiWheelNeg_"+endcapName[endcap]).c_str(),
+ ("Residual Distribution vs Phi Sector & Wheel for TRT "+endcapName[endcap]+" negative;Wheel;#phi sector;Residual [mm]").c_str(),
+ 40, -0.5, 39.5,
+ 32, -0.5, 31.5,
+ 50, m_minTRTResWindow, m_maxTRTResWindow);
+ RegisterHisto(al_mon,m_trt_ec_hist->resVsPhiWheelNeg[endcap]);
+
/** Endcap Residual plots vs Radius & Wheel */
m_trt_ec_hist->resVsRadiusWheelPos[endcap] = new TH3F(("trt_ec_resVsRadiusWheelPos_"+endcapName[endcap]).c_str(),
("Residual Distribution vs Wheel & Radius on Wheel for TRT "+endcapName[endcap]+";Wheel;Radius [mm]; Res [mm]").c_str(),
- 40, -0.5, 39.5, 30, 644,1004/*these are the radius limits in mm according to TRT SW*/,
+ 40, -0.5, 39.5,
+ 20, 644., 1004. /*these are the radius limits in mm according to TRT SW*/,
50, m_minTRTResWindow, m_maxTRTResWindow);
RegisterHisto(al_mon,m_trt_ec_hist->resVsRadiusWheelPos[endcap]);
m_trt_ec_hist->aveResVsRadiusWheelPos[endcap] = MakeHist("trt_ec_aveResVsRadiusWheelPos_"+endcapName[endcap],
"Average Residual vs Wheel & Radius on Wheel for TRT "+endcapName[endcap],
- 40, -0.5, 39.5, 30, 644, 1004,
+ 40, -0.5, 39.5,
+ 20, 644., 1004.,
"Wheel Number","Radius on Wheel [mm]");
RegisterHisto(al_mon,m_trt_ec_hist->aveResVsRadiusWheelPos[endcap]);
m_trt_ec_hist->rmsResVsRadiusWheelPos[endcap] = MakeHist("trt_ec_rmsResVsRadiusWheelPos_"+endcapName[endcap],
"Residual RMS vs Wheel & Radius on Wheel for TRT "+endcapName[endcap],
- 40, -0.5, 39.5, 30, 644, 1004,
+ 40, -0.5, 39.5,
+ 20, 644., 1004.,
"Wheel Number","Radius on Wheel [mm]");
RegisterHisto(al_mon,m_trt_ec_hist->rmsResVsRadiusWheelPos[endcap]);
m_trt_ec_hist->resVsRadiusWheelNeg[endcap] = new TH3F(("trt_ec_resVsRadiusWheelNeg_"+endcapName[endcap]).c_str(),
("Residual Distribution vs Wheel & Radius on Wheel for TRT "+endcapName[endcap]+";Wheel;Radius [mm]; Res [mm]").c_str(),
- 40, -0.5, 39.5, 30, 644, 1004/*these are the radius limits in mm according to TRT SW*/,
+ 40, -0.5, 39.5,
+ 25, 644., 1004./*these are the radius limits in mm according to TRT SW*/,
50, m_minTRTResWindow, m_maxTRTResWindow);
RegisterHisto(al_mon,m_trt_ec_hist->resVsRadiusWheelNeg[endcap]);
m_trt_ec_hist->aveResVsRadiusWheelNeg[endcap] = MakeHist("trt_ec_aveResVsRadiusWheelNeg_"+endcapName[endcap],
"Average Residual vs Wheel & Radius on Wheel for TRT "+endcapName[endcap],
- 40, -0.5, 39.5, 30, 644,1004,
+ 40, -0.5, 39.5,
+ 20, 644., 1004.,
"Wheel Number","Radius on Wheel [mm]");
RegisterHisto(al_mon,m_trt_ec_hist->aveResVsRadiusWheelNeg[endcap]);
m_trt_ec_hist->rmsResVsRadiusWheelNeg[endcap] = MakeHist("trt_ec_rmsResVsRadiusWheelNeg_"+endcapName[endcap],
"Residual RMS vs Wheel & Radius on Wheel for TRT "+endcapName[endcap],
- 40, -0.5, 39.5, 30, 644, 1004,
+ 40, -0.5, 39.5,
+ 20, 644., 1004.,
"Wheel Number","Radius on Wheel [mm]");
RegisterHisto(al_mon,m_trt_ec_hist->rmsResVsRadiusWheelNeg[endcap]);
+ /** Endcap residual histograms vs q x pT & Wheel */
+ m_trt_ec_hist->resVsqPtWheel[endcap] = new TH3F(("trt_ec_resVsqPtWheel_"+endcapName[endcap]).c_str(),
+ ("Residual Distribution vs Wheel & p_{T} for TRT "+endcapName[endcap]+";Wheel;q#timesp_{T} [GeV]; Res [mm]").c_str(),
+ 40, -0.5, 39.5,
+ 20, -m_PtRange, m_PtRange,
+ 50, m_minTRTResWindow, m_maxTRTResWindow);
+ RegisterHisto(al_mon,m_trt_ec_hist->resVsqPtWheel[endcap]);
+
/** R(t) relation */
m_trt_ec_hist->rt[endcap] = MakeHist("trt_ec_rt_"+endcapName[endcap],"rt relation for TRT "+endcapName[endcap], 100,-12.5,59.375,100,0,2,"leading edge [ns] corrected for t0 and EP ","dist from wire to track [mm]");
RegisterHisto(al_mon,m_trt_ec_hist->rt[endcap]);
@@ -5257,7 +5327,7 @@ void IDAlignMonResiduals::fillTRTEndcapHistograms(int barrel_ec, int layer_or_wh
if(m_extendedPlots){
if (LE != -999) m_trt_ec_hist->rt[endcap] -> Fill(LE - EP - t0,fabs(perdictR), hweight);
m_trt_ec_hist->residualR_pt[endcap]-> Fill(trkpt, residualR, hweight);
- m_trt_ec_hist->residualR_ptwheel[endcap][layer_or_wheel]-> Fill(trkpt, residualR, hweight);
+ m_trt_ec_hist->residualR_ptwheel[endcap][getRing(layer_or_wheel,straw_layer)]-> Fill(trkpt, residualR, hweight);
m_trt_ec_hist->pullR_pt[endcap] -> Fill(trkpt, pullR , hweight);
if (!isTubeHit) m_trt_ec_hist->pullR_notube_pt[endcap] -> Fill(trkpt,pullR, hweight);
@@ -5278,22 +5348,29 @@ void IDAlignMonResiduals::fillTRTEndcapHistograms(int barrel_ec, int layer_or_wh
}
}
+
// fill TH3F of ave residual vs phi & wheel
if(m_extendedPlots){
- m_trt_ec_hist->resVsPhiWheel[endcap]->Fill(getRing(layer_or_wheel,straw_layer),phi_module,residualR,hweight);
+ float theWheel = static_cast<float>(getRing(layer_or_wheel,straw_layer));
+ float thePhiMod = static_cast<float>(phi_module);
+
+ m_trt_ec_hist->resVsPhiWheel[endcap]->Fill(theWheel, thePhiMod, residualR, hweight);
+
// fill TH3F of ave residual vs wheel & radius vs charge & LOW PT ONLY
ATH_MSG_DEBUG ("Going to fill m_trt_ec_hist->resVsRadiusWheelPos["<< endcap<<"] for pt: " << trkpt << " hitGlobalR= " << hitGlobalR);
if(fabs(trkpt) < m_maxPtEC){
int charge = (trkpt > 0 ? 1 : -1);
- if (hitGlobalR != -9999)
- {
- if(charge > 0){
- m_trt_ec_hist->resVsRadiusWheelPos[endcap]->Fill(getRing(layer_or_wheel,straw_layer), hitGlobalR, residualR,hweight);
- }
- else{
- m_trt_ec_hist->resVsRadiusWheelNeg[endcap]->Fill(getRing(layer_or_wheel,straw_layer), hitGlobalR, residualR,hweight);
- }
+ if (hitGlobalR != -9999) {
+ if(charge > 0){
+ m_trt_ec_hist->resVsPhiWheelPos[endcap] ->Fill(theWheel, thePhiMod, residualR, hweight);
+ m_trt_ec_hist->resVsRadiusWheelPos[endcap]->Fill(theWheel, hitGlobalR, residualR, hweight);
+ }
+ else{
+ m_trt_ec_hist->resVsPhiWheelNeg[endcap] ->Fill(theWheel, thePhiMod, residualR, hweight);
+ m_trt_ec_hist->resVsRadiusWheelNeg[endcap]->Fill(theWheel, hitGlobalR, residualR, hweight);
}
+ } // radius known
+ m_trt_ec_hist->resVsqPtWheel[endcap]->Fill(theWheel, trkpt, residualR, hweight);
}
}
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h
index 954d79ff91da8ac79c6b4c0224a16cb906c2c2a0..b24017dd6b0c188e8af8d21d84b4dab31848b22c 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h
@@ -215,6 +215,7 @@ class IDAlignMonResiduals : public ManagedMonitorToolBase
//histograms
TH1F* m_totalEvents{};
+ TH1F* m_hTotalTracks{};
TH1F* m_sirescalcfailure{};
std::vector<TH3F*> m_sct_b_Oxresxvsmodetaphi_3ds;
std::vector<TH3F*> m_sct_b_Oyresxvsmodetaphi_3ds;
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx
index b49387154288b510bd4750a4256a92eb5d3e76b5..001e267d1dde1afa9720edd6922245be8616725f 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx
@@ -421,7 +421,11 @@ StatusCode IDAlignMonTruthComparison::fillHistograms()
if ( HMPL.isValid())
{
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genparptr = HMPL.scptr();
+#else
const HepMC::GenParticle *genparptr = HMPL.cptr();
+#endif
if (genparptr) {
if (genparptr->production_vertex()) {
@@ -579,7 +583,11 @@ StatusCode IDAlignMonTruthComparison::fillHistograms()
if ( HMPL.isValid())
{
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genparptr = HMPL.scptr();
+#else
const HepMC::GenParticle *genparptr = HMPL.cptr();
+#endif
if (genparptr) {
if (genparptr->production_vertex()) {
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionTool.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionTool.h
index 7c086201a3eb74eb7e06872164e325a35d81ce29..b835250ad433a924491b1f8832c12cd5303ddaea 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionTool.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRACKSELECTIONTOOL_H
@@ -20,7 +20,6 @@
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/Vertex.h"
#include "xAODTracking/VertexContainer.h"
-#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleContainer.h"
#include <vector>
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C
index 84c1d7a20ff20ab60b7b28c60d2cefc4e6b253aa..5c8ac57619f185d4f5021583a20459e1d243847d 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C
@@ -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
*/
// tope level executable
@@ -24,7 +24,6 @@
#include "TGraphErrors.h"
#include "TGraphAsymmErrors.h"
#include "TMath.h"
-#include "TFile.h"
#include "RealTrackTree.h"
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/analyzeFiles.C_old b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/analyzeFiles.C_old
index c4fb3c3f3c524a14c9934690d0f67cc59e316d9c..6411695847caacd642ee90df14a958c6a81167ea 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/analyzeFiles.C_old
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/analyzeFiles.C_old
@@ -16,17 +16,12 @@
#include <TStyle.h>
#include <TMatrixT.h>
#include <TMinuit.h>
-#include <iostream>
#include <TVirtualFitter.h>
using namespace std;
#include "RealTrackTree.h"
#include "TApplication.h"
-#include "TFile.h"
-#include "TStyle.h"
-#include <iostream>
-#include "TString.h"
#include "TChain.h"
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
index 0c3dcdaa2b13ea01620189556f6b71abb2ac3375..a0092eb23dc3f3b4bb7ad1f4ef8032a163f4d81f 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
@@ -33,7 +33,6 @@
#include "TrkTrack/TrackCollection.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "InDetRIO_OnTrack/SiClusterOnTrack.h"
-#include "InDetPrepRawData/PixelClusterContainer.h"
#include "TrkTrackSummary/TrackSummary.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZee.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZee.h
index ada717ab5ee623896879af8dffb033140fb9a0e2..9cd97cddc28b824ad9ff233b81d13570e2b80171 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZee.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/IDPerfMonZee.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef IDPerfMonZee_H
@@ -19,7 +19,6 @@
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/Photon.h"
#include "xAODEgamma/PhotonContainer.h"
-#include "xAODEgamma/PhotonContainer.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
#include "xAODMissingET/MissingET.h"
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C
index 790ef0be3cd9b75ad8b3165c2833a4cf8aa0d998..2836f3b984bb867218cc4a06f47621db85638cde 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C
@@ -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
*/
#include <iostream>
@@ -92,16 +92,8 @@ TStyle * AtlasStyle()
-#include <iostream>
#include <cmath>
-
-#include "TLine.h"
-#include "TLatex.h"
-#include "TMarker.h"
-#include "TPave.h"
-#include "TH1.h"
-
void ATLAS_LABEL(Double_t x,Double_t y,Color_t color)
{
TLatex l; //l.SetTextAlign(12); l.SetTextSize(tsize);
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitsNoiseMonAlg.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitsNoiseMonAlg.py
index 21db3f66f76884bd29308615b09b2b4ca625fad8..8471afdb6e402d208a4084aa6d32f63f0152c2d3 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitsNoiseMonAlg.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTHitsNoiseMonAlg.py
@@ -31,7 +31,7 @@ def SCTHitsNoiseMonAlgConfig(inputFlags):
myMonAlg.TriggerChain = ""
# Trigger histogram will be made only for data.
- myMonAlg.doTrigger = (not inputFlags.Input.isMC)
+ myMonAlg.doTrigger = (not inputFlags.Input.isMC and inputFlags.DQ.useTrigger)
from ROOT import SCT_Monitoring as sctMon #import SCT_MonitoringNumbers.h
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx
index f178fe5aad0496fddb2514cf53e19d3d8c10fda3..cbcdea075d625a3047e4ac39dd14f4a87f94951c 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx
@@ -130,7 +130,7 @@ StatusCode SCTHitsNoiseMonAlg::generalHistsandNoise(const std::array<std::unorde
bool isSelectedTrigger{false};
// EDAVIES - have now changed back to using L1_RD0_EMPTY
- if (m_doTrigger) {
+ if (m_doTrigger and !m_trigDecTool.empty()) {
if (AthMonitorAlgorithm::dataType() != AthMonitorAlgorithm::DataType_t::cosmics) {
if (m_trigDecTool->isPassed(m_NOTriggerItem)) {
isSelectedTrigger = true;
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
index f511586c108edcdab3e9fd47672bc7984057e79f..220fcd0ddcedcb9a4a91f677c5699f8587a8fd23 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
@@ -41,7 +41,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new BCMOverlay{"BCMOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx
index c21fc8ccf6d26962e81d417dd92fd20254017d2c..bd3798b27b2e565229eba2b53cb3eab4c43a00bf 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx
@@ -39,7 +39,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new PixelOverlay{"PixelOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx
index 94afde1679897247a79dd30a666dc21df6640e3a..e29cc852e1bc3c99978f4639445a2db9439901ff 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx
@@ -44,7 +44,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new SCTOverlay{"SCTOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
StoreGateSvc *detStore(nullptr);
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
index f7cce7f0dd1103fdd9d785f7b1e666dbea6ef2bf..c458c6acb97a9081107ad264fdfa3c0ee96784b4 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
@@ -204,7 +204,6 @@ namespace OverlayTesting {
// the tested Algorithm
m_alg = new TRTOverlay{"TRTOverlay", m_svcLoc};
m_alg->addRef();
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
// ordering B, A, C, D is on purpose to test for unintended alphabetic ordering
std::string inputSigPropertyValue = "'StoreGateSvc+TRT_RDOs_SIG'";
std::string inputBkgPropertyValue = "'StoreGateSvc+TRT_RDOs_BKG'";
@@ -234,7 +233,6 @@ namespace OverlayTesting {
if(!service) {
return nullptr;
}
- EXPECT_TRUE( service->setProperties().isSuccess() );
EXPECT_TRUE( service->configure().isSuccess() );
EXPECT_TRUE( m_svcMgr->addService(service).isSuccess() );
// assert that finalize() gets called once per test case
@@ -257,7 +255,6 @@ namespace OverlayTesting {
return nullptr;
}
- EXPECT_TRUE( tool->setProperties().isSuccess() );
EXPECT_TRUE( tool->configure().isSuccess() );
// assert that finalize() gets called once per test case
@@ -280,7 +277,7 @@ namespace OverlayTesting {
return digit;
}
- bool initMcEventCollection(std::vector<HepMC::GenParticle*>& genPartList)
+ bool initMcEventCollection(std::vector<HepMC::GenParticlePtr>& genPartList)
{
// create dummy input McEventCollection with a name that
// HepMcParticleLink knows about
@@ -289,7 +286,7 @@ namespace OverlayTesting {
// Add a dummy GenEvent
const int process_id1(20);
const int event_number1(17);
- inputTestDataHandle->push_back(new HepMC::GenEvent(process_id1, event_number1));
+ inputTestDataHandle->push_back(HepMC::newGenEvent(process_id1, event_number1));
HepMC::GenEvent& ge1 = *(inputTestDataHandle->at(0));
populateGenEvent(ge1,-11,11,genPartList);
populateGenEvent(ge1,-13,13,genPartList);
@@ -300,26 +297,26 @@ namespace OverlayTesting {
return true;
}
- void populateGenEvent(HepMC::GenEvent & ge, int pdgid1, int pdgid2, std::vector<HepMC::GenParticle*>& genPartList)
+ void populateGenEvent(HepMC::GenEvent & ge, int pdgid1, int pdgid2, std::vector<HepMC::GenParticlePtr>& genPartList)
{
- CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertex *myVertex = new HepMC::GenVertex( myPos, -1 );
+ HepMC::FourVector myPos( 0.0, 0.0, 0.0, 0.0);
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
- HepMC::GenParticle* inParticle1 = new HepMC::GenParticle(fourMomentum1, pdgid1, 2);
+ HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
HepMC::FourVector fourMomentum2( 0.0, 0.0, -1.0, 1.0*CLHEP::TeV);
- HepMC::GenParticle* inParticle2 = new HepMC::GenParticle(fourMomentum2, pdgid2, 2);
+ HepMC::GenParticlePtr inParticle2 = HepMC::newGenParticlePtr(fourMomentum2, pdgid2, 2);
myVertex->add_particle_in(inParticle2);
HepMC::FourVector fourMomentum3( 0.0, 1.0, 0.0, 1.0*CLHEP::TeV);
- HepMC::GenParticle* inParticle3 = new HepMC::GenParticle(fourMomentum3, pdgid1, 1);
+ HepMC::GenParticlePtr inParticle3 = HepMC::newGenParticlePtr(fourMomentum3, pdgid1, 1);
myVertex->add_particle_out(inParticle3);
genPartList.push_back(inParticle3);
HepMC::FourVector fourMomentum4( 0.0, -1.0, 0.0, 1.0*CLHEP::TeV);
- HepMC::GenParticle* inParticle4 = new HepMC::GenParticle(fourMomentum4, pdgid2, 1);
+ HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
genPartList.push_back(inParticle4);
ge.add_vertex( myVertex );
- ge.set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex( &ge, myVertex );
ge.set_beam_particles(inParticle1,inParticle2);
}
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/InDetTrackPRD_Association/InDetTrackPRD_Association.h b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/InDetTrackPRD_Association/InDetTrackPRD_Association.h
index 8881d2ef1d71d272b9cfbf36213e71171527e9f0..f06994c6bc2968dfa85b8d640931d28d541f90ba 100755
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/InDetTrackPRD_Association/InDetTrackPRD_Association.h
+++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/InDetTrackPRD_Association/InDetTrackPRD_Association.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*-c++-*-*
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -17,7 +17,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
-#include "TrkTrack/TrackCollection.h"
namespace InDet {
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx
index c608055d1ec69bbe598261664aeb7cebda896c88..29a40a8ef8f88748669a7e2a3400dde1a1df633d 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx
@@ -263,23 +263,39 @@ StatusCode InDet::SiSPSeededTrackFinder::newStrategy(const EventContext& ctx) co
/// prepare a collection for the quality-sorted track canddiates
std::multimap<double, Trk::Track*> qualitySortedTrackCandidates;
+ /// Get the value of the seed maker validation ntuple writing switch
+ bool doWriteNtuple = m_seedsmaker->getWriteNtupleBoolProperty();
+ long EvNumber = 0.; //Event number variable to be used for the validation ntuple
+
+ if (doWriteNtuple) {
+ SG::ReadHandle<xAOD::EventInfo> eventInfo(m_evtKey,ctx);
+ if(!eventInfo.isValid()) {EvNumber = -1.0;} else {EvNumber = eventInfo->eventNumber();}
+ }
+
/// Loop through all seeds from the first pass and attempt to form track candidates
while ((seed = m_seedsmaker->next(ctx, seedEventData))) {
+
++counter[kNSeeds];
/// we only want to fill the Z histo with the first candidate for each seed.
bool firstTrack{true};
- /// combinatorial track finding for one given seed
- std::list<Trk::Track*> trackList = m_trackmaker->getTracks(ctx, trackEventData, seed->spacePoints());
- /// record found candidates
- for (Trk::Track* t: trackList) {
- qualitySortedTrackCandidates.insert(std::make_pair(-trackQuality(t), t));
- /// For the first (highest quality) track from each seed, populate the vertex finding histograms
- if (firstTrack and not m_ITKGeometry) {
- fillZHistogram(t, beamPosPerigee, numberHistogram, zWeightedHistogram, ptWeightedHistogram);
- }
- firstTrack = false;
- }
+ /// copy all the tracks into trackList
+ std::list<Trk::Track*> trackList = m_trackmaker->getTracks(ctx, trackEventData, seed->spacePoints());
+ /// record track candidates found, using combinatorial track finding, from the given seed
+ for (Trk::Track* t: trackList) {
+
+ qualitySortedTrackCandidates.insert(std::make_pair(-trackQuality(t), t));
+
+ /// For the first (highest quality) track from each seed, populate the vertex finding histograms
+ if (firstTrack and not m_ITKGeometry) {
+ fillZHistogram(t, beamPosPerigee, numberHistogram, zWeightedHistogram, ptWeightedHistogram);
+ }
+ firstTrack = false;
+ }
+ /// Call the ntuple writing method
+ if(doWriteNtuple) { m_seedsmaker->writeNtuple(seed, !trackList.empty() ? trackList.front() : nullptr, ISiSpacePointsSeedMaker::StripSeed, EvNumber) ; }
+
+
if (counter[kNSeeds] >= m_maxNumberSeeds) {
ERR = true;
++m_problemsTotal;
@@ -307,17 +323,24 @@ StatusCode InDet::SiSPSeededTrackFinder::newStrategy(const EventContext& ctx) co
/// Again, loop over the newly found seeds and attempt to form track candidates
while ((seed = m_seedsmaker->next(ctx, seedEventData))) {
+
++counter[kNSeeds];
- /// insert the new tracks into the quality-sorted list
- for (Trk::Track* t: m_trackmaker->getTracks(ctx, trackEventData, seed->spacePoints())) {
+
+ std::list<Trk::Track*> trackList = m_trackmaker->getTracks(ctx, trackEventData, seed->spacePoints());
+
+ for (Trk::Track* t: trackList) {
qualitySortedTrackCandidates.insert(std::make_pair(-trackQuality(t), t));
}
+
+ if(doWriteNtuple) { m_seedsmaker->writeNtuple(seed, !trackList.empty() ? trackList.front() : nullptr, ISiSpacePointsSeedMaker::PixelSeed, EvNumber); }
+
if (counter[kNSeeds] >= m_maxNumberSeeds) {
ERR = true;
++m_problemsTotal;
break;
}
}
+
m_trackmaker->endEvent(trackEventData);
/// Remove shared tracks with worse quality
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
index 5b08e6df375b14470f06f07c6991f7582b985604..4b90c2ebf9c209fcad06bcf32853786e1dd4e523 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
@@ -24,7 +24,6 @@
#include "TrkSpacePoint/SpacePoint.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
-#include "StoreGate/ReadCondHandleKey.h"
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeed.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeed.h
index 2879259be2492d4be9d26985d895d7c1a440a07a..31d942ba06ef3a75870340a79fdbdff5c1e935e9 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeed.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeed.h
@@ -46,6 +46,10 @@ namespace InDet {
void set(const Trk::SpacePoint*const&,const float*,const float*);
void setQuality(float);
void setParam(const float&);
+ void setD0(const float&);
+ void setEta(const float&);
+ void setDZDR(const float&);
+ void setPt(const float&);
void setScorePenalty(const float& par) {m_scorePenalty=par;}
const Trk::SpacePoint* spacepoint;
@@ -56,9 +60,13 @@ namespace InDet {
float phi() const {return atan2(m_y,m_x);}
const float& covr() const {return m_covr;}
const float& covz() const {return m_covz;}
+ const float& d0() const {return m_d0;}
+ const float& eta() const {return m_eta;}
const float& param() const {return m_param;} /// impact parameter
const float& scorePenalty() const {return m_scorePenalty;} /// penalty term in the seed score
const float& quality() const {return m_q ;} /// quality of the best seed this candidate was seen on
+ const float& dzdr() const {return m_dzdr;}
+ const float& Pt() const {return m_pt;}
const Trk::Surface* sur() const {return m_su;}
const Trk::Surface* sun() const {return m_sn;}
@@ -70,6 +78,10 @@ namespace InDet {
float m_r ; // radius in beam system coordinates
float m_covr; //
float m_covz; //
+ float m_d0;
+ float m_eta;
+ float m_dzdr;
+ float m_pt;
float m_param; /// impact parameter
float m_scorePenalty; /// penalty term in the seed score
float m_q ; /// quality of the best seed this candidate was seen on
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeed.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeed.h
index f7595db7d84cda3f30d5251d9a44b1cb80c1c5e7..1efc685eb9f419eee818b25de26f388ea6f4e0c1 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeed.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeed.h
@@ -39,7 +39,15 @@ namespace InDet {
SiSpacePointForSeed* spacepoint0() {return m_s0;}
SiSpacePointForSeed* spacepoint1() {return m_s1;}
SiSpacePointForSeed* spacepoint2() {return m_s2;}
+ const float& d0() const {return m_d0;}
const float& z() const {return m_z ;}
+ const float& eta() const {return m_eta;}
+ const float& z1() const {return m_z1;}
+ const float& z2() const {return m_z2;}
+ const float& z3() const {return m_z3;}
+ const float& r1() const {return m_r1;}
+ const float& r2() const {return m_r2;}
+ const float& r3() const {return m_r3;}
const float& quality() const {return m_q ;}
void set(SiSpacePointForSeed*&,SiSpacePointForSeed*&,SiSpacePointForSeed*&,float);
@@ -49,11 +57,19 @@ namespace InDet {
private:
- SiSpacePointForSeed* m_s0;
- SiSpacePointForSeed* m_s1;
- SiSpacePointForSeed* m_s2;
- float m_z ;
- float m_q ;
+ SiSpacePointForSeed* m_s0 ;
+ SiSpacePointForSeed* m_s1 ;
+ SiSpacePointForSeed* m_s2 ;
+ float m_d0 ;
+ float m_z ;
+ float m_eta ;
+ float m_z1 ;
+ float m_z2 ;
+ float m_z3 ;
+ float m_r1 ;
+ float m_r2 ;
+ float m_r3 ;
+ float m_q ;
};
} // end of name space
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx
index b1716d8257d77e80418786459789834791f71b79..2701e4d01ee52bccd67ec1806d190f4ca6e0fa80 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx
@@ -21,6 +21,10 @@ namespace InDet {
m_covr = 0.;
m_covz = 0.;
m_param = 0.;
+ m_d0 = 0.;
+ m_eta = 0.;
+ m_dzdr = 0.;
+ m_pt = 0.;
m_q = 0.;
m_su = 0 ;
m_sn = 0 ;
@@ -38,6 +42,10 @@ namespace InDet {
m_covr = sp.m_covr ;
m_covz = sp.m_covz ;
m_q = sp.m_q ;
+ m_dzdr = sp.m_dzdr ;
+ m_d0 = sp.m_d0 ;
+ m_eta = sp.m_eta ;
+ m_pt = sp.m_pt ;
m_su = sp.m_su ;
m_sn = sp.m_sn ;
}
@@ -47,13 +55,13 @@ namespace InDet {
SiSpacePointForSeed::SiSpacePointForSeed
(const Trk::SpacePoint*const& sp,const float* r)
{
- set(sp,r); m_param = 0.;
+ set(sp,r); m_param = 0.;
}
SiSpacePointForSeed::SiSpacePointForSeed
(const Trk::SpacePoint*const& sp,const float* r,const float* sc)
{
- set(sp,r,sc); m_param = 0.;
+ set(sp,r,sc); m_param = 0.;
}
/////////////////////////////////////////////////////////////////////////////////
@@ -157,9 +165,30 @@ namespace InDet {
{
m_param = p;
}
+
+ void SiSpacePointForSeed::setD0(const float& d0)
+ {
+ m_d0 = d0;
+ }
+
+ void SiSpacePointForSeed::setEta(const float& eta)
+ {
+ m_eta = eta;
+ }
+
void SiSpacePointForSeed::setQuality(float q)
{
if(q <= m_q) m_q = q;
}
+
+ void SiSpacePointForSeed::setDZDR(const float& dzdr)
+ {
+ m_dzdr = dzdr;
+ }
+
+ void SiSpacePointForSeed::setPt(const float& pt)
+ {
+ m_pt = pt;
+ }
} // end of name space
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx
index 4894433ae64f4ca0d6a5e8f560d0c61080edb2ea..c300db866c1ef12d4bb80245ed6833d77e200823 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx
@@ -13,6 +13,8 @@ namespace InDet {
m_s0 = 0 ;
m_s1 = 0 ;
m_s2 = 0 ;
+ m_d0 = 0.;
+ m_eta = 0.;
m_z = 0.;
m_q = 0.;
}
@@ -22,7 +24,9 @@ namespace InDet {
{
if(&sp!=this) {
+ m_d0 = sp.m_d0;
m_z = sp.m_z ;
+ m_eta = sp.m_eta;
m_q = sp.m_q ;
m_s0 = sp.m_s0;
m_s1 = sp.m_s1;
@@ -101,7 +105,24 @@ namespace InDet {
s.add(m_s0->spacepoint);
s.add(m_s1->spacepoint);
s.add(m_s2->spacepoint);
- s.setZVertex(double(m_z));
+ s.setD0(m_s2->param());
+ s.setZVertex(double(m_z));
+ s.setEta(m_s2->eta());
+ s.setX1(m_s0->x());
+ s.setX2(m_s1->x());
+ s.setX3(m_s2->x());
+ s.setY1(m_s0->y());
+ s.setY2(m_s1->y());
+ s.setY3(m_s2->y());
+ s.setZ1(m_s0->z());
+ s.setZ2(m_s1->z());
+ s.setZ3(m_s2->z());
+ s.setR1(m_s0->radius());
+ s.setR2(m_s1->radius());
+ s.setR3(m_s2->radius());
+ s.setDZDR_B(m_s0->dzdr());
+ s.setDZDR_T(m_s2->dzdr());
+ s.setPt(m_s2->Pt());
return true;
}
diff --git a/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h b/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h
index b05bb2581cb2f5e1aa6b72ca657c1bfe1da0bb03..e0b293a8b7b36a705a01db5753de7db8613a09b9 100755
--- a/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h
+++ b/InnerDetector/InDetRecEvent/SiSpacePointsSeed/SiSpacePointsSeed/SiSpacePointsSeed.h
@@ -47,9 +47,45 @@ namespace InDet {
virtual ~SiSpacePointsSeed();
void erase();
void add(const Trk::SpacePoint*&);
+ void setD0 (const double&);
void setZVertex(const double&);
+ void setEta (const double&);
+ void setX1 (const double&);
+ void setX2 (const double&);
+ void setX3 (const double&);
+ void setY1 (const double&);
+ void setY2 (const double&);
+ void setY3 (const double&);
+ void setZ1 (const double&);
+ void setZ2 (const double&);
+ void setZ3 (const double&);
+ void setR1 (const double&);
+ void setR2 (const double&);
+ void setR3 (const double&);
+ void setDZDR_B (const double&);
+ void setDZDR_T (const double&);
+ void setPt (const double&);
+
const std::vector<const Trk::SpacePoint*>& spacePoints() const;
+ const double& d0 () const;
const double& zVertex () const;
+ const double& eta () const;
+ const double& x1 () const;
+ const double& x2 () const;
+ const double& x3 () const;
+ const double& y1 () const;
+ const double& y2 () const;
+ const double& y3 () const;
+ const double& z1 () const;
+ const double& z2 () const;
+ const double& z3 () const;
+ const double& r1 () const;
+ const double& r2 () const;
+ const double& r3 () const;
+ const double& dzdr_b () const;
+ const double& dzdr_t () const;
+ const double& pt () const;
+
virtual MsgStream& dump(MsgStream& out) const ;
virtual std::ostream& dump(std::ostream& out) const ;
@@ -60,7 +96,24 @@ namespace InDet {
protected:
std::vector<const Trk::SpacePoint*> m_spacepoints;
- double m_zvertex ;
+ double m_d0 ;
+ double m_zvertex ;
+ double m_eta ;
+ double m_x1 ;
+ double m_x2 ;
+ double m_x3 ;
+ double m_y1 ;
+ double m_y2 ;
+ double m_y3 ;
+ double m_z1 ;
+ double m_z2 ;
+ double m_z3 ;
+ double m_r1 ;
+ double m_r2 ;
+ double m_r3 ;
+ double m_dzdr_b ;
+ double m_dzdr_t ;
+ double m_pt ;
};
MsgStream& operator << (MsgStream& ,const SiSpacePointsSeed&);
@@ -85,16 +138,186 @@ namespace InDet {
m_spacepoints.push_back(p);
}
+ inline void SiSpacePointsSeed::setD0(const double& d0)
+ {
+ m_d0 = d0;
+ }
+
inline void SiSpacePointsSeed::setZVertex(const double& z)
{
m_zvertex = z;
}
+ inline void SiSpacePointsSeed::setEta(const double& eta)
+ {
+ m_eta = eta;
+ }
+
+ inline void SiSpacePointsSeed::setX1(const double& x1)
+ {
+ m_x1 = x1;
+ }
+
+ inline void SiSpacePointsSeed::setX2(const double& x2)
+ {
+ m_x2 = x2;
+ }
+
+ inline void SiSpacePointsSeed::setX3(const double& x3)
+ {
+ m_x3 = x3;
+ }
+
+ inline void SiSpacePointsSeed::setY1(const double& y1)
+ {
+ m_y1 = y1;
+ }
+
+ inline void SiSpacePointsSeed::setY2(const double& y2)
+ {
+ m_y2 = y2;
+ }
+
+ inline void SiSpacePointsSeed::setY3(const double& y3)
+ {
+ m_y3 = y3;
+ }
+
+ inline void SiSpacePointsSeed::setZ1(const double& z1)
+ {
+ m_z1 = z1;
+ }
+
+ inline void SiSpacePointsSeed::setZ2(const double& z2)
+ {
+ m_z2 = z2;
+ }
+
+ inline void SiSpacePointsSeed::setZ3(const double& z3)
+ {
+ m_z3 = z3;
+ }
+
+ inline void SiSpacePointsSeed::setR1(const double& r1)
+ {
+ m_r1 = r1;
+ }
+
+ inline void SiSpacePointsSeed::setR2(const double& r2)
+ {
+ m_r2 = r2;
+ }
+
+ inline void SiSpacePointsSeed::setR3(const double& r3)
+ {
+ m_r3 = r3;
+ }
+
+ inline void SiSpacePointsSeed::setDZDR_B(const double& dzdr)
+ {
+ m_dzdr_b = dzdr;
+ }
+
+ inline void SiSpacePointsSeed::setDZDR_T(const double& dzdr)
+ {
+ m_dzdr_t = dzdr;
+ }
+
+ inline void SiSpacePointsSeed::setPt(const double& pt)
+ {
+ m_pt = pt;
+ }
+
+ inline const double& SiSpacePointsSeed::d0() const
+ {
+ return m_d0;
+ }
+
inline const double& SiSpacePointsSeed::zVertex() const
{
return m_zvertex;
}
+
+ inline const double& SiSpacePointsSeed::eta() const
+ {
+ return m_eta;
+ }
+
+ inline const double& SiSpacePointsSeed::x1() const
+ {
+ return m_x1;
+ }
+
+ inline const double& SiSpacePointsSeed::x2() const
+ {
+ return m_x2;
+ }
+
+ inline const double& SiSpacePointsSeed::x3() const
+ {
+ return m_x3;
+ }
+
+ inline const double& SiSpacePointsSeed::y1() const
+ {
+ return m_y1;
+ }
+
+ inline const double& SiSpacePointsSeed::y2() const
+ {
+ return m_y2;
+ }
+
+ inline const double& SiSpacePointsSeed::y3() const
+ {
+ return m_y3;
+ }
+
+ inline const double& SiSpacePointsSeed::z1() const
+ {
+ return m_z1;
+ }
+
+ inline const double& SiSpacePointsSeed::z2() const
+ {
+ return m_z2;
+ }
+
+ inline const double& SiSpacePointsSeed::z3() const
+ {
+ return m_z3;
+ }
+
+ inline const double& SiSpacePointsSeed::r1() const
+ {
+ return m_r1;
+ }
+
+ inline const double& SiSpacePointsSeed::r2() const
+ {
+ return m_r2;
+ }
+
+ inline const double& SiSpacePointsSeed::r3() const
+ {
+ return m_r3;
+ }
+
+ inline const double& SiSpacePointsSeed::dzdr_b() const
+ {
+ return m_dzdr_b;
+ }
+
+ inline const double& SiSpacePointsSeed::dzdr_t() const
+ {
+ return m_dzdr_t;
+ }
+ inline const double& SiSpacePointsSeed::pt() const
+ {
+ return m_pt;
+ }
+
} // end of name space
#endif // SiSpacePointsSeed_h
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx
index d842de5665b58cd8790befb205ac5b7bbc54a125..3a4653c433bf28f6699643c1790bfda37986c723 100755
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -20,7 +20,6 @@
// data model
#include "TrkEventPrimitives/LocalParameters.h"
#include "InDetPrepRawData/PixelCluster.h"
-//#include "InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h"
//#include "TrkParameters/AtaStraightLine.h"
//#include "TrkSurfaces/DiscSurface.h"
//#include "TrkSurfaces/StraightLineSurface.h"
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/InDetConversionFinderTools/InDetConversionFinderTools.h b/InnerDetector/InDetRecTools/InDetConversionFinderTools/InDetConversionFinderTools/InDetConversionFinderTools.h
index 213d4ad851f7c5de8f496dc3dab8447932d4cb02..e248ea6be1d8e0ad6ce8e618e640856d7dcb895c 100755
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/InDetConversionFinderTools/InDetConversionFinderTools.h
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/InDetConversionFinderTools/InDetConversionFinderTools.h
@@ -26,8 +26,6 @@
#include "InDetConversionFinderTools/SingleTrackConversionTool.h"
#include "InDetConversionFinderTools/ConversionFinderUtils.h"
#include "InDetConversionFinderTools/VertexPointEstimator.h"
-#include "InDetConversionFinderTools/ConversionPostSelector.h"
-#include "InDetConversionFinderTools/SingleTrackConversionTool.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
#include "TrkParticleBase/TrackParticleBaseCollection.h"
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx
index b6c9dcd959080d20b164c66f6335eb8ab55b29ab..51e28aa3b52df046010e137a75dc75bdade030ec 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx
@@ -25,9 +25,6 @@
#include "TrkSurfaces/Surface.h"
-#include "TrkParameters/TrackParameters.h"
-
-
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/VertexContainer.h"
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h
index 11e8edb932bd8a6bf356057ba4bd25a422534e73..e85bf88234dff999180490098788a195b0677ffa 100644
--- a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDETETADEPENDENTCUTS_INDETETADEPENDENTCUTSSVC_H
#define INDETETADEPENDENTCUTS_INDETETADEPENDENTCUTSSVC_H
@@ -18,9 +18,9 @@
#include "GaudiKernel/ISvcLocator.h"
namespace InDet {
- class InDetEtaDependentCutsSvc: virtual public IInDetEtaDependentCutsSvc,
- public AthService {
-
+ class InDetEtaDependentCutsSvc final
+ : virtual public IInDetEtaDependentCutsSvc, public AthService
+ {
///////////////////////////////////////////////////////////////////
// Public methods:
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx
index 1996a73648c0eeb327c2c92ac62ccd718b251933..1c277493b25cdcd88d0d0076830b054760220d9f 100644
--- a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//Author: Lianyou Shan <lianyou.shan@cern.ch>
@@ -42,7 +42,6 @@
#include "VxVertex/VxTrackAtVertex.h"
//#include "DataModel/DataVector.h"
#include "AthContainers/DataVector.h"
-#include "TrkEventPrimitives/ParamDefs.h"
#include "TrkVertexFitterInterfaces/IVertexFitter.h"
#include "TrkTrackLink/ITrackLink.h"
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx
index 03f1643f207b1ee109498273e81d8d09b6f83cfa..fa3ceb98a333a1cfb4131dffa93ba2a7a47c82c9 100755
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx
@@ -30,7 +30,6 @@
#include "TrkVertexFitterInterfaces/IVertexSeedFinder.h"
#include "AthContainers/DataVector.h"
-#include "TrkEventPrimitives/ParamDefs.h"
#include "TrkVertexFitterInterfaces/IVertexFitter.h"
#include "VxVertex/RecVertex.h"
#include "VxVertex/VxTrackAtVertex.h"
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h
index e51088b9ea70576153422552b04365fde8c5bb68..d166e6712ccecee25e203df04d654c444cb07390 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h
@@ -26,6 +26,8 @@
class MsgStream;
+namespace Trk { class Track; }
+
namespace InDet {
class SiSpacePointsSeed;
@@ -126,7 +128,13 @@ namespace InDet {
//@{
virtual const SiSpacePointsSeed* next(const EventContext& ctx, SiSpacePointsSeedMakerEventData& data) const =0;
//@}
-
+
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track*, int seedType, long eventNumber) const =0;
+
+ virtual bool getWriteNtupleBoolProperty() const =0;
+
+ enum seedType { StripSeed = 0, PixelSeed = 1 };
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
index ed687a57f512d38b2e7f5cfff37e3b2b9fbce182..6025446d5865da364dc2843526245028394552dd 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
@@ -74,7 +74,7 @@ namespace InDet {
virtual Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & primaryVertex,
const TLorentzVector & jetMomentum,
- const std::vector<const xAOD::IParticle*> & inputTracks) const;
+ const std::vector<const xAOD::IParticle*> & inputTracks) const override;
private:
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
index 13cd285d3563d02e6a5e86843399cf797ee36837..747166aa128c62a43dcd48c35235c6a3976e1cb8 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
@@ -62,9 +62,10 @@ namespace InDet {
~InDetJetFitterVxFinder();
+ virtual
Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & /*primaryVertex*/,
const TLorentzVector & /*jetMomentum*/,
- const std::vector<const xAOD::IParticle*> & /*inputTracks*/ ) const
+ const std::vector<const xAOD::IParticle*> & /*inputTracks*/ ) const override
{
/* not implemented */
return 0;
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
index 007d78cf7437a948f374de5cd211580a701ed37b..c9f682775b310990e75c7154bf66bc85c508c3fb 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h
@@ -38,11 +38,11 @@ namespace InDet
~InDetCosmicTrackSelectorTool();
- bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const override;
- bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const override;
- bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const {
+ virtual bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const override {
ATH_MSG_WARNING("xAOD::TrackParticle selection not implemented yet");
return false;
}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
index b121018457f559283025a69c2dca42abaeabef66..0a32e5de92117dee4390dbfd77f76f21f160326f 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h
@@ -42,13 +42,13 @@ namespace InDet
~InDetIsoTrackSelectorTool();
/** ESD type interface */
- bool decision(const Trk::AtaStraightLine&, const Trk::Track& track) const;
+ virtual bool decision(const Trk::AtaStraightLine&, const Trk::Track& track) const override;
/** AOD type interface */
- bool decision(const Trk::AtaStraightLine&, const Trk::TrackParticleBase& trackParticle) const;
+ virtual bool decision(const Trk::AtaStraightLine&, const Trk::TrackParticleBase& trackParticle) const override;
/** Work-horse interface - will ignore TrackSelector */
- bool decision(const Trk::AtaStraightLine&, const Trk::TrackParameters& trackPars) const;
+ virtual bool decision(const Trk::AtaStraightLine&, const Trk::TrackParameters& trackPars) const override;
private:
/** Robust cut window setting */
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
index 386090734df037bd17f149c6eec1dfa17b665f8b..c3633ad3c5a86399f673e683c5c80739b5c67bbe 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h
@@ -50,11 +50,11 @@ namespace InDet
~InDetTrackSelectorTool();
- bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::Track& track,const Trk::Vertex* vertex) const override;
- bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const;
+ virtual bool decision(const Trk::TrackParticleBase& track,const Trk::Vertex* vertex) const override;
- bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const {
+ virtual bool decision(const xAOD::TrackParticle&,const xAOD::Vertex*) const override {
ATH_MSG_WARNING("xAOD::TrackParticle selection not implemented yet");
return false;
}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
index e399c8e5fc548e6cd596cdd9338c5b8eeba16a77..406b0f29cdccd71482581ea2084a5d8b5f96ab81 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h
@@ -30,10 +30,10 @@ namespace InDet{
InDetTrtDriftCircleCutTool(const std::string& t, const std::string& n, const IInterface* p);
- ~InDetTrtDriftCircleCutTool();
+ virtual ~InDetTrtDriftCircleCutTool();
/** @brief Minimum number of drift circles using the track scoring tool */
- int minNumberDCs(const Trk::TrackParameters*) const;
+ virtual int minNumberDCs(const Trk::TrackParameters*) const override;
private:
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
index 92576b24e940045be8368db7c81e265c01a8bdfb..4be3ff0dc5b5d05f6d34415d35729fad2e017e82 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
@@ -19,7 +19,6 @@
#include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
#include "PixelReadoutGeometry/PixelDetectorManager.h"
#include "SiDetElementsRoadTool_xk/SiDetElementsComparison.h"
-#include "SiDetElementsRoadUtils_xk.h"
#include "StoreGate/ReadCondHandle.h"
#include "TrkPrepRawData/PrepRawData.h"
#include "GaudiKernel/ContextSpecificPtr.h"
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
index adc213c8c9e3ad9cdbd30eb8e7ad3f0687607992..352c6c2f28ed82095ec0c98fd65dc10487e574cd 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -22,6 +22,9 @@
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "GaudiKernel/ITHistSvc.h"
+#include "TFile.h"
+#include "TTree.h"
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// MagField cache
@@ -35,6 +38,8 @@
#include <vector>
class MsgStream;
+//class TFile;
+//class TTree;
namespace InDet {
@@ -117,7 +122,16 @@ namespace InDet {
**/
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
-
+
+ /** This method is called by the SiSPSeededTrackFinder algorithm to fill ntuples for
+ * seeds seen by the algorithm. seedType represents Pixel/SCT type seeds, where 0->SCT
+ * and 1->Pixel. givesTrack is determined by whether or not the given seed forms atleast
+ * one track candidate. 0->No track candidate 1->At least one track Candidate
+ **/
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
@@ -475,6 +489,43 @@ namespace InDet {
* @return true if the seed is confirmed, false otherwise
**/
bool isConfirmedSeed(const InDet::SiSpacePointForSeed* bottomSP, const InDet::SiSpacePointForSeed* topSP, float quality) const;
+
+ ///Flag to write validation ntuples. Turned off by default
+ Gaudi::Property<bool> m_writeNtuple {this, "WriteNtuple", false, "Flag to write Validation Ntuples"};
+
+ ITHistSvc* m_thistSvc;
+
+ TTree* m_outputTree;
+
+ mutable std::mutex m_mutex;
+
+ mutable std::string m_treeName ATLAS_THREAD_SAFE;
+ mutable TString m_treeFolder ATLAS_THREAD_SAFE;
+
+ mutable float m_d0 ATLAS_THREAD_SAFE;
+ mutable float m_z0 ATLAS_THREAD_SAFE;
+ mutable float m_pt ATLAS_THREAD_SAFE;
+ mutable float m_eta ATLAS_THREAD_SAFE;
+ mutable double m_x1 ATLAS_THREAD_SAFE;
+ mutable double m_x2 ATLAS_THREAD_SAFE;
+ mutable double m_x3 ATLAS_THREAD_SAFE;
+ mutable double m_y1 ATLAS_THREAD_SAFE;
+ mutable double m_y2 ATLAS_THREAD_SAFE;
+ mutable double m_y3 ATLAS_THREAD_SAFE;
+ mutable double m_z1 ATLAS_THREAD_SAFE;
+ mutable double m_z2 ATLAS_THREAD_SAFE;
+ mutable double m_z3 ATLAS_THREAD_SAFE;
+ mutable double m_r1 ATLAS_THREAD_SAFE;
+ mutable double m_r2 ATLAS_THREAD_SAFE;
+ mutable double m_r3 ATLAS_THREAD_SAFE;
+ mutable float m_quality ATLAS_THREAD_SAFE;
+ mutable int m_type ATLAS_THREAD_SAFE;
+ mutable double m_dzdr_t ATLAS_THREAD_SAFE;
+ mutable double m_dzdr_b ATLAS_THREAD_SAFE;
+ mutable bool m_givesTrack ATLAS_THREAD_SAFE;
+ mutable float m_trackPt ATLAS_THREAD_SAFE;
+ mutable float m_trackEta ATLAS_THREAD_SAFE;
+ mutable long m_eventNumber ATLAS_THREAD_SAFE;
};
} // end of name space
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
index ce9990ce62bc6bdb4e57e6fcb4eb9fd60e2bc2d7..1b187b0e0a54f2464b0100c440ab660fad9ac759 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -111,6 +111,10 @@ namespace InDet {
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long EventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
index 9dabc1d84ebd595e9e1f8782981421024749d37a..0e9fe2f3726f650b0927f8ad92bfd86f0a89c28f 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -108,6 +108,10 @@ namespace InDet {
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
index 9dd38fd4534f4fb7dd7516d0848dcf7a5a57ec6d..279de03a795faa4f596ec09852a021329cc1f550 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -109,6 +109,10 @@ namespace InDet {
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
index a744dc44eaffe614cf49581bd4266e889cc4e3bc..2028e8920ce921a28a42f5d2a6b5ff4f231d05a8 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -111,6 +111,10 @@ namespace InDet {
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
index aa55a92ed6df0439e219178e9227d51747fdefcc..ac72a3bc6a155e67af6fc5ee9b584ff0a72f5032 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -109,6 +109,10 @@ namespace InDet {
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
index 92375cc65ee781215c9b2fced68f0e71674a7c4f..9eb2eb2bd14ff8c9d54de8ca4bce9c47da61a8a9 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -107,6 +107,10 @@ namespace InDet {
virtual const SiSpacePointsSeed* next(const EventContext& ctx, EventData& data) const override;
//@}
+ virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
+
+ virtual bool getWriteNtupleBoolProperty() const override;
+
///////////////////////////////////////////////////////////////////
/// @name Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
index b039fc6bae124713c6ff6dab8758677b4c80c9d4..36a72a60852a5a7ddf5c43bef85bc7f12fda1845 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
@@ -16,6 +16,10 @@
#include "InDetPrepRawData/SiCluster.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
+#include "TrkTrack/Track.h"
+#include "TrkParameters/TrackParameters.h"
+
+#include "StoreGate/ReadCondHandle.h"
#include <iomanip>
#include <ostream>
@@ -25,7 +29,11 @@
InDet::SiSpacePointsSeedMaker_ATLxk::SiSpacePointsSeedMaker_ATLxk
(const std::string& t,const std::string& n,const IInterface* p)
- : base_class(t, n, p)
+ : base_class(t, n, p),
+ m_thistSvc(nullptr),
+ m_outputTree(nullptr),
+ m_treeName(""),
+ m_treeFolder("/valNtuples/")
{
}
@@ -62,6 +70,46 @@ StatusCode InDet::SiSpacePointsSeedMaker_ATLxk::initialize()
dump(data, msg(MSG::DEBUG));
}
+ if (m_writeNtuple) {
+
+ ATH_CHECK( service("THistSvc",m_thistSvc) );
+
+ m_treeName = (std::string("SeedTree_")+name());
+ std::replace( m_treeName.begin(), m_treeName.end(), '.', '_' );
+
+ m_outputTree = new TTree( m_treeName.c_str() , "SeedMakerValTool");
+
+ m_outputTree->Branch("eventNumber", &m_eventNumber);
+ m_outputTree->Branch("d0", &m_d0);
+ m_outputTree->Branch("z0", &m_z0);
+ m_outputTree->Branch("pt", &m_pt);
+ m_outputTree->Branch("eta", &m_eta);
+ m_outputTree->Branch("x1", &m_x1);
+ m_outputTree->Branch("x2", &m_x2);
+ m_outputTree->Branch("x3", &m_x3);
+ m_outputTree->Branch("y1", &m_y1);
+ m_outputTree->Branch("y2", &m_y2);
+ m_outputTree->Branch("y3", &m_y3);
+ m_outputTree->Branch("z1", &m_z1);
+ m_outputTree->Branch("z2", &m_z2);
+ m_outputTree->Branch("z3", &m_z3);
+ m_outputTree->Branch("r1", &m_r1);
+ m_outputTree->Branch("r2", &m_r2);
+ m_outputTree->Branch("r3", &m_r3);
+ m_outputTree->Branch("quality", &m_quality);
+ m_outputTree->Branch("seedType", &m_type);
+ m_outputTree->Branch("givesTrack", &m_givesTrack);
+ m_outputTree->Branch("dzdr_b", &m_dzdr_b);
+ m_outputTree->Branch("dzdr_t", &m_dzdr_t);
+ m_outputTree->Branch("track_pt", &m_trackPt);
+ m_outputTree->Branch("track_eta", &m_trackEta);
+
+ TString fullTreeName = m_treeFolder + m_treeName;
+
+ ATH_CHECK( m_thistSvc->regTree( fullTreeName.Data(), m_outputTree ) );
+
+ }
+
return sc;
}
@@ -147,6 +195,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(const EventContext& ctx, Even
// by the user for strip seeds
data.maxSeedsPerSP = m_maxOneSizeSSS;
data.keepAllConfirmedSeeds = m_alwaysKeepConfirmedStripSeeds;
+
} ///< end if-statement for iteration 0
else { /// for the second iteration (PPP pass), don't redo the full init required the first time
data.r_first = 0; ///< reset the first radial bin
@@ -154,6 +203,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(const EventContext& ctx, Even
// by the user for pixel seeds
data.maxSeedsPerSP = m_maxOneSizePPP;
data.keepAllConfirmedSeeds = m_alwaysKeepConfirmedPixelSeeds;
+
/// call fillLists to repopulate the candidate space points and exit
fillLists(data);
return;
@@ -1767,6 +1817,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
if(z0 > zmax || z0 < zmin) continue;
/// found a bottom SP candidate, write it into the data object
data.SP[Nb] = (*iter_otherSP);
+ if(m_writeNtuple) data.SP[Nb]->setDZDR(dZdR);
/// if we are exceeding the SP capacity of our data object,
/// make it resize its vectors. Will add 50 slots by default,
/// so rarely should happen more than once per event.
@@ -1815,6 +1866,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
if(z0 > zmax || z0 < zmin) continue;
/// add SP to the list
data.SP[Nt] = (*iter_otherSP);
+ if (m_writeNtuple) data.SP[Nt]->setDZDR(dZdR);
/// if we are exceeding the SP capacity of our data object,
/// make it resize its vectors. Will add 50 slots by default,
/// so rarely should happen more than once per event.
@@ -1904,6 +1956,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
/// average value of 1/tan(theta), approximate the slope at the location of the central space point
float meanOneOverTanTheta = (Tzb+data.Tz[t])/2.;
+ float theta = 0.;
+ if(m_writeNtuple){
+ /// theta estimate of the seed based on the average value of 1/tan(theta)
+ theta = atan(1./meanOneOverTanTheta);
+ }
/// squared error on the difference in tan(theta) due to space point position errors.
float sigmaSquaredSpacePointErrors = Erb+data.Er[t] /// pre-computed individual squared errors on 1/tan(theta) for the two segments
+ 2. * covz0 * data.R[t]*data.R[b] /// mixed term with z-uncertainty on central SP
@@ -1956,7 +2013,6 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
* pt. This refines the cut applied above, following the same logic ("delta² - sigma² ?<=0")
**/
if (BSquare > ipt2K*onePlusAsquare || remainingSquaredDelta*onePlusAsquare > BSquare*sigmaSquaredScatteringPtDependent) continue;
-
/** This is an estimate of the transverse impact parameter.
* The reasoning is that, in the x-y frame with the central SP as origin and
* the x axis pointing away from the IP, we have for the distance between
@@ -1992,11 +2048,18 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
/// deviate from a straight line in r-z
data.SP[t]->setScorePenalty(std::abs((Tzb-data.Tz[t])/(dr*sTzb2)));
data.SP[t]->setParam(d0);
+
+ if(m_writeNtuple){
+ /// set parameters for ntuple writing
+ data.SP[t]->setEta(-log(tan(0.5*theta)));
+ data.SP[t]->setPt(std::sqrt(onePlusAsquare/BSquare)/(1000*data.K));
+ }
/// record one possible seed candidate, sort by the curvature
data.CmSp.emplace_back(std::make_pair(B/std::sqrt(onePlusAsquare), data.SP[t]));
/// store the transverse IP, will later be used as a quality estimator
}
+
} ///< end loop over top space point candidates
/// now apply further cleaning on the seed candidates for this central+bottom pair.
if (!data.CmSp.empty()) {
@@ -2006,6 +2069,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
///record seeds found in this run
fillSeeds(data);
nseed += data.fillOneSeeds;
+
} ///< end loop over central SP
}
@@ -2386,6 +2450,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newOneSeedWithCurvaturesComparison
void InDet::SiSpacePointsSeedMaker_ATLxk::fillSeeds(EventData& data) const
{
+
data.fillOneSeeds = 0;
std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator it_firstSeedCandidate = data.mapOneSeeds_Pro.begin();
@@ -2442,6 +2507,7 @@ const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ATLxk::next(const
}
/// iterate until we find a valid seed satisfying certain quality cuts in set3
} while (!(*data.i_seed_Pro++).set3(data.seedOutput));
+
/// then return this next seed candidate
return &data.seedOutput;
} else {
@@ -2456,6 +2522,50 @@ const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ATLxk::next(const
return nullptr;
}
+///////////////////////////////////////////////////////////////////////////////////
+/// Method to write ntuple entries for an input seed
+///////////////////////////////////////////////////////////////////////////////////
+void InDet::SiSpacePointsSeedMaker_ATLxk::writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const{
+
+ if(m_writeNtuple) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+
+ if(track != nullptr) {
+ m_trackPt = (track->trackParameters()->front()->pT())/1000.;
+ m_trackEta = std::abs(track->trackParameters()->front()->eta());
+ }
+ else {
+ m_trackPt = -1.;
+ m_trackEta = -1.;
+ }
+ m_d0 = seed->d0();
+ m_z0 = seed->zVertex();
+ m_eta = seed->eta();
+ m_x1 = seed->x1();
+ m_x2 = seed->x2();
+ m_x3 = seed->x3();
+ m_y1 = seed->y1();
+ m_y2 = seed->y2();
+ m_y3 = seed->y3();
+ m_z1 = seed->z1();
+ m_z2 = seed->z2();
+ m_z3 = seed->z3();
+ m_r1 = seed->r1();
+ m_r2 = seed->r2();
+ m_r3 = seed->r3();
+ m_type = seedType;
+ m_dzdr_b = seed->dzdr_b();
+ m_dzdr_t = seed->dzdr_t();
+ m_pt = seed->pt();
+ m_givesTrack = !(track == nullptr);
+ m_eventNumber = eventNumber;
+
+ m_outputTree->Fill();
+
+ }
+
+}
+
bool InDet::SiSpacePointsSeedMaker_ATLxk::isZCompatible
(EventData& data, const float& Zv, const float& R, const float& T) const
{
@@ -2562,3 +2672,7 @@ bool InDet::SiSpacePointsSeedMaker_ATLxk::isConfirmedSeed(const InDet::SiSpacePo
/// PPS: the confirmation is the only quality modifier applied
else return (quality < 0.);
}
+
+bool InDet::SiSpacePointsSeedMaker_ATLxk::getWriteNtupleBoolProperty() const{
+ return m_writeNtuple;
+}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
index 2c7400366b8640c148bfd0a2b9bfc6a89e1d75c4..3ebae905d6da30034210aa09f9f44e5155a20c2b 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
@@ -1216,3 +1216,10 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::initializeEventData(EventData& data)
0, // sizeRFZV not used
false); // checkEta not used
}
+
+void InDet::SiSpacePointsSeedMaker_BeamGas::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+}
+
+bool InDet::SiSpacePointsSeedMaker_BeamGas::getWriteNtupleBoolProperty() const{
+ return false;
+}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
index bbfc2e54f2528a1547fd12462d1a121ff6416b98..d1ef2528e3d3cb6ae4e6d75486bb3b7efb3b68ab 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
@@ -1160,3 +1160,10 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::initializeEventData(EventData& data)
0, // sizeRFZV not used
false); // checkEta not used
}
+
+void InDet::SiSpacePointsSeedMaker_Cosmic::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+}
+
+bool InDet::SiSpacePointsSeedMaker_Cosmic::getWriteNtupleBoolProperty() const{
+ return false;
+}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index 423b40ddfde67c2e3daebc184356c9adcdddd03c..297a3a60f3a2439a409b536a56f8cffc4ce9afcf 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -1743,3 +1743,10 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::initializeEventData(EventData& data
SizeRFZV,
false); // checkEta not used
}
+
+void InDet::SiSpacePointsSeedMaker_HeavyIon::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+}
+
+bool InDet::SiSpacePointsSeedMaker_HeavyIon::getWriteNtupleBoolProperty() const{
+ return false;
+}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index acc9bb73cea63d1b0ced23e61bf19f2ecd54dd1b..aabcf9cd6415bb2a84e71e2240de0e839243c46f 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -2077,3 +2077,10 @@ void InDet::SiSpacePointsSeedMaker_ITK::initializeEventData(EventData& data) con
SizeRFZV,
m_checketa);
}
+
+void InDet::SiSpacePointsSeedMaker_ITK::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+}
+
+bool InDet::SiSpacePointsSeedMaker_ITK::getWriteNtupleBoolProperty() const{
+ return false;
+}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
index 3f075123c6b24a105e41f0ac216f349ea5da8248..b0fb2dc7cd742b17d4c6933749d32ff19ee8ed9f 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
@@ -1184,3 +1184,10 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::initializeEventData(EventData& d
0, // sizeRFZV not used
false); // checkEta not used
}
+
+void InDet::SiSpacePointsSeedMaker_LowMomentum::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+}
+
+bool InDet::SiSpacePointsSeedMaker_LowMomentum::getWriteNtupleBoolProperty() const{
+ return false;
+}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
index 61db8694e7a55ebb3f8a1c656487686e2ce2e99c..4bae1bd01ec682005ac62d5b985699526de4d759 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
@@ -1664,3 +1664,10 @@ void InDet::SiSpacePointsSeedMaker_Trigger::initializeEventData(EventData& data)
SizeRFZV,
false); // checkEta not used
}
+
+void InDet::SiSpacePointsSeedMaker_Trigger::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+}
+
+bool InDet::SiSpacePointsSeedMaker_Trigger::getWriteNtupleBoolProperty() const{
+ return false;
+}
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
index ac26da25831ace94f4454b8eb03941a7b3a60bc9..8c775c0772e8400d898336a2d297db7b49139046 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
@@ -565,8 +565,8 @@ void InDet::SiTrackMaker_xk::newTrigEvent(const EventContext& ctx, SiTrackMakerE
data.inputseeds() = 0;
data.goodseeds() = 0;
data.findtracks() = 0;
- for(int i=0; i!=SiCombinatorialTrackFinderData_xk::kNStatAllTypes; ++i) { for(int k = 0; k!=SiCombinatorialTrackFinderData_xk::kNSeedTypes; ++k) data.summaryStatAll()[i][k]; }
- for(int i=0; i!=SiCombinatorialTrackFinderData_xk::kNStatEtaTypes; ++i) { for(int k = 0; k!=SiCombinatorialTrackFinderData_xk::kNSeedTypes; ++k) { for(int r=0; r!=SiCombinatorialTrackFinderData_xk::kNRapidityRanges; ++r) data.summaryStatUsedInTrack()[i][k][r]; } }
+ for(int i=0; i!=SiCombinatorialTrackFinderData_xk::kNStatAllTypes; ++i) { for(int k = 0; k!=SiCombinatorialTrackFinderData_xk::kNSeedTypes; ++k) data.summaryStatAll()[i][k] = 0.; }
+ for(int i=0; i!=SiCombinatorialTrackFinderData_xk::kNStatEtaTypes; ++i) { for(int k = 0; k!=SiCombinatorialTrackFinderData_xk::kNSeedTypes; ++k) { for(int r=0; r!=SiCombinatorialTrackFinderData_xk::kNRapidityRanges; ++r) data.summaryStatUsedInTrack()[i][k][r] = 0.; } }
}
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadMaker_xk.h b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadMaker_xk.h
index d796ec9c561793bf18d15d5e1ba07fb441054b1f..07029028690ef515afbc0f8e3147bf12043661ef 100755
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadMaker_xk.h
+++ b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadMaker_xk.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -24,7 +24,6 @@
#include "GaudiKernel/AlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
index 5dfd012a6a7b5402068ca9b3750dc5edf276de49..807d2a228dfdc0ad3be8d784e573abb8e0f8b48e 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -31,9 +31,6 @@
#include "StoreGate/ReadHandle.h"
-#include "GeoPrimitives/GeoPrimitives.h"
-#include "EventPrimitives/EventPrimitives.h"
-
#include "StoreGate/ReadCondHandle.h"
///////////////////////////////////////////////////////////////////
// Constructior
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h
index aac420af67845254a12bfb9db73a7ca4de0678f0..a64507eec7077a02fef27d4ef6317062fa863074 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h
@@ -11,7 +11,6 @@
#include "AthenaBaseComps/AthAlgTool.h" // Exchange IN
-#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx
index 2810f8fdac754f730f474f91a9eb1352c5da9fc3..036c664c57f52d363d5c9635317c399ae4cc43ec 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx
@@ -9,7 +9,6 @@
#include "TrkTrack/Track.h"
#include "TrkTrack/TrackCollection.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
-#include "TrkToolInterfaces/ITrackAmbiguityProcessorTool.h"
#include "TrkEventPrimitives/FitQuality.h"
#include "TrkParameters/TrackParameters.h"
#include "TrigNavigation/NavigationCore.icc"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx
index 8ceff5d7c5583d8f05db3bebe605bd374fe10600..99bcf295dc47f66634b5cb052d5600bebff93b93 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx
@@ -1,5 +1,5 @@
/*
- 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 "InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h"
@@ -19,7 +19,6 @@
#include "TrkParameters/TrackParameters.h"
#include "TrkValTools/TrackDiff.h"
#include "TrkEventPrimitives/TrackStateDefs.h"
-#include "TrkTrack/Track.h"
#include "TrkSurfaces/Surface.h"
#include "InDetIdentifier/SCT_ID.h"
#include "InDetIdentifier/SiliconID.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
index 2ce82cb6394b6bf7a947c7ac00d731ac482befcf..ac36a7e433c7c8f0fa688c7402dfc947d568817c 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////
@@ -33,18 +33,14 @@
//!< Trigger specific stuff
#include "TrigInterfaces/FexAlgo.h"
-
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h"
+#include "InDetRecToolInterfaces/ISiZvertexMaker.h"
+#include "InDetRecToolInterfaces/ISiTrackMaker.h"
//forward declarations
class TrigTimer;
-namespace InDet {
- class ISiSpacePointsSeedMaker;
- class ISiZvertexMaker;
- class ISiTrackMaker;
-}
-
namespace InDet {
//!< Class-algorithm for track finding in Pixels and SCT
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
index 1e4aa94a9b8605521d0532776bf0dde7c4310533..81479d68bfd26558173fac109d12f577e3d77a6a 100644
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
@@ -1,10 +1,5 @@
#include "SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h"
-#include "InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h"
-#include "InDetRecToolInterfaces/ISiZvertexMaker.h"
-#include "InDetRecToolInterfaces/ISiTrackMaker.h"
-#include "IRegionSelector/IRegSelSvc.h"
-
using namespace InDet;
DECLARE_COMPONENT( SiTrigSPSeededTrackFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
index b1d7b62ed071c9697bec5aa953c44ea01dc97658..9149a6dd83cbf70f0eb6d0e3dadedae8c909043b 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
@@ -1,5 +1,4 @@
#include "TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h"
-#include "IRegionSelector/IRegSelSvc.h"
using namespace InDet;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h
index 608abd5e894d87483a0f2ed4c4c9af46e1a6a09d..453d5cf999c93d380b6f64da87def49cb49fc177 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.h
@@ -22,7 +22,6 @@
#include "xAODTracking/TrackParticlexAODHelpers.h"
#include "xAODTruth/TruthParticle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "InDetPlotBase.h"
#include "InDetPhysValMonitoring/ResolutionHelper.h"
#include "TFitResultPtr.h"
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
index 16e22d4e2da9c0aeb7b91b3a14c2d025a2091601..535fd48aa8e5c15ca250ec4464ecf5f1a97d85fa 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
@@ -23,7 +23,6 @@
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackStateValidationContainer.h"
#include "xAODTracking/TrackStateValidation.h"
-#include "xAODTracking/TrackStateValidationContainer.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTruth/TruthParticle.h"
#include "xAODTruth/TruthVertex.h"
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
new file mode 100755
index 0000000000000000000000000000000000000000..eb170383a4192b0e867970e9eee2c4a3fa0c8f30
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+# art-description: Standard test for 2015 data
+# art-type: grid
+# art-include: master/Athena
+# art-output: physval*.root
+# art-output: *.xml
+# art-output: dcube*
+
+# Fix ordering of output in logfile
+exec 2>&1
+run() { (set -x; exec "$@") }
+
+
+lastref_dir=last_results
+artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
+inputBS=${artdata}/RecJobTransformTests/data15_13TeV.00283429.physics_Main.daq.RAW._lb0154._SFO-1._0001.data
+dcubeXml="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/dcube/config/IDPVMPlots_R22.xml"
+dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/ReferenceHistograms/physval_data15_1000evt_reco_r22.root"
+
+# Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
+
+run Reco_tf.py \
+ --inputBSFile "$inputBS" \
+ --maxEvents 1000 \
+ --autoConfiguration everything \
+ --conditionsTag="CONDBR2-BLKPA-2016-14" \
+ --outputAODFile physval.AOD.root \
+ --outputNTUP_PHYSVALFile physval.ntuple.root \
+ --steering doRAWtoALL \
+ --checkEventCount False \
+ --ignoreErrors True \
+ --valid True \
+ --validationFlags doInDet \
+ --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags; \
+ InDetFlags.doSlimming.set_Value_and_Lock(False); rec.doTrigger.set_Value_and_Lock(False); \
+ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags; \
+ InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
+ InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+ rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
+ rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
+ rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
+ rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+ from ParticleBuilderOptions.AODFlags import AODFlags; \
+ AODFlags.ThinGeantTruth.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
+ AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False) '
+rec_tf_exit_code=$?
+echo "art-result: $rec_tf_exit_code reco"
+
+if [ $rec_tf_exit_code -eq 0 ] ;then
+ echo "download latest result"
+ run art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
+ run ls -la "$lastref_dir"
+
+ echo "compare with R22 with nightly build at 2020-12-05"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c ${dcubeXml} \
+ -r ${dcubeRef} \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+
+ echo "compare with last build"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube_last \
+ -c ${dcubeXml} \
+ -r ${lastref_dir}/physval.ntuple.root \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+fi
+
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3efe0fede1c4cb0311442b9eabb4a51ef1186539
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+# art-description: Standard test for 2016 data
+# art-type: grid
+# art-include: master/Athena
+# art-output: physval*.root
+# art-output: *.xml
+# art-output: dcube*
+
+# Fix ordering of output in logfile
+exec 2>&1
+run() { (set -x; exec "$@") }
+
+
+lastref_dir=last_results
+artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
+inputBS=${artdata}/RecJobTransformTests/data16_13TeV.00310809.physics_Main.daq.RAW._lb1219._SFO-2._0001.data
+dcubeXml="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/dcube/config/IDPVMPlots_R22.xml"
+dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/ReferenceHistograms/physval_data16_1000evt_reco_r22.root"
+
+# Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
+
+run Reco_tf.py \
+ --inputBSFile "$inputBS" \
+ --maxEvents 1000 \
+ --autoConfiguration everything \
+ --conditionsTag="CONDBR2-BLKPA-2016-19" \
+ --outputAODFile physval.AOD.root \
+ --outputNTUP_PHYSVALFile physval.ntuple.root \
+ --steering doRAWtoALL \
+ --checkEventCount False \
+ --ignoreErrors True \
+ --valid True \
+ --validationFlags doInDet \
+ --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags; \
+ InDetFlags.doSlimming.set_Value_and_Lock(False); rec.doTrigger.set_Value_and_Lock(False); \
+ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags; \
+ InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
+ InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+ rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
+ rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
+ rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
+ rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+ from ParticleBuilderOptions.AODFlags import AODFlags; \
+ AODFlags.ThinGeantTruth.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
+ AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False) '
+rec_tf_exit_code=$?
+echo "art-result: $rec_tf_exit_code reco"
+
+if [ $rec_tf_exit_code -eq 0 ] ;then
+ echo "download latest result"
+ run art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
+ run ls -la "$lastref_dir"
+
+ echo "compare with R22 with nightly build at 2020-12-05"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c ${dcubeXml} \
+ -r ${dcubeRef} \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+
+ echo "compare with last build"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube_last \
+ -c ${dcubeXml} \
+ -r ${lastref_dir}/physval.ntuple.root \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+fi
+
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
new file mode 100755
index 0000000000000000000000000000000000000000..679554938cd59994482cad40338a2364316dad02
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+# art-description: Standard test for 2017 data
+# art-type: grid
+# art-include: master/Athena
+# art-output: physval*.root
+# art-output: *.xml
+# art-output: dcube*
+
+# Fix ordering of output in logfile
+exec 2>&1
+run() { (set -x; exec "$@") }
+
+
+lastref_dir=last_results
+artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
+inputBS=${artdata}/RecJobTransformTests/data17_13TeV.00324910.physics_Main.daq.RAW._lb0713._SFO-6._0001.data
+dcubeXml="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/dcube/config/IDPVMPlots_R22.xml"
+dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/ReferenceHistograms/physval_data17_1000evt_reco_r22.root"
+
+# Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
+
+run Reco_tf.py \
+ --inputBSFile "$inputBS" \
+ --maxEvents 1000 \
+ --AMI=f1088 \
+ --outputAODFile physval.AOD.root \
+ --outputNTUP_PHYSVALFile physval.ntuple.root \
+ --steering doRAWtoALL \
+ --checkEventCount False \
+ --ignoreErrors True \
+ --valid True \
+ --validationFlags doInDet \
+ --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags; \
+ InDetFlags.doSlimming.set_Value_and_Lock(False); rec.doTrigger.set_Value_and_Lock(False); \
+ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags; \
+ InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
+ InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+ rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
+ rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
+ rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
+ rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+ from ParticleBuilderOptions.AODFlags import AODFlags; \
+ AODFlags.ThinGeantTruth.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
+ AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False) '
+rec_tf_exit_code=$?
+echo "art-result: $rec_tf_exit_code reco"
+
+if [ $rec_tf_exit_code -eq 0 ] ;then
+ echo "download latest result"
+ run art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
+ run ls -la "$lastref_dir"
+
+ echo "compare with R22 with nightly build at 2020-12-05"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c ${dcubeXml} \
+ -r ${dcubeRef} \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+
+ echo "compare with last build"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube_last \
+ -c ${dcubeXml} \
+ -r ${lastref_dir}/physval.ntuple.root \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+fi
+
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9decc003c2f39d162160858053fbd9bac8dee961
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+# art-description: Standard test for 2018 data
+# art-type: grid
+# art-include: master/Athena
+# art-output: physval*.root
+# art-output: *.xml
+# art-output: dcube*
+
+# Fix ordering of output in logfile
+exec 2>&1
+run() { (set -x; exec "$@") }
+
+
+lastref_dir=last_results
+artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
+inputBS=${artdata}/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data
+dcubeXml="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/dcube/config/IDPVMPlots_R22.xml"
+dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/ReferenceHistograms/physval_data18_1000evt_reco_r22.root"
+
+# Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
+
+run Reco_tf.py \
+ --inputBSFile "$inputBS" \
+ --maxEvents 1000 \
+ --AMI=f1089 \
+ --outputAODFile physval.AOD.root \
+ --outputNTUP_PHYSVALFile physval.ntuple.root \
+ --steering doRAWtoALL \
+ --checkEventCount False \
+ --ignoreErrors True \
+ --valid True \
+ --validationFlags doInDet \
+ --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags; \
+ InDetFlags.doSlimming.set_Value_and_Lock(False); rec.doTrigger.set_Value_and_Lock(False); \
+ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags; \
+ InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
+ InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
+ InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+ rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
+ rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
+ rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
+ rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+ from ParticleBuilderOptions.AODFlags import AODFlags; \
+ AODFlags.ThinGeantTruth.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
+ AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
+ AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False) '
+rec_tf_exit_code=$?
+echo "art-result: $rec_tf_exit_code reco"
+
+if [ $rec_tf_exit_code -eq 0 ] ;then
+ echo "download latest result"
+ run art.py download --user=artprod --dst="$lastref_dir" "$ArtPackage" "$ArtJobName"
+ run ls -la "$lastref_dir"
+
+ echo "compare with R22 with nightly build at 2020-12-05"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c ${dcubeXml} \
+ -r ${dcubeRef} \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+
+ echo "compare with last build"
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube_last \
+ -c ${dcubeXml} \
+ -r ${lastref_dir}/physval.ntuple.root \
+ physval.ntuple.root
+ echo "art-result: $? plots"
+fi
+
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h b/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h
index d192e7d7d4440fc9ef9f0f2a082ed2bd70d6c25a..bdc5a1f51c32d00a832bec528d958e0d2b9d75a2 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/InDetRecStatistics/TrackStatHelper.h
@@ -22,7 +22,6 @@
#include "TrkToolInterfaces/IExtendedTrackSummaryTool.h"
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkTruthData/TrackTruthCollection.h"
-#include "TrkTrack/TrackInfo.h"
#include <vector>
#include <string>
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
index 4b3feda323344eea55c8022436aff5a02775f71a..4664cb5e275e4575194a1b0ba1952d8219a34906 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
@@ -68,8 +68,6 @@
#include "AtlasHepMC/GenParticle.h"
#include "TruthHelper/PileUpType.h"
-#include "IdDictDetDescr/IdDictManager.h"
-
@@ -298,7 +296,7 @@ StatusCode InDet::InDetRecStatisticsAlg::execute(const EventContext &ctx) const
// apply pt, eta etc cuts to generated tracks
// devide generated tracks into primary, truncated, secondary
- std::vector <std::pair<HepMC::GenParticle *,int> > GenSignal;
+ std::vector <std::pair<HepMC::GenParticlePtr,int> > GenSignal;
// GenSignalPrimary, GenSignalTruncated, GenSignalSecondary;
unsigned int inTimeStart = 0;
unsigned int inTimeEnd = 0;
@@ -583,7 +581,7 @@ void InDet::InDetRecStatisticsAlg::selectRecSignal(const TrackCollection* RecCol
// select charged, stable particles in allowed pt and eta range
void InDet :: InDetRecStatisticsAlg ::
selectGenSignal (const McEventCollection* SimTracks,
- std::vector <std::pair<HepMC::GenParticle *,int> > & GenSignal,
+ std::vector <std::pair<HepMC::GenParticlePtr,int> > & GenSignal,
unsigned int /*inTimeStart*/, unsigned int /*inTimeEnd*/,
InDet::InDetRecStatisticsAlg::CounterLocal &counter) const //'unused' compiler warning
{
@@ -604,7 +602,11 @@ selectGenSignal (const McEventCollection* SimTracks,
for(unsigned int ievt=0; ievt<nb_mc_event; ++ievt)
{
const HepMC::GenEvent* genEvent = SimTracks->at(ievt);
- counter.m_counter[kN_gen_tracks_processed] += ((SimTracks->at(ievt)))->particles_size();
+#ifdef HEPMC3
+ counter.m_counter[kN_gen_tracks_processed] += genEvent->particles().size();
+#else
+ counter.m_counter[kN_gen_tracks_processed] += genEvent->particles_size();
+#endif
if (put && inTimeMBbegin != inTimeMBend) // if not, inTimeStart and End are untouched
{
//if (genEvent == *inTimeMBbegin) inTimeStart = ievt;
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx
index 1f9d5946e2021f86942667d7808aa21c72f20054..1b6dc9c8237978af7b30588042aed0501a6eacab 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx
@@ -131,7 +131,7 @@ void InDet::TrackStatHelper::SetCuts(struct cuts ct)
void InDet::TrackStatHelper::addEvent(const TrackCollection * recTracks,
std::vector <const Trk::Track *> & rec,
Trk::PRDtoTrackMap *prd_to_track_map,
- std::vector <std::pair<HepMC::GenParticle *,int> > & gen,
+ std::vector <std::pair<HepMC::GenParticlePtr,int> > & gen,
const TrackTruthCollection * truthMap,
const AtlasDetectorID * const idHelper,
const PixelID * pixelID,
@@ -274,8 +274,11 @@ void InDet::TrackStatHelper::addEvent(const TrackCollection * recTr
}
else {
//classify track as coming from primary, secondary or truncated gen particle
- // if(HMPL.isValid()){
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr particle = HMPL.scptr();
+#else
const HepMC::GenParticle *particle = HMPL.cptr();
+#endif
recoClassification = ClassifyParticle(particle, trprob);
if (trprob < m_cuts.fakeTrackCut)
@@ -407,15 +410,14 @@ void InDet::TrackStatHelper::addEvent(const TrackCollection * recTr
Eta = 0;
Region = ETA_ALL;
int classification=-999;
- for (std::vector <std::pair<HepMC::GenParticle *,int> >::const_iterator truth = gen.begin(); truth != gen.end(); ++truth) {
+ for (auto truth = gen.begin(); truth != gen.end(); ++truth) {
classification=-999;
- bool inTimePileup = truth->second == 0
- || (truth->second >= (int)*inTimeStart && truth->second <= (int)*inTimeEnd);
+ bool inTimePileup = truth->second == 0 || (truth->second >= (int)*inTimeStart && truth->second <= (int)*inTimeEnd);
- HepMC::GenParticle * const particle = truth->first;
+ auto particle = truth->first;
//determine eta region
- Eta = fabs(particle->momentum().pseudoRapidity());
+ Eta = std::abs(particle->momentum().pseudoRapidity());
if (Eta < m_cuts.maxEtaBarrel) Region = ETA_BARREL;
else if (Eta < m_cuts.maxEtaTransition) Region = ETA_TRANSITION;
else if (Eta < m_cuts.maxEtaEndcap) Region = ETA_ENDCAP;
@@ -494,17 +496,17 @@ void InDet::TrackStatHelper::addEvent(const TrackCollection * recTr
Region = ETA_ALL;
classification=-999;
- for (std::vector <std::pair<HepMC::GenParticle *,int> >::const_iterator truth = gen.begin(); truth != gen.end(); ++truth)
+ for (auto truth = gen.begin(); truth != gen.end(); ++truth)
{
if (truth->second != 0) // only signal event GenParticles
continue;
classification=-999;
- HepMC::GenParticle * const particle = truth->first;
+ auto particle = truth->first;
//determine eta region
- Eta = fabs(particle->momentum().pseudoRapidity());
+ Eta = std::abs(particle->momentum().pseudoRapidity());
if (Eta < m_cuts.maxEtaBarrel) Region = ETA_BARREL;
else if (Eta < m_cuts.maxEtaTransition) Region = ETA_TRANSITION;
else if (Eta < m_cuts.maxEtaEndcap) Region = ETA_ENDCAP;
@@ -868,7 +870,7 @@ bool InDet::TrackStatHelper::PassTrackCuts(const Trk::TrackParameters *para) con
}
-int InDet::TrackStatHelper::ClassifyParticle( const HepMC::GenParticle *particle, const double prob) const {
+int InDet::TrackStatHelper::ClassifyParticle( HepMC::ConstGenParticlePtr particle, const double prob) const {
int partClass=-999;
diff --git a/LArCalorimeter/LArCellRec/python/LArCollisionTimeConfig.py b/LArCalorimeter/LArCellRec/python/LArCollisionTimeConfig.py
index b78b5eb870c791433275d33ad34f058ecde859aa..75b9be3ebd216a1d09cfe46b1e9b2e9fbe724623 100644
--- a/LArCalorimeter/LArCellRec/python/LArCollisionTimeConfig.py
+++ b/LArCalorimeter/LArCellRec/python/LArCollisionTimeConfig.py
@@ -9,6 +9,11 @@ def LArCollisionTimeCfg(configFlags, cutIteration=False):
result=ComponentAccumulator()
+ from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg
+ result.merge(BunchCrossingCondAlgCfg(configFlags))
+ from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
+ result.merge(CaloNoiseCondAlgCfg(configFlags,"totalNoise"))
+
LArCollisionTimeAlg=CompFactory.LArCollisionTimeAlg
result.addEventAlgo(LArCollisionTimeAlg("LArCollisionTimeAlg",
isMC=configFlags.Input.isMC,
diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArByteStreamConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArByteStreamConfig.py
index cad5f10f176985535d9ba709db2b004cfd639c1f..6ffba323d0f120218fb29d36c4e608d16d7da914 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArByteStreamConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArByteStreamConfig.py
@@ -1,19 +1,17 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from LArByteStream.LArByteStreamConf import LArRawDataContByteStreamTool
-
+from AthenaConfiguration.ComponentFactory import CompFactory
def LArRawDataContByteStreamToolConfig (name="LArRawDataContByteStreamTool",
InitializeForWriting = False,
stream=None,
**kwargs):
- tool = LArRawDataContByteStreamTool (name, **kwargs)
+ tool = CompFactory.LArRawDataContByteStreamTool (name, **kwargs)
if InitializeForWriting:
- from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
from LArCabling.LArCablingAccess import LArOnOffIdMapping, LArFebRodMapping
- noisealg = CaloNoiseCondAlg ('totalNoise')
+ noisealg = CompFactory.CaloNoiseCondAlg ('totalNoise')
LArOnOffIdMapping()
LArFebRodMapping()
if stream:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderReader.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderReader.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6a7add13835ff5468c3500bd26bfd48395f185dc
--- /dev/null
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderReader.cxx
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArRawEvent/LArFebHeader.h"
+#include "LArByteStream/LArRodBlockStructure.h"
+#include "LArFebHeaderReader.h"
+
+
+void LArFebHeaderReader::fillFebHeader(LArFebHeader* larFebHeader, //output
+ const LArRodBlockStructure* rodBlock, //input
+ const ROBFragment& rob) { //input
+ larFebHeader->SetFormatVersion(rob.rod_version());
+ larFebHeader->SetSourceId(rob.rod_source_id());
+ larFebHeader->SetRunNumber(rob.rod_run_no());
+ larFebHeader->SetELVL1Id(rob.rod_lvl1_id());
+ larFebHeader->SetBCId(rob.rod_bc_id());
+ larFebHeader->SetLVL1TigType(rob.rod_lvl1_trigger_type());
+ larFebHeader->SetDetEventType(rob.rod_detev_type());
+
+ //set DSP data
+ const unsigned nsample=rodBlock->getNumberOfSamples();
+ larFebHeader->SetRodStatus(rodBlock->getStatus());
+ larFebHeader->SetDspCodeVersion(rodBlock->getDspCodeVersion());
+ larFebHeader->SetDspEventCounter(rodBlock->getDspEventCounter());
+ larFebHeader->SetRodResults1Size(rodBlock->getResults1Size());
+ larFebHeader->SetRodResults2Size(rodBlock->getResults2Size());
+ larFebHeader->SetRodRawDataSize(rodBlock->getRawDataSize());
+ larFebHeader->SetNbSweetCells1(rodBlock->getNbSweetCells1());
+ larFebHeader->SetNbSweetCells2(rodBlock->getNbSweetCells2());
+ larFebHeader->SetNbSamples(nsample);
+ larFebHeader->SetOnlineChecksum(rodBlock->onlineCheckSum());
+ larFebHeader->SetOfflineChecksum(rodBlock->offlineCheckSum());
+
+ if(!rodBlock->hasControlWords()) {
+ larFebHeader->SetFebELVL1Id(rob.rod_lvl1_id());
+ larFebHeader->SetFebBCId(rob.rod_bc_id());
+ } else {
+ const uint16_t evtid = rodBlock->getCtrl1(0) & 0x1f;
+ const uint16_t bcid = rodBlock->getCtrl2(0) & 0x1fff;
+ larFebHeader->SetFebELVL1Id(evtid);
+ larFebHeader->SetFebBCId(bcid);
+ for(int iadc=0;iadc<16;iadc++) {
+ larFebHeader->SetFebCtrl1(rodBlock->getCtrl1(iadc));
+ larFebHeader->SetFebCtrl2(rodBlock->getCtrl2(iadc));
+ larFebHeader->SetFebCtrl3(rodBlock->getCtrl3(iadc));
+ }
+ for(unsigned int i = 0; i<nsample; i++ ) {
+ larFebHeader->SetFebSCA(rodBlock->getRadd(0,i) & 0xff);
+ }
+ }//end else no control words
+
+ return;
+}
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderReader.h b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderReader.h
new file mode 100644
index 0000000000000000000000000000000000000000..81315eace8fce05a5e43517fd81e310b1b01cd04
--- /dev/null
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderReader.h
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "ByteStreamData/RawEvent.h"
+
+class LArFebHeader;
+class LArRodBlockStructure;
+
+namespace LArFebHeaderReader{
+
+ using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
+
+ /**
+ * @brief Fill info for one FEB Header
+ * @param lfh Pointer ot the FEB header obj to fill
+ * @param bl Pointer to the input RodBlockStructure
+ * @param robFrag Pointer to the input ROB Fragment
+ *
+ * Extracts a bunch of control words, etc from the
+ * byte stream objects LArRodBlockStructure and
+ * ROBFragment and stores them in a FebHeader object
+ *
+ */
+ void fillFebHeader(LArFebHeader* lfh, const LArRodBlockStructure* bl, const ROBFragment& robFrag);
+} //namespace
+
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.cxx
index b46998e765336d7fa16900f01fc61680e5578a5a..9a5f8f256e23b4f068f45c3e0d43e03e85ac18ca 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.cxx
@@ -17,6 +17,8 @@
#include "LArByteStream/LArRodBlockCalibrationV3.h"
#include "LArByteStream/LArRodBlockTransparentV0.h"
+#include "LArFebHeaderReader.h"
+
LArRawCalibDataReadingAlg::LArRawCalibDataReadingAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthReentrantAlgorithm(name, pSvcLocator) {}
@@ -265,45 +267,7 @@ StatusCode LArRawCalibDataReadingAlg::execute(const EventContext& ctx) const {
//Decode FebHeaders (if requested)
if (m_doFebHeaders) {
std::unique_ptr<LArFebHeader> larFebHeader(new LArFebHeader(fId));
- larFebHeader->SetFormatVersion(rob.rod_version());
- larFebHeader->SetSourceId(rob.rod_source_id());
- larFebHeader->SetRunNumber(rob.rod_run_no());
- larFebHeader->SetELVL1Id(rob.rod_lvl1_id());
- larFebHeader->SetBCId(rob.rod_bc_id());
- larFebHeader->SetLVL1TigType(rob.rod_lvl1_trigger_type());
- larFebHeader->SetDetEventType(rob.rod_detev_type());
-
- //set DSP data
- const unsigned nsample=rodBlock->getNumberOfSamples();
- larFebHeader->SetRodStatus(rodBlock->getStatus());
- larFebHeader->SetDspCodeVersion(rodBlock->getDspCodeVersion());
- larFebHeader->SetDspEventCounter(rodBlock->getDspEventCounter());
- larFebHeader->SetRodResults1Size(rodBlock->getResults1Size());
- larFebHeader->SetRodResults2Size(rodBlock->getResults2Size());
- larFebHeader->SetRodRawDataSize(rodBlock->getRawDataSize());
- larFebHeader->SetNbSweetCells1(rodBlock->getNbSweetCells1());
- larFebHeader->SetNbSweetCells2(rodBlock->getNbSweetCells2());
- larFebHeader->SetNbSamples(nsample);
- larFebHeader->SetOnlineChecksum(rodBlock->onlineCheckSum());
- larFebHeader->SetOfflineChecksum(rodBlock->offlineCheckSum());
-
- if(!rodBlock->hasControlWords()) {
- larFebHeader->SetFebELVL1Id(rob.rod_lvl1_id());
- larFebHeader->SetFebBCId(rob.rod_bc_id());
- } else {
- const uint16_t evtid = rodBlock->getCtrl1(0) & 0x1f;
- const uint16_t bcid = rodBlock->getCtrl2(0) & 0x1fff;
- larFebHeader->SetFebELVL1Id(evtid);
- larFebHeader->SetFebBCId(bcid);
- for(int iadc=0;iadc<16;iadc++) {
- larFebHeader->SetFebCtrl1(rodBlock->getCtrl1(iadc));
- larFebHeader->SetFebCtrl2(rodBlock->getCtrl2(iadc));
- larFebHeader->SetFebCtrl3(rodBlock->getCtrl3(iadc));
- }
- for(unsigned int i = 0; i<nsample; i++ ) {
- larFebHeader->SetFebSCA(rodBlock->getRadd(0,i) & 0xff);
- }
- }//end else no control words
+ LArFebHeaderReader::fillFebHeader(larFebHeader.get(),rodBlock.get(),rob);
febHeaders->push_back(std::move(larFebHeader));
}//end if m_doFebHeaders
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx
index a2eb93e5d53b64770833577deee7cd64e2cc6fe1..7b93f2b3c1acf4a4db75f9a708f6ad0badcb842f 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx
@@ -15,6 +15,9 @@
#include "LArByteStream/LArRodBlockPhysicsV5.h"
#include "LArByteStream/LArRodBlockPhysicsV6.h"
+#include "LArFebHeaderReader.h"
+
+
LArRawDataReadingAlg::LArRawDataReadingAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthReentrantAlgorithm(name, pSvcLocator) {}
@@ -212,45 +215,7 @@ StatusCode LArRawDataReadingAlg::execute(const EventContext& ctx) const {
//Decode FebHeaders (if requested)
if (m_doFebHeaders) {
std::unique_ptr<LArFebHeader> larFebHeader(new LArFebHeader(fId));
- larFebHeader->SetFormatVersion(rob.rod_version());
- larFebHeader->SetSourceId(rob.rod_source_id());
- larFebHeader->SetRunNumber(rob.rod_run_no());
- larFebHeader->SetELVL1Id(rob.rod_lvl1_id());
- larFebHeader->SetBCId(rob.rod_bc_id());
- larFebHeader->SetLVL1TigType(rob.rod_lvl1_trigger_type());
- larFebHeader->SetDetEventType(rob.rod_detev_type());
-
- //set DSP data
- const unsigned nsample=rodBlock->getNumberOfSamples();
- larFebHeader->SetRodStatus(rodBlock->getStatus());
- larFebHeader->SetDspCodeVersion(rodBlock->getDspCodeVersion());
- larFebHeader->SetDspEventCounter(rodBlock->getDspEventCounter());
- larFebHeader->SetRodResults1Size(rodBlock->getResults1Size());
- larFebHeader->SetRodResults2Size(rodBlock->getResults2Size());
- larFebHeader->SetRodRawDataSize(rodBlock->getRawDataSize());
- larFebHeader->SetNbSweetCells1(rodBlock->getNbSweetCells1());
- larFebHeader->SetNbSweetCells2(rodBlock->getNbSweetCells2());
- larFebHeader->SetNbSamples(nsample);
- larFebHeader->SetOnlineChecksum(rodBlock->onlineCheckSum());
- larFebHeader->SetOfflineChecksum(rodBlock->offlineCheckSum());
-
- if(!rodBlock->hasControlWords()) {
- larFebHeader->SetFebELVL1Id(rob.rod_lvl1_id());
- larFebHeader->SetFebBCId(rob.rod_bc_id());
- } else {
- const uint16_t evtid = rodBlock->getCtrl1(0) & 0x1f;
- const uint16_t bcid = rodBlock->getCtrl2(0) & 0x1fff;
- larFebHeader->SetFebELVL1Id(evtid);
- larFebHeader->SetFebBCId(bcid);
- for(int iadc=0;iadc<16;iadc++) {
- larFebHeader->SetFebCtrl1(rodBlock->getCtrl1(iadc));
- larFebHeader->SetFebCtrl2(rodBlock->getCtrl2(iadc));
- larFebHeader->SetFebCtrl3(rodBlock->getCtrl3(iadc));
- }
- for(unsigned int i = 0; i<nsample; i++ ) {
- larFebHeader->SetFebSCA(rodBlock->getRadd(0,i) & 0xff);
- }
- }//end else no control words
+ LArFebHeaderReader::fillFebHeader(larFebHeader.get(),rodBlock.get(),rob);
febHeaders->push_back(std::move(larFebHeader));
}//end if m_doFebHeaders
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCondFlags.py b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCondFlags.py
index a809b87757ccfb3ec2ede6f0222b7ca9447bd11e..7b17f47c9a261b8fa72b77d0a10e878b51591b5a 100644
--- a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCondFlags.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCondFlags.py
@@ -468,7 +468,7 @@ class LArCondFlags(JobPropertyContainer):
# set the tag for FebRodMap
if "/LAR/Identifier/FebRodMap" in self.LArCondFolderTags():
- self._log.info(' using user specified tag for /LAR/Identifier/FebRodMap' , self.LArCondFolderTags()['/LAR/Identifier/FebRodMap'])
+ self._log.info(' using user specified tag for /LAR/Identifier/FebRodMap %s' , self.LArCondFolderTags()['/LAR/Identifier/FebRodMap'])
else :
if DDVtype=="" or DDVtype not in self.DDVtoFebRodIdMCTag():
diff --git a/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.cxx
index dc9494549db0e60f222b0e69c92b7fc288db9f90..7b49c6b80bfc6252eb1178ca55a910d78410b2c0 100755
--- a/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.cxx
@@ -133,7 +133,7 @@ StatusCode LArFEBMonAlg::fillHistograms(const EventContext& ctx) const {
const ToolHandle<Trig::TrigDecisionTool> trigTool=getTrigDecisionTool();
//const Trig::TrigDecisionTool *trigTool = dynamic_cast<const Trig::TrigDecisionTool * > (&*trigHdl);
std::vector<std::string> l1triggers;
- if(trigTool) {
+ if(!trigTool.empty()) {
const Trig::ChainGroup* allL1 = trigTool->getChainGroup("L1_.*");
l1triggers = allL1->getListOfTriggers();
ATH_MSG_DEBUG( "lvl1 item names: [" );
@@ -382,13 +382,15 @@ StatusCode LArFEBMonAlg::fillHistograms(const EventContext& ctx) const {
auto streambin=Monitored::Scalar<float>("streamBin",-1);
- unsigned ie;
+ unsigned ie(0);
for(unsigned int str=0; str<streamsThisEvent.size(); ++str) {
if(streamsThisEvent[str] > m_streams.size()) break;
if(trigok && streamsThisEvent[str] < m_streams.size() && (m_streams[streamsThisEvent[str]].find("CosmicCalo") != std::string::npos)) { // test excluding events
- for(ie=0; ie<m_excoscalo.size(); ++ie) {
- if(getTrigDecisionTool()->isPassed(m_excoscalo[ie])) break;
- }
+ if (!getTrigDecisionTool().empty()) {
+ for(ie=0; ie<m_excoscalo.size(); ++ie) {
+ if(getTrigDecisionTool()->isPassed(m_excoscalo[ie])) break;
+ }
+ }
if(ie<m_excoscalo.size()) {
ATH_MSG_INFO("Skipping "<<m_excoscalo[ie]<<" for CosmicCalo ");
continue; // we should skip this trigger
diff --git a/LArCalorimeter/LArMonitoring/src/LArNoiseCorrelationMonAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArNoiseCorrelationMonAlg.cxx
index bce34abd1dde3711fb63d4678c1fb65f07b81f29..ad22286bf609a7f296916b0c86b681f30b96de46 100644
--- a/LArCalorimeter/LArMonitoring/src/LArNoiseCorrelationMonAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArNoiseCorrelationMonAlg.cxx
@@ -136,7 +136,7 @@ LArNoiseCorrelationMonAlg::fillHistograms(const EventContext& ctx) const
const ToolHandle<Trig::TrigDecisionTool> trigTool=getTrigDecisionTool();
bool passBCID;
- if(trigTool) {
+ if(!trigTool.empty()) {
// BCIDs of the abort gap
const int ABORT_GAP_START = 3446;
const int ABORT_GAP_END = 3563;
diff --git a/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.cxx
index 0d6634bb15ad700d3454e83f9fd0c408cda86d66..0c306669a5f9e64fb3f3713587e536c95607875d 100755
--- a/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.cxx
@@ -77,6 +77,7 @@ LArRODMonAlg::initialize() {
ATH_CHECK(m_channelKey_fromDigits.initialize());
ATH_CHECK(m_channelKey_fromBytestream.initialize());
ATH_CHECK(m_digitContainerKey.initialize());
+ ATH_CHECK(m_headerContainerKey.initialize());
ATH_CHECK(m_keyOFC.initialize());
ATH_CHECK(m_keyShape.initialize());
@@ -220,9 +221,8 @@ StatusCode LArRODMonAlg::fillHistograms(const EventContext& ctx) const {
std::set<HWIdentifier> ignoreFEBs;
if (m_doCheckSum || m_doRodStatus) {
- const LArFebHeaderContainer* febCont=NULL;
- StatusCode sc = evtStore()->retrieve(febCont);
- if (sc.isFailure() || !febCont) {
+ const LArFebHeaderContainer* febCont = SG::get(m_headerContainerKey, ctx);
+ if (!febCont) {
ATH_MSG_WARNING( "No LArFEB container found in TDS" );
} else {
LArFebHeaderContainer::const_iterator itFEB = febCont->begin();
diff --git a/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.h b/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.h
index c4b0b017c55e2806fc6fb504604e3f961d532009..055398044d9b015021f9869ccbcec834169485d5 100644
--- a/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.h
+++ b/LArCalorimeter/LArMonitoring/src/LArRODMonAlg.h
@@ -26,6 +26,7 @@ class HWIdentifier;
class LArOnOffIdMapping;
class LArRawChannelContainer;
class LArDigitContainer;
+class LArFebHeaderContainer;
#include <atomic>
#include <fstream>
@@ -134,6 +135,7 @@ private:
SG::ReadHandleKey<LArRawChannelContainer> m_channelKey_fromDigits{this,"LArRawChannelKey_fromDigits","LArRawChannels_FromDigits","SG key of LArRawChannels produced offline"};
SG::ReadHandleKey<LArDigitContainer> m_digitContainerKey{this,"LArDigitContainerKey","FREE","SG key of LArDigitContainer read from Bytestream"};
+ SG::ReadHandleKey<LArFebHeaderContainer> m_headerContainerKey{this,"LArFebHeaderKey","LArFebHeader","SG key of LArFebHeader"};
SG::ReadCondHandleKey<ILArOFC> m_keyOFC{this,"KeyOFC","LArOFC","SG key of LArOFC CDO"};
diff --git a/LumiBlock/LumiBlockComps/CMakeLists.txt b/LumiBlock/LumiBlockComps/CMakeLists.txt
index b28292f863222e428be03ec5b20ea1ad9fedfe1d..0176ae6ca729b45229ed6ae58d02c70f3df0ff38 100644
--- a/LumiBlock/LumiBlockComps/CMakeLists.txt
+++ b/LumiBlock/LumiBlockComps/CMakeLists.txt
@@ -61,24 +61,24 @@ if( NOT XAOD_ANALYSIS )
atlas_add_test( TrigLiveFractionCondAlg_test
SOURCES test/TrigLiveFractionCondAlg_test.cxx
LINK_LIBRARIES GaudiKernel LumiBlockData LumiBlockCompsLib TestTools )
-endif()
-atlas_add_test( LuminosityCondAlgConfig_test
- SCRIPT python -m LumiBlockComps.LuminosityCondAlgConfig
- LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+ atlas_add_test( LuminosityCondAlgConfig_test
+ SCRIPT python -m LumiBlockComps.LuminosityCondAlgConfig
+ LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
-atlas_add_test( LBDurationCondAlgConfig_test
- SCRIPT python -m LumiBlockComps.LBDurationCondAlgConfig
- LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+ atlas_add_test( LBDurationCondAlgConfig_test
+ SCRIPT python -m LumiBlockComps.LBDurationCondAlgConfig
+ LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
-atlas_add_test( TrigLiveFractionCondAlgConfig_test
- SCRIPT python -m LumiBlockComps.TrigLiveFractionCondAlgConfig
- LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+ atlas_add_test( TrigLiveFractionCondAlgConfig_test
+ SCRIPT python -m LumiBlockComps.TrigLiveFractionCondAlgConfig
+ LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
-atlas_add_test( LumiBlockMuWriterConfig_test
- SCRIPT python -m LumiBlockComps.LumiBlockMuWriterConfig
- LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+ atlas_add_test( LumiBlockMuWriterConfig_test
+ SCRIPT python -m LumiBlockComps.LumiBlockMuWriterConfig
+ LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
-atlas_add_test( BunchCrossingCondAlg
- SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/BunchCrossingCondAlgTest.py
- POST_EXEC_SCRIPT " /usr/bin/diff BCData.txt ${CMAKE_CURRENT_SOURCE_DIR}/share/BCData.txt.ref > BC_diff.log " )
+ atlas_add_test( BunchCrossingCondAlg
+ SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/BunchCrossingCondAlgTest.py
+ POST_EXEC_SCRIPT " /usr/bin/diff BCData.txt ${CMAKE_CURRENT_SOURCE_DIR}/share/BCData.txt.ref > BC_diff.log " )
+endif()
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
index b20b0c241d0b4d6ed4ca85cdcf97028955f3a123..b80c338f98637497ff169db18f137d9e1cb7bcf2 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
@@ -51,7 +51,6 @@ public:
static const InterfaceID& interfaceID() { return IID_IAmdcsimrecAthenaSvc; }
virtual StatusCode initialize();
- virtual StatusCode finalize();
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
index dc4189317622daa17fe2c2d4ce9ae8f18c243c31..57ee88cbbe69e3063ce92254d44a63809bc26a72 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
@@ -266,10 +266,7 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
if ( m_EmergencyOut == 1 ) return StatusCode::FAILURE;
return StatusCode::SUCCESS;
}
-
-/// Service finalisation
-StatusCode AmdcsimrecAthenaSvc::finalize(){return StatusCode::SUCCESS;}
-
+
StatusCode AmdcsimrecAthenaSvc::queryInterface( const InterfaceID& riid, void** ppvInterface ) {
if ( IID_IAmdcsimrecAthenaSvc == riid ) {
*ppvInterface = (AmdcsimrecAthenaSvc*)this;
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
index e78595ec08fb2cf6602b86cc3006168ed36f764f..c8418f5d39e9691c258730e3f68f6f2bebe6f2c5 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/AmdcDb/AmdcDb.h
@@ -31,7 +31,6 @@ class AmdcDb final : public AthService, virtual public IRDBAccessSvc {
static const InterfaceID& interfaceID() { return IID_IRDBAccessSvc; }
virtual StatusCode initialize() override;
- virtual StatusCode finalize() override;
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
index ea84217fc16b42caa9e73770efbe1eb8b3c79ac0..bec013addc0ebcce2741704b31d5ae336aa1a5c8 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDb.cxx
@@ -195,9 +195,6 @@ StatusCode AmdcDb::DoUpdatedSvc()
return StatusCode::SUCCESS;
}
-/// Service finalisation
-StatusCode AmdcDb::finalize(){return StatusCode::SUCCESS;}
-
StatusCode AmdcDb::queryInterface(const InterfaceID& riid, void** ppvInterface)
{
if (IID_IRDBAccessSvc == riid)
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
index bae89b19c50f5acc9df9edd517f5c7c1fe5c5a56..909af1d8f0d7871860ed4e0d55e81ccff57bd66d 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/AmdcOracle/AmdcDumpOracle.h
@@ -29,8 +29,7 @@ public:
///////////////////////////////////
StatusCode initialize();
- StatusCode execute();
- StatusCode finalize();
+ StatusCode execute(){return StatusCode::SUCCESS;}
private:
///////////////////////////////////
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
index 7df7f6d4a0adb8f1f9582390dc1461c38f8530df..b018dd56bebe0c9204f5ca420122ee1581d7a94e 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/AmdcDumpOracle.cxx
@@ -374,10 +374,6 @@ StatusCode AmdcDumpOracle::DoIt()
}
-StatusCode AmdcDumpOracle::execute() {return StatusCode::SUCCESS;}
-
-StatusCode AmdcDumpOracle::finalize() {return StatusCode::SUCCESS;}
-
void AmdcDumpOracle::DumpASZT( IRDBAccessSvc* pIRDBAccessSvc, std::string TagAdd, int& Kwarn,int& Kchck){
std::string NameOfTheSet = "ASZT";
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h b/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h
index 88b2bc5d395a154b36711faa583777cf1a97d3a5..a4d8f93e69c8b47425607ac6ca88d54c1308288f 100755
--- a/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/CSCcabling/CSCcabling/CSCcablingSvc.h
@@ -24,13 +24,12 @@ class CSCcablingSvc : public AthService, virtual public IInterface {
public:
CSCcablingSvc(const std::string& name,ISvcLocator* sl);
- virtual ~CSCcablingSvc();
+ virtual ~CSCcablingSvc()=default;
static const InterfaceID& interfaceID() { return IID_ICSCcablingSvc; }
virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvIF);
virtual StatusCode initialize(void);
- virtual StatusCode finalize(void);
/** map offline ROD identifier to online ID */
bool onlineId(const uint16_t subdetectorID, const uint16_t offlineID, uint32_t& rodId) const;
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx b/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx
index 9ab4c909ec53603c0f0bec4cfb1928d7a000f414..744a261245b113037250f5249d1e2dbce0cb3441 100755
--- a/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/CSCcabling/src/CSCcablingSvc.cxx
@@ -22,8 +22,6 @@ CSCcablingSvc::CSCcablingSvc(const std::string& name, ISvcLocator* sl)
declareProperty("Run1Cabling", m_run1 = false);
}
-CSCcablingSvc::~CSCcablingSvc() {}
-
StatusCode CSCcablingSvc::queryInterface(const InterfaceID& riid, void** ppvIF) {
if( IID_ICSCcablingSvc.versionMatch(riid) ) {
@@ -73,10 +71,6 @@ StatusCode CSCcablingSvc::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode CSCcablingSvc::finalize() {
- return StatusCode::SUCCESS;
-}
-
/** map offline ROD identifier to online ID */
bool CSCcablingSvc::onlineId(const uint16_t subDetectorID, const uint16_t offlineID, uint32_t& rodId) const {
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
index ec9d0ac2b929bb3d60a78a71c0ba06bd090973dd..49d51af42e473fb33df51a2d6ed9a1909fd29820 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h
@@ -30,11 +30,10 @@ class RPCcablingServerSvc : public AthService,
public:
// Constructor and other Service methods
RPCcablingServerSvc(const std::string& name, ISvcLocator* svc);
- virtual ~RPCcablingServerSvc() {}
+ virtual ~RPCcablingServerSvc()=default;
virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF) override;
virtual StatusCode initialize(void) override;
- virtual StatusCode finalize(void) override;
// Interface implementation
virtual StatusCode giveCabling(const IRPCcablingSvc*&) const override;
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h
index 1cee8a8785081d4d031e2ae5dfe693a6601ceba2..0b4e05f664ce0a6b7a11ab4e685bd1ddd85148a1 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/TGCcablingServerSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TGCcablingServerSvc_H
@@ -22,11 +22,9 @@ class TGCcablingServerSvc : public AthService,
public:
// Constructor and other Service methods
TGCcablingServerSvc(const std::string& name, ISvcLocator* svc);
- virtual ~TGCcablingServerSvc() {}
+ virtual ~TGCcablingServerSvc()=default;
virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF);
- virtual StatusCode initialize(void);
- virtual StatusCode finalize(void);
// Interface implementation
virtual StatusCode giveCabling( const ITGCcablingSvc*&) const;
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx
index 36bd4892cee8b43df798bc35c4b2a95ccf35fefe..b2594f9dd23fe9f0c25bf7dd5db8fff06af09937 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/RPCcablingServerSvc.cxx
@@ -57,11 +57,6 @@ RPCcablingServerSvc::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode
-RPCcablingServerSvc::finalize() {
- return StatusCode::SUCCESS;
-}
-
StatusCode
RPCcablingServerSvc::giveCabling(const IRPCcablingSvc*& cabling) const {
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
index c61391da535885dd3e09bdf2aa0384a442708efd..ab1e48ba39855f8b15937fe69c955ced466cd14f 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
@@ -30,17 +30,6 @@ TGCcablingServerSvc::queryInterface(const InterfaceID& riid, void** ppvIF)
addRef();
return StatusCode::SUCCESS;
-}
-
-StatusCode
-TGCcablingServerSvc::initialize()
-{
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-TGCcablingServerSvc::finalize() {
- return StatusCode::SUCCESS;
}
StatusCode
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h
index dd353f1136418e3efce91886de881c9ed1b235c4..b640a47dd0d4ee71d432492912c6088371490aa6 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MdtTestCabling.h
@@ -29,10 +29,9 @@ class MdtTestCabling : public AthAlgorithm {
public:
MdtTestCabling(const std::string& name, ISvcLocator* pSvcLocator);
- ~MdtTestCabling();
+ ~MdtTestCabling()=default;
virtual StatusCode initialize();
- virtual StatusCode finalize();
virtual StatusCode execute();
private:
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h
index ad704fbfd4c3c549555c16189928008c7372aa6f..57128e1b00cb1c3d94af1bd5bf4fb4c0e5182123 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingAlg.h
@@ -36,7 +36,6 @@ class MuonMDT_CablingAlg: public AthAlgorithm {
virtual ~MuonMDT_CablingAlg() = default;
virtual StatusCode initialize() override;
virtual StatusCode execute() override;
- virtual StatusCode finalize() override;
private:
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
index 27aadd9b9f9a28616fc9e0ed51bdb2ca46fe823b..183ce2895038b503876287f77b938270a9f30cb1 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
@@ -29,17 +29,9 @@ class MuonMDT_CablingSvc : public AthService ,
public:
MuonMDT_CablingSvc(const std::string& name,ISvcLocator* sl);
- virtual ~MuonMDT_CablingSvc();
+ virtual ~MuonMDT_CablingSvc()=default;
virtual StatusCode initialize() override;
- virtual StatusCode finalize() override;
-
- /** methods called at trigger stop/start */
- // virtual StatusCode start();
- // virtual StatusCode stop();
-
- /** method for begin run transition */
- // virtual void handle(const Incident&);
static const InterfaceID& interfaceID() { return IID_IMuonMDT_CablingSvc; }
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx
index 11ba99136ca32b068250b554bfeab477e5e79bf7..670fb574598276277389ec3052844a681c81f1cd 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx
@@ -10,9 +10,6 @@ MdtTestCabling::MdtTestCabling(const std::string& name, ISvcLocator* pSvcLocator
{
}
-MdtTestCabling::~MdtTestCabling() { }
-
-
StatusCode MdtTestCabling::initialize()
{
ATH_CHECK( m_chronoSvc.retrieve() );
@@ -45,12 +42,6 @@ StatusCode MdtTestCabling::execute()
return StatusCode::SUCCESS;
}
-
-StatusCode MdtTestCabling::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
/** test the map content */
bool MdtTestCabling::testMap()
{
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
index 784b3d7596852b265de9fe3b05bc349a50d394d9..73be45980b2d829938b03947dade25430c30d8c5 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
@@ -286,10 +286,3 @@ StatusCode MuonMDT_CablingAlg::execute(){
return StatusCode::SUCCESS;
}
-
-
-StatusCode MuonMDT_CablingAlg::finalize(){
-
- ATH_MSG_DEBUG( "finalize " << name() );
- return StatusCode::SUCCESS;
-}
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx
index d5f66c5c7d1db0d93b2f7d2073176274f389edfa..39e59a52958b4c5f7beefdd85a010862efcd8ba0 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingSvc.cxx
@@ -39,10 +39,6 @@ AthService(svcName,sl),
declareProperty("doCalStreamInit",m_doCalStreamInit=false);
}
-MuonMDT_CablingSvc::~MuonMDT_CablingSvc()
- { }
-
-
/** Initialization method */
StatusCode MuonMDT_CablingSvc::initialize()
{
@@ -149,14 +145,6 @@ StatusCode MuonMDT_CablingSvc::initialize()
return sc;
}
-/** Finalization method */
-StatusCode MuonMDT_CablingSvc::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-
-
// queryInterface
StatusCode MuonMDT_CablingSvc::queryInterface(const InterfaceID& riid, void** ppvIF)
{
diff --git a/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.h b/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.h
index 261e0e58fef28b24cd35b0047218f61b5bf93248..a8db79c4c973081b1f8acb72a5298b385d99a05e 100755
--- a/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/TGCcabling/TGCcabling/TGCcablingSvc.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
*/
/***************************************************************************
@@ -34,7 +34,7 @@ class TGCcablingSvc : public ITGCcablingSvc
{
public:
TGCcablingSvc (const std::string& name, ISvcLocator* svc);
- virtual ~TGCcablingSvc (void);
+ virtual ~TGCcablingSvc()=default;
static const InterfaceID& interfaceID()
{
diff --git a/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.cxx b/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.cxx
index a2279c279125a1258083bd8f2b154db21fddf293..3f3c10fec9d455030f8257a80e4f2e819bdfa303 100755
--- a/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/TGCcabling/src/TGCcablingSvc.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
*/
/***************************************************************************
@@ -33,9 +33,6 @@ TGCcablingSvc::TGCcablingSvc (const std::string& name, ISvcLocator* svc)
declareProperty("databasePPToSL", m_databasePPToSL="PP2SL.db");
declareProperty("databaseSLBToROD",m_databaseSLBToROD="SLB2ROD.db");
}
-
-TGCcablingSvc::~TGCcablingSvc (void)
-{}
StatusCode TGCcablingSvc::queryInterface(const InterfaceID& riid,void** ppvIF)
{
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
index 19cbbfd44be6b11097c2aaf1e26fb7b5ee4b43cb..897f84aaa4adfab09c767c2671e4bbd6190c8f11 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
#**************************************************************
#
# Csc Pedestal Calibration
@@ -5,37 +7,7 @@
#==============================================================
runNumber = 2147483647
-#Input files:
-#prelimDir = "/raid01/lampen/testarea/Calib/August09CosmicRun/data/preliminaryData/"
-#AugustRunDir = "rfio:/castor/cern.ch/grid/atlas/DAQ/muon/csc/00124401/"
-#myInputFiles = [
-# AugustRunDir + 'data_test.00124401.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-# AugustRunDir + 'data_test.00124401.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-# AugustRunDir + 'data_test.00124401.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data',
-# ]
-
-#SeptRunDir = 'rfio:/castor/cern.ch/grid/atlas/DAQ/muon/csc/00129083/'
-#myInputFiles = [
-# SeptRunDir + 'data_test.00129083.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-# SeptRunDir + 'data_test.00129083.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-# SeptRunDir + 'data_test.00129083.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data',
-# ]
-
-#OctRunDir = '/raid02/lampen/datasets/csc/pedRuns/oct/raw/'
-#OctRUn1
-#myInputFiles = [
-# OctRunDir + 'data_test.00132435.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-# OctRunDir + 'data_test.00132435.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-# OctRunDir + 'data_test.00132435.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data'
-# ]
-
-#OctRun2
-#myInputFiles = [
-# OctRunDir + 'data_test.00133116.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-#OctRunDir + 'data_test.00133116.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-#OctRunDir + 'data_test.00133116.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data'
-#]
NovRunDir="/raid02/lampen/datasets/csc/pedRuns/nov/raw/*.data"
import glob
@@ -125,8 +97,15 @@ printfunc (MuonCscRawDataProviderTool)
# --- RawData Provider
from MuonByteStream.MuonByteStreamConf import Muon__CscRawDataProvider
-topSequence += Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
- ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+cscRawDataProvider = Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
+ ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_CSC
+cscRawDataProvider.RegionSelectionTool = makeRegSelTool_CSC()
+
+topSequence += cscRawDataProvider
+
printfunc (topSequence.MuonCscRawDataProvider)
# --- BS Converter
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
index d549f9c85cec2779b9c4d9f506f9bc3704aefce0..37061490c33c38a0fc54c660b7994ecd6f845449 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
runNumber = 2147483647
if('inputPat' not in dir()):
@@ -6,20 +8,6 @@ if('inputPat' not in dir()):
import glob
myInputFiles = glob.glob(inputPat)
-#Lots of pulses
-#defInputFile = "/afs/cern.ch/user/l/lampen/public/bytestreamTest/daq.cal.0079571.No.Streaming.LB0000.CSC-EB._0001.data"
-#myGeometryTag = 'ATLAS-GEO-01-00-00'
-#myIsCosmics = False
-#Old Cosmics
-#defInputFile = "rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001209_file01.data"
-#myGeometryTag = "MuonSpectrometer-CSC-CS-00"
-#myIsCosmics = True
-#Cosmics
-#defInputFile = "rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001853_file01.data"
-#myGeometryTag = "MuonSpectrometer-CSC-CS-00"
-#myIsCosmics = True
-############################
-
#######################################################################
#Input/Ouptut job settings.
#Command line options can give an input file as well as an output prefix
@@ -91,8 +79,14 @@ printfunc (MuonCscRawDataProviderTool)
# --- RawData Provider
from MuonByteStream.MuonByteStreamConf import Muon__CscRawDataProvider
-topSequence += Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
- ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+cscRawDataProvider = Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
+ ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_CSC
+cscRawDataProvider.RegionSelectionTool = makeRegSelTool_CSC()
+
+topSequence += cscRawDataProvider
+
printfunc (topSequence.MuonCscRawDataProvider)
# --- BS Converter
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
index 0e3953526aef2be9f3dd4617d64cb35c7f2e5d7a..e92557f6881f3181a40dc2e48212fccabf30b918 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
#**************************************************************
#
# Read in ByteStream events, and Access CSC RDO
@@ -66,8 +68,14 @@ printfunc (MuonCscRawDataProviderTool)
# load the CscRawDataProvider
from MuonByteStream.MuonByteStreamConf import Muon__CscRawDataProvider
-topSequence += Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
- ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+cscDataProvider = Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
+ ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_CSC
+cscDataProvider.RegionSelectionTool = makeRegSelTool_CSC()
+
+topSequence += cscDataProvider
+
printfunc (topSequence.MuonCscRawDataProvider)
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref
index a246a707f206dfe9493c7d1435a8d8e55fa901bb..d56b817d62cf49ed5d326a92dffc2e7831420d20 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/RpcPadContainerCnv_p2_test.ref
@@ -14,4 +14,3 @@ RpcIdHelper INFO The element hash max is 600
RpcIdHelper INFO The detector element hash max is 1122
RpcIdHelper INFO Initializing RPC hash indices for finding neighbors ...
test1
-test INFO RPCcablingSvc obtained - hashmax = 3
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtCsmCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtCsmCnv_p1.cxx
index 9696c744307951ca664db99066f372711d7b5b8c..52139bb24cbca925d57da56a46e0c435f92d4a6c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtCsmCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtCsmCnv_p1.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
*/
#include "MuonRDO/MdtCsm.h"
@@ -15,6 +15,10 @@ MdtCsmCnv_p1::persToTrans(const MdtCsm_p1* persColl, MdtCsm* transColl, MsgStrea
persColl->m_SubDetId,
persColl->m_MrodId,
persColl->m_CsmId);
+ // The assignment above will leave *transColl as a view container.
+ // But it should own it's elements, so convert it back
+ // to an owning container.
+ transColl->clear (SG::OWN_ELEMENTS);
// Invoke vector converter from the base template
MdtCsm_Cnvp1_base_t::persToTrans( persColl, transColl, log );
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx
index a47da9759f8b599b784b3443aac122d8b31e96a1..f8ae45611c34907d2121b17d40ae210a1bfd4e34 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.cxx
@@ -1,42 +1,39 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
+#include "RpcPadContainerCnv_p1.h"
+
#include "MuonRDO/RpcPad.h"
#include "MuonRDO/RpcPadContainer.h"
#include "MuonEventAthenaPool/RpcPad_p1.h"
#include "MuonEventAthenaPool/RpcPadContainer_p1.h"
-#include "MuonIdHelpers/RpcIdHelper.h"
#include "RpcPadCnv_p1.h"
-#include "RpcPadContainerCnv_p1.h"
-
-// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
-
-// Athena
#include "StoreGate/StoreGateSvc.h"
-
#include "AthAllocators/DataPool.h"
-#include "RPCcablingInterface/IRPCcablingServerSvc.h"
-#include "RPCcablingInterface/RpcPadIdHash.h"
-#include "RPCcablingInterface/IRPCcablingSvc.h"
+#include "RPCcablingInterface/IRPCcablingServerSvc.h" // to be removed
+#include "RPCcablingInterface/RpcPadIdHash.h" // to be removed
+#include "RPCcablingInterface/IRPCcablingSvc.h" // to be removed
+RpcPadContainerCnv_p1::RpcPadContainerCnv_p1() :
+ m_rpcCabling(nullptr), // to be removed
+ m_isInitialized(false),
+ m_rpcCondData(nullptr) {
+}
-StatusCode RpcPadContainerCnv_p1::initialize(MsgStream &log,
- IRPCcablingSvc* cabling /*= nullptr*/) {
- // Do not initialize again:
- m_isInitialized=true;
+StatusCode RpcPadContainerCnv_p1::initialize(MsgStream &log, IRPCcablingSvc* cabling) {
- // Get Storegate, ID helpers, and so on
+ // Get Storegate, ID helpers, and so on
ISvcLocator* svcLocator = Gaudi::svcLocator();
-
+ // to be removed
if (cabling)
m_rpcCabling = cabling;
else {
@@ -52,7 +49,7 @@ StatusCode RpcPadContainerCnv_p1::initialize(MsgStream &log,
sc = RpcCabGet->giveCabling(m_rpcCabling);
if (sc.isFailure()) {
log << MSG::FATAL << "Could not get RPCcablingSvc from the Server !" << endmsg;
- m_rpcCabling = 0;
+ m_rpcCabling = nullptr;
return StatusCode::FAILURE;
}
else {
@@ -61,6 +58,8 @@ StatusCode RpcPadContainerCnv_p1::initialize(MsgStream &log,
}
log << MSG::DEBUG << "Converter initialized." << endmsg;
+
+ m_isInitialized=true;
return StatusCode::SUCCESS;
}
@@ -79,7 +78,6 @@ void RpcPadContainerCnv_p1::transToPers(const RpcPadContainer* transCont, RpcPa
for (collIndex = 0; it_Coll != it_CollEnd; ++collIndex, it_Coll++) {
// Add in new collection
- //log << MSG::DEBUG << " New collection" << endmsg;
RpcPad_p1* pcoll = &( (*persCont)[collIndex] );
cnv.transToPers( &(**it_Coll), pcoll , log);
}
@@ -95,37 +93,21 @@ void RpcPadContainerCnv_p1::persToTrans(const RpcPadContainer_p1* persCont, Rpc
log << MSG::DEBUG << " Reading " << persCont->size() << "Collections" << endmsg;
for (unsigned int icoll = 0; icoll < persCont->size(); ++icoll) {
- // Identifier collID(Identifier(pcoll.m_id));
- // IdentifierHash collIDHash(IdentifierHash(persCont[icoll].m_hashId));
RpcPad* coll = new RpcPad;
cnv.persToTrans( &( (*persCont)[icoll]), coll, log);
- // register the rdo collection in IDC with hash - faster addCollection
-// log<<MSG::INFO<<"coll has size "<<coll->size()<<endmsg;
-// log << MSG::INFO<<" coll has hash: "<<static_cast<unsigned int>(coll->identifyHash())<<endmsg;
-// log << MSG::INFO<<" coll has id: "<<static_cast<unsigned int>(coll->identify())<<endmsg;
-
-// hack to fix bug#56429 - always use identifier to get hash
-
- // sanity check
-// if (coll->identifyHash() > static_cast<unsigned int>(m_rpcCabling->padHashFunction()->max() ) ) {
-// m_errorCount++;
-
-// if (m_errorCount<m_maxNumberOfErrors)
-// log<<MSG::WARNING<< "The persistent RDO had an IdentifierHash of "<<coll->identifyHash()
-// <<" which is larger than the hash max of "<<m_rpcCabling->padHashFunction()->max()
-// <<". Will attempt to correct from Identifier. This is message "<<m_errorCount<<" of "
-// <<m_maxNumberOfErrors<<" maximum."<<endmsg;
-// if (m_errorCount==m_maxNumberOfErrors) log<<MSG::WARNING<<"Exceeding max errors. Further WARNINGs will be suppressed!"<<endmsg;
+
+ int temp=-1;
+ if (m_rpcCondData) temp = m_rpcCondData->operator()(coll->identify());
+ else {
const RpcPadIdHash* pdHashFn = m_rpcCabling->padHashFunction();
- int temp = (*pdHashFn)(coll->identify());
- if (temp==-1) {
- coll->m_idHash = IdentifierHash();
- log<<MSG::WARNING<<"get_hash failed - nothing else we can try!"<<endmsg;
- } else{
- coll->m_idHash = temp;
-// if (m_errorCount<m_maxNumberOfErrors) log<<MSG::WARNING<<"New hash is: "<<coll->identifyHash()<<endmsg;
- }
-// }
+ temp = (*pdHashFn)(coll->identify());
+ }
+ if (temp==-1) {
+ coll->m_idHash = IdentifierHash();
+ log<<MSG::WARNING<<"get_hash failed - nothing else we can try!"<<endmsg;
+ } else{
+ coll->m_idHash = temp;
+ }
// another check - see if already added
auto ptr = transCont->indexFindPtr(coll->identifyHash());
@@ -136,15 +118,16 @@ void RpcPadContainerCnv_p1::persToTrans(const RpcPadContainer_p1* persCont, Rpc
} else {
StatusCode sc = transCont->addCollection(coll, coll->identifyHash());
if (sc.isFailure()) {
- log << MSG::WARNING<<"Could not add collection with hash="<<coll->identifyHash()
+ if (m_rpcCondData) {
+ log << MSG::WARNING<<"Could not add collection with hash="<<coll->identifyHash()
+ <<" to IDC which has hash max of "<<transCont->size()<<" (PadHashFunction gives "<<m_rpcCondData->max()<<")"<<endmsg;
+ } else {
+ log << MSG::WARNING<<"Could not add collection with hash="<<coll->identifyHash()
<<" to IDC which has hash max of "<<transCont->size()<<" (PadHashFunction gives "<<m_rpcCabling->padHashFunction()->max()<<")"<<endmsg;
+ }
throw std::runtime_error("Failed to add collection to ID Container. Hash = "+std::to_string(coll->identifyHash()));
}
}
- // if (log.level() <= MSG::DEBUG) {
- // log << MSG::DEBUG << "AthenaPoolTPCnvIDCont::persToTrans, collection, hash_id/coll id = " << (int) collIDHash << " / " <<
- // persCont[icoll].m_id << ", added to Identifiable container." << endmsg;
- // }
}
log << MSG::DEBUG << " *** Reading RpcPadContainer" << endmsg;
@@ -161,9 +144,10 @@ RpcPadContainer* RpcPadContainerCnv_p1::createTransient(const RpcPadContainer_p1
return 0;
}
}
- // log<<MSG::INFO<<"creating new pad container with hashmax= "<<m_RpcId->module_hash_max()<<endmsg;
-
- std::unique_ptr<RpcPadContainer> trans(new RpcPadContainer(m_rpcCabling->padHashFunction()->max() ));
+ int hashMax=-1;
+ if (m_rpcCondData) hashMax = m_rpcCondData->max();
+ else hashMax = m_rpcCabling->padHashFunction()->max();
+ std::unique_ptr<RpcPadContainer> trans(new RpcPadContainer(hashMax));
persToTrans(persObj, trans.get(), log);
return(trans.release());
}
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.h
index 219833cdf04823b3c291abfd83c440c2ffc70f99..626d7b7df23177c326c582cdbbf82f70c6da797d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef RPCPADCONTAINERCNV_P1
@@ -15,8 +15,9 @@
#include "MuonRDO/RpcPadContainer.h"
#include "MuonEventAthenaPool/RpcPadContainer_p1.h"
+#include "RPC_CondCabling/RpcCablingCondData.h"
-class IRPCcablingSvc;
+class IRPCcablingSvc; // to be removed
class MsgStream;
class RpcPadContainerCnv_p1 : public T_AthenaPoolTPCnvBase< RpcPadContainer, RpcPadContainer_p1 >
@@ -25,17 +26,17 @@ class RpcPadContainerCnv_p1 : public T_AthenaPoolTPCnvBase< RpcPadContainer, Rpc
public:
typedef RpcPadContainer_p1 PERS;
typedef RpcPadContainer TRANS;
- RpcPadContainerCnv_p1(): m_rpcCabling(0), m_isInitialized(false)/*, m_errorCount(0), m_maxNumberOfErrors(10)*/ {}
+ RpcPadContainerCnv_p1();
virtual void persToTrans(const PERS* persCont, TRANS* transCont, MsgStream &log) override;
virtual void transToPers(const TRANS* transCont, PERS* persCont, MsgStream &log) override;
virtual RpcPadContainer* createTransient(const RpcPadContainer_p1* persObj, MsgStream& log) override;
StatusCode initialize(MsgStream &log, IRPCcablingSvc* cabling = nullptr);
+ void setRpcCablingCondData(const RpcCablingCondData* rpc){m_rpcCondData=rpc;}
private:
- const IRPCcablingSvc *m_rpcCabling;
+ const IRPCcablingSvc *m_rpcCabling; // to be removed
bool m_isInitialized;
- //unsigned int m_errorCount;
- //unsigned int m_maxNumberOfErrors;
+ const RpcCablingCondData* m_rpcCondData;
};
#endif
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx
index 53e3029b72f686b2aaeced86fa8178db087f4894..30594ccb0a1c68c4c93b285b269c3cdcaad6697c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.cxx
@@ -1,34 +1,34 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
+#include "RpcPadContainerCnv_p2.h"
+
#include "MuonRDO/RpcPad.h"
#include "MuonRDO/RpcPadContainer.h"
#include "MuonEventAthenaPool/RpcPad_p1.h"
#include "MuonEventAthenaPool/RpcPadContainer_p2.h"
-#include "MuonIdHelpers/RpcIdHelper.h"
#include "RpcPadCnv_p1.h"
-#include "RpcPadContainerCnv_p2.h"
-
-// Gaudi
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
-
-// Athena
#include "StoreGate/StoreGateSvc.h"
-
#include "AthAllocators/DataPool.h"
-#include "RPCcablingInterface/IRPCcablingServerSvc.h"
-#include "RPCcablingInterface/RpcPadIdHash.h"
-#include "RPCcablingInterface/IRPCcablingSvc.h"
+#include "RPCcablingInterface/IRPCcablingServerSvc.h" // to be removed
+#include "RPCcablingInterface/RpcPadIdHash.h" // to be removed
+#include "RPCcablingInterface/IRPCcablingSvc.h" // to be removed
+
+RpcPadContainerCnv_p2::RpcPadContainerCnv_p2() :
+ m_rpcCabling(nullptr),
+ m_isInitialized(false),
+ m_rpcCondData(nullptr) {
+}
-StatusCode RpcPadContainerCnv_p2::initialize(MsgStream &log,
- IRPCcablingSvc* cabling /*= nullptr*/) {
+StatusCode RpcPadContainerCnv_p2::initialize(MsgStream &log, IRPCcablingSvc* cabling) {
// Do not initialize again:
m_isInitialized=true;
@@ -51,22 +51,11 @@ StatusCode RpcPadContainerCnv_p2::initialize(MsgStream &log,
sc = RpcCabGet->giveCabling(m_rpcCabling);
if (sc.isFailure()) {
log << MSG::FATAL << "Could not get RPCcablingSvc from the Server !" << endmsg;
- m_rpcCabling = 0;
+ m_rpcCabling = nullptr;
return StatusCode::FAILURE;
}
}
- {
- if (!m_rpcCabling->padHashFunction())
- {
- m_padhashmax = 1000;
- log<<MSG::INFO << "... hoewever it doesn't look like been already init; container size set by hand to "<< m_padhashmax << endmsg;
- }
- else m_padhashmax = m_rpcCabling->padHashFunction()->max();
- if (log.level() <= MSG::INFO) log <<MSG::INFO << " RPCcablingSvc obtained - hashmax = "<<m_padhashmax << endmsg;
- // if (log.level() <= MSG::VERBOSE) log <<MSG::VERBOSE << " RPCcablingSvc obtained " << endmsg;
- }
-
if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converter initialized." << endmsg;
return StatusCode::SUCCESS;
}
@@ -85,8 +74,6 @@ void RpcPadContainerCnv_p2::transToPers(const RpcPadContainer* transCont, RpcPa
persCont->m_pads.resize(numColl); log << MSG::DEBUG << " Preparing " << persCont->m_pads.size() << "Collections" << endmsg;
for (collIndex = 0; it_Coll != it_CollEnd; ++collIndex, it_Coll++) {
- // Add in new collection
- //log << MSG::DEBUG << " New collection" << endmsg;
RpcPad_p1* pcoll = &( persCont->m_pads[collIndex] );
cnv.transToPers( &(**it_Coll), pcoll , log);
}
@@ -111,8 +98,13 @@ void RpcPadContainerCnv_p2::persToTrans(const RpcPadContainer_p2* persCont, Rpc
} else {
StatusCode sc = transCont->addCollection(coll, coll->identifyHash());
if (sc.isFailure()) {
- log << MSG::WARNING<<"Could not add collection with hash="<<coll->identifyHash()
+ if (m_rpcCondData) {
+ log << MSG::WARNING<<"Could not add collection with hash="<<coll->identifyHash()
+ <<" to IDC which has hash max of "<<transCont->size()<<" (PadHashFunction gives "<<m_rpcCondData->max()<<")"<<endmsg;
+ } else {
+ log << MSG::WARNING<<"Could not add collection with hash="<<coll->identifyHash()
<<" to IDC which has hash max of "<<transCont->size()<<" (PadHashFunction gives "<<m_rpcCabling->padHashFunction()->max()<<")"<<endmsg;
+ }
throw std::runtime_error("Failed to add collection to ID Container. Hash = "+std::to_string(coll->identifyHash()));
}
}
@@ -130,13 +122,12 @@ RpcPadContainer* RpcPadContainerCnv_p2::createTransient(const RpcPadContainer_p2
if (this->initialize(log) != StatusCode::SUCCESS) {
log << MSG::FATAL << "Could not initialize RpcPadContainerCnv_p2 " << endmsg;
return 0;
- }
+ }
}
- // log<<MSG::INFO<<"creating new pad container with hashmax= "<<m_rpcCabling->padHashFunction()->max()<<endmsg;
-
- // std::unique_ptr<RpcPadContainer> trans(new RpcPadContainer(m_rpcCabling->padHashFunction()->max() ));
- // std::unique_ptr<RpcPadContainer> trans(new RpcPadContainer(404 )) ; // hardcoded number from above. FIXME!
- std::unique_ptr<RpcPadContainer> trans(new RpcPadContainer(m_padhashmax)) ; // hardcoded number from above. FIXME!
+ int hashMax=-1;
+ if (m_rpcCondData) hashMax = m_rpcCondData->max();
+ else hashMax = m_rpcCabling->padHashFunction()->max();
+ std::unique_ptr<RpcPadContainer> trans(new RpcPadContainer(hashMax));
persToTrans(persObj, trans.get(), log);
return(trans.release());
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.h b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.h
index 72f605be839ea7f66279b226f4e59c9b81955370..86019240cc9c09ca7370e5b4664b996b41e11e33 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.h
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/RpcPadContainerCnv_p2.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONEVENTATHENAPOOL_RPCPADCONTAINERCNV_P2
@@ -15,8 +15,9 @@
#include "MuonRDO/RpcPadContainer.h"
#include "MuonEventAthenaPool/RpcPadContainer_p2.h"
+#include "RPC_CondCabling/RpcCablingCondData.h"
-class IRPCcablingSvc;
+class IRPCcablingSvc; // to be removed
class MsgStream;
class RpcPadContainerCnv_p2 : public T_AthenaPoolTPCnvBase< RpcPadContainer, RpcPadContainer_p2 >
@@ -25,18 +26,17 @@ class RpcPadContainerCnv_p2 : public T_AthenaPoolTPCnvBase< RpcPadContainer, Rpc
public:
typedef RpcPadContainer_p2 PERS;
typedef RpcPadContainer TRANS;
- RpcPadContainerCnv_p2(): m_rpcCabling(0), m_isInitialized(false), m_padhashmax(0)/*, m_errorCount(0), m_maxNumberOfErrors(10)*/ {}
+ RpcPadContainerCnv_p2();
virtual void persToTrans(const PERS* persCont, TRANS* transCont, MsgStream &log);
virtual void transToPers(const TRANS* transCont, PERS* persCont, MsgStream &log);
virtual RpcPadContainer* createTransient(const RpcPadContainer_p2* persObj, MsgStream& log);
StatusCode initialize(MsgStream &log, IRPCcablingSvc* cabling = nullptr);
+ void setRpcCablingCondData(const RpcCablingCondData* rpc){m_rpcCondData=rpc;}
private:
- const IRPCcablingSvc *m_rpcCabling;
+ const IRPCcablingSvc *m_rpcCabling; // to be removed
bool m_isInitialized;
- unsigned int m_padhashmax;
- //unsigned int m_errorCount;
- //unsigned int m_maxNumberOfErrors;
+ const RpcCablingCondData* m_rpcCondData;
};
#endif
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/MuonMDT_CnvTools/IMDT_RDO_Decoder.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/MuonMDT_CnvTools/IMDT_RDO_Decoder.h
index fa6b0844af675dd2f9e7ec67dba2be5bc2df5b91..dd0a4f8f2f0a2fba5246f8541b3ce37900f72642 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/MuonMDT_CnvTools/IMDT_RDO_Decoder.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/MuonMDT_CnvTools/IMDT_RDO_Decoder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONMDT_CNVTOOLS_IMDT_RDO_DECODER_H
@@ -8,8 +8,6 @@
#include "GaudiKernel/IAlgTool.h"
class MdtDigit;
-class MdtIdHelper;
-class MuonMDT_CablingSvc;
class MdtAmtHit;
class Identifier;
@@ -24,9 +22,7 @@ namespace Muon {
/** AlgTool InterfaceID
*/
static const InterfaceID& interfaceID( );
-
- // virtual void set(const MdtIdHelper * mdtIdHelper, const MDTcablingSvc* mdtCabling)=0;
-
+
virtual MdtDigit * getDigit(const MdtAmtHit * amtHit, uint16_t& subdetId,
uint16_t& mrodId, uint16_t& csmId) const = 0;
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerData.h
index 2f926924555d63e59d30ffac5764a291b92946f2..e423319aacce0ed8ff1861ac61bf7035b4a3d4f5 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerData.h
@@ -11,11 +11,72 @@
#include <map>
#include <vector>
+
+/** Contents of Run-2 BW-CW LUT
+ * ===========================
+ * std::unordered_map<GLOBALADDR, PTVALUE>
+ * where
+ * GLOBALADDR | 27 bits | unsigned int | side, octant, type, phimod2, module, roi,
+ * | DR(0...0x1f for -15...15)<<4 & DPhi(0...0xf for -7...7)
+ * PTVALUE | 3 bits | unsigned char | pT value (0x0 and 0x7 is no cand.)
+ *
+ * for GLOBALADDR
+ * | 29 |28|27|26|25|24|23| 22 |21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
+ * |side| octant | 0|type |phimod2| module | RoI | 0| delta R | delta Phi |
+ * where side = 0x0 (A-side), 0x1 (C-side).
+ * octant = 0x(0...7)
+ * type = 0x0 (HH), 0x1 (HL), 0x2 (LH), 0x3 (LL): HL means 3-station-wire and 2-station-strip.
+ */
+
class TGCTriggerData
{
friend class TGCTriggerDbAlg;
public:
+ /// Mask for extracting the side from the GLOBALADDR
+ static constexpr uint8_t SIDE_MASK = 0x1;
+ /// Bit position of the side bit in the GLOBALADDR
+ static constexpr uint8_t SIDE_SHIFT = 29;
+ /// Mask for extracting the octant from the GLOBALADDR
+ static constexpr uint8_t OCTANT_MASK = 0x7;
+ /// Bit position of the octant bits in the GLOBALADDR
+ static constexpr uint8_t OCTANT_SHIFT = 26;
+ /// Mask for extracting the octant from the GLOBALADDR
+ static constexpr uint8_t TYPE_MASK = 0x7;
+ /// Bit position of the octant bits in the GLOBALADDR
+ static constexpr uint8_t TYPE_SHIFT = 26;
+ /// Mask for extracting the phi(F or B) from the GLOBALADDR
+ static constexpr uint8_t PHIMOD2_MASK = 0x1;
+ /// Bit position of the module number bits in the GLOBALADDR
+ static constexpr uint8_t PHIMOD2_SHIFT = 22;
+ /// Mask for extracting the module number from the GLOBALADDR
+ static constexpr uint8_t MODULE_MASK = 0xf;
+ /// Bit position of the module number bits in the GLOBALADDR
+ static constexpr uint8_t MODULE_SHIFT = 18;
+ /// Mask for extracting the module number from the GLOBALADDR
+ static constexpr uint8_t ROI_MASK = 0xff;
+ /// Bit position of the module number bits in the GLOBALADDR
+ static constexpr uint8_t ROI_SHIFT = 10;
+ /// Mask for extracting the deltaR from the GLOBALADDR
+ static constexpr uint8_t DR_MASK = 0x1f;
+ /// Bit position of the deltaR bits in the GLOBALADDR
+ static constexpr uint8_t DR_SHIFT = 4;
+ /// Mask for extracting the deltaPhi from the GLOBALADDR
+ static constexpr uint8_t DPHI_MASK = 0xf;
+ /// Bit position of the deltaPhi bits in the GLOBALADDR
+ static constexpr uint8_t DPHI_SHIFT = 0;
+ /// Mask for pT value for Run-2
+ static constexpr uint8_t PT_MASK = 0x7;
+
+ /// Range of DR in the BW coincidence window for 3-station
+ static constexpr uint8_t DR_HIGH_RANGE = 15;
+ /// Range of DR in the BW coincidence window for 2-station
+ static constexpr uint8_t DR_LOW_RANGE = 7;
+ /// Range of DPhi in the BW coincidence window for 3-station
+ static constexpr uint8_t DPHI_HIGH_RANGE = 7;
+ /// Range of DPhi in the BW coincidence window for 2-station
+ static constexpr uint8_t DPHI_LOW_RANGE = 3;
+
enum {CW_BW=0, CW_EIFI=1, CW_TILE=2, CW_NUM=3};
enum {N_PT_THRESH=6,
N_SIDE=2,
@@ -40,7 +101,9 @@ class TGCTriggerData
std::string getType(int cwtype, int channel = 0) const;
bool isActive(int cwtype, int channel = 0) const;
- const std::map<unsigned short, std::map<unsigned short, unsigned char>>& getPtMapBw(const unsigned char side, const unsigned char octant) const;
+ int8_t getTYPE(const int16_t lDR, const int16_t hDR, const int16_t lDPhi, const int16_t hDPhi) const;
+
+ uint8_t getBigWheelPt(const uint32_t addr) const;
unsigned short getTrigBitEifi(int side, int slot, int ssc, int sectorId) const;
unsigned char getFlagPtEifi(int side, int ssc, int sectorId) const;
@@ -58,24 +121,8 @@ class TGCTriggerData
std::vector<std::string> m_type[CW_NUM];
std::vector<bool> m_active[CW_NUM];
- /** Contents of Run-2 BW-CW LUT
- * ===========================
- * map<OCTANT, map<SUBSECADDR, map<DELTAADDR, PTVALUE> > >
- * where
- * OCTANT | 4 bits | unsigned char | side(A=0, C=1)<<3 & octant(0...7)
- * SUBSECADDR | 16 bits | unsigned short | consists of type, phimod2, module, and roi
- * DELTAADDR | 9 bits | unsigned short | DR(0...0x1f for -15...15)<<4 & DPhi(0...0xf for -7...7)
- * PTVALUE | 3 bits | unsigned char | pT value (0x0 and 0x7 is no cand.)
- *
- * for SUBSECADDR
- * | 15 | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
- * | 0 | type | phimod2 | module | RoI |
- * where type = 0x0 (HH), 0x1 (HL), 0x2 (LH), 0x3 (LL): HL means 3-station-wire and 2-station-strip.
- * This may reduce the malloc size when the fullCW option is not used.
- */
- std::map<unsigned char, std::map<unsigned short, std::map<unsigned short, unsigned char>>> m_ptmap_bw;
-
-// std::map<int, std::map<int,int> > m_readmap_bw[N_SIDE][N_OCTANT][N_PT_THRESH];
+ /// Run-2 BW-CW LUT map
+ std::unordered_map<uint32_t, uint8_t> m_ptmap_bw;
/** Bit information of Run-2 EIFI-LUT
* =================================
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerDbAlg.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerDbAlg.h
index 9b0625987b5a7a6ddbeae0332c5b4144b07dbfb7..dc273c4a02551787b34ad950816f75ebc39c5cd9 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerDbAlg.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/TGCTriggerDbAlg.h
@@ -21,11 +21,6 @@ class TGCTriggerDbAlg: public AthAlgorithm
virtual StatusCode execute() override;
virtual StatusCode finalize() override;
- protected:
- char getTYPE(const short lDR, const short hDR, const short lDPhi, const short hDPhi) const;
- unsigned short getRoIAddr(const char type, const unsigned char phimod2,
- const unsigned short module, const unsigned short roi) const;
-
private:
void loadParameters(TGCTriggerData* writeCdo,
const CondAttrListCollection* readKey,
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerData.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerData.cxx
index 6a015fcbe01bf5736d67724005fa61ed45186cb7..a2780baf183c6fa156f9c3f9fb128b2c710519c9 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerData.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerData.cxx
@@ -43,12 +43,23 @@ bool TGCTriggerData::isActive(int cwtype, int channel) const {
return m_active[cwtype][channel];
}
-const std::map<unsigned short, std::map<unsigned short, unsigned char>>& TGCTriggerData::getPtMapBw(const unsigned char side, const unsigned char octant) const
+int8_t TGCTriggerData::getTYPE(const int16_t lDR, const int16_t hDR, const int16_t lDPhi, const int16_t hDPhi) const
{
- unsigned char octantbit = (side<<3) + octant;
- std::map<unsigned char, std::map<unsigned short, std::map<unsigned short, unsigned char>>>::const_iterator it = m_ptmap_bw.find(octantbit);
- if(it == m_ptmap_bw.end()) return m_ptmap_bw.find(0)->second; // also for non-full-CW
- return it->second;
+ if((lDR == -DR_HIGH_RANGE) && (hDR == DR_HIGH_RANGE)) {
+ if ((lDPhi == -DPHI_HIGH_RANGE) && (hDPhi == DPHI_HIGH_RANGE)) return COIN_HH;
+ else if((lDPhi == -DPHI_LOW_RANGE) && (hDPhi == DPHI_LOW_RANGE)) return COIN_HL;
+ } else if((lDR == -DR_LOW_RANGE) && (hDR == DR_LOW_RANGE)) {
+ if ((lDPhi == -DPHI_HIGH_RANGE) && (hDPhi == DPHI_HIGH_RANGE)) return COIN_LH;
+ else if((lDPhi == -DPHI_LOW_RANGE) && (hDPhi == DPHI_LOW_RANGE)) return COIN_LL;
+ }
+ return -1;
+}
+
+uint8_t TGCTriggerData::getBigWheelPt(const uint32_t addr) const
+{
+ std::unordered_map<uint32_t, uint8_t>::const_iterator it = m_ptmap_bw.find(addr);
+ if(it == m_ptmap_bw.end()) return 0x0; // outside from defined window, i.e. pT=0
+ else return it->second;
}
unsigned short TGCTriggerData::getTrigBitEifi(int side, int slot, int ssc, int sectorId) const
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerDbAlg.cxx
index 90ce64629775056d15027bc3d2c4765a9fd83723..a40a3adb2c7e8dd504f94a73a515219785934484 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGCTriggerDbAlg.cxx
@@ -182,10 +182,6 @@ void TGCTriggerDbAlg::loadParameters(TGCTriggerData* writeCdo,
void TGCTriggerDbAlg::fillReadMapBw(TGCTriggerData* writeCdo)
{
- for(auto peroctant : writeCdo->m_ptmap_bw) {
- for(auto persubsec : peroctant.second) persubsec.second.clear();
- }
-
if (!writeCdo->isActive(TGCTriggerData::CW_BW)) {
return;
}
@@ -193,18 +189,18 @@ void TGCTriggerDbAlg::fillReadMapBw(TGCTriggerData* writeCdo)
bool fullCW = (writeCdo->getType(TGCTriggerData::CW_BW) == "full");
std::string vername = writeCdo->getVersion(TGCTriggerData::CW_BW);
- const int kNMODULETYPE = 12;
- const unsigned short modulenumber[kNMODULETYPE] = {0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 8};
+ const uint8_t kNMODULETYPE = 12;
+ const uint8_t modulenumber[kNMODULETYPE] = {0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 8};
const std::string modulename[kNMODULETYPE] = {"0","1","2a","2b","3","4","5a","5b","6","7","8a","8b"};
const std::string sidename[TGCTriggerData::N_SIDE] = {"A","C"};
for(size_t iSide = 0; iSide < TGCTriggerData::N_SIDE; iSide++) {
for(size_t iOctant = 0; iOctant < TGCTriggerData::N_OCTANT; iOctant++) {
- std::map<unsigned short, std::map<unsigned short, unsigned char>> per_octant;
- // SUBSECADDR | 16 bits | unsigned int |
+ uint32_t octaddr = (iSide<<TGCTriggerData::SIDE_SHIFT) +
+ ((iOctant & TGCTriggerData::OCTANT_MASK)<<TGCTriggerData::OCTANT_SHIFT);
- for(int iModule = 0; iModule < kNMODULETYPE; iModule++) {
+ for(size_t iModule = 0; iModule < kNMODULETYPE; iModule++) {
std::ostringstream dbname;
dbname << "RPhiCoincidenceMap.";
@@ -216,79 +212,62 @@ void TGCTriggerDbAlg::fillReadMapBw(TGCTriggerData* writeCdo)
char delimiter = '\n';
std::string field, tag;
- unsigned char phimod2 = modulename[iModule].find("b") != std::string::npos ? 1 : 0;
+ uint32_t phimod2 = modulename[iModule].find("b") != std::string::npos ? 1 : 0;
- std::map<unsigned short, unsigned char> pt_by_delta;
+ uint32_t modaddr = ((modulenumber[iModule] & TGCTriggerData::MODULE_MASK)<<TGCTriggerData::MODULE_SHIFT) +
+ ((phimod2 & TGCTriggerData::PHIMOD2_MASK)<<TGCTriggerData::PHIMOD2_SHIFT);
while (std::getline(stream, field, delimiter)) {
std::istringstream header(field);
- header>>tag;
+ header >> tag;
if (tag == "#") { // read header part.
- unsigned short ssId, mod;
- short lDR, hDR, lDPhi, hDPhi;
- unsigned short ptLevel;
- header>>ptLevel>>ssId>>mod>>lDR>>hDR>>lDPhi>>hDPhi;
+ uint16_t ptLevel, roi, mod;
+ int16_t lDR, hDR, lDPhi, hDPhi;
+ header >> ptLevel >> roi >> mod >> lDR >> hDR >> lDPhi >> hDPhi;
- char type = getTYPE( lDR, hDR, lDPhi, hDPhi );
+ int16_t type = writeCdo->getTYPE( lDR, hDR, lDPhi, hDPhi );
// check moduleNumber and ptLevel
- if (mod != modulenumber[iModule] || ptLevel > TGCTriggerData::N_PT_THRESH || type < 0 ) {
- ATH_MSG_WARNING("Invalid configuration of DB file.");
+ if( mod != modulenumber[iModule] ||
+ ptLevel > TGCTriggerData::N_PT_THRESH || type < 0 ) {
+ ATH_MSG_WARNING("Invalid configuration of DB file! - Nothing to load this DB file");
break;
}
- unsigned short roiaddr = getRoIAddr(type, phimod2, mod, ssId);
+ uint32_t cwaddr = ((uint8_t(type) & TGCTriggerData::TYPE_MASK)<<TGCTriggerData::TYPE_SHIFT) +
+ ((roi & TGCTriggerData::ROI_MASK)<<TGCTriggerData::ROI_SHIFT);
// get window data
std::getline(stream, field, delimiter);
std::istringstream cont(field);
- for (unsigned short ir = 0; ir < 31; ir++) {
- unsigned int bit;
- cont>>bit;
+ for (uint8_t ir = 0; ir < 31; ir++) { // ir=0, 15 and 30 point to -15, 0 and +15 of dR, respectively.
+ uint32_t draddr = (ir & TGCTriggerData::DR_MASK)<<TGCTriggerData::DR_SHIFT;
+
+ uint32_t bit;
+ cont >> bit;
if (bit == 0) continue; // none of window is opened in this dR
- for(unsigned short iphi=0; iphi<15; iphi++) {
- unsigned short delta = (ir<<4) + iphi;
- if(bit>>iphi & 0x1) pt_by_delta[delta] = (unsigned char)(ptLevel & 0x7);
+ for(uint8_t iphi=0; iphi<15; iphi++) { // iphi=0, 7 and 14 point to -7, 0 and +7 of dPhi, respectively.
+ if(bit>>iphi & 0x1) {
+ uint32_t theaddr = octaddr + modaddr + cwaddr + draddr + iphi;
+ writeCdo->m_ptmap_bw[theaddr] = (uint8_t)(ptLevel & TGCTriggerData::PT_MASK);
+ }
}
}
- if((ptLevel&0x7) == 0x6) {
- per_octant[roiaddr] = pt_by_delta;
- pt_by_delta.clear();
- }
} // end of if(tag)...
} // end of while(getline...)
} // end of for(iModule)
- unsigned char octantbit = iSide<<3 & iOctant;
- writeCdo->m_ptmap_bw[octantbit] = per_octant;
-
if(!fullCW) break;
} // end of for(iOctant)
if(!fullCW) break;
} // end of for(iSide)
}
-char TGCTriggerDbAlg::getTYPE(const short lDR, const short hDR, const short lDPhi, const short hDPhi) const
-{
- char type = -1;
- if ( (lDR==-15) && (hDR==15) && (lDPhi==-7) && (hDPhi==7)) type = TGCTriggerData::COIN_HH;
- else if ( (lDR==-15) && (hDR==15) && (lDPhi==-3) && (hDPhi==3)) type = TGCTriggerData::COIN_HL;
- else if ( (lDR==-7) && (hDR==7) && (lDPhi==-7) && (hDPhi==7)) type = TGCTriggerData::COIN_LH;
- else if ( (lDR==-7) && (hDR==7) && (lDPhi==-3) && (hDPhi==3)) type = TGCTriggerData::COIN_LL;
- return type;
-}
-
-unsigned short TGCTriggerDbAlg::getRoIAddr(const char type, const unsigned char phimod2,
- const unsigned short module, const unsigned short roi) const
-{
- return (type<<13) + ((phimod2&0x1)<<12) + ((module&0xf)<<8) + roi;
-}
-
void TGCTriggerDbAlg::fillTrigBitEifi(TGCTriggerData* writeCdo)
{
// remove all entries
diff --git a/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py b/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
index 25fb367cb01d650fe3bab098588c9aa5af68ccdd..421518f5059fcbed3de60f0c4da432e730cf05e9 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
@@ -55,7 +55,7 @@ if __name__=="__main__":
muon_edm_helper_svc = Muon__MuonEDMHelperSvc("MuonEDMHelperSvc")
cfg.addService( muon_edm_helper_svc )
- itemsToRecord = ["Trk::SegmentCollection#MuonSegments", "Trk::SegmentCollection#NCB_MuonSegments"]
+ itemsToRecord = ["Trk::SegmentCollection#TrackMuonSegments", "Trk::SegmentCollection#NCB_TrackMuonSegments"]
itemsToRecord += ["TrackCollection#MuonSpectrometerTracks"]
SetupMuonStandaloneOutput(cfg, ConfigFlags, itemsToRecord)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
index ec455944705b5b92cac3f57571036f795402b326..ea0c9e213fc32bb377d9499ea4c7d934cafd197e 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
@@ -610,7 +610,7 @@ def MooSegmentFinderAlgCfg(flags, name = "MuonSegmentMaker", **kwargs):
# FIXME - this really shouldn't be set here!
kwargs.setdefault('TgcPrepDataContainer', 'TGC_MeasurementsAllBCs' if not flags.Muon.useTGCPriorNextBC and not flags.Muon.useTGCPriorNextBC else 'TGC_Measurements')
- kwargs.setdefault('MuonSegmentOutputLocation', "ThirdChainSegments" if flags.Muon.segmentOrigin=="TruthTracking" else "MuonSegments")
+ kwargs.setdefault('MuonSegmentOutputLocation', "ThirdChainSegments" if flags.Muon.segmentOrigin=="TruthTracking" else "TrackMuonSegments")
moo_segment_finder_alg = MooSegmentFinderAlg( name=name, **kwargs )
moo_segment_finder_alg.Cardinality=10
@@ -645,7 +645,7 @@ def MooSegmentFinderAlg_NCBCfg(flags, name = "MuonSegmentMaker_NCB", **kwargs):
# Now set other NCB properties
kwargs.setdefault('MuonPatternCombinationLocation', "NCB_MuonHoughPatternCombinations" )
- kwargs.setdefault('MuonSegmentOutputLocation', "NCB_MuonSegments" )
+ kwargs.setdefault('MuonSegmentOutputLocation', "NCB_TrackMuonSegments" )
kwargs.setdefault('UseCSC', flags.Muon.doCSCs)
kwargs.setdefault('UseMDT', False)
kwargs.setdefault('UseRPC', False)
@@ -679,7 +679,7 @@ def MuonSegmentFindingCfg(flags, cardinality=1):
result.merge(acc)
return result
-if __name__=="__main__":
+if __name__=="__main__":
# To run this, do e.g.
# python -m MuonConfig.MuonSegmentFindingConfig --run --threads=1
from MuonConfig.MuonConfigUtils import SetupMuonStandaloneArguments, SetupMuonStandaloneConfigFlags, SetupMuonStandaloneOutput, SetupMuonStandaloneCA
@@ -707,13 +707,13 @@ if __name__=="__main__":
pps = ProxyProviderSvc()
ars=AddressRemappingSvc()
pps.ProviderNames += [ 'AddressRemappingSvc' ]
- ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("Trk::SegmentCollection", "MuonSegments", "MuonSegments_old") ]
- ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("Trk::SegmentCollection", "MuonSegments_NCB", "MuonSegments_NCB_old") ]
-
+ ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("Trk::SegmentCollection", "TrackMuonSegments", "TrackMuonSegments_old") ]
+ ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("Trk::SegmentCollection", "NCB_TrackMuonSegments", "NCB_TrackMuonSegments_old") ]
+
cfg.addService(pps)
cfg.addService(ars)
-
- itemsToRecord = ["Trk::SegmentCollection#MuonSegments", "Trk::SegmentCollection#NCB_MuonSegments"]
+
+ itemsToRecord = ["Trk::SegmentCollection#TrackMuonSegments", "Trk::SegmentCollection#NCB_TrackMuonSegments"]
SetupMuonStandaloneOutput(cfg, ConfigFlags, itemsToRecord)
# cfg.getService("StoreGateSvc").Dump = True
@@ -727,4 +727,3 @@ if __name__=="__main__":
if not sc.isSuccess():
import sys
sys.exit("Execution failed")
-
diff --git a/MuonSpectrometer/MuonConfig/python/MuonSegmentNameFixConfig.py b/MuonSpectrometer/MuonConfig/python/MuonSegmentNameFixConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..c23d67428bcc3c7c9a4da17a4dd9b5e248325325
--- /dev/null
+++ b/MuonSpectrometer/MuonConfig/python/MuonSegmentNameFixConfig.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# This allows us to convert Run 2 ESD Trk::SegmentCollection "MuonSegments" to
+# Run 3 "TrackMuonSegments"
+def MuonSegmentNameFixCfg(flags):
+ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ cfg = ComponentAccumulator()
+ if 'Trk::SegmentCollection#MuonSegments' in flags.Input.TypedCollections:
+ from SGComps.AddressRemappingConfig import InputRenameCfg
+ cfg.merge(InputRenameCfg("Trk::SegmentCollection", "MuonSegments", "TrackMuonSegments"))
+ return cfg
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index c66983c0fca2ac6b9825996dbd71df01f2c775bc..812e254a6e5addf5665242c7bbfb60979c3ae040 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -526,8 +526,12 @@ def MuonTrackBuildingCfg(flags, name = "MuPatTrackBuilder"):
acc = MuonTrackSteeringCfg(flags)
track_steering = acc.getPrimary()
result.merge(acc)
+
+ # release 21 ESDs contain a Trk::SegmentCollection named 'MuonSegments' instead of 'TrackMuonSegments', the following 2 lines account for that
+ from MuonConfig.MuonSegmentNameFixConfig import MuonSegmentNameFixCfg
+ result.merge(MuonSegmentNameFixCfg(flags))
- track_builder = MuPatTrackBuilder(name=name, TrackSteering = track_steering, MuonSegmentCollection="MuonSegments", SpectrometerTrackOutputLocation="MuonSpectrometerTracks" )
+ track_builder = MuPatTrackBuilder(name=name, TrackSteering = track_steering, MuonSegmentCollection="TrackMuonSegments", SpectrometerTrackOutputLocation="MuonSpectrometerTracks" )
result.addEventAlgo( track_builder, primary=True )
return result
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegSelCondAlg.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegSelCondAlg.cxx
index fb5a9645592fe9f5db460dcdf1b400fe16d1a9cd..67fc49c49ad87c6fad779d7df7882c0997a0c553 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegSelCondAlg.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegSelCondAlg.cxx
@@ -87,10 +87,10 @@ std::unique_ptr<RegSelSiLUT> MM_RegSelCondAlg::createTable( const EventContext&
std::vector<Identifier>::const_iterator idlast = helper->module_end();
/// do we want the module context ...
- /// const IdContext ModuleContext = helper->module_context();
+ const IdContext ModuleContext = helper->module_context();
/// or the detector element context ? Keep them both untill we are sure
- const IdContext ModuleContext = helper->detectorElement_context();
+ /// const IdContext ModuleContext = helper->detectorElement_context();
ATH_MSG_DEBUG("createTable()");
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
index 65195f93172871d511de98e888a30cac28c1b766..a35138ea475886cc6bf2357a4a99662dcb172232 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
@@ -81,10 +81,10 @@ std::unique_ptr<RegSelSiLUT> sTGC_RegSelCondAlg::createTable( const EventContext
std::vector<Identifier>::const_iterator idlast = helper->module_end();
/// do we want the module context ...
- /// const IdContext ModuleContext = helper->module_context();
+ const IdContext ModuleContext = helper->module_context();
/// or the detector element context ? Keep them both untill we are sure
- const IdContext ModuleContext = helper->detectorElement_context();
+ /// const IdContext ModuleContext = helper->detectorElement_context();
ATH_MSG_DEBUG("createTable()");
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
index b63adb39d108b690ab663f07bf69df1b6db95804..351d5f3f9e950c26e6c447b8a3b612645916988e 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
@@ -153,7 +153,7 @@ class MM_DigitizationTool : public PileUpToolBase {
//Three gas mixture mode, Ar/CO2=93/7, Ar/CO2=80/20, Ar/CO2/Iso=93/5/2
//each mode have different transverseDiffusionSigma/longitudinalDiffusionSigma/driftVelocity/avalancheGain/interactionDensityMean/interactionDensitySigma/lorentzAngle
Gaudi::Property<float> m_qThreshold{this,"qThreshold",0.001,"Charge Threshold"};
- Gaudi::Property<float> m_driftGapWidth{this,"DriftGapWidth",5.168,"Drift Gap Width of 5.04 mm + 0.128 mm (the amplification gap)"};
+ Gaudi::Property<float> m_driftGapWidth{this,"DriftGapWidth",5.04,"Drift Gap Width of 5.04 mm"};
Gaudi::Property<float> m_crossTalk1{this,"crossTalk1",0.2,"Strip Cross Talk with Nearest Neighbor"};
Gaudi::Property<float> m_crossTalk2{this,"crossTalk2",0.04,"Strip Cross Talk with 2nd Nearest Neighbor"};
@@ -173,6 +173,8 @@ class MM_DigitizationTool : public PileUpToolBase {
// Temporary until moving away from TRandom
Gaudi::Property<unsigned long int> m_randomSeed{this, "RandomSeed", 42, ""};
+ Gaudi::Property<double> m_correctShift{this,"correctShift",-0.244,"purely empirical shift to fix the z positions of clusters"}; // 12/20 pscholer
+
TFile *m_file{};
TTree *m_ntuple{};
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
index b950d26cebf1133abc349c2e8c795728cee0d8b8..b0fb4147fae8329cf25d4940bd51a395411a14e7 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
@@ -726,6 +726,7 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
/// move the initial track point to the readout plane
int gasGap = m_idHelperSvc->mmIdHelper().gasGap(layerID);
double shift = 0.5*detectorReadoutElement->getDesign(layerID)->thickness;
+ shift += m_correctShift;
double scale = 0.0;
if ( gasGap==1 || gasGap == 3) {
scale = -(stripLayerPosition.z() + shift)/localDirection.z();
diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h
index 78c837f4c1ddbcf5109caf4824e301e491239883..952a91b8bfed5000611884f6dcd6a907c706e868 100755
--- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h
+++ b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONGEOMODEL_MUONDETECTORCONDALG_H
@@ -26,8 +26,6 @@ public:
virtual StatusCode initialize() override final;
virtual StatusCode execute() override final;
- virtual StatusCode finalize() override final;
-
private:
diff --git a/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx b/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
index 514e8861de3b87e898c28174591617b85663eb51..aac677b75844fcf6625a8f92e5bc432330a7698b 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
@@ -321,6 +321,7 @@ GeoFullPhysVol* MultiLayer::build()
double tL = longWidth/2.0 - (tubePitch/2.)*TrdDwoverL;
stube = new GeoTube(0.0, tubePitch/2., tL);
stube = & ( (*stube) << GeoTrf::RotateX3D(90.*Gaudi::Units::deg) );
+ stube->ref();
const GeoShape* stubewithcut = nullptr;
if (cutoutNsteps > 1 && !m_nonCutoutXSteps.size()) { // adaption of tube cuts only needed for cutouts along amdb-y
double toptubelength = cutoutTubeLength[cutoutNsteps-1];
@@ -331,8 +332,6 @@ GeoFullPhysVol* MultiLayer::build()
GeoShape* sbox = new GeoTrd(mdtthickness, mdtthickness, longWidth,
longWidth, tubePitch/2.);
- GeoShape* sboxf = new GeoTrd(mdtthickness, mdtthickness, longWidth,
- longWidth, tubePitch/4.+1*Gaudi::Units::mm);
slay = &(slay->subtract( (*sbox)<<GeoTrf::Translate3D(0.,0.,length/2.)));
for (int i = 0; i < nrOfLayers; i++) {
@@ -371,6 +370,8 @@ GeoFullPhysVol* MultiLayer::build()
}
} // Loop over layers
+ stube->unref();
+
const GeoMaterial* mlay = getMaterialManager()->getMaterial("std::Air");
GeoLogVol* llay = new GeoLogVol(logVolName, slay, mlay);
GeoFullPhysVol* play = new GeoFullPhysVol(llay);
@@ -389,6 +390,8 @@ GeoFullPhysVol* MultiLayer::build()
sfoam = new GeoTrd(foamthicknesslow/2.-eps, foamthicknesslow/2.-eps,
width/2.-eps, longWidth/2.-eps, length/2.);
}
+ GeoShape* sboxf = new GeoTrd(mdtthickness, mdtthickness, longWidth,
+ longWidth, tubePitch/4.+1*Gaudi::Units::mm);
sfoam = &(sfoam->subtract( (*sboxf)<<GeoTrf::Translate3D(0.,0.,length/2.-tubePitch/4.)));
mfoam = getMaterialManager()->getMaterial("muo::Foam");
lfoam = new GeoLogVol("MultiLayerFoam", sfoam, mfoam);
@@ -401,6 +404,8 @@ GeoFullPhysVol* MultiLayer::build()
sfoam = new GeoTrd(foamthicknessup/2.-eps, foamthicknessup/2.-eps,
width/2.-eps, longWidth/2.-eps, length/2.);
}
+ GeoShape* sboxf = new GeoTrd(mdtthickness, mdtthickness, longWidth,
+ longWidth, tubePitch/4.+1*Gaudi::Units::mm);
sfoam = &(sfoam->subtract( (*sboxf)<<GeoTrf::Translate3D(0.,0.,length/2.-tubePitch/4.)));
mfoam = getMaterialManager()->getMaterial("muo::Foam");
lfoam = new GeoLogVol("MultiLayerFoam", sfoam, mfoam);
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
index e250f0ccb68931ff04b0665fb79a8d648126678d..e49a2003963b41d5280171b497d3b34ddbabcd15 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorCondAlg.cxx
@@ -152,10 +152,3 @@ StatusCode MuonDetectorCondAlg::execute()
return StatusCode::SUCCESS;
}
-
-
-StatusCode MuonDetectorCondAlg::finalize()
-{
- ATH_MSG_DEBUG( "finalize " << name() );
- return StatusCode::SUCCESS;
- }
diff --git a/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.h b/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.h
index e01d1da1844cca403464d4796630550a5025a51b..31cf424fa8d78216e62a6ceb2331ff75710ede54 100644
--- a/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.h
+++ b/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonGMTestOnPrd.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
*/
/***************************************************************************
@@ -25,24 +25,18 @@
#include "Identifier/Identifier.h"
#include "Identifier/IdentifierHash.h"
-
class StoreGateSvc;
class ActiveStoreSvc;
-
-//class MuonReadoutElement;
-
-
class MuonGMTestOnPrd: public AthAlgorithm
{
public:
MuonGMTestOnPrd(const std::string& name, ISvcLocator* pSvcLocator);
- ~MuonGMTestOnPrd();
+ ~MuonGMTestOnPrd()=default;
StatusCode initialize();
StatusCode execute();
- StatusCode finalize();
private:
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx
index 305cd04740737c5fffe5af52bd15b7519070a9a1..5edf1c4e2fbae18cf92642264b61cdd29da43c6e 100644
--- a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.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
*/
/***************************************************************************
@@ -7,9 +7,6 @@
-----------------------------------------
***************************************************************************/
-//<doc><file> $Id: MuonGMTestOnPrd.cxx,v 1.8 2009-03-28 10:59:01 stefspa Exp $
-//<version> $Name: not supported by cvs2svn $
-
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
@@ -20,12 +17,6 @@
#include "MuonReadoutGeometry/RpcReadoutElement.h"
#include "MuonReadoutGeometry/CscReadoutElement.h"
-// #include "MuonPrepRawData/MdtPrepDataContainer.h"
-// #include "MuonPrepRawData/MdtPrepDataCollection.h"
-// #include "MuonPrepRawData/MdtPrepData.h"
-
-// #include "Identifier/Identifier.h"
-// #include "Identifier/IdentifierHash.h"
#include "TrkDistortedSurfaces/SaggedLineSurface.h"
MuonGMTestOnPrd::MuonGMTestOnPrd(const std::string& name, ISvcLocator* pSvcLocator)
@@ -48,9 +39,6 @@ MuonGMTestOnPrd::MuonGMTestOnPrd(const std::string& name, ISvcLocator* pSvcLocat
declareProperty("doCheckMisal", m_check_misal );
}
-MuonGMTestOnPrd::~MuonGMTestOnPrd()
-{ }
-
StatusCode
MuonGMTestOnPrd::initialize()
{
@@ -256,32 +244,9 @@ MuonGMTestOnPrd::execute()
}
}
-// // Rpc
-// Muon::RpcPrepDataContainer * rpcContainer;
-
-// // Tgc
-// TgcPrepDataContainer * tgcContainer;
-// if ( StatusCode::SUCCESS != p_EventStore->retrieve(tgcContainer, key) )
-// {
-// log<<MSG::ERROR<<"Cannot retrieve TGC PRD Container "<<endmsg;
-// return StatusCode::FAILURE;
-// }
-// else
-// log<<MSG::INFO<<"Retrieved TGC PRD Container with size = " << tgcContainer->size()<< endmsg;
-
-// // Csc
-// CscPrepDataContainer * cscContainer;
-
return StatusCode::SUCCESS;
}
-StatusCode
-MuonGMTestOnPrd::finalize()
-{
- ATH_MSG_DEBUG( "Finalizing" );
- return StatusCode::SUCCESS;
-}
-
void MuonGMTestOnPrd::processMdtCollection(const Muon::MdtPrepDataCollection* mdtColl,
Identifier& collid,
IdentifierHash& collidh) const
diff --git a/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h b/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h
index bd60bc1dd08ecf64fac1af39059003934da604e0..1fbecb12a5d93ed70a3a5f866f5eb7c052b72914 100644
--- a/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h
+++ b/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelperSvc.h
@@ -31,9 +31,6 @@ namespace Muon {
/** @brief AlgTool initilize */
virtual StatusCode initialize() override;
- /** @brief AlgTool finalize */
- virtual StatusCode finalize() override;
-
/** @brief print all fields to string */
virtual std::string toString( const Identifier& id ) const override;
diff --git a/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx b/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx
index f114a40d93ccf7306f0d286cee2d9415c15db5ed..d111243a615fcdb3ea79f3aa8b7ba8bf53f01454 100644
--- a/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx
+++ b/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelperSvc.cxx
@@ -139,11 +139,6 @@ namespace Muon {
return StatusCode::SUCCESS;
}
- StatusCode MuonIdHelperSvc::finalize() {
- if( AthService::finalize().isFailure() ) return StatusCode::FAILURE;
- return StatusCode::SUCCESS;
- }
-
int MuonIdHelperSvc::gasGap( const Identifier& id ) const {
if( isRpc(id) ) {
return m_rpcIdHelper->gasGap(id);
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx b/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx
index fac3c4f6df54d6b3a62c9532be39b5ccef625db9..86fa1eea11a5a03784a559c9933a872f2bd1ff63 100644
--- a/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx
+++ b/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new MdtOverlay{"MdtOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx b/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx
index cb19ccfa6a248eeaf2f0de17d0f51e396e8d54bd..0f465f8402405a6c1173e355ad425c142252be37 100644
--- a/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx
+++ b/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new RpcOverlay{"RpcOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx b/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx
index e168fe74fa149151e90143494f678ef37c056ac7..592d7ee07676df1561887103b16142dc5dc47ac0 100644
--- a/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx
+++ b/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new TgcOverlay{"TgcOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.cxx
index c87d3499a5459a7edbb2b2d1ae06b93140fdd3fd..50be640b99e7e6d8f0d3119d9e2e0659e6257ad6 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/UTPCMMClusterBuilderTool.cxx
@@ -405,7 +405,7 @@ StatusCode Muon::UTPCMMClusterBuilderTool::finalFit(const std::vector<Muon::MMPr
double cov = (s->GetCovarianceMatrix())(0,1);
ATH_MSG_DEBUG("covariance is: "<<cov);
double fitSlope = ffit->GetParameter(1);
- double dHalfGap = 2.5; // half the thickness of the gas gap
+ double dHalfGap = 2.52; // half the thickness of the gas gap
double interceptCorr = dHalfGap - ffit->GetParameter(0);
x0 = interceptCorr/fitSlope;
sigmaX0 = pow(m_scaleClusterError,2)*(pow(ffit->GetParError(0)/interceptCorr,2)+pow(ffit->GetParError(1)/fitSlope,2) - 2./(fitSlope*interceptCorr)*cov)*pow(x0,2);
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonStandalone.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonStandalone.py
index bed770e06a53e2f156b0ee2129f4ca02d511e6b4..45f35c51658f98d35d90090f42c206f54c6329fb 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonStandalone.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonStandalone.py
@@ -66,7 +66,7 @@ def MooSegmentFinderAlg( name="MuonSegmentMaker",**kwargs ):
kwargs.setdefault("SegmentFinder", getPublicToolClone("MuonSegmentFinder","MooSegmentFinder",
DoSummary=muonStandaloneFlags.printSummary()))
kwargs.setdefault("MuonClusterSegmentFinderTool",getPublicTool("MuonClusterSegmentFinder"))
- kwargs.setdefault("MuonSegmentOutputLocation", "MuonSegments")
+ kwargs.setdefault("MuonSegmentOutputLocation", "TrackMuonSegments")
kwargs.setdefault("UseCSC", muonRecFlags.doCSCs())
kwargs.setdefault("UseMDT", muonRecFlags.doMDTs())
kwargs.setdefault("UseRPC", muonRecFlags.doRPCs())
@@ -94,8 +94,7 @@ def MooSegmentFinderNCBAlg( name="MuonSegmentMaker_NCB",**kwargs ):
segmentTool = getPublicTool("CscSegmentUtilTool_NCB")) if MuonGeometryFlags.hasCSC() else ""),
DoMdtSegments=False,DoSegmentCombinations=False,DoSegmentCombinationCleaning=False))
kwargs.setdefault("MuonPatternCombinationLocation", "NCB_MuonHoughPatternCombinations")
- kwargs.setdefault("MuonSegmentOutputLocation", "NCB_MuonSegments")
- kwargs.setdefault("MuonSegmentOutputLocation", "NCB_MuonSegments")
+ kwargs.setdefault("MuonSegmentOutputLocation", "NCB_TrackMuonSegments")
kwargs.setdefault("UseCSC", muonRecFlags.doCSCs())
kwargs.setdefault("UseMDT", False)
kwargs.setdefault("UseRPC", False)
@@ -146,7 +145,7 @@ class MuonStandalone(ConfiguredMuonRec):
super(MuonStandalone,self).configure(keys)
if not self.isEnabled(): return
- SegmentLocation = "MuonSegments"
+ SegmentLocation = "TrackMuonSegments"
if muonStandaloneFlags.segmentOrigin == 'TruthTracking':
SegmentLocation = "ThirdChainSegments"
@@ -189,7 +188,7 @@ class MuonStandalone(ConfiguredMuonRec):
self.addAlg(MooSegmentFinderNCBAlg("MuonSegmentMaker_NCB"))
if (not cfgKeyStore.isInInput ('xAOD::MuonSegmentContainer', 'MuonSegments_NCB')):
- self.addAlg( CfgMgr.xAODMaker__MuonSegmentCnvAlg("MuonSegmentCnvAlg_NCB",SegmentContainerName="NCB_MuonSegments",xAODContainerName="NCB_MuonSegments") )
+ self.addAlg( CfgMgr.xAODMaker__MuonSegmentCnvAlg("MuonSegmentCnvAlg_NCB",SegmentContainerName="NCB_TrackMuonSegments",xAODContainerName="NCB_MuonSegments") )
if (not cfgKeyStore.isInInput ('xAOD::MuonSegmentContainer', 'MuonSegments')):
self.addAlg( CfgMgr.xAODMaker__MuonSegmentCnvAlg("MuonSegmentCnvAlg") )
@@ -200,13 +199,9 @@ class MuonStandalone(ConfiguredMuonRec):
#
# add the algorithm (which uses the MuonTrackSteering)
#
- TrackBuilder = CfgMgr.MuPatTrackBuilder("MuPatTrackBuilder", TrackSteering = getPublicTool("MuonTrackSteering") )
+ TrackBuilder = CfgMgr.MuPatTrackBuilder("MuPatTrackBuilder", TrackSteering=getPublicTool("MuonTrackSteering"), SpectrometerTrackOutputLocation="MuonSpectrometerTracks", MuonSegmentCollection="TrackMuonSegments")
self.addAlg( TrackBuilder )
-
- self.registerOutputKey("MuonSpectrometerTracks", self.MuPatTrackBuilder, "SpectrometerTrackOutputLocation")
- self.registerInputKey ("MuonSegments", self.MuPatTrackBuilder, "MuonSegmentCollection" )
-
if muonStandaloneFlags.createTrackParticles():
xAODTrackParticleCnvAlg = MuonStandaloneTrackParticleCnvAlg("MuonStandaloneTrackParticleCnvAlg")
self.addAlg( xAODTrackParticleCnvAlg )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py
index b9b149554ae0de20c6df3a7e7762816a7ad3dccb..20be4a64712d3c6efab76c7028bf6e36d0e59d55 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py
@@ -82,8 +82,8 @@ if DetFlags.detdescr.Muon_on() and rec.doWriteESD():
MuonESDList+=["RpcSectorLogicContainer#RPC_SECTORLOGIC"]
# Segments
- MuonESDList+=["Trk::SegmentCollection#MuonSegments"]
- MuonESDList+=["Trk::SegmentCollection#NCB_MuonSegments"]
+ MuonESDList+=["Trk::SegmentCollection#TrackMuonSegments"]
+ MuonESDList+=["Trk::SegmentCollection#NCB_TrackMuonSegments"]
# Tracks
MuonESDList+=["TrackCollection#MuonSpectrometerTracks"]
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
index 3ff7e1613a5e464a3c990bb5966613a540dca350..965de10bed2c6cf382c8416d243732183a0af1f0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
@@ -193,9 +193,6 @@ elif muonRecFlags.doCalib():
from MuonRecExample import MuonAlignConfig
from MuonCnvExample import setupMuonCalib
setupMuonCalib()
-else:
- logMuon.warning("Loading %s but not setting up any MuonCalibration or Ntuple" % __name__ )
-
#--------------------------------------------------------------------------
# Evaluate tracking performance
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.cxx
index b63dc2e7a5a5b17155e4d416de548701f100ac4f..413b64de7ce05fac6f75fe1721f9432ee3fe9850 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.cxx
@@ -6,43 +6,11 @@
#include "MuonPrepRawData/MuonPrepDataContainer.h"
#include "MuonSegment/MuonSegment.h"
-#include "MuonSegmentCombinerToolInterfaces/IMooSegmentCombinationFinder.h"
-#include "MuonSegmentMakerToolInterfaces/IMuonSegmentOverlapRemovalTool.h"
-
-MooSegmentFinderAlg::MooSegmentFinderAlg(const std::string& name, ISvcLocator* pSvcLocator)
- : AthReentrantAlgorithm(name, pSvcLocator),
- m_keyTgc("TGC_Measurements"),
- m_keyTgcPriorBC("TGC_MeasurementsPriorBC"),
- m_keyTgcNextBC("TGC_MeasurementsNextBC"),
- m_keyRpc("RPC_Measurements"),
- m_keyCsc("CSC_Clusters"),
- m_keyMdt("MDT_DriftCircles"),
- m_patternCombiLocation("MuonHoughPatternCombinations"),
- m_segmentLocation("MooreSegments")
-{
- declareProperty("UseRPC", m_useRpc = true);
- declareProperty("UseTGC", m_useTgc = true);
- declareProperty("UseTGCPriorBC", m_useTgcPriorBC = false);
- declareProperty("UseTGCNextBC", m_useTgcNextBC = false);
- declareProperty("UseCSC", m_useCsc = true);
- declareProperty("UseMDT", m_useMdt = true);
-
- declareProperty("doTGCClust", m_doTGCClust = false);
- declareProperty("doRPCClust", m_doRPCClust = false);
- declareProperty("doClusterTruth", m_doClusterTruth = false);
-
- declareProperty("CscPrepDataContainer", m_keyCsc);
- declareProperty("MdtPrepDataContainer", m_keyMdt);
- declareProperty("RpcPrepDataContainer", m_keyRpc);
- declareProperty("TgcPrepDataContainer", m_keyTgc);
- declareProperty("TgcPrepDataContainerPriorBC", m_keyTgcPriorBC);
- declareProperty("TgcPrepDataContainerNextBC", m_keyTgcNextBC);
-
- declareProperty("MuonPatternCombinationLocation", m_patternCombiLocation);
- declareProperty("MuonSegmentOutputLocation", m_segmentLocation);
-}
-MooSegmentFinderAlg::~MooSegmentFinderAlg() {}
+
+MooSegmentFinderAlg::MooSegmentFinderAlg(const std::string& name, ISvcLocator* pSvcLocator) :
+ AthReentrantAlgorithm(name, pSvcLocator) {
+}
StatusCode
MooSegmentFinderAlg::initialize()
@@ -143,8 +111,3 @@ MooSegmentFinderAlg::execute(const EventContext& ctx) const
return StatusCode::SUCCESS;
} // execute
-StatusCode
-MooSegmentFinderAlg::finalize()
-{
- return StatusCode::SUCCESS;
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.h
index 7973fac205df161f9eb8ddd58054996237b7b122..7706d5c6862d7b092d55b43b37b8bce2628fa920 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MooSegmentFinderAlg.h
@@ -7,6 +7,9 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/WriteHandleKey.h"
+#include "StoreGate/ReadHandleKey.h"
+
#include "MuonPattern/MuonPatternCombinationCollection.h"
#include "MuonPrepRawData/CscPrepDataCollection.h"
#include "MuonPrepRawData/MdtPrepDataCollection.h"
@@ -18,23 +21,17 @@
#include "MuonSegmentMakerToolInterfaces/IMuonClusterSegmentFinder.h"
#include "TrkSegment/SegmentCollection.h"
#include "TrkTruthData/PRD_MultiTruthCollection.h"
-
-class MsgStream;
-
-namespace Muon {
-class IMooSegmentCombinationFinder;
-class IMuonSegmentOverlapRemovalTool;
-} // namespace Muon
+#include "MuonSegmentCombinerToolInterfaces/IMooSegmentCombinationFinder.h"
+#include "MuonSegmentMakerToolInterfaces/IMuonSegmentOverlapRemovalTool.h"
class MooSegmentFinderAlg : public AthReentrantAlgorithm {
public:
MooSegmentFinderAlg(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~MooSegmentFinderAlg();
+ virtual ~MooSegmentFinderAlg()=default;
virtual StatusCode initialize() override;
virtual StatusCode execute(const EventContext& ctx) const override;
- virtual StatusCode finalize() override;
private:
template <class T, class Y>
@@ -44,52 +41,36 @@ class MooSegmentFinderAlg : public AthReentrantAlgorithm {
Trk::SegmentCollection* extractSegmentCollection(const MuonSegmentCombinationCollection& segmentCombinations) const;
/** selection flags for all four technologies */
- bool m_useTgc;
- bool m_useTgcPriorBC;
- bool m_useTgcNextBC;
- bool m_useRpc;
- bool m_useCsc;
- bool m_useMdt;
+ Gaudi::Property<bool> m_useTgc{this,"UseTGC",true};
+ Gaudi::Property<bool> m_useTgcPriorBC{this,"UseTGCPriorBC",false};
+ Gaudi::Property<bool> m_useTgcNextBC{this,"UseTGCNextBC",false};
+ Gaudi::Property<bool> m_useRpc{this,"UseRPC",true};
+ Gaudi::Property<bool> m_useCsc{this,"UseCSC",true};
+ Gaudi::Property<bool> m_useMdt{this,"UseMDT",true};
/** selection flags for cluster based segment finding */
- bool m_doTGCClust;
- bool m_doRPCClust;
- bool m_doClusterTruth;
+ Gaudi::Property<bool> m_doTGCClust{this,"doTGCClust",false};
+ Gaudi::Property<bool> m_doRPCClust{this,"doRPCClust",false};
+ Gaudi::Property<bool> m_doClusterTruth{this,"doClusterTruth",false};
/** storegate location of the MuonPrepDataContainer for all four technologies */
- SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_keyTgc;
- SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_keyTgcPriorBC;
- SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_keyTgcNextBC;
- SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_keyRpc;
- SG::ReadHandleKey<Muon::CscPrepDataContainer> m_keyCsc;
- SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_keyMdt;
-
- SG::ReadHandleKey<PRD_MultiTruthCollection> m_tgcTruth{this, "TGCTruth", "TGC_TruthMap",
- "TGC PRD Multi-truth Collection"};
- SG::ReadHandleKey<PRD_MultiTruthCollection> m_rpcTruth{this, "RPCTruth", "RPC_TruthMap",
- "RPC PRD Multi-truth Collection"};
-
- SG::WriteHandleKey<MuonPatternCombinationCollection> m_patternCombiLocation;
- SG::WriteHandleKey<Trk::SegmentCollection> m_segmentLocation;
- SG::WriteHandleKey<Muon::HoughDataPerSectorVec> m_houghDataPerSectorVecKey{
- this, "Key_MuonLayerHoughToolHoughDataPerSectorVec", "HoughDataPerSectorVec", "HoughDataPerSectorVec key"};
-
- ToolHandle<Muon::IMooSegmentCombinationFinder> m_segmentFinder{
- this,
- "SegmentFinder",
- "Muon::MooSegmentCombinationFinder/MooSegmentCombinationFinder",
- }; //<! pointer to the segment finder
- ToolHandle<Muon::IMuonClusterSegmentFinder> m_clusterSegMaker{
- this,
- "MuonClusterSegmentFinderTool",
- "Muon::MuonClusterSegmentFinder/MuonClusterSegmentFinder",
- };
- ToolHandle<Muon::IMuonSegmentOverlapRemovalTool> m_overlapRemovalTool{
- this,
- "SegmentOverlapRemovalTool",
- "Muon::MuonSegmentOverlapRemovalTool/MuonSegmentOverlapRemovalTool",
- "tool to removal overlaps in segment combinations",
- };
+ SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_keyTgc{this,"TgcPrepDataContainer","TGC_Measurements"};
+ SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_keyTgcPriorBC{this,"TgcPrepDataContainerPriorBC","TGC_MeasurementsPriorBC"};
+ SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_keyTgcNextBC{this,"TgcPrepDataContainerNextBC","TGC_MeasurementsNextBC"};
+ SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_keyRpc{this,"RpcPrepDataContainer","RPC_Measurements"};
+ SG::ReadHandleKey<Muon::CscPrepDataContainer> m_keyCsc{this,"CscPrepDataContainer","CSC_Clusters"};
+ SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_keyMdt{this,"MdtPrepDataContainer","MDT_DriftCircles"};
+
+ SG::ReadHandleKey<PRD_MultiTruthCollection> m_tgcTruth{this,"TGCTruth","TGC_TruthMap","TGC PRD Multi-truth Collection"};
+ SG::ReadHandleKey<PRD_MultiTruthCollection> m_rpcTruth{this,"RPCTruth","RPC_TruthMap","RPC PRD Multi-truth Collection"};
+
+ SG::WriteHandleKey<MuonPatternCombinationCollection> m_patternCombiLocation{this,"MuonPatternCombinationLocation","MuonHoughPatternCombinations"};
+ SG::WriteHandleKey<Trk::SegmentCollection> m_segmentLocation{this,"MuonSegmentOutputLocation","MooreSegments"};
+ SG::WriteHandleKey<Muon::HoughDataPerSectorVec> m_houghDataPerSectorVecKey{this,"Key_MuonLayerHoughToolHoughDataPerSectorVec","HoughDataPerSectorVec","HoughDataPerSectorVec key"};
+
+ ToolHandle<Muon::IMooSegmentCombinationFinder> m_segmentFinder{this,"SegmentFinder","Muon::MooSegmentCombinationFinder/MooSegmentCombinationFinder","pointer to the segment finder"};
+ ToolHandle<Muon::IMuonClusterSegmentFinder> m_clusterSegMaker{this,"MuonClusterSegmentFinderTool","Muon::MuonClusterSegmentFinder/MuonClusterSegmentFinder"};
+ ToolHandle<Muon::IMuonSegmentOverlapRemovalTool> m_overlapRemovalTool{this,"SegmentOverlapRemovalTool","Muon::MuonSegmentOverlapRemovalTool/MuonSegmentOverlapRemovalTool","tool to removal overlaps in segment combinations"};
};
template <class T, class Y>
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.h
index 84636576470240530033a3a3d661cc245ca0ecd0..8b9dd8c52d366ec2fe5db6555ec32c52347bd353 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/MuonSegmentFinderAlg.h
@@ -106,11 +106,11 @@ class MuonSegmentFinderAlg : public AthReentrantAlgorithm {
"Csc4dSegmentMaker/Csc4dSegmentMaker",
};
-
+ // the following Trk::SegmentCollection MuonSegments are standard MuonSegments, the MuGirl segments are stored in MuonCreatorAlg.h
SG::WriteHandleKey<Trk::SegmentCollection> m_segmentCollectionKey{
this,
"SegmentCollectionName",
- "MuonSegments",
+ "TrackMuonSegments",
"Muon Segments",
};
SG::ReadHandleKey<Muon::CscPrepDataContainer> m_cscPrdsKey{
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx
index 37f2995317c4807a0938169251f1e4ce8ebdeddb..f00a3da604d2a9f97c962a72ef0658d1b33682f3 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx
@@ -1821,8 +1821,8 @@ struct IdDataVec {
typedef std::vector<Entry> EntryVec;
typedef typename EntryVec::iterator EntryIt;
- IdDataVec<T>() {}
- IdDataVec<T>(const Identifier& i) : id(i) {}
+ IdDataVec() {}
+ IdDataVec(const Identifier& i) : id(i) {}
Identifier id;
EntryVec data;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/CMakeLists.txt
index 4dc59bec52a2862bd5b72822e44ab5fd365fa892..e985bf243958d3130cf854322d2dd43c43730d63 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/CMakeLists.txt
@@ -1,19 +1,15 @@
-################################################################################
-# Package: MdtSegmentT0Fitter
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MdtSegmentT0Fitter )
# External dependencies:
-find_package( ROOT COMPONENTS Minuit Core Tree MathCore Hist RIO pthread MathMore Minuit2 Matrix Physics HistPainter Rint )
+find_package( ROOT COMPONENTS Core MathCore Minuit2 )
# Component(s) in the package:
atlas_add_component( MdtSegmentT0Fitter
- src/*.cxx
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel MdtCalibSvcLib TrkDriftCircleMath MdtCalibData MuonCalibToolsLib MuonReadoutGeometry MuonIdHelpersLib MuonPrepRawData MuonRIO_OnTrack MuonSegmentMakerInterfacesLib )
-
-# Install files from the package:
-atlas_install_headers( MdtSegmentT0Fitter )
+ MdtSegmentT0Fitter/*.h src/*.cxx src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel MdtCalibSvcLib
+ TrkDriftCircleMath MdtCalibData MuonReadoutGeometry MuonPrepRawData
+ MuonRIO_OnTrack MuonSegmentMakerInterfacesLib )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/MdtSegmentT0Fitter/MdtSegmentT0Fitter.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/MdtSegmentT0Fitter/MdtSegmentT0Fitter.h
index e3e89b6c26f9d6735e0672d53a708b8cda801b52..efd01f8cfa9de138105e2dbbce3959b6ce3d0007 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/MdtSegmentT0Fitter/MdtSegmentT0Fitter.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/MdtSegmentT0Fitter/MdtSegmentT0Fitter.h
@@ -19,8 +19,6 @@
#include <vector>
#include <memory>
-#include "TMinuit.h"
-
namespace TrkDriftCircleMath {
class MdtSegmentT0Fitter : public AthAlgTool, public DCSLFitter, virtual public Muon::IDCSLFitProvider {
@@ -36,34 +34,16 @@ namespace TrkDriftCircleMath {
virtual const DCSLFitter* getFitter() const override { return this; }
- /// Struct for passing data to/from TMinuit fit function
- struct MdtSegmentT0FcnData {
- struct HitCoords {
- double z;
- double t;
- double y;
- double w;
- double r;
- const MuonCalib::IRtRelation *rt;
- };
- std::vector<HitCoords> data;
- int used;
- int t0Error;
- };
-
private:
ToolHandle<MdtCalibrationDbTool> m_calibrationDbTool{this,"CalibrationDbTool","MdtCalibrationDbTool"};
Gaudi::Property<bool> m_trace{this,"TraceOperation",false,"debug - traces operation"};
- Gaudi::Property<bool> m_dumpToFile{this,"DumpToFile",false,"debug - dumps some performance info"};
Gaudi::Property<bool> m_rejectWeakTopologies{this,"RejectWeakTopologies",true,"reject topolgies that do not have at least one +- combination in one multilayer"};
Gaudi::Property<bool> m_scaleErrors{this,"RescaleErrors",true,"rescale errors in fit"};
Gaudi::Property<bool> m_propagateErrors{this,"PropagateErrors",true,"propagate errors"};
Gaudi::Property<int> m_minHits{this,"MinimumHits",4,"minimum number of selected hits for t0 fit. Otherwise use default"};
Gaudi::Property<float> m_dRTol{this,"dRTolerance",0.1};
- std::unique_ptr<TMinuit> m_minuit;
-
// counters
mutable std::atomic_uint m_ntotalCalls;
mutable std::atomic_uint m_npassedNHits;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx
index c317a68d4ee1e222d11642c0c7712829d1a39f3d..e5a9311aec54c486c9c34a6d8b1c591d3c0f4cf6 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx
@@ -15,6 +15,10 @@
#include "MuonRIO_OnTrack/MdtDriftCircleOnTrack.h"
#include "MuonPrepRawData/MdtPrepData.h"
+#include "Minuit2/Minuit2Minimizer.h"
+#include "Math/Functor.h"
+#include <functional>
+
#include <iostream>
#include <fstream>
#include <atomic>
@@ -40,12 +44,75 @@
namespace TrkDriftCircleMath {
- static MdtSegmentT0Fitter::MdtSegmentT0FcnData* g_fcnData ATLAS_THREAD_SAFE = nullptr; ///< Data to pass to/from TMinuit fcn. Guarded with mutex.
- static std::mutex g_fcnDataMutex; ///< Mutex to protect g_fcnData access
-
+ class FunctionToMinimize : public ROOT::Math::IMultiGenFunction {
+ public:
+ struct HitCoords {
+ double z;
+ double t;
+ double y;
+ double w;
+ double r;
+ const MuonCalib::IRtRelation *rt;
+ };
+ FunctionToMinimize(const int used) : m_data(),m_used(used),m_t0Error() {}
+ ~FunctionToMinimize() {m_data.clear();}
+ double DoEval(const double* xx) const {
+ double ang = xx[0];
+ double b = xx[1];
+ double t0 = xx[2];
+
+ double cosin = std::cos(ang);
+ double sinus = std::sin(ang);
+
+ double fval = 0.;
+ // Add t0 constraint
+ if (m_t0Error == WEAK_TOPO_T0ERROR ) {
+ fval += xx[2]*xx[2]/(1.0 *m_t0Error*m_t0Error);
+ }
+ double t, r, z, y, w, dist;
+ for(int i=0;i<m_used;++i) {
+ t = m_data[i].t - t0;
+ z = m_data[i].z;
+ y = m_data[i].y;
+ w = m_data[i].w;
+ dist = std::abs(b*cosin + z*sinus - y*cosin); // same thing as fabs(a*z - y + b)/sqrt(1. + a*a);
+ double uppercut = m_data[i].rt->tUpper();
+ double lowercut = m_data[i].rt->tLower();
+ // Penalty for t<lowercut and t >uppercut
+ if (t> uppercut ) { // too large
+ fval += (t-uppercut)* (t-uppercut)*0.1;
+ } else if (t < 0 ) {// too small
+ fval += (t-lowercut)*(t-lowercut)*0.1;
+ }
+ if(t<lowercut) r = m_data[i].rt->radius(lowercut);
+ else if(t>uppercut) r = m_data[i].rt->radius(uppercut);
+ else r = m_data[i].rt->radius(t);
+ fval += (dist - r)*(dist - r)*w;
+ }
+ return fval;
+ }
+ ROOT::Math::IBaseFunctionMultiDim* Clone() const {return new FunctionToMinimize(m_used);}
+ unsigned int NDim() const {return 3;}
+ void setT0Error(const int t0Error){m_t0Error=t0Error;}
+ void addCoords(const double z, const double t, const double y, const double w, const double r, const MuonCalib::IRtRelation *rt){
+ HitCoords coords;
+ coords.z=z;
+ coords.t=t;
+ coords.y=y;
+ coords.w=w;
+ coords.r=r;
+ coords.rt=rt;
+ m_data.push_back(coords);
+ }
+ private:
+ std::vector<HitCoords> m_data;
+ int m_used;
+ int m_t0Error;
+ };
+
MdtSegmentT0Fitter::MdtSegmentT0Fitter(const std::string& ty,const std::string& na,const IInterface* pa)
: AthAlgTool(ty,na,pa),
- DCSLFitter(),
+ DCSLFitter(),
m_ntotalCalls(0),
m_npassedNHits(0),
m_npassedSelectionConsistency(0),
@@ -54,22 +121,14 @@ namespace TrkDriftCircleMath {
m_npassedMinuitFit(0) {
declareInterface <IDCSLFitProvider> (this);
}
-
- StatusCode MdtSegmentT0Fitter::initialize() {
- TMinuit* oldMinuit = gMinuit;
- m_minuit = std::make_unique<TMinuit>(3);
- m_minuit->SetPrintLevel(-1); // -1: no output, 1: std output
- if( msgLvl(MSG::VERBOSE) ) m_minuit->SetPrintLevel(1);
- gMinuit = oldMinuit;
-
+ StatusCode MdtSegmentT0Fitter::initialize() {
ATH_CHECK(m_calibrationDbTool.retrieve());
-
return StatusCode::SUCCESS;
}
-
+
StatusCode MdtSegmentT0Fitter::finalize() {
-
+
double scaleFactor = m_ntotalCalls != 0 ? 1./(double)m_ntotalCalls : 1.;
ATH_MSG_INFO( "Summarizing fitter statistics " << "\n"
@@ -79,18 +138,17 @@ namespace TrkDriftCircleMath {
<< " sel. hits > 2 " << std::setw(10) << m_npassedNSelectedHits << " " << scaleFactor*m_npassedNSelectedHits << "\n"
<< " Hits > min hits " << std::setw(10) << m_npassedMinHits << " " << scaleFactor*m_npassedMinHits << "\n"
<< " Passed Fit " << std::setw(10) << m_npassedMinuitFit << " " << scaleFactor*m_npassedMinuitFit );
- if(gMinuit == m_minuit.get()) gMinuit = nullptr;
return StatusCode::SUCCESS;
}
-
-
+
+
/***********************************************************************************/
/// RT function from Craig Blocker
/// ok for now, possibly replace with actual RT function used to calibrate run
-
+
constexpr double T2R_A[] = {1.184169e-1, 3.32382e-2, 4.179808e-4, -5.012896e-6, 2.61497e-8, -7.800677e-11, 1.407393e-13, -1.516193e-16, 8.967997e-20, -2.238627e-23};
constexpr double RCORR_A[] = {234.3413, -5.803375, 5.061677e-2, -1.994959e-4, 4.017433e-7, -3.975037e-10, 1.522393e-13};
-
+
double rcorr(const double tin) {
double rc;
if(tin < 16.) {
@@ -104,25 +162,25 @@ namespace TrkDriftCircleMath {
}
}
rc = rc*1e-3;
-
+
return rc;
}
-
+
double t2r(const double tin) {
if(tin < 0.) return 0.;
if(tin > MAX_DRIFT) return 20.;
-
+
double tpow = 1.;
double rc = 0.;
for(int j = 0; j < 10; j++) {
rc += T2R_A[j]*tpow;
tpow *= tin;
}
-
+
rc -= rcorr(tin);
return rc;
}
-
+
/// derivatives of RT function, use to get errors
double rcorrprime(const double tin) {
double rc;
@@ -137,26 +195,26 @@ namespace TrkDriftCircleMath {
}
}
rc = rc*1e-3;
-
+
return rc;
}
-
+
double t2rprime(const double tin) {
if(tin < 0.) return 0.;
if(tin > MAX_DRIFT) return 20.;
-
+
double tpow = 1.;
double rc = 0.;
for(int j = 1; j < 10; j++) {
rc += j*T2R_A[j]*tpow;
tpow *= tin;
}
-
+
rc -= rcorrprime(tin);
return rc;
}
-
-
+
+
/// use a binary search to get rt-inverse from rt
/// assumes the function is monotonic, obviously not true for these polynomial parametrizations for all t
double r2t(const double r) {
@@ -167,7 +225,7 @@ namespace TrkDriftCircleMath {
} else if(r>t2r(tb)) {
return R2TSPURIOUS;
}
-
+
int itr = 0;
while (ta <= tb) {
double tm = (ta + tb) / 2; // compute mid point.
@@ -181,13 +239,13 @@ namespace TrkDriftCircleMath {
else if (r < rtm ) {
tb = tm; // repeat search in bottom half.
}
-
+
itr++;
if(itr>50) return -1;
}
return -1; // failed to find key
}
-
+
double r2t_ext(std::vector<const MuonCalib::IRtRelation*> *rtpointers, double r, int i) {
const MuonCalib::IRtRelation* rtrel = rtpointers->at(i);
double ta = rtrel->tLower();
@@ -197,7 +255,7 @@ namespace TrkDriftCircleMath {
} else if(r>rtrel->radius(tb)) {
return R2TSPURIOUS;
}
-
+
int itr = 0;
while (ta <= tb) {
double tm = (ta + tb) / 2; // compute mid point.
@@ -211,58 +269,12 @@ namespace TrkDriftCircleMath {
else if (r < rtm ) {
tb = tm; // repeat search in bottom half.
}
-
+
itr++;
if(itr>50) return -1;
}
return -1; // failed to find key
}
-
- /// the fit function
- /// gets distance between the line and the hit (in the frame whose direction is given by the line segment
- /// and position is given by the weighted average of all the hits), subtracts off the radius from the rt relation etc
- void mdtSegmentT0Fcn(Int_t &/*npar*/, Double_t* grad, Double_t &fval, Double_t* par, Int_t jflag) {
- if(jflag < 0) grad[0] = 0.;
-
- double ang = par[0];
- double b = par[1];
- double t0 = par[2];
-
- double cosin = std::cos(ang);
- double sinus = std::sin(ang);
-
- fval = 0.;
- // Add t0 constraint
- if (g_fcnData->t0Error == WEAK_TOPO_T0ERROR ) {
- fval += par[2]*par[2]/(1.0 *g_fcnData->t0Error*g_fcnData->t0Error);
- }
- double t, r, z, y, w, dist;
- for(int i = 0; i < g_fcnData->used ; i++) {
- t = g_fcnData->data[i].t - t0;
- z = g_fcnData->data[i].z;
- y = g_fcnData->data[i].y;
- w = g_fcnData->data[i].w;
- dist = std::abs(b*cosin + z*sinus - y*cosin); // same thing as fabs(a*z - y + b)/sqrt(1. + a*a);
- double uppercut = g_fcnData->data[i].rt->tUpper();
- double lowercut = g_fcnData->data[i].rt->tLower();
-// Penalty for t<lowercut and t >uppercut
- if (t> uppercut ) { // too large
- fval += (t-uppercut)* (t-uppercut)*0.1;
- }else if (t < 0 ) {// too small
- fval += (t-lowercut)*(t-lowercut)*0.1;
- }
- if(t<lowercut) r = g_fcnData->data[i].rt->radius(lowercut);
- else if(t>uppercut) r = g_fcnData->data[i].rt->radius(uppercut);
- else r = g_fcnData->data[i].rt->radius(t);
- fval += (dist - r)*(dist - r)*w;
-
- }
-
- return;
- }
- /***********************************************************************************/
-
-
int sign(double a) {
if(a>0) return 1;
if(a<0) return -1;
@@ -272,16 +284,13 @@ namespace TrkDriftCircleMath {
++m_ntotalCalls;
if(m_trace) ATH_MSG_DEBUG("New seg: ");
-
+
const DCOnTrackVec& dcs_keep = dcs;
unsigned int N = dcs_keep.size();
- std::unique_ptr<MdtSegmentT0FcnData> fcnData = std::make_unique<MdtSegmentT0FcnData>();
-
- fcnData->used=0;
result.setT0Shift(-99999,-99999);
-
+
if(N<2) {
return false;
}
@@ -289,27 +298,28 @@ namespace TrkDriftCircleMath {
if( selection.size() != N ) {
ATH_MSG_ERROR("MdtSegmentT0Fitter.cxx:fit with t0 <bad HitSelection>");
return false;
- }
+ }
++m_npassedSelectionConsistency;
+ int used=0;
for(unsigned int i=0;i<N;++i){
- if( selection[i] == 0 ) ++(fcnData->used);
+ if( selection[i] == 0 ) ++used;
}
- if(fcnData->used < 2){
+ if(used < 2){
if(m_trace) ATH_MSG_DEBUG("TOO FEW HITS SELECTED");
return false;
}
++m_npassedNSelectedHits;
- if(fcnData->used < m_minHits) {
- if(m_trace) ATH_MSG_DEBUG("FEWER THAN Minimum HITS N " << m_minHits << " total hits " <<N<<" used " << fcnData->used);
+ if(used < m_minHits) {
+ if(m_trace) ATH_MSG_DEBUG("FEWER THAN Minimum HITS N " << m_minHits << " total hits " <<N<<" used " << used);
//
// Copy driftcircles and reset the drift radii as they might have been overwritten
- // after a succesfull t0 fit
- //
+ // after a succesfull t0 fit
+ //
DCOnTrackVec::const_iterator it = dcs.begin();
DCOnTrackVec::const_iterator it_end = dcs.end();
-
+
DCOnTrackVec dcs_new;
dcs_new.reserve(dcs.size());
double chi2p = 0.;
@@ -330,7 +340,7 @@ namespace TrkDriftCircleMath {
}
}
if(m_trace&&chi2p>0) ATH_MSG_DEBUG("NO Minuit Fit TOO few hits Chi2 penalty " << chi2p);
- bool oldrefit = DCSLFitter::fit( result, line, dcs_new, selection );
+ bool oldrefit = DCSLFitter::fit( result, line, dcs_new, selection );
chi2p += result.chi2();
// add chi2 penalty for too large or too small driftTimes t < 0 or t> t upper
result.set(chi2p, result.ndof(), result.dtheta(), result.dy0());
@@ -339,16 +349,16 @@ namespace TrkDriftCircleMath {
if(m_trace) ATH_MSG_DEBUG(" chi2 total " << result.chi2() << " angle " << result.line().phi() << " y0 " << result.line().y0() << " nhits "<< selection.size() << " refit ok " << iok);
return oldrefit;
} else {
- if(m_trace) ATH_MSG_DEBUG("FITTING FOR T0 N "<<N<<" used " << fcnData->used);
- }
+ if(m_trace) ATH_MSG_DEBUG("FITTING FOR T0 N "<<N<<" used " << used);
+ }
++m_npassedMinHits;
-
+
if (m_trace) {
ATH_MSG_DEBUG(" in MdtSegmentT0Fitter::fit with N dcs "<< N << " hit selection size " << selection.size());
ATH_MSG_DEBUG("in fit "<<result.hasT0Shift()<< " " <<result.t0Shift());
}
-
+
double Zc(0);
double Yc(0);
double S(0);
@@ -356,15 +366,14 @@ namespace TrkDriftCircleMath {
double Sy(0);
std::vector<double> y(N);
std::vector<double> z(N);
- std::vector<double> w(N);
+ std::vector<double> w(N);
std::vector<double> r(N);
std::vector<double> dr(N);
std::vector<double> t(N);
std::vector<const MuonCalib::IRtRelation*> rtpointers(N);
-
- // allocate memory for data
- if(fcnData->data.capacity() != 50) fcnData->data.reserve(50);
- fcnData->data.resize(fcnData->used);
+
+ FunctionToMinimize minFunct(used);
+
{
DCOnTrackVec::const_iterator it = dcs_keep.begin();
DCOnTrackVec::const_iterator it_end = dcs_keep.end();
@@ -378,7 +387,7 @@ namespace TrkDriftCircleMath {
y[ii] = it->y();
z[ii] = it->x();
r[ii] = std::abs(roto->driftRadius());
- dr[ii] = it->dr();
+ dr[ii] = it->dr();
const Muon::MdtPrepData *peerd;
peerd = dynamic_cast<const Muon::MdtPrepData*>(roto->prepRawData());
if(!peerd) {
@@ -390,7 +399,7 @@ namespace TrkDriftCircleMath {
rtpointers[ii] = rtInfo->rt();
t[ii] = roto->driftTime();
- double newerror = m_scaleErrors ? it->drPrecise() : it->dr();
+ double newerror = m_scaleErrors ? it->drPrecise() : it->dr();
if( newerror > 0.) w[ii] = 1./(newerror);
else w[ii] = 0.;
@@ -401,7 +410,7 @@ namespace TrkDriftCircleMath {
}
if(m_trace) ATH_MSG_DEBUG("DC: (" << y[ii] << "," << z[ii] << ") R = " << r[ii] << " W " << w[ii] <<" t " <<t[ii]<< " id: "<<it->id()<<" sel " << selection[ii]);
-
+
if( selection[ii] == 0 ){
S+=w[ii];
Sz+= w[ii]*z[ii];
@@ -415,15 +424,15 @@ namespace TrkDriftCircleMath {
const double inv_S = 1. / S;
Zc = Sz*inv_S;
Yc = Sy*inv_S;
-
+
if(m_trace) ATH_MSG_DEBUG("Yc " << Yc << " Zc " << Zc);
-
+
/// go to coordinates centered at the average of the hits
for(unsigned int i=0;i<N;++i) {
y[i] -= Yc;
z[i] -= Zc;
}
-
+
int selcount(0);
DCOnTrackVec::const_iterator it = dcs_keep.begin();
DCOnTrackVec::const_iterator it_end = dcs_keep.end();
@@ -433,22 +442,16 @@ namespace TrkDriftCircleMath {
// tlower_i < ti - t0 < tupper_i
double min_tlower=1e10;
double max_tupper=-1e10;
-
+
double t0seed=0; // the average t0 of the hit
double st0 = 0; // the std deviation of the hit t0s
double min_t0 = 1e10; // the smallest t0 seen
double tee0, tl, th;
-
-
+
+
for(int ii=0 ;it!=it_end; ++it, ++ii ){
if( selection[ii] == 0 ) {
- fcnData->data[selcount].z = z[ii];
- fcnData->data[selcount].y = y[ii];
- fcnData->data[selcount].r = r[ii];
- fcnData->data[selcount].w = w[ii];
- fcnData->data[selcount].rt = rtpointers[ii];
- double r2tval;
- r2tval = r2t_ext(&rtpointers, r[ii], ii) ;
+ double r2tval = r2t_ext(&rtpointers, r[ii], ii) ;
tl = rtpointers[ii]->tLower();
th = rtpointers[ii]->tUpper();
if(t[ii] - tl < min_tlower) min_tlower = t[ii] - tl;
@@ -468,10 +471,11 @@ namespace TrkDriftCircleMath {
t0seed += tee0;
st0 += tee0*tee0;
if(tee0 < min_t0 && std::abs(r2tval) < R2TSPURIOUS) min_t0 = tee0;
-
- fcnData->data[selcount].t = t[ii];
+
+ minFunct.addCoords(z[ii], t[ii], y[ii], w[ii], r[ii], rtpointers[ii]);
+
selcount++;
- }
+ }
}
t0seed /= selcount;
st0 = st0/selcount - t0seed*t0seed;
@@ -483,7 +487,7 @@ namespace TrkDriftCircleMath {
double theta = line.phi();
double cosin = std::cos(theta);
double sinus = std::sin(theta);
-
+
if ( sinus < 0.0 ) {
sinus = -sinus;
cosin = -cosin;
@@ -491,17 +495,17 @@ namespace TrkDriftCircleMath {
cosin = -cosin;
}
if(m_trace) ATH_MSG_DEBUG("before fit theta "<<theta<<" sinus "<<sinus<< " cosin "<< cosin);
-
+
double d = line.y0() + Zc*sinus-Yc*cosin;
-
+
if(m_trace) {
ATH_MSG_DEBUG(" line x y "<<line.position().x()<<" "<<line.position().y());
ATH_MSG_DEBUG(" Zc Yc "<< Zc <<" "<<Yc);
ATH_MSG_DEBUG(" line x0 y0 "<<line.x0()<<" "<<line.y0());
ATH_MSG_DEBUG(" hit shift " << -Zc*sinus+Yc*cosin);
- }
+ }
-// Calculate signed radii
+// Calculate signed radii
int nml1p = 0;
int nml2p = 0;
@@ -518,21 +522,23 @@ namespace TrkDriftCircleMath {
if(it->id().ml()==1&&sdist < 0) nml2n++;
}
-// Define t0 constraint in Minuit
- fcnData->t0Error = STRONG_TOPO_T0ERROR;
- if (nml1p+nml2p < 2 || nml1n+nml2n < 2) fcnData->t0Error = WEAK_TOPO_T0ERROR;
+// Define t0 constraint in Minuit
+ int t0Error = STRONG_TOPO_T0ERROR;
+ if (nml1p+nml2p < 2 || nml1n+nml2n < 2) t0Error = WEAK_TOPO_T0ERROR;
+
+ minFunct.setT0Error(t0Error);
// Reject topologies where in one of the Multilayers no +- combination is present
if((nml1p<1||nml1n<1)&&(nml2p<1||nml2n<1)&&m_rejectWeakTopologies) {
- if(m_trace) ATH_MSG_DEBUG("Combination rejected for positive radii ML1 " << nml1p << " ML2 " << nml2p << " negative radii ML1 " << nml1n << " ML " << nml2n << " used hits " << fcnData->used << " t0 Error " << fcnData->t0Error);
+ if(m_trace) ATH_MSG_DEBUG("Combination rejected for positive radii ML1 " << nml1p << " ML2 " << nml2p << " negative radii ML1 " << nml1n << " ML " << nml2n << " used hits " << used << " t0 Error " << t0Error);
it = dcs.begin();
it_end = dcs.end();
- double chi2p = 0.;
+ double chi2p = 0.;
DCOnTrackVec dcs_new;
dcs_new.reserve(dcs.size());
for(int i=0; it!=it_end; ++it, ++i ){
const DriftCircle* ds = & dcs[i];
- if(std::abs(ds->r()-ds->rot()->driftRadius())>m_dRTol && m_trace) ATH_MSG_DEBUG("Different radii on dc " << ds->r() << " rot " << ds->rot()->driftRadius());
+ if(std::abs(ds->r()-ds->rot()->driftRadius())>m_dRTol && m_trace) ATH_MSG_DEBUG("Different radii on dc " << ds->r() << " rot " << ds->rot()->driftRadius());
DriftCircle dc_keep(ds->position(), ds->rot()->driftRadius(), ds->dr(), ds->drPrecise(), ds->state(), ds->id(), ds->index(),ds->rot() );
DCOnTrack dc_new(dc_keep, 0., 0.);
dc_new.state(dcs[i].state());
@@ -544,137 +550,48 @@ namespace TrkDriftCircleMath {
double tLow = rtInfo->rt()->tLower();
if(t<tLow) chi2p += (t-tLow)*(t-tLow)*0.1;
if(t>tUp) chi2p += (t-tUp)*(t-tUp)*0.1;
- }
+ }
}
if(m_trace&&chi2p>0) ATH_MSG_DEBUG(" Rejected weak topology Chi2 penalty " << chi2p);
- bool oldrefit = DCSLFitter::fit( result, line, dcs_new, selection );
+ bool oldrefit = DCSLFitter::fit( result, line, dcs_new, selection );
chi2p += result.chi2();
// add chi2 penalty for too large or too small driftTimes t < 0 or t> t upper
result.set( chi2p, result.ndof(), result.dtheta(), result.dy0() );
return oldrefit;
- } // end rejection of weak topologies
-
- if(m_trace) ATH_MSG_DEBUG("positive radii ML1 " << nml1p << " ML2 " << nml2p << " negative radii ML1 " << nml1n << " ML " << nml2n << " used hits " << fcnData->used << " t0 Error " << fcnData->t0Error);
-
- int errFlag = 0;
- int errFlag1 = 0;
- int errFlag2 = 0;
- int errFlag3 = 0;
- int errFlag4 = 0;
- int errFlag5 = 0;
- {
- // The part where the fcn gets used, requires locking to protect fcnData from concurrent access
- std::scoped_lock lock(g_fcnDataMutex);
- g_fcnData = fcnData.get();
-
- m_minuit->SetFCN(mdtSegmentT0Fcn);
- Double_t arglist[3];
-
- // Set printout level
- arglist[0] = -1;
- // Clear previous fit
- m_minuit->mncler();
- arglist[0] = -1;
-
- Double_t vstart[3];
- vstart[0] = theta;
- // x' = x - xc, y' = y - yc => y' = m x' + b + m xc - yc
- // and b = yc - m xc
- vstart[1] = d ;
- vstart[2] = 0 ;
-
- // if t0Seed value from outside use this
- if(t0Seed > -999.) vstart[2] = t0Seed;
-
- Double_t step[3] = {0.01 , 0.01 , 0.1 };
-
- if(m_trace) {
- ATH_MSG_DEBUG("\n____________INITIAL VALUES________________" );
- ATH_MSG_DEBUG("Theta " << theta << "("<<std::tan(theta)<<") d " << vstart[1]);
- }
-
+ } // end rejection of weak topologies
- m_minuit->mnparm(0, "a", vstart[0], step[0], -0.5, 3.5,errFlag);
- m_minuit->mnparm(1, "b", vstart[1], step[1], 0., 0.,errFlag);
- m_minuit->mnparm(2, "t0", vstart[2], step[2], 0., 0.,errFlag);
+ if(m_trace) ATH_MSG_DEBUG("positive radii ML1 " << nml1p << " ML2 " << nml2p << " negative radii ML1 " << nml1n << " ML " << nml2n << " used hits " << used << " t0 Error " << t0Error);
- if (errFlag !=0 &&m_trace) {
- ATH_MSG_DEBUG("ALARM with steering of Minuit variable " << errFlag);
- }
-
- m_minuit->FixParameter(0);
- m_minuit->FixParameter(1);
-
- m_minuit->mnexcm("MINIMIZE", arglist, 0,errFlag1);
-
- m_minuit->Release(0);
- m_minuit->Release(1);
- m_minuit->FixParameter(2);
- m_minuit->mnexcm("MINIMIZE", arglist, 0,errFlag2);
- m_minuit->mnexcm("MIGRAD", arglist, 0,errFlag3);
- m_minuit->Release(2);
- m_minuit->mnexcm("MINIMIZE", arglist, 0,errFlag4);
- m_minuit->mnexcm("MIGRAD", arglist, 0,errFlag5);
- if(errFlag5!=0&&errFlag4==0) {
- m_minuit->mnexcm("MINIMIZE", arglist, 0,errFlag4);
- if (errFlag4 == 0 &&m_trace) {
- ATH_MSG_DEBUG(" ALARM Fall back to MINIMIZE " << errFlag4);
- }
- }
- g_fcnData = nullptr;
- } // end of scoped_lock
-
- // Get the chisquare and errors
- double chisq(0);
- double edm(0);
- double errdef(0);
- int npari(0);
- int nparx(0);
- int icstat(0);
- m_minuit->mnstat(chisq, edm, errdef, npari, nparx, icstat);
-
- int fitretval = errFlag5;
- if (npari<0 || nparx < 0 || chisq < 0) ATH_MSG_WARNING("MdtSegmentT0Fitter MINUIT problem " << " chisq "<<chisq<<" npari "<<npari<<" nparx "<< nparx <<" fitretval "<< fitretval<<" (cf. ATLASRECTS-5795)");
-
- if (fitretval !=0 &&m_trace) {
- ATH_MSG_DEBUG( " ALARM return value " << fitretval );
- }
- if(m_dumpToFile) {
- std::ofstream ff;
- ff.open("fitres.txt", std::ios::out | std::ios::app);
- ff<<npari<<" "<<nparx<<" "<<fitretval<<" "<<chisq<< " "<< std::endl;
- ff.close();
- }
- if(m_trace) ATH_MSG_DEBUG("chisq "<<chisq<<" npari "<<npari<<" nparx "<<nparx<<" fitretval "<<fitretval);
+ Double_t step[3] = {0.01 , 0.01 , 0.1 };
+ // starting point
+ Double_t variable[3] = {theta,d,0};
+ // if t0Seed value from outside use this
+ if(t0Seed > -999.) variable[2] = t0Seed;
- // Do standard DCSL fit if minuit is bad
- // Do standard DCSL fit if all fits from minuit are bad
- if (errFlag5!=0&&errFlag4!=0&&errFlag3!=0&&errFlag2!=0&&errFlag1!=0) {
- if(m_trace)ATH_MSG_DEBUG(" ALARM Minimize fix " << errFlag1 << " ALARM minimize release " << errFlag2
- << " ALARM migrad fix 1 " << errFlag3 << " ALARM minimize all free" << errFlag4 << " ALARM migrad all free "
- << errFlag5);
+ ROOT::Minuit2::Minuit2Minimizer minimum("algoName");
+ minimum.SetMaxFunctionCalls(1000000);
+ minimum.SetTolerance(0.001);
+ minimum.SetPrintLevel(-1);
+ if(msgLvl(MSG::VERBOSE)) minimum.SetPrintLevel(1);
+
+ minimum.SetVariable(0,"a",variable[0], step[0]);
+ minimum.SetVariable(1,"b",variable[1], step[1]);
+ minimum.SetVariable(2,"t0",variable[2], step[2]);
+
+ minimum.SetFunction(minFunct);
+
+ // do the minimization
+ minimum.Minimize();
+
+ const double *results = minimum.X();
+ const double *errors = minimum.Errors();
+ ATH_MSG_DEBUG("Minimum: f(" << results[0] << "+-" << errors[0] << "," << results[1]<< "+-" << errors[1]<< "," << results[2] << "+-" << errors[2]<< "): " << minimum.MinValue());
- DCOnTrackVec dcs_new;
- dcs_new.reserve(dcs.size());
- DCOnTrackVec::const_iterator it = dcs.begin();
- DCOnTrackVec::const_iterator it_end = dcs.end();
-
- for(int i=0; it!=it_end; ++it, ++i ){
- const DriftCircle* ds = & dcs[i];
- DriftCircle dc_keep(ds->position(), ds->rot()->driftRadius(), ds->dr(), ds->drPrecise(), ds->state(), ds->id(), ds->index(),ds->rot() );
- DCOnTrack dc_new(dc_keep, 0., 0.);
- dc_new.state(dcs[i].state());
- dcs_new.push_back( dc_new );
- }
- bool oldrefit = DCSLFitter::fit( result, line , dcs_new, selection );
- return oldrefit;
- }
++m_npassedMinuitFit;
// Get the fit values
- double aret(0);
- double aErr(0);
- m_minuit->GetParameter(0,aret,aErr); // theta returned
+ double aret=results[0];
+ double aErr=errors[0];
double dtheta = aErr;
double tana = std::tan(aret); // tangent of angle
double ang = aret; // between zero and pi
@@ -687,80 +604,73 @@ namespace TrkDriftCircleMath {
cosin = -cosin;
}
ang = std::atan2(sinus, cosin);
-
-
- double b(0);
- double bErr(0);
- m_minuit->GetParameter(1,b,bErr); // intercept
- double t0(0);
- double t0Err(0);
- m_minuit->GetParameter(2,t0,t0Err);
+ double b=results[1];
+ double bErr=errors[1];
+ double t0=results[2];
+ double t0Err=errors[2];
double dy0 = cosin * bErr - b * sinus * aErr;
-
+
double del_t;
del_t = std::abs(rtpointers[0]->radius((t0+t0Err)) - rtpointers[0]->radius(t0)) ;
-
+
if(m_trace) {
ATH_MSG_DEBUG("____________FINAL VALUES________________" );
ATH_MSG_DEBUG("Values: a "<<tana<<" d "<<b * cosin <<" t0 "<<t0);
ATH_MSG_DEBUG("Errors: a "<<aErr<<" b "<<dy0 <<" t0 "<<t0Err);
}
d = b * cosin;
- double covar[3][3];
- m_minuit->mnemat(&covar[0][0],3); // 3x3
if(m_trace) {
msg() << MSG::DEBUG <<"COVAR ";
for(int it1=0; it1<3; it1++) {
for(int it2=0; it2<3; it2++) {
- msg() << MSG::DEBUG <<covar[it1][it2]<<" ";
+ msg() << MSG::DEBUG <<minimum.CovMatrix(it1,it2)<<" ";
}
msg() << MSG::DEBUG << endmsg;
}
}
-
+
result.dcs().clear();
result.clusters().clear();
result.emptyTubes().clear();
if(m_trace) ATH_MSG_DEBUG("after fit theta "<<ang<<" sinus "<<sinus<< " cosin "<< cosin);
-
+
double chi2 = 0;
unsigned int nhits(0);
double yl;
-
-
+
// calculate predicted hit positions from track parameters
it = dcs_keep.begin();
it_end = dcs_keep.end();
ATH_MSG_DEBUG("------NEW HITS------");
-
+
for(int i=0; it!=it_end; ++it, ++i ){
double rad, drad;
-
+
double uppercut = rtpointers[i]->tUpper();
double lowercut = rtpointers[i]->tLower();
rad = rtpointers[i]->radius(t[i]-t0);
- if(t[i]-t0<lowercut) rad = rtpointers[i]->radius(lowercut);
- if(t[i]-t0>uppercut) rad = rtpointers[i]->radius(uppercut);
+ if(t[i]-t0<lowercut) rad = rtpointers[i]->radius(lowercut);
+ if(t[i]-t0>uppercut) rad = rtpointers[i]->radius(uppercut);
if (w[i]==0) {
ATH_MSG_WARNING("w[i]==0, continuing");
continue;
}
- drad = 1.0/std::sqrt(w[i]) ;
-
+ drad = 1.0/std::sqrt(w[i]) ;
+
yl = (y[i] - tana*z[i] - b);
if(m_trace) {
ATH_MSG_DEBUG("i "<<i<<" ");
}
-
+
double dth = -(sinus*y[i] + cosin*z[i])*dtheta;
double residuals = std::abs(yl)/std::sqrt(1+tana*tana) - rad;
if(m_trace) {
ATH_MSG_DEBUG(" dth "<<dth<<" dy0 "<<dy0<<" del_t "<<del_t);
}
-
+
double errorResiduals = std::hypot(dth, dy0, del_t);
-
+
// derivatives of the residual 'R'
double deriv[3];
// del R/del theta
@@ -769,13 +679,13 @@ namespace TrkDriftCircleMath {
// del R / del b
deriv[1] = sign(dd) * cosin ;
// del R / del t0
-
+
deriv[2] = -1* rtpointers[i]->driftvelocity(t[i]-t0);
-
+
double covsq=0;
for(int rr=0; rr<3; rr++) {
for(int cc=0; cc<3; cc++) {
- covsq += deriv[rr]*covar[rr][cc]* deriv[cc];
+ covsq += deriv[rr]*minimum.CovMatrix(rr,cc)* deriv[cc];
}
}
if(m_trace) {
@@ -783,21 +693,21 @@ namespace TrkDriftCircleMath {
if( covsq < 0. ){
for(int rr=0; rr<3; rr++) {
for(int cc=0; cc<3; cc++) {
- double dot = deriv[rr]*covar[rr][cc]* deriv[cc];
- ATH_MSG_DEBUG(" adding term " << dot << " dev1 " << deriv[rr] << " cov " << covar[rr][cc] << " dev2 " << deriv[cc]);
+ double dot = deriv[rr]*minimum.CovMatrix(rr,cc)* deriv[cc];
+ ATH_MSG_DEBUG(" adding term " << dot << " dev1 " << deriv[rr] << " cov " << minimum.CovMatrix(rr,cc) << " dev2 " << deriv[cc]);
}
}
}
}
covsq = covsq > 0. ? std::sqrt(covsq) : 0.;
const DriftCircle* ds = & dcs_keep[i];
- if (m_propagateErrors) drad = dr[i];
+ if (m_propagateErrors) drad = dr[i];
DriftCircle dc_newrad(dcs_keep[i].position(), rad, drad, ds->state(), dcs_keep[i].id(), dcs_keep[i].index(),ds->rot() );
DCOnTrack dc_new(dc_newrad, residuals, covsq);
dc_new.state(dcs_keep[i].state());
-
+
if(m_trace) ATH_MSG_DEBUG("T0 Segment hit res "<<residuals<<" eres "<<errorResiduals<<" covsq "<<covsq<<" ri " << r[i]<<" ro "<<rad<<" drad "<<drad << " sel "<<selection[i]<< " inv error " << w[i]);
-
+
if( selection[i] == 0 ) {
++nhits;
if (!m_propagateErrors) {
@@ -807,15 +717,15 @@ namespace TrkDriftCircleMath {
}
if(m_trace) ATH_MSG_DEBUG("T0 Segment hit res "<<residuals<<" eres "<<errorResiduals<<" covsq "<<covsq<<" ri " << r[i]<<" radius after t0 "<<rad<<" radius error "<< drad << " original error " << dr[i]);
// Put chi2 penalty for drift times outside window
- if (t[i]-t0> uppercut ) { // too large
+ if (t[i]-t0> uppercut ) { // too large
chi2 += (t[i]-t0-uppercut)* (t[i]-t0-uppercut)*0.1;
}else if (t[i]-t0 < lowercut ) {// too small
chi2 += ((t[i]-t0-lowercut)*(t[i]-t0-lowercut))*0.1;
}
- }
+ }
result.dcs().push_back( dc_new );
}
-
+
double oldshift;
oldshift = result.t0Shift();
if(m_trace) ATH_MSG_DEBUG("end fit old "<<oldshift<< " new " <<t0);
@@ -836,10 +746,9 @@ namespace TrkDriftCircleMath {
if(chi2/(nhits-NUMPAR) > 5) {
ATH_MSG_DEBUG("_______NOT GOOD ");
}
- ATH_MSG_DEBUG("chi2 "<<chi2<<" per dof "<<chi2/(nhits-NUMPAR)<<" root chisq "<<chisq);
+ ATH_MSG_DEBUG("chi2 "<<chi2<<" per dof "<<chi2/(nhits-NUMPAR));
}
return true;
}
-
-}
+}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx
index 7679206d8f0a891a690c98135eada94e374b30a9..23da18bc16c70972d1194486355b614c75585b6f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx
@@ -152,7 +152,8 @@ namespace Muon {
}else{
Trk::TrackSummary tmpSum(*summary0);
m_trackSummaryTool->addDetailedTrackSummary(*track,tmpSum);
- if( tmpSum.muonTrackSummary() ) nhits0 = muonSummary0->netaHits()+ muonSummary0->nphiHits();
+ muonSummary0 = tmpSum.muonTrackSummary();
+ if( muonSummary0 ) nhits0 = muonSummary0->netaHits()+ muonSummary0->nphiHits();
}
}else{
Trk::TrackSummary tmpSummary;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx
index 086c1b5be455e0765c219ecc14468ad53db5893b..d12909b845c2b736b8944b519f66c9a93d16f2ed 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx
@@ -61,6 +61,17 @@ namespace Muon {
return StatusCode::SUCCESS;
}
+ StatusCode MuPatCandidateTool::stop() {
+
+ // Clean up all garbage now.
+ // If we leave it for later, we may end up with dangling references
+ // to Surface objects that have already been deleted.
+ for (CacheEntry& ent : m_cache) {
+ ent.cleanUp();
+ }
+ return StatusCode::SUCCESS;
+ }
+
MuPatSegment* MuPatCandidateTool::createSegInfo( const MuonSegment& segment ) const
{
CacheEntry& ent = getCache();
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
index 9408b03df006abd7444dad72da8a6ba1340789d7..da0186c3a723ffc399ca305b01ae7c0405782c2b 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
@@ -65,13 +65,16 @@ namespace Muon {
MuPatCandidateTool(const std::string&, const std::string&, const IInterface*);
/** destructor */
- ~MuPatCandidateTool() = default;
+ virtual ~MuPatCandidateTool() = default;
/** initialize method, method taken from bass-class AlgTool */
- StatusCode initialize();
+ virtual StatusCode initialize() override;
/** finialize method, method taken from bass-class AlgTool */
- StatusCode finalize();
+ virtual StatusCode finalize() override;
+
+ /** stop method, used to clean up garbage */
+ virtual StatusCode stop() override;
/** @brief access to tool interface */
static const InterfaceID& interfaceID() { return IID_MuPatCandidateTool; }
diff --git a/MuonSpectrometer/MuonTruthAlgs/MuonTruthAlgs/MuonTrackTruthTool.h b/MuonSpectrometer/MuonTruthAlgs/MuonTruthAlgs/MuonTrackTruthTool.h
index d755688f54de5668a14487f48a4b2c8f27dfb5a6..d919b8381b1cc45a8e57d17b510176576fabed2e 100644
--- a/MuonSpectrometer/MuonTruthAlgs/MuonTruthAlgs/MuonTrackTruthTool.h
+++ b/MuonSpectrometer/MuonTruthAlgs/MuonTruthAlgs/MuonTrackTruthTool.h
@@ -147,7 +147,7 @@ namespace Muon {
ToolHandle<Trk::ITruthTrajectoryBuilder> m_truthTrajectoryBuilder{this,"TruthTrajectoryBuilder","Muon::MuonDecayTruthTrajectoryBuilder/MuonDecayTruthTrajectoryBuilder"};
mutable TruthTree m_truthTree;
- mutable std::vector<TruthTrajectory*> m_truthTrajectoriesToBeDeleted;
+ mutable std::vector<std::unique_ptr<TruthTrajectory> > m_truthTrajectoriesToBeDeleted;
mutable std::map<int,int> m_barcodeMap; // map used to link barcode of TrackRecord particles/hits to 'final' state barcode
Gaudi::Property<bool> m_manipulateBarCode{this,"ManipulateBarCode",false};
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
index c343b108ef4b51159869e2aea340876b05d83bca..e5e4cf377e319a9d5db1b722d4341f59368ef625 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
@@ -156,13 +156,13 @@ namespace Muon {
}
ATH_MSG_VERBOSE(" found new particle with pdgid " << PDGCode << " in truth record, barcode " << barcode);
- TruthTrajectory* truthTrajectory = 0;
+ std::unique_ptr<TruthTrajectory> truthTrajectory;
// associate the muon truth with the gen event info
if( genEvent ){
HepMC::GenParticle* genParticle = genEvent->barcode_to_particle( (*tr_it).GetBarCode() );
if( genParticle ){
- truthTrajectory = new TruthTrajectory();
- m_truthTrajectoryBuilder->buildTruthTrajectory(truthTrajectory,genParticle);
+ truthTrajectory = std::make_unique<TruthTrajectory>();
+ m_truthTrajectoryBuilder->buildTruthTrajectory(truthTrajectory.get(),genParticle);
if( !truthTrajectory->empty() ){
// always use barcode of the 'final' particle in chain in map
@@ -212,8 +212,8 @@ namespace Muon {
TruthTreeEntry& entry = m_truthTree[barcode];
entry.truthTrack = &(*tr_it);
- entry.truthTrajectory = truthTrajectory;
- m_truthTrajectoriesToBeDeleted.push_back(truthTrajectory);
+ entry.truthTrajectory = truthTrajectory.get();
+ m_truthTrajectoriesToBeDeleted.push_back(std::move(truthTrajectory));
}
// add sim data collections
@@ -698,9 +698,6 @@ namespace Muon {
void MuonTrackTruthTool::clear() const {
m_truthTree.clear();
m_barcodeMap.clear();
- std::vector<TruthTrajectory*>::iterator dit = m_truthTrajectoriesToBeDeleted.begin();
- std::vector<TruthTrajectory*>::iterator dit_end = m_truthTrajectoriesToBeDeleted.end();
- for( ;dit!=dit_end;++dit ) delete *dit;
m_truthTrajectoriesToBeDeleted.clear();
}
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx
index 1199406c5469d84c760a14048be2323c8a9b8e34..e531dc87f97a318010afcc347ecae3885dba3767 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx
@@ -163,8 +163,10 @@ namespace Muon {
// loop over chamber layers
for( const auto& lay : ids ){
// skip empty layers
- Amg::Vector3D* firstPos = 0;
- Amg::Vector3D* secondPos = 0;
+ Amg::Vector3D firstPos = Amg::Vector3D::Zero();
+ Amg::Vector3D secondPos = Amg::Vector3D::Zero();
+ bool firstPosSet = false;
+ bool secondPosSet = false;
Identifier chId;
int index = -1;
uint8_t nprecLayers = 0;
@@ -218,14 +220,18 @@ namespace Muon {
if( isEndcap ) return fabs(p1.z()) < fabs(p2.z());
else return p1.perp() < p2.perp();
};
- if( !firstPos ) firstPos = new Amg::Vector3D(gpos);
- else if( !secondPos ){
- secondPos = new Amg::Vector3D(gpos);
- if( isSmaller(*secondPos,*firstPos) ) std::swap(firstPos,secondPos);
+ if( !firstPosSet ) {
+ firstPos = gpos;
+ firstPosSet = true;
+ }
+ else if( !secondPosSet ){
+ secondPos = gpos;
+ secondPosSet = true;
+ if( isSmaller(secondPos,firstPos) ) std::swap(firstPos,secondPos);
}else{
// update position if we can increase the distance between the two positions
- if( isSmaller(gpos,*firstPos) ) *firstPos = gpos;
- else if( isSmaller(*secondPos,gpos) ) *secondPos = gpos;
+ if( isSmaller(gpos,firstPos) ) firstPos = gpos;
+ else if( isSmaller(secondPos,gpos) ) secondPos = gpos;
}
}
}
@@ -238,14 +244,18 @@ namespace Muon {
Amg::Vector3D locpos(0,pos->second.getdeposits()[0].second.ypos(),pos->second.getdeposits()[0].second.zpos());
gpos=descriptor->localToGlobalCoords(locpos,m_idHelperSvc->cscIdHelper().elementID(id));
ATH_MSG_DEBUG("got CSC global position "<<gpos);
- if( !firstPos ) firstPos = new Amg::Vector3D(gpos);
- else if( !secondPos ){
- secondPos = new Amg::Vector3D(gpos);
- if(secondPos->perp()<firstPos->perp()) std::swap(firstPos,secondPos);
+ if( !firstPosSet ) {
+ firstPos = gpos;
+ firstPosSet = true;
+ }
+ else if( !secondPosSet ){
+ secondPos = gpos;
+ secondPosSet = true;
+ if(secondPos.perp() < firstPos.perp()) std::swap(firstPos,secondPos);
}
else{
- if( gpos.perp()<firstPos->perp() ) *firstPos = gpos;
- else if( secondPos->perp()<gpos.perp() ) *secondPos = gpos;
+ if( gpos.perp() < firstPos.perp() ) firstPos = gpos;
+ else if( secondPos.perp() < gpos.perp() ) secondPos = gpos;
}
}
}
@@ -272,16 +282,14 @@ namespace Muon {
MuonStationIndex::ChIndex chIndex = m_idHelperSvc->chamberIndex(chId);
segment->setIdentifier(sector,chIndex,eta,technology);
}
- if( firstPos && secondPos ){
- Amg::Vector3D gpos = (*firstPos+*secondPos)/2.;
- Amg::Vector3D gdir = (*firstPos-*secondPos).unit();
+ if( firstPosSet && secondPosSet ){
+ Amg::Vector3D gpos = (firstPos+secondPos)/2.;
+ Amg::Vector3D gdir = (firstPos-secondPos).unit();
ATH_MSG_DEBUG(" got position : r " << gpos.perp() << " z " << gpos.z()
<< " and direction: theta " << gdir.theta() << " phi " << gdir.phi() );
segment->setPosition(gpos.x(),gpos.y(),gpos.z());
segment->setDirection(gdir.x(),gdir.y(),gdir.z());
}
- delete firstPos;
- delete secondPos;
}
}
}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.cxx
index e0760b9afdc0418e7cb787d1e0b9c0d7c9d0c262..4e7b63876191b9549e1f5a5aba6181e72e5add66 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// MuonPhysValMonitoringTool.cxx
@@ -10,7 +10,6 @@
// PhysVal includes
#include "MuonPhysValMonitoringTool.h"
-// FrameWork includes
#include "GaudiKernel/IToolSvc.h"
#include "xAODMuon/MuonContainer.h"
#include "xAODMuon/MuonAuxContainer.h"
@@ -18,7 +17,6 @@
#include "xAODMuon/SlowMuonContainer.h"
#include "xAODMuon/SlowMuonAuxContainer.h"
#include "xAODMuon/SlowMuon.h"
-
#include "xAODTrigger/MuonRoI.h"
#include "xAODTrigger/MuonRoIContainer.h"
#include "xAODTrigMuon/L2StandAloneMuonContainer.h"
@@ -29,9 +27,6 @@
#include "xAODTruth/TruthVertexContainer.h"
#include "xAODTruth/TruthVertexAuxContainer.h"
#include "MuonHistUtils/MuonEnumDefs.h"
-
-#include "MuonCombinedToolInterfaces/IMuonPrintingTool.h"
-
#include "xAODCore/ShallowCopy.h"
#include "xAODBase/IParticleHelpers.h"
@@ -66,13 +61,14 @@ MuonPhysValMonitoringTool::MuonPhysValMonitoringTool( const std::string& type,
const IInterface* parent ):
ManagedMonitorToolBase( type, name, parent ),
m_MSTracks(nullptr),
- m_isData(false),
+ m_counterBits(),
+ m_muonItems(),
+ m_L1Seed(),
+ m_SelectedAuthor(0),
m_muonSelectionTool("CP::MuonSelectionTool/MuonSelectionTool"),
m_muonPrinter("Rec::MuonPrintingTool/MuonPrintingTool"),
m_trigDec("Trig::TrigDecisionTool/TrigDecisionTool"),
m_trackSelector("InDet::InDetDetailedTrackSelectorTool/MuonCombinedInDetDetailedTrackSelectorTool"),
- // m_muonResonanceSelectionTool("MuonResonanceSelectionTool/MuonZSelectionTool"),
- // m_muonResonancePairingTool("MuonResonancePairingTool/ZmumuResonancePairingTool"),
m_oUnmatchedRecoMuonPlots(nullptr),
m_oUnmatchedTruthMuonPlots(nullptr),
m_oUnmatchedRecoMuonTrackPlots(nullptr),
@@ -82,49 +78,9 @@ MuonPhysValMonitoringTool::MuonPhysValMonitoringTool( const std::string& type,
m_h_overview_Z_mass_ME(nullptr),
m_h_overview_Z_mass_ID(nullptr)
{
- // default for muon chains
-
- declareProperty( "IsData", m_isData = false );
- declareProperty( "MuonContainerName", m_muonsName = "Muons" );
- declareProperty( "SlowMuonContainerName", m_slowMuonsName = "SlowMuons" );
- declareProperty( "MuonTruthParticleContainerName", m_muonsTruthName = "MuonTruthParticles" );
-
- declareProperty( "TrackContainerName", m_tracksName);
- declareProperty( "FwdTrackContainerName", m_fwdtracksName);
- declareProperty( "MuonTrackContainerName", m_muonTracksName );
- declareProperty( "MuonExtrapolatedTrackContainerName", m_muonExtrapolatedTracksName);
- declareProperty( "MuonOnlyExtrapolatedTrackContainerName", m_muonMSOnlyExtrapolatedTracksName);
- declareProperty( "MuonSegmentContainerName", m_muonSegmentsName);
- declareProperty( "MuonTruthSegmentContainerName", m_muonSegmentsTruthName = "MuonTruthSegments" );
-
declareProperty( "TrackSelector", m_trackSelector);
- declareProperty( "IsoTool", m_isoTool );
-
- declareProperty( "SelectMuonWorkingPoints", m_selectMuonWPs);
- declareProperty( "SelectMuonAuthors", m_selectMuonAuthors);
- declareProperty( "SelectHLTMuonItems", m_selectHLTMuonItems);
- declareProperty( "SelectL1MuonItems", m_L1MuonItems);
- declareProperty( "SelectMuonCategories", m_selectMuonCategories );
- declareProperty( "DoBinnedResolutionPlots", m_doBinnedResolutionPlots = true);
-
- declareProperty( "DoTrigMuonValidation", m_doTrigMuonValidation = false);
- declareProperty( "DoTrigMuonL1Validation", m_doTrigMuonL1Validation = false);
- declareProperty( "DoTrigMuonL2Validation", m_doTrigMuonL2Validation = false);
- declareProperty( "DoTrigMuonEFValidation", m_doTrigMuonEFValidation = false);
- declareProperty( "L1TrigMuonContainerName", m_muonL1TrigName = "LVL1MuonRoIs");
- declareProperty( "L2SAMuonContainerName",m_muonL2SAName = "HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfo");
- declareProperty( "L2CBMuonContainerName",m_muonL2CBName = "HLT_xAOD__L2CombinedMuonContainer_MuonL2CBInfo");
- declareProperty( "EFCombTrigMuonContainerName", m_muonEFCombTrigName = "HLT_xAOD__MuonContainer_MuonEFInfo");
- declareProperty( "DoMuonTree", m_doMuonTree = false);
-
- m_SelectedAuthor = 0;
}
-// Destructor
-///////////////
-MuonPhysValMonitoringTool::~MuonPhysValMonitoringTool()
-{}
-
// Athena algtool's Hooks
////////////////////////////
StatusCode MuonPhysValMonitoringTool::initialize()
@@ -148,12 +104,6 @@ StatusCode MuonPhysValMonitoringTool::initialize()
m_doTrigMuonL2Validation = false;
m_doTrigMuonEFValidation = false;
}
- if (m_isData) {
- m_selectMuonCategories.clear();
- m_selectMuonCategories.push_back(ALL);
- m_selectMuonCategories.push_back(PROMPT);
- m_selectMuonCategories.push_back(REST);
- }
ATH_CHECK(m_eventInfo.initialize());
ATH_CHECK(m_muonSelectionTool.retrieve());
@@ -210,22 +160,9 @@ StatusCode MuonPhysValMonitoringTool::bookHistograms()
{
ATH_MSG_INFO ("Booking hists " << name() << "...");
- if (m_selectMuonWPs.size()==0) {
- int defaultWPList[]={xAOD::Muon::Loose,xAOD::Muon::Medium};
- for (const auto wp : defaultWPList) m_selectMuonWPs.push_back(wp);
- }
- else if (m_selectMuonWPs.size()==1 && m_selectMuonWPs[0]<0 ) m_selectMuonWPs.clear();
-
- if (m_selectMuonAuthors.size()==0) {
- unsigned int defaultAuthorList[]={xAOD::Muon::MuidCo,xAOD::Muon::MuTagIMO,xAOD::Muon::MuidSA,xAOD::Muon::MuGirl,xAOD::Muon::CaloTag,xAOD::Muon::CaloLikelihood};
- for (const auto author : defaultAuthorList) m_selectMuonAuthors.push_back(author);
- }
- else if (m_selectMuonAuthors.size()==1 && m_selectMuonAuthors[0]==0) m_selectMuonAuthors.clear();
+ if (m_selectMuonWPs.size()==1 && m_selectMuonWPs[0]<0 ) m_selectMuonWPs.clear();
- if (m_selectMuonCategories.size()==0) {
- unsigned int defaultMuonCategories[]={ ALL, PROMPT, INFLIGHT, NONISO, REST };
- for (const auto category: defaultMuonCategories) m_selectMuonCategories.push_back(category);
- }
+ if (m_selectMuonAuthors.size()==1 && m_selectMuonAuthors[0]==0) m_selectMuonAuthors.clear();
std::string theMuonCategories[5];
theMuonCategories[ALL]="All";
@@ -239,11 +176,12 @@ StatusCode MuonPhysValMonitoringTool::bookHistograms()
bool separateSAFMuons = true;
if (m_slowMuonsName!="") separateSAFMuons = false; // no such muons in case of SlowMuon reco
- for (const auto category : m_selectMuonCategoriesStr) {
+ std::string muonContainerName = m_muonsName.name();
+ for (const auto& category : m_selectMuonCategoriesStr) {
std::string categoryPath = m_muonsName+"/"+category+"/";
m_muonValidationPlots.push_back( new MuonValidationPlots(0, categoryPath,
m_selectMuonWPs, m_selectMuonAuthors, m_isData,
- (category==theMuonCategories[ALL]? false : m_doBinnedResolutionPlots),
+ (category==theMuonCategories[ALL]? false : m_doBinnedResolutionPlots.value()),
separateSAFMuons,
m_doMuonTree));
m_slowMuonValidationPlots.push_back( new SlowMuonValidationPlots( 0, categoryPath, m_isData ) );
@@ -255,7 +193,7 @@ StatusCode MuonPhysValMonitoringTool::bookHistograms()
}
if (m_muonTracksName!="") {
m_muonMSTrackValidationPlots.push_back(new MuonTrackValidationPlots(0, categoryPath, "MSTrackParticles", m_isData));
- if (!m_isData) m_oUnmatchedRecoMuonTrackPlots = new Muon::RecoMuonTrackPlotOrganizer(0, Form("%s/UnmatchedRecoMuonTracks/",m_muonsName.c_str()));
+ if (!m_isData) m_oUnmatchedRecoMuonTrackPlots = new Muon::RecoMuonTrackPlotOrganizer(0, Form("%s/UnmatchedRecoMuonTracks/",muonContainerName.c_str()));
}
if (m_muonExtrapolatedTracksName!="") m_muonMETrackValidationPlots.push_back(new MuonTrackValidationPlots(0, categoryPath, "METrackParticles", m_isData));
if (m_muonMSOnlyExtrapolatedTracksName!="") m_muonMSOnlyMETrackValidationPlots.push_back(new MuonTrackValidationPlots(0, categoryPath, "MSOnlyMETrackParticles", m_isData));
@@ -269,13 +207,13 @@ StatusCode MuonPhysValMonitoringTool::bookHistograms()
if (m_muonSegmentsName!="") {
if (category!=theMuonCategories[ALL]) continue; //cannot identify the truth origin of segments...
m_muonSegmentValidationPlots.push_back(new MuonSegmentValidationPlots(0, categoryPath, m_isData));
- if (!m_isData) m_oUnmatchedRecoMuonSegmentPlots = new Muon::MuonSegmentPlots(0, Form("%s/UnmatchedRecoMuonSegments/",m_muonsName.c_str()));
+ if (!m_isData) m_oUnmatchedRecoMuonSegmentPlots = new Muon::MuonSegmentPlots(0, Form("%s/UnmatchedRecoMuonSegments/",muonContainerName.c_str()));
}
}
if (!m_isData) {
- m_oUnmatchedRecoMuonPlots = new Muon::RecoMuonPlotOrganizer(0, Form("%s/UnmatchedRecoMuons/",m_muonsName.c_str()));
- m_oUnmatchedTruthMuonPlots = new Muon::TruthMuonPlotOrganizer(0, Form("%s/UnmatchedTruthMuons/",m_muonsName.c_str()));
+ m_oUnmatchedRecoMuonPlots = new Muon::RecoMuonPlotOrganizer(0, Form("%s/UnmatchedRecoMuons/",muonContainerName.c_str()));
+ m_oUnmatchedTruthMuonPlots = new Muon::TruthMuonPlotOrganizer(0, Form("%s/UnmatchedTruthMuons/",muonContainerName.c_str()));
}
for (const auto plots : m_muonValidationPlots) bookValidationPlots(*plots).ignore();
@@ -295,37 +233,37 @@ StatusCode MuonPhysValMonitoringTool::bookHistograms()
if (m_oUnmatchedRecoMuonSegmentPlots) bookValidationPlots(*m_oUnmatchedRecoMuonSegmentPlots).ignore();
}
//book overview hists
- m_h_overview_Z_mass = new TH1F(Form("%s_Overview_Z_mass",m_muonsName.c_str()),"",20,76,106);
- ATH_CHECK(regHist(m_h_overview_Z_mass,Form("%s/Overview",m_muonsName.c_str()),all));
- m_h_overview_Z_mass_ME = new TH1F(Form("%s_Overview_Z_mass_ME",m_muonsName.c_str()),"",20,76,106);
- ATH_CHECK(regHist(m_h_overview_Z_mass_ME,Form("%s/Overview",m_muonsName.c_str()),all));
- m_h_overview_Z_mass_ID = new TH1F(Form("%s_Overview_Z_mass_ID",m_muonsName.c_str()),"",20,76,106);
- ATH_CHECK(regHist(m_h_overview_Z_mass_ID,Form("%s/Overview",m_muonsName.c_str()),all));
+ m_h_overview_Z_mass = new TH1F(Form("%s_Overview_Z_mass",muonContainerName.c_str()),"",20,76,106);
+ ATH_CHECK(regHist(m_h_overview_Z_mass,Form("%s/Overview",muonContainerName.c_str()),all));
+ m_h_overview_Z_mass_ME = new TH1F(Form("%s_Overview_Z_mass_ME",muonContainerName.c_str()),"",20,76,106);
+ ATH_CHECK(regHist(m_h_overview_Z_mass_ME,Form("%s/Overview",muonContainerName.c_str()),all));
+ m_h_overview_Z_mass_ID = new TH1F(Form("%s_Overview_Z_mass_ID",muonContainerName.c_str()),"",20,76,106);
+ ATH_CHECK(regHist(m_h_overview_Z_mass_ID,Form("%s/Overview",muonContainerName.c_str()),all));
m_h_overview_nObjects.clear();
- m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_truth_muons",m_muonsName.c_str()), "Number of truth Muons per event", 20, -0.5, 19.5));
- m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_muons",m_muonsName.c_str()), "Number of Muons per event", 20, -0.5, 19.5));
- m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_tracks",m_muonsName.c_str()), "Number of Tracks per event", 50, -0.5, 49.5));
- m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_truth_segments",m_muonsName.c_str()), "Number of truth Segments per event", 200, -0.5, 199.5));
- m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_segments",m_muonsName.c_str()), "Number of Segments per event", 200, -0.5, 199.5));
+ m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_truth_muons",muonContainerName.c_str()), "Number of truth Muons per event", 20, -0.5, 19.5));
+ m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_muons",muonContainerName.c_str()), "Number of Muons per event", 20, -0.5, 19.5));
+ m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_tracks",muonContainerName.c_str()), "Number of Tracks per event", 50, -0.5, 49.5));
+ m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_truth_segments",muonContainerName.c_str()), "Number of truth Segments per event", 200, -0.5, 199.5));
+ m_h_overview_nObjects.push_back(new TH1F(Form("%s_Overview_N_perevent_segments",muonContainerName.c_str()), "Number of Segments per event", 200, -0.5, 199.5));
for (const auto hist : m_h_overview_nObjects) {
- if (hist) ATH_CHECK(regHist(hist,Form("%s/Overview",m_muonsName.c_str()),all));
+ if (hist) ATH_CHECK(regHist(hist,Form("%s/Overview",muonContainerName.c_str()),all));
}
- m_h_overview_reco_category = new TH1F(Form("%s_Overview_reco_category",m_muonsName.c_str()),"",4,0,4); //prompt/in-flight/non-isolated/other
+ m_h_overview_reco_category = new TH1F(Form("%s_Overview_reco_category",muonContainerName.c_str()),"",4,0,4); //prompt/in-flight/non-isolated/other
for (int i=1; i<4; i++) { //skip 'All'
m_h_overview_reco_category->GetXaxis()->SetBinLabel(i,theMuonCategories[i].c_str());
} m_h_overview_reco_category->GetXaxis()->SetBinLabel(4,"Other"); //of some other origin or fakes
- ATH_CHECK(regHist(m_h_overview_reco_category,Form("%s/Overview",m_muonsName.c_str()),all));
+ ATH_CHECK(regHist(m_h_overview_reco_category,Form("%s/Overview",muonContainerName.c_str()),all));
int nAuth = xAOD::Muon::NumberOfMuonAuthors;
for (int i=1; i<4; i++) {
- m_h_overview_reco_authors.push_back(new TH1F((m_muonsName+"_"+theMuonCategories[i]+"_reco_authors").c_str(),(m_muonsName+"_"+theMuonCategories[i]+"_reco_authors").c_str(),nAuth+1,-0.5,nAuth+0.5));
+ m_h_overview_reco_authors.push_back(new TH1F((m_muonsName+"_"+theMuonCategories[i]+"_reco_authors").c_str(),(muonContainerName+"_"+theMuonCategories[i]+"_reco_authors").c_str(),nAuth+1,-0.5,nAuth+0.5));
}
- m_h_overview_reco_authors.push_back(new TH1F((m_muonsName+"_Overview_Other_reco_authors").c_str(),(m_muonsName+"_Other_reco_authors").c_str(),nAuth+1,-0.5,nAuth+0.5));
+ m_h_overview_reco_authors.push_back(new TH1F((m_muonsName+"_Overview_Other_reco_authors").c_str(),(muonContainerName+"_Other_reco_authors").c_str(),nAuth+1,-0.5,nAuth+0.5));
for (const auto hist : m_h_overview_reco_authors) {
- if (hist) ATH_CHECK(regHist(hist,Form("%s/Overview",m_muonsName.c_str()),all));
+ if (hist) ATH_CHECK(regHist(hist,Form("%s/Overview",muonContainerName.c_str()),all));
}
return StatusCode::SUCCESS;
@@ -861,7 +799,7 @@ StatusCode MuonPhysValMonitoringTool::fillHistograms()
}//m_vRecoMuons_EffDen
}//m_muonItems
//@@@@@ L1 items efficiency @@@@@
- for (const auto L1MuonItem : m_L1MuonItems) {
+ for (const auto& L1MuonItem : m_L1MuonItems) {
m_vRecoMuons_EffDen=m_vRecoMuons_EffDen_CB; m_SelectedAuthor=1;
float treshold=0.;
if(L1MuonItem=="L1_MU4") treshold=4000;
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.h
index 7af96ecbccbf0f0266dc905ed3080ea9214161c6..9c2fd6dc143474ae6808dd239767e710d5cf85c9 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonPhysValMonitoringTool.h
@@ -10,11 +10,6 @@
#ifndef MUONPHYSVALMONITORING_MUONPHYSVALMONITORINGTOOL_H
#define MUONPHYSVALMONITORING_MUONPHYSVALMONITORINGTOOL_H
-// STL includes
-#include <string>
-#include <vector>
-
-// FrameWork includes
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/ReadHandleKey.h"
#include "xAODTruth/TruthParticleContainer.h"
@@ -23,32 +18,23 @@
#include "xAODTrigMuon/L2StandAloneMuon.h"
#include "xAODTrigMuon/L2CombinedMuonContainer.h"
#include "xAODTrigMuon/L2CombinedMuon.h"
-
#include "xAODMuon/SlowMuon.h"
#include "xAODEventInfo/EventInfo.h"
-
-// Tools
#include "MuonAnalysisInterfaces/IMuonSelectionTool.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
#include "IsolationSelection/IIsolationSelectionTool.h"
-
-
-
-// Local includes
+#include "MuonCombinedToolInterfaces/IMuonPrintingTool.h"
#include "AthenaMonitoring/ManagedMonitorToolBase.h"
-
-// Root includes
#include "MuonValidationPlots.h"
#include "TriggerMuonValidationPlots.h"
#include "MuonTrackValidationPlots.h"
#include "MuonSegmentValidationPlots.h"
#include "SlowMuonValidationPlots.h"
-// Forward declaration
-namespace Rec {
- class IMuonPrintingTool;
-}
+#include <string>
+#include <vector>
+
namespace MuonPhysValMonitoring {
class MuonPhysValMonitoringTool
@@ -67,7 +53,7 @@ class MuonPhysValMonitoringTool
const IInterface* parent );
/// Destructor:
- virtual ~MuonPhysValMonitoringTool();
+ virtual ~MuonPhysValMonitoringTool()=default;
// Athena algtool's Hooks
virtual StatusCode initialize();
@@ -93,6 +79,8 @@ class MuonPhysValMonitoringTool
/// Default constructor:
MuonPhysValMonitoringTool();
+ enum MUCATEGORY{ALL=0, PROMPT, INFLIGHT, NONISO, REST};
+
void handleMuon(const xAOD::Muon* mu,const xAOD::SlowMuon *smu=0);
void handleSlowMuon(const xAOD::SlowMuon *smu);
void handleTruthMuon(const xAOD::TruthParticle* truthMu);
@@ -120,62 +108,53 @@ class MuonPhysValMonitoringTool
xAOD::Muon* getCorrectedMuon(const xAOD::Muon &mu);
const xAOD::TrackParticleContainer* m_MSTracks;
-
- TH1F* findHistogram(std::vector<HistData> hists,std::string hnameTag,std::string hdirTag,std::string hNewName);
- void modifyHistogram(TH1* hist);
-
- bool m_isData;
-
-
-
-
- // Containers
- std::string m_tracksName;
- std::string m_fwdtracksName;
- std::string m_muonsName;
- std::string m_slowMuonsName;
- std::string m_muonsTruthName;
- std::string m_muonTracksName;
- std::string m_muonExtrapolatedTracksName;
- std::string m_muonMSOnlyExtrapolatedTracksName;
- std::string m_muonSegmentsName;
- std::string m_muonSegmentsTruthName;
- std::string m_muonL1TrigName;
- std::string m_muonL2SAName;
- std::string m_muonL2CBName;
- std::string m_muonEFCombTrigName;
-
- SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{this,"EventInfo","EventInfo","event info"};
-
- // Configurable properties
std::map<std::string,int> m_counterBits;
- std::vector<int> m_selectMuonWPs;
- std::vector<unsigned int> m_selectMuonAuthors;
- std::vector<std::vector<std::string>> m_selectHLTMuonItems;
std::vector<std::string> m_muonItems;
std::vector<std::string> m_L1Seed;
- std::vector<std::string> m_L1MuonItems;
int m_SelectedAuthor;
- std::vector<unsigned int> m_selectMuonCategories;
- bool m_doBinnedResolutionPlots;
- bool m_doTrigMuonValidation;
- bool m_doTrigMuonL1Validation;
- bool m_doTrigMuonL2Validation;
- bool m_doTrigMuonEFValidation;
- bool m_doMuonTree;
+ TH1F* findHistogram(std::vector<HistData> hists,std::string hnameTag,std::string hdirTag,std::string hNewName);
+ void modifyHistogram(TH1* hist);
+ Gaudi::Property<std::string> m_tracksName{this,"TrackContainerName","InDetTrackParticles"};
+ Gaudi::Property<std::string> m_fwdtracksName{this,"FwdTrackContainerName",""};
+ Gaudi::Property<std::string> m_muonsName{this,"MuonContainerName","Muons"};
+ Gaudi::Property<std::string> m_slowMuonsName{this,"SlowMuonContainerName","SlowMuons"};
+ Gaudi::Property<std::string> m_muonsTruthName{this,"MuonTruthParticleContainerName","MuonTruthParticles"};
+ Gaudi::Property<std::string> m_muonTracksName{this,"MuonTrackContainerName","MuonSpectrometerTrackParticles"};
+ Gaudi::Property<std::string> m_muonExtrapolatedTracksName{this,"MuonExtrapolatedTrackContainerName","ExtrapolatedMuonTrackParticles"};
+ Gaudi::Property<std::string> m_muonMSOnlyExtrapolatedTracksName{this,"MuonOnlyExtrapolatedTrackContainerName","MSOnlyExtrapolatedMuonTrackParticles"};
+ Gaudi::Property<std::string> m_muonSegmentsName{this,"MuonSegmentContainerName","MuonSegments"};
+ Gaudi::Property<std::string> m_muonSegmentsTruthName{this,"MuonTruthSegmentContainerName","MuonTruthSegments"};
+ Gaudi::Property<std::string> m_muonL1TrigName{this,"L1TrigMuonContainerName","LVL1MuonRoIs"};
+ Gaudi::Property<std::string> m_muonL2SAName{this,"L2SAMuonContainerName","HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfo"};
+ Gaudi::Property<std::string> m_muonL2CBName{this,"L2CBMuonContainerName","HLT_xAOD__L2CombinedMuonContainer_MuonL2CBInfo"};
+ Gaudi::Property<std::string> m_muonEFCombTrigName{this,"EFCombTrigMuonContainerName","HLT_xAOD__MuonContainer_MuonEFInfo"};
+
+ Gaudi::Property<std::vector<int>> m_selectMuonWPs{this,"SelectMuonWorkingPoints",{xAOD::Muon::Loose,xAOD::Muon::Medium}};
+ Gaudi::Property<std::vector<unsigned int>> m_selectMuonAuthors{this,"SelectMuonAuthors",{xAOD::Muon::MuidCo,xAOD::Muon::MuTagIMO,xAOD::Muon::MuidSA,xAOD::Muon::MuGirl,xAOD::Muon::CaloTag,xAOD::Muon::CaloLikelihood}};
+ Gaudi::Property<std::vector<std::vector<std::string>>> m_selectHLTMuonItems{this,"SelectHLTMuonItems",{}};
+ Gaudi::Property<std::vector<std::string>> m_L1MuonItems{this,"SelectL1MuonItems",{}};
+ Gaudi::Property<std::vector<unsigned int>> m_selectMuonCategories{this,"SelectMuonCategories",{MUCATEGORY::ALL,MUCATEGORY::PROMPT,MUCATEGORY::INFLIGHT,MUCATEGORY::NONISO,MUCATEGORY::REST}};
+
+ Gaudi::Property<bool> m_doBinnedResolutionPlots{this,"DoBinnedResolutionPlots",true};
+ Gaudi::Property<bool> m_doTrigMuonValidation{this,"DoTrigMuonValidation",false};
+ Gaudi::Property<bool> m_doTrigMuonL1Validation{this,"DoTrigMuonL1Validation",false};
+ Gaudi::Property<bool> m_doTrigMuonL2Validation{this,"DoTrigMuonL2Validation",false};
+ Gaudi::Property<bool> m_doTrigMuonEFValidation{this,"DoTrigMuonEFValidation",false};
+ Gaudi::Property<bool> m_doMuonTree{this,"DoMuonTree",false};
+ Gaudi::Property<bool> m_isData{this,"IsData",false};
+
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{this,"EventInfo","EventInfo","event info"};
// Tools
ToolHandle<CP::IMuonSelectionTool> m_muonSelectionTool;
ToolHandle<Rec::IMuonPrintingTool> m_muonPrinter;
ToolHandle<Trig::TrigDecisionTool> m_trigDec;
ToolHandle<Trk::ITrackSelectorTool> m_trackSelector;
- ToolHandle<CP::IIsolationSelectionTool> m_isoTool;
-
-
+ ToolHandle<CP::IIsolationSelectionTool> m_isoTool{this,"IsoTool",""};
- enum MUCATEGORY{ALL=0, PROMPT, INFLIGHT, NONISO, REST};
+
std::vector<std::string> m_selectMuonCategoriesStr;
MuonPhysValMonitoringTool::MUCATEGORY getMuonSegmentTruthCategory(const xAOD::MuonSegment* truthMuSeg, const xAOD::TruthParticleContainer* muonTruthContainer);
MuonPhysValMonitoringTool::MUCATEGORY getMuonTruthCategory(const xAOD::IParticle* prt);
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonValidationPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonValidationPlots.cxx
index e41c54b36f2d38b344b902e49405d691ae5740d8..9dd0383c843bcdb4a8cd3a4f6767c760e9674ba9 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonValidationPlots.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/MuonValidationPlots.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonValidationPlots.h"
@@ -16,7 +16,7 @@ MuonValidationPlots::MuonValidationPlots(PlotBase* pParent, std::string sDir,std
m_truthSelections[1] = "MSAcceptance"; //truth muons in MS acceptance (at least 4 associated hits in the MS)
//histogram classes for all muons
- for(const auto truthSelection : m_truthSelections) {
+ for(const auto& truthSelection : m_truthSelections) {
m_oTruthMuonPlots.push_back(new Muon::TruthMuonPlotOrganizer(this,"truth/"+truthSelection));
}
m_oTruthRelatedMuonPlots = new Muon::TruthRelatedMuonPlotOrganizer(this, "matched/AllMuons", doBinnedResolutionPlots);//, doMuonTree);
@@ -248,7 +248,7 @@ bool MuonValidationPlots::isGoodTruthTrack(const xAOD::TruthParticle& truthMu) {
int nPrecHits=0;
bool hasEnoughPrecHits=false;
- for (const auto hitTypeItr : hitTypes) {
+ for (const auto& hitTypeItr : hitTypes) {
if (truthMu.isAvailable<uint8_t>(hitTypeItr)) {
nPrecHits+=truthMu.auxdata<uint8_t>(hitTypeItr);
if (nPrecHits>=minPrecHits) {
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValAlg.h
index e13ed2a63f064da249da9691e3213b8f5e315503..ceebb0af9f3270f1599e5feaf3112a6e532c23d0 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValAlg.h
@@ -90,7 +90,7 @@ class CSCSegmValAlg : public ManagedMonitorToolBase {
std::vector<std::string> m_sampSelTriggers;
bool m_doEvtSel;
- SG::ReadHandleKey<Trk::SegmentCollection> m_segmKey{this,"SegmentKey","MuonSegments","muon segments"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_segmKey{this,"SegmentKey","TrackMuonSegments","muon segments"};
double m_segmSlope;
bool m_debuglevel; //!< private member to control debug messages
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h
index 54a68b8bf31d1f13c2927ddadc747f6459ca7f79..7567d39993d676057d4d980ed379cc6763742d4c 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h
@@ -58,7 +58,7 @@ class CSCSegmValMonAlg : public AthMonitorAlgorithm {
"Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
"Handle to the service providing the IMuonEDMHelperSvc interface" };
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
- SG::ReadHandleKey<Trk::SegmentCollection> m_segmKey{this,"SegmentKey","MuonSegments","muon segments"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_segmKey{this,"SegmentKey","TrackMuonSegments","muon segments"};
Gaudi::Property<std::vector<std::string>> m_sampSelTriggers{this,"EventSelTriggers",{}};
Gaudi::Property<bool> m_doEvtSel{this,"DoEventSelection",false};
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringESD_Alg.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringESD_Alg.py
index 2935361e463889f699ba13efe3127453a0876409..a87f507615eb08f2822507a1dd548b97b431c2af 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringESD_Alg.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringESD_Alg.py
@@ -24,6 +24,10 @@ def CscMonitoringESD_AlgConfig(inputFlags):
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
result.merge(MuonGeoModelCfg(inputFlags))
+ # Fixup for R21 ESD
+ from MuonConfig.MuonSegmentNameFixConfig import MuonSegmentNameFixCfg
+ result.merge(MuonSegmentNameFixCfg(inputFlags))
+
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring import AthMonitorCfgHelper
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py
index fa5864cfefeb99b224a463d132a6e860749b09fc..4cd3a3f39cda88546f84c7b328a756311025dc9f 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py
@@ -36,8 +36,6 @@ def getInputFiles(dir, AODHLTP):
# Input files
##############################
-#AODir = ['/raid01/venkat/dataset/data/csc/2011/mcpskim/data10_7TeV.*.phys*', 'data10_7TeV*DESD_ZMUMU*']
-#AODir2 = ['/raid01/jveatch/data/dataset/CSCMon/data11_7TeV.00189751.physics_Muons.recon.DESD_ZMUMU.f405_m716_f405', 'data11_7TeV*DESD_ZMUMU*']
AODir2=['/afs/cern.ch/work/p/panagoul/CSC_data', 'data15_13TeV.00280950*']
CSCInputFiles = []
@@ -262,7 +260,7 @@ if doCSCSegm:
## trigger-aware monitoring: sample seletion triggers (express stream menu physics_pp_v2)
evtSelectionTriggers = [ "L1_MU10", "L1_MU15", "EF_mu20_muCombTag_NoEF", "EF_mu15", "EF_mu15_mu10_EFFS", "EF_2mu10", "EF_2mu10_loose" ]
- CSCSegmValAlg = CSCSegmValAlg ( name = "CSCSegmValAlg", SegmentKey = "MuonSegments",
+ CSCSegmValAlg = CSCSegmValAlg ( name = "CSCSegmValAlg",
TrigDecisionTool = ToolSvc.TrigDecisionTool, DoEventSelection = False, EventSelTriggers = evtSelectionTriggers,
SegmentSlopeCut = 0.07, ClusterStatus = clusStatWords)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py
index a4879b152c0e712f15426a4555a3e1da35b445e0..abac9f678a9e17d1ea6a22260746fc8b1f8f5f92 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py
@@ -87,8 +87,6 @@ topSequence += cscesdRawMonMan
# CSC Segment Monitoring
#---------------------------------------------------------------
from CscRawDataMonitoring.CscRawDataMonitoringConf import CSCSegmValAlg
-#from MuonDQAMonFlags.MuonDQAFlags import MuonDQAFlags as MuonDQAFlags
-#MuonDQAFlags.doMuonSegmMon = True
## TDT instance (this should be done already?)
if(DQMonFlags.useTrigger() and hasattr(ToolSvc, DQMonFlags.nameTrigDecTool())):
@@ -106,8 +104,6 @@ clusStatWords = [ "Unspoiled", "Simple", "Edge", "MultiPeak", "Narrow",
evtSelectionTriggers = [ "L1_MU10", "L1_MU15", "EF_mu20_muCombTag_NoEF", "EF_mu15", "EF_mu15_mu10_EFFS", "EF_2mu10", "EF_2mu10_loose" ]
CSCSegmESDValAlg = CSCSegmValAlg ( name = "CSCSegmValAlg",
- SegmentKey = "MuonSegments",
- #TrigDecisionTool = ToolSvc.TrigDecisionTool,
DoEventSelection = False,
EventSelTriggers = evtSelectionTriggers,
SegmentSlopeCut = 0.07,
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx
index 9f5c01e880cda2e8595fa584648e297ef1b65337..bef9f5e11911487dc0f7f8ef8522939487b34d91 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx
@@ -76,6 +76,10 @@ StatusCode CSCSegmValMonAlg::fillHistograms(const EventContext& ctx) const{
}
SG::ReadHandle<Trk::SegmentCollection> segments(m_segmKey, ctx);
+ if (!segments.isValid()) {
+ ATH_MSG_ERROR("Could not retrieve Trk::SegmentCollection "<<m_segmKey.key());
+ return StatusCode::FAILURE;
+ }
if ( segments->empty() ){
ATH_MSG_DEBUG( " Segm Collection is Empty, done... ");
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h
index 351fe161c323b061716617ff55421104266ac38b..1da9dddb88bd4442eb85b4a9d79dda6704b39936 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h
@@ -160,7 +160,7 @@ class MdtRawDataMonAlg: public AthMonitorAlgorithm {
bool m_atlas_ready;
- SG::ReadHandleKey<Trk::SegmentCollection> m_segm_type{this,"Eff_segm_type","MuonSegments","muon segments"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_segm_type{this,"Eff_segm_type","TrackMuonSegments","muon segments"};
std::string returnString(int i) const{
std::stringstream ss;
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataValAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataValAlg.h
index ccac9d53b25db4f80e28dd674fa7038caa0abc8e..6df5cbf4b05fb445d1d8a42950328b2cd0b072ab 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataValAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataValAlg.h
@@ -176,7 +176,7 @@ class MdtRawDataValAlg: public ManagedMonitorToolBase {
uint32_t m_firstTime;
int m_numberOfEvents;
- SG::ReadHandleKey<Trk::SegmentCollection> m_segm_type{this,"Eff_segm_type","MuonSegments","muon segments"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_segm_type{this,"Eff_segm_type","TrackMuonSegments","muon segments"};
std::string returnString(int i){
std::stringstream ss;
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
index 25a11b32020662d7f42680ab56cc24d4b85e8660..5ed3d6ce704a5eba8f875cdf5c5a2fc8d22f5f5b 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
@@ -27,6 +27,10 @@ def MdtMonitoringConfig(inputFlags):
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
result.merge(MuonGeoModelCfg(inputFlags))
+ # Fixup for R21 ESD
+ from MuonConfig.MuonSegmentNameFixConfig import MuonSegmentNameFixCfg
+ result.merge(MuonSegmentNameFixCfg(inputFlags))
+
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring import AthMonitorCfgHelper
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx
index cf5c608a021e56b1da4c7f653b2821b241144a45..0b53e7916360d692dcac85b9c58933271266110f 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx
@@ -528,8 +528,7 @@ StatusCode MdtRawDataMonAlg::fillHistograms(const EventContext& ctx) const
} //m_doMdtESD==true
SG::ReadHandle<Trk::SegmentCollection> segms(m_segm_type, ctx);
- if (!segms.isValid())
- {
+ if (!segms.isValid()) {
ATH_MSG_ERROR("evtStore() does not contain mdt segms Collection with name " << m_segm_type);
return StatusCode::FAILURE;
}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
index 6fbcd4d033bbd2acf26d28cfbd23e29a522337e3..ad59d834352656205e340caac5c2719159baf96d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
@@ -14,6 +14,13 @@ def TgcRawDataMonitoringConfig(inputFlags):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
result = ComponentAccumulator()
+ from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
+ from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ result.merge(MagneticFieldSvcCfg(inputFlags))
+ result.merge(AtlasGeometryCfg(inputFlags))
+ result.merge(TrackingGeometrySvcCfg(inputFlags))
+
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags,'TgcRawDataMonitorCfg')
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
index 3d7065337d5a92d61ea3d00ed431045d90cf3c9a..649a20199595c46c566d95ab76e37ffaffb70718 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef STGCRDOVARIABLES_H
@@ -10,7 +10,7 @@
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include <vector>
-class sTGCRDOVariables : public ValAlgVariables
+class sTGCRDOVariables final : public ValAlgVariables
{
public:
sTGCRDOVariables(StoreGateSvc* evtStore,
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/AsgAnalysisAlgorithmsTest.py b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/AsgAnalysisAlgorithmsTest.py
index 5d99638fa074f9ba76fab67d9d16cbeafeff43da..262068810cf1a7150f89e3550d7f483630762a20 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/AsgAnalysisAlgorithmsTest.py
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/AsgAnalysisAlgorithmsTest.py
@@ -58,36 +58,40 @@ def makeOverlapSequence (dataType) :
outputName = 'AnalysisJets_%SYS%' )
algSeq += jetSequence
+ # TODO: disabled for now
# Include, and then set up the tau analysis algorithm sequence:
- from TauAnalysisAlgorithms.TauAnalysisSequence import makeTauAnalysisSequence
- tauSequence = makeTauAnalysisSequence( dataType, 'Tight' )
- tauSequence.configure( inputName = 'TauJets',
- outputName = 'AnalysisTauJets_%SYS%' )
- algSeq += tauSequence
+ # from TauAnalysisAlgorithms.TauAnalysisSequence import makeTauAnalysisSequence
+ # tauSequence = makeTauAnalysisSequence( dataType, 'Tight' )
+ # tauSequence.configure( inputName = 'TauJets',
+ # outputName = 'AnalysisTauJets_%SYS%' )
+ # algSeq += tauSequence
# Include, and then set up the overlap analysis algorithm sequence:
from AsgAnalysisAlgorithms.OverlapAnalysisSequence import \
makeOverlapAnalysisSequence
- overlapSequence = makeOverlapAnalysisSequence( dataType, doMuPFJetOR=True, enableCutflow=True )
+ overlapSequence = makeOverlapAnalysisSequence( dataType, doMuPFJetOR=True, doTaus=False, enableCutflow=True )
overlapSequence.configure(
inputName = {
'electrons' : 'AnalysisElectrons_%SYS%',
'photons' : 'AnalysisPhotons_%SYS%',
'muons' : 'AnalysisMuons_%SYS%',
'jets' : 'AnalysisJets_%SYS%',
- 'taus' : 'AnalysisTauJets_%SYS%' },
+ # 'taus' : 'AnalysisTauJets_%SYS%'
+ },
outputName = {
'electrons' : 'AnalysisElectronsOR_%SYS%',
'photons' : 'AnalysisPhotonsOR_%SYS%',
'muons' : 'AnalysisMuonsOR_%SYS%',
'jets' : 'AnalysisJetsOR_%SYS%',
- 'taus' : 'AnalysisTauJetsOR_%SYS%' },
+ # 'taus' : 'AnalysisTauJetsOR_%SYS%'
+ },
affectingSystematics = {
'electrons' : electronSequence.affectingSystematics(),
'photons' : photonSequence.affectingSystematics(),
'muons' : muonSequence.affectingSystematics(),
'jets' : jetSequence.affectingSystematics(),
- 'taus' : tauSequence.affectingSystematics() } )
+ # 'taus' : tauSequence.affectingSystematics()
+ } )
algSeq += overlapSequence
# Set up an ntuple to check the job with:
@@ -123,12 +127,13 @@ def makeOverlapSequence (dataType) :
'AnalysisJetsOR_%SYS%.eta -> jet_OR_%SYS%_eta',
'AnalysisJetsOR_%SYS%.phi -> jet_OR_%SYS%_phi',
'AnalysisJetsOR_%SYS%.pt -> jet_OR_%SYS%_pt',
- 'AnalysisTauJets_%SYS%.eta -> tau_%SYS%_eta',
- 'AnalysisTauJets_%SYS%.phi -> tau_%SYS%_phi',
- 'AnalysisTauJets_%SYS%.pt -> tau_%SYS%_pt',
- 'AnalysisTauJetsOR_%SYS%.eta -> tau_OR_%SYS%_eta',
- 'AnalysisTauJetsOR_%SYS%.phi -> tau_OR_%SYS%_phi',
- 'AnalysisTauJetsOR_%SYS%.pt -> tau_OR_%SYS%_pt' ]
+ # 'AnalysisTauJets_%SYS%.eta -> tau_%SYS%_eta',
+ # 'AnalysisTauJets_%SYS%.phi -> tau_%SYS%_phi',
+ # 'AnalysisTauJets_%SYS%.pt -> tau_%SYS%_pt',
+ # 'AnalysisTauJetsOR_%SYS%.eta -> tau_OR_%SYS%_eta',
+ # 'AnalysisTauJetsOR_%SYS%.phi -> tau_OR_%SYS%_phi',
+ # 'AnalysisTauJetsOR_%SYS%.pt -> tau_OR_%SYS%_pt'
+ ]
ntupleMaker.systematicsRegex = '.*'
algSeq += ntupleMaker
treeFiller = createAlgorithm( 'CP::TreeFillerAlg', 'TreeFiller' )
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/EventAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/EventAlgorithmsTest_jobOptions.py
index 6fd7280dd7e3aa9d5025957cb8cf76e5696a6427..854852047c069959fe65bc74352b5442f337f5dc 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/EventAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/EventAlgorithmsTest_jobOptions.py
@@ -22,11 +22,15 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
+# Needed for filtering, Athena only for now
+from EventBookkeeperTools.CutFlowHelpers import CreateCutFlowSvc
+CreateCutFlowSvc(svcName="CutFlowSvc", seq=athAlgSeq, addMetaDataToAllOutputFiles=False)
+
from AsgAnalysisAlgorithms.AsgAnalysisAlgorithmsTest import makeEventAlgorithmsSequence
algSeq = makeEventAlgorithmsSequence (dataType)
print( algSeq ) # For debugging
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/GeneratorAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/GeneratorAlgorithmsTest_jobOptions.py
index bae994afbe052c6f5d68d2b823096e6b3a2e2b56..5bff87b56399699893d321c85d4d80d75158a99f 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/GeneratorAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/GeneratorAlgorithmsTest_jobOptions.py
@@ -21,7 +21,7 @@ inputfile = {"mc": 'ASG_TEST_FILE_MC',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/OverlapAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/OverlapAlgorithmsTest_jobOptions.py
index 607ba7885078694ae82c31f5ff87df886f7a275e..b631c30461a94e4d48243c946742646401543157 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/OverlapAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/share/OverlapAlgorithmsTest_jobOptions.py
@@ -22,11 +22,15 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
+# Needed for filtering, Athena only for now
+from EventBookkeeperTools.CutFlowHelpers import CreateCutFlowSvc
+CreateCutFlowSvc(svcName="CutFlowSvc", seq=athAlgSeq, addMetaDataToAllOutputFiles=False)
+
from AsgAnalysisAlgorithms.AsgAnalysisAlgorithmsTest import makeOverlapSequence
algSeq = makeOverlapSequence (dataType)
print( algSeq ) # For debugging
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/python/PhotonAnalysisSequence.py b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/python/PhotonAnalysisSequence.py
index 9c9826c5cd9d50164b8bb753c94135be5c7d000e..b9da8fa196c474b7a218f26e442adc803a657ce9 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/python/PhotonAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/python/PhotonAnalysisSequence.py
@@ -146,6 +146,7 @@ def makePhotonAnalysisSequence( dataType, workingPoint,
alg.isolationCorrectionTool.IsMC = 1
pass
seq.append( alg, inputPropName = 'egammas', outputPropName = 'egammasOut',
+ affectingSystematics = '(^PH_Iso_.*)',
stageName = 'selection' )
# Set up the isolation selection algorithm:
@@ -165,11 +166,9 @@ def makePhotonAnalysisSequence( dataType, workingPoint,
addPrivateTool( alg, 'efficiencyCorrectionTool',
'AsgPhotonEfficiencyCorrectionTool' )
alg.scaleFactorDecoration = 'effSF' + postfix
- alg.efficiencyCorrectionTool.MapFilePath = \
- 'PhotonEfficiencyCorrection/2015_2017/rel21.2/Winter2018_Prerec_v1/map0.txt'
if dataType == 'afii':
alg.efficiencyCorrectionTool.ForceDataType = \
- PATCore.ParticleDataType.Fast
+ PATCore.ParticleDataType.Full # no AFII ID SFs for now
elif dataType == 'mc':
alg.efficiencyCorrectionTool.ForceDataType = \
PATCore.ParticleDataType.Full
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_eljob.py b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_eljob.py
index bbf680455ce301c37cc9a1900daa50095b940a88..d4d268597b2e9545437c87a350a68b0eb2bcf524 100755
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_eljob.py
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_eljob.py
@@ -57,7 +57,7 @@ job.options().setDouble( ROOT.EL.Job.optMaxEvents, 500 )
from EgammaAnalysisAlgorithms.EgammaAnalysisAlgorithmsTest import makeSequence
algSeq = makeSequence (dataType)
-print algSeq # For debugging
+print (algSeq) # For debugging
for alg in algSeq :
job.algsAdd( alg )
pass
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_jobOptions.py
index a3124542462fc69bae67417dc84bcfd103872c54..8f04fdf374a02166b5ab6d60f0e262e65c0fe4d9 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/share/EgammaAnalysisAlgorithmsTest_jobOptions.py
@@ -22,7 +22,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/python/FTagAnalysisSequence.py b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/python/FTagAnalysisSequence.py
index d37732da0a3a7f206e6e85cda3704960e4cf1886..bcde16d17fe49ced497ba64e697ea8822fe23c53 100644
--- a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/python/FTagAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/python/FTagAnalysisSequence.py
@@ -5,7 +5,7 @@ from AnaAlgorithm.DualUseConfig import createAlgorithm, addPrivateTool
def makeFTagAnalysisSequence( seq, dataType, jetCollection,
btagWP = "FixedCutBEff_77",
- btagger = "MV2c10",
+ btagger = "DL1r",
postfix = "",
preselection=None,
kinematicSelection = False,
@@ -46,14 +46,12 @@ def makeFTagAnalysisSequence( seq, dataType, jetCollection,
if legacyRecommendations:
# Remove b-tagging calibration from the container name
btIndex = jetCollection.find('_BTagging')
- if btIndex != -1:
- jetCollection = jetCollection[:btIndex]
+ if btIndex == -1:
+ jetCollection += '_BTagging201903'
- # CDI file
- # https://twiki.cern.ch/twiki/bin/view/AtlasProtected/BTagCalibrationRecommendationsRelease21
- bTagCalibFile = "xAODBTaggingEfficiency/13TeV/2017-21-13TeV-MC16-CDI-2019-07-30_v1.root"
- else:
- bTagCalibFile = "xAODBTaggingEfficiency/13TeV/2020-21-13TeV-MC16-CDI-2020-03-11_Sh228_v3.root"
+ # CDI file
+ # https://twiki.cern.ch/twiki/bin/view/AtlasProtected/BTagCalibrationRecommendationsRelease21
+ bTagCalibFile = "xAODBTaggingEfficiency/13TeV/2020-21-13TeV-MC16-CDI-2020-03-11_Sh228_v3.root"
# # Create the analysis algorithm sequence object:
# seq = AnaAlgSequence( "FTagAnalysisSequence" )
diff --git a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_eljob.py b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_eljob.py
index 88fa5e90944501caddf663f369d0d09ef3293f1b..de0ab5b219d0c55eac2eeb1786dcd3491caab3fd 100755
--- a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_eljob.py
+++ b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_eljob.py
@@ -24,11 +24,6 @@ parser.add_option( '-u', '--unit-test', dest='unit_test',
import ROOT
ROOT.xAOD.Init().ignore()
-# this forces the jet algorithms dictionary to be loaded before
-# anything else, which works around some strange dictionary issues I
-# don't understand.
-ROOT.CP.JetCalibrationAlg ("dummy", None)
-
# ideally we'd run over all of them, but we don't have a mechanism to
# configure per-sample right now
diff --git a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_jobOptions.py
index d776511c9ce836af6904492b3a9ead502ac8774d..e6f6f0aeca8eed87cc251bb3d19921291b20ec50 100644
--- a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/share/FTagAnalysisAlgorithmsTest_jobOptions.py
@@ -22,7 +22,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py
index 5dae4f300888839fc01a6e0268a3b097dfb5ceca..067fbc6631489b4827c56c9a3068f72c48abac1c 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py
@@ -161,9 +161,9 @@ def makeJetAnalysisSequence( dataType, jetCollection, postfix = '',
def makeSmallRJetAnalysisSequence( seq, cutlist, cutlength, dataType, jetCollection,
jetInput, postfix = '',
- runJvtUpdate = True, runFJvtUpdate = True,
- runJvtSelection = True, runFJvtSelection = True,
- runJvtEfficiency = True, runFJvtEfficiency = True,
+ runJvtUpdate = False, runFJvtUpdate = False,
+ runJvtSelection = True, runFJvtSelection = False,
+ runJvtEfficiency = True, runFJvtEfficiency = False,
reduction = "Global", JEROption = "Simple"):
"""Add algorithms for the R=0.4 jets.
@@ -240,6 +240,7 @@ def makeSmallRJetAnalysisSequence( seq, cutlist, cutlength, dataType, jetCollect
if runJvtUpdate :
alg = createAlgorithm( 'CP::JvtUpdateAlg', 'JvtUpdateAlg'+postfix )
addPrivateTool( alg, 'jvtTool', 'JetVertexTaggerTool' )
+ alg.jvtTool.JetContainer = jetCollection
seq.append( alg, inputPropName = 'jets', outputPropName = 'jetsOut', stageName = 'selection' )
if runFJvtUpdate :
@@ -266,6 +267,7 @@ def makeSmallRJetAnalysisSequence( seq, cutlist, cutlength, dataType, jetCollect
alg.efficiencyTool.SFFile = 'JetJvtEfficiency/Moriond2018/JvtSFFile_EMTopoJets.root'
alg.efficiencyTool.MaxPtForJvt = 120e3
alg.efficiencyTool.WorkingPoint = 'Tight' if jetInput == 'EMPFlow' else 'Medium'
+ alg.truthJetCollection = 'AntiKt4TruthDressedWZJets'
alg.selection = 'jvt_selection'
alg.scaleFactorDecoration = 'jvt_effSF_%SYS%'
alg.scaleFactorDecorationRegex = jvtSysts
@@ -285,6 +287,7 @@ def makeSmallRJetAnalysisSequence( seq, cutlist, cutlength, dataType, jetCollect
addPrivateTool( alg, 'efficiencyTool', 'CP::JetJvtEfficiency' )
alg.efficiencyTool.SFFile = 'JetJvtEfficiency/Moriond2018/fJvtSFFile.root'
alg.efficiencyTool.WorkingPoint = 'Tight'
+ alg.truthJetCollection = 'AntiKt4TruthDressedWZJets'
alg.dofJVT = True
alg.fJVTStatus = 'passFJVT,as_char'
alg.selection = 'fjvt_selection'
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py
index 8ebee22a2ab30f3bd48b25d641f3792a9ca7dcc7..17f5dda46dcfa955326924f86ef360be85d8d5b2 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py
@@ -6,7 +6,7 @@ from AnaAlgorithm.DualUseConfig import createAlgorithm
def makeJetJvtAnalysisSequence( dataType, jetCollection,
preselection = '',
- disableFJvt = False,
+ enableFJvt = False,
globalSF = True,
runSelection = True,
enableCutflow = False ):
@@ -15,7 +15,7 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
Keyword arguments:
dataType -- The data type to run on ("data", "mc" or "afii")
jetCollection -- The jet container to run on
- disableFJvt -- Whether to disable forward JVT calculations
+ enableFJvt -- Whether to enable forward JVT calculations
globalSF -- Whether to calculate per event scale factors
runSelection -- Whether to run selection
enableCutflow -- Whether or not to dump the cutflow
@@ -37,7 +37,7 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
# Set up the per-event jet efficiency scale factor calculation algorithm
if dataType != 'data' and globalSF:
- from JetAnalysisSequence import jvtSysts, fjvtSysts
+ from .JetAnalysisSequence import jvtSysts, fjvtSysts
alg = createAlgorithm( 'CP::AsgEventScaleFactorAlg', 'JvtEventScaleFactorAlg' )
alg.preselection = preselection + '&&no_jvt' if preselection else 'no_jvt'
@@ -50,7 +50,7 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
inputPropName = { 'jets' : 'particles',
'eventInfo' : 'eventInfo' } )
- if not disableFJvt:
+ if enableFJvt:
alg = createAlgorithm( 'CP::AsgEventScaleFactorAlg', 'ForwardJvtEventScaleFactorAlg' )
alg.preselection = preselection + '&&no_fjvt' if preselection else 'no_fjvt'
alg.scaleFactorInputDecoration = 'fjvt_effSF_%SYS%'
@@ -66,7 +66,7 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
cutlist.append('jvt_selection')
cutlength.append(1)
- if not disableFJvt:
+ if enableFJvt:
cutlist.append('fjvt_selection')
cutlength.append(1)
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_eljob.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_eljob.py
index 235132a94ae57cba540028959bd13e6fde8f0638..768ae197a9d900dc462e352195e414065bd52bca 100755
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_eljob.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_eljob.py
@@ -24,11 +24,6 @@ parser.add_option( '-u', '--unit-test', dest='unit_test',
import ROOT
ROOT.xAOD.Init().ignore()
-# this forces the jet algorithms dictionary to be loaded before
-# anything else, which works around some strange dictionary issues I
-# don't understand.
-ROOT.CP.JetCalibrationAlg ("dummy", None)
-
# ideally we'd run over all of them, but we don't have a mechanism to
# configure per-sample right now
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py
index aaaa35b50e71246da7cecd99244f33dc529cf5b8..f1a8f48865b2a47cb47d76ceb6541911767d0876 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py
@@ -24,7 +24,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
jetContainer = "AntiKt4EMTopoJets"
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py
index 3d1660911813dade2fa8ac48ad87a5ad87386338..d51cbab9119323bd67961074e3756e0166391dfa 100755
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py
@@ -24,11 +24,6 @@ parser.add_option( '-u', '--unit-test', dest='unit_test',
import ROOT
ROOT.xAOD.Init().ignore()
-# this forces the jet algorithms dictionary to be loaded before
-# anything else, which works around some strange dictionary issues I
-# don't understand.
-ROOT.CP.JetCalibrationAlg ("dummy", None)
-
# ideally we'd run over all of them, but we don't have a mechanism to
# configure per-sample right now
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py
index 3ad9c2a04f1a72d51511a256cfbb6b496166b731..de9ba9c438964bea1c539784e1bc42b0cee36ce8 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py
@@ -24,7 +24,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
jetContainer = "AntiKt4EMTopoJets"
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithmsDict.h b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithmsDict.h
index 751f56e8171afc57f916267267c5cc3ffb60dc2f..06f150d36f6feea8d8b4e33c9b5c5fd5bf959d01 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithmsDict.h
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithmsDict.h
@@ -11,6 +11,5 @@
#include <MetAnalysisAlgorithms/MetBuilderAlg.h>
#include <MetAnalysisAlgorithms/MetMakerAlg.h>
#include <MetAnalysisAlgorithms/MetSignificanceAlg.h>
-#include <MetAnalysisAlgorithms/MetSystematicsAlg.h>
#endif
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetMakerAlg.h b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetMakerAlg.h
index da7cab77319412a73a3100b56b4b5b4f7a43882d..7bf2b28ef695af5a800f2f5625e25439f53a99d0 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetMakerAlg.h
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetMakerAlg.h
@@ -14,6 +14,7 @@
#include <SystematicsHandles/SysWriteHandle.h>
#include <SystematicsHandles/SysListHandle.h>
#include <METInterface/IMETMaker.h>
+#include <METInterface/IMETSystematicsTool.h>
#include <xAODBase/IParticleContainer.h>
#include <xAODMissingET/MissingETContainer.h>
@@ -47,10 +48,14 @@ namespace CP
- /// \brief the smearing tool
+ /// \brief the maker tool
private:
ToolHandle<IMETMaker> m_makerTool;
+ /// \brief the systematics tool
+ private:
+ ToolHandle<IMETSystematicsTool> m_systematicsTool;
+
/// \brief the name of the core MissingETContainer
private:
std::string m_metCoreName;
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetSystematicsAlg.h b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetSystematicsAlg.h
deleted file mode 100644
index cba1d161ef4467072008872141b653956d32489b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/MetSystematicsAlg.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// @author Nils Krumnack
-
-
-
-#ifndef MET_ANALYSIS_ALGORITHMS__MET_SYSTEMATICS_ALG_H
-#define MET_ANALYSIS_ALGORITHMS__MET_SYSTEMATICS_ALG_H
-
-#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <SystematicsHandles/SysCopyHandle.h>
-#include <SystematicsHandles/SysListHandle.h>
-#include <METInterface/IMETSystematicsTool.h>
-#include <xAODMissingET/MissingETContainer.h>
-
-namespace CP
-{
- /// \brief an algorithm for calling \ref IMetCalibrationAndSmearingTool
-
- class MetSystematicsAlg final : public EL::AnaAlgorithm
- {
- /// \brief the standard constructor
- public:
- MetSystematicsAlg (const std::string& name,
- ISvcLocator* pSvcLocator);
-
-
- public:
- StatusCode initialize () override;
-
- public:
- StatusCode execute () override;
-
-
-
- /// \brief the smearing tool
- private:
- ToolHandle<IMETSystematicsTool> m_systematicsTool;
-
- /// \brief the systematics list we run
- private:
- SysListHandle m_systematicsList {this};
-
- /// \brief the met collection we run on
- private:
- SysCopyHandle<xAOD::MissingETContainer> m_metHandle {
- this, "met", "MissingET_%SYS%", "the met collection we run on"};
-
- /// \brief the key for the soft term
- private:
- std::string m_softTerm {"PVSoftTrk"};
- };
-}
-
-#endif
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/selection.xml b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/selection.xml
index c83c888c5044aabdc2ad83858b67ec1222229d77..fc4f787b3d677aa2ab605602d5d5a4a0ab11b4c5 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/selection.xml
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/MetAnalysisAlgorithms/selection.xml
@@ -3,6 +3,5 @@
<class name="CP::MetBuilderAlg" />
<class name="CP::MetMakerAlg" />
<class name="CP::MetSignificanceAlg" />
- <class name="CP::MetSystematicsAlg" />
</lcgdict>
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
index c5e0191f2e24906412c46369447e5436c00ba90f..e6b9c054e30cf7f5953e031ccfb8b32c4052fa1d 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
@@ -26,8 +26,10 @@ namespace CP
ISvcLocator* pSvcLocator)
: AnaAlgorithm (name, pSvcLocator)
, m_makerTool ("METMaker", this)
+ , m_systematicsTool ("", this)
{
declareProperty ("makerTool", m_makerTool, "the METMaker tool we apply");
+ declareProperty ("systematicsTool", m_systematicsTool, "the systematics tool we apply");
declareProperty ("metCore", m_metCoreName, "the name of the core MissingETContainer");
declareProperty ("metAssociation", m_metAssociationName, "the name of the core MissingETContainer");
declareProperty ("electronsKey", m_electronsKey, "the key for the electrons");
@@ -46,6 +48,7 @@ namespace CP
initialize ()
{
ANA_CHECK (m_makerTool.retrieve());
+
for (auto* handle : {&m_electronsHandle, &m_photonsHandle,
&m_muonsHandle, &m_tausHandle, &m_invisHandle}) {
if (*handle) {
@@ -54,6 +57,13 @@ namespace CP
}
m_systematicsList.addHandle (m_jetsHandle);
m_systematicsList.addHandle (m_metHandle);
+
+ if (!m_systematicsTool.empty())
+ {
+ ANA_CHECK (m_systematicsTool.retrieve());
+ ANA_CHECK (m_systematicsList.addAffectingSystematics (m_systematicsTool->affectingSystematics()));
+ }
+
ANA_CHECK (m_systematicsList.initialize());
return StatusCode::SUCCESS;
@@ -122,6 +132,25 @@ namespace CP
ANA_CHECK (m_makerTool->rebuildJetMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, &metHelper, m_doJetJVT));
}
+ // Systematics
+ if (!m_systematicsTool.empty())
+ {
+ ANA_CHECK (m_systematicsTool->applySystematicVariation (sys));
+
+ xAOD::MissingET *softTerm = (*met)[m_softTermKey];
+ if (softTerm == nullptr)
+ {
+ ANA_MSG_ERROR ("failed to find MET soft-term \"" << m_softTermKey << "\"");
+ return StatusCode::FAILURE;
+ }
+
+ // This returns a `CorrectionCode`, so in principle this could
+ // return an `OutOfValidity` result, but I have no idea what
+ // that would mean or how to handle it, so I'm implicitly
+ // converting it into a `FAILURE` instead.
+ ANA_CHECK (m_systematicsTool->applyCorrection (*softTerm, &metHelper));
+ }
+
ANA_CHECK (m_metHandle.record (std::move (met), std::move (aux), sys));
return StatusCode::SUCCESS;
});
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSystematicsAlg.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSystematicsAlg.cxx
deleted file mode 100644
index 1e255b6581d66bc07cda3bfc34b1b94bc59cff90..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSystematicsAlg.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// @author Nils Krumnack
-
-
-
-//
-// includes
-//
-
-#include <MetAnalysisAlgorithms/MetSystematicsAlg.h>
-
-#include <xAODMissingET/MissingETAuxContainer.h>
-
-//
-// method implementations
-//
-
-namespace CP
-{
- MetSystematicsAlg ::
- MetSystematicsAlg (const std::string& name,
- ISvcLocator* pSvcLocator)
- : AnaAlgorithm (name, pSvcLocator)
- , m_systematicsTool ("met::METSystematicsTool", this)
- {
- declareProperty ("systematicsTool", m_systematicsTool, "the systematics tool we apply");
- declareProperty ("softTerm", m_softTerm, "the key for the soft term");
- }
-
-
-
- StatusCode MetSystematicsAlg ::
- initialize ()
- {
- ANA_CHECK (m_systematicsTool.retrieve());
- m_systematicsList.addHandle (m_metHandle);
- ANA_CHECK (m_systematicsList.addAffectingSystematics (m_systematicsTool->affectingSystematics()));
- ANA_CHECK (m_systematicsList.initialize());
- return StatusCode::SUCCESS;
- }
-
-
-
- StatusCode MetSystematicsAlg ::
- execute ()
- {
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_systematicsTool->applySystematicVariation (sys));
-
- xAOD::MissingETContainer *met {};
- ANA_CHECK (m_metHandle.getCopy (met, sys));
-
- xAOD::MissingET *softTerm = (*met)[m_softTerm];
- if (softTerm == nullptr)
- {
- ANA_MSG_ERROR ("failed to find MET soft-term \"" << m_softTerm << "\"");
- return StatusCode::FAILURE;
- }
-
- // This returns a `CorrectionCode`, so in principle this could
- // return an `OutOfValidity` result, but I have no idea what
- // that would mean or how to handle it, so I'm implicitly
- // converting it into a `FAILURE` instead.
- ANA_CHECK (m_systematicsTool->applyCorrection (*softTerm));
-
- return StatusCode::SUCCESS;
- });
- }
-}
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/python/MetAnalysisSequence.py b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/python/MetAnalysisSequence.py
index a20926c5c835ec62b6471c6ea8c1027b3ebcd6b2..aeb244ea391ac58209941b3226e1de8999871fb8 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/python/MetAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/python/MetAnalysisSequence.py
@@ -6,8 +6,8 @@ from AnaAlgorithm.DualUseConfig import createAlgorithm, addPrivateTool
def makeMetAnalysisSequence( dataType, metSuffix,
postfix = '',
- useFJVT = True,
- treatPUJets = True ):
+ useFJVT = False,
+ treatPUJets = False ):
"""Create a met analysis algorithm sequence
After creating the sequence object, it needs to be configured with a call
@@ -60,6 +60,8 @@ def makeMetAnalysisSequence( dataType, metSuffix,
alg.makerTool.DoPFlow = 'PFlow' in metSuffix
if useFJVT:
alg.makerTool.JetRejectionDec = 'passFJVT'
+ if dataType != "data" :
+ addPrivateTool( alg, 'systematicsTool', 'met::METSystematicsTool' )
alg.metCore = 'MET_Core_' + metSuffix
alg.metAssociation = 'METAssoc_' + metSuffix
seq.append( alg,
@@ -72,13 +74,6 @@ def makeMetAnalysisSequence( dataType, metSuffix,
outputPropName = 'met',
affectingSystematics = '(^MET_.*)' )
- if dataType != "data" :
- alg = createAlgorithm( 'CP::MetSystematicsAlg', 'MetSystematicsAlg' + postfix )
- addPrivateTool( alg, 'systematicsTool', 'met::METSystematicsTool' )
- seq.append( alg, inputPropName = 'met',
- affectingSystematics = '(^MET_.*)' )
- pass
-
# Set up the met builder algorithm:
alg = createAlgorithm( 'CP::MetBuilderAlg', 'MetBuilderAlg' + postfix )
seq.append( alg, inputPropName = 'met' )
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/share/MetAnalysisAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/share/MetAnalysisAlgorithmsTest_jobOptions.py
index 0c13735ea0bf6be6cedecbb4fe0f65449ccbe184..6b949c02f98ef5d4e8ce3867b6b27c0b1a990069 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/share/MetAnalysisAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/share/MetAnalysisAlgorithmsTest_jobOptions.py
@@ -22,7 +22,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/src/components/MetAnalysisAlgorithms_entries.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/src/components/MetAnalysisAlgorithms_entries.cxx
index 7e058bc2cb473822da377afd10e96924bca6bde5..566a3a6924a2759e414fcfaab3b985793242f99b 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/src/components/MetAnalysisAlgorithms_entries.cxx
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/src/components/MetAnalysisAlgorithms_entries.cxx
@@ -3,10 +3,8 @@
#include <MetAnalysisAlgorithms/MetBuilderAlg.h>
#include <MetAnalysisAlgorithms/MetMakerAlg.h>
#include <MetAnalysisAlgorithms/MetSignificanceAlg.h>
-#include <MetAnalysisAlgorithms/MetSystematicsAlg.h>
DECLARE_COMPONENT (CP::MetBuilderAlg)
DECLARE_COMPONENT (CP::MetMakerAlg)
DECLARE_COMPONENT (CP::MetSignificanceAlg)
-DECLARE_COMPONENT (CP::MetSystematicsAlg)
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/share/MuonAnalysisAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/share/MuonAnalysisAlgorithmsTest_jobOptions.py
index 1bf25efdc24a8a4d28f77962420cbaf068d9f68c..de5537baa5464ee125893eb254d3bebd9d35e804 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/share/MuonAnalysisAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/share/MuonAnalysisAlgorithmsTest_jobOptions.py
@@ -1,47 +1,31 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
-# @author Nils Krumnack, Will Buttinger
+# @author Nils Krumnack
-#User options, which can be set from command line after a "-" character
-#athena MuonAnalysisAlgorithmsTest_jobOptions.py - --myOption ...
+# User options, which can be set from command line after a "-" character
+# athena MuonAnalysisAlgorithmsTest_jobOptions.py - --myOption ...
from AthenaCommon.AthArgumentParser import AthArgumentParser
athArgsParser = AthArgumentParser()
-athArgsParser.add_argument("--data-type",action="store",dest="data_type",
- default="data",
- help="Type of data to run over. Valid options are data, mc, afii")
-athArgsParser.add_argument("--write-xaod",action="store",dest="write_xaod",
- default=False,
- help="Specify if you want xaod writing to happen (which means slower access mode for now)")
+athArgsParser.add_argument("--data-type", action = "store", dest = "data_type",
+ default = "data",
+ help = "Type of input to run over. Valid options are 'data', 'mc', 'afii'")
athArgs = athArgsParser.parse_args()
-
-if athArgs.write_xaod:
- #currently we must use POOLAccess mode when writing an xAOD
- jps.AthenaCommonFlags.AccessMode = "POOLAccess"
-else:
- #ClassAccess is much faster than POOLAccess
- jps.AthenaCommonFlags.AccessMode = "ClassAccess"
-
dataType = athArgs.data_type
+if not dataType in ["data", "mc", "afii"] :
+ raise Exception ("invalid data type: " + dataType)
-# Set up a histogram/tree output file for the job:
-jps.AthenaCommonFlags.HistOutputs = ["ANALYSIS:MuonAnalysisAlgorithmsTest." + dataType + ".hist.root"]
-svcMgr.THistSvc.MaxFileSize=-1 #make job run faster by disabling file size check
-
-#set a default file and number of events to process
-#can override with standard athena command line options (--evtMax and --filesInput)
-jps.AthenaCommonFlags.EvtMax = 500
-
-if dataType=="data":
- testFile = os.getenv ('ASG_TEST_FILE_DATA')
-elif dataType=="mc":
- testFile = os.getenv ('ASG_TEST_FILE_MC')
-elif dataType=="afii":
- testFile = os.getenv ('ASG_TEST_FILE_MC_AFII')
-
-jps.AthenaCommonFlags.FilesInput = [testFile]
+print("Running on data type: " + dataType)
+inputfile = {"data": 'ASG_TEST_FILE_DATA',
+ "mc": 'ASG_TEST_FILE_MC',
+ "afii": 'ASG_TEST_FILE_MC_AFII'}
+# Set up the reading of the input file:
+import AthenaPoolCnvSvc.ReadAthenaPool
+theApp.EvtMax = 500
+testFile = os.getenv ( inputfile[dataType] )
+svcMgr.EventSelector.InputCollections = [testFile]
from MuonAnalysisAlgorithms.MuonAnalysisAlgorithmsTest import makeSequence
algSeq = makeSequence (dataType)
@@ -50,17 +34,11 @@ print (algSeq) # For debugging
# Add all algorithms from the sequence to the job.
athAlgSeq += algSeq
-# Write a mini-xAOD if requested:
-if athArgs.write_xaod:
- from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
- minixAOD = MSMgr.NewPoolRootStream( 'AAOD_MUON',
- FileName = 'MuonAnalysisAlgorithmsTest.AAOD_MUON.pool.root' )
- minixAOD.AddItem(
- [ 'xAOD::EventInfo#EventInfo',
- 'xAOD::EventAuxInfo#EventInfoAux.-',
- 'xAOD::MuonContainer#AnalysisMuons_NOSYS',
- 'xAOD::AuxContainerBase#AnalysisMuons_NOSYSAux.eta.phi.pt' ] )
-
+# Set up a histogram output file for the job:
+ServiceMgr += CfgMgr.THistSvc()
+ServiceMgr.THistSvc.Output += [
+ "ANALYSIS DATAFILE='MuonAnalysisAlgorithmsTest." + dataType + ".hist.root' OPT='RECREATE'"
+ ]
# Reduce the printout from Athena:
include( "AthAnalysisBaseComps/SuppressLogging.py" )
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/CMakeLists.txt
index f9e3e98448df02cc3ba627edec40730950e01cc7..58a12d090108bc15595babf16edc57143954dd63 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/CMakeLists.txt
@@ -29,27 +29,28 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
atlas_install_data( data/*.conf )
-if( XAOD_STANDALONE )
- atlas_add_test( testJobData
- SCRIPT TauAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- # atlas_add_test( testJobFullSim #testJobFullSim and testJobFastSim are temporarily removed awaiting TauTruthMatchigToolMigration (ATLASG-1548)
- # SCRIPT TauAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
- # PROPERTIES TIMEOUT 600 )
- # atlas_add_test( testJobFastSim
- # SCRIPT TauAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
- # PROPERTIES TIMEOUT 600 )
-else()
- atlas_add_test( testJobData
- SCRIPT athena.py
- TauAnalysisAlgorithms/TauAnalysisAlgorithmsTest_jobOptions.py - --data-type data
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFullSim
- SCRIPT athena.py
- TauAnalysisAlgorithms/TauAnalysisAlgorithmsTest_jobOptions.py - --data-type mc
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFastSim
- SCRIPT athena.py
- TauAnalysisAlgorithms/TauAnalysisAlgorithmsTest_jobOptions.py - --data-type afii
- PROPERTIES TIMEOUT 600 )
-endif()
+# Temporarily disabled
+# if( XAOD_STANDALONE )
+# atlas_add_test( testJobData
+# SCRIPT TauAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+# PROPERTIES TIMEOUT 600 )
+# atlas_add_test( testJobFullSim
+# SCRIPT TauAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+# PROPERTIES TIMEOUT 600 )
+# atlas_add_test( testJobFastSim
+# SCRIPT TauAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+# PROPERTIES TIMEOUT 600 )
+# else()
+# atlas_add_test( testJobData
+# SCRIPT athena.py
+# TauAnalysisAlgorithms/TauAnalysisAlgorithmsTest_jobOptions.py - --data-type data
+# PROPERTIES TIMEOUT 600 )
+# atlas_add_test( testJobFullSim
+# SCRIPT athena.py
+# TauAnalysisAlgorithms/TauAnalysisAlgorithmsTest_jobOptions.py - --data-type mc
+# PROPERTIES TIMEOUT 600 )
+# atlas_add_test( testJobFastSim
+# SCRIPT athena.py
+# TauAnalysisAlgorithms/TauAnalysisAlgorithmsTest_jobOptions.py - --data-type afii
+# PROPERTIES TIMEOUT 600 )
+# endif()
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/share/TauAnalysisAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/share/TauAnalysisAlgorithmsTest_jobOptions.py
index a83dc7c63755f389daeeb51e20156201bb3e1ad5..d15a7339611f865c7c1bf3aadb46c652e8638ac8 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/share/TauAnalysisAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/share/TauAnalysisAlgorithmsTest_jobOptions.py
@@ -22,7 +22,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_jobOptions.py b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_jobOptions.py
index 8bd9e31e5eb4b798448388462af016c6fe7bc6d3..3a0ab8d7e39fb1aa66a71bfecc7aac6f63815dcc 100644
--- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_jobOptions.py
@@ -22,11 +22,15 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"afii": 'ASG_TEST_FILE_MC_AFII'}
# Set up the reading of the input file:
-import AthenaRootComps.ReadAthenaxAODHybrid
+import AthenaPoolCnvSvc.ReadAthenaPool
theApp.EvtMax = 500
testFile = os.getenv ( inputfile[dataType] )
svcMgr.EventSelector.InputCollections = [testFile]
+# Needed for filtering, Athena only for now
+from EventBookkeeperTools.CutFlowHelpers import CreateCutFlowSvc
+CreateCutFlowSvc(svcName="CutFlowSvc", seq=athAlgSeq, addMetaDataToAllOutputFiles=False)
+
from TriggerAnalysisAlgorithms.TriggerAnalysisAlgorithmsTest import makeSequence
algSeq = makeSequence (dataType)
print (algSeq) # For debugging
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index 585b8271c772c6ece9dcace9e74a99e086b6e294..bfef73785373ead2d5ad8092b744392c6f7eebbc 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -590,18 +590,10 @@ StatusCode AANTupleStream::initialize_subAlgos()
ATH_MSG_INFO (" -> creating sub-algorithm " << (*it));
sc = createSubAlgorithm( theType,theName, algo );
if (sc.isFailure())
- {
- ATH_MSG_FATAL (" ERROR creating sub-alg." << (*it));
- return StatusCode::FAILURE;
- }
-
- // force subAlgorithm to set his properties now (reading the jobOptions
- sc = algo->setProperties();
- if (sc.isFailure())
- {
- ATH_MSG_FATAL (" ERROR setting properties for this sub-algorithm.");
- return StatusCode::FAILURE;
- }
+ {
+ ATH_MSG_FATAL (" ERROR creating sub-alg." << (*it));
+ return StatusCode::FAILURE;
+ }
}
return sc;
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
index f5ad85275d7fda499fa4e9ee13f2a4490c6a552c..d6d72da87982a4abb8a35dd320160e5c23f6f5d5 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
@@ -14,7 +14,6 @@
// FrameWork includes
#include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
///////////////////////////////////////////////////////////////////
@@ -101,22 +100,22 @@ StatusCode ParticleSortingAlg::initialize()
if (m_setInCollKey) {
ATH_MSG_DEBUG( "Setting property" << m_inCollKey
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_inCollKey) );
+ m_jos->set (fullToolName + "." + m_inCollKey.name(), m_inCollKey.toString());
}
if (m_setOutCollKey) {
ATH_MSG_DEBUG( "Setting property" << m_outCollKey
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_outCollKey) );
+ m_jos->set (fullToolName + "." + m_outCollKey.name(), m_outCollKey.toString());
}
if (m_setSortVar) {
ATH_MSG_DEBUG( "Setting property" << m_sortVar
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_sortVar) );
+ m_jos->set (fullToolName + "." + m_sortVar.name(), m_sortVar.toString());
}
if (m_setSortDescending) {
ATH_MSG_DEBUG( "Setting property" << m_sortDescending
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_sortDescending) );
+ m_jos->set (fullToolName + "." + m_sortDescending.name(), m_sortDescending.toString());
}
ATH_MSG_DEBUG( "Done setting properties of the tool");
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
index 763f04c952cab1305f4467bf3595943579326178..dd83b6bd8df2b55be88f0a6b689eb63cba482585 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
@@ -12,6 +12,7 @@
#define EVENTUTILS_PARTICLESORTINGALG_H 1
// FrameWork includes
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
@@ -20,7 +21,6 @@
#include <string>
// Forward declarations
-class IJobOptionsSvc;
namespace DerivationFramework {
class IAugmentationTool;
}
@@ -43,13 +43,13 @@ class ParticleSortingAlg
virtual ~ParticleSortingAlg();
/// Athena algorithm's initalize hook
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/// Athena algorithm's execute hook
- virtual StatusCode execute();
+ virtual StatusCode execute() override;
/// Athena algorithm's finalize hook
- virtual StatusCode finalize();
+ virtual StatusCode finalize() override;
private:
@@ -75,7 +75,7 @@ private:
private:
/// The job options service (will be used to forward this algs properties to
/// the private tool)
- ServiceHandle<IJobOptionsSvc> m_jos;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_jos;
/// The ToolHandle to the private ParticleSortingTool
ToolHandle<DerivationFramework::IAugmentationTool> m_tool;
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/Root/PMGCrossSectionTool.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/Root/PMGCrossSectionTool.cxx
index aaa346dbd3c2e52b2d1f20cf5b8d8e008a880aa5..fd2014c2f3e1304777322c71ef2b5d7074c9fb0f 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/Root/PMGCrossSectionTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/Root/PMGCrossSectionTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id: PMGCrossSectionTool.cxx 764400 2016-07-26 17:47:39Z tripiana $
@@ -208,7 +208,7 @@ double PMGCrossSectionTool::getSampleXsection(const int dsid) const
std::vector<int> PMGCrossSectionTool::getLoadedDSIDs() const {
std::vector<int> dsids;
dsids.reserve(m_fStoreSampleInfo.size());
- for (const std::pair<unsigned, AllSampleInfo>& key_info : m_fStoreSampleInfo) {
+ for (const std::pair<const unsigned, AllSampleInfo>& key_info : m_fStoreSampleInfo) {
dsids.push_back(key_info.second.dsid);
}
return dsids;
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/test/ut_PRWDataWeightExample_test.cxx b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/test/ut_PRWDataWeightExample_test.cxx
index 73715427be37b81e0bbfde5e4033820863a95c53..a7d73a13345fec6527d2377a9e9521b9d2583147 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/test/ut_PRWDataWeightExample_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/test/ut_PRWDataWeightExample_test.cxx
@@ -34,11 +34,11 @@ int main() {
"dev/PileupReweighting/ilumicalc_histograms_HLT_e12_lhvloose_nod0_L1EM10VH_297730-304494_OflLumi-13TeV-005.root:HLT_e12_lhvloose_nod0_L1EM10VH",
"dev/PileupReweighting/ilumicalc_histograms_HLT_e24_lhvloose_nod0_L1EM20VH_297730-304494_OflLumi-13TeV-005.root:HLT_e24_lhvloose_nod0_L1EM20VH"}; //feed with lc files for each trigger
- prwTool.setProperty( "DataScaleFactor", 1/1.09 );
- prwTool.setProperty( "LumiCalcFiles" , lcFiles );
- //prwTool.setProperty( "OutputLevel", 1 ); //VERBOSE OUTPUT LEVEL
+ ANA_CHECK(prwTool.setProperty( "DataScaleFactor", 1/1.09 ));
+ ANA_CHECK(prwTool.setProperty( "LumiCalcFiles" , lcFiles ));
+ //ANA_CHECK(prwTool.setProperty( "OutputLevel", 1 )); //VERBOSE OUTPUT LEVEL
- prwTool.initialize();
+ ANA_CHECK(prwTool.initialize());
std::cout << prwTool->expert()->GetDataWeight( 297730 , "HLT_e12_lhvloose_nod0_L1EM10VH", 4) << std::endl;
if(! ( fabs(prwTool->expert()->GetDataWeight( 297730 , "HLT_e12_lhvloose_nod0_L1EM10VH", 4) - 8797.7) < 1e-3 ) ) {
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx
index 8baaaa0a3909f8c8bf014fc5b073770c35e8469c..afdc3a4debb0dbb0b2c71521b80fcca1471f749f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_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
*/
@@ -115,12 +115,14 @@ int main() {
CP::SystematicSet s; s.insert(CP::SystematicVariation("mySyst",1));
- dynamic_cast<CP::ISystematicsTool*>(&*myTool4)->applySystematicVariation(s).ignore();
+ auto isyst4 = dynamic_cast<CP::ISystematicsTool*>(&*myTool4);
+ if (!isyst4) std::abort();
+ isyst4->applySystematicVariation(s).ignore();
std::cout << myTool4->evaluate(e) << std::endl; //should print 5.0
s.clear(); s.insert(CP::SystematicVariation("mySyst",-1));
- dynamic_cast<CP::ISystematicsTool*>(&*myTool4)->applySystematicVariation(s).ignore();
+ isyst4->applySystematicVariation(s).ignore();
std::cout << myTool4->evaluate(e) << std::endl; //should print 1.0
return 0; //zero = success
diff --git a/PhysicsAnalysis/BPhys/BPhysTools/Root/SimpleEncrypter.cxx b/PhysicsAnalysis/BPhys/BPhysTools/Root/SimpleEncrypter.cxx
index 77cc5475f19267425b78afc72be5caa696740bb2..66341ded31fd8204a7e2a05c63e5b5ef6d0ed88c 100644
--- a/PhysicsAnalysis/BPhys/BPhysTools/Root/SimpleEncrypter.cxx
+++ b/PhysicsAnalysis/BPhys/BPhysTools/Root/SimpleEncrypter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// system include:
@@ -21,8 +21,12 @@ namespace xAOD {
//--------------------------------------------------------------------------
// Private static constants
//--------------------------------------------------------------------------
+ // This gives 0x10000 on a 64-bit platform.
+ // ??? Would probably be better to write these using bit operations,
+ // rather than FP, to avoid potential rounding issues.
+ // (eg. the maximum uint64_t cannot be represented exactly as a double)
const SimpleEncrypter::ULLI_t SimpleEncrypter::m_MAXRANGE =
- (SimpleEncrypter::ULLI_t)pow(std::numeric_limits<ULLI_t>::max(), 0.25);
+ (SimpleEncrypter::ULLI_t)pow(static_cast<double>(std::numeric_limits<ULLI_t>::max()), 0.25);
const SimpleEncrypter::ULLI_t SimpleEncrypter::m_MINRANGE =
(SimpleEncrypter::ULLI_t)SimpleEncrypter::m_MAXRANGE/10;
const unsigned int SimpleEncrypter::m_MAXHEXDIGITS =
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDParticleCombiner.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDParticleCombiner.cxx
index b4cab570b04eadde6f9613d34c41ed57a85abd26..a4425d30e16d8cce5239197b91c0bd04dba1e014 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDParticleCombiner.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDParticleCombiner.cxx
@@ -1385,13 +1385,13 @@ bool D2PDParticleCombiner::mcTruthSelections( const CompositeParticle* compPart
{
// Get the GenParticle from the TruthParticle
const TruthParticle* part = (*partItr);
- const HepMC::GenParticle* genPart = part->genParticle();
+ auto genPart = part->genParticle();
const int pdgID = genPart->pdg_id();
// Now, get the origin of this generated particle
McEventCollection::const_iterator mcEventItr = m_mcEventColl->begin();
- const int primaryBarcode = genPart->barcode()%1000000;
- const HepMC::GenParticle* primaryPart = (*mcEventItr)->barcode_to_particle(primaryBarcode);
+ const int primaryBarcode = HepMC::barcode(genPart)%1000000;
+ auto primaryPart = HepMC::barcode_to_particle((*mcEventItr),primaryBarcode);
// Check that we really have the primaryPart
if ( !primaryPart )
@@ -1401,7 +1401,7 @@ bool D2PDParticleCombiner::mcTruthSelections( const CompositeParticle* compPart
}
// Now get the production vertex
- const HepMC::GenVertex* prodVert = primaryPart->production_vertex();
+ auto prodVert = primaryPart->production_vertex();
if ( !prodVert )
{
ATH_MSG_WARNING ( "Could not get the ProductionVertex... skipping!" );
@@ -1409,7 +1409,11 @@ bool D2PDParticleCombiner::mcTruthSelections( const CompositeParticle* compPart
}
// Check that we have only one mother
+#ifdef HEPMC3
+ if ( prodVert->particles_in().size() > 1 )
+#else
if ( prodVert->particles_in_size() > 1 )
+#endif
{
ATH_MSG_WARNING ( "The ProductionVertex has more than one incomming particles... skipping!" );
return true;
@@ -1418,21 +1422,24 @@ bool D2PDParticleCombiner::mcTruthSelections( const CompositeParticle* compPart
// Loop over the mother particles
// Make sure that we ignore bremsstrahlung and decays into itself
- const HepMC::GenVertex* originVert = prodVert ;
- //const HepMC::GenVertex* tmpVert(0);
+ auto originVert = prodVert;
int originPdgID = pdgID;
int originBarcode(0);
int counter(0);
do
{
++counter;
+#ifdef HEPMC3
+ for ( auto mother: originVert->particles_in()) {
+#else
HepMC::GenVertex::particles_in_const_iterator motherItr = originVert->particles_in_const_begin();
HepMC::GenVertex::particles_in_const_iterator motherItrEnd = originVert->particles_in_const_end();
- for ( ; motherItr != motherItrEnd; ++motherItr )
- {
- originPdgID = (*motherItr)->pdg_id();
- originVert = (*motherItr)->production_vertex();
- originBarcode = (*motherItr)->barcode();
+ for ( ; motherItr != motherItrEnd; ++motherItr ) {
+ auto mother=*motherItr;
+#endif
+ originPdgID = mother->pdg_id();
+ originVert = mother->production_vertex();
+ originBarcode = HepMC::barcode(mother);
}
// Protect against infinite loop
@@ -1441,7 +1448,7 @@ bool D2PDParticleCombiner::mcTruthSelections( const CompositeParticle* compPart
ATH_MSG_WARNING ( "Stuck in an infinite while loop... breaking out!" );
break;
}
- } while ( abs(originPdgID) == abs(pdgID) && originVert != 0 );
+ } while ( std::abs(originPdgID) == std::abs(pdgID) && originVert );
// Attach the PDG_ID and barcode of the origin particle to the vectors
pdgIDList.push_back( originPdgID );
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDTruthParticleSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDTruthParticleSelector.cxx
index e9649d21776517d8546bfbd6759788130cd8a84b..1e655dc0d91747c5fc31d9957c8945ccd0608287 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDTruthParticleSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDTruthParticleSelector.cxx
@@ -297,14 +297,11 @@ StatusCode D2PDTruthParticleSelector::processObject( const TruthParticle* part,
if( genPart->end_vertex() )
{
int barcode = HepMC::barcode(genPart);
- auto childItrBegin = genPart->end_vertex()->particles_begin(HepMC::children);
- auto childItrEnd = genPart->end_vertex()->particles_end(HepMC::children);
- for (auto childItr=childItrBegin; childItr!=childItrEnd; ++childItr )
+ for (auto child: *(genPart->end_vertex()))
{
- auto child = (*childItr);
if( child->pdg_id() == pdgID
- && child->barcode() != barcode
- && child->barcode() < 200000 )
+ && HepMC::barcode(child) != barcode
+ && HepMC::barcode(child) < 200000 )
{
isPassed = false;
}
@@ -605,17 +602,14 @@ bool D2PDTruthParticleSelector::getDaughters( HepMC::ConstGenParticlePtr genPart
if( genPart->end_vertex() )
{
int pdgID = genPart->pdg_id();
- int barcode = genPart->barcode();
+ int barcode = HepMC::barcode(genPart);
// Loop over all children
- auto childItrBegin = genPart->end_vertex()->particles_begin(HepMC::children);
- auto childItrEnd = genPart->end_vertex()->particles_end(HepMC::children);
- for (auto childItr=childItrBegin; childItr != childItrEnd; ++childItr )
+ for (auto child: *(genPart->end_vertex()))
{
- auto child = (*childItr);
if( child->pdg_id() == pdgID
- && child->barcode() != barcode
- && child->barcode() < 200000 )
+ && HepMC::barcode(child) != barcode
+ && HepMC::barcode(child) < 200000 )
{
return getDaughters( child, daughters );
}
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py
index 29bf2a9878c535195860bc009e0cfedcea3d6c2b..4e13f4f8639febd796576bb14c07e11ca2643b5d 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/python/egammaD3PD.py
@@ -205,18 +205,10 @@ class MergeElectrons (PyAthena.Alg):
sg.record (enew, 'AllElectrons')
cfgKeyStore.addTransient ('xAOD::ElectronContainer', 'AllElectrons')
- #e1 = sg['StacoMuonCollection']
- e1 = sg.retrieve (ROOT.DataVector(ROOT.xAOD.Electron_v1), 'AllElectrons')
- #if e1.size() > 0:
- # reg = ROOT.SG.AuxTypeRegistry.instance()
- # auxids = list(e1[0].getAuxIDs())
- # auxids = [(reg.getName(id), id) for id in auxids]
- # auxids.sort()
- # print 'aaa', auxids
- # if e2.size() > 0:
- # acc = ROOT.SG.AuxElement.TypelessConstAccessor ('Loose')
- # print 'bbb2', acc.isAvailable(e2[0])
-
+ # Make sure these aux variables are defined at this point.
+ ROOT.xAOD.ElectronAuxContainer()
+ ROOT.xAOD.CaloClusterAuxContainer()
+
return StatusCode.Success
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py
index dfa8e02ffd393d1475db8f6d90137207f9bfb8b0..f573679f8666fcb201473dbfe902a3c052718074 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py
@@ -57,6 +57,9 @@ muonRecFlags.doMSVertex.set_Value_and_Lock( False )
#from xAODJetCnv import ParticleJetCompatibility
+
+include( "RecExCommon/RecExCommon_topOptions.py" )
+
# Block loading conditions folders we won't need.
blocked_folders = [
'/CALO/Identifier/CaloTTOnAttrIdMapAtlas',
@@ -80,5 +83,3 @@ for f in blocked_folders:
conddb.blockFolder (f)
-include( "RecExCommon/RecExCommon_topOptions.py" )
-
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt
index f5f6fd7a12553ace679bf343a8294373081ebc23..987894859e3fbea676960514113e8e1f04e74dcf 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt
@@ -14,6 +14,6 @@ atlas_add_component( JetD3PDMaker
LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils TriggerD3PDMakerLib JetTagEvent JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py
index 641e4c2496eae2a793420882a7de6d8dd0375a1e..f7671f3431abf67820210b8ad4fad5f01f5cb467 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py
@@ -12,12 +12,8 @@ from JetD3PDMaker.jetMETD3PDTrigger import jetMETTriggerBitsD3PDObject
from MuonD3PDMaker.MuonD3PDObject import MuonD3PDObject
from JetD3PDMaker.JetD3PDObject import JetD3PDObject
from TrackD3PDMaker.xAODVertexD3PDObject import PrimaryxAODVertexD3PDObject
-from MissingETD3PDMaker.MissingETD3PDObject import *
-from CaloD3PDMaker.MBTSD3PDObject import MBTSD3PDObject
-from egammaD3PDAnalysis.egammaUserDataConfig import egammaUserDataConfig
from EventCommonD3PDMaker.LBMetadataConfig import LBMetadataConfig
from TruthD3PDMaker.GenEventD3PDObject import GenEventD3PDObject
-from TruthD3PDAnalysis.truthParticleConfig import truthParticleConfig
from TruthD3PDMaker.TruthParticleD3PDObject import TruthParticleD3PDObject
from RecExConfig.RecFlags import rec
@@ -47,7 +43,6 @@ def JetD3PD (file,
file = file,
D3PDSvc = D3PDSvc,
streamNameRoot = streamNameRoot)
- JetIncludes = ['AssocTrackCont']
alg += EventInfoD3PDObject (**_args (level, 'EventInfo', kw ))
alg += ElectronD3PDObject (**_args (level, 'Electron', kw))
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PDObject.py
index 3d5648f28e8455950126fa29b9807b39bb38acd0..2f76ee43dabfd36a978b8004b3cda871c1e61014 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PDObject.py
@@ -1,31 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# import JetD3PDMaker
import D3PDMakerCoreComps
import EventCommonD3PDMaker
-# import BackgroundD3PDMaker
-from D3PDMakerCoreComps.D3PDObject import D3PDObject, \
- make_SGDataVector_D3PDObject
-# from D3PDMakerCoreComps.release_version import at_least_version
-# from D3PDMakerCoreComps.resolveSGKey import resolveSGKey
-# from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
-# from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
-# from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
+from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-# from EventCommonD3PDMaker.DRAssociation import DRAssociation
-
-# from JetD3PDAnalysis.JetVertexFractionConfig import JetVertexFractionConfig
-# from JetD3PDMaker import JetD3PDMakerConf
-# from JetRecTools.JetRecToolsConf import *
-# from JetMomentTools.JetMomentToolsConf import *
-# from RecExConfig.RecFlags import rec
-# from AthenaCommon.AlgSequence import AlgSequence
-# from JetRec import JetRecConf
-# from JetRecTools import JetRecToolsConf
-# from JetTagD3PDMaker.AddBTagD3PDInfo import addBTagInfoToJetObject
-# from AthenaCommon.Logging import logging
-
-
# #
# # Useful options:
@@ -40,166 +18,16 @@ from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
# #
-
-# # Reconstruction versions prior to 15.6.8 didn't fill in the jet timing/quality.
-# # Fix up such jets here.
-# def _fixJetTiming (c, **kw):
-# if at_least_version ('15.6.8'): return
-
-# sgkey_in = c.Getter.SGKey
-# try:
-# sgkey_in = resolveSGKey ('JetCollection', sgkey_in)
-# except:
-# if not kw.get('allowMissing'): raise
-# return
-# sgkey_out = sgkey_in + '_timing'
-
-# seq = AlgSequence (D3PDMakerFlags.PreD3PDAlgSeqName())
-# if not hasattr (seq, sgkey_out):
-# tools = []
-# caloqual_kw = {'doCellBasedVariables' : True,
-# 'doConstituentBasedVariables' : True,
-# 'doSamplingBasedVariables' : True,
-# 'cutOnTile' : 254,
-# 'cutOnLAr' : 4000,
-# 'doTileQuality' : True,
-# 'doLArQuality' : True}
-
-# if hasattr (JetRecToolsConf, 'JetTimeQualityTool'):
-# # rel 15 setup
-# tool1 = JetRecToolsConf.JetTimeQualityTool (sgkey_out + 'TimeTool',
-# DoTime = False,
-# DoQuality = False,
-# UseCells = False)
-# if rec.readESD() or rec.readRDO():
-# tool1.DoTime = True
-# tool1.DoQuality = True
-# tool1.UseCells = True
-# if rec.readAOD() and (sgkey_in.find ('H1Topo') >= 0 or
-# sgkey_in.find ('LCTopo') >= 0):
-# tool1.DoTime = True
-# tools.append (tool1)
-# else:
-# # rel 16
-# caloqual_kw['doTiming'] = True
-
-# tool2 = JetCaloQualityTool (sgkey_out + 'QualTool',
-# **caloqual_kw)
-# tools.append (tool2)
-
-# alg = JetD3PDMaker.JetFixupAlg (sgkey_out,
-# InputKey = sgkey_in,
-# OutputKey = sgkey_out,
-# Tools = tools)
-# for t in tools:
-# alg += t
-
-# seq += alg
-
-# c.Getter.SGKey = sgkey_out
-# return
-
-
-# def _getprop (c, n):
-# return getattr (c, n, c.getDefaultProperty(n))
-
-# def _jetVertexAlgHook (c, prefix, sgkey, typeName,
-# seq = AlgSequence(D3PDMakerFlags.PreD3PDAlgSeqName()),
-# *args, **kw):
-# jvf = getattr(c, c.getName() + '_JetVertexFraction', None)
-# if jvf :setattr(jvf,'FillFullJVF',True) # impose FillFullJVF in this case
-# if jvf and (_getprop (jvf, 'FromUD') or _getprop (jvf, 'FillFullJVF')):
-# JetVertexFractionConfig (seq = seq,
-# prefix = prefix,
-# # nb. Use this rather than the sgkey
-# # passed in; _fixJetTiming may
-# # have changed it.
-# sgkey = c.Getter.SGKey,
-# typeName = typeName)
-
-
-# return
-
-
-# # Don't make this unless target has been specified.
-# def _constitAssocLevel (reqlev, args):
-# if reqlev < 1: return False
-# if not args.has_key ('Target') or not args['Target']: return False
-# return True
-
-
-# def _jetMomentsHook (c, prefix, sgkey, typeName,
-# seq = AlgSequence(D3PDMakerFlags.PreD3PDAlgSeqName()),
-# *args, **kw):
-
-# from JetD3PDAnalysis.JetMomentCalcConfig import JetMomentCalcConfig
-
-# # Always turn this on if we're making jets --- it changes jvf results.
-# from JetRec.JetRecFlags import jetFlags
-# if hasattr(jetFlags, 'jetPerformanceJob'):
-# jetFlags.jetPerformanceJob = True
-
-# if hasattr (c, c.name() + '_Special'):
-# JetMomentCalcConfig (c.Getter.SGKey, 'all', seq=seq)
-# else:
-# key = resolveSGKey ('JetCollection', c.Getter.SGKey)
-# if hasattr (c, c.name() + '_ActiveArea'):
-# JetMomentCalcConfig (c.Getter.SGKey, None, seq=seq)
-# if hasattr (c, c.name() + '_TruthMF') and 'Topo' in key:
-# JetMomentCalcConfig (c.Getter.SGKey, ['truthMF'], seq=seq)
-# if hasattr (c, c.name() + '_TracksMoments') and 'Topo' in key:
-# JetMomentCalcConfig (c.Getter.SGKey, ['trackMoments'], seq=seq)
-# if hasattr (c, c.name() + '_OriginCorrection'):
-# JetMomentCalcConfig (c.Getter.SGKey, ['origin'], seq=seq)
-# return
-
-# def _jetClusterMomentsHook (c, prefix, sgkey, typeName,
-# seq = AlgSequence(D3PDMakerFlags.PreD3PDAlgSeqName()),
-# *args, **kw):
-
-# if hasattr (c, c.name() + '_JetClusterMoment'):
-# from JetRec.JetMomentGetter import make_JetMomentGetter
-# try:
-# from JetMomentTools.JetMomentToolsConf import JetMomentsFromClusters
-# except ImportError:
-# # JetMomentsFromClusters available only in AtlasPhysics, not
-# # in AtlasProduction or development.
-# log = logging.getLogger ('JetD3PDObject')
-# log.warn ('JetMomentsFromClusters not available; skipping.')
-# return
-# jt = JetMomentsFromClusters(ClusterMoments=["CENTER_LAMBDA","SECOND_R","SECOND_LAMBDA"],
-# ClusterPt=True)
-# make_JetMomentGetter(resolveSGKey ('JetCollection', c.Getter.SGKey),
-# [jt])
-
-# return
-
def getJetD3PDObject(objectname='JetD3PDObject', prefix='jet_', btagleveloffset=7):
-
object = make_SGDataVector_D3PDObject ('DataVector<xAOD::Jet_v1>',
D3PDMakerFlags.JetSGKey(),
prefix, objectname)
-# object.defineHook (_fixJetTiming)
-# object.defineHook (_jetVertexAlgHook)
-# object.defineHook (_jetMomentsHook)
-# object.defineHook (_jetClusterMomentsHook)
-
object.defineBlock(0, 'Kinematics',
EventCommonD3PDMaker.FourMomFillerTool,
WriteE = True)
-# object.defineBlock(1, 'OriginCorrection',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['EtaOrigin' , 'PhiOrigin' , 'MOrigin'
-# ])
-
-# object.defineBlock(1, 'WIDTH',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['WIDTH'
-# ])
-
object.defineBlock (
1, 'DQMoments',
D3PDMakerCoreComps.AuxDataFillerTool,
@@ -221,10 +49,6 @@ def getJetD3PDObject(objectname='JetD3PDObject', prefix='jet_', btagleveloffset=
'ootFracClusters10 < float: 0',
])
-# object.defineBlock(1, 'JetSamplingsFrac',
-# JetD3PDMaker.JetSamplingsFracFillerTool)
-# object.defineBlock(1, 'JetQual',
-# JetD3PDMaker.JetCaloUtilsFillerTool)
object.defineBlock (
1, 'JetQual',
D3PDMakerCoreComps.AuxDataFillerTool,
@@ -234,228 +58,7 @@ def getJetD3PDObject(objectname='JetD3PDObject', prefix='jet_', btagleveloffset=
'isUgly < int: 0',
'hecf = HECFrac < float: 0',
])
-# object.defineBlock(1, 'EMFraction',
-# JetD3PDMaker.JetEMFractionFillerTool)
-
-# object.defineBlock(1, 'JES',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=[ 'Offset', 'EMJES', 'EMJES_EtaCorr','EMJESnooffset' ])
-
-# object.defineBlock(1, 'JESMoments',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['LCJES', 'LCJES_EtaCorr' ])
-
-# object.defineBlock(1, 'EMScale',
-# JetD3PDMaker.JetSignalStateFillerTool,
-# WriteE = True,
-# SignalStateNumber = 0,
-# SignalStatePrefix = 'emscale')
-
-# object.defineBlock(1, 'ActiveArea',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['ActiveArea', 'ActiveAreaPx', 'ActiveAreaPy', 'ActiveAreaPz', 'ActiveAreaE'])
-
-# # Including JetVertexFraction should also include JVtx and TruthMF,
-# # unless explicitly excluded.
-# def _jvfLOD (reqlev, args, hookargs):
-# if reqlev < 3: return False
-# if not 'JVtx' in hookargs['exclude']:
-# hookargs['include'].append ('JVtx')
-# if not 'TruthMF' in hookargs['exclude']:
-# hookargs['include'].append ('TruthMF')
-# return True
-# try:
-# # tracksAvailableForJets not defined in every release. Temporarily put it in
-# # a try / except block
-# from JetRec.TrackSelectionForJets import tracksAvailableForJets
-# dotrackVars = tracksAvailableForJets()
-# except:
-# dotrackVars = True
-# if dotrackVars:
-# object.defineBlock(_jvfLOD, 'JetVertexFraction',
-# JetD3PDMaker.JetVertexFractionFillerTool,
-# UDPrefix=D3PDMakerFlags.JetUserDataPrefix(),
-# )
-# object.defineBlock(3, 'JVtx',
-# JetD3PDMaker.JetVtxFillerTool)
-
-# object.defineBlock(3, 'TruthMF',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['TruthMFindex','TruthMF'])
-
-# object.defineBlock(3, 'Layer',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['GSCFactorF','WidthFraction'])
-
-# object.defineBlock(4, 'Samplings',
-# JetD3PDMaker.JetSamplingsFillerTool)
-
-# object.defineBlock(4, 'JetShape',
-# JetD3PDMaker.JetShapeFillerTool)
-
-
-# object.defineBlock(4, 'Constituents',
-# JetD3PDMaker.JetConstituentFillerTool,
-# SignalStateNumber = -1,
-# SignalStatePrefix = 'default')
-
-# object.defineBlock(4, 'ConstituentScale',
-# JetD3PDMaker.JetSignalStateFillerTool,
-# WriteE = True,
-# SignalStateNumber = 2,
-# SignalStatePrefix = 'constscale')
-
-# object.defineBlock(5, 'JetLArHVMoment',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['LArBadHVEnergy','LArBadHVRatio'])
-
-# object.defineBlock(9, 'JetClusterMoment',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['CENTER_LAMBDA','SECOND_R','SECOND_LAMBDA',
-# 'CLUSTER_PT'])
-
-# addBTagInfoToJetObject(object,btagleveloffset)
-
-# # Track association cannot be done unless there are tracks.
-# # As often this is not the case track association will be done only
-# # if this is explicitly asked for. by defining it in the include list.
-# #
-# # You can also enable it by passing an argument to JetD3PDObject
-# # like:
-# # AssocTrackCont_target='mytarget_'
-# def _jetAssocLevel (reqlev, args):
-# return args.has_key ('target') or (reqlev >= 999)
-# IndexMultiAssociation (object,
-# JetD3PDMaker.FlavorAssociationTool,
-# 'trk',
-# prefix = 'flavor_assoctrk_',
-# level = _jetAssocLevel,
-# blockname = 'AssocTrackCont')
-
-# object.defineBlock(10, 'JetRoIword',
-# JetD3PDMaker.JetROIWordFillerTool
-# )
-
-
-# #JetElAssoc = DRAssociation(object,"ElectronContainer",D3PDMakerFlags.ElectronSGKey(),0.2,prefix='el_',matched="matched",blockname="El02Match")
-
-# #JetMuAssoc = DRAssociation(object,"Analysis::MuonContainer",D3PDMakerFlags.MuonSGKey(),0.2,prefix='mu_',matched="matched",blockname="Mu02Match")
-
-# #JetTrkAssoc = DRAssociation(object,"Rec::TrackParticleContainer",D3PDMakerFlags.TrackSGKey(),0.4,prefix='trk_',matched="matched",blockname="Trk04Match")
-
-# #---------------- Trigger Object ----------------------------
-
-# #if D3PDMakerFlags.DoTrigger():
-# if False:
-# JetL1Assoc = SimpleAssociation(object,
-# JetD3PDMaker.JetL1TriggerObjectAssociationTool,
-# matched = 'matched',
-# blockname = 'L1Info',
-# prefix = 'L1_',
-# MaxDR = 0.6,
-# ChainPattern = 'L1_J.*')
-
-# JetL1Assoc.defineBlock (99, 'L1Kinematics',
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteE = True,
-# WriteEt = False,
-# WriteM = False)
-
-# JetL2Assoc = SimpleAssociation(object,
-# JetD3PDMaker.JetL2TriggerObjectAssociationTool,
-# matched = 'matched',
-# blockname = 'L2Info',
-# prefix = 'L2_',
-# MaxDR = 0.25,
-# ChainPattern = 'L2_j.*')
-
-# JetL2Assoc.defineBlock (99, 'L2Kinematics',
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteE = True,
-# WriteEt = False,
-# WriteM = False)
-
-# JetEFAssoc = SimpleAssociation(object,
-# JetD3PDMaker.JetEFTriggerObjectAssociationTool,
-# matched = 'matched',
-# blockname = 'EFInfo',
-# prefix = 'EF_',
-# MaxDR = 0.25,
-# ChainPattern = 'EF_j.*')
-
-# JetEFAssoc.defineBlock (99, 'EFKinematics',
-# EventCommonD3PDMaker.FourMomFillerTool,
-# WriteE = True,
-# WriteEt = False,
-# WriteM = False)
-# pass
-
-# ConstitAssoc = ContainedVectorMultiAssociation \
-# (object,
-# #JetD3PDMaker.JetConstituentAssociationTool,
-# EventCommonD3PDMaker.NavigableConstituentAssociationTool,
-# 'constit_',
-# TypeName = 'CaloCluster',
-# nrowName = '',
-# level = 1)
-
-
-# ConstitAssoc.defineBlock (_constitAssocLevel, 'ConstitIndex',
-# D3PDMakerCoreComps.IndexFillerTool,
-# Target = '')
-
-
-# # Beam Background Identification Method
-# object.defineBlock( 999, 'BeamBackground',
-# BackgroundD3PDMaker.BeamBackgroundJetFillerTool)
-
-# #---------------- special jet moments ----------------------------
-
-# object.defineBlock(999, 'TrackMF',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['TrackMFindex','TrackMF'])
-
-# object.defineBlock(999, 'TracksMoments',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['nTrk_pv0_1GeV', 'sumPtTrk_pv0_1GeV', 'nTrk_allpv_1GeV', 'sumPtTrk_allpv_1GeV',
-# 'nTrk_pv0_500MeV', 'sumPtTrk_pv0_500MeV',
-# 'trackWIDTH_pv0_1GeV','trackWIDTH_allpv_1GeV'
-# ])
-
-# object.defineBlock(999, 'JetLabel',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['JetLabel'])
-
-# object.defineBlock(999, 'Special',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['LikeLihood_0',
-# 'LowEtConstituentsFrac','KtDr',
-# ])
-
-# object.defineBlock(999, 'VoronoiArea',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['VoronoiArea', 'VoronoiAreaPx', 'VoronoiAreaPy', 'VoronoiAreaPz', 'VoronoiAreaE',
-# ])
-
-# object.defineBlock(999, 'Isolation',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['IsoKR20Perp', 'IsoKR20Par', 'IsoKR20SumPt', 'IsoDelta2Perp', 'IsoDelta2Par',
-# 'IsoDelta2SumPt', 'IsoFixedCone8Perp', 'IsoFixedCone8Par', 'IsoFixedCone8SumPt',
-# 'IsoFixedArea13Perp', 'IsoFixedArea13Par', 'IsoFixedArea13SumPt',
-# 'Iso6To88Perp', 'Iso6To88Par', 'Iso6To88SumPt',
-# ])
-
-# object.defineBlock(999, 'SplitInfo',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['SPLIT12', 'SPLIT23', 'SPLIT34'])
-
-# object.defineBlock(999, 'Uncertainties',
-# JetD3PDMaker.JetMomentFillerTool,
-# Moments=['SmearingFactor'])
return object
-
-
-
JetD3PDObject = getJetD3PDObject()
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py
deleted file mode 100644
index 23a189f63c15bfd1cb628c500cef75d3fa1e2144..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
-from JetD3PDMaker.jetMETD3PDTrigger import jetMETTriggerBitsD3PDObject
-from JetD3PDMaker.JetTileD3PDObject import JetTileD3PDObject
-#from MissingETD3PDMaker.MissingETD3PDObject import *
-from EventCommonD3PDMaker.LBMetadataConfig import LBMetadataConfig
-from TruthD3PDMaker.GenEventD3PDObject import GenEventD3PDObject
-from TruthD3PDMaker.TruthParticleD3PDObject import TruthParticleD3PDObject
-from RecExConfig.RecFlags import rec
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-inputSGkey='AntiKt4TopoEMNewJets'
-
-def _args (level, name, kwin, **kw):
- kw = kw.copy()
- kw['level'] = level
- for (k, v) in kwin.items():
- if k.startswith (name + '_'):
- kw[k[len(name)+1:]] = v
- return kw
-
-
-# TD: changed the tuplename here:
-def JetTileD3PD (file,
- level = 4,
- tuplename = 'MyTuple',
- seq = topSequence,
- D3PDSvc = 'D3PD::RootD3PDSvc',
- streamNameRoot = None,
- **kw):
-
-
- alg = D3PDMakerCoreComps.MakerAlg(tuplename,
- seq,
- file = file,
- D3PDSvc = D3PDSvc,
- streamNameRoot = streamNameRoot)
-
- JetIncludes = ['AssocTrackCont']
-
- alg += EventInfoD3PDObject (**_args (level, 'EventInfo', kw ))
-
- alg += JetTileD3PDObject (**_args(level,inputSGkey, kw, sgkey=inputSGkey, prefix='AntiKt4Topo_' ) )
-
- from TriggerD3PDMaker.BGCodeD3PDObject import BGCodeD3PDObject
- from TriggerD3PDMaker.BunchStructureMetadata import addBunchStructureMetadata
- alg += BGCodeD3PDObject (**_args (2, 'BGCode', kw))
- addBunchStructureMetadata( alg )
-
-
- from TriggerD3PDMaker.TrigDecisionD3PDObject import TrigDecisionD3PDObject
- from TriggerD3PDMaker.TrigConfMetadata import addTrigConfMetadata
-
- alg += TrigDecisionD3PDObject (**_args(10, 'TrigDecision', kw))
- addTrigConfMetadata( alg )
-
- if D3PDMakerFlags.DoTrigger():
- alg += jetMETTriggerBitsD3PDObject(level)
-
-
- from TrackD3PDMaker.TrackD3PDMakerFlags import TrackD3PDFlags
- TrackD3PDFlags.storeVertexTrackIndexAssociation.set_Value_and_Lock(False)
- TrackD3PDFlags.storeVertexTrackAssociation.set_Value_and_Lock(False)
- TrackD3PDFlags.storeVertexFitQuality.set_Value_and_Lock(False)
-
- from TrackD3PDMaker.xAODVertexD3PDObject import PrimaryxAODVertexD3PDObject
- alg += PrimaryxAODVertexD3PDObject (**_args (0, 'PrimaryVertex', kw,
- allowMissing = True,
- sgkey = D3PDMakerFlags.VertexSGKey(),
- prefix = 'vxp_'))
-
-
- if rec.doTruth():
- alg += GenEventD3PDObject (**_args (1, 'GenEvent', kw))
- alg += TruthParticleD3PDObject(**_args (1, 'TruthParticle', kw))
- alg += JetTileD3PDObject (**_args (1, 'AntiKt4TruthJets', kw, sgkey='AntiKt4TruthJets', prefix='AntiKt4Truth_' ) )
-
-
- alg.MetadataTools += [LBMetadataConfig()]
- return alg
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py
deleted file mode 100644
index 825123394f0cc1becf50842f99a52817fdb22fb3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Haifeng.Li@cern.ch
-
-# For May reprocess data
-
-
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
-from egammaD3PDMaker.ElectronD3PDObject import ElectronD3PDObject
-from egammaD3PDMaker.PhotonD3PDObject import PhotonD3PDObject
-from JetD3PDMaker.jetMETD3PDTrigger import jetMETTriggerBitsD3PDObject
-from MuonD3PDMaker.MuonD3PDObject import MuonD3PDObject
-from JetD3PDMaker.JetD3PDObject import JetD3PDObject
-from TrackD3PDMaker.xAODVertexD3PDObject import PrimaryxAODVertexD3PDObject
-from MissingETD3PDMaker.MissingETD3PDObject import *
-from CaloD3PDMaker.MBTSD3PDObject import MBTSD3PDObject
-from egammaD3PDAnalysis.egammaUserDataConfig import egammaUserDataConfig
-from EventCommonD3PDMaker.LBMetadataConfig import LBMetadataConfig
-from TruthD3PDMaker.GenEventD3PDObject import GenEventD3PDObject
-from TruthD3PDAnalysis.truthParticleConfig import truthParticleConfig
-from TruthD3PDMaker.TruthParticleD3PDObject import TruthParticleD3PDObject
-from RecExConfig.RecFlags import rec
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-def JetD3PD (file,
- level = 4,
- tuplename = 'jet',
- seq = topSequence,
- D3PDSvc = 'D3PD::RootD3PDSvc'):
-
- egammaUserDataConfig (seq)
- if rec.doTruth():
- truthParticleConfig (seq)
-
- JetIncludes = ['AssocTrackCont']
-
- alg = D3PDMakerCoreComps.MakerAlg(tuplename, seq,
- file = file, D3PDSvc = D3PDSvc)
- #-- General
- alg += EventInfoD3PDObject (level)
- alg += ElectronD3PDObject (0)
- alg += PhotonD3PDObject (0)
- alg += MuonD3PDObject (0)
- alg += PrimaryxAODVertexD3PDObject (4, allowMissing = True,
- sgkey = D3PDMakerFlags.VertexSGKey(),
- prefix = 'vxp_')
- #-- JET
- alg += JetD3PDObject (level, sgkey='AntiKt4H1TopoJets', include = JetIncludes, prefix='AntiKt4H1Topo_' )
- alg += JetD3PDObject (level, sgkey='AntiKt6H1TopoJets', include = JetIncludes, prefix='AntiKt6H1Topo_' )
-
- #alg += JetD3PDObject (level, sgkey='Cone4H1TopoJets', include = JetIncludes, prefix='Cone4H1Topo_' )
-
- #-- MET
- alg += RefFinalMETD3PDObject (level)
- alg += MuonMETD3PDObject (level)
- alg += MuonBoyMETD3PDObject (level)
- alg += FinalMETD3PDObject (level)
- alg += CryoMETD3PDObject (level)
- alg += CryoConeMETD3PDObject (level)
- alg += RefEleMETD3PDObject (level)
- alg += RefJetMETD3PDObject (level)
- alg += RefGammaMETD3PDObject (level)
- alg += RefTauMETD3PDObject (level)
- alg += CellOutMETD3PDObject (level)
- alg += BaseMETD3PDObject (level)
- alg += Base0METD3PDObject (level)
- alg += CalibMETD3PDObject (level)
- alg += MuonBoySpectroMETD3PDObject (level)
- alg += MuonBoyTrackMETD3PDObject (level)
- alg += TopoMETD3PDObject (level)
- alg += CorrTopoMETD3PDObject (level)
- alg += LocHadTopoMETD3PDObject (level)
- alg += TopoObjMETD3PDObject (level)
-
- #-- Trigger
- if D3PDMakerFlags.DoTrigger():
- alg += jetMETTriggerBitsD3PDObject(level)
-
- #-- Truth
- if rec.doTruth() :
- alg += GenEventD3PDObject (1)
- #alg += TruthParticleD3PDObject (level)
- #alg += JetD3PDObject (level, sgkey='Cone4TruthJets' , prefix='Cone4Truth_' )
- alg += JetD3PDObject (3, sgkey='AntiKt4TruthJets', prefix='AntiKt4Truth_' )
- #alg += JetD3PDObject (3, sgkey='AntiKt6TruthJets', prefix='AntiKt6Truth_' )
-
-
- #-- Meta Data
- alg.MetadataTools += [LBMetadataConfig()]
- return alg
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/CMakeLists.txt
index 19dfe77fbc9e9ae4052b9aa16223e6bd460860d5..0dec158a973878d491273ab22363d7b297033a06 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/CMakeLists.txt
@@ -1,12 +1,10 @@
-################################################################################
-# Package: JetTagD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetTagD3PDMaker )
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( CLHEP )
# Component(s) in the package:
@@ -14,9 +12,9 @@ atlas_add_component( JetTagD3PDMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel AthContainers EventKernel EventPrimitives GaudiKernel GeneratorObjects InDetIdentifier InDetReadoutGeometry D3PDMakerUtils JetTagEvent JetTagInfo MuonIDEvent McParticleEvent JetEvent muonEvent Particle egammaEvent TrkParticleBase VxJetVertex VxSecVertex VxVertex TrkVertexFitterInterfaces InDetConditionsSummaryService )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel AthContainers EventPrimitives GaudiKernel GeneratorObjects InDetIdentifier InDetReadoutGeometry D3PDMakerUtils JetTagEvent JetTagInfo MuonIDEvent McParticleEvent JetEvent muonEvent Particle egammaEvent StoreGateLib TrkParticleBase VxJetVertex VxSecVertex VxVertex InDetConditionsSummaryService )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/AddBTagD3PDInfo.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/AddBTagD3PDInfo.py
index 29111f043801cd737332fd0902e8b1f23612aeee..49f4a296b419878b079db76721465c912c4b5a6c 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/AddBTagD3PDInfo.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/AddBTagD3PDInfo.py
@@ -1,7 +1,5 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from __future__ import print_function
-
#
## @file JetTagD3PDMaker/python/AddBTagInfoToJetObject.py
## @brief Python function to add BTagging specific fillers and association tools to a JetD3PDObject
@@ -32,14 +30,10 @@ addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=X)
alg+=JetD3PDObject(level, <additional options>)
"""
import JetTagD3PDMaker
-import TrackD3PDMaker
-import TruthD3PDMaker
import EventCommonD3PDMaker
import MuonD3PDMaker
+import TruthD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
@@ -51,7 +45,6 @@ from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
-from TruthD3PDMaker.TruthD3PDMakerFlags import TruthD3PDFlags
def _jetTagAssocLevel (reqlev, args):
if not args.has_key ('target') :
@@ -67,7 +60,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
from AthenaCommon.Logging import logging
addBTagInfoLogger = logging.getLogger( "addBTagInfoToJetObject" )
- if JetD3PDObject.allBlocknames().has_key(JetTagD3PDKeys.BTagWeightsBlockName()) :
+ if JetTagD3PDKeys.BTagWeightsBlockName() in JetD3PDObject.allBlocknames():
addBTagInfoLogger.warning("btag blocks already added to JetD3PDObject - ignore")
return
@@ -153,7 +146,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
- JetTrack = ContainedVectorMultiAssociation(JetD3PDObject,
+ JetTrack = ContainedVectorMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetTrackAssociationTool,
level = btagLevelOffset+4,
prefix=JetTagD3PDKeys.JetTrackAssocPrefix(),
@@ -164,7 +157,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JetTrackGhostAssoc():
- JetTrackAssoc = IndexMultiAssociation(JetD3PDObject,
+ JetTrackAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetTrackAssociationTool,
'', ## set target when calling the JetD3PDObject
level = _jetTagAssocLevel,
@@ -230,7 +223,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JetMuonAssoc():
- JetMuonAssoc = IndexMultiAssociation(JetD3PDObject,
+ JetMuonAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetMuonAssociationTool,
'', ## set target when calling the JetD3PDObject
level =_jetTagAssocLevel,
@@ -239,7 +232,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.AddSecondMuonCollection():
- JetMuon2Assoc = IndexMultiAssociation(JetD3PDObject,
+ JetMuon2Assoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetMuonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -249,7 +242,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JetElectronAssoc():
- JetElectronAssoc = IndexMultiAssociation(JetD3PDObject,
+ JetElectronAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetElectronAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -258,7 +251,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JetPhotonAssoc():
- JetPhotonAssoc = IndexMultiAssociation(JetD3PDObject,
+ JetPhotonAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetPhotonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -269,8 +262,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if rec.doTruth and LocalFlags.JetGenSoftLeptonAssoc():
- JetGenSoftLeptonAssoc = IndexMultiAssociation(\
- JetD3PDObject,
+ JetGenSoftLeptonAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetGenSoftLeptonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -281,8 +273,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
- JetGenSoftLepton = ContainedVectorMultiAssociation(\
- JetD3PDObject,
+ JetGenSoftLepton = ContainedVectorMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetGenSoftLeptonAssociationTool,
level = btagLevelOffset+4,
prefix=JetTagD3PDKeys.JetGenSoftLeptonAssocPrefix(),
@@ -475,7 +466,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.IPInfoPlus():
- IPInfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject,
+ IPInfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagIPInfoPlusTrackAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -515,7 +506,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
AddNormDist=True)
- SVInfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject,
+ SVInfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSVInfoPlusTrackAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -552,7 +543,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
InfoType="SV0InfoPlus",
AllowMissing = True)
- SV0InfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject,
+ SV0InfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSVInfoPlusTrackAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -583,7 +574,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.SoftMuonInfo():
- SoftMuonInfoMuonAssoc = IndexMultiAssociation(JetD3PDObject,
+ SoftMuonInfoMuonAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSoftMuonInfoMuonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -630,8 +621,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.AddSecondMuonCollection():
- SoftMuon2InfoMuon2Assoc = IndexMultiAssociation(\
- JetD3PDObject,
+ SoftMuon2InfoMuon2Assoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSoftMuonInfoMuonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -663,7 +653,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.SoftMuonChi2Info():
- SoftMuonChi2InfoMuonAssoc = IndexMultiAssociation(JetD3PDObject,
+ SoftMuonChi2InfoMuonAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSoftMuonInfoMuonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -712,8 +702,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.AddSecondMuonCollection():
- SoftMuon2Chi2InfoMuon2Assoc = IndexMultiAssociation(\
- JetD3PDObject,
+ SoftMuon2Chi2InfoMuon2Assoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSoftMuonInfoMuonAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -747,8 +736,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.SoftElectronInfo():
- SoftElectronInfoElectronAssoc = IndexMultiAssociation(\
- JetD3PDObject,
+ SoftElectronInfoElectronAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagSoftElecInfoegammaAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -784,8 +772,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
AllowMissing = True)
- MultiSVInfoPlusTrackAssoc = IndexMultiAssociation(\
- JetD3PDObject,
+ MultiSVInfoPlusTrackAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagMultiSVInfoMSVVtxInfoAssociationTool,
'',
level = _jetTagAssocLevel,
@@ -853,7 +840,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JFVxOnJetAxisAssocLabel() != "":
- JetVxOnJetAxisAssoc = IndexMultiAssociation(JetD3PDObject,
+ JetVxOnJetAxisAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetVxOnJetAxisAssociationTool,
LocalFlags.JFVxOnJetAxisAssocLabel(),
level = btagLevelOffset+5,
@@ -864,8 +851,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JetFitterFlipVxOnJetAxisAssoc():
- JFFlipJetVxOnJetAxisAssoc = IndexMultiAssociation(\
- JetD3PDObject,
+ JFFlipJetVxOnJetAxisAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetVxOnJetAxisAssociationTool,
LocalFlags.JFVxOnJetAxisAssocLabel(),
level = btagLevelOffset+6,
@@ -877,8 +863,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JFTwoTrackVertexAssocLabel() != "":
- JetJFTwoTrackVertexAssoc = IndexMultiAssociation(\
- JetD3PDObject,
+ JetJFTwoTrackVertexAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetJFTwoTrackVertexAssociationTool,
LocalFlags.JFTwoTrackVertexAssocLabel(),
level = btagLevelOffset+5,
@@ -889,8 +874,7 @@ def addBTagInfoToJetObject(JetD3PDObject, btagLevelOffset=0, LocalFlags=JetTagD3
if LocalFlags.JetFitterFlipTwoTrackVertexAssoc():
- JetJFFlipTwoTrackVertexAssoc = IndexMultiAssociation(\
- JetD3PDObject,
+ JetJFFlipTwoTrackVertexAssoc = IndexMultiAssociation(JetD3PDObject, # noqa: F841
JetTagD3PDMaker.JetTagJetJFTwoTrackVertexAssociationTool,
LocalFlags.JFTwoTrackVertexAssocLabel(),
level = btagLevelOffset+6,
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/BTaggingD3PD.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/BTaggingD3PD.py
index 54ca8cb2eebc0d5953f41d1d2a124dcaa340ac72..69ef4530a672cfb3c56feb018bd71c872934388f 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/BTaggingD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/BTaggingD3PD.py
@@ -6,30 +6,24 @@
# @brief Construct a btagging d3pd.
#
-from __future__ import print_function
-
-
from AthenaCommon.AppMgr import ServiceMgr
-from AthenaCommon.AppMgr import ToolSvc
from RecExConfig.RecFlags import rec
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
-from TrackD3PDMaker.TrackD3PDMakerFlags import TrackD3PDFlags
-from TruthD3PDMaker.TruthD3PDMakerFlags import TruthD3PDFlags
def _modifyMuonObject(MuonD3PDObject):
- if not MuonD3PDObject.allBlocknames().has_key("BtagMuonTrackMatchingBlock"):
+ if "BtagMuonTrackMatchingBlock" not in MuonD3PDObject.allBlocknames():
if JetTagD3PDFlags.TrackAssocLabel() != "":
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
import MuonD3PDMaker
- mtassoc = IndexAssociation(MuonD3PDObject,
- MuonD3PDMaker.MuonTrackParticleAssociationTool,
- JetTagD3PDFlags.TrackAssocLabel(),
- level = 500,
- prefix=JetTagD3PDKeys.MuonInDetTrackAssocPrefix(),
- blockname="BtagMuonTrackMatchingBlock",
- Type = 'InDet')
+ _ = IndexAssociation(MuonD3PDObject,
+ MuonD3PDMaker.MuonTrackParticleAssociationTool,
+ JetTagD3PDFlags.TrackAssocLabel(),
+ level = 500,
+ prefix=JetTagD3PDKeys.MuonInDetTrackAssocPrefix(),
+ blockname="BtagMuonTrackMatchingBlock",
+ Type = 'InDet')
@@ -312,7 +306,7 @@ def BTaggingD3PD(alg = None,
if JetTagD3PDFlags.AddFatJets():
from JetTagD3PDMaker.JetTagJSD3PDObjects import JSD3PD_Tool
for xx in JetTagD3PDKeys.FatJetsList():
- if xx[0] != None and xx[1] != None:
+ if xx[0] is not None and xx[1] is not None:
jsD3PD = JSD3PD_Tool(xx)
jsD3PD.addToAlg(alg)
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagClustersD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagClustersD3PDObject.py
index 20451112a83d0fae9872da484a45492130f15334..4900c4ea4224f245c20c2655adad32245b03ac5c 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagClustersD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagClustersD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagClustersD3PDObject.py
@@ -6,8 +6,6 @@
## @author Georges Aad
## @date Nov, 2010
##
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
def getJetTagClusterD3PDObject(level=0, **kw):
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
index 9804b1080ce20e839f4efa9c73bcc2f57d16f51e..418e3f49a75856bb8c3e68c55b00d3e9dddb326e 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
@@ -7,8 +7,6 @@
## @date Nov, 2010
##
-import JetTagD3PDMaker
-import TrackD3PDMaker
import egammaD3PDMaker
import EventCommonD3PDMaker
##from egammaD3PDMaker.isem_version import isem_version ## use 16
@@ -19,8 +17,6 @@ from ROOT import egammaPID
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagEventInfoD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagEventInfoD3PDObject.py
index f4c1e662250a14c7f499f77bde9734730c8791b0..7a836ed940074b6df7b62ebd03ddef62e88c1c5f 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagEventInfoD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagEventInfoD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagEventInfoD3PDObject.py
@@ -7,8 +7,6 @@
## @date Nov, 2010
##
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from EventCommonD3PDMaker.EventInfoD3PDObject import EventInfoD3PDObject
def getJetTagEventInfoD3PDObject(level=1, **kw):
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJSD3PDObjects.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJSD3PDObjects.py
index a745f144f13055cb1fb2662b7d0b3fa57bd71d4e..411976b9bae804132ff82a842152f593bcff5928 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJSD3PDObjects.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJSD3PDObjects.py
@@ -1,15 +1,11 @@
-# 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 JetD3PDMaker.JetD3PDObject import getJetD3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from RecExConfig.RecFlags import rec
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
import JetSubstructureD3PDMaker
from D3PDMakerCoreComps.D3PDObject import make_SG_D3PDObject
-import EventCommonD3PDMaker
-#from JetTagD3PDMaker.AddBTagD3PDInfo import addBTagInfoToJetObject
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
import JetTagD3PDMaker
@@ -37,14 +33,14 @@ def AddHadronicInfo(obj, additionalMoments = [], theblockname = 'SubjetMomentsHa
def AddAssocJetsIndex(obj, jetassocname, jettarget, intermediate_names = [], level=0):
- JetAssocTrack = IndexMultiAssociation(obj,
- JetSubstructureD3PDMaker.JetSubstructureTagJetINavigable4MomentumAssociationTool,
- jettarget,level = level,
- prefix=jetassocname+'_',
- blockname=jetassocname+'blockindex',
- AssociationName = jetassocname ,
- IntermediateAssociationNames=intermediate_names,
- OutputLevel=3 )
+ _ = IndexMultiAssociation(obj,
+ JetSubstructureD3PDMaker.JetSubstructureTagJetINavigable4MomentumAssociationTool,
+ jettarget,level = level,
+ prefix=jetassocname+'_',
+ blockname=jetassocname+'blockindex',
+ AssociationName = jetassocname ,
+ IntermediateAssociationNames=intermediate_names,
+ OutputLevel=3 )
def AddConstitIndex(object, typename='CaloCluster', target='cl_', myprefix='', level=0):
@@ -64,7 +60,6 @@ def AddConstitIndex(object, typename='CaloCluster', target='cl_', myprefix='', l
def AddConstitTruthIndex(object, typename='TruthParticle', level=0):
import EventCommonD3PDMaker
- import D3PDMakerCoreComps
import TruthD3PDMaker
ConstitAssoc = ContainedVectorMultiAssociation \
(object,
@@ -74,10 +69,10 @@ def AddConstitTruthIndex(object, typename='TruthParticle', level=0):
TypeName = typename, WriteWeight = False,
level = level)
- genpart = IndexAssociation (ConstitAssoc,
- TruthD3PDMaker.TruthParticleGenParticleAssociationTool,
- TruthD3PDFlags.GenParticleAssocLabel(),
- prefix='mcpart_')
+ _ = IndexAssociation (ConstitAssoc,
+ TruthD3PDMaker.TruthParticleGenParticleAssociationTool,
+ TruthD3PDFlags.GenParticleAssocLabel(),
+ prefix='mcpart_')
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJetD3PDObject.py
index 8404905fa9df4e92601b2406cdea2a3a54c6094b..4bc767efa3a235cb0a450e9689e23866d2cdc0c4 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagJetD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagJetD3PDObject.py
@@ -10,8 +10,6 @@
import JetTagD3PDMaker
import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.ObjKeyStore import cfgKeyStore
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
@@ -53,11 +51,11 @@ def _jetFilterAlgHook (c, prefix, sgkey,
del filterargs['name']
### if some argument do not exist set them to the flag values
- if not 'PtMinCut' in filterargs:
+ if 'PtMinCut' not in filterargs:
filterargs['PtMinCut']=JetTagD3PDFlags.JetFilterPtMinCut()
- if not 'EtaCut' in filterargs:
+ if 'EtaCut' not in filterargs:
filterargs['EtaCut']=JetTagD3PDFlags.JetFilterEtaCut()
- if not 'UseEMScale' in filterargs:
+ if 'UseEMScale' not in filterargs:
filterargs['UseEMScale']=JetTagD3PDFlags.JetFilterUseEMScale()
preseq += JetTagD3PDMaker.JetTagJetFilterAlg(algname,
@@ -139,7 +137,7 @@ def getJetTagJetD3PDObject(filteredsgkey, origsgkey, level=4, prefix=None,
**kw):
- if prefix == None:
+ if prefix is None:
import re
prefix = re.sub('Jets','',origsgkey)
prefix = re.sub('AOD','',prefix)
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMETD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMETD3PDObject.py
index 82f6ab61e5eabfff1a1ce714964684b9c624a604..3a7cec901a76acabfe6851740d9f732c9cb76e79 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMETD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMETD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagMETD3PDObject.py
@@ -6,8 +6,6 @@
## @author Georges Aad
## @date Nov, 2010
##
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
import re
from MissingETD3PDMaker.MissingETD3PDObject import RefFinalMETD3PDObject
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMSVVtxInJetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMSVVtxInJetD3PDObject.py
index 705cec126a7528217e1f24036a0a3b4023adfcc0..b9e6bf7406d6cd21251a9a511fd0cc1c8aada17d 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMSVVtxInJetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMSVVtxInJetD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagMSVVtxInJetD3PDObject.py
@@ -13,7 +13,6 @@ import JetTagD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py
index 4ff1ed59f93ab7a312a234756bcf60db8e573293..526f53857a9e09284e269e29581891447a6e2c65 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py
@@ -18,7 +18,6 @@ import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPhotonInJetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPhotonInJetD3PDObject.py
index 579358a1f5c469e1b40ef0c5b1086a972722c66b..7c78b5b69116c348765ec2d9726a2c51c0251c7c 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPhotonInJetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPhotonInJetD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagPhotonInJetD3PDObject.py
@@ -7,14 +7,11 @@
## @date Nov, 2010
##
-import JetTagD3PDMaker
-import TrackD3PDMaker
import egammaD3PDMaker
import EventCommonD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPixModCondD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPixModCondD3PDObject.py
index 5e68ae3897e41bff72397916f0fb86229243f336..874c72c9bad51abb707b4f31fc2d0330f32b38e3 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPixModCondD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPixModCondD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagPixModCondD3PDObject.py
@@ -11,15 +11,11 @@ import JetTagD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
-from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
-
-
def _jetTagPixModCondAssocLevel (reqlev, args):
if not args.has_key ('PixelSummarySvc') :
return False
- if args['PixelSummarySvc'] == None:
+ if args['PixelSummarySvc'] is None:
return False
return True
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py
index abee42be5c0cda94e089f7785ea893bc168d6ec5..2a98e4b2511a9a4a2000dc883788bfbf72042a8f 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py
@@ -6,8 +6,6 @@
## @author Georges Aad
## @date Nov, 2010
##
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from TrackD3PDMaker.xAODVertexD3PDObject import BuildxAODVertexD3PDObject
from TrackD3PDMaker.TrackD3PDMakerFlags import TrackD3PDFlags
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
index 7768e2414a5534a22c7b989707dfc5e46076f2cb..490c5dd1dfa70d125794ae74dc030fc5413721d2 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
@@ -6,8 +6,6 @@
## @author Georges Aad
## @date Nov, 2010
##
-import D3PDMakerCoreComps
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from TrackD3PDMaker.TrackD3PDMakerFlags import TrackD3PDFlags
from TrackD3PDMaker.xAODTrackD3PDObject import xAODTrackD3PDObject
from RecExConfig.RecFlags import rec
@@ -15,7 +13,6 @@ from RecExConfig.RecFlags import rec
from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDFlags
from TruthD3PDMaker.TruthD3PDMakerFlags import TruthD3PDFlags
-from TruthD3PDMaker.TruthD3PDMakerKeys import TruthD3PDKeys
## configure TrackD3PDFlags before calling this function
##eg:
@@ -45,7 +42,7 @@ def getJetTagTrackD3PDObject(level=20, **kw):
if not rec.doTruth:
TrackD3PDFlags.doTruth = False
- if TruthD3PDFlags.GenParticleAssocLabel() == None or TruthD3PDFlags.GenParticleAssocLabel() == "":
+ if TruthD3PDFlags.GenParticleAssocLabel() is None or TruthD3PDFlags.GenParticleAssocLabel() == "":
TrackD3PDFlags.doTruth = False
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTriggerBitsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTriggerBitsD3PDObject.py
index d86015bb79bd1aca694e7a2d2dc567880b1ecfeb..2d86428587c0bf342a961b8d88730de8539e80cc 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTriggerBitsD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTriggerBitsD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagTriggerBitsD3PDObject.py
@@ -44,6 +44,6 @@ defineTriggerBits(JetTagTriggerBitsD3PDObject, 0, ["L1_MU4.*","L2_mu4T.*","EF_mu
def getJetTagTriggerBitsD3PDObject(triggerList):
- defineTriggerBits(JetTagTriggerBitsD3PDObject,0,triggerList);
+ defineTriggerBits(JetTagTriggerBitsD3PDObject,0,triggerList)
return JetTagTriggerBitsD3PDObject(0)
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTwoTrackVertexD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTwoTrackVertexD3PDObject.py
index bd064a3d3f5be2591b70097dc64e4e02353d0856..f9276c24884432fd0c4fbc44492227727d910b76 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTwoTrackVertexD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTwoTrackVertexD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagTwoTrackVertexD3PDObject.py
@@ -8,12 +8,9 @@
##
import JetTagD3PDMaker
-import EventCommonD3PDMaker
-import TrackD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.ObjKeyStore import cfgKeyStore
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagVxOnJetAxisD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagVxOnJetAxisD3PDObject.py
index f29754886ceb89ea8874f0d65a394fd0d9c28990..62a66963263688f8e771bbd1077d646f9f54157d 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagVxOnJetAxisD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagVxOnJetAxisD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
## @file JetTagD3PDMaker/python/JetTagVxOnJetAxisD3PDObject.py
@@ -9,12 +9,9 @@
import JetTagD3PDMaker
-import EventCommonD3PDMaker
-import TrackD3PDMaker
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.ObjKeyStore import cfgKeyStore
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt
index 8be369473eb413318cc772f981f1a7d49f3666fb..412ff095b2abc77f292322ce2bef3d3adc2d96e2 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt
@@ -1,22 +1,19 @@
-################################################################################
-# Package: MuonD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonD3PDMaker )
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
# Component(s) in the package:
atlas_add_component( MuonD3PDMaker
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel AthContainers StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent TrackRecordLib MuonTruthAlgsLib )
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel AthContainers StoreGateLib AtlasDetDescr EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigMuonEvent TrackRecordLib MuonTruthAlgsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/CscPrepDataD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/CscPrepDataD3PDObject.py
deleted file mode 100644
index 087859689e801d704616375df44d1c2aebca2c4d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/CscPrepDataD3PDObject.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import MuonD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
-
-def makeD3PDObject (name, prefix, object_name, getter = None,
- sgkey = 'CSC_Clusters',
- typename = 'Muon::CscPrepDataContainer',
- label = 'CscPrepData'):
- if not getter:
- from MuonD3PDMaker.MuonD3PDMakerConf import D3PD__CscPrepDataCollectionGetterTool
- getter = D3PD__CscPrepDataCollectionGetterTool \
- (name + '_Getter',
- SGKey = sgkey,
- TypeName = typename,
- Label = label)
- getter.OutputLevel=1
- return D3PDMakerCoreComps.VectorFillerTool (name,
- Prefix = prefix,
- Getter = getter,
- ObjectName = object_name, OutputLevel=1)
-
-
-CscPrepDataD3PDObject = D3PDObject (makeD3PDObject, 'csc_', 'CscPrepDataD3PDObject')
-
-CscPrepDataD3PDObject.defineBlock (0, 'PrepData', MuonD3PDMaker.CscPrepDataFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MDTSimHitD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MDTSimHitD3PDObject.py
index b33c3dbbccd62ce315409c7289173a4ca96e9fdf..27479a70d7380212717c125cf15adb777b5596d4 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MDTSimHitD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MDTSimHitD3PDObject.py
@@ -1,13 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: MDTSimHitD3PDObject.py 508173 2012-06-29 11:47:55Z ssnyder $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Import all needed modules:
import MuonD3PDMaker
-import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
# Create the configurable:
MDTSimHitD3PDObject = \
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MdtPrepDataD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MdtPrepDataD3PDObject.py
deleted file mode 100644
index 4ddc187f4f44733c9fdce92e7150ffe174749bf9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MdtPrepDataD3PDObject.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import MuonD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
-
-def makeD3PDObject (name, prefix, object_name, getter = None,
- sgkey = 'MDT_DriftCircles',
- typename = 'Muon::MdtPrepDataContainer',
- label = 'MdtPrepData'):
- if not getter:
- from MuonD3PDMaker.MuonD3PDMakerConf import D3PD__MdtPrepDataCollectionGetterTool
- getter = D3PD__MdtPrepDataCollectionGetterTool \
- (name + '_Getter',
- SGKey = sgkey,
- TypeName = typename,
- Label = label)
- getter.OutputLevel=1
- return D3PDMakerCoreComps.VectorFillerTool (name,
- Prefix = prefix,
- Getter = getter,
- ObjectName = object_name, OutputLevel=1)
-
-
-MdtPrepDataD3PDObject = D3PDObject (makeD3PDObject, 'mdt_', 'MdtPrepDataD3PDObject')
-
-MdtPrepDataD3PDObject.defineBlock (0, 'PrepData', MuonD3PDMaker.MdtPrepDataFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py
index 5dd4489e20c1c1c89a0ddfe7437eabc396efb61f..d8eb5967a39d031934a9f41df2fdeb5fad65af44 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonD3PDObject.py
@@ -4,23 +4,13 @@
import MuonD3PDMaker
import D3PDMakerCoreComps
import EventCommonD3PDMaker
-import TriggerD3PDMaker
import TrackD3PDMaker
-from TriggerD3PDMaker.defineTriggerBits import defineTriggerBits
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerCoreComps.D3PDObject import DeferArg
from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
-from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
import TruthD3PDMaker
from RecExConfig.RecFlags import rec
-from RecExConfig.ObjKeyStore import cfgKeyStore
-
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.Include import include
-
from MuonD3PDMaker.MuonD3PDMakerFlags import MuonD3PDFlags
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentD3PDObject.py
index 54557190d10f58d2a36a750ff936f1be71f001e6..8e45f15497fa4541c69226334582d3085e91e91c 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentD3PDObject.py
@@ -1,18 +1,12 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import MuonD3PDMaker
-import D3PDMakerCoreComps
-import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from MuonD3PDMaker.MuonD3PDMakerFlags import MuonD3PDFlags
from RecExConfig.RecFlags import rec
-#from MuonD3PDMaker.MuonD3PDMakerConf import MuonWZTruthTool
-#TruthTool = MuonWZTruthTool()
-#ToolSvc += TruthTool
-
MuonSegmentD3PDObject = \
make_SGDataVector_D3PDObject ('Trk::SegmentCollection',
D3PDMakerFlags.MuonSegmentSGKey(),
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentTruthD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentTruthD3PDObject.py
deleted file mode 100644
index e8cfa5bc2b1e0cc1bed662a63281f75632cdebfc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSegmentTruthD3PDObject.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import MuonD3PDMaker
-import D3PDMakerCoreComps
-import EventCommonD3PDMaker
-from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
-from RecExConfig.RecFlags import rec
-
-MuonSegmentTruthD3PDObject = \
- make_SGDataVector_D3PDObject ('Trk::SegmentCollection',
- 'MuonSegments',
- 'mu_segmentTruth_', 'MuonSegmentTruthD3PDObject')
-
-MuonSegmentTruthD3PDObject.defineBlock (1, 'PatternTruthCombination',
- MuonD3PDMaker.MuonSegmentTruthFillerTool)
-
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSpShowerD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSpShowerD3PDObject.py
index bf3d1f64eb57d3a87f98b2dc2dba25840fdffd8a..cdb5179c8cc514a987633d4110e6c2546d69bf0e 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSpShowerD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/MuonSpShowerD3PDObject.py
@@ -1,6 +1,5 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id$
#
# @file MuonD3PDMaker/python/MuonSpShowerD3PDObject.py
# @author Michiru Kaneda <Michiru.Kaneda@cern.ch>
@@ -8,7 +7,6 @@
# @brief MuonSpShower filler tool
#
-import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from MuonD3PDMaker.MuonD3PDMakerConf import D3PD__MuonSpShowerFillerTool as MuonSpShowerFillerTool
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/RpcPrepDataD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/RpcPrepDataD3PDObject.py
deleted file mode 100644
index a8cb743c876318467f092dededc66b8264401dad..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/RpcPrepDataD3PDObject.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import MuonD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
-
-def makeD3PDObject (name, prefix, object_name, getter = None,
- sgkey = 'RPC_Measurements',
- typename = 'Muon::RpcPrepDataContainer',
- label = 'RpcPrepData'):
- if not getter:
- from MuonD3PDMaker.MuonD3PDMakerConf import D3PD__RpcPrepDataCollectionGetterTool
- getter = D3PD__RpcPrepDataCollectionGetterTool \
- (name + '_Getter',
- SGKey = sgkey,
- TypeName = typename,
- Label = label)
- getter.OutputLevel=1
- return D3PDMakerCoreComps.VectorFillerTool (name,
- Prefix = prefix,
- Getter = getter,
- ObjectName = object_name, OutputLevel=1)
-
-
-RpcPrepDataD3PDObject = D3PDObject (makeD3PDObject, 'rpc_', 'RpcPrepDataD3PDObject')
-
-RpcPrepDataD3PDObject.defineBlock (0, 'PrepData', MuonD3PDMaker.RpcPrepDataFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TgcPrepDataD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TgcPrepDataD3PDObject.py
deleted file mode 100644
index 74780db166d54f8b377a6472145af67461a2a373..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TgcPrepDataD3PDObject.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import MuonD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
-
-def makeD3PDObject (name, prefix, object_name, getter = None,
- sgkey = 'TGC_Measurements',
- #sgkey = 'TGC_MeasurementsPriorBC',
- #sgkey = 'TGC_MeasurementsNextBC',
- typename = 'Muon::TgcPrepDataContainer',
- label = 'TgcPrepData'):
- if not getter:
- from MuonD3PDMaker.MuonD3PDMakerConf import D3PD__TgcPrepDataCollectionGetterTool
- getter = D3PD__TgcPrepDataCollectionGetterTool \
- (name + '_Getter',
- SGKey = sgkey,
- TypeName = typename,
- Label = label)
- getter.OutputLevel=1
- return D3PDMakerCoreComps.VectorFillerTool (name,
- Prefix = prefix,
- Getter = getter,
- ObjectName = object_name, OutputLevel=1)
-
-
-TgcPrepDataD3PDObject = D3PDObject (makeD3PDObject, 'tgc_', 'TgcPrepDataD3PDObject')
-
-TgcPrepDataD3PDObject.defineBlock (0, 'PrepData', MuonD3PDMaker.TgcPrepDataFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TrackRecordD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TrackRecordD3PDObject.py
index 9af4e3ea908410f7c973ebcfbfccfea1cc6cfdc6..af551535e6256d08aa42063f880f5ba67b2c753a 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TrackRecordD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TrackRecordD3PDObject.py
@@ -1,13 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: TrackRecordD3PDObject.py
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Import all needed modules:
import MuonD3PDMaker
-import D3PDMakerCoreComps
-from D3PDMakerCoreComps.resolveSGKey import testSGKey
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.D3PDObject import D3PDObject
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TruthMuonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TruthMuonD3PDObject.py
index 89bbea36976227edeced3117cdeaa6de4b9d2a38..28d646ea12c04da61aef318a9955ba4e3d5105bf 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TruthMuonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/TruthMuonD3PDObject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# @file MuonD3PDMaker/python/TruthMuonD3PDObject.py
# $author Srivas Prasad <srivas.prasad@cern.ch>
@@ -9,7 +9,6 @@
import MuonD3PDMaker
import EventCommonD3PDMaker
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerCoreComps.resolveSGKey import testSGKey
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.ObjKeyStore import cfgKeyStore
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/muonD3PD.py b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/muonD3PD.py
index d3ddfb1b3f6361db05dbf0c23c510c414ad2749e..2d4e90c52671b0daa6faac23141f0a2b678136bc 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/muonD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/python/muonD3PD.py
@@ -1,6 +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$
#
# @file MuonD3PDMaker/python/muonD3PD.py
# @author srivas prasad <srivas.prasad@cern.ch>
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/TruthD3PDAnalysis/IGenObjectsFilterTool.h b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/TruthD3PDAnalysis/IGenObjectsFilterTool.h
index ba5cfa518deb39ee8e69dee1c537542b2627ecfc..9223bbfebb4c73880b236301ccc73d38527e9de7 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/TruthD3PDAnalysis/IGenObjectsFilterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/TruthD3PDAnalysis/IGenObjectsFilterTool.h
@@ -72,7 +72,7 @@ public:
* @returns <code>true</code> if the object should be selected,
* <code>false</code> otherwise
*/
- virtual bool pass( const HepMC::GenParticle* part,
+ virtual bool pass( HepMC::ConstGenParticlePtr part,
const McEventCollection* coll = 0 ) const = 0;
/// Function selecting GenVertex objects
@@ -85,7 +85,7 @@ public:
* @returns <code>true</code> if the object should be selected,
* <code>false</code> otherwise
*/
- virtual bool pass( const HepMC::GenVertex* vtx,
+ virtual bool pass( HepMC::ConstGenVertexPtr vtx,
const McEventCollection* coll = 0 ) const = 0;
}; // class IGenObjectsFilterTool
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.cxx
index 997025e37b1f82d302b313f39a92c5a7ddcf52b1..45098962fbd6f19cd2f7d8b174e4abf42c43acb2 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.cxx
@@ -35,7 +35,7 @@ SimpleTruthParticleFilterTool::SimpleTruthParticleFilterTool
* @brief Test to see if we want to keep a particle.
*/
bool
-SimpleTruthParticleFilterTool::isAccepted (const HepMC::GenParticle* p)
+SimpleTruthParticleFilterTool::isAccepted (HepMC::ConstGenParticlePtr p)
{
bool ok = false;
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.h b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.h
index 9b3c1d4141189ffb712b0a83eef51c80e402aa08..546c44d0d2d5a2c55b401716024e5ed1aad86b37 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/SimpleTruthParticleFilterTool.h
@@ -36,7 +36,7 @@ public:
const IInterface* parent);
/// Test to see if we want to keep a particle.
- virtual bool isAccepted (const HepMC::GenParticle* p);
+ virtual bool isAccepted (HepMC::ConstGenParticlePtr p);
private:
/// Parameter: PDG ID to filter on
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/share/TruthD3PDfromEVGEN_preInclude.py b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/share/TruthD3PDfromEVGEN_preInclude.py
index 937b69d20376ec0584dbb1117b145fa9de8036b5..d394adc7703bce8a916122c80e8e9321f358a5ad 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/share/TruthD3PDfromEVGEN_preInclude.py
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/share/TruthD3PDfromEVGEN_preInclude.py
@@ -34,14 +34,6 @@ from JetRec.JetRecFlags import jetFlags
jetFlags.noStandardConfig.set_Value_and_Lock(True)
jetFlags.evgenJets.set_Value_and_Lock(True)
-# This is necessary to properly disable JVF tools...
-# Unfortunately, the functions only exist in newer releases...
-try:
- from JetMomentTools import JetMomentsConfigHelpers
- JetMomentsConfigHelpers.recommendedAreaAndJVFMoments = lambda *l,**a:None
-except:
- pass
-
#--------------------------------------------------------------------------
# Configuration
#--------------------------------------------------------------------------
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/GenVertexFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/GenVertexFillerTool.cxx
index 453e1dc2558771524b006a1f3ed765c29c23623a..852510d414746aeb4dce117f1185c610c42c1f1a 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/GenVertexFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/GenVertexFillerTool.cxx
@@ -67,7 +67,7 @@ StatusCode GenVertexFillerTool::fill (const HepMC::GenVertex& p)
*m_x = pos.x();
*m_y = pos.y();
*m_z = pos.z();
- *m_barcode = p.barcode();
+ *m_barcode = HepMC::barcode(p);
if (m_do_id) *m_id = p.id();
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/JetFullTruthTag.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/JetFullTruthTag.cxx
index 71d853c66ec4ef2e56e9a0c0aaab8e8381f08dc6..3d01e45b521df0ef75ba6329857e424bf0681483 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/JetFullTruthTag.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/JetFullTruthTag.cxx
@@ -63,36 +63,35 @@ StatusCode JetFullTruthTag::fill (const Jet& p)
// We have an McEventCollection
for (McEventCollection::const_iterator currentGenEventIter = mcCollection->begin();
currentGenEventIter!=mcCollection->end(); ++currentGenEventIter) {
- for (HepMC::GenEvent::particle_const_iterator currentGenParticleIter= (*currentGenEventIter)->particles_begin();
- currentGenParticleIter!= (*currentGenEventIter)->particles_end(); ++currentGenParticleIter) {
+ for (auto currentGenParticle: *(*currentGenEventIter)) {
// Grab the PDGID, used both for partons and hadrons
- pdgid = (*currentGenParticleIter)->pdg_id();
+ pdgid = currentGenParticle->pdg_id();
// Parton labeling section...
- if((*currentGenParticleIter)->momentum().e()>=Emax && (*currentGenParticleIter)->momentum().perp()>m_min_parton_pt){
- if( abs(pdgid)<=21 && // Should be a parton
- abs(pdgid)!=6 && // Should not be a top
- (abs(pdgid)==15 || abs(pdgid)<=10 || abs(pdgid)>16) && // Not a lepton
- abs(pdgid)!=0){ // not an unrecognized thingy
+ if(currentGenParticle->momentum().e()>=Emax && currentGenParticle->momentum().perp()>m_min_parton_pt){
+ if( std::abs(pdgid)<=21 && // Should be a parton
+ std::abs(pdgid)!=6 && // Should not be a top
+ (std::abs(pdgid)==15 || std::abs(pdgid)<=10 || std::abs(pdgid)>16) && // Not a lepton
+ std::abs(pdgid)!=0){ // not an unrecognized thingy
- dR2 = std::pow( std::acos( std::cos( p.phi() - (*currentGenParticleIter)->momentum().phi() ) ) , 2 );
- dR2 += std::pow( p.eta()-(*currentGenParticleIter)->momentum().eta() , 2 );
+ dR2 = std::pow( std::acos( std::cos( p.phi() - currentGenParticle->momentum().phi() ) ) , 2 );
+ dR2 += std::pow( p.eta()-currentGenParticle->momentum().eta() , 2 );
if(dR2<=m_partonMatch_dr*m_partonMatch_dr){ // We have a winner
- Emax=(*currentGenParticleIter)->momentum().e();
- *m_partonFlavor = (*currentGenParticleIter)->pdg_id();
+ Emax=currentGenParticle->momentum().e();
+ *m_partonFlavor = currentGenParticle->pdg_id();
*m_partonDR = static_cast<float> (dR2);
} // Outside of dR
} // Wrong PDG ID
} // Low energy
// Hadron labeling section
- if ((HepPID::isHadron (pdgid) || abs(pdgid)==15) && ((*currentGenParticleIter)->momentum().perp()>m_min_hadron_pt)){
+ if ((HepPID::isHadron (pdgid) || std::abs(pdgid)==15) && (currentGenParticle->momentum().perp()>m_min_hadron_pt)){
// Check on DR match
- dR2 = std::pow( std::acos( std::cos( p.phi() - (*currentGenParticleIter)->momentum().phi() ) ) , 2 );
- dR2 += std::pow( p.eta()-(*currentGenParticleIter)->momentum().eta() , 2 );
+ dR2 = std::pow( std::acos( std::cos( p.phi() - currentGenParticle->momentum().phi() ) ) , 2 );
+ dR2 += std::pow( p.eta()-currentGenParticle->momentum().eta() , 2 );
if( dR2<=m_hadronMatch_dr*m_hadronMatch_dr ){
// Strict ordering bottom up - 0 -> tau -> c -> b
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx
index 321da3fb40d22fd7e91481051d2330e77a4527e6..5787c1c4df11383966cf6ce99eec5938fe736f13 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx
@@ -64,35 +64,35 @@ StatusCode TruthLeptonNearbyAssociationTool::fill (const TruthParticle& p)
// We have an McEventCollection
for (McEventCollection::const_iterator currentGenEventIter = mcCollection->begin();
currentGenEventIter!=mcCollection->end(); ++currentGenEventIter) {
- for (HepMC::GenEvent::particle_const_iterator currentGenParticleIter= (*currentGenEventIter)->particles_begin();
- currentGenParticleIter!= (*currentGenEventIter)->particles_end(); ++currentGenParticleIter) {
- if (!(*currentGenParticleIter)) continue;
- if ((*currentGenParticleIter)->status()!=1) continue;
- if ((*currentGenParticleIter)->barcode()==p.barcode()) continue; // The same particle twice!
- dR2 = p.phi() - (*currentGenParticleIter)->momentum().phi();
+ for (auto currentGenParticle: *(*currentGenEventIter)) {
+ if (!currentGenParticle) continue;
+ if (currentGenParticle->status()!=1) continue;
+ if (HepMC::barcode(currentGenParticle)==p.barcode()) continue; // The same particle twice!
+
+ dR2 = p.phi() - currentGenParticle->momentum().phi();
if (dR2>M_PI) dR2-=2.*M_PI;
else if (dR2<-M_PI) dR2+=2.*M_PI;
- dR2 = std::pow(dR2,2)+std::pow(p.eta()-(*currentGenParticleIter)->momentum().eta(),2);
+ dR2 = std::pow(dR2,2)+std::pow(p.eta()-currentGenParticle->momentum().eta(),2);
if (dR2>=0.09) continue; // Save a little time
// Isolation section - exclude neutrinos
- if (!MC::PID::isNeutrino( (*currentGenParticleIter)->pdg_id() ) ){
- *m_iso03 = (*m_iso03)+(*currentGenParticleIter)->momentum().perp();
- if (dR2<0.04) *m_iso02 = (*m_iso02)+(*currentGenParticleIter)->momentum().perp();
+ if (!MC::PID::isNeutrino( currentGenParticle->pdg_id() ) ){
+ *m_iso03 = (*m_iso03)+currentGenParticle->momentum().perp();
+ if (dR2<0.04) *m_iso02 = (*m_iso02)+currentGenParticle->momentum().perp();
}
// Dressing section
- if ((*currentGenParticleIter)->pdg_id()!=22) continue; // Only photons
- if (dR2>=0.01) continue; // Only DR<0.1
+ if (currentGenParticle->pdg_id()!=22) continue; // Only photons
+ if (dR2>=0.01) continue; // Only DR<0.1 //AV this is a magic number.
- real_parent = std::fabs(get_real_parent( *currentGenParticleIter ));
+ real_parent = std::abs(get_real_parent( currentGenParticle ));
if (real_parent>=26 || real_parent==15) continue; // Veto hadron parents
- dressed_4mom += CLHEP::HepLorentzVector((*currentGenParticleIter)->momentum().x(),(*currentGenParticleIter)->momentum().y(),
- (*currentGenParticleIter)->momentum().z(),(*currentGenParticleIter)->momentum().t());
+ dressed_4mom += CLHEP::HepLorentzVector(currentGenParticle->momentum().x(),currentGenParticle->momentum().y(),
+ currentGenParticle->momentum().z(),currentGenParticle->momentum().t());
} // Loop over particles
} // Loop over events
@@ -106,20 +106,30 @@ StatusCode TruthLeptonNearbyAssociationTool::fill (const TruthParticle& p)
return StatusCode::SUCCESS;
}
-int TruthLeptonNearbyAssociationTool::get_real_parent( HepMC::GenParticle * p , int depth ) const
+int TruthLeptonNearbyAssociationTool::get_real_parent( HepMC::ConstGenParticlePtr p , int depth ) const
{
if (depth>10) return 0;
- if (!p->production_vertex()) return 0;
// Work assuming one parent...
- HepMC::GenVertex::particle_iterator itrPar = p->production_vertex()->particles_begin(HepMC::parents);
- if ( !(*itrPar) ) return 0; // parent didn't exist
+//AV This algorithm is ambiguous as it assumesnot more than one parent per particle.
+//AV In HepMC2 this could be wrong more often than expected.
+
+ auto prodvertex = p->production_vertex();
+ if ( !prodvertex ) return 0; // parent didn't exist
+#ifdef HEPMC3
+ if (!prodvertex->particles_in().size()) return 0;
+ auto parentparticle=prodvertex->particles_in()[0];
+#else
+ if (!prodvertex->particles_in_size()) return 0;
+ auto parentparticle=*(prodvertex->particles_begin(HepMC::parents));
+#endif
+ if ( !parentparticle ) return 0; // parent didn't exist
// Not a photon - return the parent
- if ((*itrPar)->pdg_id()!=22) return (*itrPar)->pdg_id();
+ if (parentparticle->pdg_id()!=22) return parentparticle->pdg_id();
// Photon - iterate
- return get_real_parent( *itrPar , depth+1 );
+ return get_real_parent( parentparticle , depth+1 );
}
} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.h b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.h
index 32b8f875f9382d71b9443a28379fa3e8f5e78b3e..6ca115aba192f09cb8e5b9cf3d54c39245ccab77 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.h
@@ -59,7 +59,7 @@ private:
float *m_iso02;
float *m_iso03;
- int get_real_parent( HepMC::GenParticle * , int depth=0 ) const;
+ int get_real_parent( HepMC::ConstGenParticlePtr , int depth=0 ) const;
};
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.cxx
index 9e452a53e7966a3a4c298548f1b1698199ae3d53..dd1514279573cd4976369d58032919cc615187bc 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.cxx
@@ -84,9 +84,9 @@ TruthLeptonParentAssociationTool::reset (const TruthParticle& p)
return StatusCode::SUCCESS;
}
-void TruthLeptonParentAssociationTool::addLeptonParent(const HepMC::GenParticle* part) {
+void TruthLeptonParentAssociationTool::addLeptonParent(HepMC::ConstGenParticlePtr part) {
- HepMC::GenVertex* begvx = part->production_vertex();
+ auto begvx = part->production_vertex();
if(!begvx){ // no parents
return;
}
@@ -95,22 +95,27 @@ void TruthLeptonParentAssociationTool::addLeptonParent(const HepMC::GenParticle*
if (begvx==part->end_vertex()) return;
// More complex loop catch
- if ( find(m_barcode_trace.begin(),m_barcode_trace.end(),begvx->barcode()) != m_barcode_trace.end()){
+ if ( find(m_barcode_trace.begin(),m_barcode_trace.end(),HepMC::barcode(begvx)) != m_barcode_trace.end()){
ATH_MSG_DEBUG( "Found a loop (a la Sherpa sample). Backing out." );
return;
}
- m_barcode_trace.push_back(begvx->barcode());
+ m_barcode_trace.push_back(HepMC::barcode(begvx));
// Loop over the parents of this particle.
+#ifdef HEPMC3
+ auto itrPar = begvx->particles_in().begin();
+ auto endPar = begvx->particles_in().end();
+#else
HepMC::GenVertex::particle_iterator itrPar = begvx->particles_begin(HepMC::parents);
HepMC::GenVertex::particle_iterator endPar = begvx->particles_end(HepMC::parents);
+#endif
int n_iter=0;
for(;itrPar!=endPar; ++itrPar){
if ( !(*itrPar) ) continue; // parent didn't exist
n_iter++;
if (n_iter>2) break; // No point in trying - this vertex does not have a quantum meaning...
- int pdg = abs((*itrPar)->pdg_id());
+ int pdg = std::abs((*itrPar)->pdg_id());
if ( (31<pdg && pdg<38) || // BSM Higgs / W' / Z' / etc
pdg==39 ||
@@ -125,7 +130,7 @@ void TruthLeptonParentAssociationTool::addLeptonParent(const HepMC::GenParticle*
(pdg == 15 && !m_primary_is_tau) || // Tau
HepPID::isHadron (pdg) // from a hadron!
){
- m_parent_barcodes.push_back( (*itrPar)->barcode() );
+ m_parent_barcodes.push_back( HepMC::barcode(*itrPar) );
} else { // Will get to here if we are coming from the same lepton again
addLeptonParent( *itrPar );
} // End of catch on PDG ID
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.h b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.h
index 70ffc405c6179a7dc756f2540b36b9cc5c33cfc3..53bb0bf6dbb528deca8404fd2dbe99027fd2d53b 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonParentAssociationTool.h
@@ -59,7 +59,7 @@ public:
private:
/// Function for association to a specific lepton
- void addLeptonParent(const HepMC::GenParticle*);
+ void addLeptonParent(HepMC::ConstGenParticlePtr);
/// TruthParticle iterator
std::vector<const TruthParticle*> m_parents;
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.cxx
index 953fd2cf260d64cd42212fbafd6d580df71bc060..ad77365a6b8bb95325ba41658fc6eb3a29d17376 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.cxx
@@ -78,25 +78,23 @@ TruthTauDecayAssociationTool::reset (const TruthParticle& p)
return StatusCode::SUCCESS;
}
-void TruthTauDecayAssociationTool::addStableDaughters(const HepMC::GenParticle* part) {
+void TruthTauDecayAssociationTool::addStableDaughters(HepMC::ConstGenParticlePtr part) {
// Sanity check
if (!part) return;
- HepMC::GenVertex* endvx = part->end_vertex();
+ auto endvx = part->end_vertex();
if(!endvx){ // no children
- if ( part && part->status()==1 ) m_tau_prod_barcodes.push_back( part->barcode() );
+ if ( part && part->status()==1 ) m_tau_prod_barcodes.push_back( HepMC::barcode(part) );
return;
}
// Loop over the parents of this particle.
- HepMC::GenVertex::particle_iterator itrChild = endvx->particles_begin(HepMC::children);
- HepMC::GenVertex::particle_iterator endChild = endvx->particles_end(HepMC::children);
- for(;itrChild!=endChild; ++itrChild){
- if ( (*itrChild) && (*itrChild)->status()==1 ){
+ for(auto Child: *endvx){
+ if ( (Child) && (Child)->status()==1 ){
// Found a stable child!
- m_tau_prod_barcodes.push_back( (*itrChild)->barcode() );
- } else if ( (*itrChild) ){
- addStableDaughters( (*itrChild) );
+ m_tau_prod_barcodes.push_back( HepMC::barcode(Child) );
+ } else if ( (Child) ){
+ addStableDaughters( (Child) );
}
} // End loop over children
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.h b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.h
index bfb6b361fe698bdbf7dbe184f584b2316e4f74e5..a56845e22d96cd19fc041dc478e37da7257a6db6 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthTauDecayAssociationTool.h
@@ -59,7 +59,7 @@ public:
private:
/// Function for association to a specific tau
- void addStableDaughters(const HepMC::GenParticle*);
+ void addStableDaughters(HepMC::ConstGenParticlePtr);
/// TruthParticle iterator
std::vector<const TruthParticle*> m_tau_prods;
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/CMakeLists.txt
index dc849b86d410df7d235641db39225def0303e973..f7de71e2dbd46b4cc7b484931b34d220abcd51d7 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: egammaD3PDAnalysis
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( egammaD3PDAnalysis )
@@ -9,8 +7,7 @@ atlas_subdir( egammaD3PDAnalysis )
atlas_add_component( egammaD3PDAnalysis
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES CaloClusterCorrectionLib CaloEvent CaloGeoHelpers CaloRecLib AthContainers AthenaBaseComps AthenaKernel EventKernel xAODCaloEvent xAODEgamma xAODTruth GaudiKernel LArCablingLib D3PDMakerUtils MCTruthClassifierLib RecoToolInterfaces egammaEvent TrkCaloExtension VxVertex egammaInterfacesLib )
+ LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel CaloEvent CaloGeoHelpers D3PDMakerInterfaces EventKernel GaudiKernel LArCablingLib MCTruthClassifierLib RecoToolInterfaces StoreGateLib TrkCaloExtension egammaInterfacesLib xAODCaloEvent xAODEgamma xAODTruth )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/TileGapSelectionGetter.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/TileGapSelectionGetter.py
index b0820af63f4f77cdf3620230bfaaa337876816b7..89f3ad6f8c518255915d4b139e2f1b0a5383e403 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/TileGapSelectionGetter.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/TileGapSelectionGetter.py
@@ -1,6 +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$
#
# @file egammaD3PDAnalysis/python/TileGapSelectionGetter.py
# @author scott snyder <snyder@bnl.gov>
@@ -53,7 +52,7 @@ class TileGapSelectionGetter ( Configured ) :
self._handle = alg
- except:
+ except Exception:
mlog.error ("Error configuring TileGapSelectionAlg.")
traceback.print_exc()
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaTruthParticleConfig.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaTruthParticleConfig.py
index eb659e62ebbbbf90fdf7100a58491ebb593fb23c..6fd9a3d84675bee31bd612ee360d08afd1600146 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaTruthParticleConfig.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaTruthParticleConfig.py
@@ -1,6 +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$
#
# @file egammaD3PDAnalysis/python/egammaTruthParticleConfig.py
# @author scott snyder <snyder@bnl.gov>
@@ -11,12 +10,10 @@
import egammaD3PDAnalysis
-import D3PDMakerCoreComps
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from McParticleAlgs.JobOptCfg import createMcAodBuilder
-from RecExConfig.RecFlags import rec
from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.ObjKeyStore import cfgKeyStore
+from RecExConfig.RecFlags import rec
from AthenaCommon import CfgMgr
@@ -36,7 +33,6 @@ def egammaTruthParticleConfig \
algname = prefix + sgkey + 'Builder'
if not hasattr (seq, algname):
- import AthenaCommon.CfgMgr as CfgMgr
from egammaRec.Factories import ToolFactory
exten = ToolFactory (CfgMgr.Trk__ParticleCaloExtensionTool,
name="GSFParticleCaloExtensionTool",
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/CMakeLists.txt
index eda4cfa902c5d48645cfca197515d776be62559f..8b4a3693da9ae2de615814923b2ce5988221285a 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: egammaD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( egammaD3PDMaker )
@@ -13,9 +11,8 @@ atlas_add_component( egammaD3PDMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib CaloIdentifier AthenaKernel Navigation StoreGateLib SGtests EventKernel FourMomUtils xAODBase xAODCaloEvent xAODEgamma xAODJet xAODTracking xAODTruth GaudiKernel AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib egammaEvent TrkParameters TrkExInterfaces TrkVertexFitterInterfaces TrigObjectMatchingLib TrigCaloEvent TrigInDetEvent TrigParticle CaloTrackingGeometryLib )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib CaloIdentifier AthenaKernel Navigation StoreGateLib EventKernel FourMomUtils xAODBase xAODCaloEvent xAODEgamma xAODJet xAODTracking xAODTruth GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib egammaEvent TrkParameters TrkExInterfaces TrkVertexFitterInterfaces CaloTrackingGeometryLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterD3PDObject.py
index cce388f2d6b86d2e12ea40e0a04e8e51a2fc3cbf..1efcd7c3c021e1ba0d1c847dc58d087de6e2966d 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterD3PDObject.py
@@ -1,6 +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$
#
# @file egammaD3PDMaker/python/CorrectionClusterD3PDObject.py
# @author scott snyder <snyder@bnl.gov>
@@ -11,15 +10,11 @@
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
-from D3PDMakerCoreComps import SGObjGetterTool
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from egammaD3PDAnalysis.TileGapConfig import TileGapConfig
from D3PDMakerCoreComps.D3PDObject import DeferArg
-from D3PDMakerCoreComps.resolveSGKey import resolveSGKey
-from AthenaCommon.AlgSequence import AlgSequence
+from D3PDMakerCoreComps.resolveSGKey import resolveSGKey # noqa: F401
import EventCommonD3PDMaker
import D3PDMakerCoreComps
-import egammaD3PDMaker
import CaloD3PDMaker
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterGetter.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterGetter.py
index 7b5f30e44bf5c4e6ab396359cd1865d8677b969e..31fd018d9f3c8e7c98fd7d90a4fbe09219057410 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterGetter.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/CorrectionClusterGetter.py
@@ -99,13 +99,13 @@ def make_CorrectionClusterGetter (typ, eta_size, phi_size,
else:
sizekey = "%d%d" % (eta_size, phi_size)
- if output_key == None:
+ if output_key is None:
output_key = name_base + typ + sizekey + suffix
- if algname == None:
+ if algname is None:
algname = output_key
- if copier_name == None:
+ if copier_name is None:
copier_name = algname + '_copier'
key = typ
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py
index a7327726cea8d7cb11c1e2544c06a84a2066f954..42c49237a45bfec8aceb3c434669b851d210dd8e 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py
@@ -7,18 +7,16 @@
# @brief Configure electron D3PD object.
#
-from egammaD3PDMaker.defineBlockAndAlg \
- import defineAlgLODFunc, defineBlockAndAlg
+from egammaD3PDMaker.defineBlockAndAlg import defineBlockAndAlg
from EventCommonD3PDMaker.DRAssociation import DRAssociation
from TrackD3PDMaker.xAODTrackSummaryFiller import xAODTrackSummaryFiller
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerCoreComps.D3PDObject import DeferArg
-from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation, IdentityAssociation
-from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
+from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
from D3PDMakerCoreComps.IndexMultiAssociation import IndexMultiAssociation
-from D3PDMakerCoreComps.resolveSGKey import resolveSGKey, testSGKey
+from D3PDMakerCoreComps.resolveSGKey import testSGKey
+from D3PDMakerCoreComps.resolveSGKey import resolveSGKey # noqa: F401
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-# from TriggerD3PDMaker.defineTriggerBits import defineTriggerBits
from RecExConfig.RecFlags import rec
import egammaD3PDMaker
import EventCommonD3PDMaker
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/GSFElectronD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/GSFElectronD3PDObject.py
deleted file mode 100644
index 740cf17002f4d76520e4409b7b6d59cc8bee00ce..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/GSFElectronD3PDObject.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id: GSFElectronD3PDObject.py 523036 2012-10-24 15:50:12Z ssnyder $
-#
-# @file egammaD3PDMaker/python/GSFElectronD3PDObject.py
-# @author scott snyder <snyder@bnl.gov>
-# @date 2009
-# @brief Configure GSF electron D3PD object.
-#
-
-from egammaD3PDMaker.defineBlockAndAlg import defineBlockAndAlg
-from D3PDMakerCoreComps.D3PDObject import DeferArg
-from D3PDMakerCoreComps.resolveSGKey import resolveSGKey
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from AthenaCommon.AlgSequence import AlgSequence
-from RecExConfig.RecFlags import rec
-import egammaD3PDMaker
-import egammaD3PDAnalysis
-import EventCommonD3PDMaker
-import D3PDMakerCoreComps
-
-
-from egammaD3PDMaker.ElectronD3PDObject import ElectronD3PDObject
-
-GSFElectronD3PDObject = ElectronD3PDObject.copy()
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py
index 8362699959afc550a148bc67a4b6ab73cfc4d246..81757134e46add9fd704287d00251aa63e6936f1 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py
@@ -7,26 +7,19 @@
# @brief Configure photon D3PD object.
#
-
-# from egammaD3PDMaker.isem_version import isem_version
-from egammaD3PDMaker.defineBlockAndAlg \
- import defineAlgLODFunc, defineBlockAndAlg
+from egammaD3PDMaker.defineBlockAndAlg import defineBlockAndAlg
from EventCommonD3PDMaker.DRAssociation import DRAssociation
from D3PDMakerCoreComps.D3PDObject import make_SGDataVector_D3PDObject
from D3PDMakerCoreComps.D3PDObject import DeferArg
from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
-# from D3PDMakerCoreComps.IndexAssociation import IndexAssociation
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.resolveSGKey import resolveSGKey, testSGKey
+from D3PDMakerCoreComps.resolveSGKey import testSGKey
+from D3PDMakerCoreComps.resolveSGKey import resolveSGKey # noqa: F401
from TrackD3PDMaker.xAODTrackSummaryFiller import xAODTrackSummaryFiller
from D3PDMakerCoreComps.ContainedVectorMultiAssociation import ContainedVectorMultiAssociation
-# from TriggerD3PDMaker.defineTriggerBits import defineTriggerBits
-# from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.RecFlags import rec
import egammaD3PDMaker
-# import egammaD3PDAnalysis
import EventCommonD3PDMaker
-# import CaloD3PDMaker
import D3PDMakerCoreComps
import TruthD3PDMaker
import TrackD3PDMaker
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTriggerBitsD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTriggerBitsD3PDObject.py
deleted file mode 100644
index b3b24424b85414c75e65d46c68cf2b6ff35bc143..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTriggerBitsD3PDObject.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id$
-#
-# @file egammaD3PDMaker/python/egammaTriggerBitsD3PDObject.py
-# @author Haifeng Li <Haifeng.Li@cern.ch>, sss
-# @date Sep, 2009
-# @brief Define trigger bit blocks for egamma.
-#
-
-
-import D3PDMakerCoreComps
-import TriggerD3PDMaker
-from D3PDMakerCoreComps.D3PDObject import make_Void_D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-
-
-# Create the object type.
-egammaTriggerBitsD3PDObject = \
- make_Void_D3PDObject (default_name = 'egammaTriggerBitsFiller')
-
-
-#
-# The egamma trigger bits are now added in ElectronD3PDObject and
-# PhotonD3PDObject; this file is kept just for backwards compatibility.
-#
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTruthD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTruthD3PDObject.py
index f1e7f3ebcfb7d7b24f090b84f7edfe6e605fb828..4dd8811b9da9a2626c11829aa9e0640aa6de1216 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTruthD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/egammaTruthD3PDObject.py
@@ -1,6 +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$
#
# @file egammaD3PDMaker/python/egammaTruthD3PDObject.py
# @author scott snyder <snyder@bnl.gov>
@@ -20,7 +19,6 @@ from D3PDMakerCoreComps.SimpleAssociation import SimpleAssociation
import D3PDMakerCoreComps
import EventCommonD3PDMaker
import TruthD3PDMaker
-import egammaD3PDAnalysis
#FIXME:
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
index 84cc10421356fe87a9ff613ce1c05c8163af2b8b..cb76231dc30f5a40cc42a15e15b0c0a04b7f29a7 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
@@ -61,12 +61,7 @@ namespace EL
/// currently be done with a \ref `EL::Algorithm` since it neither
/// knows about incidents, nor has all the virtual methods that were
/// available before.
- ///
- /// \todo It might be nice to make this actually dual-use at some
- /// point, but since there seems little interest in a dual-use
- /// algorithm that is on the back-burner. There are some
- /// conditional compilation directives here and there, but it was
- /// never tested for dual-use (or even in-athena compilation).
+
class AnaAlgorithm
#ifdef XAOD_STANDALONE
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
index 8f37ca3c0839f7ff2cdb41ee0a578dda26d17b5b..53a654bdaa2fe60e102fc07174f270f1d7515709 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
@@ -395,7 +395,6 @@ namespace EL
public:
static const std::string optGridDestSE;
static const std::string optGridSite;
- static const std::string optGridCloud;
static const std::string optGridExcludedSite;
static const std::string optGridNGBPerJob;
static const std::string optGridMemory;
@@ -405,11 +404,9 @@ namespace EL
static const std::string optGridNJobs;
static const std::string optGridMaxFileSize;
static const std::string optGridMaxNFilesPerJob;
- static const std::string optGridUseChirpServer;
static const std::string optGridExpress;
static const std::string optGridNoSubmit;
static const std::string optGridMergeOutput;
- static const std::string optGridUseContElementBoundary;
static const std::string optGridAddNthFieldOfInDSToLFN;
static const std::string optGridWorkingGroup;
static const std::string optGridShowCmd;
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
index 62bb1063d0c0b1efb82fb8990698e222b1836265..92295c21fad25d5c5d2176702dbce9ebac5f2bd3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
@@ -68,7 +68,6 @@ namespace EL
const std::string Job::optOutputSampleName = "nc_outputSampleName";
const std::string Job::optGridDestSE = "nc_destSE";
const std::string Job::optGridSite = "nc_site";
- const std::string Job::optGridCloud = "nc_cloud";
const std::string Job::optGridExcludedSite = "nc_excludedSite";
const std::string Job::optGridNGBPerJob = "nc_nGBPerJob";
const std::string Job::optGridMemory = "nc_memory";
@@ -78,11 +77,9 @@ namespace EL
const std::string Job::optGridNJobs = "nc_nJobs";
const std::string Job::optGridMaxFileSize = "nc_maxFileSize";
const std::string Job::optGridMaxNFilesPerJob = "nc_maxNFilesPerJob";
- const std::string Job::optGridUseChirpServer = "nc_useChirpServer";
const std::string Job::optGridExpress = "nc_express";
const std::string Job::optGridNoSubmit = "nc_noSubmit";
const std::string Job::optGridMergeOutput = "nc_mergeOutput";
- const std::string Job::optGridUseContElementBoundary = "nc_useContElementBoundary";
const std::string Job::optGridAddNthFieldOfInDSToLFN = "nc_addNthFieldOfInDSToLFN";
const std::string Job::optGridWorkingGroup = "nc_workingGroup";
const std::string Job::optGridShowCmd = "nc_showCmd";
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
index 24ee3132d3a68a67533a3953adc3047571da581f..e9487cc7e4881860c149ffbbbdace1e105240d23 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
@@ -135,7 +135,6 @@ static SH::MetaObject defaultOpts()
SH::MetaObject o;
o.setString("nc_nGBPerJob", "MAX");
o.setString("nc_mergeOutput", "true");
- o.setString("nc_rootVer", gROOT->GetVersion());
o.setString("nc_cmtConfig", gSystem->ExpandPathName("$AnalysisBase_PLATFORM"));
o.setString("nc_useAthenaPackages", "true");
const std::string mergestr = "elg_merge jobdef.root %OUT %IN";
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
index c82a27b240b495e8125e9df6137f5b4acb1dce25..f2785c05681a8d04667272537f7842e87c7a5dc6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
@@ -21,7 +21,6 @@ def ELG_prun(sample) :
#These are options that can be set by the user
opts = ['destSE',
'site',
- 'cloud',
'rootVer',
'cmtConfig',
'excludedSite',
@@ -41,8 +40,7 @@ def ELG_prun(sample) :
'tmpDir']
#These are options that can be set by the user
- switches = ['useChirpServer',
- 'express',
+ switches = ['express',
'noSubmit',
'skipScout',
'disableAutoRetry',
@@ -50,8 +48,7 @@ def ELG_prun(sample) :
'official',
'mergeOutput',
'useRootCore',
- 'useAthenaPackages',
- 'useContElementBoundary']
+ 'useAthenaPackages']
for opt in opts :
arg = sample.getMetaDouble('nc_' + opt, -1)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH0.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH0.sh
index 18c2019e01481d878aaf17c70d51a07c9f82069c..193f83ca9d3ca6c576762e9708f76412540ce57b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH0.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH0.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# art-include: 21.2/AthDerivation
+# art-include: master/Athena
# art-description: DAOD building TRUTH0 mc15
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH1.sh
index 8264118a40b5f34c42ecd19e9a6303ca5548080d..a03e7e9796d6c1b7865493769894814d3d115f57 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH1.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# art-include: 21.2/AthDerivation
+# art-include: master/Athena
# art-description: DAOD building TRUTH1 mc15
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH3.sh
index 418e6cd4c636b85656eafb8f263838e9c6aa838c..1a240a09541dc890a702a23cceb029c8ac08c7c4 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc15TRUTH3.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# art-include: 21.2/AthDerivation
+# art-include: master/Athena
# art-description: DAOD building TRUTH3 mc15
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/BPhysPVCascadeTools.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/BPhysPVCascadeTools.h
index c1561102db7691fc7fbcd2a311956d694943ad03..cc0eb8c7726d013ef9055ecf4927a21e16d2e7c5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/BPhysPVCascadeTools.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/BPhysPVCascadeTools.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef DERIVATIONFRAMEWORK_PVCASCADETOOLS_H
@@ -38,7 +38,6 @@ namespace DerivationFramework {
typedef ElementLink<xAOD::VertexContainer> VertexLink;
typedef std::vector<VertexLink> VertexLinkVector;
private:
- const Trk::V0Tools *m_v0Tools;
const CascadeTools *m_cascadeTools;
const InDet::BeamSpotData *m_beamSpotData;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BPhysVertexTrackBase.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BPhysVertexTrackBase.cxx
index 2f2cef79bfca9169fddd8060020ccf6d9264a38e..8ea8e0d31a44dabddb6d57d240c7429faecfb51a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BPhysVertexTrackBase.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BPhysVertexTrackBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//============================================================================
@@ -362,7 +362,7 @@ namespace DerivationFramework {
std::istringstream stream(lines);
std::string line;
while ( std::getline(stream, line) ) {
- if ( !ostr.length() == 0 ) ostr += "\n";
+ if ( !ostr.empty() ) ostr += "\n";
ostr += prefix + line;
}
return ostr;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusDsCascade.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusDsCascade.cxx
index f7d485b75f79fa359ecc2a61aa21cd2597f1f404..78027a049682891936e5aa95f6658bf973f4e7db 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusDsCascade.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusDsCascade.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////
// JpsiPlusDsCascade.cxx, (c) ATLAS Detector software
@@ -537,7 +537,7 @@ namespace DerivationFramework {
}
}
- if(abs(m_Dx_pid==411)) { // D+/-
+ if(abs(m_Dx_pid)==411) { // D+/-
SG::AuxElement::Accessor<Char_t> flagAcc1("passed_Dp");
SG::AuxElement::Accessor<Char_t> flagAcc2("passed_Dm");
bool isDp(true);
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..80ef5a4f884f674b2d6ad9a51fea1d077132ea72
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/CMakeLists.txt
@@ -0,0 +1,11 @@
+################################################################################
+# Package: DerivationFrameworkDataPrep
+################################################################################
+
+# Declare the package name:
+atlas_subdir( DerivationFrameworkDataPrep )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py )
+
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/DAPR2EventList.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/DAPR2EventList.py
new file mode 100644
index 0000000000000000000000000000000000000000..c488e7d5cd6a19c140866e21b0982091d0d7ed84
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/DAPR2EventList.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+EventList = [(276262, 366216946), (276262, 12241502), (276262, 13647343), (276262, 198181590), (276262, 255004128), (276262, 191476906), (276262, 157951929), (276262, 219513416), (276262, 78609439), (276262, 7160282), (276262, 126115945), (276262, 108109797), (276262, 404124285), (276329, 67649584), (276329, 372178767), (276329, 246999417), (276329, 250386040), (276329, 133096046), (276329, 102349619), (276329, 260927287), (276329, 112387366), (276329, 115922962), (276329, 142650297), (276329, 71039435), (276329, 76160804), (276329, 277617312), (276329, 282573830), (276329, 19659640), (276329, 19075347), (276329, 138616006), (276329, 313784553), (276329, 98972081), (276329, 181000569), (276329, 186351646), (276329, 187254326), (276329, 207602715), (276329, 242427871), (276329, 287238498), (276329, 411900298), (276329, 167534390), (276329, 304550306), (276329, 201405515), (276329, 342398721), (276329, 310320039), (276336, 21273207), (276336, 6843552), (276336, 18040781), (276336, 18758716), (276336, 19385659), (276416, 143538017), (276416, 148159084), (276416, 134005896), (276416, 124106650), (276416, 125792472), (276416, 113629388), (276416, 65624569), (276416, 28043912), (276416, 35408791), (276416, 7612513), (276416, 92938525), (276511, 159344994), (276511, 227121168), (276511, 233743915), (276511, 248005016), (276511, 249844151), (276511, 266426359), (276511, 79967862), (276511, 84849641), (276511, 219365115), (276511, 147446961), (276511, 174338302), (276511, 24260973), (276511, 32926183), (276511, 181357786), (276511, 182858171), (276511, 183801762), (276511, 1183208), (276511, 4154561), (276511, 4735843), (276511, 95688892), (276511, 103283877), (276511, 132322634), (276511, 6477457), (276511, 5920544), (276511, 107156789), (276511, 110970816), (276511, 112398479), (276511, 125207371), (276511, 129332450), (276511, 74064515), (276511, 73769311), (276511, 198957977), (276511, 199282143), (276511, 257523172), (276689, 137109697), (276689, 143074596), (276689, 148879715), (276689, 77815761), (276689, 23929472), (276689, 27292496), (276689, 42023947), (276689, 198530398), (276689, 201728804), (276689, 202903111), (276689, 206101041), (276689, 85069330), (276689, 89384650), (276689, 115425020), (276689, 117237937), (276689, 172727967), (276689, 215560663), (276689, 8167397), (276689, 9680864), (276689, 261453453), (276689, 263199154), (276689, 1156290), (276689, 2640029), (276689, 98684383), (276689, 103129126), (276689, 108532720), (276689, 57290075), (276689, 59748649), (276689, 20420693), (276689, 49207872), (276689, 164401024), (276689, 170474206), (276689, 171359319), (276689, 186780139), (276689, 192011862), (276689, 193051077), (276778, 16041787), (276790, 11276967), (276790, 12110486), (276790, 52748416), (276790, 23078325), (276790, 22495017), (276790, 34538441), (276790, 37589269), (276952, 124070203), (276952, 205579598), (276952, 11888053), (276952, 41857703), (276952, 44242529), (276952, 147258878), (276952, 152814611), (276952, 69524185), (276952, 70773235), (276952, 83921840), (276952, 218433117), (276952, 221081946), (276952, 225867095), (276952, 225466398), (276952, 181078925), (276952, 20310337), (276952, 23744446), (276954, 14574690), (278880, 558085589), (278880, 210318172), (278880, 602265022), (278880, 676792095), (278880, 689755707), (278880, 146778511), (278880, 148342250), (278880, 255538473), (278880, 256393458), (278880, 286576235), (278880, 70264671), (278880, 74174619), (278880, 81445605), (278880, 94801954), (278880, 164505578), (278880, 202139538), (278880, 291210636), (278880, 170499965), (278880, 174445448), (278880, 187835224), (278880, 187910379), (278880, 188228430), (278880, 118180964), (278880, 322668008), (278880, 326402710), (278880, 374369278), (278880, 376121296), (278880, 380385214), (278880, 129786175), (278880, 133038506), (278880, 585833415), (278880, 587265014), (278880, 593009820), (278880, 470197912), (278880, 438328550), (278880, 439565190), (278880, 230061545), (278880, 235385490), (278880, 235517755), (278880, 248583650), (278880, 262270235), (278880, 265998789), (278880, 268630374), (278880, 269180081), (278880, 343397990), (278880, 351883614), (278880, 33685726), (278880, 36588872), (278880, 53513443), (278880, 702200008), (278880, 542587395), (278880, 708878720), (278880, 713175974), (278880, 17985738), (278880, 23266001), (278880, 67423146), (278880, 68561247), (278880, 416560385), (278880, 418053900), (278880, 460066094), (278880, 526379537), (278880, 529065042), (278880, 481414837), (278880, 482487092), (278880, 664807109), (278880, 613104986), (278880, 720200839), (278880, 433085407), (278912, 9325788), (278912, 24180006), (278912, 391830323), (278912, 393428345), (278912, 395672838), (278912, 398174556), (278912, 402368383), (278912, 402248151), (278912, 446740704), (278912, 247226791), (278912, 210164111), (278912, 174301934), (278912, 330690799), (278912, 344532504), (278912, 351056473), (278912, 356562325), (278912, 425889292), (278912, 440821328), (278912, 444778724), (278912, 452320099), (278912, 523727655), (278912, 127070976), (278912, 129230005), (278912, 130967009), (278912, 64417832), (278912, 154518859), (278912, 162475008), (278912, 165148177), (278912, 247472369), (278912, 254465819), (278912, 258958314), (278912, 266113254), (278912, 268525890), (278912, 268869947), (278912, 270704153), (278912, 87571939), (278912, 509095340), (278912, 554264734), (278912, 370087212), (278912, 373296021), (278912, 377909850), (278912, 275131369), (278912, 110561647), (278912, 115742166), (278912, 218423882), (278912, 46664935), (278912, 477148808), (278912, 487054716), (278968, 165182532), (278968, 143260590), (278968, 90174946), (278968, 89956812), (278968, 101489709), (278968, 102767612), (278968, 115572316), (278968, 73571144), (278968, 76769497), (278968, 155339552), (278968, 44114170), (278968, 250824132), (278968, 218357057), (278968, 219828633), (278968, 70324804), (278968, 71490596), (278968, 11649887), (278968, 173738447), (278968, 198894682), (278968, 3659739), (278968, 2329077), (278968, 120012398), (278968, 122865406), (278968, 127440137), (278970, 15845225), (278970, 15760301), (278970, 18356759), (278970, 22424983), (278970, 6132230), (279169, 943996713), (279169, 945083670), (279169, 633433430), (279169, 643462941), (279169, 520296143), (279169, 575857015), (279169, 595636736), (279169, 1469883743), (279169, 1495023079), (279169, 438293368), (279169, 439642378), (279169, 442226342), (279169, 194302338), (279169, 201262625), (279169, 214362147), (279169, 219305303), (279169, 219891400), (279169, 919112711), (279169, 275333897), (279169, 273252362), (279169, 279551154), (279169, 1402864338), (279169, 1401821825), (279169, 1103410929), (279169, 1109269936), (279169, 1118067608), (279169, 1530082412), (279169, 1541038448), (279169, 377875241), (279169, 384300248), (279169, 792841748), (279169, 1447900865), (279169, 1454385855), (279169, 1457631427), (279169, 1461591590), (279169, 612607030), (279169, 1031987980), (279169, 1563254647), (279169, 171512400), (279169, 178315806), (279169, 987341454), (279169, 987577577), (279169, 988458822), (279169, 1502738552), (279169, 1506590293), (279169, 1510296981), (279169, 1211088344), (279169, 1211046418), (279169, 1227526456), (279169, 1231226864), (279169, 1240810263), (279169, 1626433282), (279169, 1644149115), (279169, 1651353222), (279169, 1652072980), (279169, 74878768), (279169, 74272943), (279169, 79981385), (279169, 98877310), (279169, 99460073), (279169, 887998446), (279169, 1312869297), (279169, 1314976476), (279169, 1362180102), (279169, 301744794), (279169, 307888886), (279169, 323690739), (279169, 1246287325), (279169, 1261465613), (279169, 1266924280), (279169, 679173076), (279169, 680351387), (279169, 691777525), (279169, 691072555), (279169, 701892284), (279169, 707648124), (279169, 707568505), (279169, 717681383), (279169, 723981578), (279169, 481962563), (279169, 487473644), (279169, 488883027), (279169, 492009472), (279169, 493588232), (279169, 495697730), (279169, 1600602838), (279169, 1601131811), (279169, 1620265042), (279169, 1052348336), (279169, 1055573472), (279169, 1063099189), (279169, 843802936), (279169, 845268121), (279169, 852984357), (279169, 861205000), (279169, 868808229), (279169, 898947734), (279169, 915126543), (279169, 393777873), (279169, 412778817), (279169, 834609284), (279169, 836143404), (279169, 840498834), (279169, 843015382), (279169, 337210178), (279169, 340406409), (279169, 343555274), (279169, 550545934), (279169, 555766315), (279169, 738857915), (279169, 746714708), (279169, 292554193), (279169, 1408623093), (279169, 1425453083), (279169, 1434103497), (279169, 223326543), (279169, 1276286341), (279169, 1386275048), (279169, 764020905), (279169, 773224456), (279169, 775604446), (279169, 656640231), (279169, 670951445), (279169, 1585273614), (279169, 1593711986), (279169, 10495054), (279169, 14241626), (279169, 38752459), (279169, 42158648), (279169, 56057584), (279169, 62105065), (279169, 75106139), (279169, 104712796), (279169, 110649292), (279169, 1157924659), (279169, 1157392517), (279169, 1163371091), (279169, 1175355814), (279169, 1173940835), (279169, 1325159713), (279169, 964857934), (279169, 974587831), (279169, 981256056), (279169, 255320225), (279169, 1142754619), (279169, 20613346), (279169, 22695063), (279169, 22325424), (279169, 27853806), (279169, 27346911), (279169, 117668500), (279169, 129461531), (279169, 153607428), (279169, 157204853), (279169, 446801433), (279169, 455096017), (279169, 456322832), (279259, 7382766), (279259, 189538654), (279259, 102973716), (279259, 101874907), (279259, 132973056), (279259, 138363059), (279259, 80747505), (279259, 84429720), (279259, 85725926), (279259, 87470015), (279259, 109137471), (279259, 121163788), (279259, 127555797), (279259, 127082625), (279259, 127666691), (279259, 131478932), (279259, 10070234), (279259, 13036249), (279259, 164655706), (279259, 30998749), (279259, 50182595), (279279, 157765700), (279279, 168431568), (279279, 169652815), (279279, 67409918), (279279, 85068026), (279279, 85127053), (279279, 290268491), (279279, 299528243), (279279, 299566094), (279279, 302116573), (279279, 307050736), (279279, 309944889), (279279, 447787237), (279279, 453259422), (279279, 483013239), (279279, 485476237), (279279, 486723062), (279279, 126953859), (279279, 126802184), (279279, 254565509), (279279, 410226903), (279279, 412237714), (279279, 415017426), (279279, 419043534), (279279, 433225859), (279279, 221870318), (279279, 223467366), (279279, 224901359), (279279, 227022877), (279279, 228353326), (279279, 237957054), (279279, 37607554), (279279, 40198656), (279279, 41247657), (279279, 41110764), (279279, 43339592), (279279, 177409592), (279279, 2092291), (279279, 2820861), (279279, 398014464), (279279, 109275223), (279279, 364090925), (279279, 363952307), (279279, 10109417), (279279, 13987633), (279279, 96812330), (279279, 270819332), (279279, 274604367), (279279, 282865118), (279279, 285082097), (279279, 285292483), (279279, 368048886), (279279, 373448746), (279279, 384438338), (279279, 145606367), (279279, 154558799), (279284, 28905365), (279284, 711776478), (279284, 130411483), (279284, 136143656), (279284, 829015000), (279284, 835342939), (279284, 837716724), (279284, 837366208), (279284, 394256920), (279284, 415461541), (279284, 2233942), (279284, 5383290), (279284, 4962413), (279284, 460276836), (279284, 607205529), (279284, 612988048), (279284, 501138096), (279284, 502913949), (279284, 761425665), (279284, 801288658), (279284, 654380441), (279284, 687703411), (279284, 484577148), (279284, 514082039), (279284, 514885483), (279284, 280743447), (279284, 282317355), (279284, 283789373), (279284, 294779317), (279284, 296376533), (279284, 154051371), (279284, 155181782), (279284, 743942311), (279284, 59447991), (279284, 68941988), (279284, 73656051), (279284, 77895813), (279284, 83709286), (279284, 344485613), (279284, 352887723), (279284, 433393828), (279284, 574089358), (279284, 577247890), (279284, 587648267), (279284, 589509722), (279284, 537429716), (279284, 48378100), (279284, 52885094), (279284, 854511572), (279284, 862036119), (279284, 238168122), (279284, 635300126), (279284, 639849600), (279284, 669783559), (279284, 671430320), (279284, 679269563), (279284, 248397464), (279284, 248662417), (279284, 251367153), (279284, 269248448), (279284, 272268398), (279284, 85331968), (279284, 89642837), (279284, 177128897), (279284, 185555331), (279284, 191882785), (279284, 447640716), (279284, 472040355), (279284, 473125716), (279284, 476588693), (279284, 311601042), (279284, 331197293), (279284, 372210446), (279284, 544739342), (279284, 547223675), (279284, 562957561), (279284, 213125379), (279284, 219938554), (279284, 232966410), (279345, 1035190249), (279345, 520602143), (279345, 288259752), (279345, 287864601), (279345, 299122084), (279345, 172001233), (279345, 174561880), (279345, 868237357), (279345, 871382796), (279345, 409098444), (279345, 415021297), (279345, 425620990), (279345, 986389970), (279345, 988615034), (279345, 436533637), (279345, 438627316), (279345, 495882386), (279345, 501744769), (279345, 163235851), (279345, 211866800), (279345, 353160612), (279345, 352651640), (279345, 355025669), (279345, 362343899), (279345, 387977378), (279345, 391534047), (279345, 140224469), (279345, 142067599), (279345, 240762906), (279345, 239642198), (279345, 598401438), (279345, 833596648), (279345, 836382436), (279345, 839222405), (279345, 855322438), (279345, 855083629), (279345, 854708266), (279345, 854585572), (279345, 1212650394), (279345, 538114794), (279345, 540618998), (279345, 738298753), (279345, 745585855), (279345, 771636157), (279345, 959810044), (279345, 230122533), (279345, 232017519), (279345, 235776182), (279345, 243152325), (279345, 721857512), (279345, 785702676), (279345, 1070785781), (279345, 1072388432), (279345, 1074858200), (279345, 1074108987), (279345, 1076452646), (279345, 1076024173), (279345, 1080436445), (279345, 1080239910), (279345, 559910786), (279345, 822683782), (279345, 1288844147), (279345, 1287915007), (279345, 217003404), (279345, 226238055), (279345, 304060822), (279345, 286949721), (279345, 5123407), (279345, 1014928454), (279345, 88352598), (279345, 1270445702), (279345, 271977692), (279345, 885256205), (279345, 891679622), (279345, 943499700), (279345, 946809273), (279345, 664254380), (279345, 670608593), (279345, 110996821), (279345, 112071858), (279345, 115874894), (279345, 128839186), (279345, 95625492), (279345, 96220242), (279345, 362828182), (279345, 708545744), (279345, 726001340), (279345, 902047367), (279345, 908118968), (279345, 911886178), (279345, 922167447), (279345, 785822161), (279345, 935610164), (279345, 1224224035), (279345, 345742201), (279345, 1105239291), (279345, 1162661409), (279345, 1170563502), (279345, 618487713), (279345, 994488043), (279345, 996787419), (279345, 1009472954), (279345, 1067422589), (279345, 1318184448), (279345, 1321398967), (279345, 1325145992), (279345, 1326432358), (279345, 1327204644), (279345, 1344880322), (279345, 815036794), (279345, 1210248345), (279345, 1327837723), (279345, 1335034130), (279345, 1334771383), (279345, 632480228), (279345, 635028969), (279345, 636606307), (279345, 638759437), (279345, 447501400), (279345, 449630229), (279345, 467888331), (279345, 468707961), (279345, 471549014), (279345, 929791657), (279345, 318807004), (279345, 317523398), (279345, 319990672), (279345, 323366206), (279345, 8164514), (279345, 11556745), (279345, 16486019), (279345, 18358344), (279345, 45118043), (279345, 46521827), (279345, 30445828), (279515, 3962434), (279515, 6025764), (279598, 1388891327), (279598, 1394176644), (279598, 1402783909), (279598, 1414448132), (279598, 973620427), (279598, 979595015), (279598, 1357688820), (279598, 1367718704), (279598, 1295010706), (279598, 1325608057), (279598, 1325292726), (279598, 1331886192), (279598, 1333373735), (279598, 968291813), (279598, 778914918), (279598, 791411562), (279598, 792167092), (279598, 793569288), (279598, 802113884), (279598, 374698810), (279598, 1087649368), (279598, 1086700195), (279598, 1099884791), (279598, 1100165415), (279598, 166600860), (279598, 183119109), (279598, 189322469), (279598, 636050899), (279598, 640113663), (279598, 645427167), (279598, 654528034), (279598, 574322297), (279598, 1476144889), (279598, 1480949682), (279598, 1495046331), (279598, 318291690), (279598, 325819776), (279598, 325662467), (279598, 330550056), (279598, 330805523), (279598, 337870049), (279598, 1168991694), (279598, 1462950863), (279598, 1472530964), (279598, 46900118), (279598, 50172613), (279598, 134367249), (279598, 135152816), (279598, 138378804), (279598, 139400399), (279598, 143550149), (279598, 65573096), (279598, 77298165), (279598, 144551097), (279598, 154392977), (279598, 188545455), (279598, 195185261), (279598, 226348599), (279598, 228384923), (279598, 690706845), (279598, 694306428), (279598, 706586806), (279598, 274219499), (279598, 280547611), (279598, 385199347), (279598, 393248273), (279598, 462195139), (279598, 447756374), (279598, 452728423), (279598, 884694866), (279598, 1137834059), (279598, 751497185), (279598, 766523514), (279598, 766040455), (279598, 459560248), (279598, 1037949989), (279598, 1045713975), (279598, 230240202), (279598, 232625906), (279598, 243269391), (279598, 242906848), (279598, 983813384), (279598, 57268567), (279598, 75977588), (279598, 85810638), (279598, 946421835), (279598, 948621510), (279598, 735859214), (279598, 736132092), (279598, 103977647), (279598, 114269921), (279598, 112714572), (279598, 621897976), (279598, 624834907), (279598, 624080216), (279598, 626422330), (279598, 627832560), (279598, 630342724), (279598, 1235398562), (279598, 1237488346), (279598, 1239492690), (279598, 1283427434), (279598, 1384764421), (279598, 515633192), (279598, 529583548), (279598, 1207920667), (279598, 1209120259), (279598, 1216893537), (279598, 1228972019), (279598, 1227261582), (279598, 666698134), (279598, 671396538), (279598, 677029107), (279598, 1112966914), (279598, 1114815598), (279598, 1175389910), (279598, 1177181779), (279598, 1178599861), (279598, 1183212184), (279598, 1185121044), (279598, 1187097618), (279598, 1253293190), (279598, 1254691608), (279598, 1258902383), (279598, 1342732987), (279598, 1348632307), (279598, 202102884), (279598, 206321910), (279598, 551627349), (279598, 601203267), (279598, 602094181), (279598, 917868637), (279598, 920180716), (279598, 985622816), (279598, 994793323), (279598, 997881402), (279598, 999419684), (279598, 857365954), (279598, 856326326), (279598, 1145231627), (279598, 1149974331), (279598, 1154115475), (279598, 1189717883), (279598, 1197191331), (279598, 1198249657), (279598, 850139548), (279598, 853681341), (279598, 866434381), (279598, 876900879), (279598, 892730309), (279598, 898433744), (279598, 902822367), (279598, 905176377), (279598, 1418666154), (279598, 1417706379), (279598, 1446180251), (279598, 1447516086), (279598, 1452474604), (279598, 720949184), (279598, 1502027023), (279598, 1503190290), (279598, 1502430080), (279598, 1510860539), (279598, 1555272155), (279598, 314197678), (279598, 925078528), (279598, 929238548), (279598, 935507622), (279598, 9198293), (279598, 11441207), (279598, 13672638), (279598, 1561732067), (279598, 1561952673), (279598, 1565191883), (279598, 432956996), (279598, 433448327), (279598, 437574148), (279598, 288344344), (279598, 350407838), (279598, 352028446), (279598, 358330446), (279598, 527123760), (279598, 527808485), (279598, 589276780), (279598, 1616503410), (279598, 1616885503), (279598, 1543088721), (279598, 1590951544), (279598, 1593452632), (279598, 1600151675), (279598, 1004261079), (279598, 1002572312), (279598, 1006881782), (279598, 1010589620), (279598, 1014570747), (279598, 1015903907), (279598, 1624740973), (279598, 1643829316), (279685, 569724665), (279685, 994915396), (279685, 1058293500), (279685, 1059691471), (279685, 1060524274), (279685, 902029287), (279685, 906221432), (279685, 905353716), (279685, 908822177), (279685, 1587215741), (279685, 102225689), (279685, 111265479), (279685, 112437604), (279685, 117232487), (279685, 170008812), (279685, 173618549), (279685, 172685200), (279685, 548219355), (279685, 548775161), (279685, 551082383), (279685, 572228553), (279685, 584895490), (279685, 859593162), (279685, 1019141524), (279685, 1041391686), (279685, 1043945604), (279685, 75254343), (279685, 82429255), (279685, 90451060), (279685, 98910890), (279685, 308173810), (279685, 307481942), (279685, 1077573297), (279685, 1079943156), (279685, 601199047), (279685, 610366173), (279685, 632813454), (279685, 1084232152), (279685, 1085663679), (279685, 757468064), (279685, 758660432), (279685, 1449718623), (279685, 1449419797), (279685, 1448800734), (279685, 1458862243), (279685, 931230941), (279685, 1787373449), (279685, 1273019788), (279685, 1623723627), (279685, 1627345414), (279685, 1665215377), (279685, 941561732), (279685, 945808152), (279685, 952069422), (279685, 959386543), (279685, 957489617), (279685, 960091593), (279685, 1498853), (279685, 3354467), (279685, 1825441210), (279685, 1826135061), (279685, 447177602), (279685, 450784276), (279685, 1114561661), (279685, 1145965756), (279685, 1301362874), (279685, 1305530278), (279685, 744120151), (279685, 1479609626), (279685, 1481369452), (279685, 1487977743), (279685, 1486709793), (279685, 1493011696), (279685, 222575576), (279685, 225567252), (279685, 230102870), (279685, 178592801), (279685, 179247331), (279685, 1101776168), (279685, 46448084), (279685, 54285602), (279685, 58410530), (279685, 1182376397), (279685, 1240387257), (279685, 1496184362), (279685, 1817476143), (279685, 648076843), (279685, 651304603), (279685, 660023662), (279685, 659626008), (279685, 66462959), (279685, 68135525), (279685, 26480868), (279685, 497932998), (279685, 1692021026), (279685, 1698150911), (279685, 1717769174), (279685, 1795794646), (279685, 1810537926), (279685, 463073158), (279685, 467817677), (279685, 470133770), (279685, 476165445), (279685, 478420692), (279685, 484119678), (279685, 1474311126), (279685, 252408862), (279685, 616175955), (279685, 615044725), (279685, 617188215), (279685, 710888398), (279685, 717128856), (279685, 1824722195), (279685, 1828119641), (279685, 255853864), (279685, 157159798), (279685, 185747999), (279685, 185578178), (279685, 187779327), (279685, 1216555452), (279685, 1744754317), (279685, 1747211832), (279685, 1748341060), (279685, 1753005273), (279685, 402618250), (279685, 404631466), (279685, 119795507), (279685, 120091061), (279685, 211043904), (279685, 1171421202), (279685, 134159756), (279685, 141460532), (279685, 147255417), (279685, 155870083), (279685, 378532264), (279685, 665461073), (279685, 667677456), (279685, 671112770), (279685, 672741895), (279685, 696755721), (279685, 695307543), (279685, 697244349), (279685, 701432480), (279685, 706392932), (279685, 350271855), (279685, 353883987), (279685, 796806157), (279685, 806779151), (279685, 1546891437), (279685, 1549430039), (279685, 1550267182), (279685, 1552145210), (279685, 1553505171), (279685, 1559780666), (279685, 1562932412), (279685, 1573740582), (279685, 1575135572), (279685, 1576802830), (279685, 967514807), (279685, 967681480), (279685, 973546702), (279685, 973249481), (279685, 528038554), (279685, 1222927166), (279685, 1225955645), (279685, 1154233143), (279685, 841042729), (279685, 845988910), (279685, 847464153), (279685, 847679312), (279685, 897288539), (279685, 1259574788), (279685, 327324918), (279685, 771342809), (279685, 770222271), (279685, 769856136), (279685, 1682320978), (279685, 1727605776), (279685, 1732050788), (279685, 1734545390), (279685, 777495529), (279685, 785254618), (279685, 916319792), (279685, 926937122), (279685, 598508746), (279685, 679806409), (279685, 687090831), (279685, 1372152899), (279685, 1377678026), (279685, 1386934868), (279685, 1389046709), (279685, 1397343325), (279685, 1338092042), (279685, 1339637549), (279685, 1600116897), (279685, 1607910084), (279685, 1610191079), (279685, 1611562685), (279685, 1617446423), (279685, 1364914813), (279685, 1759463409), (279685, 1758881557), (279685, 1770512895), (279685, 1770039305), (279764, 5819788), (279764, 147785766), (279764, 40232410), (279813, 616466172), (279813, 619809037), (279813, 635457094), (279813, 642836718), (279813, 440447256), (279813, 444048352), (279813, 447706527), (279813, 451702099), (279813, 460232356), (279813, 461352233), (279813, 464634867), (279813, 97955957), (279813, 102338113), (279813, 107652008), (279813, 106361232), (279813, 120228827), (279813, 299404856), (279813, 303064762), (279813, 128018090), (279813, 130202428), (279813, 130015733), (279813, 139140794), (279813, 140139893), (279813, 146724224), (279813, 43947930), (279813, 45549576), (279813, 52577520), (279813, 3658787), (279813, 5210712), (279813, 1154321916), (279813, 1158790717), (279813, 1159090290), (279813, 1165572770), (279813, 754406947), (279813, 756800398), (279813, 761144976), (279813, 768822871), (279813, 853840890), (279813, 211655354), (279813, 221445554), (279813, 222492549), (279813, 789441169), (279813, 791778110), (279813, 797592164), (279813, 1178568495), (279813, 1215922757), (279813, 646372100), (279813, 647978944), (279813, 654188675), (279813, 405800339), (279813, 409339907), (279813, 410688911), (279813, 1068596105), (279813, 1102506220), (279813, 1115180157), (279813, 333100810), (279813, 332941516), (279813, 682743143), (279813, 681445084), (279813, 701309533), (279813, 702546536), (279813, 707476487), (279813, 484253053), (279813, 559204132), (279813, 559137019), (279813, 563071462), (279813, 576910951), (279813, 971824075), (279813, 160199615), (279813, 163499359), (279813, 168546333), (279813, 985775743), (279813, 1030903032), (279813, 1226590420), (279813, 1235865797), (279813, 1197688367), (279813, 1205015713), (279813, 1242594781), (279813, 1245317384), (279813, 998085516), (279813, 369482646), (279813, 498844966), (279813, 388459936), (279813, 391427043), (279813, 870999559), (279813, 880378200), (279813, 249523725), (279813, 260842731), (279813, 15368714), (279813, 24934870), (279813, 26265330), (279813, 1033632667), (279813, 1037311167), (279813, 1050859949), (279813, 1054815393), (279813, 1055943910), (279813, 1100057814), (279813, 720370499), (279813, 1125950845), (279813, 1135480408), (279813, 1148403014), (279813, 174172890), (279813, 188787273), (279813, 198702267), (279813, 261175451), (279813, 265130671), (279813, 281487612), (279813, 279948829), (279813, 280070287), (279813, 287516402), (279813, 887283232), (279813, 886117066), (279813, 895690048), (279813, 904706566), (279813, 907326665), (279813, 803716262), (279813, 816588518), (279813, 64799420), (279813, 68953861), (279813, 69378380), (279813, 85998116), (279813, 930068729), (279813, 931303409), (279867, 276462710), (279867, 283478093), (279867, 40374415), (279867, 48205478), (279867, 57832404), (279867, 220727668), (279867, 225201413), (279867, 230083828), (279867, 234090186), (279867, 238214821), (279867, 152315704), (279867, 173150219), (279867, 552916125), (279867, 553492391), (279867, 578475797), (279867, 576636245), (279867, 584246967), (279867, 587806044), (279867, 593262754), (279867, 251156171), (279867, 254720060), (279867, 256562575), (279867, 260388389), (279867, 656092326), (279867, 662938194), (279867, 375865760), (279867, 382566734), (279867, 523629106), (279867, 527358731), (279867, 384262353), (279867, 391137986), (279867, 397526232), (279867, 397540041), (279867, 400144067), (279867, 404250675), (279867, 404098489), (279867, 71976189), (279867, 79482015), (279867, 79330119), (279867, 119159109), (279867, 131839848), (279867, 132829782), (279867, 420847658), (279867, 435767466), (279867, 437218546), (279867, 439333394), (279867, 445515368), (279867, 448633490), (279867, 298901939), (279867, 298322683), (279867, 301192556), (279867, 305637241), (279867, 321738423), (279867, 565324594), (279867, 198556976), (279867, 200365902), (279867, 507533248), (279867, 506970520), (279867, 539183937), (279867, 102905619), (279867, 110790455), (279867, 607416904), (279867, 636596608), (279867, 637566889), (279867, 650399144), (279867, 481990882), (279867, 406846348), (279867, 413020649), (279867, 414061437), (279867, 464538507), (279867, 470960911), (279867, 377607978), (279867, 330766943), (279867, 336013625), (279867, 347635818), (279867, 15012112), (279867, 30367924), (279928, 7904736), (279928, 9543411), (279928, 12132872), (279928, 10267765), (279928, 13923914), (279932, 537387934), (279932, 539808166), (279932, 789532614), (279932, 789657845), (279932, 808591363), (279932, 998123955), (279932, 364772005), (279932, 994715156), (279932, 1005236149), (279932, 1025399141), (279932, 468459692), (279932, 475890612), (279932, 480958467), (279932, 482504840), (279932, 756247031), (279932, 781018138), (279932, 779002166), (279932, 8599822), (279932, 11297069), (279932, 13758917), (279932, 18341275), (279932, 23782059), (279932, 32004457), (279932, 42835472), (279932, 57139278), (279932, 61398373), (279932, 655807898), (279932, 656157158), (279932, 669401622), (279932, 670162684), (279932, 683482319), (279932, 483179039), (279932, 487609186), (279932, 529394225), (279932, 533504637), (279932, 534178827), (279932, 817866564), (279932, 816951913), (279932, 818753917), (279932, 819868781), (279932, 837041074), (279932, 942574028), (279932, 955031554), (279932, 967752540), (279932, 975385966), (279932, 984086477), (279932, 713773421), (279932, 717300387), (279932, 324553947), (279932, 334270094), (279932, 335402320), (279932, 335293482), (279932, 342731578), (279932, 343360308), (279932, 346826503), (279932, 108413293), (279932, 111805388), (279932, 113513911), (279932, 587004807), (279932, 589257352), (279932, 589655067), (279932, 598241304), (279932, 645215674), (279932, 648275647), (279932, 650544540), (279932, 650704969), (279932, 612999477), (279932, 624961067), (279932, 624870367), (279932, 289855172), (279932, 298845396), (279932, 164032909), (279932, 382890312), (279932, 384772370), (279932, 394903722), (279932, 403247539), (279932, 407152872), (279932, 504185577), (279932, 509093509), (279932, 508082245), (279932, 511656679), (279932, 521597703), (279932, 522413971), (279932, 914749114), (279932, 932025556), (279932, 198622212), (279932, 204366335), (279932, 244685199), (279932, 244026524), (279932, 244238860), (279932, 266770046), (279932, 282178729), (279932, 215396000), (279932, 231451835), (279932, 237463069), (279932, 244724002), (279932, 428678783), (279932, 355284109), (279932, 357576354), (279932, 377540805), (279932, 170531949), (279932, 174834997), (279932, 172400430), (279932, 181016157), (279932, 184914053), (279932, 694033901), (279932, 717728719), (279932, 719205259), (279932, 721348777), (279932, 723676165), (279932, 725029952), (279932, 728355726), (279932, 126115705), (279932, 137736437), (279932, 146822795), (279932, 149518335), (279932, 897126465), (279932, 944327392), (279932, 944128650), (279932, 968702873), (279932, 735075940), (279932, 863481189), (279932, 870290007), (279932, 880476512), (279932, 882826003), (279932, 430969735), (279932, 436899787), (279932, 438809167), (279932, 441542389), (279932, 448622663), (279932, 449855856), (279932, 315692580), (279932, 319865821), (279932, 324410202), (279984, 203574371), (279984, 209494295), (279984, 226576929), (279984, 704677185), (279984, 725065273), (279984, 1439950282), (279984, 1467346953), (279984, 132238512), (279984, 431702444), (279984, 438988933), (279984, 441301622), (279984, 286135090), (279984, 296404412), (279984, 660624978), (279984, 662480441), (279984, 668485621), (279984, 696383882), (279984, 871248035), (279984, 1374875253), (279984, 612588484), (279984, 621139315), (279984, 638134633), (279984, 649232536), (279984, 651233229), (279984, 566194111), (279984, 567007312), (279984, 574983306), (279984, 576866499), (279984, 1021322692), (279984, 177530616), (279984, 183527026), (279984, 184583254), (279984, 1111779127), (279984, 1121587255), (279984, 1127647502), (279984, 1133875712), (279984, 1342363616), (279984, 1346473479), (279984, 1348345553), (279984, 1351367224), (279984, 1356393695), (279984, 1357845360), (279984, 1360145796), (279984, 1478546588), (279984, 1479723233), (279984, 1479556604), (279984, 1231063345), (279984, 632328323), (279984, 635344308), (279984, 377026438), (279984, 1294597823), (279984, 1295812372), (279984, 1300422864), (279984, 1318499940), (279984, 1391311353), (279984, 1395298056), (279984, 1403930012), (279984, 910584338), (279984, 915779140), (279984, 918777379), (279984, 1053399407), (279984, 1055807660), (279984, 89828430), (279984, 91910483), (279984, 104113253), (279984, 115354325), (279984, 1171798273), (279984, 1175375807), (279984, 1176891721), (279984, 1179008859), (279984, 1183606039), (279984, 1143860751), (279984, 1148604631), (279984, 1149254523), (279984, 1159875136), (279984, 1259816663), (279984, 1272290835), (279984, 1277090444), (279984, 1277682507), (279984, 820536378), (279984, 820836378), (279984, 824599473), (279984, 826173615), (279984, 830614230), (279984, 837218918), (279984, 12778623), (279984, 466189416), (279984, 471202313), (279984, 586104960), (279984, 598971757), (279984, 980040724), (279984, 1075070408), (279984, 1076778676), (279984, 1096572243), (279984, 1097230136), (279984, 796893590), (279984, 803375607), (279984, 807804261), (279984, 818481701), (279984, 238278996), (279984, 244367499), (279984, 242452118), (279984, 1411309100), (279984, 1419513519), (279984, 1433269542), (279984, 1441285496), (279984, 163377331), (279984, 194595648), (279984, 194918883), (279984, 539118309), (279984, 548242271), (279984, 128843345), (279984, 502122075), (279984, 511562984), (279984, 512742536), (279984, 512165378), (279984, 523680108), (279984, 525423661), (279984, 1199110775), (279984, 1219873554), (279984, 328987017), (279984, 341031913), (279984, 356654933), (279984, 743171650), (279984, 743165336), (279984, 749235945), (279984, 25077169), (279984, 27537063), (279984, 32563160), (279984, 39885749), (279984, 305895209), (279984, 309206165), (279984, 308155401), (279984, 322667967), (279984, 1002613611), (279984, 1012315666), (279984, 1015736657), (279984, 395391978), (279984, 399735682), (279984, 1067305476), (279984, 1072074541), (279984, 61881584), (279984, 66529886), (279984, 774111109), (279984, 776114527), (279984, 784425595), (279984, 677779731), (279984, 682195540), (279984, 415868084), (279984, 415447915), (279984, 56984747), (279984, 58416632), (279984, 60491232), (279984, 123743894), (279984, 127103528), (279984, 473768215), (279984, 488222088), (279984, 500081545), (279984, 274552281), (279984, 341306171), (279984, 345399690), (279984, 346526187), (279984, 154874931), (279984, 152774031), (279984, 927028121), (279984, 941866077), (279984, 942073042), (279984, 940069951), (280231, 1697220415), (280231, 2044826238), (280231, 2173299266), (280231, 2212872429), (280231, 2216552214), (280231, 1449968217), (280231, 1527271497), (280231, 1534504071), (280231, 1541691770), (280231, 1545610057), (280231, 1552437414), (280231, 2233292561), (280231, 2237120544), (280231, 2237811313), (280231, 2246005121), (280231, 369689579), (280231, 367543760), (280231, 1458179665), (280231, 1474698197), (280231, 1482665388), (280231, 1156069677), (280231, 1157252005), (280231, 1158855586), (280231, 1164197770), (280231, 1180553520), (280231, 1180765527), (280231, 793501146), (280231, 1667479009), (280231, 1676573399), (280231, 1687565918), (280231, 1692799960), (280231, 1698406588), (280231, 855957288), (280231, 854394699), (280231, 869243622), (280231, 873562692), (280231, 876920574), (280231, 875530537), (280231, 880532971), (280231, 881173153), (280231, 971849653), (280231, 1002395450), (280231, 1013068944), (280231, 945670592), (280231, 953019147), (280231, 1260055395), (280231, 1263800365), (280231, 1268507030), (280231, 1269911400), (280231, 1273571681), (280231, 1278011838), (280231, 38558870), (280231, 40878906), (280231, 61455973), (280231, 66713800), (280231, 1339192349), (280231, 1344392823), (280231, 217745065), (280231, 227728751), (280231, 231636765), (280231, 235466307), (280231, 2012570930), (280231, 2016636496), (280231, 671510359), (280231, 434101590), (280231, 443192737), (280231, 450134377), (280231, 459055082), (280231, 460538315), (280231, 1973708885), (280231, 1980187692), (280231, 471164304), (280231, 473567922), (280231, 473221885), (280231, 473991357), (280231, 479249399), (280231, 488312835), (280231, 490615902), (280231, 1315844372), (280231, 1313857790), (280231, 1321860185), (280231, 1326534006), (280231, 1356225718), (280231, 1375092666), (280231, 196298124), (280231, 1949842409), (280231, 1931123628), (280231, 1930664315), (280231, 89110006), (280231, 91182123), (280231, 95836512), (280231, 100768792), (280231, 108884461), (280231, 111613478), (280231, 2087566099), (280231, 2096000312), (280231, 2096781713), (280231, 2100684572), (280231, 2103911713), (280231, 2119938426), (280231, 1243456494), (280231, 1260778712), (280231, 1520861485), (280231, 1528260441), (280231, 1635043760), (280231, 1634847333), (280231, 1640387994), (280231, 1639530458), (280231, 1958665413), (280231, 1964739554), (280231, 1972308456), (280231, 2140453858), (280231, 2148717251), (280231, 2151283867), (280231, 2153712104), (280231, 2161705125), (280231, 2162933936), (280231, 2163098832), (280231, 1655056891), (280231, 1654594888), (280231, 1578063704), (280231, 1581115715), (280231, 1588933605), (280231, 1620659373), (280231, 1621635609), (280231, 561112136), (280231, 569793875), (280231, 1701958330), (280231, 1716112176), (280231, 1718629600), (280231, 12832494), (280231, 11445384), (280231, 13101419), (280231, 14209417), (280231, 19447751), (280231, 19967925), (280231, 27121746), (280231, 348600562), (280231, 349861950), (280231, 606171478), (280231, 615592694), (280231, 49282306), (280231, 48459971), (280231, 49570849), (280231, 50060693), (280231, 54294670), (280231, 73396555), (280231, 591443490), (280231, 622639558), (280231, 631088748), (280231, 631753816), (280231, 638446503), (280231, 647084730), (280231, 647441215), (280231, 1072450928), (280231, 1080299669), (280231, 1088259805), (280231, 1093289411), (280231, 400797053), (280231, 407606480), (280231, 417324542), (280231, 420912100), (280231, 1049057108), (280231, 1057775763), (280231, 495433553), (280231, 497678002), (280231, 496555495), (280231, 541558273), (280231, 2028905291), (280231, 2032968631), (280231, 837219032), (280231, 842594902), (280231, 852619081), (280231, 1386675206), (280231, 1387030296), (280231, 1395214136), (280231, 1395978315), (280231, 1413343276), (280231, 1415373351), (280231, 2225072885), (280231, 308583604), (280231, 650446390), (280231, 801609983), (280231, 812889623), (280231, 895818306), (280231, 897375449), (280231, 898263363), (280231, 902393965), (280231, 136391466), (280231, 144644538), (280231, 758891910), (280231, 758987458), (280231, 770711413), (280231, 1212711538), (280231, 1215676249), (280231, 2189604584), (280231, 1912203263), (280231, 1914766176), (280231, 707984122), (280231, 712923693), (280231, 1500562379), (280231, 1508198363), (280231, 1507843608), (280231, 1097216072), (280231, 1099777576), (280231, 1106135966), (280231, 1116050195), (280231, 1116882997), (280231, 341892480), (280231, 345016738), (280231, 2120184031), (280231, 691741058), (280231, 731223052), (280231, 741232200), (280231, 508826854), (280231, 521848336), (280231, 245281313), (280231, 302371622), (280231, 317351811), (280231, 327312659), (280231, 980624274), (280231, 1022196008), (280231, 1026226964), (280231, 1031787135), (280231, 996629778), (280231, 1000502763), (280231, 262686527), (280231, 272031523), (280231, 274498243), (280231, 286401785), (280231, 1575675636), (280231, 1607855932), (280231, 163417619), (280231, 165752059), (280231, 175324013), (280231, 179745591), (280231, 181073967), (280231, 536480514), (280231, 921620215), (280231, 1995330311), (280231, 2058751034), (280319, 562029959), (280319, 567143828), (280319, 573275578), (280319, 591403563), (280319, 1036903160), (280319, 1034517720), (280319, 733740633), (280319, 1523819931), (280319, 281959301), (280319, 290356572), (280319, 336382906), (280319, 367243891), (280319, 369071591), (280319, 367052586), (280319, 1080619643), (280319, 810881493), (280319, 212091003), (280319, 271544005), (280319, 1167221976), (280319, 1203245495), (280319, 1206062859), (280319, 1205889842), (280319, 179803922), (280319, 179756949), (280319, 184887165), (280319, 194079815), (280319, 563318190), (280319, 695883268), (280319, 695447406), (280319, 701649500), (280319, 509676059), (280319, 512035916), (280319, 513593907), (280319, 515140366), (280319, 518901728), (280319, 524487015), (280319, 1691227729), (280319, 785236144), (280319, 790450488), (280319, 24388459), (280319, 27495707), (280319, 30626154), (280319, 278408387), (280319, 774601762), (280319, 826676971), (280319, 832932290), (280319, 833909729), (280319, 1120682424), (280319, 528264020), (280319, 318047356), (280319, 319639794), (280319, 326288942), (280319, 1525417169), (280319, 1534808191), (280319, 1537085700), (280319, 1550724777), (280319, 1555280491), (280319, 633887102), (280319, 634398978), (280319, 640806170), (280319, 868271764), (280319, 227574195), (280319, 239073291), (280319, 1805498900), (280319, 1717915951), (280319, 1176247), (280319, 1883466548), (280319, 1888059765), (280319, 1994844252), (280319, 952055843), (280319, 950653148), (280319, 953307970), (280319, 974019669), (280319, 981646637), (280319, 1090291013), (280319, 1091898446), (280319, 1102018261), (280319, 1225829518), (280319, 1228858773), (280319, 1266571891), (280319, 1268793110), (280319, 1275046676), (280319, 1983955191), (280319, 1989324817), (280319, 1927883623), (280319, 1936849157), (280319, 1936707257), (280319, 1946712502), (280319, 1948913625), (280319, 75809074), (280319, 87910127), (280319, 1828850376), (280319, 1839057146), (280319, 1844923384), (280319, 1844702370), (280319, 745442820), (280319, 752623568), (280319, 798105003), (280319, 722094647), (280319, 760235715), (280319, 1648730072), (280319, 2008777571), (280319, 2013904070), (280319, 2016151584), (280319, 736964000), (280319, 1681460726), (280319, 1682247541), (280319, 1691355864), (280319, 1771934315), (280319, 1775183359), (280319, 1774691556), (280319, 1777191468), (280319, 1822163649), (280319, 1823376735), (280319, 1826273957), (280319, 1826940160), (280319, 1851634850), (280319, 1855972106), (280319, 1864367352), (280319, 1864414128), (280319, 1871948254), (280319, 1873304852), (280319, 1874785103), (280319, 1133321903), (280319, 1139047711), (280319, 1153638375), (280319, 1151415477), (280319, 1153720565), (280319, 1008081445), (280319, 913051817), (280319, 914450704), (280319, 921187787), (280319, 931194131), (280319, 2036770261), (280319, 2042319778), (280319, 2046979488), (280319, 2050121279), (280319, 2058398448), (280319, 726127616), (280319, 1894777433), (280319, 887921870), (280319, 889450748), (280319, 935184686), (280319, 935513275), (280319, 942862333), (280319, 1475173173), (280319, 1479514672), (280319, 1478120277), (280319, 1478257757), (280319, 1488525960), (280319, 1569643892), (280319, 963155881), (280319, 1173822256), (280319, 1178287036), (280319, 1951070306), (280319, 1963080845), (280319, 1965865848), (280319, 1965685628), (280319, 1589594523), (280319, 1596104201), (280319, 1596443921), (280319, 1599250983), (280319, 1621956298), (280319, 1628997553), (280319, 667498270), (280319, 688232169), (280319, 420925509), (280319, 425494828), (280319, 430397837), (280319, 1294198318), (280319, 101558805), (280319, 105389815), (280319, 108272689), (280319, 113253324), (280319, 116449667), (280319, 122212963), (280319, 121504127), (280319, 1049077141), (280319, 1051348408), (280319, 1072422024), (280319, 408586138), (280319, 417241152), (280319, 1355988103), (280319, 1398061854), (280319, 1400246374), (280319, 1401513478), (280319, 1408234862), (280319, 1330192822), (280319, 1337393000), (280319, 1348856615), (280319, 1354491936), (280319, 131565819), (280319, 131691545), (280319, 143449561), (280319, 170322087), (280319, 260408945), (280319, 47716555), (280319, 55118355), (280319, 60906203), (280319, 65631594), (280319, 70697683), (280319, 1331803255), (280319, 649497548), (280319, 476259839), (280319, 1378419054), (280319, 1379556550), (280319, 1418979438), (280319, 1425810973), (280319, 840781166), (280319, 844110200), (280319, 862377450), (280319, 1218209634), (280319, 1216278078), (280319, 1253627767), (280319, 295870607), (280319, 298961705), (280319, 1448768963), (280319, 1452532772), (280319, 1460778453), (280319, 1459335527), (280319, 1470974161), (280319, 1473438001), (280319, 356245342), (280319, 401966385), (280319, 443060472), (280319, 445957840), (280319, 453840378), (280319, 461955172), (280319, 468243075), (280319, 1607864717), (280319, 1613732251), (280319, 36789003), (280319, 40320283), (280319, 1790009047), (280319, 1373261437), (280319, 1427358349), (280319, 593790933), (280319, 610486929), (280319, 373797091), (280319, 384690953), (280319, 387231970), (280319, 404758158), (280368, 18630561), (280368, 51648904), (280368, 54941288), (280368, 3646070), (280368, 98914941), (280368, 102460266), (280368, 111188172), (280368, 110195295), (280368, 111231202), (280368, 35044919), (280368, 37803137), (280368, 46074631), (280368, 119864418), (280368, 120542057), (280368, 122424631), (280368, 126731420), (280368, 20144526), (280368, 28604229), (280368, 86306278), (280368, 157377745), (280368, 145775947), (280368, 76870390), (280368, 159538570), (280423, 361879287), (280423, 362830248), (280423, 364833223), (280423, 373737920), (280423, 376217318), (280423, 373150603), (280423, 381102402), (280423, 382471972), (280423, 385475890), (280423, 617874050), (280423, 1148716645), (280423, 1154025636), (280423, 1254129385), (280423, 394025670), (280423, 395246647), (280423, 395278324), (280423, 400221258), (280423, 1427172638), (280423, 1180567303), (280423, 1185909605), (280423, 1187368199), (280423, 165419390), (280423, 181035460), (280423, 188028507), (280423, 190016366), (280423, 1230869026), (280423, 876312069), (280423, 1101820335), (280423, 1104512803), (280423, 1118381906), (280423, 1129146016), (280423, 782844728), (280423, 787249204), (280423, 961887294), (280423, 972534323), (280423, 970727751), (280423, 1002887456), (280423, 1007692904), (280423, 1010794041), (280423, 1382253233), (280423, 1383416018), (280423, 538486944), (280423, 557206463), (280423, 561990306), (280423, 9878484), (280423, 14216983), (280423, 16326388), (280423, 18767832), (280423, 241148225), (280423, 244595846), (280423, 1070353107), (280423, 937828273), (280423, 947795856), (280423, 527038547), (280423, 1031743590), (280423, 1203185849), (280423, 1260779023), (280423, 1271032060), (280423, 1274946917), (280423, 86295392), (280423, 449834672), (280423, 454760804), (280423, 469015037), (280423, 1325322649), (280423, 1357782077), (280423, 1359154942), (280423, 1363741945), (280423, 1364463414), (280423, 28462304), (280423, 349285383), (280423, 349810042), (280423, 353367542), (280423, 1238212366), (280423, 1238753925), (280423, 1239476174), (280423, 880301270), (280423, 926231166), (280423, 1137299942), (280423, 1171790310), (280423, 1395159771), (280423, 1398240379), (280423, 1440351100), (280423, 1442033968), (280423, 1450644524), (280423, 286229470), (280423, 307998315), (280423, 313571606), (280423, 316574001), (280423, 575438226), (280423, 581449935), (280423, 584326224), (280423, 587953050), (280423, 409497173), (280423, 415687661), (280423, 975667197), (280423, 985158814), (280423, 984716930), (280423, 990209212), (280423, 1040033763), (280423, 628695807), (280423, 630821228), (280423, 630413949), (280423, 858619782), (280423, 861359093), (280423, 865932277), (280423, 116060826), (280423, 122388586), (280423, 206059696), (280423, 211654495), (280423, 224046559), (280423, 227375400), (280423, 632865993), (280423, 654235135), (280423, 657561622), (280423, 129766561), (280423, 138283972), (280423, 152330182), (280423, 194073332), (280423, 199973590), (280423, 200852470), (280423, 201522099), (280423, 203303471), (280423, 892527775), (280423, 893096566), (280423, 895141051), (280423, 914557524), (280423, 918190132), (280423, 671877647), (280423, 692407000), (280423, 697758178), (280423, 700384917), (280423, 699184191), (280423, 295070462), (280423, 298640650), (280423, 300261327), (280423, 398038121), (280423, 419468311), (280423, 429311954), (280423, 439364946), (280423, 440470825), (280423, 440692290), (280423, 259349181), (280423, 262207679), (280423, 262061175), (280423, 263154947), (280423, 263838645), (280423, 272479713), (280423, 1353299397), (280423, 1392249888), (280423, 1455292838), (280423, 1454925780), (280423, 1470162509), (280423, 1013683544), (280423, 1016912491), (280423, 1049866282), (280423, 1051711843), (280423, 725890228), (280423, 740450907), (280423, 744155732), (280423, 743752620), (280423, 1290387569), (280423, 65023309), (280423, 64989151), (280423, 66160176), (280423, 67561661), (280423, 68518681), (280423, 72267220), (280423, 490779190), (280423, 495189076), (280423, 1299561766), (280423, 247905881), (280423, 251975039), (280423, 1201706120), (280423, 1206298512), (280423, 1216431096), (280423, 756513490), (280423, 767520638), (280423, 770310698), (280423, 812035014), (280423, 823451393), (280423, 830257107), (280423, 829574918), (280464, 403679437), (280464, 947987832), (280464, 952240148), (280464, 503924435), (280464, 1083589410), (280464, 1163146080), (280464, 1162478083), (280464, 1164288631), (280464, 710930850), (280464, 703262462), (280464, 600587508), (280464, 607176800), (280464, 245203634), (280464, 249008186), (280464, 251459903), (280464, 254136179), (280464, 682723454), (280464, 686307471), (280464, 688567342), (280464, 689606912), (280464, 693794106), (280464, 725116424), (280464, 735303390), (280464, 738387074), (280464, 152556344), (280464, 458632505), (280464, 460104446), (280464, 463842979), (280464, 468517915), (280464, 232273755), (280464, 196920263), (280464, 200933676), (280464, 273749193), (280464, 272973462), (280464, 633972651), (280464, 633220390), (280464, 634574687), (280464, 637155335), (280464, 1031693888), (280464, 1114412068), (280464, 418652990), (280464, 126759885), (280464, 1160231009), (280464, 214628406), (280464, 217360033), (280464, 528663619), (280464, 220336136), (280464, 221661891), (280464, 226532362), (280464, 226632558), (280464, 553839938), (280464, 563302945), (280464, 565035967), (280464, 175172492), (280464, 176815328), (280464, 568239726), (280464, 572283010), (280464, 572552135), (280464, 581587223), (280464, 1065216667), (280464, 1069118617), (280464, 514796437), (280464, 271733586), (280464, 271647938), (280464, 86107134), (280464, 91133906), (280464, 92700049), (280464, 391974029), (280464, 388911563), (280464, 400621603), (280464, 287676836), (280464, 289009994), (280464, 308881491), (280464, 367648003), (280464, 370260559), (280464, 380561608), (280464, 382928385), (280464, 387213831), (280464, 386525088), (280464, 880447668), (280464, 888303196), (280464, 259950335), (280464, 259765338), (280464, 268881406), (280464, 1130301946), (280464, 1138638990), (280464, 1137776122), (280464, 737099342), (280464, 744662924), (280464, 748251064), (280464, 909578492), (280464, 911354300), (280464, 926316827), (280464, 1138881294), (280464, 1147367215), (280464, 1173373755), (280464, 1185306156), (280464, 1103977707), (280464, 1110296971), (280464, 279661057), (280464, 975352871), (280464, 979075921), (280464, 983442153), (280464, 987957933), (280464, 988819437), (280464, 989634663), (280464, 330503907), (280464, 332597272), (280464, 357975715), (280464, 9219814), (280464, 49735110), (280464, 54605145), (280464, 310541782), (280464, 312614388), (280464, 318887683), (280464, 319806632), (280464, 30366027), (280464, 836579683), (280464, 839912275), (280464, 842333950), (280464, 847153251), (280464, 852064668), (280464, 779913363), (280464, 793047081), (280464, 791995874), (280464, 65413515), (280464, 126125351), (280464, 110061655), (280464, 113411803), (280464, 20288421), (280464, 26048665), (280464, 68823987), (280464, 81902464), (280464, 343969365), (280464, 342160879), (280464, 815285637), (280464, 178978607), (280464, 187603384), (280464, 490965341), (280464, 492847873), (280464, 491456439), (280464, 493532551), (280464, 497126245), (280500, 134703333), (280500, 154142130), (280500, 157250753), (280500, 161506305), (280500, 110635174), (280500, 129681932), (280500, 127520832), (280500, 40285631), (280500, 66590758), (280500, 80784169), (280500, 23335506), (280500, 24345010), (280500, 26259749), (280500, 31766868), (280500, 88711753), (280500, 175173724), (280500, 142811965), (280500, 149327890), (280500, 150787598), (280520, 487785931), (280520, 492044036), (280520, 497803222), (280520, 517744529), (280520, 372978976), (280520, 418145603), (280520, 472984019), (280520, 436928009), (280520, 446183506), (280520, 125120877), (280520, 193329262), (280520, 352549231), (280520, 164065382), (280520, 197168109), (280520, 201281443), (280520, 147743883), (280520, 245928907), (280520, 249866083), (280520, 256947489), (280520, 257632916), (280520, 255478538), (280520, 263837247), (280520, 265476786), (280520, 350819590), (280520, 432126142), (280520, 213138882), (280520, 217266710), (280520, 224127542), (280520, 228135497), (280614, 161177673), (280614, 169745152), (280614, 170767640), (280614, 215146625), (280614, 219127570), (280614, 301178226), (280614, 303707437), (280614, 332449119), (280614, 335003120), (280614, 345722410), (280614, 353058908), (280614, 411236139), (280614, 414979598), (280614, 419235273), (280614, 426610368), (280614, 175746364), (280614, 2832819), (280614, 445394990), (280614, 23884140), (280614, 26304101), (280614, 36897069), (280614, 52567457), (280614, 263895374), (280614, 197529463), (280614, 195487015), (280614, 200548148), (280614, 381849649), (280614, 484299614), (280614, 251899309), (280614, 258595205), (280614, 262503389), (280614, 266054651), (280614, 508036054), (280614, 135108736), (280614, 469203363), (280614, 197406782), (280614, 280156426), (280614, 66251511), (280614, 68094944), (280614, 68851524), (280614, 402762268), (280614, 234643177), (280614, 241494472), (280614, 182710441), (280614, 124825582), (280614, 131963406), (280614, 129554236), (280614, 398377511), (280614, 15314641), (280614, 75177979), (280614, 81554504), (280614, 84242925), (280614, 249695289), (280614, 48491778), (280614, 425895393), (280614, 429688367), (280614, 430584664), (280614, 430786875), (280614, 470180942), (280614, 101543692), (280614, 118170578), (280614, 343741138), (280614, 377386110), (280614, 310506941), (280673, 1561502610), (280673, 52197766), (280673, 51903608), (280673, 277801020), (280673, 280047936), (280673, 286316962), (280673, 287350710), (280673, 287567264), (280673, 2717432142), (280673, 627110595), (280673, 635454801), (280673, 667428224), (280673, 668936168), (280673, 676414835), (280673, 1179958099), (280673, 1179577719), (280673, 753417563), (280673, 925801475), (280673, 929027626), (280673, 928808433), (280673, 932066869), (280673, 936543525), (280673, 2177212635), (280673, 2181799462), (280673, 2182347482), (280673, 2183016874), (280673, 2187212326), (280673, 2482538521), (280673, 2765600574), (280673, 2770492663), (280673, 2778816414), (280673, 1340984944), (280673, 1341338341), (280673, 1343587778), (280673, 1356827410), (280673, 2118192753), (280673, 2119242422), (280673, 2124148901), (280673, 2193498932), (280673, 210239745), (280673, 217201639), (280673, 1785965118), (280673, 2532511534), (280673, 2540140200), (280673, 2634973887), (280673, 2638154345), (280673, 2640706025), (280673, 2644529335), (280673, 2353158959), (280673, 2356623320), (280673, 2355325771), (280673, 2362575975), (280673, 2362574478), (280673, 2200915370), (280673, 2167541330), (280673, 2170303336), (280673, 151665751), (280673, 150994206), (280673, 159901037), (280673, 960791346), (280673, 966344732), (280673, 1001228209), (280673, 353035512), (280673, 388200329), (280673, 3028503266), (280673, 3033721245), (280673, 3041435788), (280673, 3045258635), (280673, 1541222359), (280673, 1903177089), (280673, 1903343123), (280673, 1913750957), (280673, 1927101566), (280673, 1926692554), (280673, 1926495149), (280673, 2489966503), (280673, 2494706635), (280673, 2497573278), (280673, 3077092792), (280673, 3084576045), (280673, 3097295300), (280673, 3108240355), (280673, 2448458780), (280673, 415504114), (280673, 433390588), (280673, 2330851434), (280673, 2335889912), (280673, 2348111074), (280673, 2350683365), (280673, 1366214126), (280673, 1368434425), (280673, 1368106313), (280673, 1370854154), (280673, 1371304327), (280673, 1388443622), (280673, 1598767572), (280673, 1598692856), (280673, 1605479287), (280673, 1607307218), (280673, 1608987310), (280673, 1612751849), (280673, 1615433136), (280673, 1628068009), (280673, 1627193982), (280673, 1632071699), (280673, 1639670651), (280673, 1664330995), (280673, 1674930087), (280673, 2993363444), (280673, 2997148328), (280673, 1952785961), (280673, 1960201606), (280673, 2026525657), (280673, 2028900521), (280673, 2034778729), (280673, 2892196239), (280673, 2893130910), (280673, 2499185660), (280673, 2505613462), (280673, 600059506), (280673, 599870982), (280673, 603985827), (280673, 764333824), (280673, 256951192), (280673, 262963837), (280673, 1823410733), (280673, 2197123741), (280673, 2305157070), (280673, 143442741), (280673, 145327957), (280673, 146058228), (280673, 974479952), (280673, 1115470566), (280673, 1122200277), (280673, 1125565319), (280673, 1446940697), (280673, 1456938274), (280673, 1432608078), (280673, 1439332158), (280673, 1442001118), (280673, 1506108555), (280673, 1507118668), (280673, 940729316), (280673, 948917043), (280673, 952956637), (280673, 1308336479), (280673, 1309842978), (280673, 1312823890), (280673, 1041312063), (280673, 105431623), (280673, 113254383), (280673, 113609086), (280673, 269472024), (280673, 301050464), (280673, 2084153001), (280673, 2096012343), (280673, 2094350623), (280673, 2099192829), (280673, 695743717), (280673, 740399793), (280673, 740833989), (280673, 2699043355), (280673, 2700838882), (280673, 2704280557), (280673, 2702117297), (280673, 2755267267), (280673, 2755748945), (280673, 1838517358), (280673, 1847546351), (280673, 1849982083), (280673, 183913264), (280673, 190962116), (280673, 254167831), (280673, 362515909), (280673, 368705629), (280673, 378884323), (280673, 438647052), (280673, 33080895), (280673, 37404310), (280673, 73257613), (280673, 74321810), (280673, 2058495473), (280673, 2610520806), (280673, 2615440234), (280673, 3061036739), (280673, 3063705592), (280673, 3063983815), (280673, 3069199853), (280673, 987541087), (280673, 993205767), (280673, 1248630674), (280673, 1256550197), (280673, 1282700034), (280673, 1282805298), (280673, 1285256834), (280673, 2967185399), (280673, 2968235722), (280673, 2984633757), (280673, 1693042776), (280673, 1693515134), (280673, 2559633088), (280673, 2564757270), (280673, 2570199648), (280673, 1754905208), (280673, 1765885177), (280673, 776706806), (280673, 779280908), (280673, 786048765), (280673, 826548990), (280673, 1989749719), (280673, 1993721146), (280673, 2003265224), (280673, 880005111), (280673, 881453173), (280673, 880853423), (280673, 879119855), (280673, 885268972), (280673, 893896382), (280673, 921251337), (280673, 920049075), (280673, 619607431), (280673, 620337836), (280673, 800148757), (280673, 805493593), (280673, 2216766663), (280673, 2215203701), (280673, 2224732686), (280673, 1548675198), (280673, 1409701972), (280673, 2132591573), (280673, 2135459734), (280673, 2140137426), (280673, 2141521944), (280673, 2139289914), (280673, 517281588), (280673, 518474148), (280673, 521836884), (280673, 524072652), (280673, 529364317), (280673, 527380335), (280673, 541839586), (280673, 545146215), (280673, 1737032501), (280673, 1803102265), (280673, 1805904365), (280673, 862793888), (280673, 1141134627), (280673, 1154242847), (280673, 1152145113), (280673, 1156283181), (280673, 1234105644), (280673, 1238746015), (280673, 1241679168), (280673, 1244259699), (280673, 1288357225), (280673, 1292190420), (280673, 1301023266), (280673, 3161467555), (280673, 3168914014), (280673, 3169608364), (280673, 3170980301), (280673, 2927975162), (280673, 2940655712), (280673, 2938539332), (280673, 2942247737), (280673, 2946249490), (280673, 2943982655), (280673, 2949947284), (280673, 2383804628), (280673, 2394990476), (280673, 2393558202), (280673, 1793918043), (280673, 1797617325), (280673, 1801893686), (280673, 1802994817), (280673, 1868958632), (280673, 1881612349), (280673, 1015828677), (280673, 1040684819), (280673, 1044120721), (280673, 1055563895), (280673, 1861044367), (280673, 1861840516), (280673, 1563278273), (280673, 1573321097), (280673, 636521337), (280673, 658334485), (280673, 657853395), (280673, 658923859), (280673, 661353763), (280673, 719032876), (280673, 730277027), (280673, 130772988), (280673, 128639410), (280673, 192722347), (280673, 2520714318), (280673, 2524900212), (280673, 540252534), (280673, 1129293375), (280673, 1127880961), (280673, 1127567985), (280673, 1129709373), (280673, 1130442500), (280673, 1204578001), (280673, 1210239213), (280673, 1209987687), (280673, 515678340), (280673, 638356141), (280673, 714091151), (280673, 573577074), (280673, 441791715), (280673, 450639263), (280673, 550449120), (280673, 1400216651), (280673, 1461712657), (280673, 1103085132), (280673, 2829060797), (280673, 2834122239), (280673, 507612086), (280673, 529883757), (280673, 301723541), (280673, 308973827), (280673, 337108746), (280673, 1963106847), (280673, 1970219336), (280673, 1973879931), (280673, 2041576452), (280673, 1189283571), (280673, 1193924154), (280673, 2900701815), (280673, 2911558212), (280673, 2910735588), (280673, 2915446398), (280673, 292745140), (280673, 294918744), (280673, 868664676), (280673, 1943757842), (280673, 2009219993), (280673, 2009186699), (280673, 2016738385), (280673, 2752894471), (280673, 2675317465), (280673, 2672561025), (280673, 905540049), (280673, 1059283304), (280673, 1062503441), (280673, 1065882767), (280673, 2596434341), (280673, 2080012190), (280673, 2148602850), (280673, 2152193836), (280673, 2156881522), (280673, 2849611504), (280673, 2848484692), (280673, 2854571066), (280673, 2857016500), (280673, 2857678756), (280673, 2856700246), (280673, 2861374546), (280673, 484140310), (280673, 2245104868), (280673, 2245529823), (280673, 2274565601), (280673, 2279370083), (280673, 2288397076), (280673, 61651056), (280673, 61793945), (280673, 3053976855), (280673, 588981061), (280673, 592194568), (280673, 679256630), (280673, 680769321), (280673, 679405752), (280673, 685018370), (280673, 690886151), (280673, 460404830), (280673, 2455078568), (280673, 2466014369), (280673, 2467491159), (280673, 243904759), (280673, 266544725), (280673, 270497155), (280673, 159954028), (280673, 1099507887), (280673, 3126832728), (280673, 3127107304), (280673, 3132352042), (280673, 3140983301), (280673, 848535089), (280673, 856939280), (280673, 854182688), (280673, 860166988), (280673, 859509052), (280673, 1416123410), (280673, 1420559613), (280673, 1426036490), (280673, 1683872098), (280673, 1589446887), (280673, 1741238339), (280673, 1746826593), (280673, 1776252952), (280673, 1853050261), (280673, 2806294018), (280673, 85913912), (280673, 117009110), (280753, 365456849), (280753, 376437185), (280753, 422998503), (280753, 441378620), (280753, 27753821), (280753, 30829464), (280753, 39366995), (280753, 43218719), (280753, 44351741), (280753, 74941574), (280753, 79893511), (280753, 89066701), (280753, 95489617), (280753, 96879307), (280753, 766664461), (280753, 768428703), (280753, 778821400), (280753, 813375609), (280753, 811693821), (280753, 134561155), (280753, 177384900), (280753, 864135449), (280753, 864682742), (280753, 240478542), (280753, 346171992), (280753, 351796583), (280753, 354102534), (280753, 358289357), (280753, 363569966), (280753, 333717286), (280753, 333390112), (280753, 61541558), (280753, 66437573), (280753, 69680529), (280753, 635429149), (280753, 732689189), (280753, 649050361), (280753, 210010568), (280753, 217994521), (280753, 221475865), (280753, 567552131), (280753, 568115382), (280753, 572486468), (280753, 574235324), (280753, 592483954), (280753, 797604745), (280753, 807802541), (280753, 828723584), (280753, 833447390), (280753, 266513600), (280753, 268646852), (280753, 297250576), (280753, 679828943), (280753, 698044006), (280753, 13265533), (280753, 17051870), (280753, 19064691), (280753, 54122633), (280753, 55443906), (280753, 59454949), (280753, 848380537), (280753, 847713278), (280753, 850429585), (280753, 867607441), (280753, 398836135), (280753, 403106756), (280753, 406391793), (280753, 412998749), (280753, 527747276), (280753, 528489947), (280753, 530333422), (280753, 272398089), (280753, 272996746), (280753, 274428674), (280753, 314356589), (280753, 317616096), (280753, 321620391), (280753, 321338962), (280753, 325417838), (280753, 326718901), (280753, 330419057), (280753, 735448189), (280753, 745653570), (280753, 746224121), (280753, 744096305), (280753, 745172692), (280753, 754549904), (280753, 758217185), (280753, 104405491), (280753, 102213244), (280753, 112652971), (280753, 709038478), (280753, 383705797), (280753, 388628709), (280753, 395875171), (280753, 139888392), (280753, 168114146), (280753, 491280594), (280753, 496091622), (280753, 503858086), (280753, 508881079), (280753, 508900345), (280753, 510314834), (280753, 446256192), (280753, 466184764), (280753, 471900183), (280753, 537464779), (280753, 537857180), (280753, 538573954), (280753, 548561281), (280753, 721826545), (280753, 721146202), (280753, 723937158), (280753, 129616839), (280753, 144474583), (280753, 151148259), (280753, 778906192), (280753, 779344349), (280753, 784367794), (280753, 793117292), (280753, 299895622), (280753, 300936115), (280753, 301573976), (280753, 304803216), (280753, 314520592), (280753, 622741527), (280753, 626422097), (280753, 474243198), (280753, 475736691), (280753, 485297093), (280753, 486264713), (280753, 486742407), (280753, 486776862), (280753, 173211963), (280753, 171428593), (280753, 180617209), (280753, 181021134), (280753, 179266464), (280753, 186307027), (280753, 191317520), (280753, 197266902), (280853, 12280853), (280853, 33570179), (280853, 34929280), (280853, 40356388), (280853, 116187520), (280853, 119434178), (280853, 20546136), (280853, 84246492), (280853, 85596120), (280853, 88044578), (280853, 90630872), (280853, 130933362), (280853, 29144998), (280853, 64187219), (280853, 137691992), (280853, 144074454), (280853, 149266631), (280853, 146187670), (280853, 88975116), (280853, 99122399), (280853, 106334941), (280853, 107318663), (280853, 104888757), (280853, 46534033), (280853, 58769889), (280853, 68391127), (280862, 1936729688), (280862, 1939640883), (280862, 1990292225), (280862, 867603545), (280862, 896122487), (280862, 896383546), (280862, 896945507), (280862, 2402827453), (280862, 2423759093), (280862, 821967323), (280862, 857152963), (280862, 713621141), (280862, 746087171), (280862, 203985064), (280862, 229448002), (280862, 612509241), (280862, 657018655), (280862, 663803029), (280862, 2553060717), (280862, 2554443443), (280862, 2814934281), (280862, 2821494034), (280862, 2710543225), (280862, 2724475109), (280862, 15860086), (280862, 22107217), (280862, 43776347), (280862, 42416817), (280862, 1640972519), (280862, 1642090940), (280862, 1651901077), (280862, 1649496131), (280862, 1652832256), (280862, 1327171764), (280862, 1329650273), (280862, 1342897375), (280862, 56730589), (280862, 62673646), (280862, 93077037), (280862, 99420604), (280862, 133954936), (280862, 140387903), (280862, 141121340), (280862, 1291240322), (280862, 1314102134), (280862, 290732474), (280862, 299935456), (280862, 311404245), (280862, 1690685297), (280862, 1700860944), (280862, 1715156393), (280862, 1244772049), (280862, 1255681830), (280862, 1256103772), (280862, 1256009495), (280862, 1258305841), (280862, 1265008715), (280862, 2738723628), (280862, 2428284929), (280862, 1210198658), (280862, 1211845504), (280862, 1215231325), (280862, 1226234981), (280862, 951121817), (280862, 956744691), (280862, 715462687), (280862, 724143788), (280862, 727069118), (280862, 807006290), (280862, 809621319), (280862, 812612068), (280862, 818301705), (280862, 1334790134), (280862, 1389016245), (280862, 1395169725), (280862, 1008250128), (280862, 1035630940), (280862, 545557701), (280862, 546949626), (280862, 567468081), (280862, 570314712), (280862, 629847337), (280862, 633573311), (280862, 2743119066), (280862, 2764711185), (280862, 2765637164), (280862, 2768183806), (280862, 2794984941), (280862, 2800983297), (280862, 2037607826), (280862, 2040024507), (280862, 2045468401), (280862, 2107725751), (280862, 2112942609), (280862, 2122516125), (280862, 2120629988), (280862, 2537670027), (280862, 2542190370), (280862, 2158080235), (280862, 2159024598), (280862, 2157786872), (280862, 2164196799), (280862, 2169573471), (280862, 2171297732), (280862, 2175720789), (280862, 2179742953), (280862, 976613967), (280862, 979898299), (280862, 986506321), (280862, 991177184), (280862, 2276671032), (280862, 2281197545), (280862, 2289575465), (280862, 2232202599), (280862, 2238228435), (280862, 2241430816), (280862, 2239384335), (280862, 2240949225), (280862, 1666130369), (280862, 1667750866), (280862, 1669406620), (280862, 1682719992), (280862, 1685189623), (280862, 1689879531), (280862, 2068254682), (280862, 2079299679), (280862, 2078538876), (280862, 1195152778), (280862, 272130933), (280862, 1161378968), (280862, 1162412120), (280862, 1177120505), (280862, 1176007128), (280862, 1178698178), (280862, 1187914969), (280862, 1186425075), (280862, 1189445789), (280862, 1190057139), (280862, 1108281142), (280862, 1113116381), (280862, 1117312152), (280862, 1144753088), (280862, 1913058206), (280862, 1920023133), (280862, 1922260023), (280862, 1942673546), (280862, 1946330493), (280862, 1948746787), (280862, 2091669582), (280862, 2093959715), (280862, 2144270206), (280862, 2146144224), (280862, 1099773133), (280862, 1104547958), (280862, 1998019138), (280862, 2005713864), (280862, 1569260676), (280862, 2694393663), (280862, 119799453), (280862, 128240362), (280862, 130519007), (280862, 130479131), (280862, 753245725), (280862, 756185863), (280862, 328205191), (280862, 331874629), (280862, 336203476), (280862, 338073877), (280862, 574551286), (280862, 518000123), (280862, 518670612), (280862, 529592999), (280862, 529969791), (280862, 2594025546), (280862, 2592807741), (280862, 1534382210), (280862, 1543216121), (280862, 1545545228), (280862, 2488691940), (280862, 1235245545), (280862, 1236983053), (280862, 1277626098), (280862, 1280829228), (280862, 1428881574), (280862, 1432775428), (280862, 1435958310), (280862, 1467938622), (280862, 1470418864), (280862, 1506396265), (280862, 1512029239), (280862, 1512574377), (280862, 482711349), (280862, 484242904), (280862, 486725465), (280862, 490217718), (280862, 496650932), (280862, 499969488), (280862, 502779400), (280862, 505942519), (280862, 349367078), (280862, 359120213), (280862, 359514221), (280862, 366644149), (280862, 371475378), (280862, 371854967), (280862, 1719322879), (280862, 1732456364), (280862, 1731646721), (280862, 1747017202), (280862, 1746814883), (280862, 1359484923), (280862, 1367486108), (280862, 1489789760), (280862, 1498098377), (280862, 911372192), (280862, 191495989), (280862, 400422481), (280862, 399408254), (280862, 405703078), (280862, 412703611), (280862, 414838548), (280862, 418647465), (280862, 419893532), (280862, 1881257041), (280862, 1890503462), (280862, 1896192790), (280862, 1902521620), (280862, 1905613362), (280862, 467673712), (280862, 475297805), (280862, 480572831), (280862, 1204314195), (280862, 1206865151), (280862, 1210795875), (280862, 2554738642), (280862, 2555403349), (280862, 1128855636), (280862, 1128654572), (280862, 1139937029), (280862, 429036746), (280862, 429576381), (280862, 443264366), (280862, 2358092347), (280862, 2357012942), (280862, 2373704825), (280862, 2201343365), (280862, 2209057199), (280862, 2215225892), (280862, 372987968), (280862, 385473040), (280862, 1603566196), (280862, 1613280670), (280862, 1614281766), (280862, 1623364984), (280862, 172377859), (280862, 185306777), (280862, 267942018), (280862, 2839580707), (280862, 2844485290), (280862, 2845391423), (280862, 36459351), (280862, 40180071), (280862, 214815856), (280862, 218381590), (280862, 779627720), (280862, 788837479), (280862, 796723737), (280862, 802425527), (280862, 2304775305), (280862, 2314457834), (280862, 2339563661), (280862, 2338300334), (280862, 2642124476), (280862, 2652318187), (280862, 2679892082), (280862, 2043607768), (280862, 2056918125), (280862, 838759902), (280862, 838396870), (280862, 837898324), (280862, 922951041), (280862, 927190041), (280862, 2259173821), (280862, 2264841189), (280862, 2460190921), (280862, 2463622000), (280862, 1381019832), (280862, 1765201656), (280862, 1768499397), (280862, 2327547421), (280862, 2391395233), (280862, 670901657), (280862, 672365919), (280862, 684807023), (280862, 730553949), (280862, 743375024), (280862, 1906755767), (280862, 650741360), (280862, 692690208), (280862, 698045808), (280862, 1852091942), (280862, 1859495024), (280862, 1861341486), (280862, 1867554834), (280862, 4557498), (280862, 1956304251), (280862, 1967369720), (280862, 1975214121), (280862, 1976918308), (280862, 1784778936), (280862, 1812882271), (280862, 2506404062), (280862, 2521556515), (280862, 2524252375), (280862, 2529070602), (280862, 2527789606), (280862, 2529176065), (280862, 2532785557), (280862, 2444434784), (280862, 2471758467), (280862, 1827824719), (280862, 1000389632), (280862, 1000345540), (280862, 999253428), (280862, 1002714896), (280950, 9187792), (280950, 10573357), (280950, 15426066), (280950, 46269099), (280950, 2091805267), (280950, 2099319268), (280950, 31622797), (280950, 35168551), (280950, 43030101), (280950, 1940683396), (280950, 1941715174), (280950, 1947825900), (280950, 1952905345), (280950, 1956837999), (280950, 1959532130), (280950, 1961848279), (280950, 1962030557), (280950, 785219841), (280950, 1401071968), (280950, 1403064168), (280950, 2196490951), (280950, 2206078699), (280950, 2262474812), (280950, 2120041978), (280950, 2169421001), (280950, 2170277470), (280950, 2178144511), (280950, 2176782694), (280950, 918318666), (280950, 927134967), (280950, 933235833), (280950, 2013504605), (280950, 2018155443), (280950, 2021915036), (280950, 1448702144), (280950, 1453108272), (280950, 1455215108), (280950, 1462402856), (280950, 547970785), (280950, 1442542891), (280950, 2530424009), (280950, 1800383430), (280950, 2515838222), (280950, 2630916879), (280950, 514241981), (280950, 2676172703), (280950, 1896655511), (280950, 1980256960), (280950, 1042194167), (280950, 460922609), (280950, 460060389), (280950, 2759986721), (280950, 1206536739), (280950, 1224356812), (280950, 1226964877), (280950, 1229969147), (280950, 1194698193), (280950, 1196987667), (280950, 1197424102), (280950, 1196471523), (280950, 1201551663), (280950, 2040164846), (280950, 2073381890), (280950, 217010196), (280950, 216241130), (280950, 218544658), (280950, 224155340), (280950, 222576270), (280950, 1615760514), (280950, 1622709325), (280950, 1632852912), (280950, 1641044367), (280950, 2432357397), (280950, 2432380255), (280950, 2433659234), (280950, 2433504468), (280950, 2435858510), (280950, 2472439228), (280950, 202310071), (280950, 211275664), (280950, 686771187), (280950, 690085116), (280950, 699797332), (280950, 618585677), (280950, 2644770071), (280950, 2654921358), (280950, 2672582001), (280950, 896106167), (280950, 898463347), (280950, 900390575), (280950, 903717758), (280950, 903685949), (280950, 902188528), (280950, 597354230), (280950, 616443696), (280950, 620428396), (280950, 686770893), (280950, 769238391), (280950, 782960901), (280950, 780584805), (280950, 2698933738), (280950, 2725480045), (280950, 2727186545), (280950, 2727922757), (280950, 2730100018), (280950, 1203696268), (280950, 2668705330), (280950, 568573960), (280950, 592317107), (280950, 640631308), (280950, 871595251), (280950, 1853411342), (280950, 1854943843), (280950, 2459054882), (280950, 172546934), (280950, 178447971), (280950, 180731110), (280950, 1381143962), (280950, 1382719827), (280950, 1382286130), (280950, 1396600388), (280950, 1421139067), (280950, 1643886106), (280950, 1649847875), (280950, 1678561481), (280950, 1681380804), (280950, 1685958364), (280950, 2506702592), (280950, 2531013364), (280950, 2538022589), (280950, 2232143594), (280950, 2235724297), (280950, 2397100911), (280950, 2400091803), (280950, 55938289), (280950, 164293201), (280950, 164758887), (280950, 740419859), (280950, 748953982), (280950, 798503363), (280950, 1550678128), (280950, 1551141875), (280950, 1565132053), (280950, 1577685175), (280950, 415960293), (280950, 429105295), (280950, 432442865), (280950, 1255920926), (280950, 1279027199), (280950, 1314769620), (280950, 1318313104), (280950, 2182468282), (280950, 2185594221), (280950, 2193074722), (280950, 2212404870), (280950, 2215674158), (280950, 2223413389), (280950, 2225108144), (280950, 1245124618), (280950, 1243668726), (280950, 1252038712), (280950, 100994888), (280950, 2565448924), (280950, 2366568844), (280950, 2370482874), (280950, 2381837292), (280950, 2390299835), (280950, 779094582), (280950, 2608806073), (280950, 2611412637), (280950, 2465702865), (280950, 2490088451), (280950, 2578986171), (280950, 2581625840), (280950, 2586125413), (280950, 2588526174), (280950, 2588738299), (280950, 2305064763), (280950, 2302717073), (280950, 2309448731), (280950, 2309348064), (280950, 821399184), (280950, 2281920330), (280950, 2298973606), (280950, 1885824052), (280950, 390884024), (280950, 391290294), (280950, 394699644), (280950, 486908069), (280950, 486132085), (280950, 490595926), (280950, 305591552), (280950, 359989187), (280950, 402676873), (280950, 409635007), (280950, 150050882), (280950, 188005538), (280950, 188546090), (280950, 191857467), (280950, 198806467), (280950, 666853790), (280950, 678649811), (280950, 1331151907), (280950, 1334888408), (280950, 1340224942), (280950, 1340246351), (280950, 1341251784), (280950, 1345336268), (280950, 1344999325), (280950, 1368686209), (280950, 1369587334), (280950, 1379598532), (280950, 1381155620), (280950, 1747349975), (280950, 2151714800), (280950, 2153242888), (280950, 2165461918), (280950, 1089394105), (280950, 1092184227), (280950, 1098848585), (280950, 291471134), (280950, 291165699), (280950, 292388086), (280950, 339673226), (280950, 338862055), (280950, 342882783), (280950, 343500323), (280950, 348591802), (280950, 348996382), (280950, 2084970545), (280950, 1488177585), (280950, 1509611449), (280950, 1515974652), (280950, 1523070263), (280950, 1530576371), (280950, 1530681802), (280950, 1533824804), (280950, 1533777383), (280950, 1542907252), (280950, 1546548452), (280950, 942098275), (280950, 952307608), (280950, 955382378), (280950, 958077598), (280950, 958478251), (280950, 1348297776), (280950, 1351511901), (280950, 1819528064), (280950, 1823941983), (280950, 1826396540), (280950, 1829445299), (280950, 1835138534), (280950, 1839793045), (280950, 2409375600), (280950, 121388814), (280950, 129781940), (280950, 141286649), (280950, 2334399095), (280950, 2339120571), (280950, 2338464004), (280950, 2345395320), (280950, 2357744286), (280950, 1252934566), (280950, 1254642535), (280950, 1301373943), (280950, 514391868), (280950, 2558688824), (280950, 2570736613), (280950, 2572515614), (280950, 2591739883), (280950, 2590356712), (280950, 1106733176), (280950, 1115347484), (280950, 1121101659), (280950, 1136380420), (280950, 278954200), (280950, 1170998405), (280950, 1178038074), (280950, 1182566484), (280950, 2048105149), (280950, 2057177350), (280950, 2069061825), (280950, 1741224312), (280950, 1758566231), (280950, 2250737075), (280950, 2254483171), (280950, 2255300639), (280950, 841986149), (280950, 1304276175), (280950, 1858428247), (280950, 2553499282), (280950, 1138365575), (280950, 1143441355), (280950, 1148253879), (280950, 624173882), (280950, 626677314), (280950, 625909626), (280950, 630053485), (280950, 633265575), (280950, 631597106), (280950, 633550198), (280950, 714767325), (280950, 1441891656), (280950, 2708801908), (280950, 1212121970), (280950, 1215532849), (280950, 253357251), (280950, 1659042563), (280950, 1662876409), (280950, 1596439210), (280950, 1599492079), (280950, 1600645713), (280950, 1608476523), (280950, 1912550607), (280950, 1913498795), (280950, 1923586719), (280950, 1926123390), (280950, 1004275197), (280950, 1003968518), (280950, 1703331530), (280950, 1714222073), (280950, 1718175549), (280950, 1723617236), (280950, 1730950376), (280950, 1732502258), (280950, 57659816), (280950, 57339283), (280950, 68258663), (280950, 74728508), (280950, 79158940), (280950, 969962423), (280950, 975470051), (280950, 987998671), (280950, 988405369), (280950, 441058642), (280950, 441841561), (280950, 447892321), (280950, 450418617), (280950, 458532184), (280950, 471529575), (280950, 477724912), (280950, 1584828435), (280950, 1585333327), (280950, 1687866358), (280950, 1692308383), (280950, 1759796335), (280950, 1780363835), (280950, 1782406431), (280950, 1847266266), (280977, 365476451), (280977, 364189059), (280977, 378598000), (280977, 379847289), (280977, 384502784), (280977, 168219347), (280977, 170150834), (280977, 175265938), (280977, 260779171), (280977, 263358794), (280977, 262998198), (280977, 270748746), (280977, 308420144), (280977, 314744346), (280977, 313117914), (280977, 318579550), (280977, 323924193), (280977, 328004323), (280977, 651919378), (280977, 657069957), (280977, 687757675), (280977, 689418308), (280977, 690568203), (280977, 6454166), (280977, 291533608), (280977, 297919938), (280977, 522768282), (280977, 526225015), (280977, 525533660), (280977, 527183092), (280977, 538785640), (280977, 539021081), (280977, 575593408), (280977, 608429027), (280977, 617104047), (280977, 621060722), (280977, 224326637), (280977, 233906123), (280977, 560430540), (280977, 564988210), (280977, 395393455), (280977, 401165409), (280977, 405380990), (280977, 405911735), (280977, 406614162), (280977, 678795478), (280977, 634166393), (280977, 639503585), (280977, 208210784), (280977, 210689436), (280977, 216258743), (280977, 332039712), (280977, 336935310), (280977, 352487256), (280977, 153230677), (280977, 166250829), (280977, 66074774), (280977, 67127586), (280977, 76055636), (280977, 83852289), (280977, 412254450), (280977, 410086940), (280977, 414781074), (280977, 413178405), (280977, 448899856), (280977, 33743971), (280977, 454519437), (280977, 454676225), (280977, 457989478), (280977, 458331691), (280977, 460722996), (280977, 463704913), (280977, 483725490), (280977, 486034888), (280977, 491265322), (280977, 492901163), (280977, 493856576), (280977, 492987217), (280977, 112230533), (280977, 117017185), (280977, 121554458), (280977, 125364129), (280977, 128580510), (280977, 127087245), (280977, 133646013), (280977, 92772944), (280977, 141971410), (280977, 179538658), (280977, 190066310), (280977, 472641774), (280977, 387762143), (280977, 392312600), (280977, 392269655), (280977, 391564990), (281070, 192337253), (281070, 192416400), (281070, 242797712), (281070, 245696669), (281070, 231555092), (281070, 162773670), (281070, 38006893), (281070, 111059704), (281070, 117559049), (281070, 205031551), (281070, 208844055), (281070, 211244538), (281070, 211220593), (281070, 218253382), (281070, 47932856), (281070, 51835840), (281070, 222924259), (281070, 221759413), (281070, 221189065), (281070, 228367360), (281070, 131313504), (281070, 135752567), (281070, 135030279), (281070, 72656009), (281070, 78383468), (281070, 96376699), (281070, 97931771), (281070, 86943653), (281070, 137681597), (281070, 140381102), (281070, 142449920), (281070, 144465752), (281070, 171575804), (281070, 7736444), (281070, 14510533), (281070, 18259543), (281070, 15430442), (281070, 19309202), (281070, 19513374), (281070, 23385511), (281070, 23541950), (281070, 25470016), (281070, 65188443), (281070, 65714474), (281070, 67028285), (281074, 888484336), (281074, 273537729), (281074, 276212772), (281074, 280942138), (281074, 619507362), (281074, 630092935), (281074, 640436165), (281074, 645548959), (281074, 34808881), (281074, 325482124), (281074, 330318367), (281074, 366247814), (281074, 369538972), (281074, 381602704), (281074, 397184907), (281074, 406959623), (281074, 285329216), (281074, 360913395), (281074, 453544923), (281074, 459621542), (281074, 460050685), (281074, 465477012), (281074, 335421019), (281074, 339822511), (281074, 344811336), (281074, 414147451), (281074, 439321357), (281074, 840278119), (281074, 708549150), (281074, 718698674), (281074, 524711937), (281074, 535678391), (281074, 537148497), (281074, 550235441), (281074, 760541692), (281074, 760209243), (281074, 767516472), (281074, 769024585), (281074, 770721279), (281074, 779275957), (281074, 244683125), (281074, 244814916), (281074, 250761141), (281074, 141696082), (281074, 149311146), (281074, 154146117), (281074, 160561783), (281074, 552578557), (281074, 559889754), (281074, 570633644), (281074, 572602585), (281074, 577173612), (281074, 584363979), (281074, 597333283), (281074, 893176571), (281074, 892244664), (281074, 895550244), (281074, 113603384), (281074, 193168847), (281074, 197278677), (281074, 200411496), (281074, 200984217), (281074, 205670863), (281074, 206410720), (281074, 472895841), (281074, 579330928), (281074, 647383111), (281074, 650371446), (281074, 658452666), (281074, 664281861), (281074, 669697895), (281074, 669033136), (281074, 669198066), (281074, 129967617), (281074, 133959788), (281074, 136321117), (281074, 137479241), (281074, 218345823), (281074, 228988690), (281074, 238126522), (281074, 238540891), (281074, 789247969), (281074, 792747399), (281074, 794519565), (281074, 794631689), (281074, 797536535), (281074, 800188797), (281074, 303344684), (281074, 722474558), (281074, 722497656), (281074, 725579326), (281074, 729485499), (281074, 739848233), (281074, 744960772), (281074, 495225638), (281074, 482688754), (281074, 483413322), (281074, 480396575), (281074, 489869351), (281074, 821563734), (281074, 823917117), (281074, 824327382), (281074, 851911621), (281074, 58980774), (281074, 62062566), (281074, 66468550), (281074, 68234192), (281074, 265893479), (281074, 268485881), (281074, 3994271), (281074, 31061967), (281075, 1901934), (281075, 10768291), (281075, 18968296), (281075, 16705086), (281130, 316962841), (281130, 314158900), (281130, 303467992), (281130, 306513303), (281130, 151852403), (281130, 118932816), (281130, 122882407), (281130, 123838423), (281130, 141225843), (281130, 145368974), (281130, 210656037), (281130, 191798820), (281130, 196179651), (281130, 216584551), (281130, 217499609), (281130, 222954151), (281130, 244504707), (281130, 246734873), (281130, 393187507), (281130, 359568397), (281130, 366141086), (281130, 371919789), (281130, 46220569), (281130, 131823719), (281130, 281194765), (281130, 122990048), (281130, 160070069), (281130, 165438380), (281130, 173108140), (281130, 183086891), (281130, 183946265), (281130, 5428775), (281130, 28119213), (281130, 58308319), (281130, 286532535), (281130, 286251240), (281130, 294442485), (281130, 39252595), (281130, 62533604), (281130, 71034790), (281130, 398165520), (281130, 92892529), (281130, 104827700), (281143, 157595537), (281143, 333156839), (281143, 333619871), (281143, 347320050), (281143, 2761202471), (281143, 256754619), (281143, 2032281195), (281143, 2037877561), (281143, 1234798740), (281143, 1239163686), (281143, 1243066433), (281143, 1247808657), (281143, 1251899109), (281143, 1255678609), (281143, 1979316791), (281143, 2008822283), (281143, 951503985), (281143, 956153284), (281143, 3061612232), (281143, 3063409045), (281143, 3062680360), (281143, 3071698440), (281143, 3072038605), (281143, 806559205), (281143, 813593589), (281143, 2319301390), (281143, 3461810341), (281143, 3470210182), (281143, 3473567503), (281143, 205434538), (281143, 216658970), (281143, 215583292), (281143, 425370058), (281143, 2289348760), (281143, 2299002002), (281143, 2310641698), (281143, 1202495606), (281143, 1221726046), (281143, 2646382125), (281143, 2644875629), (281143, 2644618760), (281143, 2644347068), (281143, 1116332496), (281143, 1127155737), (281143, 1125402431), (281143, 1134122026), (281143, 1136070997), (281143, 2730733203), (281143, 2742489017), (281143, 2745879884), (281143, 2747109642), (281143, 585174740), (281143, 627857416), (281143, 1583607000), (281143, 3352377218), (281143, 3363067074), (281143, 3412975265), (281143, 3412354320), (281143, 3423020787), (281143, 840870609), (281143, 843593950), (281143, 850167655), (281143, 3905430950), (281143, 996119847), (281143, 1003063210), (281143, 1000046734), (281143, 1003652866), (281143, 1013707046), (281143, 1010848037), (281143, 1010430921), (281143, 1016637269), (281143, 1019820624), (281143, 2837116235), (281143, 2835623662), (281143, 2850328518), (281143, 1747460907), (281143, 1747688852), (281143, 1767844683), (281143, 1455827208), (281143, 1461169862), (281143, 1463881902), (281143, 1473882717), (281143, 1477019555), (281143, 1725686810), (281143, 1725822113), (281143, 1401955295), (281143, 1412262046), (281143, 1415285278), (281143, 1420115705), (281143, 1419347139), (281143, 1421363192), (281143, 623654255), (281143, 3595181463), (281143, 3602409437), (281143, 3601870538), (281143, 3609556274), (281143, 676867234), (281143, 678554447), (281143, 1492687951), (281143, 1518002588), (281143, 2246989491), (281143, 2252447406), (281143, 2270923360), (281143, 2077545436), (281143, 2083628985), (281143, 2106914318), (281143, 38105202), (281143, 55081438), (281143, 60845464), (281143, 57726921), (281143, 65061871), (281143, 1257144239), (281143, 1264564611), (281143, 1263737532), (281143, 2783687433), (281143, 2785643143), (281143, 2788666669), (281143, 2791888303), (281143, 2795422122), (281143, 2799707900), (281143, 1534777181), (281143, 1538080978), (281143, 1537115408), (281143, 1548229928), (281143, 1550903174), (281143, 1622204649), (281143, 1625307021), (281143, 1647435924), (281143, 1649806534), (281143, 2863691662), (281143, 2869448870), (281143, 2879063404), (281143, 2879132229), (281143, 2881423057), (281143, 2882934281), (281143, 2885269854), (281143, 2889163508), (281143, 2554623654), (281143, 2565211002), (281143, 3284741171), (281143, 3334235996), (281143, 3339428466), (281143, 3348951685), (281143, 2687920571), (281143, 2184506418), (281143, 4223756601), (281143, 4229645827), (281143, 143059276), (281143, 142287587), (281143, 141306090), (281143, 4152602640), (281143, 1788217665), (281143, 1790921846), (281143, 1791744222), (281143, 1802805812), (281143, 1802356894), (281143, 2341726799), (281143, 712697671), (281143, 302269251), (281143, 303376108), (281143, 304409387), (281143, 315328905), (281143, 317401697), (281143, 2451692247), (281143, 2457472381), (281143, 2471725123), (281143, 2471637185), (281143, 2066381892), (281143, 2066358496), (281143, 2073387720), (281143, 3248338144), (281143, 3254266012), (281143, 3263486956), (281143, 3267096980), (281143, 3274987680), (281143, 469895296), (281143, 473053691), (281143, 481896991), (281143, 867227854), (281143, 3570845149), (281143, 3700234654), (281143, 3705064006), (281143, 35980951), (281143, 185368900), (281143, 185558909), (281143, 3972163292), (281143, 3558718112), (281143, 3564724489), (281143, 3568326480), (281143, 3571861904), (281143, 882854121), (281143, 888231558), (281143, 1937194549), (281143, 1941898983), (281143, 1953807538), (281143, 1967829737), (281143, 3626709104), (281143, 735126205), (281143, 737825896), (281143, 741721313), (281143, 687713916), (281143, 690622746), (281143, 1874777712), (281143, 1883147330), (281143, 1891159931), (281143, 1060702981), (281143, 1081424334), (281143, 587915869), (281143, 590877447), (281143, 592547173), (281143, 593015307), (281143, 594103820), (281143, 598254838), (281143, 610397433), (281143, 3089558356), (281143, 3141145145), (281143, 3142150545), (281143, 3140353149), (281143, 3143500116), (281143, 3144815266), (281143, 3149260607), (281143, 1365468325), (281143, 1367516994), (281143, 1382914120), (281143, 1383973147), (281143, 1387266804), (281143, 1385973507), (281143, 2402048662), (281143, 2402067900), (281143, 2413902475), (281143, 2413959429), (281143, 2419397288), (281143, 1838274807), (281143, 1846413688), (281143, 1853436960), (281143, 1851750722), (281143, 1024296031), (281143, 2204340582), (281143, 2206945713), (281143, 2208801285), (281143, 2214581867), (281143, 3204740050), (281143, 3209039866), (281143, 3211528833), (281143, 2442716992), (281143, 504259125), (281143, 526827836), (281143, 3533048294), (281143, 3547406065), (281143, 152915185), (281143, 154608774), (281143, 156381922), (281143, 4196794118), (281143, 4205595171), (281143, 4208442399), (281143, 4213738161), (281143, 2983956191), (281143, 2985557102), (281143, 759027281), (281143, 761304834), (281143, 769368571), (281143, 778111761), (281143, 783679510), (281143, 782022651), (281143, 2478223815), (281143, 2495347223), (281143, 1081092273), (281143, 1093583895), (281143, 1109700494), (281143, 1109322409), (281143, 3295261786), (281143, 3307978769), (281143, 2945783255), (281143, 2951857003), (281143, 2952973606), (281143, 2968703933), (281143, 2976641388), (281143, 2977578156), (281143, 3096808706), (281143, 3123104163), (281143, 3753336078), (281143, 3758069083), (281143, 3763472525), (281143, 3785778424), (281143, 3428628298), (281143, 3428729768), (281143, 3435313396), (281143, 3445141280), (281143, 3446160451), (281143, 3456425420), (281143, 3458166225), (281143, 3456266623), (281143, 98702485), (281143, 107009256), (281143, 116605576), (281143, 117840018), (281143, 119047242), (281143, 437738114), (281143, 445959894), (281143, 449043103), (281143, 452944263), (281143, 454736249), (281143, 2702060967), (281143, 2709145254), (281143, 2710239244), (281143, 2712247657), (281143, 2715576586), (281143, 3046811437), (281143, 3047583327), (281143, 972514684), (281143, 981032119), (281143, 3814779570), (281143, 638826157), (281143, 649742776), (281143, 656846303), (281143, 661819091), (281143, 1568666882), (281143, 1580094041), (281143, 1688012722), (281143, 1700089887), (281143, 1706750974), (281143, 3166661545), (281143, 3223632514), (281143, 3230944477), (281143, 4072332515), (281143, 4084860737), (281143, 4084145884), (281143, 4096486712), (281143, 4095856169), (281143, 4101946684), (281143, 2108694354), (281143, 2111790854), (281143, 2120584830), (281143, 2132546579), (281143, 3372010167), (281143, 3801303010), (281143, 3801153977), (281143, 3808070823), (281143, 3811917914), (281143, 176303631), (281143, 184989418), (281143, 183031458), (281143, 265196423), (281143, 541672995), (281143, 542382512), (281143, 546198417), (281143, 546878667), (281143, 550833127), (281143, 2654323785), (281143, 2659469406), (281143, 2659630671), (281143, 1172403041), (281143, 1183838491), (281143, 3881496657), (281143, 3887796806), (281143, 3897305500), (281143, 3901054726), (281143, 1138789946), (281143, 1142412487), (281143, 1145384194), (281143, 1152447689), (281143, 1150105806), (281143, 1156000849), (281143, 1157422020), (281143, 1163277282), (281143, 3689572719), (281143, 3691241074), (281143, 3702412630), (281143, 3705826100), (281143, 3712828940), (281143, 3723702909), (281143, 280514869), (281143, 3010000753), (281143, 3018777947), (281143, 3512212480), (281143, 3516170502), (281143, 3520289068), (281143, 3525794265), (281143, 3678497429), (281143, 3680449961), (281143, 3751149759), (281143, 820823967), (281143, 830729691), (281143, 68656648), (281143, 77148174), (281143, 95193594), (281143, 93074616), (281143, 1896997077), (281143, 1904800650), (281143, 1912257707), (281143, 1917430690), (281143, 2931804457), (281143, 2991935317), (281143, 2996718205), (281143, 4037788178), (281143, 4038457975), (281143, 4045366719), (281143, 4048314793), (281143, 4052795248), (281143, 4053510388), (281143, 4051936651), (281143, 2050455506), (281143, 2060434996), (281143, 2229992476), (281143, 2239539990), (281143, 2576651931), (281143, 2584641333), (281143, 2586417263), (281143, 2584370048), (281143, 2598772901), (281143, 930207541), (281143, 1430806120), (281143, 1435246489), (281143, 1445827843), (281143, 1443984051), (281143, 1448418108), (281143, 497238709), (281143, 361030086), (281143, 362222246), (281143, 375548425), (281143, 322076796), (281143, 327939823), (281143, 330209440), (281143, 3181489347), (281143, 3185362500), (281143, 3185657411), (281143, 3190497661), (281143, 3200995243), (281143, 1808896031), (281143, 1812577312), (281143, 1812157791), (281143, 1032330697), (281143, 1041326703), (281143, 1057417818), (281143, 381820393), (281143, 395348181), (281143, 394617983), (281143, 401329985), (281143, 399121161), (281143, 397846921), (281143, 2150353112), (281143, 2160156197), (281143, 2164461832), (281143, 2165720688), (281143, 3919429582), (281143, 3932479759), (281143, 2756431), (281143, 11106510), (281143, 11050325), (281143, 25756691), (281143, 28144957), (281143, 1333449112), (281143, 1339005972), (281143, 1338366733), (281143, 721203231), (281143, 2043826073), (281143, 1982282379), (281143, 4009947724), (281143, 4179450299), (281143, 4187220539), (281143, 3950299722), (281143, 4023612212), (281143, 4028049269), (281143, 4031368686), (281143, 4127241917), (281143, 4140411189), (281143, 908671097), (281143, 914008100), (281143, 913495166), (281143, 918852184), (281143, 919220828), (281143, 2368205853), (281143, 2377009233), (281143, 2389832336), (281143, 2400245319), (281143, 3834775499), (281143, 3848924798), (281143, 3855738234), (281143, 3319954939), (281143, 3323639709), (281143, 227084758), (281143, 237116621), (281143, 240841256), (281143, 250997266), (281143, 2514319250), (281143, 2515072889), (281143, 2526203403), (281143, 2526938628), (281143, 3654995106), (281143, 3656926151), (281143, 3663007478), (281143, 3669937719), (281143, 3670518898), (281143, 3677939818), (281143, 2610880409), (281143, 2627156766), (281143, 2627322721), (281143, 2630747559), (281143, 2633581850), (281143, 288986712), (281143, 289469861), (281143, 293902396), (281143, 298413220), (281143, 1602346659), (281143, 1613154549), (281143, 1661088138), (281143, 1667082188), (281143, 1668638047), (281143, 1674983167), (281143, 1676949270), (281143, 1676671010), (281143, 1676999016), (281143, 1679177550), (281143, 3240089300), (281143, 4106098845), (281143, 4113697974), (281143, 4117256686), (281143, 4119363295), (281143, 1282591969), (281143, 1285789506), (281143, 1287074927), (281143, 2899261219), (281143, 2907127329), (281143, 2910948284), (281143, 2919579992), (281143, 2921247872), (281143, 1777076882), (281317, 32518025), (281317, 35402318), (281317, 410841126), (281317, 414490582), (281317, 418398611), (281317, 431245411), (281317, 394529793), (281317, 395792496), (281317, 397491850), (281317, 259973640), (281317, 145824965), (281317, 155818668), (281317, 363862383), (281317, 39330713), (281317, 47208018), (281317, 56434457), (281317, 60177362), (281317, 69074711), (281317, 322578241), (281317, 383138111), (281317, 160741254), (281317, 173020785), (281317, 171616660), (281317, 177421660), (281317, 192765043), (281317, 189952644), (281317, 7026550), (281317, 8185433), (281317, 7591136), (281317, 8661374), (281317, 15249375), (281317, 27265533), (281317, 292294684), (281317, 298825016), (281317, 305890084), (281317, 229039232), (281317, 234566222), (281317, 241415349), (281317, 242796222), (281317, 248264282), (281317, 251714859), (281317, 96214206), (281317, 227422336), (281317, 229567177), (281317, 274763899), (281317, 275688193), (281317, 278980962), (281317, 282530232), (281317, 332027659), (281317, 336102716), (281317, 347939257), (281317, 111927337), (281317, 115742920), (281317, 116599249), (281317, 120482530), (281317, 123680104), (281317, 129416389), (281317, 130455328), (281317, 136601838), (281317, 135648929), (281317, 138895774), (281385, 1166803573), (281385, 1169829490), (281385, 1179336499), (281385, 1403781898), (281385, 1404677260), (281385, 1408089491), (281385, 1409869505), (281385, 1413063128), (281385, 1417497573), (281385, 1425157474), (281385, 1428853992), (281385, 1388079518), (281385, 1917657899), (281385, 1492378778), (281385, 1491609265), (281385, 1502393604), (281385, 495747737), (281385, 501189070), (281385, 517461069), (281385, 574881507), (281385, 590696146), (281385, 605326260), (281385, 1540080460), (281385, 1549918738), (281385, 1556317449), (281385, 1557381290), (281385, 2140165087), (281385, 2153043496), (281385, 539913767), (281385, 543335546), (281385, 544383660), (281385, 545794434), (281385, 547027374), (281385, 552732304), (281385, 553059816), (281385, 552172327), (281385, 556037306), (281385, 553782387), (281385, 557340600), (281385, 560856414), (281385, 1856011992), (281385, 2115963135), (281385, 2129611655), (281385, 2133905081), (281385, 2176100628), (281385, 2178917324), (281385, 2179172162), (281385, 2182077711), (281385, 2184415713), (281385, 2183737175), (281385, 1328411487), (281385, 1333819359), (281385, 439346906), (281385, 445429273), (281385, 447527528), (281385, 704644469), (281385, 715418167), (281385, 721177433), (281385, 729057069), (281385, 734643796), (281385, 734249191), (281385, 737079227), (281385, 1741254183), (281385, 1745166456), (281385, 1744571536), (281385, 1747777200), (281385, 1761628323), (281385, 1761552493), (281385, 2039310342), (281385, 2038413098), (281385, 2042942686), (281385, 1697695625), (281385, 1698690641), (281385, 1700193361), (281385, 483238850), (281385, 489870078), (281385, 623305995), (281385, 629655981), (281385, 640513875), (281385, 641197422), (281385, 642656796), (281385, 1034954318), (281385, 1042651235), (281385, 1048545116), (281385, 1050926491), (281385, 1065164967), (281385, 1067898580), (281385, 1071998037), (281385, 1974985259), (281385, 1982535752), (281385, 1983462364), (281385, 1985849127), (281385, 1998285428), (281385, 2001825787), (281385, 1828865231), (281385, 1839338993), (281385, 1850931701), (281385, 528278767), (281385, 1467852201), (281385, 1471344634), (281385, 1475932184), (281385, 1528364261), (281385, 1531745150), (281385, 910181586), (281385, 911566493), (281385, 916280650), (281385, 923227825), (281385, 1918033635), (281385, 1091486360), (281385, 1507819072), (281385, 1512171947), (281385, 1514749613), (281385, 1514537924), (281385, 1575803953), (281385, 1581687082), (281385, 1605804623), (281385, 1613039197), (281385, 1122597203), (281385, 1124670577), (281385, 1134765913), (281385, 1147186602), (281385, 2008745132), (281385, 2010751381), (281385, 2013244918), (281385, 2015071288), (281385, 2017007784), (281385, 2021432069), (281385, 2032998684), (281385, 2032211331), (281385, 2035326933), (281385, 1184958970), (281385, 1200292642), (281385, 1208550872), (281385, 1073528150), (281385, 1001824746), (281385, 999491313), (281385, 1003009744), (281385, 1007146005), (281385, 1010573099), (281385, 1011263926), (281385, 1018432099), (281385, 1019184930), (281385, 1022747304), (281385, 1662615434), (281385, 1667987118), (281385, 1673993137), (281385, 1671994282), (281385, 1677164357), (281385, 1679241983), (281385, 1680724294), (281385, 1694144618), (281385, 963069256), (281385, 962516681), (281385, 965793898), (281385, 968674189), (281385, 975113633), (281385, 890140254), (281385, 894981872), (281385, 1661921906), (281385, 1028563565), (281385, 977766425), (281385, 980730781), (281385, 987336483), (281385, 990291653), (281385, 991989937), (281385, 989640726), (281385, 419813596), (281385, 425599496), (281385, 653516481), (281385, 870081375), (281385, 872077132), (281385, 1968876126), (281385, 1970719918), (281385, 1969115879), (281385, 1082740267), (281385, 1097785216), (281385, 1098207242), (281385, 1097530077), (281385, 1102044123), (281385, 1739962232), (281385, 825847190), (281385, 1941358448), (281385, 1940731451), (281385, 1947418685), (281385, 1956759197), (281385, 1956357890), (281385, 1256517836), (281385, 1214161516), (281385, 1217645604), (281385, 1794197259), (281385, 1803728783), (281385, 1801133887), (281385, 1809691076), (281385, 1622566040), (281385, 1622313659), (281385, 1623541543), (281385, 1626020598), (281385, 1651702198), (281385, 1350709903), (281385, 1352776810), (281385, 1357638537), (281385, 1369136090), (281385, 1382834411), (281385, 1156946546), (281385, 1156563153), (281385, 1714194557), (281385, 1715451942), (281385, 1721212809), (281385, 2084309371), (281385, 2096916097), (281385, 2099466381), (281385, 1434239234), (281385, 1432486123), (281385, 1433928160), (281385, 1440594116), (281385, 1453117941), (281385, 747799865), (281385, 1885455563), (281385, 1269983750), (281385, 1277281219), (281385, 1284596682), (281385, 1283350391), (281385, 1244384867), (281385, 1602882145), (281385, 930534379), (281385, 947299446), (281385, 1285523334), (281385, 1611650175), (281385, 1617754646), (281385, 797345264), (281385, 2200163602), (281385, 2206392910), (281385, 2204124322), (281385, 2208015440), (281385, 858309749), (281385, 857280222), (281385, 1822084888), (281411, 137947779), (281411, 151338255), (281411, 159844857), (281411, 160858710), (281411, 1898226718), (281411, 1898973049), (281411, 1917609981), (281411, 1877331539), (281411, 1884696854), (281411, 1886962280), (281411, 915533943), (281411, 38319417), (281411, 40536636), (281411, 38845323), (281411, 54152727), (281411, 410543375), (281411, 412792380), (281411, 416946572), (281411, 420642269), (281411, 426686043), (281411, 424158800), (281411, 426725072), (281411, 433328640), (281411, 1120344246), (281411, 1125139041), (281411, 1131825431), (281411, 617441193), (281411, 829522133), (281411, 830202183), (281411, 534856399), (281411, 537636170), (281411, 547867890), (281411, 547686532), (281411, 550654951), (281411, 392351854), (281411, 397225157), (281411, 396450611), (281411, 398205093), (281411, 403021648), (281411, 408315181), (281411, 432455402), (281411, 437744959), (281411, 436096458), (281411, 439242043), (281411, 442107985), (281411, 445209396), (281411, 454457098), (281411, 90526410), (281411, 2329082087), (281411, 2339000952), (281411, 2341013887), (281411, 2347420152), (281411, 2356127194), (281411, 1274956815), (281411, 1275858850), (281411, 1296200774), (281411, 1299729555), (281411, 1301827098), (281411, 1302436693), (281411, 1682241379), (281411, 1690031203), (281411, 569993507), (281411, 572870027), (281411, 571659871), (281411, 576600323), (281411, 577227389), (281411, 586206683), (281411, 2076944854), (281411, 2073929920), (281411, 2082828478), (281411, 2175425186), (281411, 2182090915), (281411, 2201577115), (281411, 1737729881), (281411, 1737776182), (281411, 1741683287), (281411, 1742791232), (281411, 1751875086), (281411, 1751467021), (281411, 949421112), (281411, 2089932835), (281411, 2095570578), (281411, 654855803), (281411, 652908327), (281411, 662778023), (281411, 663035212), (281411, 671026946), (281411, 677835239), (281411, 678571454), (281411, 679951483), (281411, 1402120349), (281411, 1401588869), (281411, 1407271725), (281411, 1424547033), (281411, 1426939915), (281411, 512291583), (281411, 514471989), (281411, 522686254), (281411, 522315907), (281411, 524682367), (281411, 121873192), (281411, 131739317), (281411, 128639106), (281411, 699184528), (281411, 704143866), (281411, 721936958), (281411, 1762519428), (281411, 1777039309), (281411, 1782989700), (281411, 1786384106), (281411, 9085842), (281411, 20872509), (281411, 25971095), (281411, 28521815), (281411, 26923907), (281411, 172233365), (281411, 189768272), (281411, 189700911), (281411, 1060612921), (281411, 1064636512), (281411, 1061264910), (281411, 1066043374), (281411, 1076509976), (281411, 1073518979), (281411, 561500432), (281411, 2269423696), (281411, 2274894478), (281411, 2281750497), (281411, 2464515149), (281411, 2475503986), (281411, 2492127680), (281411, 2508628457), (281411, 2509744902), (281411, 206916373), (281411, 208354805), (281411, 208256375), (281411, 624819143), (281411, 639105340), (281411, 638917378), (281411, 639300418), (281411, 640659994), (281411, 643404469), (281411, 644870515), (281411, 1429542022), (281411, 1444179270), (281411, 2295873390), (281411, 228499834), (281411, 238523563), (281411, 2372962450), (281411, 2377414339), (281411, 2381168931), (281411, 2383752692), (281411, 2387785755), (281411, 1639815238), (281411, 1642185274), (281411, 1643536629), (281411, 1654807440), (281411, 1660478022), (281411, 1667766524), (281411, 1664940957), (281411, 504936849), (281411, 505222624), (281411, 1989273463), (281411, 1996284623), (281411, 1999728749), (281411, 2002791029), (281411, 2004911940), (281411, 2008535736), (281411, 2012947340), (281411, 298059912), (281411, 298725986), (281411, 301170660), (281411, 300890468), (281411, 304076788), (281411, 301686448), (281411, 307114673), (281411, 319951976), (281411, 920780273), (281411, 922917599), (281411, 924946371), (281411, 923092694), (281411, 927837765), (281411, 930378675), (281411, 930910410), (281411, 933994108), (281411, 936788463), (281411, 938507929), (281411, 944256998), (281411, 1161386513), (281411, 1802322833), (281411, 1804250261), (281411, 1804350243), (281411, 1811086894), (281411, 1813089653), (281411, 1821189740), (281411, 1623071773), (281411, 1623484350), (281411, 1625158423), (281411, 1631335719), (281411, 1918924707), (281411, 1923983984), (281411, 1930699915), (281411, 1936331234), (281411, 2015258715), (281411, 956291541), (281411, 959924897), (281411, 967047746), (281411, 980370277), (281411, 982981644), (281411, 460519601), (281411, 1023709332), (281411, 1024744798), (281411, 1043963279), (281411, 1046449998), (281411, 366889605), (281411, 369846251), (281411, 371306667), (281411, 382504714), (281411, 1336498299), (281411, 1350658011), (281411, 323089751), (281411, 327108674), (281411, 325868535), (281411, 327896142), (281411, 336871930), (281411, 337278310), (281411, 339637663), (281411, 2054325875), (281411, 2058285734), (281411, 2063682603), (281411, 2067356902), (281411, 2073235988), (281411, 2124774364), (281411, 2127732713), (281411, 2131611852), (281411, 2134569102), (281411, 735346718), (281411, 736125997), (281411, 743800219), (281411, 744889899), (281411, 256276592), (281411, 263416623), (281411, 263999789), (281411, 1553496398), (281411, 1570452113), (281411, 1569537841), (281411, 2244180012), (281411, 2265506376), (281411, 2421142016), (281411, 2433070377), (281411, 2442759932), (281411, 1370693637), (281411, 1377733038), (281411, 1379425170), (281411, 1380185764), (281411, 1381009217), (281411, 1386861205), (281411, 1389343074), (281411, 1393369239), (281411, 1826713256), (281411, 1826130829), (281411, 1837498611), (281411, 1840276080), (281411, 1843418919), (281411, 1203280503), (281411, 1213732411), (281411, 1218153332), (281411, 1230249461), (281411, 2517933330), (281411, 2523860792), (281411, 2527931236), (281411, 2536166240), (281411, 1962858529), (281411, 1962612569), (281411, 1973067398), (281411, 1983755088), (281411, 1470336291), (281411, 1481285252), (281411, 484332137), (281411, 486586484), (281411, 489403072), (281411, 489685439), (281411, 490490640), (281411, 493434821), (281411, 499851606), (281411, 502528289), (281411, 502195101), (281411, 1088393891), (281411, 1088736682), (281411, 1096407143), (281411, 1105359643), (281411, 1103884353), (281411, 1107878825), (281411, 1110838324), (281411, 2541722927), (281411, 2547903479), (281411, 2554760257), (281411, 1598185829), (281411, 1598703739), (281411, 66704854), (281411, 111828957), (281411, 267687679), (281411, 270520861), (281411, 271888559), (281411, 276782551), (281411, 278641857), (281411, 282497094), (281411, 288056813), (281411, 2210087467), (281411, 2230056977), (281411, 1502470070), (281411, 1506284529), (281411, 1507999446), (281411, 1511142338), (281411, 354859965), (281411, 362754527), (281411, 365434952), (281411, 363728210), (281411, 1523363845), (281411, 1528931922), (281411, 1540682207), (281411, 1707440174), (281411, 1707727906), (281411, 1713788480), (281411, 1716158228), (281411, 1715064431), (281411, 1717372051), (281411, 1718963830), (281411, 1719854126), (281411, 1727728457), (281411, 1301887021), (281411, 1303181507), (281411, 1308148385), (281411, 1322682565), (281411, 1326195379), (281411, 2388472707), (281411, 2398070546), (281411, 2410535535), (281411, 2415712821), (281411, 2413956907), (281411, 2141794107), (281411, 2171142496), (281411, 1238440672), (281411, 1248094002), (281411, 1246262900), (281411, 1257009156), (281411, 1255434196), (281411, 1265086457), (281411, 593147924), (281411, 612822411), (281411, 615088109), (281411, 994006798), (281411, 995922398), (281411, 1002678075), (281411, 1003043229), (281411, 1008954784), (281411, 1011309099), (281411, 692671354), (281411, 1175343312), (281411, 1179230017), (281411, 1178102591), (281411, 1181673278), (281411, 1181834093), (281411, 1183385738), (281411, 1195121856), (281411, 2014996510), (281411, 2014878068), (281411, 2024353197), (281411, 2027208695), (281411, 2029522374), (281411, 2030114830), (281411, 2035915455), (282631, 164145147), (282631, 172636144), (282631, 172152699), (282631, 174434844), (282631, 179928046), (282631, 183230456), (282631, 523659965), (282631, 524175880), (282631, 526307054), (282631, 528525381), (282631, 532426345), (282631, 534692956), (282631, 140457108), (282631, 72394287), (282631, 79322921), (282631, 87687843), (282631, 457133688), (282631, 464432582), (282631, 464840905), (282631, 48431519), (282631, 54105578), (282631, 57793888), (282631, 13691678), (282631, 23420702), (282631, 22244749), (282631, 25360542), (282631, 31817306), (282631, 66831383), (282631, 105030383), (282631, 107770511), (282631, 114199554), (282631, 113605190), (282631, 116129552), (282631, 199067188), (282631, 200972369), (282631, 204448318), (282631, 208368489), (282631, 287220382), (282631, 288771130), (282631, 300466818), (282631, 181190985), (282631, 189604314), (282631, 316847565), (282631, 329158325), (282631, 223143649), (282631, 226372046), (282631, 236561993), (282631, 241403014), (282631, 243709095), (282631, 247027686), (282631, 247686013), (282631, 103605080), (282631, 406209206), (282631, 414785039), (282631, 414343446), (282631, 419290818), (282631, 425722136), (282631, 429717615), (282631, 481796677), (282631, 344823384), (282631, 350091474), (282631, 349401847), (282631, 353204333), (282631, 435233292), (282631, 440803772), (282631, 443850796), (282631, 478142100), (282631, 338236152), (282631, 340084300), (282631, 360771635), (282631, 375906112), (282631, 498994058), (282631, 507875751), (282712, 281503239), (282712, 286434708), (282712, 88319302), (282712, 88866193), (282712, 92985689), (282712, 100280934), (282712, 102382789), (282712, 107153133), (282712, 109273376), (282712, 108657057), (282712, 116068553), (282712, 1013927163), (282712, 1019120311), (282712, 1026923892), (282712, 449799817), (282712, 455154639), (282712, 453301508), (282712, 479965646), (282712, 1591686909), (282712, 1616587791), (282712, 514291356), (282712, 239459900), (282712, 7885361), (282712, 14042241), (282712, 117297847), (282712, 119169907), (282712, 1250511769), (282712, 1255031765), (282712, 1258916908), (282712, 1265229947), (282712, 301751957), (282712, 303004392), (282712, 307309098), (282712, 345601072), (282712, 346112488), (282712, 812877298), (282712, 830369607), (282712, 837625008), (282712, 1140248495), (282712, 695773453), (282712, 709436355), (282712, 615082015), (282712, 794729112), (282712, 794950039), (282712, 1453337605), (282712, 1451969787), (282712, 1456770956), (282712, 1458706470), (282712, 1463869951), (282712, 1471463602), (282712, 1473372122), (282712, 1477668749), (282712, 38660565), (282712, 45320617), (282712, 45694035), (282712, 790734487), (282712, 798638754), (282712, 802746378), (282712, 806690932), (282712, 807698273), (282712, 769738952), (282712, 768263543), (282712, 466717584), (282712, 215316272), (282712, 1203789614), (282712, 1215039466), (282712, 1219471579), (282712, 1222956523), (282712, 128715187), (282712, 134141735), (282712, 135343271), (282712, 138539853), (282712, 139101984), (282712, 138973686), (282712, 63856919), (282712, 65533295), (282712, 70492518), (282712, 75489278), (282712, 74120086), (282712, 632336039), (282712, 638093613), (282712, 649946548), (282712, 914892035), (282712, 922692047), (282712, 927687869), (282712, 926015329), (282712, 1485446237), (282712, 1514444547), (282712, 1522069277), (282712, 359158896), (282712, 360337972), (282712, 372430062), (282712, 743204098), (282712, 747377098), (282712, 748038550), (282712, 269148113), (282712, 270681847), (282712, 271566281), (282712, 276161360), (282712, 278926535), (282712, 282058736), (282712, 287565611), (282712, 289265632), (282712, 289715928), (282712, 309362408), (282712, 325490901), (282712, 1083077939), (282712, 1091658790), (282712, 89225285), (282712, 418966250), (282712, 429731165), (282712, 437430600), (282712, 338036190), (282712, 1328858563), (282712, 1369307982), (282712, 1374704448), (282712, 1379018645), (282712, 1385936630), (282712, 402220110), (282712, 489228759), (282712, 495840062), (282712, 496800748), (282712, 1442423427), (282712, 1445872111), (282712, 1446643220), (282712, 1449701487), (282712, 1449065783), (282712, 555857703), (282712, 577598305), (282712, 845473343), (282712, 845627908), (282712, 851839315), (282712, 854964652), (282712, 937575447), (282712, 941456314), (282712, 956229444), (282712, 971260457), (282712, 1688405539), (282712, 1689695945), (282712, 1701662423), (282712, 1702472198), (282712, 1179943863), (282712, 1184281103), (282712, 1190782484), (282712, 1191798010), (282712, 528390450), (282712, 533218350), (282712, 538918442), (282712, 537386367), (282712, 673829644), (282712, 675404714), (282712, 675214565), (282712, 675327498), (282712, 676034846), (282712, 682515221), (282712, 685348605), (282712, 1120936199), (282712, 1657341999), (282712, 1662966956), (282712, 1662022616), (282712, 865247513), (282712, 867974903), (282712, 875838618), (282712, 878291731), (282712, 881617396), (282712, 25908370), (282712, 27319310), (282712, 29878572), (282712, 585480051), (282712, 582591255), (282712, 586909199), (282712, 601035211), (282712, 1363519019), (282712, 1363469522), (282712, 155594944), (282712, 164150731), (282712, 169949251), (282712, 179646546), (282712, 177952632), (282712, 180667539), (282712, 966481555), (282712, 987951300), (282712, 987892137), (282712, 992669933), (282712, 1036581793), (282712, 1035806227), (282712, 1037328879), (282712, 1048897072), (282712, 1045259557), (282712, 1055128234), (282712, 1056418297), (282712, 1059587994), (282712, 1062474835), (282712, 1066204788), (282712, 1154811079), (282712, 1162143477), (282712, 1169114059), (282712, 1167190380), (282712, 1174090853), (282712, 1178575044), (282712, 376269137), (282712, 380679836), (282712, 387667239), (282712, 395429988), (282712, 567388425), (282712, 645142748), (282712, 247223028), (282712, 257696585), (282712, 261095829), (282712, 266015717), (282712, 267801783), (282712, 1400405523), (282712, 1413840599), (282712, 1421477395), (282712, 1421547094), (282712, 684946496), (282712, 737373695), (282712, 744238898), (282712, 1345610885), (282712, 1357056666), (282712, 658152214), (282712, 151343646), (282712, 228154044), (282712, 229460118), (282712, 1280062625), (282712, 1280421338), (282712, 1617021782), (282712, 1634019125), (282712, 1639755171), (282712, 1645394184), (282712, 1647118432), (282712, 183071675), (282712, 183824040), (282712, 1232413675), (282712, 1234507659), (282712, 1238950355), (282712, 1242440883), (282712, 202492892), (282712, 212041168), (282712, 213280350), (282712, 1566723774), (282712, 1576865231), (282712, 1301866112), (282712, 1303987841), (282712, 1309702397), (282712, 1322701344), (282712, 1522431536), (282712, 1529576228), (282712, 1538987376), (282712, 1554186064), (282784, 214990654), (282784, 186669593), (282784, 190115226), (282784, 192328893), (282784, 198450167), (282784, 201009003), (282784, 199693025), (282784, 205139952), (282784, 210950615), (282784, 212502657), (282992, 1369468980), (282992, 1384541083), (282992, 1490332461), (282992, 1488281007), (282992, 1503888366), (282992, 1512288755), (282992, 1519961330), (282992, 1487289827), (282992, 1688369842), (282992, 1694560400), (282992, 1697233400), (282992, 1699794724), (282992, 1703028820), (282992, 1703479842), (282992, 1710868796), (282992, 1815708714), (282992, 1821291048), (282992, 1825141642), (282992, 1824915980), (282992, 1677932827), (282992, 1676444247), (282992, 1684323682), (282992, 1833331320), (282992, 1837202715), (282992, 1839748999), (282992, 86800076), (282992, 94469874), (282992, 99310122), (282992, 105401527), (282992, 118338605), (282992, 834609128), (282992, 842107496), (282992, 859364748), (282992, 156139420), (282992, 154177383), (282992, 162471403), (282992, 167632681), (282992, 172265484), (282992, 351580395), (282992, 371192926), (282992, 379626357), (282992, 378563244), (282992, 1108365502), (282992, 1028923119), (282992, 1033296444), (282992, 1037058205), (282992, 1042589043), (282992, 620757647), (282992, 627993366), (282992, 636346167), (282992, 637542203), (282992, 303902811), (282992, 528200428), (282992, 553940478), (282992, 703509169), (282992, 703648166), (282992, 708366977), (282992, 710507315), (282992, 709048911), (282992, 710471116), (282992, 713984794), (282992, 712131398), (282992, 721765977), (282992, 723044147), (282992, 724740770), (282992, 731376548), (282992, 733153192), (282992, 74028032), (282992, 948226460), (282992, 956957137), (282992, 956337043), (282992, 966193126), (282992, 969659490), (282992, 969956701), (282992, 1580650260), (282992, 1588974554), (282992, 2057118256), (282992, 941783114), (282992, 1887494624), (282992, 1893242089), (282992, 1898092758), (282992, 1899072635), (282992, 1914503524), (282992, 1266369114), (282992, 1270173928), (282992, 1289991550), (282992, 1295117616), (282992, 696421227), (282992, 602780333), (282992, 610181314), (282992, 612578585), (282992, 614861689), (282992, 189048096), (282992, 788265646), (282992, 1856028682), (282992, 1859992654), (282992, 1859348300), (282992, 1863556838), (282992, 1863087351), (282992, 1872531805), (282992, 1873480399), (282992, 1878042450), (282992, 245666044), (282992, 250165465), (282992, 262077444), (282992, 1636579531), (282992, 1640383529), (282992, 1641252236), (282992, 1652213186), (282992, 1658189811), (282992, 1659187722), (282992, 1662461275), (282992, 1666559306), (282992, 866104136), (282992, 876204178), (282992, 878535487), (282992, 887625285), (282992, 343422334), (282992, 344362973), (282992, 346932440), (282992, 619486735), (282992, 1230041483), (282992, 1240462701), (282992, 1250741850), (282992, 1187597163), (282992, 1152515775), (282992, 1158826398), (282992, 1161161836), (282992, 559048523), (282992, 1095486584), (282992, 1101508812), (282992, 437236161), (282992, 445313545), (282992, 1193506553), (282992, 1204082141), (282992, 1225028371), (282992, 1786706653), (282992, 1796268256), (282992, 1798188652), (282992, 907134588), (282992, 909855422), (282992, 917937031), (282992, 1441602093), (282992, 1542328364), (282992, 1778608809), (282992, 860715296), (282992, 864346080), (282992, 867287651), (282992, 120877521), (282992, 227843463), (282992, 232389139), (282992, 316346808), (282992, 318543518), (282992, 322487299), (282992, 340103616), (282992, 1987380229), (282992, 1993811040), (282992, 1998841988), (282992, 2003118036), (282992, 2009327605), (282992, 2009882343), (282992, 2014033155), (282992, 675779717), (282992, 680401496), (282992, 680401677), (282992, 681640257), (282992, 684177504), (282992, 686320809), (282992, 690149979), (282992, 33082249), (282992, 130497780), (282992, 149646511), (282992, 499645985), (282992, 506220530), (282992, 503698882), (282992, 508751263), (282992, 983189140), (282992, 983212343), (282992, 985489420), (282992, 991760279), (282992, 991920605), (282992, 997407124), (282992, 1004735019), (282992, 1556496187), (282992, 1558852819), (282992, 1566512813), (282992, 1567867313), (282992, 1575275403), (282992, 1576403301), (282992, 560710255), (282992, 564635153), (282992, 576169719), (282992, 576038965), (282992, 1744423827), (282992, 1750290008), (282992, 1764221550), (282992, 1767287806), (282992, 1770620825), (282992, 1170319725), (282992, 1174962492), (282992, 902305658), (282992, 1121688638), (282992, 1125786066), (282992, 1130386322), (282992, 1137689537), (282992, 1147014465), (282992, 589569963), (282992, 595748111), (282992, 1590081674), (282992, 1593109055), (282992, 1600857751), (282992, 1603607155), (282992, 1609087998), (282992, 1614450082), (282992, 395679384), (282992, 399887047), (282992, 406047446), (282992, 402843592), (282992, 406100830), (282992, 415397114), (282992, 419057119), (282992, 418462677), (282992, 797628482), (282992, 808180777), (282992, 809857909), (282992, 2024251316), (282992, 2027115584), (282992, 2034516914), (282992, 2037315874), (282992, 2038612523), (282992, 2045674360), (282992, 2049630608), (282992, 462841266), (282992, 473764450), (282992, 482902372), (282992, 1344358957), (282992, 1345599765), (282992, 58084171), (282992, 61106243), (282992, 932190055), (282992, 929965989), (282992, 934679987), (282992, 277126723), (282992, 279720069), (282992, 277933972), (282992, 287893949), (282992, 295195884), (282992, 1059179264), (282992, 1059366283), (282992, 1064382267), (282992, 1716174230), (282992, 1522571756), (282992, 1525513618), (282992, 1525692773), (282992, 1529571099), (282992, 1450847850), (282992, 1456164393), (282992, 1754460), (282992, 3869674), (282992, 9614057), (282992, 13874393), (282992, 1393055058), (282992, 1397792638), (282992, 1397487166), (282992, 1402934344), (282992, 1411488371), (282992, 1415188041), (282992, 1420929731), (282992, 1227658113), (282992, 1307053624), (282992, 1939951520), (282992, 1950010036), (282992, 1961511934), (282992, 197789704), (282992, 198076477), (282992, 196052754), (282992, 200902747), (282992, 204329774), (282992, 220678674), (282992, 1614318414), (282992, 1624075976), (282992, 1626065956), (282992, 1627250791), (282992, 1633247809), (282992, 1631070459), (282992, 1632260828), (282992, 1785055939), (282992, 2069018885), (282992, 748987174), (282992, 746940214), (282992, 750601558), (282992, 753205069), (282992, 757041740), (282992, 773301112), (283074, 413962421), (283074, 646013336), (283074, 650629004), (283074, 654947848), (283074, 669849879), (283074, 668368900), (283074, 125393055), (283074, 35092814), (283074, 58796804), (283074, 60034698), (283074, 64083335), (283074, 852156132), (283074, 855503794), (283074, 857774819), (283074, 859603837), (283074, 869146271), (283074, 443223995), (283074, 457800440), (283074, 462039488), (283074, 467035898), (283074, 171948160), (283074, 171514785), (283074, 177208813), (283074, 180793725), (283074, 178404694), (283074, 181925388), (283074, 203366813), (283074, 982240747), (283074, 730567567), (283074, 737010345), (283074, 885060386), (283074, 892431376), (283074, 908334404), (283074, 914310650), (283074, 923121020), (283074, 922310719), (283074, 407586874), (283074, 431306664), (283074, 433649415), (283074, 242750003), (283074, 247079410), (283074, 519196350), (283074, 521143241), (283074, 528440854), (283074, 532569046), (283074, 340999735), (283074, 343509910), (283074, 482123898), (283074, 498062067), (283074, 349663342), (283074, 346793587), (283074, 824011492), (283074, 830863121), (283074, 844175588), (283074, 843152720), (283074, 149881125), (283074, 151747353), (283074, 236243179), (283074, 297881234), (283074, 302229066), (283074, 302410366), (283074, 301291543), (283074, 3232598), (283074, 19142224), (283074, 108608961), (283074, 118196938), (283074, 254543909), (283074, 394026334), (283074, 397204580), (283074, 416583891), (283074, 432311874), (283074, 431136905), (283074, 173465640), (283074, 622740088), (283074, 909917370), (283074, 87529457), (283074, 84989916), (283074, 752929218), (283074, 800821491), (283074, 808557274), (283074, 810573999), (283074, 77480842), (283074, 79556274), (283074, 83326275), (283074, 85629156), (283074, 92028977), (283074, 22186194), (283074, 27059898), (283074, 572851277), (283074, 593984818), (283074, 593259555), (283074, 603009893), (283074, 608371529), (283074, 615339862), (283074, 632894283), (283074, 170112725), (283074, 537612567), (283074, 539762853), (283074, 500072422), (283074, 512174529), (283074, 562409932), (283074, 310356627), (283074, 369753747), (283074, 377307282), (283074, 1012699693), (283074, 1015196526), (283074, 699588484), (283074, 705700940), (283074, 711679453), (283074, 959195913), (283074, 957045172), (283074, 965402006), (283074, 966620502), (283074, 261307649), (283074, 264687684), (283074, 262069609), (283074, 265477195), (283074, 265311981), (283074, 275360017), (283074, 277300892), (283074, 279910138), (283074, 785412612), (283074, 793663598), (283074, 792304498), (283074, 386056127), (283074, 390669110), (283074, 392802805), (283074, 188467611), (283074, 190702979), (283155, 255415335), (283155, 375332043), (283155, 372987828), (283155, 378054182), (283155, 390431257), (283155, 411870342), (283155, 31961439), (283155, 29825428), (283155, 66830298), (283155, 74220812), (283155, 78463673), (283155, 80000034), (283155, 81231352), (283155, 82108929), (283155, 455612776), (283155, 464364209), (283155, 466591493), (283155, 251325493), (283155, 265780702), (283155, 265392746), (283155, 60335975), (283155, 63431180), (283155, 65031520), (283155, 339776290), (283155, 351448942), (283155, 353690469), (283155, 404129905), (283155, 407734955), (283155, 2434826), (283155, 12593978), (283155, 13516481), (283155, 15581545), (283155, 19157358), (283155, 22059563), (283155, 25103385), (283155, 514586471), (283155, 210202168), (283155, 223342059), (283155, 226138675), (283155, 225543919), (283155, 326599941), (283155, 334276112), (283155, 353041192), (283155, 357697338), (283155, 127414098), (283155, 269547021), (283155, 278387638), (283155, 281383602), (283155, 482701672), (283155, 495422653), (283155, 497751094), (283155, 173310297), (283155, 179959945), (283155, 192055255), (283155, 235609940), (283155, 245767391), (283155, 411623221), (283155, 416341368), (283155, 424910220), (283155, 431784196), (283155, 441773001), (283155, 298057100), (283155, 302125674), (283155, 311379775), (283155, 35030390), (283155, 43072717), (283155, 51971999), (283155, 211406580), (283155, 92191386), (283155, 94001150), (283155, 93208800), (283155, 137685525), (283155, 141439776), (283155, 145900642), (283155, 145535911), (283155, 145537315), (283155, 150613654), (283155, 153803009), (283155, 157555819), (283155, 155743540), (283155, 159332962), (283155, 196063676), (283270, 33294235), (283270, 36192261), (283270, 59321623), (283270, 58058012), (283270, 1820228), (283270, 4498654), (283270, 3617124), (283270, 6598496), (283270, 9906075), (283270, 12351943), (283270, 137056290), (283270, 144679678), (283270, 143022586), (283270, 144968888), (283270, 100376419), (283270, 102016811), (283270, 102735375), (283270, 187178678), (283270, 194896126), (283270, 122793824), (283270, 127780643), (283270, 132087804), (283270, 198632194), (283270, 200259063), (283270, 151920098), (283270, 149356594), (283270, 164944045), (283270, 168684140), (283270, 169574492), (283270, 168198551), (283270, 90191285), (283270, 90877228), (283270, 92847189), (283270, 92446332), (283270, 60312914), (283270, 65323314), (283270, 66654094), (283270, 177425604), (283270, 186523400), (283270, 187582241), (283270, 196284164), (283270, 22527357), (283270, 24693622), (283270, 33253502), (283270, 77688725), (283270, 79011437), (283270, 83039711), (283429, 1568219006), (283429, 619115370), (283429, 625818835), (283429, 630689310), (283429, 632240653), (283429, 636723935), (283429, 641297584), (283429, 97700639), (283429, 110931576), (283429, 108211614), (283429, 109939007), (283429, 112927238), (283429, 115655026), (283429, 244485841), (283429, 247006731), (283429, 247340541), (283429, 250729503), (283429, 130985192), (283429, 136074718), (283429, 152898599), (283429, 1610875741), (283429, 1630687495), (283429, 493306414), (283429, 500716570), (283429, 1739935191), (283429, 1748348130), (283429, 1760812562), (283429, 3154832141), (283429, 3163370499), (283429, 3166626130), (283429, 432308390), (283429, 438987055), (283429, 453007110), (283429, 452746668), (283429, 4287180121), (283429, 4289714320), (283429, 4303772153), (283429, 4308246034), (283429, 3984249254), (283429, 3992442565), (283429, 4002305370), (283429, 3201252170), (283429, 3206252045), (283429, 3211497408), (283429, 3214499570), (283429, 779193563), (283429, 789613734), (283429, 791578685), (283429, 791560253), (283429, 793497821), (283429, 975012959), (283429, 985822987), (283429, 994827429), (283429, 889160859), (283429, 930426329), (283429, 931856983), (283429, 946405503), (283429, 959435798), (283429, 961840220), (283429, 962030017), (283429, 2565172596), (283429, 2566373514), (283429, 2570815020), (283429, 1092410746), (283429, 3832416470), (283429, 3832095668), (283429, 3834350993), (283429, 3835111780), (283429, 3834325054), (283429, 3843068920), (283429, 3846943720), (283429, 3844826725), (283429, 3850130737), (283429, 3854984852), (283429, 3899905144), (283429, 3902255541), (283429, 3902406164), (283429, 3903956539), (283429, 3910264546), (283429, 919575980), (283429, 927166860), (283429, 1138765052), (283429, 1142429272), (283429, 1146786562), (283429, 1148515735), (283429, 4319779759), (283429, 3250899224), (283429, 3262843742), (283429, 2965553285), (283429, 2977648409), (283429, 2980144403), (283429, 2983755714), (283429, 3045583763), (283429, 191432685), (283429, 203409887), (283429, 205793440), (283429, 203941339), (283429, 2041283869), (283429, 2050026896), (283429, 2054795990), (283429, 2063988991), (283429, 2067288657), (283429, 2071331679), (283429, 2077565655), (283429, 3658909047), (283429, 3658563341), (283429, 1854549429), (283429, 710988344), (283429, 715251126), (283429, 726764622), (283429, 759171954), (283429, 764356472), (283429, 765851778), (283429, 767728949), (283429, 771439619), (283429, 769829729), (283429, 4025323188), (283429, 4024244068), (283429, 4029368436), (283429, 4040229899), (283429, 4041097666), (283429, 4040389161), (283429, 3720369363), (283429, 3858160171), (283429, 3856484892), (283429, 3862943273), (283429, 3874003074), (283429, 3880790472), (283429, 4376574550), (283429, 4382553006), (283429, 3617300603), (283429, 4051947625), (283429, 4064107769), (283429, 4062204931), (283429, 4065520608), (283429, 4067188391), (283429, 4072878367), (283429, 4076825505), (283429, 4081293443), (283429, 3460567151), (283429, 3462075389), (283429, 3465467335), (283429, 3468422260), (283429, 3472653911), (283429, 3475164236), (283429, 29863443), (283429, 36912675), (283429, 558569517), (283429, 570456916), (283429, 567782100), (283429, 3775156959), (283429, 3777512506), (283429, 3789189626), (283429, 1691485510), (283429, 1701962439), (283429, 1705665608), (283429, 167359932), (283429, 165676008), (283429, 172673772), (283429, 1497078368), (283429, 1497461720), (283429, 1499296873), (283429, 3368399226), (283429, 3369511102), (283429, 3370455364), (283429, 3377644708), (283429, 3380450858), (283429, 3389047231), (283429, 3390071769), (283429, 3091100277), (283429, 3099868561), (283429, 3108629569), (283429, 3113014176), (283429, 3113073679), (283429, 2589713617), (283429, 2596702142), (283429, 2602444722), (283429, 2602098431), (283429, 2600529493), (283429, 2606581332), (283429, 2712151929), (283429, 2715080532), (283429, 2719123793), (283429, 2721256348), (283429, 2724216377), (283429, 2725514909), (283429, 2798374229), (283429, 2134419828), (283429, 2149066396), (283429, 2154109300), (283429, 2158705712), (283429, 2170931364), (283429, 1411251880), (283429, 1960933562), (283429, 1973709523), (283429, 1974079176), (283429, 296045908), (283429, 296357193), (283429, 297523875), (283429, 301525545), (283429, 302105104), (283429, 305746143), (283429, 305493606), (283429, 3275801214), (283429, 3278435582), (283429, 3299159541), (283429, 1001056843), (283429, 1018867418), (283429, 1024295603), (283429, 1032296511), (283429, 214343518), (283429, 226772014), (283429, 361253582), (283429, 363078983), (283429, 367517457), (283429, 370318809), (283429, 673886676), (283429, 679351213), (283429, 679978717), (283429, 679730532), (283429, 681304456), (283429, 685193626), (283429, 687066592), (283429, 688427583), (283429, 3505588038), (283429, 3510530848), (283429, 3512779320), (283429, 3514463952), (283429, 3517901017), (283429, 3532020390), (283429, 745052602), (283429, 754261689), (283429, 760669830), (283429, 43262327), (283429, 47486802), (283429, 56229484), (283429, 54836344), (283429, 60530253), (283429, 57905552), (283429, 1422277783), (283429, 1923742587), (283429, 1954595987), (283429, 190690269), (283429, 189780618), (283429, 230196771), (283429, 231338891), (283429, 2645719604), (283429, 2649828905), (283429, 2662413856), (283429, 2666023662), (283429, 2670419257), (283429, 2673593832), (283429, 2080849777), (283429, 2078573315), (283429, 1594744936), (283429, 3538737879), (283429, 3551290031), (283429, 3555061094), (283429, 3555837313), (283429, 3559905432), (283429, 3567206309), (283429, 1672817258), (283429, 3683952589), (283429, 3689518027), (283429, 3701752323), (283429, 3707488220), (283429, 3712909476), (283429, 2322124907), (283429, 2324677768), (283429, 2331267540), (283429, 2807247984), (283429, 2807823212), (283429, 2805910454), (283429, 2824178115), (283429, 321312843), (283429, 326932750), (283429, 328995004), (283429, 334318321), (283429, 1428487157), (283429, 1431543265), (283429, 1430371235), (283429, 1444619042), (283429, 1448204477), (283429, 1451549730), (283429, 1452257562), (283429, 1458434832), (283429, 2478349822), (283429, 3924890130), (283429, 3927361733), (283429, 3939657121), (283429, 273590802), (283429, 278833118), (283429, 279751057), (283429, 282731641), (283429, 283168232), (283429, 1893054343), (283429, 1907078338), (283429, 1905490517), (283429, 1906339863), (283429, 1289025873), (283429, 873832655), (283429, 880604991), (283429, 1785672245), (283429, 1793004654), (283429, 403679302), (283429, 1542179329), (283429, 1545147684), (283429, 3396333867), (283429, 3404253778), (283429, 2457503578), (283429, 2460940619), (283429, 2467411411), (283429, 2468851110), (283429, 2467614009), (283429, 3028259758), (283429, 3339249463), (283429, 1874233061), (283429, 4333055508), (283429, 4345902245), (283429, 4353011335), (283429, 4360234404), (283429, 4359784933), (283429, 2259226438), (283429, 2265174467), (283429, 2265505835), (283429, 2268586840), (283429, 2281706051), (283429, 2285086152), (283429, 2288554919), (283429, 1777389605), (283429, 1774499522), (283429, 1783805170), (283429, 1262083256), (283429, 1001418601), (283429, 2109819049), (283429, 2111498696), (283429, 2121797053), (283429, 1470407735), (283429, 1472927198), (283429, 1474612726), (283429, 1473282681), (283429, 2862578531), (283429, 2861251935), (283429, 2868557501), (283429, 2872669265), (283429, 2877049740), (283429, 2292211727), (283429, 2296247868), (283429, 2296837506), (283429, 2492528996), (283429, 2492997104), (283429, 2493706220), (283429, 2501355218), (283429, 2804685501), (283429, 2514477542), (283429, 1042922326), (283429, 519055607), (283429, 520801387), (283429, 521233569), (283429, 528342675), (283429, 533443923), (283429, 534892139), (283429, 1338715098), (283429, 1341227525), (283429, 1345933502), (283429, 1347572381), (283429, 1350628719), (283429, 1353750201), (283429, 1710451591), (283429, 1712457222), (283429, 1714267360), (283429, 1725472193), (283429, 1731691979), (283429, 1203632208), (283429, 1255479864), (283429, 2168165121), (283429, 387232267), (283429, 385696011), (283429, 469139851), (283429, 470252232), (283429, 476014765), (283429, 473119260), (283429, 478765328), (283429, 483913232), (283429, 2222485530), (283429, 2226167441), (283429, 2227436004), (283429, 2241407046), (283429, 660386328), (283429, 667238559), (283429, 670704258), (283429, 1641788340), (283429, 1648356349), (283429, 1652779083), (283429, 1650961418), (283429, 1653088121), (283429, 1654780636), (283429, 4119344671), (283429, 4122529634), (283429, 4120936515), (283429, 4126424447), (283429, 4139856975), (283429, 4145084929), (283429, 4149114126), (283429, 837859816), (283429, 847065940), (283429, 1301737586), (283429, 1302326650), (283429, 1302356172), (283429, 1303174246), (283429, 1309077525), (283429, 2177602759), (283429, 2185680487), (283429, 2204205931), (283429, 2206742965), (283429, 4094774025), (283429, 3061607704), (283429, 3069835072), (283429, 3073394332), (283429, 504770333), (283429, 508533816), (283429, 508791938), (283429, 509846159), (283429, 515007267), (283429, 514419073), (283429, 2377780619), (283429, 2380812873), (283429, 2383699803), (283429, 578385949), (283429, 587274544), (283429, 594567488), (283429, 599439862), (283429, 606280065), (283429, 3807815327), (283429, 3808711099), (283429, 3818027379), (283429, 3828974950), (283429, 3450044180), (283429, 571929234), (283429, 1085283746), (283429, 3888795367), (283429, 3952584570), (283429, 3959814402), (283429, 3969734607), (283429, 3973943845), (283429, 3973087613), (283429, 2247302053), (283429, 2248557476), (283429, 2300072786), (283429, 2300474375), (283429, 2306265719), (283429, 2309074071), (283429, 2616834008), (283429, 2626664227), (283429, 2635374872), (283429, 614899326), (283429, 1982551741), (283429, 1985809357), (283429, 1993294074), (283429, 2001454718), (283429, 1998281606), (283429, 2006147523), (283429, 1119270326), (283429, 1116497310), (283429, 1124415366), (283429, 1127072185), (283429, 1127605030), (283429, 1153630855), (283429, 4242479524), (283429, 4243012845), (283429, 4254037800), (283429, 4260292556), (283429, 2924571602), (283429, 2929287436), (283429, 2943703779), (283429, 2947551678), (283429, 2948633892), (283429, 2959332695), (283429, 2690802429), (283429, 2752070992), (283429, 3537345202), (283429, 3725899743), (283429, 3728313248), (283429, 3730635520), (283429, 3745033277), (283429, 3408085420), (283429, 3420104884), (283429, 3425693670), (283429, 3425930013), (283429, 3432953454), (283429, 3431631450), (283429, 3439455866), (283429, 1318435491), (283429, 1326788884), (283429, 1327516212), (283429, 3594906738), (283429, 3595153036), (283429, 1812929456), (283429, 1822408863), (283429, 1824967979), (283429, 1219879484), (283429, 1228982280), (283429, 1233393258), (283429, 1237024743), (283429, 1236247156), (283429, 1241669258), (283429, 64812095), (283429, 66543092), (283429, 67551797), (283429, 66413539), (283429, 461288363), (283429, 2009703357), (283429, 2013785421), (283429, 2014166506), (283429, 2013259179), (283429, 2033368422), (283429, 2406979974), (283429, 2426140270), (283429, 2423371590), (283429, 346552488), (283429, 350441743), (283429, 415905704), (283429, 423017570), (283429, 421244554), (283429, 425692996), (283429, 883661690), (283429, 1080451873), (283429, 1358857561), (283429, 2996639550), (283429, 3000465308), (283429, 3010114648), (283429, 3012836552), (283429, 3018374053), (283429, 3021384870), (283429, 5961771), (283429, 7253149), (283429, 15570795), (283429, 20154264), (283429, 19685710), (283429, 2842231648), (283429, 2841058576), (283429, 4267295154), (283429, 4279255345), (283429, 4279523644), (283429, 822228323), (283429, 835374236), (283429, 836791829), (283429, 2433749393), (283429, 2433775635), (283429, 2437613859), (283429, 2536502620), (283429, 2536232272), (283429, 2537859565), (283429, 2539502626), (283429, 2541082686), (283429, 2542905291), (283429, 2559536502), (283429, 314350829), (283429, 316107436), (283429, 316588549), (283429, 542406971), (283429, 549310005), (283429, 695567037), (283429, 695914374), (283429, 654093188), (283429, 652490083), (283429, 1157082497), (283429, 1399981608), (283429, 1402190633), (283429, 2886327653), (283429, 4190755807), (283429, 4194329473), (283429, 4200790959), (283429, 4204458339), (283429, 4206272332), (283429, 4206862755), (283429, 4215249761), (283429, 2889419075), (283429, 2896761969), (283429, 2911371579), (283429, 2914552420), (283429, 2916047563), (283429, 957062010), (283429, 734935200), (283429, 3173693858), (283429, 3175532695), (283429, 1522124357), (283429, 1523460241), (283429, 1528911699), (283429, 1529058807), (283429, 897799768), (283429, 898802791), (283429, 4155624346), (283429, 4155148108), (283429, 4159769626), (283429, 4162755704), (283429, 4176942076), (283429, 1371282786), (283429, 1418982615), (283429, 1421516753), (283429, 1943542253), (283429, 1948627460), (283429, 1954787433), (283429, 2761394969), (283429, 2762686314), (283429, 2769748038), (283429, 2777190725), (283429, 2782265861), (283429, 2785600722), (283429, 2784289792), (283429, 2789001055), (283429, 3121953603), (283429, 3132074200), (283429, 3193668384), (283429, 1166414802), (283429, 1169639766), (283429, 1188221585), (283608, 230783744), (283608, 239120681), (283608, 244556602), (283608, 245127400), (283608, 254812251), (283608, 260653310), (283608, 263593060), (283608, 509147330), (283608, 513195901), (283608, 512519793), (283608, 512920303), (283608, 440327782), (283608, 442097325), (283608, 503332057), (283608, 506002791), (283608, 519204763), (283608, 526172034), (283608, 526906545), (283608, 526309772), (283608, 531087861), (283608, 531327937), (283608, 86694374), (283608, 139624232), (283608, 142637908), (283608, 143402327), (283608, 156079832), (283608, 91017438), (283608, 97869609), (283608, 7998489), (283608, 12545393), (283608, 20408461), (283608, 353533622), (283608, 358208870), (283608, 330302665), (283608, 351007207), (283608, 294067137), (283608, 308433261), (283608, 313174940), (283608, 200218740), (283608, 179229333), (283608, 180751046), (283608, 197792416), (283608, 205988942), (283608, 445070852), (283608, 453810671), (283608, 459220233), (283608, 458220275), (283608, 464005501), (283608, 465958375), (283608, 39049180), (283608, 432052906), (283608, 437520149), (283608, 368252592), (283608, 369502190), (283608, 375358455), (283608, 375223072), (283608, 390435260), (283608, 393478393), (283608, 400421189), (283608, 267903407), (283608, 282507624), (283608, 279479526), (283608, 286907351), (283608, 287740302), (283608, 57071810), (283608, 64244341), (283780, 2389418545), (283780, 28009081), (283780, 191658792), (283780, 194849381), (283780, 196520440), (283780, 1732702970), (283780, 1735762915), (283780, 1738639519), (283780, 1738566216), (283780, 1741967934), (283780, 1750105019), (283780, 1754961006), (283780, 2473543519), (283780, 2473238267), (283780, 2475920584), (283780, 2480374821), (283780, 2488887403), (283780, 2492904095), (283780, 1980444067), (283780, 2001285396), (283780, 666381247), (283780, 681726046), (283780, 870341786), (283780, 888241480), (283780, 890397823), (283780, 893810944), (283780, 897326713), (283780, 2592392602), (283780, 2593442590), (283780, 1475295752), (283780, 1490157740), (283780, 1766657750), (283780, 1767902629), (283780, 756541389), (283780, 2429751212), (283780, 2439695784), (283780, 2449299932), (283780, 1540374071), (283780, 1544802210), (283780, 1549059206), (283780, 1555537208), (283780, 1557739082), (283780, 1576574168), (283780, 87380767), (283780, 94421099), (283780, 94267745), (283780, 94013898), (283780, 93712366), (283780, 203593948), (283780, 200794822), (283780, 202143006), (283780, 200617064), (283780, 518499697), (283780, 523768529), (283780, 527229904), (283780, 539121182), (283780, 550748883), (283780, 101195958), (283780, 101114770), (283780, 113006728), (283780, 118639609), (283780, 119785217), (283780, 66498980), (283780, 178345882), (283780, 183485709), (283780, 188512535), (283780, 188231490), (283780, 192173081), (283780, 267637627), (283780, 268589354), (283780, 274706595), (283780, 909703008), (283780, 915453821), (283780, 916106931), (283780, 925637478), (283780, 927148118), (283780, 2559556325), (283780, 2560941638), (283780, 2564836329), (283780, 2569654623), (283780, 2577886435), (283780, 2580783140), (283780, 2585614566), (283780, 683605023), (283780, 690324781), (283780, 693584166), (283780, 693798728), (283780, 704970432), (283780, 712078159), (283780, 462491199), (283780, 466406477), (283780, 2060908403), (283780, 2065311306), (283780, 2064701836), (283780, 2065116793), (283780, 2066788725), (283780, 2074812482), (283780, 2078130199), (283780, 1798676518), (283780, 1803046616), (283780, 1806081477), (283780, 1810961794), (283780, 2081946655), (283780, 2085798792), (283780, 2086252833), (283780, 2089007488), (283780, 2105972603), (283780, 335850785), (283780, 339057435), (283780, 362461147), (283780, 1159189132), (283780, 1174241368), (283780, 2640124660), (283780, 2656177358), (283780, 1307206757), (283780, 1319035095), (283780, 1324452253), (283780, 1328281889), (283780, 1813885580), (283780, 1813087153), (283780, 1816847846), (283780, 1817770651), (283780, 1827150122), (283780, 1832411756), (283780, 1833135460), (283780, 1838248947), (283780, 2227986045), (283780, 2325080513), (283780, 2332034094), (283780, 2342562554), (283780, 2345096226), (283780, 1261531439), (283780, 1262267161), (283780, 1273815327), (283780, 1278486261), (283780, 624842914), (283780, 625806004), (283780, 1210657936), (283780, 1215226405), (283780, 1682158759), (283780, 778636133), (283780, 787952516), (283780, 794582438), (283780, 797603977), (283780, 800125939), (283780, 801178696), (283780, 70339459), (283780, 72918714), (283780, 81177742), (283780, 947703349), (283780, 944533894), (283780, 947775060), (283780, 1949173296), (283780, 1970982743), (283780, 2016113982), (283780, 2020137235), (283780, 1443173386), (283780, 1441467169), (283780, 1446104021), (283780, 1465269725), (283780, 980624575), (283780, 167077117), (283780, 167942542), (283780, 170778703), (283780, 174821602), (283780, 175411168), (283780, 423543200), (283780, 125366642), (283780, 131626974), (283780, 130830560), (283780, 138180340), (283780, 137367979), (283780, 150694550), (283780, 153786298), (283780, 2512586540), (283780, 2524472090), (283780, 2527868926), (283780, 2535640341), (283780, 2540419530), (283780, 2541213497), (283780, 2011896347), (283780, 2167833401), (283780, 2177677325), (283780, 2177571279), (283780, 2177777889), (283780, 294112986), (283780, 296777171), (283780, 309087957), (283780, 321578367), (283780, 1551516628), (283780, 1184485916), (283780, 1187992259), (283780, 1196136542), (283780, 1201973266), (283780, 1201865724), (283780, 1201652453), (283780, 1204194690), (283780, 366288685), (283780, 371749209), (283780, 375025974), (283780, 1893398603), (283780, 1906300657), (283780, 2131634042), (283780, 2130601760), (283780, 1723482573), (283780, 278900477), (283780, 276772331), (283780, 278375880), (283780, 278598264), (283780, 277804952), (283780, 284895231), (283780, 1349601584), (283780, 1917417743), (283780, 1922090608), (283780, 1934009008), (283780, 1937945821), (283780, 713280368), (283780, 710652837), (283780, 712073305), (283780, 711925887), (283780, 716176501), (283780, 640444013), (283780, 641566258), (283780, 656692670), (283780, 657959463), (283780, 1096977121), (283780, 959120376), (283780, 963191151), (283780, 974035270), (283780, 2136852538), (283780, 2137232889), (283780, 2139344055), (283780, 2149883111), (283780, 2150701838), (283780, 2155749019), (283780, 2157986043), (283780, 2157803510), (283780, 2161916971), (283780, 2181816970), (283780, 1147340365), (283780, 2555328674), (283780, 214925692), (283780, 223394056), (283780, 228985953), (283780, 231734345), (283780, 433996420), (283780, 441772719), (283780, 2506326511), (283780, 2504372931), (283780, 2505965436), (283780, 2611794178), (283780, 2610209177), (283780, 2610224800), (283780, 2613386559), (283780, 2627639784), (283780, 2628918998), (283780, 242193950), (283780, 245617995), (283780, 1676712722), (283780, 1681959398), (283780, 2198292342), (283780, 2199122076), (283780, 2203598539), (283780, 2214621793), (283780, 2216512407), (283780, 2217276294), (283780, 1337563838), (283780, 1344795319), (283780, 1592639869), (283780, 1598505674), (283780, 1626606125), (283780, 1632334217), (283780, 1636690402), (283780, 1644280110), (283780, 840059628), (283780, 837957595), (283780, 847287470), (283780, 850167259), (283780, 862347651), (283780, 1124607559), (283780, 40703269), (283780, 42144692), (283780, 47064959), (283780, 58802565), (283780, 1000820332), (283780, 1005507327), (283780, 1022012948), (283780, 2030214240), (283780, 2032921083), (283780, 2031141562), (283780, 2034390837), (283780, 2043384183), (283780, 2260271400), (283780, 2263863548), (283780, 2265385358), (283780, 2267194299), (283780, 2275651235), (283780, 1511697999), (283780, 1516395116), (283780, 1514350463), (283780, 1516077804), (283780, 1516705249), (283780, 1525092040), (283780, 471603232), (283780, 476536608), (283780, 478746421), (283780, 480245180), (283780, 489490534), (283780, 1392487382), (283780, 1391001400), (283780, 1421206703), (283780, 1418910954), (283780, 816902186), (283780, 819762850), (283780, 929733252), (283780, 1032048497), (283780, 1030836837), (283780, 1033851455), (283780, 1039767810), (283780, 1428638986), (283780, 1430539731), (283780, 1433719557), (283780, 1867185570), (283780, 1881959481), (283780, 1885858424), (283780, 587840111), (283780, 594571853), (283780, 555628283), (283780, 557704755), (283780, 559757094), (283780, 559443685), (283780, 560485210), (283780, 565472909), (283780, 566390509), (283780, 570652920), (283780, 573791047), (283780, 575706251), (283780, 582163072), (283780, 2611963), (283780, 11621285), (283780, 19923734), (283780, 20256596), (283780, 1692454048), (283780, 1695134225), (283780, 1711084634), (283780, 2116353620), (283780, 2115408099), (283780, 2233994159), (283780, 1231802205), (283780, 1233779000), (283780, 1236898248), (283780, 1241120162), (283780, 1248855254), (283780, 1248866990), (283780, 1248967062), (283780, 1252879432), (283780, 1254543462), (283780, 1284687687), (283780, 1295453648), (283780, 1454180886), (283780, 1454542896), (283780, 393485075), (283780, 404971466), (283780, 412873908), (283780, 2279327546), (283780, 2283223237), (283780, 2291565405), (283780, 2296369487), (283780, 2304991561), (283780, 2689449856), (283780, 2705644699), (283780, 499926895), (283780, 496867991), (283780, 502360914), (283780, 500911892), (283780, 504619674), (283780, 509026410), (283780, 721694409), (283780, 722228482), (283780, 730763053), (283780, 730407119), (283780, 733067966), (283780, 735734366), (283780, 754309425), (283780, 2347958665), (283780, 2350581063), (283780, 2351638644), (283780, 2362030202), (283780, 2414096269), (283780, 1050821159), (283780, 1070263713), (283780, 1067610995), (283780, 1071037144), (284006, 547467726), (284006, 551678576), (284006, 562474153), (284006, 482550001), (284006, 490335078), (284006, 490380894), (284006, 388693677), (284006, 392481712), (284006, 221470687), (284006, 224004348), (284006, 223182147), (284006, 294049599), (284006, 297777910), (284006, 325269803), (284006, 333315135), (284006, 334464904), (284006, 336685123), (284006, 337517456), (284006, 350995421), (284006, 354386329), (284006, 367319026), (284006, 373431697), (284006, 439628616), (284006, 440826245), (284006, 287486456), (284006, 87053704), (284006, 89564068), (284006, 31423737), (284006, 82541878), (284006, 193712914), (284006, 206720357), (284006, 402174009), (284006, 405852427), (284006, 454568805), (284006, 459900774), (284006, 472992658), (284006, 227729968), (284006, 245664248), (284006, 246780181), (284006, 129348968), (284006, 262994884), (284006, 268278540), (284006, 272426846), (284006, 273884444), (284006, 275749711), (284006, 285142502), (284006, 101949741), (284006, 112817621), (284006, 113703124), (284006, 115957948), (284006, 123558845), (284006, 416212700), (284006, 419612781), (284006, 420537648), (284006, 429008488), (284006, 431237040), (284006, 438671941), (284006, 572128834), (284006, 138975822), (284006, 151464467), (284006, 153547703), (284006, 255011554), (284006, 301449277), (284006, 304466281), (284006, 309018135), (284006, 312361133), (284006, 323905136), (284006, 327109167), (284006, 2507151), (284006, 8951810), (284006, 19745678), (284006, 16718185), (284006, 404857501), (284006, 524854343), (284006, 524941222), (284006, 529811290), (284006, 530631320), (284006, 539109071), (284006, 509183751), (284006, 517428436), (284006, 517163850), (284006, 518717918), (284006, 519646797), (284006, 519921691), (284006, 69879289), (284006, 38259632), (284006, 44562677), (284006, 42498766), (284006, 47992703), (284006, 164165371), (284154, 118872765), (284154, 176033671), (284154, 184498941), (284154, 194771443), (284154, 89448633), (284154, 90793231), (284154, 93561245), (284154, 95065424), (284154, 102194480), (284154, 111600155), (284154, 112664111), (284154, 204961698), (284154, 122551501), (284154, 10738450), (284154, 13391783), (284154, 21136264), (284154, 22166811), (284154, 24148803), (284154, 33512236), (284154, 35596347), (284154, 55499495), (284154, 62796697), (284154, 70056781), (284154, 73333358), (284154, 157090375), (284154, 161570733), (284154, 80410022), (284213, 2606549963), (284213, 2276654185), (284213, 2277706332), (284213, 2286971971), (284213, 2295547574), (284213, 2302765330), (284213, 2306642894), (284213, 2308651219), (284213, 2306812235), (284213, 3485630881), (284213, 3488042797), (284213, 3488473902), (284213, 3496552410), (284213, 3497015333), (284213, 161366075), (284213, 169333189), (284213, 177711062), (284213, 176660591), (284213, 176462288), (284213, 183551120), (284213, 775356331), (284213, 1638401664), (284213, 1638239326), (284213, 1642948162), (284213, 1770110875), (284213, 756486209), (284213, 755944412), (284213, 197457357), (284213, 201242364), (284213, 209829421), (284213, 211954641), (284213, 217331043), (284213, 816562833), (284213, 817245216), (284213, 825591829), (284213, 829317684), (284213, 833765414), (284213, 2271290498), (284213, 2273679633), (284213, 2336497150), (284213, 2358777375), (284213, 431235053), (284213, 430445619), (284213, 435764435), (284213, 444119788), (284213, 3236401728), (284213, 3258893429), (284213, 2770340214), (284213, 2775857500), (284213, 1450535116), (284213, 1453273502), (284213, 1457713244), (284213, 1471968761), (284213, 456287316), (284213, 461086024), (284213, 2260188263), (284213, 1216797577), (284213, 1225019345), (284213, 2110975544), (284213, 224202608), (284213, 228528965), (284213, 234267578), (284213, 243892848), (284213, 1585778210), (284213, 1588032339), (284213, 1594221239), (284213, 1595725922), (284213, 1596725322), (284213, 1597926091), (284213, 1604140042), (284213, 1609071327), (284213, 1610967920), (284213, 3139326081), (284213, 3155376172), (284213, 1022918607), (284213, 1025812928), (284213, 1029213266), (284213, 1028629248), (284213, 1031297703), (284213, 1048455982), (284213, 1048308565), (284213, 1047110291), (284213, 1801074890), (284213, 1354669192), (284213, 739568956), (284213, 736444338), (284213, 740441336), (284213, 9950375), (284213, 686410117), (284213, 687929212), (284213, 685471606), (284213, 695479982), (284213, 695532799), (284213, 698080792), (284213, 698415354), (284213, 701584122), (284213, 1345672615), (284213, 1344029112), (284213, 1234617838), (284213, 1240343170), (284213, 1245626229), (284213, 1251812467), (284213, 1258927258), (284213, 1261343971), (284213, 1262138938), (284213, 554874455), (284213, 566210271), (284213, 565987259), (284213, 566592442), (284213, 775495685), (284213, 778732256), (284213, 641074443), (284213, 1853502392), (284213, 1879639644), (284213, 1894007530), (284213, 3271279683), (284213, 3269925104), (284213, 3273185788), (284213, 1121569975), (284213, 1128287072), (284213, 1132110496), (284213, 1313825574), (284213, 3501517600), (284213, 1910966591), (284213, 2123721424), (284213, 2135842288), (284213, 2137791888), (284213, 96085946), (284213, 93968203), (284213, 99021698), (284213, 103830977), (284213, 121958939), (284213, 2720583567), (284213, 2730905826), (284213, 2729906588), (284213, 2731258883), (284213, 25276021), (284213, 30417830), (284213, 1081666837), (284213, 1084979045), (284213, 1085685073), (284213, 1085096455), (284213, 1087157447), (284213, 1094923389), (284213, 1097144130), (284213, 1101010024), (284213, 1104889370), (284213, 1534056902), (284213, 1550024149), (284213, 1558894621), (284213, 1698641955), (284213, 1697681182), (284213, 1716250135), (284213, 1718925344), (284213, 3312227123), (284213, 1738931975), (284213, 1749326068), (284213, 1749676909), (284213, 1757705807), (284213, 67410408), (284213, 70630496), (284213, 79710282), (284213, 88454298), (284213, 91407137), (284213, 3432368048), (284213, 3433851309), (284213, 3444665554), (284213, 3463460830), (284213, 2065843643), (284213, 2069615288), (284213, 3186691218), (284213, 3188244614), (284213, 3190335306), (284213, 3200464265), (284213, 2175372848), (284213, 2175610165), (284213, 2181108142), (284213, 2183068865), (284213, 384981185), (284213, 387234161), (284213, 390564195), (284213, 2793097905), (284213, 2799730338), (284213, 2801711746), (284213, 2799754430), (284213, 786171537), (284213, 786772490), (284213, 793695698), (284213, 710863241), (284213, 718531316), (284213, 722559334), (284213, 726712477), (284213, 353496124), (284213, 359697195), (284213, 365980010), (284213, 364977299), (284213, 366390662), (284213, 369775249), (284213, 371705696), (284213, 371487930), (284213, 1300673862), (284213, 1302920029), (284213, 1305115410), (284213, 1308070884), (284213, 2612523651), (284213, 1672767284), (284213, 1674106771), (284213, 1678919907), (284213, 1735662568), (284213, 1736007654), (284213, 2039327191), (284213, 468287250), (284213, 476467816), (284213, 481115908), (284213, 481876228), (284213, 482867313), (284213, 996700729), (284213, 1001851002), (284213, 1983583940), (284213, 3357123421), (284213, 3362172364), (284213, 3370054303), (284213, 3373779500), (284213, 3391707702), (284213, 2999361153), (284213, 3005816400), (284213, 3010025478), (284213, 3017691907), (284213, 3024846380), (284213, 3025810159), (284213, 1207916736), (284213, 1210734874), (284213, 1211754435), (284213, 1224664176), (284213, 1226199720), (284213, 1504789272), (284213, 2877522955), (284213, 2878097645), (284213, 2892618455), (284213, 2898979796), (284213, 2899684644), (284213, 2902315954), (284213, 2903169247), (284213, 42622525), (284213, 56875864), (284213, 39584793), (284213, 1511479390), (284213, 1510741119), (284213, 1513295575), (284213, 1517043476), (284213, 1814691648), (284213, 1831719074), (284213, 1837360057), (284213, 1840844655), (284213, 1766707786), (284213, 902989701), (284213, 903139394), (284213, 912954696), (284213, 282412784), (284213, 293917263), (284213, 2586927043), (284213, 2594588885), (284213, 2598125179), (284213, 305547779), (284213, 307647315), (284213, 310341155), (284213, 308399028), (284213, 315763570), (284213, 2843480046), (284213, 2848725654), (284213, 1899466452), (284213, 1931630267), (284213, 1939721032), (284213, 2386668945), (284213, 2391680804), (284213, 2413422871), (284213, 2464548470), (284213, 2465838953), (284213, 2470837500), (284213, 3103992386), (284213, 3108707150), (284213, 3109338684), (284213, 3111344203), (284213, 3113559447), (284213, 3113585460), (284213, 3115969872), (284213, 1730411716), (284213, 934560603), (284213, 934839849), (284213, 2905006637), (284213, 798220406), (284213, 800561272), (284213, 803956925), (284213, 806281954), (284213, 2191434612), (284213, 2203582262), (284213, 2206933352), (284213, 2215721478), (284213, 2696622867), (284213, 2711396820), (284213, 647077947), (284213, 653774603), (284213, 655316990), (284213, 656210261), (284213, 666696055), (284213, 665528855), (284213, 1425091763), (284213, 1427010267), (284213, 1436816986), (284213, 1436797622), (284213, 1448274506), (284213, 2317049073), (284213, 2316554442), (284213, 2316924858), (284213, 2567742438), (284213, 2567006163), (284213, 2568693926), (284213, 2573036291), (284213, 332578253), (284213, 334044542), (284213, 345433908), (284213, 349465433), (284213, 2235740668), (284213, 2244165631), (284213, 2647111137), (284213, 2650973235), (284213, 975868321), (284213, 981776138), (284213, 979674987), (284213, 981320944), (284213, 983595299), (284213, 984059739), (284213, 995080581), (284213, 625778886), (284213, 623866736), (284213, 625583464), (284213, 633268604), (284213, 1389739537), (284213, 1388553366), (284213, 1391019625), (284213, 1396718751), (284213, 1394760673), (284213, 1398610271), (284213, 1408709526), (284213, 500310924), (284213, 498205888), (284213, 574434814), (284213, 584855001), (284213, 1105987561), (284213, 1114648432), (284213, 1117405575), (284213, 2928015088), (284213, 2932139153), (284213, 2935288766), (284213, 2938112897), (284213, 2941744172), (284213, 2984159901), (284213, 2997606908), (284213, 501507395), (284213, 522353923), (284213, 524311113), (284213, 2086425481), (284213, 2094647486), (284213, 2380410384), (284213, 2388017732), (284213, 2390807157), (284213, 2392572796), (284213, 2397448856), (284213, 2402817219), (284213, 672684760), (284213, 674422456), (284213, 675705732), (284213, 1166864542), (284213, 1168384105), (284213, 1172616222), (284213, 1177053841), (284213, 2857704267), (284213, 2860156392), (284213, 3133868033), (284213, 842912415), (284213, 845729824), (284213, 847735869), (284213, 848131180), (284213, 851221300), (284213, 848892871), (284213, 862737896), (284213, 862373344), (284213, 867108788), (284213, 866900082), (284213, 399733055), (284213, 401023824), (284213, 403759791), (284213, 419429605), (284213, 879029316), (284213, 880653112), (284213, 964712207), (284213, 963464908), (284213, 965402442), (284213, 2666532800), (284213, 2675664909), (284213, 2956618577), (284213, 2956096229), (284213, 2957230547), (284213, 2978196333), (284213, 2982848406), (284213, 2987711258), (284213, 1056790181), (284213, 1064798193), (284213, 1068344400), (284213, 1072086543), (284213, 1479048429), (284213, 1481912426), (284213, 1486627824), (284213, 1491003737), (284213, 3298940250), (284213, 3305100658), (284213, 3304874012), (284213, 257138038), (284213, 269380629), (284213, 269447122), (284213, 2451735455), (284213, 2453370443), (284213, 2454781871), (284213, 2459004425), (284213, 2461094050), (284213, 2461354873), (284213, 1991806967), (284213, 1992493177), (284213, 1997982451), (284213, 2017590410), (284213, 1961056397), (284213, 2030673698), (284213, 2235771176), (284213, 534892205), (284213, 535496537), (284213, 532721516), (284213, 542074990), (284213, 541216907), (284213, 2139219001), (284213, 2140697723), (284213, 2152611294), (284213, 2155071486), (284213, 3071435983), (284213, 3073026980), (284213, 3075073338), (284213, 3079557207), (284213, 3096852034), (284213, 591796204), (284213, 602052293), (284213, 614017823), (284213, 2523653102), (284213, 2525756416), (284213, 2534316767), (284213, 1274953341), (284213, 1280769001), (284213, 2732339188), (284213, 2736832576), (284213, 2740906500), (284213, 2749247061), (284213, 2757394890), (284213, 2759989486), (284213, 2761843277), (284213, 151478930), (284213, 148062450), (284213, 151967530), (284213, 3201855770), (284213, 3202886134), (284213, 3206581251), (284213, 3209039845), (284213, 1332296226), (284213, 189927044), (284213, 1161319334), (284213, 1149974756), (284213, 1565266922), (284213, 1483389682), (284213, 1488539374), (284213, 2268288138), (284213, 2350713619), (284213, 2359810706), (284213, 2372213644), (284213, 1656560630), (284213, 919374493), (284213, 922927368), (284213, 3029701978), (284213, 3052338941), (284213, 137377857), (284213, 141026521), (284213, 2415574441), (284213, 2420218534), (284213, 2418552965), (284213, 2420025714), (284213, 2422775870), (284213, 2428675502), (284213, 2430308838), (284213, 2438740898), (284213, 2504297820), (284213, 2503211326), (284213, 2506610545), (284213, 2605055627), (284213, 2612396396), (284213, 2621904503), (284213, 3394543455), (284213, 3409964405), (284213, 3411589506), (284213, 3418729672), (284213, 2224899284), (284213, 2231689989), (284213, 1848894038), (284213, 1852114871), (284213, 2131863387), (284285, 33636635), (284285, 38918853), (284285, 207492014), (284285, 211105414), (284285, 209106001), (284285, 3143395864), (284285, 3145473019), (284285, 3142672197), (284285, 3155672659), (284285, 3159725898), (284285, 3176674767), (284285, 289970618), (284285, 293436195), (284285, 295551209), (284285, 301354985), (284285, 2035802185), (284285, 2040048200), (284285, 2041046794), (284285, 2043145379), (284285, 3297108619), (284285, 3303926356), (284285, 2274703655), (284285, 2277048543), (284285, 1055039111), (284285, 1060993406), (284285, 1064710980), (284285, 1634400284), (284285, 1318769950), (284285, 1323925394), (284285, 1496090057), (284285, 1499018814), (284285, 1502656421), (284285, 1507985474), (284285, 2088236582), (284285, 2391859388), (284285, 2528689805), (284285, 2531981691), (284285, 965426172), (284285, 985220014), (284285, 982609611), (284285, 1975185812), (284285, 1981802885), (284285, 1981728817), (284285, 1988449684), (284285, 1336050263), (284285, 1341048289), (284285, 1342572231), (284285, 1346029309), (284285, 1347730150), (284285, 1352460232), (284285, 1356522892), (284285, 1360273610), (284285, 2319781514), (284285, 2339487592), (284285, 2347412184), (284285, 499284505), (284285, 511307700), (284285, 511659385), (284285, 515075587), (284285, 518058934), (284285, 520115069), (284285, 4427480685), (284285, 4427214569), (284285, 4425194545), (284285, 4431674790), (284285, 994260527), (284285, 1368910955), (284285, 1367175833), (284285, 1374033876), (284285, 1386606346), (284285, 1384656211), (284285, 1388721050), (284285, 2988973121), (284285, 3539747618), (284285, 3539948481), (284285, 3543847957), (284285, 3549235811), (284285, 3557730189), (284285, 3561061238), (284285, 3562357872), (284285, 3736526628), (284285, 3899225877), (284285, 999722262), (284285, 999639892), (284285, 1004143263), (284285, 1008291274), (284285, 1009068788), (284285, 1014251719), (284285, 1018751664), (284285, 3851092389), (284285, 3873535558), (284285, 878678881), (284285, 877534158), (284285, 1112401192), (284285, 1113847945), (284285, 1119980367), (284285, 1119739228), (284285, 1213485460), (284285, 1212962367), (284285, 1209893812), (284285, 1210513185), (284285, 1667135505), (284285, 1677575261), (284285, 1678529787), (284285, 1679020084), (284285, 1680126507), (284285, 1682568392), (284285, 4313186893), (284285, 4313573020), (284285, 4334181927), (284285, 4343598423), (284285, 4343111497), (284285, 2475734564), (284285, 2481757675), (284285, 2488125156), (284285, 2915221137), (284285, 738665916), (284285, 741982827), (284285, 746218586), (284285, 752141300), (284285, 749366728), (284285, 3498515680), (284285, 3501962006), (284285, 3509413595), (284285, 3513463997), (284285, 3521214100), (284285, 3523923789), (284285, 3527148776), (284285, 3529424154), (284285, 4522870758), (284285, 4530531752), (284285, 4531286513), (284285, 4532704105), (284285, 4535318163), (284285, 3096931846), (284285, 3109674767), (284285, 3118643771), (284285, 3120852711), (284285, 3123163858), (284285, 318037786), (284285, 1791752), (284285, 6631312), (284285, 20343623), (284285, 24914142), (284285, 23817893), (284285, 29496117), (284285, 337960251), (284285, 339777781), (284285, 345955525), (284285, 3264329230), (284285, 3277039668), (284285, 3280522094), (284285, 3288572213), (284285, 3285459952), (284285, 3289974173), (284285, 2699486820), (284285, 2706709718), (284285, 2708450023), (284285, 2715022648), (284285, 2717134080), (284285, 2726881985), (284285, 2729471569), (284285, 2738134601), (284285, 569151765), (284285, 580055061), (284285, 589659059), (284285, 591731538), (284285, 3764654213), (284285, 3766633368), (284285, 3767776533), (284285, 3769891373), (284285, 3784015485), (284285, 3788803651), (284285, 3447301163), (284285, 3447748620), (284285, 3452792303), (284285, 3455822623), (284285, 1408782805), (284285, 1423828443), (284285, 1424526754), (284285, 1431683050), (284285, 1431554252), (284285, 1433526949), (284285, 1433966573), (284285, 1434837632), (284285, 3914706362), (284285, 3916728508), (284285, 2007264489), (284285, 2005942665), (284285, 2009769254), (284285, 2013570114), (284285, 2018725197), (284285, 2020547109), (284285, 2021933564), (284285, 2030266599), (284285, 2032450362), (284285, 263409022), (284285, 264805595), (284285, 1132984363), (284285, 1141354309), (284285, 2403181236), (284285, 2410061994), (284285, 2410581343), (284285, 2420440861), (284285, 2426118246), (284285, 2424641838), (284285, 2426852503), (284285, 2814178068), (284285, 2818715882), (284285, 2832045213), (284285, 2838340009), (284285, 2842810245), (284285, 2064669890), (284285, 2062241295), (284285, 2075547338), (284285, 2078554501), (284285, 472356237), (284285, 469880658), (284285, 471529263), (284285, 477279259), (284285, 479120967), (284285, 493123521), (284285, 494394252), (284285, 267986317), (284285, 276563131), (284285, 278691898), (284285, 1027481328), (284285, 1033005308), (284285, 1042589452), (284285, 1044480023), (284285, 1049475782), (284285, 958584594), (284285, 1064510129), (284285, 1074940088), (284285, 1075860391), (284285, 1077647874), (284285, 1080733737), (284285, 1082844284), (284285, 1083090494), (284285, 1084306108), (284285, 1880842442), (284285, 1933228445), (284285, 2447083686), (284285, 2447550855), (284285, 2451578843), (284285, 2448134399), (284285, 2449062459), (284285, 2467807740), (284285, 2467737635), (284285, 1277564030), (284285, 1281031825), (284285, 1279591708), (284285, 1283322289), (284285, 1280885026), (284285, 81715919), (284285, 89073466), (284285, 93300422), (284285, 98318393), (284285, 107274046), (284285, 108976283), (284285, 3664835635), (284285, 3992966842), (284285, 4011081818), (284285, 1514233299), (284285, 1517779743), (284285, 3888472645), (284285, 3888601315), (284285, 3891832409), (284285, 3894775501), (284285, 3894216640), (284285, 1481162541), (284285, 1481920076), (284285, 1482835779), (284285, 2677519370), (284285, 2685378112), (284285, 653960435), (284285, 652177471), (284285, 663054336), (284285, 662844404), (284285, 666231330), (284285, 666468179), (284285, 927160095), (284285, 927497797), (284285, 930770716), (284285, 940680339), (284285, 940120878), (284285, 1804778257), (284285, 1846269012), (284285, 1852121785), (284285, 1859822692), (284285, 2428680540), (284285, 2432059909), (284285, 2432274807), (284285, 2433676724), (284285, 2436907400), (284285, 114227165), (284285, 118813100), (284285, 119854869), (284285, 1236941725), (284285, 1244353619), (284285, 1247194558), (284285, 3799454738), (284285, 3804615423), (284285, 4046609616), (284285, 142479400), (284285, 145283521), (284285, 642376419), (284285, 638295840), (284285, 643955605), (284285, 4344292495), (284285, 4356839593), (284285, 4354445572), (284285, 4358443170), (284285, 4369908750), (284285, 3938661551), (284285, 3939715319), (284285, 71548953), (284285, 74549569), (284285, 880103889), (284285, 881303288), (284285, 905825136), (284285, 904061103), (284285, 3670175691), (284285, 3696469718), (284285, 2172562332), (284285, 2175297375), (284285, 179001330), (284285, 445793581), (284285, 466272300), (284285, 3715772524), (284285, 3719852500), (284285, 3733180613), (284285, 1088508975), (284285, 1145467198), (284285, 1151266404), (284285, 1808427330), (284285, 1809710763), (284285, 1812320841), (284285, 1820820115), (284285, 2095007346), (284285, 2104592507), (284285, 2103855408), (284285, 2108306080), (284285, 2109271786), (284285, 2117857285), (284285, 848447837), (284285, 856174467), (284285, 860936750), (284285, 857166302), (284285, 867527628), (284285, 789101954), (284285, 793344912), (284285, 826501817), (284285, 830422228), (284285, 2354565969), (284285, 2364296788), (284285, 2365005382), (284285, 2368317937), (284285, 2367116792), (284285, 2380688017), (284285, 2386424498), (284285, 3987338150), (284285, 3985471723), (284285, 1732140134), (284285, 1737964909), (284285, 1737269125), (284285, 2763584811), (284285, 2761699162), (284285, 2787649561), (284285, 2783757993), (284285, 221375462), (284285, 228010991), (284285, 227997239), (284285, 232023015), (284285, 237258038), (284285, 1202552334), (284285, 1205558747), (284285, 2863500526), (284285, 3189979761), (284285, 3576944315), (284285, 3582787808), (284285, 49327304), (284285, 51966999), (284285, 50991772), (284285, 56769031), (284285, 3128601358), (284285, 3473856416), (284285, 3485469945), (284285, 3488494086), (284285, 3491189660), (284285, 1303104112), (284285, 1317064589), (284285, 4476425860), (284285, 4476635023), (284285, 4474642035), (284285, 531286244), (284285, 531171042), (284285, 533538576), (284285, 2349726439), (284285, 598172167), (284285, 1590053392), (284285, 4187413855), (284285, 4187515076), (284285, 4199055247), (284285, 4205918535), (284285, 4209481820), (284285, 4210250607), (284285, 4212741169), (284285, 3218558722), (284285, 3220173293), (284285, 3234664471), (284285, 124890803), (284285, 128593653), (284285, 134192443), (284285, 4062671970), (284285, 4064068763), (284285, 4067239530), (284285, 4065582707), (284285, 4074020680), (284285, 4083839685), (284285, 2947395090), (284285, 2951352243), (284285, 2966408513), (284285, 1526185387), (284285, 1536956181), (284285, 1540881221), (284285, 1547594968), (284285, 1546480615), (284285, 1554461844), (284285, 1553990579), (284285, 1558659666), (284285, 1181186845), (284285, 1188987304), (284285, 1194215486), (284285, 1192391174), (284285, 4541157492), (284285, 4542353894), (284285, 4545060420), (284285, 4088806780), (284285, 4094638019), (284285, 4098551678), (284285, 4113883459), (284285, 2793055639), (284285, 2798678607), (284285, 2798253493), (284285, 2799388220), (284285, 4506005222), (284285, 4515308092), (284285, 4031532173), (284285, 4033464554), (284285, 4036450349), (284285, 570528019), (284285, 725296237), (284285, 728397244), (284285, 733621346), (284285, 732625064), (284285, 3954497072), (284285, 3964109543), (284285, 3964040362), (284285, 3974321805), (284285, 2543325311), (284285, 2557821913), (284285, 2570083423), (284285, 2574513368), (284285, 2574530554), (284285, 2854765782), (284285, 2495023029), (284285, 2496415031), (284285, 2508346508), (284285, 1156903442), (284285, 1158609187), (284285, 1168769728), (284285, 1178084482), (284285, 1390833349), (284285, 1397271529), (284285, 4234350388), (284285, 4242975373), (284285, 4244107018), (284285, 4246759476), (284285, 4245155105), (284285, 4255872468), (284285, 4265483715), (284285, 359861273), (284285, 356807290), (284285, 363158730), (284285, 364679871), (284285, 374267876), (284285, 374964355), (284285, 617397162), (284285, 621443034), (284285, 628517435), (284285, 632096325), (284285, 629972737), (284285, 631561557), (284285, 1453646501), (284285, 1453394389), (284285, 1454912549), (284285, 1464433830), (284285, 1467713759), (284285, 1472607900), (284285, 1474612360), (284285, 3239890293), (284285, 3245823575), (284285, 3250254587), (284285, 3319498880), (284285, 3318885122), (284285, 4144723400), (284285, 4148293515), (284285, 4161924759), (284285, 4163402479), (284285, 4164596973), (284285, 4169621121), (284285, 428299462), (284285, 430849026), (284285, 434528389), (284285, 3017881115), (284285, 3025060409), (284285, 3036538705), (284285, 4438208984), (284285, 4445776145), (284285, 4454725285), (284285, 4465041007), (284285, 2627315119), (284285, 2632630668), (284285, 3086180553), (284285, 4130015795), (284285, 4129535537), (284285, 4132903868), (284285, 4131879802), (284285, 3586448737), (284285, 3585257593), (284285, 3591548434), (284285, 3597136432), (284285, 2181819357), (284285, 2189693645), (284285, 2190834704), (284285, 2200077542), (284285, 2205325284), (284285, 1695969550), (284285, 3702035888), (284285, 3702913333), (284285, 3703273081), (284285, 3708070573), (284285, 3640486603), (284285, 3645099634), (284285, 3648292247), (284285, 3649412794), (284285, 3653604567), (284285, 3657341809), (284285, 3655532747), (284285, 2919734105), (284285, 2929949555), (284285, 2930746508), (284285, 2289473863), (284285, 2296411633), (284285, 2299771376), (284285, 2309048269), (284285, 1636202918), (284285, 1645959396), (284285, 1654379098), (284285, 1653545117), (284285, 3334753510), (284285, 3338599243), (284285, 3341062871), (284285, 3357318236), (284285, 1705198184), (284285, 2660109036), (284285, 2660604168), (284285, 2667238044), (284285, 2668818992), (284285, 3840835079), (284285, 3846328622), (284285, 3849715392), (284285, 2123245760), (284285, 2123831256), (284285, 2123358944), (284285, 2127196523), (284285, 2156623210), (284285, 2160175496), (284285, 2162830462), (284285, 680997030), (284285, 1557374534), (284285, 1562463496), (284285, 2588034839), (284285, 4291645864), (284285, 4291586639), (284285, 4288910191), (284285, 4298147467), (284285, 4303792264), (284285, 2221482201), (284285, 2230410656), (284285, 2226912354), (284285, 2232618144), (284285, 2241745500), (284285, 1611628179), (284285, 1620847371), (284285, 1619594895), (284285, 1621232047), (284285, 1624832068), (284285, 1622288958), (284285, 1628767303), (284285, 715301923), (284285, 762673007), (284285, 779440973), (284285, 537343574), (284285, 551389400), (284285, 558474796), (284285, 2181476454), (284285, 3824979784), (284285, 3829749701), (284285, 3829602784), (284285, 3832534806), (284285, 3833791484), (284285, 3835217665), (284285, 3835225258), (284285, 2316264651), (284285, 2316472662), (284285, 2604542625), (284285, 2610252456), (284285, 1936070412), (284285, 1939557644), (284285, 1955132989), (284285, 1963769478), (284285, 1962334784), (284285, 1440446284), (284285, 1441631203), (284285, 1448795376), (284285, 1575105042), (284285, 1578912544), (284285, 1583614545), (284285, 1908544073), (284285, 1918862607), (284285, 384818546), (284285, 386612138), (284285, 386157439), (284285, 410934606), (284285, 3384359403), (284285, 3397459330), (284285, 1755542416), (284285, 1758367607), (284285, 1764209356), (284285, 3565184557), (284285, 3571149500), (284285, 3577533637), (284285, 3578623768), (284285, 1633497595), (284285, 1249638545), (284285, 1249132525), (284285, 1251279641), (284285, 1254052680), (284285, 1259588595), (284285, 2891059727), (284285, 1844160455), (284285, 1893945497), (284285, 1902215134), (284285, 1902818884), (284285, 1904485161), (284285, 1903669559), (284285, 806886478), (284285, 814075225), (284285, 815490484), (284285, 826280584), (284285, 828708533), (284285, 685859801), (284285, 695523491), (284285, 3418048170), (284285, 3416611686), (284285, 3417502152), (284285, 3424208656), (284285, 3425996629), (284285, 3432660137), (284285, 3437811780), (284285, 3442885413), (284285, 4225832291), (284285, 2988724606), (284285, 2992734704), (284285, 2991656108), (284285, 3000263065), (284285, 3000813723), (284285, 3012919644), (284285, 3016312492), (284285, 1774510750), (284285, 1778605508), (284285, 1793359632), (284285, 1791786552), (284285, 3042958985), (284285, 3055930105), (284285, 3062660960), (284285, 3065496828), (284420, 539128223), (284420, 545479469), (284420, 554820629), (284420, 824935127), (284420, 115520963), (284420, 124027725), (284420, 761830354), (284420, 770327522), (284420, 779142990), (284420, 221396615), (284420, 226580476), (284420, 567764851), (284420, 702751748), (284420, 703343056), (284420, 710168965), (284420, 710255179), (284420, 706581110), (284420, 714736907), (284420, 718659675), (284420, 266449051), (284420, 268086034), (284420, 269348598), (284420, 180119365), (284420, 181342878), (284420, 182761887), (284420, 188577848), (284420, 206984651), (284420, 341077336), (284420, 346105362), (284420, 349672357), (284420, 351569065), (284420, 356238344), (284420, 362163171), (284420, 74356679), (284420, 76099347), (284420, 83312403), (284420, 83549510), (284420, 84557546), (284420, 791437469), (284420, 39331445), (284420, 42695382), (284420, 44976026), (284420, 45790626), (284420, 49614502), (284420, 49913708), (284420, 311776749), (284420, 311292049), (284420, 602319153), (284420, 605042484), (284420, 610296169), (284420, 611554790), (284420, 615690924), (284420, 837034831), (284420, 683484639), (284420, 684036108), (284420, 688983914), (284420, 686839120), (284420, 689928610), (284420, 865769334), (284420, 869910303), (284420, 879893854), (284420, 1697303), (284420, 6260834), (284420, 19294636), (284420, 486072716), (284420, 491193335), (284420, 492555496), (284420, 497392958), (284420, 210336339), (284420, 211860757), (284420, 213688846), (284420, 422387882), (284420, 424041189), (284420, 719643516), (284420, 29425048), (284420, 92082036), (284420, 96739409), (284420, 97800624), (284420, 97337893), (284420, 452800622), (284420, 456406796), (284420, 461540870), (284420, 464421590), (284420, 466737474), (284420, 473645423), (284420, 574296094), (284420, 573242421), (284420, 574026493), (284420, 577617819), (284420, 582590925), (284420, 582808247), (284420, 584193170), (284420, 588006353), (284420, 584878719), (284420, 590089264), (284420, 591146042), (284420, 595655923), (284420, 593333270), (284420, 142650498), (284420, 154649468), (284420, 158288622), (284420, 159733046), (284420, 160386284), (284420, 162780228), (284420, 736792752), (284420, 753378631), (284420, 753299727), (284420, 756595628), (284420, 320666263), (284420, 320356077), (284420, 321392648), (284420, 795253705), (284420, 795308538), (284420, 801593761), (284420, 810351015), (284420, 812264259), (284420, 816635806), (284420, 134552400), (284420, 134358313), (284420, 136596608), (284420, 138899145), (284420, 400306445), (284420, 403975414), (284420, 63106344), (284420, 637133359), (284420, 640704129), (284420, 639383097), (284420, 638221644), (284420, 640443440), (284420, 649494235), (284420, 654370201), (284420, 660451521), (284420, 433674322), (284420, 444356967), (284420, 449700597), (284420, 446825156), (284420, 237606548), (284420, 625295020), (284420, 626138552), (284420, 631776751), (284420, 634025163), (284420, 858217350), (284420, 859103533), (284420, 864868915), (284420, 285596176), (284420, 286694903), (284420, 301330657), (284420, 302938873), (284420, 305858325), (284420, 697345733), (284420, 701365521), (284420, 504050941), (284420, 502874016), (284420, 507356339), (284420, 523579699), (284420, 372479898), (284420, 374838099), (284420, 379566261), (284420, 380545961), (284420, 250187950), (284427, 392505551), (284427, 395651523), (284427, 401558190), (284427, 406646309), (284427, 409731287), (284427, 413609670), (284427, 414395604), (284427, 230838287), (284427, 418597068), (284427, 425648311), (284427, 433407176), (284427, 436905648), (284427, 435526791), (284427, 438153275), (284427, 445512213), (284427, 275044163), (284427, 273829489), (284427, 323666982), (284427, 325959511), (284427, 329028621), (284427, 329744850), (284427, 333257718), (284427, 527991808), (284427, 529145325), (284427, 531064604), (284427, 168456998), (284427, 172993232), (284427, 172574594), (284427, 175001222), (284427, 192361040), (284427, 197284137), (284427, 166785118), (284427, 235561491), (284427, 238193036), (284427, 238993558), (284427, 243002439), (284427, 449041407), (284427, 87027154), (284427, 92532393), (284427, 62101100), (284427, 67110341), (284427, 299121380), (284427, 338106066), (284427, 492081093), (284427, 123543582), (284427, 127859101), (284427, 132636482), (284427, 135808177), (284427, 384003532), (284427, 485960543), (284427, 486543570), (284427, 354893417), (284427, 358945218), (284427, 368267679), (284427, 370030262), (284427, 370658075), (284427, 521025752), (284427, 522173165), (284427, 321510001), (284427, 40621793), (284427, 49529220), (284427, 48664553), (284427, 203369931), (284427, 218126342), (284427, 220250159), (284427, 221979185), (284427, 186240430), (284427, 184852511), (284427, 185054426), (284427, 20311217), (284427, 20174496), (284427, 28935019), (284427, 33942277), (284427, 11268392), (284427, 13096636), (284427, 18423084), (284427, 93163524), (284427, 107085366), (284427, 110646694), (284427, 115464096), (284427, 457748267), (284427, 459063076), (284427, 458448322), (284427, 465382096), (284427, 472063680), (284427, 473272866), (284427, 472105785), (284427, 477176977), (284427, 133380466), (284427, 145753675), (284427, 149946247), (284427, 152458404), (284427, 157132206), (284427, 247819894), (284427, 255323953), (284427, 261286872), (276262, 12241502), (276262, 13647343), (276262, 198181590), (276262, 255004128), (276262, 191476906), (276262, 366216946), (276262, 157951929), (276262, 219513416), (276262, 7160282), (276262, 126115945), (276262, 78609439), (276262, 108109797), (276262, 404124285), (276329, 67649584), (276329, 372178767), (276329, 246999417), (276329, 250386040), (276329, 133096046), (276329, 102349619), (276329, 260927287), (276329, 112387366), (276329, 115922962), (276329, 142650297), (276329, 71039435), (276329, 76160804), (276329, 277617312), (276329, 282573830), (276329, 19659640), (276329, 19075347), (276329, 138616006), (276329, 313784553), (276329, 181000569), (276329, 186351646), (276329, 187254326), (276329, 207602715), (276329, 242427871), (276329, 287238498), (276329, 411900298), (276329, 167534390), (276329, 98972081), (276329, 304550306), (276329, 201405515), (276329, 342398721), (276329, 310320039), (276336, 21273207), (276336, 6843552), (276336, 18040781), (276336, 18758716), (276336, 19385659), (276416, 143538017), (276416, 148159084), (276416, 124106650), (276416, 125792472), (276416, 113629388), (276416, 134005896), (276416, 65624569), (276416, 28043912), (276416, 35408791), (276416, 7612513), (276416, 92938525), (276511, 159344994), (276511, 227121168), (276511, 233743915), (276511, 248005016), (276511, 249844151), (276511, 79967862), (276511, 84849641), (276511, 219365115), (276511, 147446961), (276511, 174338302), (276511, 24260973), (276511, 32926183), (276511, 266426359), (276511, 181357786), (276511, 182858171), (276511, 183801762), (276511, 1183208), (276511, 4154561), (276511, 4735843), (276511, 95688892), (276511, 103283877), (276511, 132322634), (276511, 6477457), (276511, 5920544), (276511, 107156789), (276511, 110970816), (276511, 112398479), (276511, 125207371), (276511, 129332450), (276511, 74064515), (276511, 73769311), (276511, 198957977), (276511, 199282143), (276511, 257523172), (276689, 137109697), (276689, 143074596), (276689, 148879715), (276689, 23929472), (276689, 27292496), (276689, 42023947), (276689, 198530398), (276689, 201728804), (276689, 202903111), (276689, 206101041), (276689, 85069330), (276689, 89384650), (276689, 115425020), (276689, 117237937), (276689, 172727967), (276689, 215560663), (276689, 8167397), (276689, 9680864), (276689, 261453453), (276689, 263199154), (276689, 77815761), (276689, 98684383), (276689, 103129126), (276689, 108532720), (276689, 1156290), (276689, 2640029), (276689, 57290075), (276689, 59748649), (276689, 20420693), (276689, 49207872), (276689, 164401024), (276689, 170474206), (276689, 171359319), (276689, 186780139), (276689, 192011862), (276689, 193051077), (276778, 16041787), (276790, 11276967), (276790, 12110486), (276790, 52748416), (276790, 23078325), (276790, 22495017), (276790, 34538441), (276790, 37589269), (276952, 124070203), (276952, 205579598), (276952, 11888053), (276952, 41857703), (276952, 44242529), (276952, 147258878), (276952, 152814611), (276952, 69524185), (276952, 70773235), (276952, 83921840), (276952, 218433117), (276952, 221081946), (276952, 225867095), (276952, 225466398), (276952, 181078925), (276952, 20310337), (276952, 23744446), (276954, 14574690), (278880, 210318172), (278880, 602265022), (278880, 676792095), (278880, 689755707), (278880, 146778511), (278880, 148342250), (278880, 255538473), (278880, 256393458), (278880, 286576235), (278880, 70264671), (278880, 74174619), (278880, 81445605), (278880, 94801954), (278880, 164505578), (278880, 202139538), (278880, 291210636), (278880, 170499965), (278880, 174445448), (278880, 187835224), (278880, 187910379), (278880, 188228430), (278880, 558085589), (278880, 322668008), (278880, 326402710), (278880, 374369278), (278880, 376121296), (278880, 380385214), (278880, 129786175), (278880, 133038506), (278880, 585833415), (278880, 587265014), (278880, 593009820), (278880, 470197912), (278880, 438328550), (278880, 439565190), (278880, 118180964), (278880, 262270235), (278880, 265998789), (278880, 268630374), (278880, 269180081), (278880, 343397990), (278880, 351883614), (278880, 33685726), (278880, 36588872), (278880, 53513443), (278880, 702200008), (278880, 542587395), (278880, 708878720), (278880, 713175974), (278880, 230061545), (278880, 235385490), (278880, 235517755), (278880, 248583650), (278880, 416560385), (278880, 418053900), (278880, 460066094), (278880, 526379537), (278880, 529065042), (278880, 481414837), (278880, 482487092), (278880, 17985738), (278880, 23266001), (278880, 67423146), (278880, 68561247), (278880, 664807109), (278880, 613104986), (278880, 720200839), (278880, 433085407), (278912, 9325788), (278912, 24180006), (278912, 391830323), (278912, 393428345), (278912, 395672838), (278912, 398174556), (278912, 402368383), (278912, 402248151), (278912, 446740704), (278912, 247226791), (278912, 210164111), (278912, 174301934), (278912, 444778724), (278912, 452320099), (278912, 523727655), (278912, 127070976), (278912, 129230005), (278912, 130967009), (278912, 64417832), (278912, 330690799), (278912, 344532504), (278912, 351056473), (278912, 356562325), (278912, 425889292), (278912, 440821328), (278912, 247472369), (278912, 254465819), (278912, 258958314), (278912, 266113254), (278912, 268525890), (278912, 268869947), (278912, 270704153), (278912, 87571939), (278912, 509095340), (278912, 554264734), (278912, 154518859), (278912, 162475008), (278912, 165148177), (278912, 370087212), (278912, 373296021), (278912, 377909850), (278912, 275131369), (278912, 110561647), (278912, 115742166), (278912, 218423882), (278912, 46664935), (278912, 477148808), (278912, 487054716), (278968, 165182532), (278968, 90174946), (278968, 89956812), (278968, 101489709), (278968, 102767612), (278968, 115572316), (278968, 73571144), (278968, 76769497), (278968, 155339552), (278968, 44114170), (278968, 250824132), (278968, 218357057), (278968, 219828633), (278968, 143260590), (278968, 70324804), (278968, 71490596), (278968, 11649887), (278968, 173738447), (278968, 198894682), (278968, 3659739), (278968, 2329077), (278968, 120012398), (278968, 122865406), (278968, 127440137), (278970, 15845225), (278970, 15760301), (278970, 18356759), (278970, 22424983), (278970, 6132230), (279169, 943996713), (279169, 945083670), (279169, 633433430), (279169, 643462941), (279169, 520296143), (279169, 575857015), (279169, 595636736), (279169, 1469883743), (279169, 1495023079), (279169, 438293368), (279169, 439642378), (279169, 442226342), (279169, 194302338), (279169, 201262625), (279169, 214362147), (279169, 219305303), (279169, 219891400), (279169, 919112711), (279169, 275333897), (279169, 273252362), (279169, 279551154), (279169, 1402864338), (279169, 1401821825), (279169, 1530082412), (279169, 1541038448), (279169, 377875241), (279169, 384300248), (279169, 792841748), (279169, 1447900865), (279169, 1454385855), (279169, 1457631427), (279169, 1461591590), (279169, 612607030), (279169, 1031987980), (279169, 1563254647), (279169, 171512400), (279169, 178315806), (279169, 1103410929), (279169, 1109269936), (279169, 1118067608), (279169, 1502738552), (279169, 1506590293), (279169, 1510296981), (279169, 1211088344), (279169, 1211046418), (279169, 1227526456), (279169, 1231226864), (279169, 1240810263), (279169, 1626433282), (279169, 1644149115), (279169, 1651353222), (279169, 1652072980), (279169, 74878768), (279169, 74272943), (279169, 79981385), (279169, 98877310), (279169, 99460073), (279169, 887998446), (279169, 1312869297), (279169, 1314976476), (279169, 1362180102), (279169, 301744794), (279169, 307888886), (279169, 323690739), (279169, 1246287325), (279169, 1261465613), (279169, 1266924280), (279169, 987341454), (279169, 987577577), (279169, 988458822), (279169, 707648124), (279169, 707568505), (279169, 717681383), (279169, 723981578), (279169, 481962563), (279169, 487473644), (279169, 488883027), (279169, 492009472), (279169, 493588232), (279169, 495697730), (279169, 1600602838), (279169, 1601131811), (279169, 1620265042), (279169, 1052348336), (279169, 1055573472), (279169, 1063099189), (279169, 843802936), (279169, 845268121), (279169, 852984357), (279169, 861205000), (279169, 868808229), (279169, 898947734), (279169, 915126543), (279169, 393777873), (279169, 412778817), (279169, 834609284), (279169, 836143404), (279169, 840498834), (279169, 843015382), (279169, 337210178), (279169, 340406409), (279169, 343555274), (279169, 550545934), (279169, 555766315), (279169, 679173076), (279169, 680351387), (279169, 691777525), (279169, 691072555), (279169, 701892284), (279169, 292554193), (279169, 1408623093), (279169, 1425453083), (279169, 1434103497), (279169, 223326543), (279169, 1276286341), (279169, 1386275048), (279169, 764020905), (279169, 773224456), (279169, 775604446), (279169, 656640231), (279169, 670951445), (279169, 738857915), (279169, 746714708), (279169, 10495054), (279169, 14241626), (279169, 38752459), (279169, 42158648), (279169, 56057584), (279169, 62105065), (279169, 75106139), (279169, 104712796), (279169, 110649292), (279169, 1157924659), (279169, 1157392517), (279169, 1163371091), (279169, 1175355814), (279169, 1173940835), (279169, 1325159713), (279169, 964857934), (279169, 974587831), (279169, 981256056), (279169, 255320225), (279169, 1142754619), (279169, 20613346), (279169, 22695063), (279169, 22325424), (279169, 27853806), (279169, 27346911), (279169, 1585273614), (279169, 1593711986), (279169, 117668500), (279169, 129461531), (279169, 153607428), (279169, 157204853), (279169, 446801433), (279169, 455096017), (279169, 456322832), (279259, 7382766), (279259, 189538654), (279259, 102973716), (279259, 101874907), (279259, 132973056), (279259, 138363059), (279259, 80747505), (279259, 84429720), (279259, 85725926), (279259, 87470015), (279259, 109137471), (279259, 121163788), (279259, 127555797), (279259, 127082625), (279259, 127666691), (279259, 131478932), (279259, 10070234), (279259, 13036249), (279259, 164655706), (279259, 30998749), (279259, 50182595), (279279, 157765700), (279279, 168431568), (279279, 169652815), (279279, 67409918), (279279, 85068026), (279279, 85127053), (279279, 290268491), (279279, 299528243), (279279, 299566094), (279279, 302116573), (279279, 307050736), (279279, 309944889), (279279, 447787237), (279279, 453259422), (279279, 483013239), (279279, 485476237), (279279, 486723062), (279279, 126953859), (279279, 126802184), (279279, 254565509), (279279, 410226903), (279279, 412237714), (279279, 415017426), (279279, 419043534), (279279, 433225859), (279279, 37607554), (279279, 40198656), (279279, 41247657), (279279, 41110764), (279279, 43339592), (279279, 177409592), (279279, 2092291), (279279, 2820861), (279279, 398014464), (279279, 109275223), (279279, 221870318), (279279, 223467366), (279279, 224901359), (279279, 227022877), (279279, 228353326), (279279, 237957054), (279279, 10109417), (279279, 13987633), (279279, 96812330), (279279, 364090925), (279279, 363952307), (279279, 270819332), (279279, 274604367), (279279, 282865118), (279279, 285082097), (279279, 285292483), (279279, 368048886), (279279, 373448746), (279279, 384438338), (279279, 145606367), (279279, 154558799), (279284, 28905365), (279284, 130411483), (279284, 136143656), (279284, 829015000), (279284, 835342939), (279284, 837716724), (279284, 837366208), (279284, 394256920), (279284, 415461541), (279284, 2233942), (279284, 5383290), (279284, 4962413), (279284, 460276836), (279284, 607205529), (279284, 612988048), (279284, 501138096), (279284, 502913949), (279284, 761425665), (279284, 801288658), (279284, 711776478), (279284, 654380441), (279284, 687703411), (279284, 484577148), (279284, 514082039), (279284, 514885483), (279284, 280743447), (279284, 282317355), (279284, 283789373), (279284, 294779317), (279284, 296376533), (279284, 154051371), (279284, 155181782), (279284, 743942311), (279284, 59447991), (279284, 68941988), (279284, 73656051), (279284, 77895813), (279284, 83709286), (279284, 344485613), (279284, 352887723), (279284, 433393828), (279284, 574089358), (279284, 577247890), (279284, 587648267), (279284, 589509722), (279284, 537429716), (279284, 48378100), (279284, 52885094), (279284, 854511572), (279284, 862036119), (279284, 238168122), (279284, 635300126), (279284, 639849600), (279284, 669783559), (279284, 671430320), (279284, 679269563), (279284, 248397464), (279284, 248662417), (279284, 251367153), (279284, 269248448), (279284, 272268398), (279284, 85331968), (279284, 89642837), (279284, 177128897), (279284, 185555331), (279284, 191882785), (279284, 447640716), (279284, 472040355), (279284, 473125716), (279284, 476588693), (279284, 311601042), (279284, 331197293), (279284, 372210446), (279284, 544739342), (279284, 547223675), (279284, 562957561), (279284, 213125379), (279284, 219938554), (279284, 232966410), (279345, 520602143), (279345, 288259752), (279345, 287864601), (279345, 299122084), (279345, 172001233), (279345, 174561880), (279345, 868237357), (279345, 871382796), (279345, 409098444), (279345, 415021297), (279345, 425620990), (279345, 986389970), (279345, 988615034), (279345, 436533637), (279345, 438627316), (279345, 495882386), (279345, 501744769), (279345, 1035190249), (279345, 353160612), (279345, 352651640), (279345, 355025669), (279345, 362343899), (279345, 387977378), (279345, 391534047), (279345, 140224469), (279345, 142067599), (279345, 240762906), (279345, 239642198), (279345, 598401438), (279345, 833596648), (279345, 836382436), (279345, 839222405), (279345, 855322438), (279345, 855083629), (279345, 854708266), (279345, 854585572), (279345, 1212650394), (279345, 538114794), (279345, 540618998), (279345, 738298753), (279345, 745585855), (279345, 771636157), (279345, 959810044), (279345, 230122533), (279345, 232017519), (279345, 235776182), (279345, 243152325), (279345, 163235851), (279345, 211866800), (279345, 1070785781), (279345, 1072388432), (279345, 1074858200), (279345, 1074108987), (279345, 1076452646), (279345, 1076024173), (279345, 1080436445), (279345, 1080239910), (279345, 559910786), (279345, 822683782), (279345, 1288844147), (279345, 1287915007), (279345, 217003404), (279345, 226238055), (279345, 304060822), (279345, 286949721), (279345, 5123407), (279345, 721857512), (279345, 785702676), (279345, 88352598), (279345, 1270445702), (279345, 271977692), (279345, 885256205), (279345, 891679622), (279345, 943499700), (279345, 946809273), (279345, 664254380), (279345, 670608593), (279345, 110996821), (279345, 112071858), (279345, 115874894), (279345, 128839186), (279345, 1014928454), (279345, 362828182), (279345, 708545744), (279345, 726001340), (279345, 902047367), (279345, 908118968), (279345, 911886178), (279345, 922167447), (279345, 785822161), (279345, 935610164), (279345, 1224224035), (279345, 345742201), (279345, 1105239291), (279345, 1162661409), (279345, 1170563502), (279345, 618487713), (279345, 994488043), (279345, 996787419), (279345, 1009472954), (279345, 1067422589), (279345, 1318184448), (279345, 1321398967), (279345, 1325145992), (279345, 1326432358), (279345, 1327204644), (279345, 1344880322), (279345, 95625492), (279345, 96220242), (279345, 1210248345), (279345, 1327837723), (279345, 1335034130), (279345, 1334771383), (279345, 632480228), (279345, 635028969), (279345, 636606307), (279345, 638759437), (279345, 447501400), (279345, 449630229), (279345, 467888331), (279345, 468707961), (279345, 471549014), (279345, 929791657), (279345, 318807004), (279345, 317523398), (279345, 319990672), (279345, 323366206), (279345, 8164514), (279345, 11556745), (279345, 16486019), (279345, 18358344), (279345, 45118043), (279345, 46521827), (279345, 815036794), (279345, 30445828), (279515, 3962434), (279515, 6025764), (279598, 1388891327), (279598, 1394176644), (279598, 1402783909), (279598, 1414448132), (279598, 973620427), (279598, 979595015), (279598, 1357688820), (279598, 1367718704), (279598, 1295010706), (279598, 1325608057), (279598, 1325292726), (279598, 1331886192), (279598, 1333373735), (279598, 968291813), (279598, 778914918), (279598, 791411562), (279598, 792167092), (279598, 793569288), (279598, 802113884), (279598, 374698810), (279598, 1087649368), (279598, 1086700195), (279598, 1099884791), (279598, 1100165415), (279598, 166600860), (279598, 183119109), (279598, 189322469), (279598, 574322297), (279598, 1476144889), (279598, 1480949682), (279598, 1495046331), (279598, 318291690), (279598, 325819776), (279598, 325662467), (279598, 330550056), (279598, 330805523), (279598, 337870049), (279598, 1168991694), (279598, 1462950863), (279598, 1472530964), (279598, 46900118), (279598, 50172613), (279598, 134367249), (279598, 135152816), (279598, 138378804), (279598, 139400399), (279598, 143550149), (279598, 636050899), (279598, 640113663), (279598, 645427167), (279598, 654528034), (279598, 188545455), (279598, 195185261), (279598, 226348599), (279598, 228384923), (279598, 690706845), (279598, 694306428), (279598, 706586806), (279598, 274219499), (279598, 280547611), (279598, 385199347), (279598, 393248273), (279598, 462195139), (279598, 447756374), (279598, 452728423), (279598, 65573096), (279598, 77298165), (279598, 144551097), (279598, 154392977), (279598, 751497185), (279598, 766523514), (279598, 766040455), (279598, 459560248), (279598, 1037949989), (279598, 1045713975), (279598, 230240202), (279598, 232625906), (279598, 243269391), (279598, 242906848), (279598, 983813384), (279598, 57268567), (279598, 75977588), (279598, 85810638), (279598, 946421835), (279598, 948621510), (279598, 884694866), (279598, 1137834059), (279598, 103977647), (279598, 114269921), (279598, 112714572), (279598, 621897976), (279598, 624834907), (279598, 624080216), (279598, 626422330), (279598, 627832560), (279598, 630342724), (279598, 1235398562), (279598, 1237488346), (279598, 1239492690), (279598, 1283427434), (279598, 1384764421), (279598, 515633192), (279598, 529583548), (279598, 1207920667), (279598, 1209120259), (279598, 1216893537), (279598, 1228972019), (279598, 1227261582), (279598, 666698134), (279598, 671396538), (279598, 677029107), (279598, 1112966914), (279598, 1114815598), (279598, 1175389910), (279598, 1177181779), (279598, 1178599861), (279598, 1183212184), (279598, 1185121044), (279598, 1187097618), (279598, 1253293190), (279598, 1254691608), (279598, 1258902383), (279598, 1342732987), (279598, 1348632307), (279598, 202102884), (279598, 206321910), (279598, 735859214), (279598, 736132092), (279598, 917868637), (279598, 920180716), (279598, 985622816), (279598, 994793323), (279598, 997881402), (279598, 999419684), (279598, 857365954), (279598, 856326326), (279598, 1145231627), (279598, 1149974331), (279598, 1154115475), (279598, 1189717883), (279598, 1197191331), (279598, 1198249657), (279598, 850139548), (279598, 853681341), (279598, 866434381), (279598, 876900879), (279598, 892730309), (279598, 898433744), (279598, 902822367), (279598, 905176377), (279598, 1418666154), (279598, 1417706379), (279598, 1446180251), (279598, 1447516086), (279598, 1452474604), (279598, 720949184), (279598, 1502027023), (279598, 1503190290), (279598, 1502430080), (279598, 1510860539), (279598, 551627349), (279598, 601203267), (279598, 602094181), (279598, 314197678), (279598, 925078528), (279598, 929238548), (279598, 935507622), (279598, 9198293), (279598, 11441207), (279598, 13672638), (279598, 1561732067), (279598, 1561952673), (279598, 1565191883), (279598, 432956996), (279598, 433448327), (279598, 437574148), (279598, 288344344), (279598, 1555272155), (279598, 350407838), (279598, 352028446), (279598, 358330446), (279598, 527123760), (279598, 527808485), (279598, 589276780), (279598, 1616503410), (279598, 1616885503), (279598, 1543088721), (279598, 1590951544), (279598, 1593452632), (279598, 1600151675), (279598, 1004261079), (279598, 1002572312), (279598, 1006881782), (279598, 1010589620), (279598, 1014570747), (279598, 1015903907), (279598, 1624740973), (279598, 1643829316), (279685, 569724665), (279685, 902029287), (279685, 906221432), (279685, 905353716), (279685, 908822177), (279685, 1587215741), (279685, 102225689), (279685, 111265479), (279685, 112437604), (279685, 117232487), (279685, 170008812), (279685, 173618549), (279685, 172685200), (279685, 548219355), (279685, 548775161), (279685, 551082383), (279685, 572228553), (279685, 584895490), (279685, 859593162), (279685, 1019141524), (279685, 1041391686), (279685, 1043945604), (279685, 75254343), (279685, 82429255), (279685, 90451060), (279685, 98910890), (279685, 308173810), (279685, 307481942), (279685, 1077573297), (279685, 1079943156), (279685, 994915396), (279685, 1058293500), (279685, 1059691471), (279685, 1060524274), (279685, 1084232152), (279685, 1085663679), (279685, 757468064), (279685, 758660432), (279685, 1449718623), (279685, 1449419797), (279685, 1448800734), (279685, 1458862243), (279685, 931230941), (279685, 1787373449), (279685, 1273019788), (279685, 1623723627), (279685, 1627345414), (279685, 1665215377), (279685, 941561732), (279685, 945808152), (279685, 952069422), (279685, 959386543), (279685, 957489617), (279685, 960091593), (279685, 601199047), (279685, 610366173), (279685, 632813454), (279685, 1825441210), (279685, 1826135061), (279685, 447177602), (279685, 450784276), (279685, 1114561661), (279685, 1145965756), (279685, 1301362874), (279685, 1305530278), (279685, 744120151), (279685, 1479609626), (279685, 1481369452), (279685, 1487977743), (279685, 1486709793), (279685, 1493011696), (279685, 222575576), (279685, 225567252), (279685, 230102870), (279685, 1498853), (279685, 3354467), (279685, 1101776168), (279685, 46448084), (279685, 54285602), (279685, 58410530), (279685, 1182376397), (279685, 1240387257), (279685, 1496184362), (279685, 1817476143), (279685, 648076843), (279685, 651304603), (279685, 660023662), (279685, 659626008), (279685, 66462959), (279685, 68135525), (279685, 26480868), (279685, 497932998), (279685, 178592801), (279685, 179247331), (279685, 1692021026), (279685, 1698150911), (279685, 1717769174), (279685, 1795794646), (279685, 1810537926), (279685, 463073158), (279685, 467817677), (279685, 470133770), (279685, 476165445), (279685, 478420692), (279685, 484119678), (279685, 1474311126), (279685, 252408862), (279685, 616175955), (279685, 615044725), (279685, 617188215), (279685, 710888398), (279685, 717128856), (279685, 1824722195), (279685, 1828119641), (279685, 255853864), (279685, 157159798), (279685, 185747999), (279685, 185578178), (279685, 187779327), (279685, 1216555452), (279685, 1744754317), (279685, 1747211832), (279685, 1748341060), (279685, 1753005273), (279685, 402618250), (279685, 404631466), (279685, 119795507), (279685, 120091061), (279685, 211043904), (279685, 1171421202), (279685, 134159756), (279685, 141460532), (279685, 147255417), (279685, 155870083), (279685, 378532264), (279685, 665461073), (279685, 667677456), (279685, 671112770), (279685, 672741895), (279685, 696755721), (279685, 695307543), (279685, 697244349), (279685, 701432480), (279685, 706392932), (279685, 796806157), (279685, 806779151), (279685, 1546891437), (279685, 1549430039), (279685, 1550267182), (279685, 1552145210), (279685, 1553505171), (279685, 1559780666), (279685, 1562932412), (279685, 1573740582), (279685, 1575135572), (279685, 1576802830), (279685, 967514807), (279685, 967681480), (279685, 973546702), (279685, 973249481), (279685, 528038554), (279685, 1222927166), (279685, 1225955645), (279685, 1154233143), (279685, 841042729), (279685, 845988910), (279685, 847464153), (279685, 847679312), (279685, 897288539), (279685, 1259574788), (279685, 327324918), (279685, 350271855), (279685, 353883987), (279685, 1682320978), (279685, 1727605776), (279685, 1732050788), (279685, 1734545390), (279685, 777495529), (279685, 785254618), (279685, 916319792), (279685, 926937122), (279685, 598508746), (279685, 679806409), (279685, 687090831), (279685, 1372152899), (279685, 1377678026), (279685, 1386934868), (279685, 1389046709), (279685, 1397343325), (279685, 1338092042), (279685, 1339637549), (279685, 1600116897), (279685, 1607910084), (279685, 1610191079), (279685, 1611562685), (279685, 1617446423), (279685, 1364914813), (279685, 771342809), (279685, 770222271), (279685, 769856136), (279685, 1759463409), (279685, 1758881557), (279685, 1770512895), (279685, 1770039305), (279764, 5819788), (279764, 147785766), (279764, 40232410), (279813, 616466172), (279813, 619809037), (279813, 635457094), (279813, 642836718), (279813, 97955957), (279813, 102338113), (279813, 107652008), (279813, 106361232), (279813, 120228827), (279813, 299404856), (279813, 303064762), (279813, 128018090), (279813, 130202428), (279813, 130015733), (279813, 139140794), (279813, 140139893), (279813, 146724224), (279813, 43947930), (279813, 45549576), (279813, 52577520), (279813, 3658787), (279813, 5210712), (279813, 1154321916), (279813, 1158790717), (279813, 1159090290), (279813, 1165572770), (279813, 754406947), (279813, 756800398), (279813, 761144976), (279813, 768822871), (279813, 853840890), (279813, 211655354), (279813, 221445554), (279813, 222492549), (279813, 789441169), (279813, 791778110), (279813, 797592164), (279813, 440447256), (279813, 444048352), (279813, 447706527), (279813, 451702099), (279813, 460232356), (279813, 461352233), (279813, 464634867), (279813, 646372100), (279813, 647978944), (279813, 654188675), (279813, 405800339), (279813, 409339907), (279813, 410688911), (279813, 1068596105), (279813, 1102506220), (279813, 1115180157), (279813, 333100810), (279813, 332941516), (279813, 682743143), (279813, 681445084), (279813, 701309533), (279813, 702546536), (279813, 707476487), (279813, 484253053), (279813, 559204132), (279813, 559137019), (279813, 563071462), (279813, 576910951), (279813, 971824075), (279813, 160199615), (279813, 163499359), (279813, 168546333), (279813, 1178568495), (279813, 1215922757), (279813, 1226590420), (279813, 1235865797), (279813, 1197688367), (279813, 1205015713), (279813, 1242594781), (279813, 1245317384), (279813, 998085516), (279813, 369482646), (279813, 498844966), (279813, 388459936), (279813, 391427043), (279813, 870999559), (279813, 880378200), (279813, 249523725), (279813, 260842731), (279813, 15368714), (279813, 24934870), (279813, 26265330), (279813, 985775743), (279813, 1030903032), (279813, 1100057814), (279813, 720370499), (279813, 1125950845), (279813, 1135480408), (279813, 1148403014), (279813, 174172890), (279813, 188787273), (279813, 198702267), (279813, 261175451), (279813, 265130671), (279813, 281487612), (279813, 279948829), (279813, 280070287), (279813, 287516402), (279813, 1033632667), (279813, 1037311167), (279813, 1050859949), (279813, 1054815393), (279813, 1055943910), (279813, 887283232), (279813, 886117066), (279813, 895690048), (279813, 904706566), (279813, 907326665), (279813, 803716262), (279813, 816588518), (279813, 64799420), (279813, 68953861), (279813, 69378380), (279813, 85998116), (279813, 930068729), (279813, 931303409), (279867, 276462710), (279867, 283478093), (279867, 40374415), (279867, 48205478), (279867, 57832404), (279867, 220727668), (279867, 225201413), (279867, 230083828), (279867, 234090186), (279867, 238214821), (279867, 152315704), (279867, 173150219), (279867, 552916125), (279867, 553492391), (279867, 578475797), (279867, 576636245), (279867, 584246967), (279867, 587806044), (279867, 593262754), (279867, 251156171), (279867, 254720060), (279867, 256562575), (279867, 260388389), (279867, 656092326), (279867, 662938194), (279867, 375865760), (279867, 382566734), (279867, 384262353), (279867, 391137986), (279867, 397526232), (279867, 397540041), (279867, 400144067), (279867, 404250675), (279867, 404098489), (279867, 71976189), (279867, 79482015), (279867, 79330119), (279867, 119159109), (279867, 131839848), (279867, 132829782), (279867, 420847658), (279867, 435767466), (279867, 437218546), (279867, 439333394), (279867, 445515368), (279867, 448633490), (279867, 298901939), (279867, 298322683), (279867, 301192556), (279867, 305637241), (279867, 321738423), (279867, 565324594), (279867, 198556976), (279867, 200365902), (279867, 507533248), (279867, 506970520), (279867, 539183937), (279867, 523629106), (279867, 527358731), (279867, 102905619), (279867, 110790455), (279867, 607416904), (279867, 636596608), (279867, 637566889), (279867, 650399144), (279867, 481990882), (279867, 406846348), (279867, 413020649), (279867, 414061437), (279867, 464538507), (279867, 470960911), (279867, 377607978), (279867, 330766943), (279867, 336013625), (279867, 347635818), (279867, 15012112), (279867, 30367924), (279928, 7904736), (279928, 9543411), (279928, 12132872), (279928, 10267765), (279928, 13923914), (279932, 998123955), (279932, 364772005), (279932, 994715156), (279932, 1005236149), (279932, 1025399141), (279932, 468459692), (279932, 475890612), (279932, 480958467), (279932, 482504840), (279932, 756247031), (279932, 781018138), (279932, 779002166), (279932, 8599822), (279932, 11297069), (279932, 13758917), (279932, 18341275), (279932, 23782059), (279932, 32004457), (279932, 42835472), (279932, 57139278), (279932, 61398373), (279932, 655807898), (279932, 656157158), (279932, 669401622), (279932, 670162684), (279932, 683482319), (279932, 483179039), (279932, 487609186), (279932, 529394225), (279932, 533504637), (279932, 534178827), (279932, 817866564), (279932, 816951913), (279932, 818753917), (279932, 819868781), (279932, 837041074), (279932, 537387934), (279932, 539808166), (279932, 789532614), (279932, 789657845), (279932, 808591363), (279932, 942574028), (279932, 955031554), (279932, 967752540), (279932, 975385966), (279932, 984086477), (279932, 713773421), (279932, 717300387), (279932, 324553947), (279932, 334270094), (279932, 335402320), (279932, 335293482), (279932, 342731578), (279932, 343360308), (279932, 346826503), (279932, 108413293), (279932, 111805388), (279932, 113513911), (279932, 587004807), (279932, 589257352), (279932, 589655067), (279932, 598241304), (279932, 645215674), (279932, 648275647), (279932, 650544540), (279932, 650704969), (279932, 612999477), (279932, 624961067), (279932, 624870367), (279932, 289855172), (279932, 298845396), (279932, 382890312), (279932, 384772370), (279932, 394903722), (279932, 403247539), (279932, 407152872), (279932, 504185577), (279932, 509093509), (279932, 508082245), (279932, 511656679), (279932, 521597703), (279932, 522413971), (279932, 914749114), (279932, 932025556), (279932, 198622212), (279932, 204366335), (279932, 244685199), (279932, 244026524), (279932, 244238860), (279932, 266770046), (279932, 282178729), (279932, 215396000), (279932, 231451835), (279932, 237463069), (279932, 244724002), (279932, 428678783), (279932, 355284109), (279932, 357576354), (279932, 377540805), (279932, 164032909), (279932, 694033901), (279932, 717728719), (279932, 719205259), (279932, 721348777), (279932, 723676165), (279932, 725029952), (279932, 728355726), (279932, 126115705), (279932, 137736437), (279932, 146822795), (279932, 149518335), (279932, 170531949), (279932, 174834997), (279932, 172400430), (279932, 181016157), (279932, 184914053), (279932, 897126465), (279932, 944327392), (279932, 944128650), (279932, 968702873), (279932, 735075940), (279932, 863481189), (279932, 870290007), (279932, 880476512), (279932, 882826003), (279932, 430969735), (279932, 436899787), (279932, 438809167), (279932, 441542389), (279932, 448622663), (279932, 449855856), (279932, 315692580), (279932, 319865821), (279932, 324410202), (279984, 203574371), (279984, 209494295), (279984, 226576929), (279984, 704677185), (279984, 725065273), (279984, 1439950282), (279984, 1467346953), (279984, 132238512), (279984, 431702444), (279984, 438988933), (279984, 441301622), (279984, 286135090), (279984, 296404412), (279984, 660624978), (279984, 662480441), (279984, 668485621), (279984, 696383882), (279984, 871248035), (279984, 1374875253), (279984, 566194111), (279984, 567007312), (279984, 574983306), (279984, 576866499), (279984, 1021322692), (279984, 177530616), (279984, 183527026), (279984, 184583254), (279984, 1111779127), (279984, 1121587255), (279984, 1127647502), (279984, 1133875712), (279984, 1342363616), (279984, 1346473479), (279984, 1348345553), (279984, 1351367224), (279984, 1356393695), (279984, 1357845360), (279984, 1360145796), (279984, 1478546588), (279984, 1479723233), (279984, 1479556604), (279984, 612588484), (279984, 621139315), (279984, 638134633), (279984, 649232536), (279984, 651233229), (279984, 632328323), (279984, 635344308), (279984, 377026438), (279984, 1294597823), (279984, 1295812372), (279984, 1300422864), (279984, 1318499940), (279984, 1391311353), (279984, 1395298056), (279984, 1403930012), (279984, 910584338), (279984, 915779140), (279984, 918777379), (279984, 1053399407), (279984, 1055807660), (279984, 89828430), (279984, 91910483), (279984, 104113253), (279984, 115354325), (279984, 1171798273), (279984, 1175375807), (279984, 1176891721), (279984, 1179008859), (279984, 1183606039), (279984, 1143860751), (279984, 1148604631), (279984, 1149254523), (279984, 1159875136), (279984, 1231063345), (279984, 820536378), (279984, 820836378), (279984, 824599473), (279984, 826173615), (279984, 830614230), (279984, 837218918), (279984, 12778623), (279984, 466189416), (279984, 471202313), (279984, 586104960), (279984, 598971757), (279984, 980040724), (279984, 1075070408), (279984, 1076778676), (279984, 1096572243), (279984, 1097230136), (279984, 796893590), (279984, 803375607), (279984, 807804261), (279984, 818481701), (279984, 238278996), (279984, 244367499), (279984, 242452118), (279984, 1259816663), (279984, 1272290835), (279984, 1277090444), (279984, 1277682507), (279984, 163377331), (279984, 194595648), (279984, 194918883), (279984, 539118309), (279984, 548242271), (279984, 128843345), (279984, 502122075), (279984, 511562984), (279984, 512742536), (279984, 512165378), (279984, 523680108), (279984, 525423661), (279984, 1199110775), (279984, 1219873554), (279984, 328987017), (279984, 341031913), (279984, 356654933), (279984, 1411309100), (279984, 1419513519), (279984, 1433269542), (279984, 1441285496), (279984, 25077169), (279984, 27537063), (279984, 32563160), (279984, 39885749), (279984, 305895209), (279984, 309206165), (279984, 308155401), (279984, 322667967), (279984, 1002613611), (279984, 1012315666), (279984, 1015736657), (279984, 395391978), (279984, 399735682), (279984, 1067305476), (279984, 1072074541), (279984, 61881584), (279984, 66529886), (279984, 774111109), (279984, 776114527), (279984, 784425595), (279984, 677779731), (279984, 682195540), (279984, 743171650), (279984, 743165336), (279984, 749235945), (279984, 415868084), (279984, 415447915), (279984, 56984747), (279984, 58416632), (279984, 60491232), (279984, 123743894), (279984, 127103528), (279984, 473768215), (279984, 488222088), (279984, 500081545), (279984, 274552281), (279984, 341306171), (279984, 345399690), (279984, 346526187), (279984, 154874931), (279984, 152774031), (279984, 927028121), (279984, 941866077), (279984, 942073042), (279984, 940069951), (280231, 2173299266), (280231, 2212872429), (280231, 2216552214), (280231, 1449968217), (280231, 1527271497), (280231, 1534504071), (280231, 1541691770), (280231, 1545610057), (280231, 1552437414), (280231, 2233292561), (280231, 2237120544), (280231, 2237811313), (280231, 2246005121), (280231, 369689579), (280231, 367543760), (280231, 1458179665), (280231, 1474698197), (280231, 1482665388), (280231, 1156069677), (280231, 1157252005), (280231, 1158855586), (280231, 1164197770), (280231, 1180553520), (280231, 1180765527), (280231, 793501146), (280231, 1667479009), (280231, 1676573399), (280231, 1687565918), (280231, 1692799960), (280231, 1698406588), (280231, 1697220415), (280231, 2044826238), (280231, 971849653), (280231, 1002395450), (280231, 1013068944), (280231, 945670592), (280231, 953019147), (280231, 1260055395), (280231, 1263800365), (280231, 1268507030), (280231, 1269911400), (280231, 1273571681), (280231, 1278011838), (280231, 38558870), (280231, 40878906), (280231, 61455973), (280231, 66713800), (280231, 1339192349), (280231, 1344392823), (280231, 217745065), (280231, 227728751), (280231, 231636765), (280231, 235466307), (280231, 2012570930), (280231, 2016636496), (280231, 671510359), (280231, 434101590), (280231, 443192737), (280231, 450134377), (280231, 459055082), (280231, 460538315), (280231, 1973708885), (280231, 1980187692), (280231, 855957288), (280231, 854394699), (280231, 869243622), (280231, 873562692), (280231, 876920574), (280231, 875530537), (280231, 880532971), (280231, 881173153), (280231, 1315844372), (280231, 1313857790), (280231, 1321860185), (280231, 1326534006), (280231, 1356225718), (280231, 1375092666), (280231, 196298124), (280231, 1949842409), (280231, 1931123628), (280231, 1930664315), (280231, 89110006), (280231, 91182123), (280231, 95836512), (280231, 100768792), (280231, 108884461), (280231, 111613478), (280231, 2087566099), (280231, 2096000312), (280231, 2096781713), (280231, 2100684572), (280231, 2103911713), (280231, 2119938426), (280231, 471164304), (280231, 473567922), (280231, 473221885), (280231, 473991357), (280231, 479249399), (280231, 488312835), (280231, 490615902), (280231, 1520861485), (280231, 1528260441), (280231, 1635043760), (280231, 1634847333), (280231, 1640387994), (280231, 1639530458), (280231, 1958665413), (280231, 1964739554), (280231, 1972308456), (280231, 2140453858), (280231, 2148717251), (280231, 2151283867), (280231, 2153712104), (280231, 2161705125), (280231, 2162933936), (280231, 2163098832), (280231, 1655056891), (280231, 1654594888), (280231, 1578063704), (280231, 1581115715), (280231, 1588933605), (280231, 1620659373), (280231, 1621635609), (280231, 561112136), (280231, 569793875), (280231, 1701958330), (280231, 1716112176), (280231, 1718629600), (280231, 12832494), (280231, 11445384), (280231, 13101419), (280231, 14209417), (280231, 19447751), (280231, 19967925), (280231, 27121746), (280231, 1243456494), (280231, 1260778712), (280231, 606171478), (280231, 615592694), (280231, 49282306), (280231, 48459971), (280231, 49570849), (280231, 50060693), (280231, 54294670), (280231, 73396555), (280231, 591443490), (280231, 622639558), (280231, 631088748), (280231, 631753816), (280231, 638446503), (280231, 647084730), (280231, 647441215), (280231, 1072450928), (280231, 1080299669), (280231, 1088259805), (280231, 1093289411), (280231, 400797053), (280231, 407606480), (280231, 417324542), (280231, 420912100), (280231, 1049057108), (280231, 1057775763), (280231, 495433553), (280231, 497678002), (280231, 496555495), (280231, 541558273), (280231, 2028905291), (280231, 2032968631), (280231, 348600562), (280231, 349861950), (280231, 1386675206), (280231, 1387030296), (280231, 1395214136), (280231, 1395978315), (280231, 1413343276), (280231, 1415373351), (280231, 2225072885), (280231, 308583604), (280231, 650446390), (280231, 801609983), (280231, 812889623), (280231, 895818306), (280231, 897375449), (280231, 898263363), (280231, 902393965), (280231, 136391466), (280231, 144644538), (280231, 758891910), (280231, 758987458), (280231, 770711413), (280231, 837219032), (280231, 842594902), (280231, 852619081), (280231, 2189604584), (280231, 1912203263), (280231, 1914766176), (280231, 707984122), (280231, 712923693), (280231, 1500562379), (280231, 1508198363), (280231, 1507843608), (280231, 1097216072), (280231, 1099777576), (280231, 1106135966), (280231, 1116050195), (280231, 1116882997), (280231, 341892480), (280231, 345016738), (280231, 2120184031), (280231, 691741058), (280231, 731223052), (280231, 741232200), (280231, 508826854), (280231, 521848336), (280231, 1212711538), (280231, 1215676249), (280231, 302371622), (280231, 317351811), (280231, 327312659), (280231, 980624274), (280231, 1022196008), (280231, 1026226964), (280231, 1031787135), (280231, 996629778), (280231, 1000502763), (280231, 262686527), (280231, 272031523), (280231, 274498243), (280231, 286401785), (280231, 1575675636), (280231, 1607855932), (280231, 163417619), (280231, 165752059), (280231, 175324013), (280231, 179745591), (280231, 181073967), (280231, 536480514), (280231, 245281313), (280231, 921620215), (280231, 1995330311), (280231, 2058751034), (280319, 562029959), (280319, 567143828), (280319, 573275578), (280319, 591403563), (280319, 733740633), (280319, 1523819931), (280319, 281959301), (280319, 290356572), (280319, 336382906), (280319, 367243891), (280319, 369071591), (280319, 367052586), (280319, 1080619643), (280319, 810881493), (280319, 212091003), (280319, 271544005), (280319, 1167221976), (280319, 1203245495), (280319, 1206062859), (280319, 1205889842), (280319, 179803922), (280319, 179756949), (280319, 184887165), (280319, 194079815), (280319, 563318190), (280319, 695883268), (280319, 695447406), (280319, 701649500), (280319, 509676059), (280319, 512035916), (280319, 513593907), (280319, 515140366), (280319, 518901728), (280319, 524487015), (280319, 1036903160), (280319, 1034517720), (280319, 785236144), (280319, 790450488), (280319, 24388459), (280319, 27495707), (280319, 30626154), (280319, 278408387), (280319, 774601762), (280319, 826676971), (280319, 832932290), (280319, 833909729), (280319, 1120682424), (280319, 528264020), (280319, 318047356), (280319, 319639794), (280319, 326288942), (280319, 1525417169), (280319, 1534808191), (280319, 1537085700), (280319, 1550724777), (280319, 1555280491), (280319, 633887102), (280319, 634398978), (280319, 640806170), (280319, 1691227729), (280319, 227574195), (280319, 239073291), (280319, 1805498900), (280319, 1717915951), (280319, 1176247), (280319, 1883466548), (280319, 1888059765), (280319, 1994844252), (280319, 952055843), (280319, 950653148), (280319, 953307970), (280319, 974019669), (280319, 981646637), (280319, 1090291013), (280319, 1091898446), (280319, 1102018261), (280319, 868271764), (280319, 1225829518), (280319, 1228858773), (280319, 1266571891), (280319, 1268793110), (280319, 1275046676), (280319, 1983955191), (280319, 1989324817), (280319, 1927883623), (280319, 1936849157), (280319, 1936707257), (280319, 1946712502), (280319, 1948913625), (280319, 75809074), (280319, 87910127), (280319, 1828850376), (280319, 1839057146), (280319, 1844923384), (280319, 1844702370), (280319, 745442820), (280319, 752623568), (280319, 798105003), (280319, 722094647), (280319, 760235715), (280319, 1648730072), (280319, 736964000), (280319, 1681460726), (280319, 1682247541), (280319, 1691355864), (280319, 1771934315), (280319, 1775183359), (280319, 1774691556), (280319, 1777191468), (280319, 1822163649), (280319, 1823376735), (280319, 1826273957), (280319, 1826940160), (280319, 1851634850), (280319, 1855972106), (280319, 1864367352), (280319, 1864414128), (280319, 1871948254), (280319, 1873304852), (280319, 1874785103), (280319, 1133321903), (280319, 1139047711), (280319, 1153638375), (280319, 1151415477), (280319, 1153720565), (280319, 1008081445), (280319, 913051817), (280319, 914450704), (280319, 921187787), (280319, 931194131), (280319, 2036770261), (280319, 2042319778), (280319, 2046979488), (280319, 2050121279), (280319, 2058398448), (280319, 726127616), (280319, 1894777433), (280319, 2008777571), (280319, 2013904070), (280319, 2016151584), (280319, 1475173173), (280319, 1479514672), (280319, 1478120277), (280319, 1478257757), (280319, 1488525960), (280319, 1569643892), (280319, 963155881), (280319, 1173822256), (280319, 1178287036), (280319, 1951070306), (280319, 1963080845), (280319, 1965865848), (280319, 1965685628), (280319, 1589594523), (280319, 1596104201), (280319, 1596443921), (280319, 1599250983), (280319, 1621956298), (280319, 1628997553), (280319, 667498270), (280319, 688232169), (280319, 420925509), (280319, 425494828), (280319, 430397837), (280319, 1294198318), (280319, 101558805), (280319, 105389815), (280319, 108272689), (280319, 113253324), (280319, 116449667), (280319, 122212963), (280319, 121504127), (280319, 887921870), (280319, 889450748), (280319, 935184686), (280319, 935513275), (280319, 942862333), (280319, 408586138), (280319, 417241152), (280319, 1355988103), (280319, 1398061854), (280319, 1400246374), (280319, 1401513478), (280319, 1408234862), (280319, 1330192822), (280319, 1337393000), (280319, 1348856615), (280319, 1354491936), (280319, 131565819), (280319, 131691545), (280319, 143449561), (280319, 170322087), (280319, 260408945), (280319, 47716555), (280319, 55118355), (280319, 60906203), (280319, 65631594), (280319, 70697683), (280319, 1331803255), (280319, 649497548), (280319, 476259839), (280319, 1049077141), (280319, 1051348408), (280319, 1072422024), (280319, 840781166), (280319, 844110200), (280319, 862377450), (280319, 1218209634), (280319, 1216278078), (280319, 1253627767), (280319, 295870607), (280319, 298961705), (280319, 1448768963), (280319, 1452532772), (280319, 1460778453), (280319, 1459335527), (280319, 1470974161), (280319, 1473438001), (280319, 356245342), (280319, 401966385), (280319, 443060472), (280319, 445957840), (280319, 453840378), (280319, 461955172), (280319, 468243075), (280319, 1607864717), (280319, 1613732251), (280319, 1378419054), (280319, 1379556550), (280319, 1418979438), (280319, 1425810973), (280319, 1790009047), (280319, 1373261437), (280319, 1427358349), (280319, 593790933), (280319, 610486929), (280319, 373797091), (280319, 384690953), (280319, 387231970), (280319, 404758158), (280319, 36789003), (280319, 40320283), (280368, 18630561), (280368, 51648904), (280368, 54941288), (280368, 98914941), (280368, 102460266), (280368, 111188172), (280368, 110195295), (280368, 111231202), (280368, 3646070), (280368, 35044919), (280368, 37803137), (280368, 46074631), (280368, 119864418), (280368, 120542057), (280368, 122424631), (280368, 126731420), (280368, 20144526), (280368, 28604229), (280368, 86306278), (280368, 157377745), (280368, 145775947), (280368, 76870390), (280368, 159538570), (280423, 361879287), (280423, 362830248), (280423, 364833223), (280423, 373737920), (280423, 376217318), (280423, 373150603), (280423, 381102402), (280423, 382471972), (280423, 385475890), (280423, 1148716645), (280423, 1154025636), (280423, 1254129385), (280423, 394025670), (280423, 395246647), (280423, 395278324), (280423, 400221258), (280423, 1427172638), (280423, 1180567303), (280423, 1185909605), (280423, 1187368199), (280423, 165419390), (280423, 181035460), (280423, 188028507), (280423, 190016366), (280423, 1230869026), (280423, 876312069), (280423, 617874050), (280423, 782844728), (280423, 787249204), (280423, 961887294), (280423, 972534323), (280423, 970727751), (280423, 1002887456), (280423, 1007692904), (280423, 1010794041), (280423, 1382253233), (280423, 1383416018), (280423, 538486944), (280423, 557206463), (280423, 561990306), (280423, 9878484), (280423, 14216983), (280423, 16326388), (280423, 18767832), (280423, 241148225), (280423, 244595846), (280423, 1070353107), (280423, 937828273), (280423, 947795856), (280423, 527038547), (280423, 1031743590), (280423, 1101820335), (280423, 1104512803), (280423, 1118381906), (280423, 1129146016), (280423, 86295392), (280423, 449834672), (280423, 454760804), (280423, 469015037), (280423, 1325322649), (280423, 1357782077), (280423, 1359154942), (280423, 1363741945), (280423, 1364463414), (280423, 28462304), (280423, 349285383), (280423, 349810042), (280423, 353367542), (280423, 1238212366), (280423, 1238753925), (280423, 1239476174), (280423, 880301270), (280423, 926231166), (280423, 1137299942), (280423, 1171790310), (280423, 1395159771), (280423, 1398240379), (280423, 1440351100), (280423, 1442033968), (280423, 1450644524), (280423, 1203185849), (280423, 1260779023), (280423, 1271032060), (280423, 1274946917), (280423, 575438226), (280423, 581449935), (280423, 584326224), (280423, 587953050), (280423, 409497173), (280423, 415687661), (280423, 975667197), (280423, 985158814), (280423, 984716930), (280423, 990209212), (280423, 1040033763), (280423, 628695807), (280423, 630821228), (280423, 630413949), (280423, 858619782), (280423, 861359093), (280423, 865932277), (280423, 116060826), (280423, 122388586), (280423, 206059696), (280423, 211654495), (280423, 224046559), (280423, 227375400), (280423, 632865993), (280423, 654235135), (280423, 657561622), (280423, 129766561), (280423, 138283972), (280423, 152330182), (280423, 286229470), (280423, 307998315), (280423, 313571606), (280423, 316574001), (280423, 892527775), (280423, 893096566), (280423, 895141051), (280423, 914557524), (280423, 918190132), (280423, 671877647), (280423, 692407000), (280423, 697758178), (280423, 700384917), (280423, 699184191), (280423, 295070462), (280423, 298640650), (280423, 300261327), (280423, 398038121), (280423, 419468311), (280423, 429311954), (280423, 439364946), (280423, 440470825), (280423, 440692290), (280423, 259349181), (280423, 262207679), (280423, 262061175), (280423, 263154947), (280423, 263838645), (280423, 272479713), (280423, 1353299397), (280423, 1392249888), (280423, 1455292838), (280423, 1454925780), (280423, 1470162509), (280423, 1013683544), (280423, 1016912491), (280423, 1049866282), (280423, 1051711843), (280423, 725890228), (280423, 740450907), (280423, 744155732), (280423, 743752620), (280423, 194073332), (280423, 199973590), (280423, 200852470), (280423, 201522099), (280423, 203303471), (280423, 65023309), (280423, 64989151), (280423, 66160176), (280423, 67561661), (280423, 68518681), (280423, 72267220), (280423, 490779190), (280423, 495189076), (280423, 1299561766), (280423, 247905881), (280423, 251975039), (280423, 1290387569), (280423, 1201706120), (280423, 1206298512), (280423, 1216431096), (280423, 756513490), (280423, 767520638), (280423, 770310698), (280423, 812035014), (280423, 823451393), (280423, 830257107), (280423, 829574918), (280464, 403679437), (280464, 503924435), (280464, 1083589410), (280464, 1163146080), (280464, 1162478083), (280464, 1164288631), (280464, 710930850), (280464, 703262462), (280464, 600587508), (280464, 607176800), (280464, 245203634), (280464, 249008186), (280464, 251459903), (280464, 254136179), (280464, 682723454), (280464, 686307471), (280464, 688567342), (280464, 689606912), (280464, 693794106), (280464, 947987832), (280464, 952240148), (280464, 725116424), (280464, 735303390), (280464, 738387074), (280464, 152556344), (280464, 458632505), (280464, 460104446), (280464, 463842979), (280464, 468517915), (280464, 232273755), (280464, 196920263), (280464, 200933676), (280464, 273749193), (280464, 272973462), (280464, 1031693888), (280464, 1114412068), (280464, 418652990), (280464, 633972651), (280464, 633220390), (280464, 634574687), (280464, 637155335), (280464, 1160231009), (280464, 214628406), (280464, 217360033), (280464, 528663619), (280464, 220336136), (280464, 221661891), (280464, 226532362), (280464, 226632558), (280464, 553839938), (280464, 563302945), (280464, 565035967), (280464, 175172492), (280464, 176815328), (280464, 568239726), (280464, 572283010), (280464, 572552135), (280464, 581587223), (280464, 1065216667), (280464, 1069118617), (280464, 126759885), (280464, 271733586), (280464, 271647938), (280464, 86107134), (280464, 91133906), (280464, 92700049), (280464, 391974029), (280464, 388911563), (280464, 400621603), (280464, 287676836), (280464, 289009994), (280464, 308881491), (280464, 367648003), (280464, 370260559), (280464, 380561608), (280464, 382928385), (280464, 387213831), (280464, 386525088), (280464, 880447668), (280464, 888303196), (280464, 259950335), (280464, 259765338), (280464, 268881406), (280464, 1130301946), (280464, 1138638990), (280464, 1137776122), (280464, 737099342), (280464, 744662924), (280464, 748251064), (280464, 514796437), (280464, 1138881294), (280464, 1147367215), (280464, 1173373755), (280464, 1185306156), (280464, 1103977707), (280464, 1110296971), (280464, 279661057), (280464, 975352871), (280464, 979075921), (280464, 983442153), (280464, 987957933), (280464, 988819437), (280464, 989634663), (280464, 330503907), (280464, 332597272), (280464, 357975715), (280464, 9219814), (280464, 49735110), (280464, 54605145), (280464, 310541782), (280464, 312614388), (280464, 318887683), (280464, 319806632), (280464, 30366027), (280464, 836579683), (280464, 839912275), (280464, 842333950), (280464, 847153251), (280464, 852064668), (280464, 779913363), (280464, 793047081), (280464, 791995874), (280464, 909578492), (280464, 911354300), (280464, 926316827), (280464, 110061655), (280464, 113411803), (280464, 20288421), (280464, 26048665), (280464, 68823987), (280464, 81902464), (280464, 343969365), (280464, 342160879), (280464, 815285637), (280464, 65413515), (280464, 126125351), (280464, 178978607), (280464, 187603384), (280464, 490965341), (280464, 492847873), (280464, 491456439), (280464, 493532551), (280464, 497126245), (280500, 134703333), (280500, 154142130), (280500, 157250753), (280500, 161506305), (280500, 40285631), (280500, 66590758), (280500, 80784169), (280500, 110635174), (280500, 129681932), (280500, 127520832), (280500, 23335506), (280500, 24345010), (280500, 26259749), (280500, 31766868), (280500, 88711753), (280500, 175173724), (280500, 142811965), (280500, 149327890), (280500, 150787598), (280520, 487785931), (280520, 492044036), (280520, 497803222), (280520, 517744529), (280520, 472984019), (280520, 436928009), (280520, 446183506), (280520, 125120877), (280520, 193329262), (280520, 352549231), (280520, 164065382), (280520, 197168109), (280520, 201281443), (280520, 372978976), (280520, 418145603), (280520, 147743883), (280520, 245928907), (280520, 249866083), (280520, 256947489), (280520, 257632916), (280520, 255478538), (280520, 263837247), (280520, 265476786), (280520, 350819590), (280520, 432126142), (280520, 213138882), (280520, 217266710), (280520, 224127542), (280520, 228135497), (280614, 161177673), (280614, 169745152), (280614, 170767640), (280614, 215146625), (280614, 219127570), (280614, 301178226), (280614, 303707437), (280614, 332449119), (280614, 335003120), (280614, 345722410), (280614, 353058908), (280614, 411236139), (280614, 414979598), (280614, 419235273), (280614, 426610368), (280614, 175746364), (280614, 2832819), (280614, 445394990), (280614, 263895374), (280614, 197529463), (280614, 195487015), (280614, 200548148), (280614, 381849649), (280614, 484299614), (280614, 251899309), (280614, 258595205), (280614, 262503389), (280614, 266054651), (280614, 508036054), (280614, 135108736), (280614, 469203363), (280614, 197406782), (280614, 23884140), (280614, 26304101), (280614, 36897069), (280614, 52567457), (280614, 66251511), (280614, 68094944), (280614, 68851524), (280614, 402762268), (280614, 234643177), (280614, 241494472), (280614, 182710441), (280614, 124825582), (280614, 131963406), (280614, 129554236), (280614, 398377511), (280614, 280156426), (280614, 249695289), (280614, 15314641), (280614, 75177979), (280614, 81554504), (280614, 84242925), (280614, 48491778), (280614, 425895393), (280614, 429688367), (280614, 430584664), (280614, 430786875), (280614, 470180942), (280614, 101543692), (280614, 118170578), (280614, 343741138), (280614, 377386110), (280614, 310506941), (280673, 1561502610), (280673, 627110595), (280673, 635454801), (280673, 667428224), (280673, 668936168), (280673, 676414835), (280673, 1179958099), (280673, 1179577719), (280673, 753417563), (280673, 925801475), (280673, 929027626), (280673, 928808433), (280673, 932066869), (280673, 936543525), (280673, 2177212635), (280673, 2181799462), (280673, 2182347482), (280673, 2183016874), (280673, 2187212326), (280673, 2482538521), (280673, 2765600574), (280673, 2770492663), (280673, 2778816414), (280673, 1340984944), (280673, 1341338341), (280673, 1343587778), (280673, 1356827410), (280673, 2717432142), (280673, 210239745), (280673, 217201639), (280673, 1785965118), (280673, 2532511534), (280673, 2540140200), (280673, 2634973887), (280673, 2638154345), (280673, 2640706025), (280673, 2644529335), (280673, 2353158959), (280673, 2356623320), (280673, 2355325771), (280673, 2362575975), (280673, 2362574478), (280673, 2200915370), (280673, 2167541330), (280673, 2170303336), (280673, 2118192753), (280673, 2119242422), (280673, 2124148901), (280673, 2193498932), (280673, 960791346), (280673, 966344732), (280673, 1001228209), (280673, 353035512), (280673, 388200329), (280673, 3028503266), (280673, 3033721245), (280673, 3041435788), (280673, 3045258635), (280673, 1541222359), (280673, 1903177089), (280673, 1903343123), (280673, 1913750957), (280673, 1927101566), (280673, 1926692554), (280673, 1926495149), (280673, 2489966503), (280673, 2494706635), (280673, 2497573278), (280673, 3077092792), (280673, 3084576045), (280673, 3097295300), (280673, 3108240355), (280673, 2448458780), (280673, 151665751), (280673, 150994206), (280673, 159901037), (280673, 2330851434), (280673, 2335889912), (280673, 2348111074), (280673, 2350683365), (280673, 1366214126), (280673, 1368434425), (280673, 1368106313), (280673, 1370854154), (280673, 1371304327), (280673, 1388443622), (280673, 1598767572), (280673, 1598692856), (280673, 1605479287), (280673, 1607307218), (280673, 1608987310), (280673, 1612751849), (280673, 1615433136), (280673, 1628068009), (280673, 1627193982), (280673, 1632071699), (280673, 1639670651), (280673, 1664330995), (280673, 1674930087), (280673, 2993363444), (280673, 2997148328), (280673, 1952785961), (280673, 1960201606), (280673, 2026525657), (280673, 2028900521), (280673, 2034778729), (280673, 2892196239), (280673, 2893130910), (280673, 2499185660), (280673, 2505613462), (280673, 600059506), (280673, 599870982), (280673, 603985827), (280673, 764333824), (280673, 415504114), (280673, 433390588), (280673, 1823410733), (280673, 2197123741), (280673, 2305157070), (280673, 143442741), (280673, 145327957), (280673, 146058228), (280673, 974479952), (280673, 1115470566), (280673, 1122200277), (280673, 1125565319), (280673, 1446940697), (280673, 1456938274), (280673, 1432608078), (280673, 1439332158), (280673, 1442001118), (280673, 1506108555), (280673, 1507118668), (280673, 940729316), (280673, 948917043), (280673, 952956637), (280673, 1308336479), (280673, 1309842978), (280673, 1312823890), (280673, 1041312063), (280673, 105431623), (280673, 113254383), (280673, 113609086), (280673, 269472024), (280673, 301050464), (280673, 256951192), (280673, 262963837), (280673, 2084153001), (280673, 2096012343), (280673, 2094350623), (280673, 2099192829), (280673, 695743717), (280673, 740399793), (280673, 740833989), (280673, 2699043355), (280673, 2700838882), (280673, 2704280557), (280673, 2702117297), (280673, 2755267267), (280673, 2755748945), (280673, 52197766), (280673, 51903608), (280673, 277801020), (280673, 280047936), (280673, 286316962), (280673, 287350710), (280673, 287567264), (280673, 183913264), (280673, 190962116), (280673, 254167831), (280673, 362515909), (280673, 368705629), (280673, 378884323), (280673, 438647052), (280673, 33080895), (280673, 37404310), (280673, 73257613), (280673, 74321810), (280673, 2058495473), (280673, 2610520806), (280673, 2615440234), (280673, 3061036739), (280673, 3063705592), (280673, 3063983815), (280673, 3069199853), (280673, 987541087), (280673, 993205767), (280673, 1248630674), (280673, 1256550197), (280673, 1282700034), (280673, 1282805298), (280673, 1285256834), (280673, 2967185399), (280673, 2968235722), (280673, 2984633757), (280673, 1838517358), (280673, 1847546351), (280673, 1849982083), (280673, 1693042776), (280673, 1693515134), (280673, 2559633088), (280673, 2564757270), (280673, 2570199648), (280673, 1754905208), (280673, 1765885177), (280673, 776706806), (280673, 779280908), (280673, 786048765), (280673, 826548990), (280673, 1989749719), (280673, 1993721146), (280673, 2003265224), (280673, 880005111), (280673, 881453173), (280673, 880853423), (280673, 879119855), (280673, 885268972), (280673, 893896382), (280673, 921251337), (280673, 920049075), (280673, 619607431), (280673, 620337836), (280673, 800148757), (280673, 805493593), (280673, 2216766663), (280673, 2215203701), (280673, 2224732686), (280673, 1548675198), (280673, 2132591573), (280673, 2135459734), (280673, 2140137426), (280673, 2141521944), (280673, 2139289914), (280673, 517281588), (280673, 518474148), (280673, 521836884), (280673, 524072652), (280673, 529364317), (280673, 527380335), (280673, 541839586), (280673, 545146215), (280673, 1737032501), (280673, 1803102265), (280673, 1805904365), (280673, 862793888), (280673, 1141134627), (280673, 1154242847), (280673, 1152145113), (280673, 1156283181), (280673, 1234105644), (280673, 1238746015), (280673, 1241679168), (280673, 1244259699), (280673, 1288357225), (280673, 1292190420), (280673, 1301023266), (280673, 3161467555), (280673, 3168914014), (280673, 3169608364), (280673, 3170980301), (280673, 2927975162), (280673, 2940655712), (280673, 2938539332), (280673, 2942247737), (280673, 2946249490), (280673, 2943982655), (280673, 2949947284), (280673, 2383804628), (280673, 2394990476), (280673, 2393558202), (280673, 1409701972), (280673, 1015828677), (280673, 1040684819), (280673, 1044120721), (280673, 1055563895), (280673, 1861044367), (280673, 1861840516), (280673, 1563278273), (280673, 1573321097), (280673, 636521337), (280673, 658334485), (280673, 657853395), (280673, 658923859), (280673, 661353763), (280673, 719032876), (280673, 730277027), (280673, 130772988), (280673, 128639410), (280673, 192722347), (280673, 2520714318), (280673, 2524900212), (280673, 540252534), (280673, 1129293375), (280673, 1127880961), (280673, 1127567985), (280673, 1129709373), (280673, 1130442500), (280673, 1204578001), (280673, 1210239213), (280673, 1209987687), (280673, 1793918043), (280673, 1797617325), (280673, 1801893686), (280673, 1802994817), (280673, 1868958632), (280673, 1881612349), (280673, 573577074), (280673, 441791715), (280673, 450639263), (280673, 550449120), (280673, 1400216651), (280673, 1461712657), (280673, 1103085132), (280673, 2829060797), (280673, 2834122239), (280673, 507612086), (280673, 529883757), (280673, 515678340), (280673, 638356141), (280673, 714091151), (280673, 1963106847), (280673, 1970219336), (280673, 1973879931), (280673, 2041576452), (280673, 1189283571), (280673, 1193924154), (280673, 2900701815), (280673, 2911558212), (280673, 2910735588), (280673, 2915446398), (280673, 292745140), (280673, 294918744), (280673, 868664676), (280673, 1943757842), (280673, 2009219993), (280673, 2009186699), (280673, 2016738385), (280673, 2752894471), (280673, 2675317465), (280673, 2672561025), (280673, 905540049), (280673, 1059283304), (280673, 1062503441), (280673, 1065882767), (280673, 2596434341), (280673, 2080012190), (280673, 301723541), (280673, 308973827), (280673, 337108746), (280673, 2849611504), (280673, 2848484692), (280673, 2854571066), (280673, 2857016500), (280673, 2857678756), (280673, 2856700246), (280673, 2861374546), (280673, 484140310), (280673, 2245104868), (280673, 2245529823), (280673, 2274565601), (280673, 2279370083), (280673, 2288397076), (280673, 61651056), (280673, 61793945), (280673, 3053976855), (280673, 588981061), (280673, 592194568), (280673, 679256630), (280673, 680769321), (280673, 679405752), (280673, 685018370), (280673, 690886151), (280673, 460404830), (280673, 2455078568), (280673, 2466014369), (280673, 2467491159), (280673, 2148602850), (280673, 2152193836), (280673, 2156881522), (280673, 159954028), (280673, 1099507887), (280673, 3126832728), (280673, 3127107304), (280673, 3132352042), (280673, 3140983301), (280673, 848535089), (280673, 856939280), (280673, 854182688), (280673, 860166988), (280673, 859509052), (280673, 1416123410), (280673, 1420559613), (280673, 1426036490), (280673, 1683872098), (280673, 1589446887), (280673, 1741238339), (280673, 1746826593), (280673, 1776252952), (280673, 1853050261), (280673, 2806294018), (280673, 85913912), (280673, 117009110), (280673, 243904759), (280673, 266544725), (280673, 270497155), (280753, 365456849), (280753, 376437185), (280753, 27753821), (280753, 30829464), (280753, 39366995), (280753, 43218719), (280753, 44351741), (280753, 74941574), (280753, 79893511), (280753, 89066701), (280753, 95489617), (280753, 96879307), (280753, 766664461), (280753, 768428703), (280753, 778821400), (280753, 813375609), (280753, 811693821), (280753, 134561155), (280753, 177384900), (280753, 864135449), (280753, 864682742), (280753, 240478542), (280753, 346171992), (280753, 351796583), (280753, 354102534), (280753, 358289357), (280753, 363569966), (280753, 422998503), (280753, 441378620), (280753, 61541558), (280753, 66437573), (280753, 69680529), (280753, 635429149), (280753, 732689189), (280753, 649050361), (280753, 210010568), (280753, 217994521), (280753, 221475865), (280753, 567552131), (280753, 568115382), (280753, 572486468), (280753, 574235324), (280753, 592483954), (280753, 797604745), (280753, 807802541), (280753, 828723584), (280753, 833447390), (280753, 266513600), (280753, 268646852), (280753, 333717286), (280753, 333390112), (280753, 679828943), (280753, 698044006), (280753, 13265533), (280753, 17051870), (280753, 19064691), (280753, 54122633), (280753, 55443906), (280753, 59454949), (280753, 848380537), (280753, 847713278), (280753, 850429585), (280753, 867607441), (280753, 398836135), (280753, 403106756), (280753, 406391793), (280753, 412998749), (280753, 527747276), (280753, 528489947), (280753, 530333422), (280753, 272398089), (280753, 272996746), (280753, 274428674), (280753, 314356589), (280753, 317616096), (280753, 321620391), (280753, 321338962), (280753, 325417838), (280753, 326718901), (280753, 330419057), (280753, 735448189), (280753, 745653570), (280753, 746224121), (280753, 744096305), (280753, 745172692), (280753, 754549904), (280753, 758217185), (280753, 297250576), (280753, 709038478), (280753, 383705797), (280753, 388628709), (280753, 395875171), (280753, 139888392), (280753, 168114146), (280753, 491280594), (280753, 496091622), (280753, 503858086), (280753, 508881079), (280753, 508900345), (280753, 510314834), (280753, 446256192), (280753, 466184764), (280753, 471900183), (280753, 537464779), (280753, 537857180), (280753, 538573954), (280753, 548561281), (280753, 721826545), (280753, 721146202), (280753, 723937158), (280753, 129616839), (280753, 144474583), (280753, 151148259), (280753, 104405491), (280753, 102213244), (280753, 112652971), (280753, 299895622), (280753, 300936115), (280753, 301573976), (280753, 304803216), (280753, 314520592), (280753, 778906192), (280753, 779344349), (280753, 784367794), (280753, 793117292), (280753, 622741527), (280753, 626422097), (280753, 474243198), (280753, 475736691), (280753, 485297093), (280753, 486264713), (280753, 486742407), (280753, 486776862), (280753, 173211963), (280753, 171428593), (280753, 180617209), (280753, 181021134), (280753, 179266464), (280753, 186307027), (280753, 191317520), (280753, 197266902), (280853, 12280853), (280853, 33570179), (280853, 34929280), (280853, 40356388), (280853, 20546136), (280853, 84246492), (280853, 85596120), (280853, 88044578), (280853, 90630872), (280853, 130933362), (280853, 116187520), (280853, 119434178), (280853, 29144998), (280853, 64187219), (280853, 137691992), (280853, 144074454), (280853, 149266631), (280853, 146187670), (280853, 88975116), (280853, 99122399), (280853, 106334941), (280853, 107318663), (280853, 104888757), (280853, 46534033), (280853, 58769889), (280853, 68391127), (280862, 1936729688), (280862, 1939640883), (280862, 1990292225), (280862, 821967323), (280862, 857152963), (280862, 713621141), (280862, 746087171), (280862, 203985064), (280862, 229448002), (280862, 612509241), (280862, 657018655), (280862, 663803029), (280862, 2553060717), (280862, 2554443443), (280862, 2814934281), (280862, 2821494034), (280862, 2710543225), (280862, 2724475109), (280862, 2402827453), (280862, 2423759093), (280862, 15860086), (280862, 22107217), (280862, 43776347), (280862, 42416817), (280862, 1640972519), (280862, 1642090940), (280862, 1651901077), (280862, 1649496131), (280862, 1652832256), (280862, 1327171764), (280862, 1329650273), (280862, 1342897375), (280862, 56730589), (280862, 62673646), (280862, 93077037), (280862, 99420604), (280862, 133954936), (280862, 140387903), (280862, 141121340), (280862, 1291240322), (280862, 1314102134), (280862, 290732474), (280862, 299935456), (280862, 311404245), (280862, 1690685297), (280862, 1700860944), (280862, 1715156393), (280862, 867603545), (280862, 896122487), (280862, 896383546), (280862, 896945507), (280862, 2738723628), (280862, 2428284929), (280862, 1210198658), (280862, 1211845504), (280862, 1215231325), (280862, 1226234981), (280862, 951121817), (280862, 956744691), (280862, 715462687), (280862, 724143788), (280862, 727069118), (280862, 807006290), (280862, 809621319), (280862, 812612068), (280862, 818301705), (280862, 1334790134), (280862, 1389016245), (280862, 1395169725), (280862, 1008250128), (280862, 1035630940), (280862, 545557701), (280862, 546949626), (280862, 567468081), (280862, 570314712), (280862, 629847337), (280862, 633573311), (280862, 2743119066), (280862, 2764711185), (280862, 2765637164), (280862, 2768183806), (280862, 1244772049), (280862, 1255681830), (280862, 1256103772), (280862, 1256009495), (280862, 1258305841), (280862, 1265008715), (280862, 2037607826), (280862, 2040024507), (280862, 2045468401), (280862, 2107725751), (280862, 2112942609), (280862, 2122516125), (280862, 2120629988), (280862, 2537670027), (280862, 2542190370), (280862, 2158080235), (280862, 2159024598), (280862, 2157786872), (280862, 2164196799), (280862, 2169573471), (280862, 2171297732), (280862, 2175720789), (280862, 2179742953), (280862, 976613967), (280862, 979898299), (280862, 986506321), (280862, 991177184), (280862, 2276671032), (280862, 2281197545), (280862, 2289575465), (280862, 2232202599), (280862, 2238228435), (280862, 2241430816), (280862, 2239384335), (280862, 2240949225), (280862, 1666130369), (280862, 1667750866), (280862, 1669406620), (280862, 1682719992), (280862, 1685189623), (280862, 1689879531), (280862, 2068254682), (280862, 2079299679), (280862, 2078538876), (280862, 1195152778), (280862, 2794984941), (280862, 2800983297), (280862, 1161378968), (280862, 1162412120), (280862, 1177120505), (280862, 1176007128), (280862, 1178698178), (280862, 1187914969), (280862, 1186425075), (280862, 1189445789), (280862, 1190057139), (280862, 1108281142), (280862, 1113116381), (280862, 1117312152), (280862, 1144753088), (280862, 1913058206), (280862, 1920023133), (280862, 1922260023), (280862, 1942673546), (280862, 1946330493), (280862, 1948746787), (280862, 2091669582), (280862, 2093959715), (280862, 2144270206), (280862, 2146144224), (280862, 1099773133), (280862, 1104547958), (280862, 1998019138), (280862, 2005713864), (280862, 1569260676), (280862, 2694393663), (280862, 119799453), (280862, 128240362), (280862, 130519007), (280862, 130479131), (280862, 753245725), (280862, 756185863), (280862, 272130933), (280862, 574551286), (280862, 518000123), (280862, 518670612), (280862, 529592999), (280862, 529969791), (280862, 2594025546), (280862, 2592807741), (280862, 1534382210), (280862, 1543216121), (280862, 1545545228), (280862, 2488691940), (280862, 1235245545), (280862, 1236983053), (280862, 1277626098), (280862, 1280829228), (280862, 1428881574), (280862, 1432775428), (280862, 1435958310), (280862, 1467938622), (280862, 1470418864), (280862, 1506396265), (280862, 1512029239), (280862, 1512574377), (280862, 482711349), (280862, 484242904), (280862, 486725465), (280862, 490217718), (280862, 496650932), (280862, 499969488), (280862, 502779400), (280862, 505942519), (280862, 349367078), (280862, 359120213), (280862, 359514221), (280862, 366644149), (280862, 371475378), (280862, 371854967), (280862, 328205191), (280862, 331874629), (280862, 336203476), (280862, 338073877), (280862, 1359484923), (280862, 1367486108), (280862, 1489789760), (280862, 1498098377), (280862, 911372192), (280862, 191495989), (280862, 400422481), (280862, 399408254), (280862, 405703078), (280862, 412703611), (280862, 414838548), (280862, 418647465), (280862, 419893532), (280862, 1881257041), (280862, 1890503462), (280862, 1896192790), (280862, 1902521620), (280862, 1905613362), (280862, 467673712), (280862, 475297805), (280862, 480572831), (280862, 1204314195), (280862, 1206865151), (280862, 1210795875), (280862, 2554738642), (280862, 2555403349), (280862, 1128855636), (280862, 1128654572), (280862, 1139937029), (280862, 1719322879), (280862, 1732456364), (280862, 1731646721), (280862, 1747017202), (280862, 1746814883), (280862, 2358092347), (280862, 2357012942), (280862, 2373704825), (280862, 2201343365), (280862, 2209057199), (280862, 2215225892), (280862, 372987968), (280862, 385473040), (280862, 1603566196), (280862, 1613280670), (280862, 1614281766), (280862, 1623364984), (280862, 172377859), (280862, 185306777), (280862, 267942018), (280862, 2839580707), (280862, 2844485290), (280862, 2845391423), (280862, 36459351), (280862, 40180071), (280862, 214815856), (280862, 218381590), (280862, 779627720), (280862, 788837479), (280862, 796723737), (280862, 802425527), (280862, 2304775305), (280862, 2314457834), (280862, 2339563661), (280862, 2338300334), (280862, 429036746), (280862, 429576381), (280862, 443264366), (280862, 2043607768), (280862, 2056918125), (280862, 838759902), (280862, 838396870), (280862, 837898324), (280862, 922951041), (280862, 927190041), (280862, 2259173821), (280862, 2264841189), (280862, 2460190921), (280862, 2463622000), (280862, 1381019832), (280862, 1765201656), (280862, 1768499397), (280862, 2327547421), (280862, 2391395233), (280862, 670901657), (280862, 672365919), (280862, 684807023), (280862, 730553949), (280862, 743375024), (280862, 1906755767), (280862, 650741360), (280862, 692690208), (280862, 698045808), (280862, 2642124476), (280862, 2652318187), (280862, 2679892082), (280862, 1852091942), (280862, 1859495024), (280862, 1861341486), (280862, 1867554834), (280862, 4557498), (280862, 1956304251), (280862, 1967369720), (280862, 1975214121), (280862, 1976918308), (280862, 1784778936), (280862, 1812882271), (280862, 2506404062), (280862, 2521556515), (280862, 2524252375), (280862, 2529070602), (280862, 2527789606), (280862, 2529176065), (280862, 2532785557), (280862, 2444434784), (280862, 2471758467), (280862, 1827824719), (280862, 1000389632), (280862, 1000345540), (280862, 999253428), (280862, 1002714896), (280950, 9187792), (280950, 10573357), (280950, 15426066), (280950, 46269099), (280950, 1940683396), (280950, 1941715174), (280950, 1947825900), (280950, 1952905345), (280950, 1956837999), (280950, 1959532130), (280950, 1961848279), (280950, 1962030557), (280950, 785219841), (280950, 1401071968), (280950, 1403064168), (280950, 2196490951), (280950, 2206078699), (280950, 2262474812), (280950, 2120041978), (280950, 2169421001), (280950, 2170277470), (280950, 2178144511), (280950, 2176782694), (280950, 918318666), (280950, 927134967), (280950, 933235833), (280950, 2013504605), (280950, 2018155443), (280950, 2021915036), (280950, 1448702144), (280950, 1453108272), (280950, 1455215108), (280950, 1462402856), (280950, 31622797), (280950, 35168551), (280950, 43030101), (280950, 1442542891), (280950, 2530424009), (280950, 1800383430), (280950, 2515838222), (280950, 2630916879), (280950, 514241981), (280950, 2676172703), (280950, 1896655511), (280950, 1980256960), (280950, 1042194167), (280950, 460922609), (280950, 460060389), (280950, 2759986721), (280950, 547970785), (280950, 1194698193), (280950, 1196987667), (280950, 1197424102), (280950, 1196471523), (280950, 1201551663), (280950, 2040164846), (280950, 2073381890), (280950, 217010196), (280950, 216241130), (280950, 218544658), (280950, 224155340), (280950, 222576270), (280950, 1615760514), (280950, 1622709325), (280950, 1632852912), (280950, 1641044367), (280950, 2432357397), (280950, 2432380255), (280950, 2433659234), (280950, 2433504468), (280950, 2435858510), (280950, 2472439228), (280950, 202310071), (280950, 211275664), (280950, 686771187), (280950, 690085116), (280950, 699797332), (280950, 1206536739), (280950, 1224356812), (280950, 1226964877), (280950, 1229969147), (280950, 896106167), (280950, 898463347), (280950, 900390575), (280950, 903717758), (280950, 903685949), (280950, 902188528), (280950, 597354230), (280950, 616443696), (280950, 620428396), (280950, 686770893), (280950, 769238391), (280950, 782960901), (280950, 780584805), (280950, 2698933738), (280950, 2725480045), (280950, 2727186545), (280950, 2727922757), (280950, 2730100018), (280950, 1203696268), (280950, 2668705330), (280950, 618585677), (280950, 2644770071), (280950, 2654921358), (280950, 2672582001), (280950, 568573960), (280950, 592317107), (280950, 640631308), (280950, 871595251), (280950, 2091805267), (280950, 2099319268), (280950, 172546934), (280950, 178447971), (280950, 180731110), (280950, 1381143962), (280950, 1382719827), (280950, 1382286130), (280950, 1396600388), (280950, 1421139067), (280950, 1643886106), (280950, 1649847875), (280950, 1678561481), (280950, 1681380804), (280950, 1685958364), (280950, 2506702592), (280950, 2531013364), (280950, 2538022589), (280950, 2232143594), (280950, 2235724297), (280950, 2397100911), (280950, 2400091803), (280950, 55938289), (280950, 164293201), (280950, 164758887), (280950, 740419859), (280950, 748953982), (280950, 798503363), (280950, 1550678128), (280950, 1551141875), (280950, 1565132053), (280950, 1577685175), (280950, 415960293), (280950, 429105295), (280950, 432442865), (280950, 1853411342), (280950, 1854943843), (280950, 2459054882), (280950, 2182468282), (280950, 2185594221), (280950, 2193074722), (280950, 2212404870), (280950, 2215674158), (280950, 2223413389), (280950, 2225108144), (280950, 1245124618), (280950, 1243668726), (280950, 1252038712), (280950, 100994888), (280950, 2565448924), (280950, 2366568844), (280950, 2370482874), (280950, 2381837292), (280950, 2390299835), (280950, 779094582), (280950, 2608806073), (280950, 2611412637), (280950, 2465702865), (280950, 2490088451), (280950, 2578986171), (280950, 2581625840), (280950, 2586125413), (280950, 2588526174), (280950, 2588738299), (280950, 1255920926), (280950, 1279027199), (280950, 1314769620), (280950, 1318313104), (280950, 2305064763), (280950, 2302717073), (280950, 2309448731), (280950, 2309348064), (280950, 821399184), (280950, 2281920330), (280950, 2298973606), (280950, 1885824052), (280950, 390884024), (280950, 391290294), (280950, 394699644), (280950, 486908069), (280950, 486132085), (280950, 490595926), (280950, 305591552), (280950, 359989187), (280950, 402676873), (280950, 409635007), (280950, 150050882), (280950, 188005538), (280950, 188546090), (280950, 191857467), (280950, 198806467), (280950, 666853790), (280950, 678649811), (280950, 1331151907), (280950, 1334888408), (280950, 1340224942), (280950, 1340246351), (280950, 1341251784), (280950, 1345336268), (280950, 1344999325), (280950, 1368686209), (280950, 1369587334), (280950, 1379598532), (280950, 1381155620), (280950, 1747349975), (280950, 2151714800), (280950, 2153242888), (280950, 2165461918), (280950, 1089394105), (280950, 1092184227), (280950, 1098848585), (280950, 291471134), (280950, 291165699), (280950, 292388086), (280950, 339673226), (280950, 338862055), (280950, 342882783), (280950, 343500323), (280950, 348591802), (280950, 348996382), (280950, 1488177585), (280950, 1509611449), (280950, 1515974652), (280950, 1523070263), (280950, 1530576371), (280950, 1530681802), (280950, 1533824804), (280950, 1533777383), (280950, 1542907252), (280950, 1546548452), (280950, 942098275), (280950, 952307608), (280950, 955382378), (280950, 958077598), (280950, 958478251), (280950, 1348297776), (280950, 1351511901), (280950, 1819528064), (280950, 1823941983), (280950, 1826396540), (280950, 1829445299), (280950, 1835138534), (280950, 1839793045), (280950, 2409375600), (280950, 2084970545), (280950, 2334399095), (280950, 2339120571), (280950, 2338464004), (280950, 2345395320), (280950, 2357744286), (280950, 1252934566), (280950, 1254642535), (280950, 1301373943), (280950, 514391868), (280950, 2558688824), (280950, 2570736613), (280950, 2572515614), (280950, 2591739883), (280950, 2590356712), (280950, 1106733176), (280950, 1115347484), (280950, 1121101659), (280950, 1136380420), (280950, 278954200), (280950, 1170998405), (280950, 1178038074), (280950, 1182566484), (280950, 2048105149), (280950, 2057177350), (280950, 2069061825), (280950, 1741224312), (280950, 1758566231), (280950, 121388814), (280950, 129781940), (280950, 141286649), (280950, 841986149), (280950, 1304276175), (280950, 1858428247), (280950, 2553499282), (280950, 1138365575), (280950, 1143441355), (280950, 1148253879), (280950, 624173882), (280950, 626677314), (280950, 625909626), (280950, 630053485), (280950, 633265575), (280950, 631597106), (280950, 633550198), (280950, 714767325), (280950, 1441891656), (280950, 2708801908), (280950, 1212121970), (280950, 1215532849), (280950, 253357251), (280950, 2250737075), (280950, 2254483171), (280950, 2255300639), (280950, 1659042563), (280950, 1662876409), (280950, 1596439210), (280950, 1599492079), (280950, 1600645713), (280950, 1608476523), (280950, 1912550607), (280950, 1913498795), (280950, 1923586719), (280950, 1926123390), (280950, 1004275197), (280950, 1003968518), (280950, 1703331530), (280950, 1714222073), (280950, 1718175549), (280950, 1723617236), (280950, 1730950376), (280950, 1732502258), (280950, 57659816), (280950, 57339283), (280950, 68258663), (280950, 74728508), (280950, 79158940), (280950, 969962423), (280950, 975470051), (280950, 987998671), (280950, 988405369), (280950, 441058642), (280950, 441841561), (280950, 447892321), (280950, 450418617), (280950, 458532184), (280950, 471529575), (280950, 477724912), (280950, 1584828435), (280950, 1585333327), (280950, 1687866358), (280950, 1692308383), (280950, 1759796335), (280950, 1780363835), (280950, 1782406431), (280950, 1847266266), (280977, 365476451), (280977, 364189059), (280977, 378598000), (280977, 379847289), (280977, 384502784), (280977, 168219347), (280977, 170150834), (280977, 175265938), (280977, 260779171), (280977, 263358794), (280977, 262998198), (280977, 270748746), (280977, 308420144), (280977, 314744346), (280977, 313117914), (280977, 318579550), (280977, 323924193), (280977, 328004323), (280977, 651919378), (280977, 657069957), (280977, 687757675), (280977, 689418308), (280977, 690568203), (280977, 6454166), (280977, 291533608), (280977, 297919938), (280977, 522768282), (280977, 526225015), (280977, 525533660), (280977, 527183092), (280977, 538785640), (280977, 539021081), (280977, 575593408), (280977, 608429027), (280977, 617104047), (280977, 621060722), (280977, 224326637), (280977, 233906123), (280977, 395393455), (280977, 401165409), (280977, 405380990), (280977, 405911735), (280977, 406614162), (280977, 678795478), (280977, 634166393), (280977, 639503585), (280977, 208210784), (280977, 210689436), (280977, 216258743), (280977, 332039712), (280977, 336935310), (280977, 352487256), (280977, 153230677), (280977, 166250829), (280977, 66074774), (280977, 67127586), (280977, 76055636), (280977, 83852289), (280977, 412254450), (280977, 410086940), (280977, 414781074), (280977, 413178405), (280977, 448899856), (280977, 33743971), (280977, 560430540), (280977, 564988210), (280977, 454519437), (280977, 454676225), (280977, 457989478), (280977, 458331691), (280977, 460722996), (280977, 463704913), (280977, 483725490), (280977, 486034888), (280977, 491265322), (280977, 492901163), (280977, 493856576), (280977, 492987217), (280977, 112230533), (280977, 117017185), (280977, 121554458), (280977, 125364129), (280977, 128580510), (280977, 127087245), (280977, 133646013), (280977, 92772944), (280977, 141971410), (280977, 179538658), (280977, 190066310), (280977, 472641774), (280977, 387762143), (280977, 392312600), (280977, 392269655), (280977, 391564990), (281070, 192337253), (281070, 192416400), (281070, 242797712), (281070, 245696669), (281070, 162773670), (281070, 38006893), (281070, 111059704), (281070, 117559049), (281070, 205031551), (281070, 208844055), (281070, 211244538), (281070, 211220593), (281070, 218253382), (281070, 47932856), (281070, 51835840), (281070, 231555092), (281070, 222924259), (281070, 221759413), (281070, 221189065), (281070, 228367360), (281070, 131313504), (281070, 135752567), (281070, 135030279), (281070, 72656009), (281070, 78383468), (281070, 96376699), (281070, 97931771), (281070, 86943653), (281070, 137681597), (281070, 140381102), (281070, 142449920), (281070, 144465752), (281070, 171575804), (281070, 7736444), (281070, 14510533), (281070, 18259543), (281070, 15430442), (281070, 19309202), (281070, 19513374), (281070, 23385511), (281070, 23541950), (281070, 25470016), (281070, 65188443), (281070, 65714474), (281070, 67028285), (281074, 888484336), (281074, 273537729), (281074, 276212772), (281074, 280942138), (281074, 619507362), (281074, 630092935), (281074, 640436165), (281074, 645548959), (281074, 34808881), (281074, 325482124), (281074, 330318367), (281074, 366247814), (281074, 369538972), (281074, 381602704), (281074, 397184907), (281074, 406959623), (281074, 285329216), (281074, 360913395), (281074, 453544923), (281074, 459621542), (281074, 460050685), (281074, 465477012), (281074, 335421019), (281074, 339822511), (281074, 344811336), (281074, 414147451), (281074, 439321357), (281074, 840278119), (281074, 708549150), (281074, 718698674), (281074, 524711937), (281074, 535678391), (281074, 537148497), (281074, 550235441), (281074, 760541692), (281074, 760209243), (281074, 767516472), (281074, 769024585), (281074, 770721279), (281074, 779275957), (281074, 244683125), (281074, 244814916), (281074, 250761141), (281074, 552578557), (281074, 559889754), (281074, 570633644), (281074, 572602585), (281074, 577173612), (281074, 584363979), (281074, 597333283), (281074, 893176571), (281074, 892244664), (281074, 895550244), (281074, 113603384), (281074, 193168847), (281074, 197278677), (281074, 200411496), (281074, 200984217), (281074, 205670863), (281074, 206410720), (281074, 472895841), (281074, 579330928), (281074, 647383111), (281074, 650371446), (281074, 658452666), (281074, 664281861), (281074, 669697895), (281074, 669033136), (281074, 669198066), (281074, 129967617), (281074, 133959788), (281074, 136321117), (281074, 137479241), (281074, 218345823), (281074, 228988690), (281074, 238126522), (281074, 238540891), (281074, 141696082), (281074, 149311146), (281074, 154146117), (281074, 160561783), (281074, 303344684), (281074, 722474558), (281074, 722497656), (281074, 725579326), (281074, 729485499), (281074, 739848233), (281074, 744960772), (281074, 495225638), (281074, 482688754), (281074, 483413322), (281074, 480396575), (281074, 489869351), (281074, 789247969), (281074, 792747399), (281074, 794519565), (281074, 794631689), (281074, 797536535), (281074, 800188797), (281074, 821563734), (281074, 823917117), (281074, 824327382), (281074, 851911621), (281074, 58980774), (281074, 62062566), (281074, 66468550), (281074, 68234192), (281074, 265893479), (281074, 268485881), (281074, 3994271), (281074, 31061967), (281075, 1901934), (281075, 10768291), (281075, 18968296), (281075, 16705086), (281130, 316962841), (281130, 314158900), (281130, 303467992), (281130, 306513303), (281130, 151852403), (281130, 118932816), (281130, 122882407), (281130, 123838423), (281130, 141225843), (281130, 145368974), (281130, 210656037), (281130, 191798820), (281130, 196179651), (281130, 216584551), (281130, 217499609), (281130, 222954151), (281130, 244504707), (281130, 246734873), (281130, 393187507), (281130, 46220569), (281130, 131823719), (281130, 281194765), (281130, 122990048), (281130, 160070069), (281130, 165438380), (281130, 173108140), (281130, 183086891), (281130, 183946265), (281130, 5428775), (281130, 28119213), (281130, 58308319), (281130, 359568397), (281130, 366141086), (281130, 371919789), (281130, 286532535), (281130, 286251240), (281130, 294442485), (281130, 39252595), (281130, 62533604), (281130, 71034790), (281130, 398165520), (281130, 92892529), (281130, 104827700), (281143, 157595537), (281143, 333156839), (281143, 333619871), (281143, 347320050), (281143, 2032281195), (281143, 2037877561), (281143, 1234798740), (281143, 1239163686), (281143, 1243066433), (281143, 1247808657), (281143, 1251899109), (281143, 1255678609), (281143, 1979316791), (281143, 2008822283), (281143, 951503985), (281143, 956153284), (281143, 3061612232), (281143, 3063409045), (281143, 3062680360), (281143, 3071698440), (281143, 3072038605), (281143, 806559205), (281143, 813593589), (281143, 2319301390), (281143, 3461810341), (281143, 3470210182), (281143, 3473567503), (281143, 205434538), (281143, 216658970), (281143, 215583292), (281143, 425370058), (281143, 256754619), (281143, 1202495606), (281143, 1221726046), (281143, 2646382125), (281143, 2644875629), (281143, 2644618760), (281143, 2644347068), (281143, 1116332496), (281143, 1127155737), (281143, 1125402431), (281143, 1134122026), (281143, 1136070997), (281143, 2730733203), (281143, 2742489017), (281143, 2745879884), (281143, 2747109642), (281143, 585174740), (281143, 627857416), (281143, 1583607000), (281143, 3352377218), (281143, 3363067074), (281143, 3412975265), (281143, 3412354320), (281143, 3423020787), (281143, 840870609), (281143, 843593950), (281143, 850167655), (281143, 2289348760), (281143, 2299002002), (281143, 2310641698), (281143, 996119847), (281143, 1003063210), (281143, 1000046734), (281143, 1003652866), (281143, 1013707046), (281143, 1010848037), (281143, 1010430921), (281143, 1016637269), (281143, 1019820624), (281143, 2837116235), (281143, 2835623662), (281143, 2850328518), (281143, 1747460907), (281143, 1747688852), (281143, 1767844683), (281143, 1455827208), (281143, 1461169862), (281143, 1463881902), (281143, 1473882717), (281143, 1477019555), (281143, 1725686810), (281143, 1725822113), (281143, 1401955295), (281143, 1412262046), (281143, 1415285278), (281143, 1420115705), (281143, 1419347139), (281143, 1421363192), (281143, 623654255), (281143, 3595181463), (281143, 3602409437), (281143, 3601870538), (281143, 3609556274), (281143, 676867234), (281143, 678554447), (281143, 1492687951), (281143, 1518002588), (281143, 3905430950), (281143, 2077545436), (281143, 2083628985), (281143, 2106914318), (281143, 38105202), (281143, 55081438), (281143, 60845464), (281143, 57726921), (281143, 65061871), (281143, 1257144239), (281143, 1264564611), (281143, 1263737532), (281143, 2783687433), (281143, 2785643143), (281143, 2788666669), (281143, 2791888303), (281143, 2795422122), (281143, 2799707900), (281143, 1534777181), (281143, 1538080978), (281143, 1537115408), (281143, 1548229928), (281143, 1550903174), (281143, 1622204649), (281143, 1625307021), (281143, 1647435924), (281143, 1649806534), (281143, 2246989491), (281143, 2252447406), (281143, 2270923360), (281143, 2554623654), (281143, 2565211002), (281143, 3284741171), (281143, 3334235996), (281143, 3339428466), (281143, 3348951685), (281143, 2687920571), (281143, 2184506418), (281143, 4223756601), (281143, 4229645827), (281143, 143059276), (281143, 142287587), (281143, 141306090), (281143, 4152602640), (281143, 1788217665), (281143, 1790921846), (281143, 1791744222), (281143, 1802805812), (281143, 1802356894), (281143, 2341726799), (281143, 712697671), (281143, 2863691662), (281143, 2869448870), (281143, 2879063404), (281143, 2879132229), (281143, 2881423057), (281143, 2882934281), (281143, 2885269854), (281143, 2889163508), (281143, 2451692247), (281143, 2457472381), (281143, 2471725123), (281143, 2471637185), (281143, 2066381892), (281143, 2066358496), (281143, 2073387720), (281143, 3248338144), (281143, 3254266012), (281143, 3263486956), (281143, 3267096980), (281143, 3274987680), (281143, 469895296), (281143, 473053691), (281143, 481896991), (281143, 867227854), (281143, 3570845149), (281143, 3700234654), (281143, 3705064006), (281143, 35980951), (281143, 185368900), (281143, 185558909), (281143, 3972163292), (281143, 3558718112), (281143, 3564724489), (281143, 3568326480), (281143, 3571861904), (281143, 302269251), (281143, 303376108), (281143, 304409387), (281143, 315328905), (281143, 317401697), (281143, 1937194549), (281143, 1941898983), (281143, 1953807538), (281143, 1967829737), (281143, 3626709104), (281143, 735126205), (281143, 737825896), (281143, 741721313), (281143, 687713916), (281143, 690622746), (281143, 1874777712), (281143, 1883147330), (281143, 1891159931), (281143, 1060702981), (281143, 1081424334), (281143, 587915869), (281143, 590877447), (281143, 592547173), (281143, 593015307), (281143, 594103820), (281143, 598254838), (281143, 610397433), (281143, 3089558356), (281143, 3141145145), (281143, 3142150545), (281143, 3140353149), (281143, 3143500116), (281143, 3144815266), (281143, 3149260607), (281143, 882854121), (281143, 888231558), (281143, 2402048662), (281143, 2402067900), (281143, 2413902475), (281143, 2413959429), (281143, 2419397288), (281143, 1838274807), (281143, 1846413688), (281143, 1853436960), (281143, 1851750722), (281143, 1024296031), (281143, 2204340582), (281143, 2206945713), (281143, 2208801285), (281143, 2214581867), (281143, 3204740050), (281143, 3209039866), (281143, 3211528833), (281143, 2442716992), (281143, 504259125), (281143, 526827836), (281143, 3533048294), (281143, 3547406065), (281143, 1365468325), (281143, 1367516994), (281143, 1382914120), (281143, 1383973147), (281143, 1387266804), (281143, 1385973507), (281143, 152915185), (281143, 154608774), (281143, 156381922), (281143, 4196794118), (281143, 4205595171), (281143, 4208442399), (281143, 4213738161), (281143, 2761202471), (281143, 759027281), (281143, 761304834), (281143, 769368571), (281143, 778111761), (281143, 783679510), (281143, 782022651), (281143, 2478223815), (281143, 2495347223), (281143, 1081092273), (281143, 1093583895), (281143, 1109700494), (281143, 1109322409), (281143, 3295261786), (281143, 3307978769), (281143, 2945783255), (281143, 2951857003), (281143, 2952973606), (281143, 2968703933), (281143, 2976641388), (281143, 2977578156), (281143, 3096808706), (281143, 3123104163), (281143, 3753336078), (281143, 3758069083), (281143, 3763472525), (281143, 3785778424), (281143, 3428628298), (281143, 3428729768), (281143, 3435313396), (281143, 3445141280), (281143, 3446160451), (281143, 3456425420), (281143, 3458166225), (281143, 3456266623), (281143, 98702485), (281143, 107009256), (281143, 116605576), (281143, 117840018), (281143, 119047242), (281143, 2983956191), (281143, 2985557102), (281143, 2702060967), (281143, 2709145254), (281143, 2710239244), (281143, 2712247657), (281143, 2715576586), (281143, 3046811437), (281143, 3047583327), (281143, 972514684), (281143, 981032119), (281143, 3814779570), (281143, 638826157), (281143, 649742776), (281143, 656846303), (281143, 661819091), (281143, 1568666882), (281143, 1580094041), (281143, 1688012722), (281143, 1700089887), (281143, 1706750974), (281143, 3166661545), (281143, 3223632514), (281143, 3230944477), (281143, 4072332515), (281143, 4084860737), (281143, 4084145884), (281143, 4096486712), (281143, 4095856169), (281143, 4101946684), (281143, 2108694354), (281143, 2111790854), (281143, 2120584830), (281143, 2132546579), (281143, 437738114), (281143, 445959894), (281143, 449043103), (281143, 452944263), (281143, 454736249), (281143, 3372010167), (281143, 3801303010), (281143, 3801153977), (281143, 3808070823), (281143, 3811917914), (281143, 176303631), (281143, 184989418), (281143, 183031458), (281143, 265196423), (281143, 541672995), (281143, 542382512), (281143, 546198417), (281143, 546878667), (281143, 550833127), (281143, 2654323785), (281143, 2659469406), (281143, 2659630671), (281143, 1172403041), (281143, 1183838491), (281143, 3881496657), (281143, 3887796806), (281143, 3897305500), (281143, 3901054726), (281143, 1138789946), (281143, 1142412487), (281143, 1145384194), (281143, 1152447689), (281143, 1150105806), (281143, 1156000849), (281143, 1157422020), (281143, 1163277282), (281143, 280514869), (281143, 3010000753), (281143, 3018777947), (281143, 3512212480), (281143, 3516170502), (281143, 3520289068), (281143, 3525794265), (281143, 3678497429), (281143, 3680449961), (281143, 3751149759), (281143, 820823967), (281143, 830729691), (281143, 68656648), (281143, 77148174), (281143, 95193594), (281143, 93074616), (281143, 1896997077), (281143, 1904800650), (281143, 1912257707), (281143, 1917430690), (281143, 2931804457), (281143, 2991935317), (281143, 2996718205), (281143, 4037788178), (281143, 4038457975), (281143, 4045366719), (281143, 4048314793), (281143, 4052795248), (281143, 4053510388), (281143, 4051936651), (281143, 2050455506), (281143, 2060434996), (281143, 3689572719), (281143, 3691241074), (281143, 3702412630), (281143, 3705826100), (281143, 3712828940), (281143, 3723702909), (281143, 2576651931), (281143, 2584641333), (281143, 2586417263), (281143, 2584370048), (281143, 2598772901), (281143, 930207541), (281143, 1430806120), (281143, 1435246489), (281143, 1445827843), (281143, 1443984051), (281143, 1448418108), (281143, 497238709), (281143, 361030086), (281143, 362222246), (281143, 375548425), (281143, 322076796), (281143, 327939823), (281143, 330209440), (281143, 2229992476), (281143, 2239539990), (281143, 1808896031), (281143, 1812577312), (281143, 1812157791), (281143, 1032330697), (281143, 1041326703), (281143, 1057417818), (281143, 381820393), (281143, 395348181), (281143, 394617983), (281143, 401329985), (281143, 399121161), (281143, 397846921), (281143, 2150353112), (281143, 2160156197), (281143, 2164461832), (281143, 2165720688), (281143, 3919429582), (281143, 3932479759), (281143, 2756431), (281143, 11106510), (281143, 11050325), (281143, 25756691), (281143, 28144957), (281143, 1333449112), (281143, 1339005972), (281143, 1338366733), (281143, 721203231), (281143, 2043826073), (281143, 1982282379), (281143, 4009947724), (281143, 4179450299), (281143, 4187220539), (281143, 3181489347), (281143, 3185362500), (281143, 3185657411), (281143, 3190497661), (281143, 3200995243), (281143, 4023612212), (281143, 4028049269), (281143, 4031368686), (281143, 4127241917), (281143, 4140411189), (281143, 908671097), (281143, 914008100), (281143, 913495166), (281143, 918852184), (281143, 919220828), (281143, 2368205853), (281143, 2377009233), (281143, 2389832336), (281143, 2400245319), (281143, 3834775499), (281143, 3848924798), (281143, 3855738234), (281143, 3319954939), (281143, 3323639709), (281143, 227084758), (281143, 237116621), (281143, 240841256), (281143, 250997266), (281143, 2514319250), (281143, 2515072889), (281143, 2526203403), (281143, 2526938628), (281143, 3950299722), (281143, 2610880409), (281143, 2627156766), (281143, 2627322721), (281143, 2630747559), (281143, 2633581850), (281143, 288986712), (281143, 289469861), (281143, 293902396), (281143, 298413220), (281143, 1602346659), (281143, 1613154549), (281143, 1661088138), (281143, 1667082188), (281143, 1668638047), (281143, 1674983167), (281143, 1676949270), (281143, 1676671010), (281143, 1676999016), (281143, 1679177550), (281143, 3240089300), (281143, 4106098845), (281143, 4113697974), (281143, 4117256686), (281143, 4119363295), (281143, 1282591969), (281143, 1285789506), (281143, 1287074927), (281143, 2899261219), (281143, 2907127329), (281143, 2910948284), (281143, 2919579992), (281143, 2921247872), (281143, 1777076882), (281143, 3654995106), (281143, 3656926151), (281143, 3663007478), (281143, 3669937719), (281143, 3670518898), (281143, 3677939818), (281317, 32518025), (281317, 35402318), (281317, 394529793), (281317, 395792496), (281317, 397491850), (281317, 259973640), (281317, 145824965), (281317, 155818668), (281317, 363862383), (281317, 39330713), (281317, 47208018), (281317, 56434457), (281317, 60177362), (281317, 69074711), (281317, 322578241), (281317, 383138111), (281317, 410841126), (281317, 414490582), (281317, 418398611), (281317, 431245411), (281317, 160741254), (281317, 173020785), (281317, 171616660), (281317, 177421660), (281317, 192765043), (281317, 189952644), (281317, 7026550), (281317, 8185433), (281317, 7591136), (281317, 8661374), (281317, 15249375), (281317, 27265533), (281317, 292294684), (281317, 298825016), (281317, 305890084), (281317, 229039232), (281317, 234566222), (281317, 241415349), (281317, 242796222), (281317, 248264282), (281317, 251714859), (281317, 96214206), (281317, 227422336), (281317, 229567177), (281317, 274763899), (281317, 275688193), (281317, 278980962), (281317, 282530232), (281317, 332027659), (281317, 336102716), (281317, 347939257), (281317, 111927337), (281317, 115742920), (281317, 116599249), (281317, 120482530), (281317, 123680104), (281317, 129416389), (281317, 130455328), (281317, 136601838), (281317, 135648929), (281317, 138895774), (281385, 1166803573), (281385, 1169829490), (281385, 1179336499), (281385, 1388079518), (281385, 1917657899), (281385, 1492378778), (281385, 1491609265), (281385, 1502393604), (281385, 495747737), (281385, 501189070), (281385, 517461069), (281385, 574881507), (281385, 590696146), (281385, 605326260), (281385, 1540080460), (281385, 1549918738), (281385, 1556317449), (281385, 1557381290), (281385, 2140165087), (281385, 2153043496), (281385, 539913767), (281385, 543335546), (281385, 544383660), (281385, 545794434), (281385, 547027374), (281385, 552732304), (281385, 553059816), (281385, 552172327), (281385, 556037306), (281385, 553782387), (281385, 557340600), (281385, 560856414), (281385, 1856011992), (281385, 2115963135), (281385, 2129611655), (281385, 2133905081), (281385, 2176100628), (281385, 2178917324), (281385, 2179172162), (281385, 2182077711), (281385, 2184415713), (281385, 2183737175), (281385, 1328411487), (281385, 1333819359), (281385, 1403781898), (281385, 1404677260), (281385, 1408089491), (281385, 1409869505), (281385, 1413063128), (281385, 1417497573), (281385, 1425157474), (281385, 1428853992), (281385, 704644469), (281385, 715418167), (281385, 721177433), (281385, 729057069), (281385, 734643796), (281385, 734249191), (281385, 737079227), (281385, 1741254183), (281385, 1745166456), (281385, 1744571536), (281385, 1747777200), (281385, 1761628323), (281385, 1761552493), (281385, 2039310342), (281385, 2038413098), (281385, 2042942686), (281385, 1697695625), (281385, 1698690641), (281385, 1700193361), (281385, 483238850), (281385, 489870078), (281385, 623305995), (281385, 629655981), (281385, 640513875), (281385, 641197422), (281385, 642656796), (281385, 1034954318), (281385, 1042651235), (281385, 1048545116), (281385, 1050926491), (281385, 1065164967), (281385, 1067898580), (281385, 1071998037), (281385, 1974985259), (281385, 1982535752), (281385, 1983462364), (281385, 1985849127), (281385, 1998285428), (281385, 2001825787), (281385, 439346906), (281385, 445429273), (281385, 447527528), (281385, 1828865231), (281385, 1839338993), (281385, 1850931701), (281385, 528278767), (281385, 1467852201), (281385, 1471344634), (281385, 1475932184), (281385, 1528364261), (281385, 1531745150), (281385, 910181586), (281385, 911566493), (281385, 916280650), (281385, 923227825), (281385, 1918033635), (281385, 1091486360), (281385, 1507819072), (281385, 1512171947), (281385, 1514749613), (281385, 1514537924), (281385, 1575803953), (281385, 1581687082), (281385, 1605804623), (281385, 1613039197), (281385, 2008745132), (281385, 2010751381), (281385, 2013244918), (281385, 2015071288), (281385, 2017007784), (281385, 2021432069), (281385, 2032998684), (281385, 2032211331), (281385, 2035326933), (281385, 1184958970), (281385, 1200292642), (281385, 1208550872), (281385, 1073528150), (281385, 1122597203), (281385, 1124670577), (281385, 1134765913), (281385, 1147186602), (281385, 1662615434), (281385, 1667987118), (281385, 1673993137), (281385, 1671994282), (281385, 1677164357), (281385, 1679241983), (281385, 1680724294), (281385, 1694144618), (281385, 963069256), (281385, 962516681), (281385, 965793898), (281385, 968674189), (281385, 975113633), (281385, 890140254), (281385, 894981872), (281385, 1661921906), (281385, 1028563565), (281385, 977766425), (281385, 980730781), (281385, 987336483), (281385, 990291653), (281385, 991989937), (281385, 989640726), (281385, 1001824746), (281385, 999491313), (281385, 1003009744), (281385, 1007146005), (281385, 1010573099), (281385, 1011263926), (281385, 1018432099), (281385, 1019184930), (281385, 1022747304), (281385, 653516481), (281385, 870081375), (281385, 872077132), (281385, 1968876126), (281385, 1970719918), (281385, 1969115879), (281385, 1082740267), (281385, 1097785216), (281385, 1098207242), (281385, 1097530077), (281385, 1102044123), (281385, 1739962232), (281385, 825847190), (281385, 419813596), (281385, 425599496), (281385, 1256517836), (281385, 1214161516), (281385, 1217645604), (281385, 1794197259), (281385, 1803728783), (281385, 1801133887), (281385, 1809691076), (281385, 1622566040), (281385, 1622313659), (281385, 1623541543), (281385, 1626020598), (281385, 1651702198), (281385, 1350709903), (281385, 1352776810), (281385, 1357638537), (281385, 1369136090), (281385, 1382834411), (281385, 1156946546), (281385, 1156563153), (281385, 1714194557), (281385, 1715451942), (281385, 1721212809), (281385, 2084309371), (281385, 2096916097), (281385, 2099466381), (281385, 1941358448), (281385, 1940731451), (281385, 1947418685), (281385, 1956759197), (281385, 1956357890), (281385, 747799865), (281385, 1885455563), (281385, 1269983750), (281385, 1277281219), (281385, 1284596682), (281385, 1283350391), (281385, 1244384867), (281385, 1434239234), (281385, 1432486123), (281385, 1433928160), (281385, 1440594116), (281385, 1453117941), (281385, 930534379), (281385, 947299446), (281385, 1285523334), (281385, 1611650175), (281385, 1617754646), (281385, 797345264), (281385, 2200163602), (281385, 2206392910), (281385, 2204124322), (281385, 2208015440), (281385, 858309749), (281385, 857280222), (281385, 1822084888), (281385, 1602882145), (281411, 137947779), (281411, 151338255), (281411, 159844857), (281411, 160858710), (281411, 1877331539), (281411, 1884696854), (281411, 1886962280), (281411, 915533943), (281411, 38319417), (281411, 40536636), (281411, 38845323), (281411, 54152727), (281411, 410543375), (281411, 412792380), (281411, 416946572), (281411, 420642269), (281411, 426686043), (281411, 424158800), (281411, 426725072), (281411, 433328640), (281411, 1120344246), (281411, 1125139041), (281411, 1131825431), (281411, 617441193), (281411, 829522133), (281411, 830202183), (281411, 534856399), (281411, 537636170), (281411, 547867890), (281411, 547686532), (281411, 550654951), (281411, 1898226718), (281411, 1898973049), (281411, 1917609981), (281411, 432455402), (281411, 437744959), (281411, 436096458), (281411, 439242043), (281411, 442107985), (281411, 445209396), (281411, 454457098), (281411, 90526410), (281411, 2329082087), (281411, 2339000952), (281411, 2341013887), (281411, 2347420152), (281411, 2356127194), (281411, 1274956815), (281411, 1275858850), (281411, 1296200774), (281411, 1299729555), (281411, 1301827098), (281411, 1302436693), (281411, 1682241379), (281411, 1690031203), (281411, 569993507), (281411, 572870027), (281411, 571659871), (281411, 576600323), (281411, 577227389), (281411, 586206683), (281411, 2076944854), (281411, 2073929920), (281411, 2082828478), (281411, 2175425186), (281411, 2182090915), (281411, 2201577115), (281411, 392351854), (281411, 397225157), (281411, 396450611), (281411, 398205093), (281411, 403021648), (281411, 408315181), (281411, 1737729881), (281411, 1737776182), (281411, 1741683287), (281411, 1742791232), (281411, 1751875086), (281411, 1751467021), (281411, 949421112), (281411, 2089932835), (281411, 2095570578), (281411, 654855803), (281411, 652908327), (281411, 662778023), (281411, 663035212), (281411, 671026946), (281411, 677835239), (281411, 678571454), (281411, 679951483), (281411, 1402120349), (281411, 1401588869), (281411, 1407271725), (281411, 1424547033), (281411, 1426939915), (281411, 512291583), (281411, 514471989), (281411, 522686254), (281411, 522315907), (281411, 524682367), (281411, 121873192), (281411, 131739317), (281411, 128639106), (281411, 699184528), (281411, 704143866), (281411, 721936958), (281411, 1762519428), (281411, 1777039309), (281411, 1782989700), (281411, 1786384106), (281411, 9085842), (281411, 20872509), (281411, 25971095), (281411, 28521815), (281411, 26923907), (281411, 172233365), (281411, 189768272), (281411, 189700911), (281411, 561500432), (281411, 2269423696), (281411, 2274894478), (281411, 2281750497), (281411, 2464515149), (281411, 2475503986), (281411, 2492127680), (281411, 2508628457), (281411, 2509744902), (281411, 206916373), (281411, 208354805), (281411, 208256375), (281411, 624819143), (281411, 639105340), (281411, 638917378), (281411, 639300418), (281411, 640659994), (281411, 643404469), (281411, 644870515), (281411, 1429542022), (281411, 1444179270), (281411, 2295873390), (281411, 1060612921), (281411, 1064636512), (281411, 1061264910), (281411, 1066043374), (281411, 1076509976), (281411, 1073518979), (281411, 2372962450), (281411, 2377414339), (281411, 2381168931), (281411, 2383752692), (281411, 2387785755), (281411, 1639815238), (281411, 1642185274), (281411, 1643536629), (281411, 1654807440), (281411, 1660478022), (281411, 1667766524), (281411, 1664940957), (281411, 504936849), (281411, 505222624), (281411, 1989273463), (281411, 1996284623), (281411, 1999728749), (281411, 2002791029), (281411, 2004911940), (281411, 2008535736), (281411, 2012947340), (281411, 298059912), (281411, 298725986), (281411, 301170660), (281411, 300890468), (281411, 304076788), (281411, 301686448), (281411, 307114673), (281411, 319951976), (281411, 920780273), (281411, 922917599), (281411, 924946371), (281411, 923092694), (281411, 927837765), (281411, 930378675), (281411, 930910410), (281411, 933994108), (281411, 936788463), (281411, 938507929), (281411, 944256998), (281411, 1161386513), (281411, 1802322833), (281411, 1804250261), (281411, 1804350243), (281411, 1811086894), (281411, 1813089653), (281411, 1821189740), (281411, 228499834), (281411, 238523563), (281411, 1918924707), (281411, 1923983984), (281411, 1930699915), (281411, 1936331234), (281411, 2015258715), (281411, 956291541), (281411, 959924897), (281411, 967047746), (281411, 980370277), (281411, 982981644), (281411, 460519601), (281411, 1023709332), (281411, 1024744798), (281411, 1043963279), (281411, 1046449998), (281411, 366889605), (281411, 369846251), (281411, 371306667), (281411, 382504714), (281411, 1336498299), (281411, 1350658011), (281411, 323089751), (281411, 327108674), (281411, 325868535), (281411, 327896142), (281411, 336871930), (281411, 337278310), (281411, 339637663), (281411, 2054325875), (281411, 2058285734), (281411, 2063682603), (281411, 2067356902), (281411, 2073235988), (281411, 2124774364), (281411, 2127732713), (281411, 2131611852), (281411, 2134569102), (281411, 1623071773), (281411, 1623484350), (281411, 1625158423), (281411, 1631335719), (281411, 256276592), (281411, 263416623), (281411, 263999789), (281411, 1553496398), (281411, 1570452113), (281411, 1569537841), (281411, 2244180012), (281411, 2265506376), (281411, 2421142016), (281411, 2433070377), (281411, 2442759932), (281411, 1370693637), (281411, 1377733038), (281411, 1379425170), (281411, 1380185764), (281411, 1381009217), (281411, 1386861205), (281411, 1389343074), (281411, 1393369239), (281411, 1826713256), (281411, 1826130829), (281411, 1837498611), (281411, 1840276080), (281411, 1843418919), (281411, 1203280503), (281411, 1213732411), (281411, 1218153332), (281411, 1230249461), (281411, 2517933330), (281411, 2523860792), (281411, 2527931236), (281411, 2536166240), (281411, 1962858529), (281411, 1962612569), (281411, 1973067398), (281411, 1983755088), (281411, 1470336291), (281411, 1481285252), (281411, 735346718), (281411, 736125997), (281411, 743800219), (281411, 744889899), (281411, 1088393891), (281411, 1088736682), (281411, 1096407143), (281411, 1105359643), (281411, 1103884353), (281411, 1107878825), (281411, 1110838324), (281411, 2541722927), (281411, 2547903479), (281411, 2554760257), (281411, 1598185829), (281411, 1598703739), (281411, 66704854), (281411, 111828957), (281411, 267687679), (281411, 270520861), (281411, 271888559), (281411, 276782551), (281411, 278641857), (281411, 282497094), (281411, 288056813), (281411, 2210087467), (281411, 2230056977), (281411, 1502470070), (281411, 1506284529), (281411, 1507999446), (281411, 1511142338), (281411, 354859965), (281411, 362754527), (281411, 365434952), (281411, 363728210), (281411, 1523363845), (281411, 1528931922), (281411, 1540682207), (281411, 1707440174), (281411, 1707727906), (281411, 1713788480), (281411, 1716158228), (281411, 1715064431), (281411, 1717372051), (281411, 1718963830), (281411, 1719854126), (281411, 1727728457), (281411, 484332137), (281411, 486586484), (281411, 489403072), (281411, 489685439), (281411, 490490640), (281411, 493434821), (281411, 499851606), (281411, 502528289), (281411, 502195101), (281411, 1301887021), (281411, 1303181507), (281411, 1308148385), (281411, 1322682565), (281411, 1326195379), (281411, 2388472707), (281411, 2398070546), (281411, 2410535535), (281411, 2415712821), (281411, 2413956907), (281411, 2141794107), (281411, 2171142496), (281411, 1238440672), (281411, 1248094002), (281411, 1246262900), (281411, 1257009156), (281411, 1255434196), (281411, 1265086457), (281411, 593147924), (281411, 612822411), (281411, 615088109), (281411, 994006798), (281411, 995922398), (281411, 1002678075), (281411, 1003043229), (281411, 1008954784), (281411, 1011309099), (281411, 692671354), (281411, 1175343312), (281411, 1179230017), (281411, 1178102591), (281411, 1181673278), (281411, 1181834093), (281411, 1183385738), (281411, 1195121856), (281411, 2014996510), (281411, 2014878068), (281411, 2024353197), (281411, 2027208695), (281411, 2029522374), (281411, 2030114830), (281411, 2035915455), (282631, 164145147), (282631, 172636144), (282631, 172152699), (282631, 174434844), (282631, 179928046), (282631, 183230456), (282631, 140457108), (282631, 72394287), (282631, 79322921), (282631, 87687843), (282631, 457133688), (282631, 464432582), (282631, 464840905), (282631, 48431519), (282631, 54105578), (282631, 57793888), (282631, 13691678), (282631, 23420702), (282631, 22244749), (282631, 25360542), (282631, 31817306), (282631, 66831383), (282631, 105030383), (282631, 107770511), (282631, 114199554), (282631, 113605190), (282631, 116129552), (282631, 199067188), (282631, 200972369), (282631, 204448318), (282631, 208368489), (282631, 287220382), (282631, 288771130), (282631, 300466818), (282631, 523659965), (282631, 524175880), (282631, 526307054), (282631, 528525381), (282631, 532426345), (282631, 534692956), (282631, 223143649), (282631, 226372046), (282631, 236561993), (282631, 241403014), (282631, 243709095), (282631, 247027686), (282631, 247686013), (282631, 103605080), (282631, 406209206), (282631, 414785039), (282631, 414343446), (282631, 419290818), (282631, 425722136), (282631, 429717615), (282631, 481796677), (282631, 181190985), (282631, 189604314), (282631, 316847565), (282631, 329158325), (282631, 344823384), (282631, 350091474), (282631, 349401847), (282631, 353204333), (282631, 435233292), (282631, 440803772), (282631, 443850796), (282631, 478142100), (282631, 338236152), (282631, 340084300), (282631, 360771635), (282631, 375906112), (282631, 498994058), (282631, 507875751), (282712, 281503239), (282712, 286434708), (282712, 1013927163), (282712, 1019120311), (282712, 1026923892), (282712, 449799817), (282712, 455154639), (282712, 453301508), (282712, 479965646), (282712, 1591686909), (282712, 1616587791), (282712, 514291356), (282712, 239459900), (282712, 7885361), (282712, 14042241), (282712, 88319302), (282712, 88866193), (282712, 92985689), (282712, 100280934), (282712, 102382789), (282712, 107153133), (282712, 109273376), (282712, 108657057), (282712, 116068553), (282712, 1250511769), (282712, 1255031765), (282712, 1258916908), (282712, 1265229947), (282712, 301751957), (282712, 303004392), (282712, 307309098), (282712, 345601072), (282712, 346112488), (282712, 812877298), (282712, 830369607), (282712, 837625008), (282712, 1140248495), (282712, 695773453), (282712, 709436355), (282712, 615082015), (282712, 794729112), (282712, 794950039), (282712, 1453337605), (282712, 1451969787), (282712, 1456770956), (282712, 1458706470), (282712, 1463869951), (282712, 1471463602), (282712, 1473372122), (282712, 1477668749), (282712, 38660565), (282712, 45320617), (282712, 45694035), (282712, 117297847), (282712, 119169907), (282712, 790734487), (282712, 798638754), (282712, 802746378), (282712, 806690932), (282712, 807698273), (282712, 769738952), (282712, 768263543), (282712, 466717584), (282712, 215316272), (282712, 1203789614), (282712, 1215039466), (282712, 1219471579), (282712, 1222956523), (282712, 128715187), (282712, 134141735), (282712, 135343271), (282712, 138539853), (282712, 139101984), (282712, 138973686), (282712, 63856919), (282712, 65533295), (282712, 70492518), (282712, 75489278), (282712, 74120086), (282712, 632336039), (282712, 638093613), (282712, 649946548), (282712, 1485446237), (282712, 1514444547), (282712, 1522069277), (282712, 359158896), (282712, 360337972), (282712, 372430062), (282712, 743204098), (282712, 747377098), (282712, 748038550), (282712, 269148113), (282712, 270681847), (282712, 271566281), (282712, 276161360), (282712, 278926535), (282712, 282058736), (282712, 287565611), (282712, 289265632), (282712, 289715928), (282712, 309362408), (282712, 325490901), (282712, 1083077939), (282712, 1091658790), (282712, 89225285), (282712, 418966250), (282712, 429731165), (282712, 437430600), (282712, 338036190), (282712, 914892035), (282712, 922692047), (282712, 927687869), (282712, 926015329), (282712, 402220110), (282712, 489228759), (282712, 495840062), (282712, 496800748), (282712, 1442423427), (282712, 1445872111), (282712, 1446643220), (282712, 1449701487), (282712, 1449065783), (282712, 555857703), (282712, 577598305), (282712, 845473343), (282712, 845627908), (282712, 851839315), (282712, 854964652), (282712, 937575447), (282712, 941456314), (282712, 956229444), (282712, 971260457), (282712, 1688405539), (282712, 1689695945), (282712, 1701662423), (282712, 1702472198), (282712, 1179943863), (282712, 1184281103), (282712, 1190782484), (282712, 1191798010), (282712, 528390450), (282712, 533218350), (282712, 538918442), (282712, 537386367), (282712, 1328858563), (282712, 1369307982), (282712, 1374704448), (282712, 1379018645), (282712, 1385936630), (282712, 1120936199), (282712, 1657341999), (282712, 1662966956), (282712, 1662022616), (282712, 865247513), (282712, 867974903), (282712, 875838618), (282712, 878291731), (282712, 881617396), (282712, 25908370), (282712, 27319310), (282712, 29878572), (282712, 585480051), (282712, 582591255), (282712, 586909199), (282712, 601035211), (282712, 1363519019), (282712, 1363469522), (282712, 155594944), (282712, 164150731), (282712, 169949251), (282712, 179646546), (282712, 177952632), (282712, 180667539), (282712, 966481555), (282712, 987951300), (282712, 987892137), (282712, 992669933), (282712, 673829644), (282712, 675404714), (282712, 675214565), (282712, 675327498), (282712, 676034846), (282712, 682515221), (282712, 685348605), (282712, 1154811079), (282712, 1162143477), (282712, 1169114059), (282712, 1167190380), (282712, 1174090853), (282712, 1178575044), (282712, 376269137), (282712, 380679836), (282712, 387667239), (282712, 395429988), (282712, 567388425), (282712, 645142748), (282712, 247223028), (282712, 257696585), (282712, 261095829), (282712, 266015717), (282712, 267801783), (282712, 1400405523), (282712, 1413840599), (282712, 1421477395), (282712, 1421547094), (282712, 684946496), (282712, 737373695), (282712, 744238898), (282712, 1345610885), (282712, 1357056666), (282712, 658152214), (282712, 151343646), (282712, 228154044), (282712, 229460118), (282712, 1036581793), (282712, 1035806227), (282712, 1037328879), (282712, 1048897072), (282712, 1045259557), (282712, 1055128234), (282712, 1056418297), (282712, 1059587994), (282712, 1062474835), (282712, 1066204788), (282712, 1617021782), (282712, 1634019125), (282712, 1639755171), (282712, 1645394184), (282712, 1647118432), (282712, 183071675), (282712, 183824040), (282712, 1232413675), (282712, 1234507659), (282712, 1238950355), (282712, 1242440883), (282712, 202492892), (282712, 212041168), (282712, 213280350), (282712, 1566723774), (282712, 1576865231), (282712, 1301866112), (282712, 1303987841), (282712, 1309702397), (282712, 1322701344), (282712, 1280062625), (282712, 1280421338), (282712, 1522431536), (282712, 1529576228), (282712, 1538987376), (282712, 1554186064), (282784, 214990654), (282784, 186669593), (282784, 190115226), (282784, 192328893), (282784, 198450167), (282784, 201009003), (282784, 199693025), (282784, 205139952), (282784, 210950615), (282784, 212502657), (282992, 1369468980), (282992, 1384541083), (282992, 1487289827), (282992, 1688369842), (282992, 1694560400), (282992, 1697233400), (282992, 1699794724), (282992, 1703028820), (282992, 1703479842), (282992, 1710868796), (282992, 1815708714), (282992, 1821291048), (282992, 1825141642), (282992, 1824915980), (282992, 1677932827), (282992, 1676444247), (282992, 1684323682), (282992, 1833331320), (282992, 1837202715), (282992, 1839748999), (282992, 86800076), (282992, 94469874), (282992, 99310122), (282992, 105401527), (282992, 118338605), (282992, 834609128), (282992, 842107496), (282992, 859364748), (282992, 156139420), (282992, 154177383), (282992, 162471403), (282992, 167632681), (282992, 172265484), (282992, 1490332461), (282992, 1488281007), (282992, 1503888366), (282992, 1512288755), (282992, 1519961330), (282992, 351580395), (282992, 371192926), (282992, 379626357), (282992, 378563244), (282992, 1108365502), (282992, 1028923119), (282992, 1033296444), (282992, 1037058205), (282992, 1042589043), (282992, 620757647), (282992, 627993366), (282992, 636346167), (282992, 637542203), (282992, 303902811), (282992, 528200428), (282992, 553940478), (282992, 74028032), (282992, 948226460), (282992, 956957137), (282992, 956337043), (282992, 966193126), (282992, 969659490), (282992, 969956701), (282992, 1580650260), (282992, 1588974554), (282992, 2057118256), (282992, 941783114), (282992, 1887494624), (282992, 1893242089), (282992, 1898092758), (282992, 1899072635), (282992, 1914503524), (282992, 1266369114), (282992, 1270173928), (282992, 1289991550), (282992, 1295117616), (282992, 703509169), (282992, 703648166), (282992, 708366977), (282992, 710507315), (282992, 709048911), (282992, 710471116), (282992, 713984794), (282992, 712131398), (282992, 721765977), (282992, 723044147), (282992, 724740770), (282992, 731376548), (282992, 733153192), (282992, 602780333), (282992, 610181314), (282992, 612578585), (282992, 614861689), (282992, 189048096), (282992, 788265646), (282992, 1856028682), (282992, 1859992654), (282992, 1859348300), (282992, 1863556838), (282992, 1863087351), (282992, 1872531805), (282992, 1873480399), (282992, 1878042450), (282992, 245666044), (282992, 250165465), (282992, 262077444), (282992, 1636579531), (282992, 1640383529), (282992, 1641252236), (282992, 1652213186), (282992, 1658189811), (282992, 1659187722), (282992, 1662461275), (282992, 1666559306), (282992, 866104136), (282992, 876204178), (282992, 878535487), (282992, 887625285), (282992, 343422334), (282992, 344362973), (282992, 346932440), (282992, 696421227), (282992, 619486735), (282992, 1230041483), (282992, 1240462701), (282992, 1250741850), (282992, 1187597163), (282992, 1152515775), (282992, 1158826398), (282992, 1161161836), (282992, 559048523), (282992, 1095486584), (282992, 1101508812), (282992, 437236161), (282992, 445313545), (282992, 1193506553), (282992, 1204082141), (282992, 1225028371), (282992, 907134588), (282992, 909855422), (282992, 917937031), (282992, 1441602093), (282992, 1542328364), (282992, 1778608809), (282992, 860715296), (282992, 864346080), (282992, 867287651), (282992, 120877521), (282992, 1786706653), (282992, 1796268256), (282992, 1798188652), (282992, 316346808), (282992, 318543518), (282992, 322487299), (282992, 340103616), (282992, 1987380229), (282992, 1993811040), (282992, 1998841988), (282992, 2003118036), (282992, 2009327605), (282992, 2009882343), (282992, 2014033155), (282992, 675779717), (282992, 680401496), (282992, 680401677), (282992, 681640257), (282992, 684177504), (282992, 686320809), (282992, 690149979), (282992, 33082249), (282992, 130497780), (282992, 149646511), (282992, 499645985), (282992, 506220530), (282992, 503698882), (282992, 508751263), (282992, 983189140), (282992, 983212343), (282992, 985489420), (282992, 991760279), (282992, 991920605), (282992, 997407124), (282992, 1004735019), (282992, 1556496187), (282992, 1558852819), (282992, 1566512813), (282992, 1567867313), (282992, 1575275403), (282992, 1576403301), (282992, 560710255), (282992, 564635153), (282992, 576169719), (282992, 576038965), (282992, 1744423827), (282992, 1750290008), (282992, 1764221550), (282992, 1767287806), (282992, 1770620825), (282992, 1170319725), (282992, 1174962492), (282992, 227843463), (282992, 232389139), (282992, 902305658), (282992, 1121688638), (282992, 1125786066), (282992, 1130386322), (282992, 1137689537), (282992, 1147014465), (282992, 589569963), (282992, 595748111), (282992, 1590081674), (282992, 1593109055), (282992, 1600857751), (282992, 1603607155), (282992, 1609087998), (282992, 1614450082), (282992, 395679384), (282992, 399887047), (282992, 406047446), (282992, 402843592), (282992, 406100830), (282992, 415397114), (282992, 419057119), (282992, 418462677), (282992, 797628482), (282992, 808180777), (282992, 809857909), (282992, 2024251316), (282992, 2027115584), (282992, 2034516914), (282992, 2037315874), (282992, 2038612523), (282992, 2045674360), (282992, 2049630608), (282992, 1344358957), (282992, 1345599765), (282992, 58084171), (282992, 61106243), (282992, 932190055), (282992, 929965989), (282992, 934679987), (282992, 277126723), (282992, 279720069), (282992, 277933972), (282992, 287893949), (282992, 295195884), (282992, 1059179264), (282992, 1059366283), (282992, 1064382267), (282992, 1716174230), (282992, 1522571756), (282992, 1525513618), (282992, 1525692773), (282992, 1529571099), (282992, 1450847850), (282992, 1456164393), (282992, 462841266), (282992, 473764450), (282992, 482902372), (282992, 1393055058), (282992, 1397792638), (282992, 1397487166), (282992, 1402934344), (282992, 1411488371), (282992, 1415188041), (282992, 1420929731), (282992, 1227658113), (282992, 1307053624), (282992, 1939951520), (282992, 1950010036), (282992, 1961511934), (282992, 197789704), (282992, 198076477), (282992, 196052754), (282992, 200902747), (282992, 204329774), (282992, 220678674), (282992, 1614318414), (282992, 1624075976), (282992, 1626065956), (282992, 1627250791), (282992, 1633247809), (282992, 1631070459), (282992, 1632260828), (282992, 1785055939), (282992, 2069018885), (282992, 748987174), (282992, 746940214), (282992, 750601558), (282992, 753205069), (282992, 757041740), (282992, 773301112), (282992, 1754460), (282992, 3869674), (282992, 9614057), (282992, 13874393), (283074, 413962421), (283074, 125393055), (283074, 35092814), (283074, 58796804), (283074, 60034698), (283074, 64083335), (283074, 852156132), (283074, 855503794), (283074, 857774819), (283074, 859603837), (283074, 869146271), (283074, 443223995), (283074, 457800440), (283074, 462039488), (283074, 467035898), (283074, 171948160), (283074, 171514785), (283074, 177208813), (283074, 180793725), (283074, 178404694), (283074, 181925388), (283074, 203366813), (283074, 982240747), (283074, 730567567), (283074, 737010345), (283074, 885060386), (283074, 892431376), (283074, 908334404), (283074, 914310650), (283074, 923121020), (283074, 922310719), (283074, 407586874), (283074, 431306664), (283074, 433649415), (283074, 646013336), (283074, 650629004), (283074, 654947848), (283074, 669849879), (283074, 668368900), (283074, 519196350), (283074, 521143241), (283074, 528440854), (283074, 532569046), (283074, 340999735), (283074, 343509910), (283074, 482123898), (283074, 498062067), (283074, 349663342), (283074, 346793587), (283074, 824011492), (283074, 830863121), (283074, 844175588), (283074, 843152720), (283074, 149881125), (283074, 151747353), (283074, 236243179), (283074, 297881234), (283074, 302229066), (283074, 302410366), (283074, 301291543), (283074, 3232598), (283074, 19142224), (283074, 242750003), (283074, 247079410), (283074, 254543909), (283074, 394026334), (283074, 397204580), (283074, 416583891), (283074, 432311874), (283074, 431136905), (283074, 173465640), (283074, 622740088), (283074, 909917370), (283074, 87529457), (283074, 84989916), (283074, 752929218), (283074, 800821491), (283074, 808557274), (283074, 810573999), (283074, 77480842), (283074, 79556274), (283074, 83326275), (283074, 85629156), (283074, 92028977), (283074, 22186194), (283074, 27059898), (283074, 572851277), (283074, 593984818), (283074, 593259555), (283074, 108608961), (283074, 118196938), (283074, 603009893), (283074, 608371529), (283074, 615339862), (283074, 632894283), (283074, 170112725), (283074, 537612567), (283074, 539762853), (283074, 500072422), (283074, 512174529), (283074, 562409932), (283074, 310356627), (283074, 369753747), (283074, 377307282), (283074, 1012699693), (283074, 1015196526), (283074, 699588484), (283074, 705700940), (283074, 711679453), (283074, 959195913), (283074, 957045172), (283074, 965402006), (283074, 966620502), (283074, 261307649), (283074, 264687684), (283074, 262069609), (283074, 265477195), (283074, 265311981), (283074, 275360017), (283074, 277300892), (283074, 279910138), (283074, 785412612), (283074, 793663598), (283074, 792304498), (283074, 386056127), (283074, 390669110), (283074, 392802805), (283074, 188467611), (283074, 190702979), (283155, 255415335), (283155, 31961439), (283155, 29825428), (283155, 66830298), (283155, 74220812), (283155, 78463673), (283155, 80000034), (283155, 81231352), (283155, 82108929), (283155, 455612776), (283155, 464364209), (283155, 466591493), (283155, 251325493), (283155, 265780702), (283155, 265392746), (283155, 60335975), (283155, 63431180), (283155, 65031520), (283155, 339776290), (283155, 351448942), (283155, 353690469), (283155, 404129905), (283155, 407734955), (283155, 2434826), (283155, 12593978), (283155, 13516481), (283155, 15581545), (283155, 19157358), (283155, 22059563), (283155, 25103385), (283155, 514586471), (283155, 375332043), (283155, 372987828), (283155, 378054182), (283155, 390431257), (283155, 411870342), (283155, 326599941), (283155, 334276112), (283155, 353041192), (283155, 357697338), (283155, 127414098), (283155, 269547021), (283155, 278387638), (283155, 281383602), (283155, 482701672), (283155, 495422653), (283155, 497751094), (283155, 173310297), (283155, 179959945), (283155, 192055255), (283155, 235609940), (283155, 245767391), (283155, 411623221), (283155, 416341368), (283155, 424910220), (283155, 431784196), (283155, 441773001), (283155, 210202168), (283155, 223342059), (283155, 226138675), (283155, 225543919), (283155, 298057100), (283155, 302125674), (283155, 311379775), (283155, 35030390), (283155, 43072717), (283155, 51971999), (283155, 211406580), (283155, 92191386), (283155, 94001150), (283155, 93208800), (283155, 137685525), (283155, 141439776), (283155, 145900642), (283155, 145535911), (283155, 145537315), (283155, 150613654), (283155, 153803009), (283155, 157555819), (283155, 155743540), (283155, 159332962), (283155, 196063676), (283270, 33294235), (283270, 36192261), (283270, 59321623), (283270, 58058012), (283270, 1820228), (283270, 4498654), (283270, 3617124), (283270, 6598496), (283270, 9906075), (283270, 12351943), (283270, 137056290), (283270, 144679678), (283270, 143022586), (283270, 144968888), (283270, 100376419), (283270, 102016811), (283270, 102735375), (283270, 187178678), (283270, 194896126), (283270, 122793824), (283270, 127780643), (283270, 132087804), (283270, 198632194), (283270, 200259063), (283270, 151920098), (283270, 149356594), (283270, 164944045), (283270, 168684140), (283270, 169574492), (283270, 168198551), (283270, 90191285), (283270, 90877228), (283270, 92847189), (283270, 92446332), (283270, 60312914), (283270, 65323314), (283270, 66654094), (283270, 177425604), (283270, 186523400), (283270, 187582241), (283270, 196284164), (283270, 22527357), (283270, 24693622), (283270, 33253502), (283270, 77688725), (283270, 79011437), (283270, 83039711), (283429, 1568219006), (283429, 244485841), (283429, 247006731), (283429, 247340541), (283429, 250729503), (283429, 130985192), (283429, 136074718), (283429, 152898599), (283429, 1610875741), (283429, 1630687495), (283429, 493306414), (283429, 500716570), (283429, 1739935191), (283429, 1748348130), (283429, 1760812562), (283429, 3154832141), (283429, 3163370499), (283429, 3166626130), (283429, 432308390), (283429, 438987055), (283429, 453007110), (283429, 452746668), (283429, 4287180121), (283429, 4289714320), (283429, 4303772153), (283429, 4308246034), (283429, 3984249254), (283429, 3992442565), (283429, 4002305370), (283429, 3201252170), (283429, 3206252045), (283429, 3211497408), (283429, 3214499570), (283429, 97700639), (283429, 110931576), (283429, 108211614), (283429, 109939007), (283429, 112927238), (283429, 115655026), (283429, 975012959), (283429, 985822987), (283429, 994827429), (283429, 889160859), (283429, 930426329), (283429, 931856983), (283429, 946405503), (283429, 959435798), (283429, 961840220), (283429, 962030017), (283429, 2565172596), (283429, 2566373514), (283429, 2570815020), (283429, 1092410746), (283429, 3832416470), (283429, 3832095668), (283429, 3834350993), (283429, 3835111780), (283429, 3834325054), (283429, 3843068920), (283429, 3846943720), (283429, 3844826725), (283429, 3850130737), (283429, 3854984852), (283429, 3899905144), (283429, 3902255541), (283429, 3902406164), (283429, 3903956539), (283429, 3910264546), (283429, 919575980), (283429, 927166860), (283429, 1138765052), (283429, 1142429272), (283429, 1146786562), (283429, 1148515735), (283429, 4319779759), (283429, 3250899224), (283429, 3262843742), (283429, 2965553285), (283429, 2977648409), (283429, 2980144403), (283429, 2983755714), (283429, 3045583763), (283429, 191432685), (283429, 203409887), (283429, 205793440), (283429, 203941339), (283429, 779193563), (283429, 789613734), (283429, 791578685), (283429, 791560253), (283429, 793497821), (283429, 3658909047), (283429, 3658563341), (283429, 1854549429), (283429, 710988344), (283429, 715251126), (283429, 726764622), (283429, 759171954), (283429, 764356472), (283429, 765851778), (283429, 767728949), (283429, 771439619), (283429, 769829729), (283429, 4025323188), (283429, 4024244068), (283429, 4029368436), (283429, 4040229899), (283429, 4041097666), (283429, 4040389161), (283429, 3720369363), (283429, 3858160171), (283429, 3856484892), (283429, 3862943273), (283429, 3874003074), (283429, 3880790472), (283429, 4376574550), (283429, 4382553006), (283429, 3617300603), (283429, 2041283869), (283429, 2050026896), (283429, 2054795990), (283429, 2063988991), (283429, 2067288657), (283429, 2071331679), (283429, 2077565655), (283429, 4051947625), (283429, 4064107769), (283429, 4062204931), (283429, 4065520608), (283429, 4067188391), (283429, 4072878367), (283429, 4076825505), (283429, 4081293443), (283429, 3460567151), (283429, 3462075389), (283429, 3465467335), (283429, 3468422260), (283429, 3472653911), (283429, 3475164236), (283429, 29863443), (283429, 36912675), (283429, 558569517), (283429, 570456916), (283429, 567782100), (283429, 3775156959), (283429, 3777512506), (283429, 3789189626), (283429, 1691485510), (283429, 1701962439), (283429, 1705665608), (283429, 167359932), (283429, 165676008), (283429, 172673772), (283429, 1497078368), (283429, 1497461720), (283429, 1499296873), (283429, 3368399226), (283429, 3369511102), (283429, 3370455364), (283429, 3377644708), (283429, 3380450858), (283429, 3389047231), (283429, 3390071769), (283429, 2589713617), (283429, 2596702142), (283429, 2602444722), (283429, 2602098431), (283429, 2600529493), (283429, 2606581332), (283429, 2712151929), (283429, 2715080532), (283429, 2719123793), (283429, 2721256348), (283429, 2724216377), (283429, 2725514909), (283429, 2798374229), (283429, 2134419828), (283429, 2149066396), (283429, 2154109300), (283429, 2158705712), (283429, 2170931364), (283429, 1411251880), (283429, 1960933562), (283429, 1973709523), (283429, 1974079176), (283429, 296045908), (283429, 296357193), (283429, 297523875), (283429, 301525545), (283429, 302105104), (283429, 305746143), (283429, 305493606), (283429, 3275801214), (283429, 3278435582), (283429, 3299159541), (283429, 1001056843), (283429, 1018867418), (283429, 1024295603), (283429, 1032296511), (283429, 214343518), (283429, 226772014), (283429, 3091100277), (283429, 3099868561), (283429, 3108629569), (283429, 3113014176), (283429, 3113073679), (283429, 673886676), (283429, 679351213), (283429, 679978717), (283429, 679730532), (283429, 681304456), (283429, 685193626), (283429, 687066592), (283429, 688427583), (283429, 3505588038), (283429, 3510530848), (283429, 3512779320), (283429, 3514463952), (283429, 3517901017), (283429, 3532020390), (283429, 745052602), (283429, 754261689), (283429, 760669830), (283429, 43262327), (283429, 47486802), (283429, 56229484), (283429, 54836344), (283429, 60530253), (283429, 57905552), (283429, 1422277783), (283429, 1923742587), (283429, 1954595987), (283429, 190690269), (283429, 189780618), (283429, 230196771), (283429, 231338891), (283429, 361253582), (283429, 363078983), (283429, 367517457), (283429, 370318809), (283429, 2080849777), (283429, 2078573315), (283429, 1594744936), (283429, 3538737879), (283429, 3551290031), (283429, 3555061094), (283429, 3555837313), (283429, 3559905432), (283429, 3567206309), (283429, 1672817258), (283429, 3683952589), (283429, 3689518027), (283429, 3701752323), (283429, 3707488220), (283429, 3712909476), (283429, 2322124907), (283429, 2324677768), (283429, 2331267540), (283429, 2807247984), (283429, 2807823212), (283429, 2805910454), (283429, 2824178115), (283429, 321312843), (283429, 326932750), (283429, 328995004), (283429, 334318321), (283429, 1428487157), (283429, 1431543265), (283429, 1430371235), (283429, 1444619042), (283429, 1448204477), (283429, 1451549730), (283429, 1452257562), (283429, 1458434832), (283429, 2478349822), (283429, 2645719604), (283429, 2649828905), (283429, 2662413856), (283429, 2666023662), (283429, 2670419257), (283429, 2673593832), (283429, 3924890130), (283429, 3927361733), (283429, 3939657121), (283429, 273590802), (283429, 278833118), (283429, 279751057), (283429, 282731641), (283429, 283168232), (283429, 1893054343), (283429, 1907078338), (283429, 1905490517), (283429, 1906339863), (283429, 1289025873), (283429, 873832655), (283429, 880604991), (283429, 1785672245), (283429, 1793004654), (283429, 403679302), (283429, 1542179329), (283429, 1545147684), (283429, 2457503578), (283429, 2460940619), (283429, 2467411411), (283429, 2468851110), (283429, 2467614009), (283429, 3028259758), (283429, 3339249463), (283429, 1874233061), (283429, 4333055508), (283429, 4345902245), (283429, 4353011335), (283429, 4360234404), (283429, 4359784933), (283429, 2259226438), (283429, 2265174467), (283429, 2265505835), (283429, 2268586840), (283429, 2281706051), (283429, 2285086152), (283429, 2288554919), (283429, 3396333867), (283429, 3404253778), (283429, 1777389605), (283429, 1774499522), (283429, 1783805170), (283429, 619115370), (283429, 625818835), (283429, 630689310), (283429, 632240653), (283429, 636723935), (283429, 641297584), (283429, 1001418601), (283429, 2109819049), (283429, 2111498696), (283429, 2121797053), (283429, 1470407735), (283429, 1472927198), (283429, 1474612726), (283429, 1473282681), (283429, 2862578531), (283429, 2861251935), (283429, 2868557501), (283429, 2872669265), (283429, 2877049740), (283429, 2292211727), (283429, 2296247868), (283429, 2296837506), (283429, 2492528996), (283429, 2492997104), (283429, 2493706220), (283429, 2501355218), (283429, 2804685501), (283429, 2514477542), (283429, 1042922326), (283429, 519055607), (283429, 520801387), (283429, 521233569), (283429, 528342675), (283429, 533443923), (283429, 534892139), (283429, 1338715098), (283429, 1341227525), (283429, 1345933502), (283429, 1347572381), (283429, 1350628719), (283429, 1353750201), (283429, 1710451591), (283429, 1712457222), (283429, 1714267360), (283429, 1725472193), (283429, 1731691979), (283429, 1262083256), (283429, 2168165121), (283429, 387232267), (283429, 385696011), (283429, 469139851), (283429, 470252232), (283429, 476014765), (283429, 473119260), (283429, 478765328), (283429, 483913232), (283429, 2222485530), (283429, 2226167441), (283429, 2227436004), (283429, 2241407046), (283429, 660386328), (283429, 667238559), (283429, 670704258), (283429, 1641788340), (283429, 1648356349), (283429, 1652779083), (283429, 1650961418), (283429, 1653088121), (283429, 1654780636), (283429, 4119344671), (283429, 4122529634), (283429, 4120936515), (283429, 4126424447), (283429, 4139856975), (283429, 4145084929), (283429, 4149114126), (283429, 837859816), (283429, 847065940), (283429, 1301737586), (283429, 1302326650), (283429, 1302356172), (283429, 1303174246), (283429, 1309077525), (283429, 2177602759), (283429, 2185680487), (283429, 2204205931), (283429, 2206742965), (283429, 1203632208), (283429, 1255479864), (283429, 3061607704), (283429, 3069835072), (283429, 3073394332), (283429, 504770333), (283429, 508533816), (283429, 508791938), (283429, 509846159), (283429, 515007267), (283429, 514419073), (283429, 2377780619), (283429, 2380812873), (283429, 2383699803), (283429, 578385949), (283429, 587274544), (283429, 594567488), (283429, 599439862), (283429, 606280065), (283429, 3807815327), (283429, 3808711099), (283429, 3818027379), (283429, 3828974950), (283429, 3450044180), (283429, 571929234), (283429, 1085283746), (283429, 4094774025), (283429, 2247302053), (283429, 2248557476), (283429, 2300072786), (283429, 2300474375), (283429, 2306265719), (283429, 2309074071), (283429, 2616834008), (283429, 2626664227), (283429, 2635374872), (283429, 614899326), (283429, 1982551741), (283429, 1985809357), (283429, 1993294074), (283429, 2001454718), (283429, 1998281606), (283429, 2006147523), (283429, 1119270326), (283429, 1116497310), (283429, 1124415366), (283429, 1127072185), (283429, 1127605030), (283429, 1153630855), (283429, 4242479524), (283429, 4243012845), (283429, 4254037800), (283429, 4260292556), (283429, 2924571602), (283429, 2929287436), (283429, 2943703779), (283429, 2947551678), (283429, 2948633892), (283429, 2959332695), (283429, 3888795367), (283429, 3952584570), (283429, 3959814402), (283429, 3969734607), (283429, 3973943845), (283429, 3973087613), (283429, 3537345202), (283429, 3725899743), (283429, 3728313248), (283429, 3730635520), (283429, 3745033277), (283429, 3408085420), (283429, 3420104884), (283429, 3425693670), (283429, 3425930013), (283429, 3432953454), (283429, 3431631450), (283429, 3439455866), (283429, 1318435491), (283429, 1326788884), (283429, 1327516212), (283429, 3594906738), (283429, 3595153036), (283429, 1812929456), (283429, 1822408863), (283429, 1824967979), (283429, 1219879484), (283429, 1228982280), (283429, 1233393258), (283429, 1237024743), (283429, 1236247156), (283429, 1241669258), (283429, 2690802429), (283429, 2752070992), (283429, 64812095), (283429, 66543092), (283429, 67551797), (283429, 66413539), (283429, 461288363), (283429, 2009703357), (283429, 2013785421), (283429, 2014166506), (283429, 2013259179), (283429, 2033368422), (283429, 2406979974), (283429, 2426140270), (283429, 2423371590), (283429, 346552488), (283429, 350441743), (283429, 415905704), (283429, 423017570), (283429, 421244554), (283429, 425692996), (283429, 883661690), (283429, 1080451873), (283429, 1358857561), (283429, 2996639550), (283429, 3000465308), (283429, 3010114648), (283429, 3012836552), (283429, 3018374053), (283429, 3021384870), (283429, 5961771), (283429, 7253149), (283429, 15570795), (283429, 20154264), (283429, 19685710), (283429, 4267295154), (283429, 4279255345), (283429, 4279523644), (283429, 822228323), (283429, 835374236), (283429, 836791829), (283429, 2433749393), (283429, 2433775635), (283429, 2437613859), (283429, 2536502620), (283429, 2536232272), (283429, 2537859565), (283429, 2539502626), (283429, 2541082686), (283429, 2542905291), (283429, 2559536502), (283429, 314350829), (283429, 316107436), (283429, 316588549), (283429, 542406971), (283429, 549310005), (283429, 695567037), (283429, 695914374), (283429, 654093188), (283429, 652490083), (283429, 1157082497), (283429, 1399981608), (283429, 1402190633), (283429, 2886327653), (283429, 4190755807), (283429, 4194329473), (283429, 4200790959), (283429, 4204458339), (283429, 4206272332), (283429, 4206862755), (283429, 4215249761), (283429, 2842231648), (283429, 2841058576), (283429, 957062010), (283429, 734935200), (283429, 3173693858), (283429, 3175532695), (283429, 1522124357), (283429, 1523460241), (283429, 1528911699), (283429, 1529058807), (283429, 897799768), (283429, 898802791), (283429, 4155624346), (283429, 4155148108), (283429, 4159769626), (283429, 4162755704), (283429, 4176942076), (283429, 1371282786), (283429, 1418982615), (283429, 1421516753), (283429, 1943542253), (283429, 1948627460), (283429, 1954787433), (283429, 2761394969), (283429, 2762686314), (283429, 2769748038), (283429, 2777190725), (283429, 2782265861), (283429, 2785600722), (283429, 2784289792), (283429, 2789001055), (283429, 3121953603), (283429, 3132074200), (283429, 3193668384), (283429, 1166414802), (283429, 1169639766), (283429, 1188221585), (283429, 2889419075), (283429, 2896761969), (283429, 2911371579), (283429, 2914552420), (283429, 2916047563), (283608, 254812251), (283608, 260653310), (283608, 263593060), (283608, 509147330), (283608, 513195901), (283608, 512519793), (283608, 512920303), (283608, 440327782), (283608, 442097325), (283608, 503332057), (283608, 506002791), (283608, 519204763), (283608, 526172034), (283608, 526906545), (283608, 526309772), (283608, 531087861), (283608, 531327937), (283608, 86694374), (283608, 139624232), (283608, 142637908), (283608, 143402327), (283608, 156079832), (283608, 91017438), (283608, 97869609), (283608, 7998489), (283608, 12545393), (283608, 20408461), (283608, 353533622), (283608, 358208870), (283608, 230783744), (283608, 239120681), (283608, 244556602), (283608, 245127400), (283608, 294067137), (283608, 308433261), (283608, 313174940), (283608, 200218740), (283608, 179229333), (283608, 180751046), (283608, 197792416), (283608, 205988942), (283608, 330302665), (283608, 351007207), (283608, 445070852), (283608, 453810671), (283608, 459220233), (283608, 458220275), (283608, 464005501), (283608, 465958375), (283608, 39049180), (283608, 432052906), (283608, 437520149), (283608, 368252592), (283608, 369502190), (283608, 375358455), (283608, 375223072), (283608, 390435260), (283608, 393478393), (283608, 400421189), (283608, 267903407), (283608, 282507624), (283608, 279479526), (283608, 286907351), (283608, 287740302), (283608, 57071810), (283608, 64244341), (283780, 2389418545), (283780, 2473543519), (283780, 2473238267), (283780, 2475920584), (283780, 2480374821), (283780, 2488887403), (283780, 2492904095), (283780, 1980444067), (283780, 2001285396), (283780, 666381247), (283780, 681726046), (283780, 870341786), (283780, 888241480), (283780, 890397823), (283780, 893810944), (283780, 897326713), (283780, 2592392602), (283780, 2593442590), (283780, 1475295752), (283780, 1490157740), (283780, 1766657750), (283780, 1767902629), (283780, 756541389), (283780, 2429751212), (283780, 2439695784), (283780, 2449299932), (283780, 1732702970), (283780, 1735762915), (283780, 1738639519), (283780, 1738566216), (283780, 1741967934), (283780, 1750105019), (283780, 1754961006), (283780, 87380767), (283780, 94421099), (283780, 94267745), (283780, 94013898), (283780, 93712366), (283780, 203593948), (283780, 200794822), (283780, 202143006), (283780, 200617064), (283780, 1540374071), (283780, 1544802210), (283780, 1549059206), (283780, 1555537208), (283780, 1557739082), (283780, 1576574168), (283780, 518499697), (283780, 523768529), (283780, 527229904), (283780, 539121182), (283780, 550748883), (283780, 101195958), (283780, 101114770), (283780, 113006728), (283780, 118639609), (283780, 119785217), (283780, 66498980), (283780, 178345882), (283780, 183485709), (283780, 188512535), (283780, 188231490), (283780, 192173081), (283780, 267637627), (283780, 268589354), (283780, 274706595), (283780, 909703008), (283780, 915453821), (283780, 916106931), (283780, 925637478), (283780, 927148118), (283780, 2559556325), (283780, 2560941638), (283780, 2564836329), (283780, 2569654623), (283780, 2577886435), (283780, 2580783140), (283780, 2585614566), (283780, 683605023), (283780, 690324781), (283780, 693584166), (283780, 693798728), (283780, 704970432), (283780, 712078159), (283780, 28009081), (283780, 191658792), (283780, 194849381), (283780, 196520440), (283780, 2060908403), (283780, 2065311306), (283780, 2064701836), (283780, 2065116793), (283780, 2066788725), (283780, 2074812482), (283780, 2078130199), (283780, 1798676518), (283780, 1803046616), (283780, 1806081477), (283780, 1810961794), (283780, 2081946655), (283780, 2085798792), (283780, 2086252833), (283780, 2089007488), (283780, 2105972603), (283780, 335850785), (283780, 339057435), (283780, 362461147), (283780, 1159189132), (283780, 1174241368), (283780, 2640124660), (283780, 2656177358), (283780, 1307206757), (283780, 1319035095), (283780, 1324452253), (283780, 1328281889), (283780, 1813885580), (283780, 1813087153), (283780, 1816847846), (283780, 1817770651), (283780, 1827150122), (283780, 1832411756), (283780, 1833135460), (283780, 1838248947), (283780, 462491199), (283780, 466406477), (283780, 1261531439), (283780, 1262267161), (283780, 1273815327), (283780, 1278486261), (283780, 624842914), (283780, 625806004), (283780, 1210657936), (283780, 1215226405), (283780, 1682158759), (283780, 778636133), (283780, 787952516), (283780, 794582438), (283780, 797603977), (283780, 800125939), (283780, 801178696), (283780, 70339459), (283780, 72918714), (283780, 81177742), (283780, 947703349), (283780, 944533894), (283780, 947775060), (283780, 1949173296), (283780, 1970982743), (283780, 2016113982), (283780, 2020137235), (283780, 2227986045), (283780, 2325080513), (283780, 2332034094), (283780, 2342562554), (283780, 2345096226), (283780, 980624575), (283780, 167077117), (283780, 167942542), (283780, 170778703), (283780, 174821602), (283780, 175411168), (283780, 423543200), (283780, 125366642), (283780, 131626974), (283780, 130830560), (283780, 138180340), (283780, 137367979), (283780, 150694550), (283780, 153786298), (283780, 2512586540), (283780, 2524472090), (283780, 2527868926), (283780, 2535640341), (283780, 2540419530), (283780, 2541213497), (283780, 2011896347), (283780, 2167833401), (283780, 2177677325), (283780, 2177571279), (283780, 2177777889), (283780, 294112986), (283780, 296777171), (283780, 309087957), (283780, 321578367), (283780, 1551516628), (283780, 1184485916), (283780, 1187992259), (283780, 1196136542), (283780, 1201973266), (283780, 1201865724), (283780, 1201652453), (283780, 1204194690), (283780, 366288685), (283780, 371749209), (283780, 375025974), (283780, 1893398603), (283780, 1906300657), (283780, 2131634042), (283780, 2130601760), (283780, 1443173386), (283780, 1441467169), (283780, 1446104021), (283780, 1465269725), (283780, 278900477), (283780, 276772331), (283780, 278375880), (283780, 278598264), (283780, 277804952), (283780, 284895231), (283780, 1349601584), (283780, 1917417743), (283780, 1922090608), (283780, 1934009008), (283780, 1937945821), (283780, 713280368), (283780, 710652837), (283780, 712073305), (283780, 711925887), (283780, 716176501), (283780, 640444013), (283780, 641566258), (283780, 656692670), (283780, 657959463), (283780, 1096977121), (283780, 959120376), (283780, 963191151), (283780, 974035270), (283780, 2136852538), (283780, 2137232889), (283780, 2139344055), (283780, 2149883111), (283780, 2150701838), (283780, 2155749019), (283780, 2157986043), (283780, 2157803510), (283780, 2161916971), (283780, 2181816970), (283780, 1723482573), (283780, 2555328674), (283780, 214925692), (283780, 223394056), (283780, 228985953), (283780, 231734345), (283780, 433996420), (283780, 441772719), (283780, 2506326511), (283780, 2504372931), (283780, 2505965436), (283780, 2611794178), (283780, 2610209177), (283780, 2610224800), (283780, 2613386559), (283780, 2627639784), (283780, 2628918998), (283780, 242193950), (283780, 245617995), (283780, 1676712722), (283780, 1681959398), (283780, 1147340365), (283780, 1337563838), (283780, 1344795319), (283780, 1592639869), (283780, 1598505674), (283780, 1626606125), (283780, 1632334217), (283780, 1636690402), (283780, 1644280110), (283780, 840059628), (283780, 837957595), (283780, 847287470), (283780, 850167259), (283780, 862347651), (283780, 1124607559), (283780, 40703269), (283780, 42144692), (283780, 47064959), (283780, 58802565), (283780, 1000820332), (283780, 1005507327), (283780, 1022012948), (283780, 2030214240), (283780, 2032921083), (283780, 2031141562), (283780, 2034390837), (283780, 2043384183), (283780, 2260271400), (283780, 2263863548), (283780, 2265385358), (283780, 2267194299), (283780, 2275651235), (283780, 1511697999), (283780, 1516395116), (283780, 1514350463), (283780, 1516077804), (283780, 1516705249), (283780, 1525092040), (283780, 2198292342), (283780, 2199122076), (283780, 2203598539), (283780, 2214621793), (283780, 2216512407), (283780, 2217276294), (283780, 1392487382), (283780, 1391001400), (283780, 1421206703), (283780, 1418910954), (283780, 816902186), (283780, 819762850), (283780, 929733252), (283780, 1032048497), (283780, 1030836837), (283780, 1033851455), (283780, 1039767810), (283780, 1428638986), (283780, 1430539731), (283780, 1433719557), (283780, 1867185570), (283780, 1881959481), (283780, 1885858424), (283780, 587840111), (283780, 594571853), (283780, 555628283), (283780, 557704755), (283780, 559757094), (283780, 559443685), (283780, 560485210), (283780, 565472909), (283780, 566390509), (283780, 570652920), (283780, 573791047), (283780, 575706251), (283780, 582163072), (283780, 2611963), (283780, 11621285), (283780, 19923734), (283780, 20256596), (283780, 1692454048), (283780, 1695134225), (283780, 1711084634), (283780, 471603232), (283780, 476536608), (283780, 478746421), (283780, 480245180), (283780, 489490534), (283780, 1231802205), (283780, 1233779000), (283780, 1236898248), (283780, 1241120162), (283780, 1248855254), (283780, 1248866990), (283780, 1248967062), (283780, 1252879432), (283780, 1254543462), (283780, 1284687687), (283780, 1295453648), (283780, 1454180886), (283780, 1454542896), (283780, 393485075), (283780, 404971466), (283780, 412873908), (283780, 2279327546), (283780, 2283223237), (283780, 2291565405), (283780, 2296369487), (283780, 2304991561), (283780, 2689449856), (283780, 2705644699), (283780, 499926895), (283780, 496867991), (283780, 502360914), (283780, 500911892), (283780, 504619674), (283780, 509026410), (283780, 721694409), (283780, 722228482), (283780, 730763053), (283780, 730407119), (283780, 733067966), (283780, 735734366), (283780, 754309425), (283780, 2347958665), (283780, 2350581063), (283780, 2351638644), (283780, 2362030202), (283780, 2414096269), (283780, 1050821159), (283780, 1070263713), (283780, 1067610995), (283780, 1071037144), (283780, 2116353620), (283780, 2115408099), (283780, 2233994159), (284006, 547467726), (284006, 551678576), (284006, 562474153), (284006, 388693677), (284006, 392481712), (284006, 221470687), (284006, 224004348), (284006, 223182147), (284006, 294049599), (284006, 297777910), (284006, 325269803), (284006, 333315135), (284006, 334464904), (284006, 336685123), (284006, 337517456), (284006, 350995421), (284006, 354386329), (284006, 367319026), (284006, 373431697), (284006, 439628616), (284006, 440826245), (284006, 287486456), (284006, 87053704), (284006, 89564068), (284006, 31423737), (284006, 82541878), (284006, 193712914), (284006, 206720357), (284006, 402174009), (284006, 405852427), (284006, 482550001), (284006, 490335078), (284006, 490380894), (284006, 227729968), (284006, 245664248), (284006, 246780181), (284006, 129348968), (284006, 262994884), (284006, 268278540), (284006, 272426846), (284006, 273884444), (284006, 275749711), (284006, 285142502), (284006, 101949741), (284006, 112817621), (284006, 113703124), (284006, 115957948), (284006, 123558845), (284006, 416212700), (284006, 419612781), (284006, 420537648), (284006, 429008488), (284006, 431237040), (284006, 438671941), (284006, 572128834), (284006, 138975822), (284006, 151464467), (284006, 153547703), (284006, 255011554), (284006, 301449277), (284006, 304466281), (284006, 309018135), (284006, 312361133), (284006, 323905136), (284006, 327109167), (284006, 454568805), (284006, 459900774), (284006, 472992658), (284006, 2507151), (284006, 8951810), (284006, 19745678), (284006, 16718185), (284006, 404857501), (284006, 524854343), (284006, 524941222), (284006, 529811290), (284006, 530631320), (284006, 539109071), (284006, 509183751), (284006, 517428436), (284006, 517163850), (284006, 518717918), (284006, 519646797), (284006, 519921691), (284006, 69879289), (284006, 38259632), (284006, 44562677), (284006, 42498766), (284006, 47992703), (284006, 164165371), (284154, 118872765), (284154, 176033671), (284154, 184498941), (284154, 194771443), (284154, 89448633), (284154, 90793231), (284154, 93561245), (284154, 95065424), (284154, 102194480), (284154, 111600155), (284154, 112664111), (284154, 204961698), (284154, 122551501), (284154, 10738450), (284154, 13391783), (284154, 21136264), (284154, 22166811), (284154, 24148803), (284154, 33512236), (284154, 35596347), (284154, 55499495), (284154, 62796697), (284154, 70056781), (284154, 73333358), (284154, 157090375), (284154, 161570733), (284154, 80410022), (284213, 2606549963), (284213, 161366075), (284213, 169333189), (284213, 177711062), (284213, 176660591), (284213, 176462288), (284213, 183551120), (284213, 775356331), (284213, 1638401664), (284213, 1638239326), (284213, 1642948162), (284213, 1770110875), (284213, 756486209), (284213, 755944412), (284213, 197457357), (284213, 201242364), (284213, 209829421), (284213, 211954641), (284213, 217331043), (284213, 816562833), (284213, 817245216), (284213, 825591829), (284213, 829317684), (284213, 833765414), (284213, 2271290498), (284213, 2273679633), (284213, 2336497150), (284213, 2358777375), (284213, 431235053), (284213, 430445619), (284213, 435764435), (284213, 444119788), (284213, 3236401728), (284213, 3258893429), (284213, 2770340214), (284213, 2775857500), (284213, 3485630881), (284213, 3488042797), (284213, 3488473902), (284213, 3496552410), (284213, 3497015333), (284213, 456287316), (284213, 461086024), (284213, 2260188263), (284213, 1216797577), (284213, 1225019345), (284213, 2110975544), (284213, 224202608), (284213, 228528965), (284213, 234267578), (284213, 243892848), (284213, 1585778210), (284213, 1588032339), (284213, 1594221239), (284213, 1595725922), (284213, 1596725322), (284213, 1597926091), (284213, 1604140042), (284213, 1609071327), (284213, 1610967920), (284213, 3139326081), (284213, 3155376172), (284213, 1022918607), (284213, 1025812928), (284213, 1029213266), (284213, 1028629248), (284213, 1031297703), (284213, 1048455982), (284213, 1048308565), (284213, 1047110291), (284213, 1801074890), (284213, 1450535116), (284213, 1453273502), (284213, 1457713244), (284213, 1471968761), (284213, 739568956), (284213, 736444338), (284213, 740441336), (284213, 9950375), (284213, 686410117), (284213, 687929212), (284213, 685471606), (284213, 695479982), (284213, 695532799), (284213, 698080792), (284213, 698415354), (284213, 701584122), (284213, 1345672615), (284213, 1344029112), (284213, 1234617838), (284213, 1240343170), (284213, 1245626229), (284213, 1251812467), (284213, 1258927258), (284213, 1261343971), (284213, 1262138938), (284213, 554874455), (284213, 566210271), (284213, 565987259), (284213, 566592442), (284213, 775495685), (284213, 778732256), (284213, 641074443), (284213, 1853502392), (284213, 1879639644), (284213, 1894007530), (284213, 3271279683), (284213, 3269925104), (284213, 3273185788), (284213, 1121569975), (284213, 1128287072), (284213, 1132110496), (284213, 1313825574), (284213, 1354669192), (284213, 1910966591), (284213, 2123721424), (284213, 2135842288), (284213, 2137791888), (284213, 96085946), (284213, 93968203), (284213, 99021698), (284213, 103830977), (284213, 121958939), (284213, 2720583567), (284213, 2730905826), (284213, 2729906588), (284213, 2731258883), (284213, 25276021), (284213, 30417830), (284213, 1081666837), (284213, 1084979045), (284213, 1085685073), (284213, 1085096455), (284213, 1087157447), (284213, 1094923389), (284213, 1097144130), (284213, 1101010024), (284213, 1104889370), (284213, 1534056902), (284213, 1550024149), (284213, 1558894621), (284213, 1698641955), (284213, 1697681182), (284213, 1716250135), (284213, 1718925344), (284213, 3312227123), (284213, 1738931975), (284213, 1749326068), (284213, 1749676909), (284213, 1757705807), (284213, 67410408), (284213, 70630496), (284213, 79710282), (284213, 88454298), (284213, 91407137), (284213, 3501517600), (284213, 3432368048), (284213, 3433851309), (284213, 3444665554), (284213, 3463460830), (284213, 2065843643), (284213, 2069615288), (284213, 3186691218), (284213, 3188244614), (284213, 3190335306), (284213, 3200464265), (284213, 2175372848), (284213, 2175610165), (284213, 2181108142), (284213, 2183068865), (284213, 384981185), (284213, 387234161), (284213, 390564195), (284213, 2793097905), (284213, 2799730338), (284213, 2801711746), (284213, 2799754430), (284213, 786171537), (284213, 786772490), (284213, 793695698), (284213, 710863241), (284213, 718531316), (284213, 722559334), (284213, 726712477), (284213, 353496124), (284213, 359697195), (284213, 365980010), (284213, 364977299), (284213, 366390662), (284213, 369775249), (284213, 371705696), (284213, 371487930), (284213, 1300673862), (284213, 1302920029), (284213, 1305115410), (284213, 1308070884), (284213, 2276654185), (284213, 2277706332), (284213, 2286971971), (284213, 2295547574), (284213, 2302765330), (284213, 2306642894), (284213, 2308651219), (284213, 2306812235), (284213, 1672767284), (284213, 1674106771), (284213, 1678919907), (284213, 1735662568), (284213, 1736007654), (284213, 2039327191), (284213, 468287250), (284213, 476467816), (284213, 481115908), (284213, 481876228), (284213, 482867313), (284213, 996700729), (284213, 1001851002), (284213, 1983583940), (284213, 3357123421), (284213, 3362172364), (284213, 3370054303), (284213, 3373779500), (284213, 3391707702), (284213, 2999361153), (284213, 3005816400), (284213, 3010025478), (284213, 3017691907), (284213, 3024846380), (284213, 3025810159), (284213, 1207916736), (284213, 1210734874), (284213, 1211754435), (284213, 1224664176), (284213, 1226199720), (284213, 1504789272), (284213, 2877522955), (284213, 2878097645), (284213, 2892618455), (284213, 2898979796), (284213, 2899684644), (284213, 2902315954), (284213, 2903169247), (284213, 42622525), (284213, 56875864), (284213, 2612523651), (284213, 39584793), (284213, 1511479390), (284213, 1510741119), (284213, 1513295575), (284213, 1517043476), (284213, 1814691648), (284213, 1831719074), (284213, 1837360057), (284213, 1840844655), (284213, 1766707786), (284213, 902989701), (284213, 903139394), (284213, 912954696), (284213, 282412784), (284213, 293917263), (284213, 2586927043), (284213, 2594588885), (284213, 2598125179), (284213, 305547779), (284213, 307647315), (284213, 310341155), (284213, 308399028), (284213, 315763570), (284213, 2843480046), (284213, 2848725654), (284213, 1899466452), (284213, 1931630267), (284213, 1939721032), (284213, 3103992386), (284213, 3108707150), (284213, 3109338684), (284213, 3111344203), (284213, 3113559447), (284213, 3113585460), (284213, 3115969872), (284213, 1730411716), (284213, 934560603), (284213, 934839849), (284213, 2905006637), (284213, 798220406), (284213, 800561272), (284213, 803956925), (284213, 806281954), (284213, 2191434612), (284213, 2203582262), (284213, 2206933352), (284213, 2215721478), (284213, 2696622867), (284213, 2711396820), (284213, 647077947), (284213, 653774603), (284213, 655316990), (284213, 656210261), (284213, 666696055), (284213, 665528855), (284213, 1425091763), (284213, 1427010267), (284213, 1436816986), (284213, 1436797622), (284213, 1448274506), (284213, 2386668945), (284213, 2391680804), (284213, 2413422871), (284213, 2464548470), (284213, 2465838953), (284213, 2470837500), (284213, 332578253), (284213, 334044542), (284213, 345433908), (284213, 349465433), (284213, 2235740668), (284213, 2244165631), (284213, 2647111137), (284213, 2650973235), (284213, 975868321), (284213, 981776138), (284213, 979674987), (284213, 981320944), (284213, 983595299), (284213, 984059739), (284213, 995080581), (284213, 625778886), (284213, 623866736), (284213, 625583464), (284213, 633268604), (284213, 1389739537), (284213, 1388553366), (284213, 1391019625), (284213, 1396718751), (284213, 1394760673), (284213, 1398610271), (284213, 1408709526), (284213, 500310924), (284213, 498205888), (284213, 574434814), (284213, 584855001), (284213, 1105987561), (284213, 1114648432), (284213, 1117405575), (284213, 2928015088), (284213, 2932139153), (284213, 2935288766), (284213, 2938112897), (284213, 2941744172), (284213, 2984159901), (284213, 2997606908), (284213, 501507395), (284213, 522353923), (284213, 524311113), (284213, 2317049073), (284213, 2316554442), (284213, 2316924858), (284213, 2567742438), (284213, 2567006163), (284213, 2568693926), (284213, 2573036291), (284213, 2380410384), (284213, 2388017732), (284213, 2390807157), (284213, 2392572796), (284213, 2397448856), (284213, 2402817219), (284213, 672684760), (284213, 674422456), (284213, 675705732), (284213, 1166864542), (284213, 1168384105), (284213, 1172616222), (284213, 1177053841), (284213, 2857704267), (284213, 2860156392), (284213, 3133868033), (284213, 842912415), (284213, 845729824), (284213, 847735869), (284213, 848131180), (284213, 851221300), (284213, 848892871), (284213, 862737896), (284213, 862373344), (284213, 867108788), (284213, 866900082), (284213, 399733055), (284213, 401023824), (284213, 403759791), (284213, 419429605), (284213, 879029316), (284213, 880653112), (284213, 964712207), (284213, 963464908), (284213, 965402442), (284213, 2666532800), (284213, 2675664909), (284213, 2956618577), (284213, 2956096229), (284213, 2957230547), (284213, 2978196333), (284213, 2982848406), (284213, 2987711258), (284213, 1056790181), (284213, 1064798193), (284213, 1068344400), (284213, 1072086543), (284213, 2086425481), (284213, 2094647486), (284213, 3298940250), (284213, 3305100658), (284213, 3304874012), (284213, 257138038), (284213, 269380629), (284213, 269447122), (284213, 2451735455), (284213, 2453370443), (284213, 2454781871), (284213, 2459004425), (284213, 2461094050), (284213, 2461354873), (284213, 1991806967), (284213, 1992493177), (284213, 1997982451), (284213, 2017590410), (284213, 1961056397), (284213, 2030673698), (284213, 2235771176), (284213, 534892205), (284213, 535496537), (284213, 532721516), (284213, 542074990), (284213, 541216907), (284213, 2139219001), (284213, 2140697723), (284213, 2152611294), (284213, 2155071486), (284213, 1479048429), (284213, 1481912426), (284213, 1486627824), (284213, 1491003737), (284213, 591796204), (284213, 602052293), (284213, 614017823), (284213, 2523653102), (284213, 2525756416), (284213, 2534316767), (284213, 1274953341), (284213, 1280769001), (284213, 2732339188), (284213, 2736832576), (284213, 2740906500), (284213, 2749247061), (284213, 2757394890), (284213, 2759989486), (284213, 2761843277), (284213, 151478930), (284213, 148062450), (284213, 151967530), (284213, 3201855770), (284213, 3202886134), (284213, 3206581251), (284213, 3209039845), (284213, 1332296226), (284213, 189927044), (284213, 1161319334), (284213, 1149974756), (284213, 1565266922), (284213, 3071435983), (284213, 3073026980), (284213, 3075073338), (284213, 3079557207), (284213, 3096852034), (284213, 1656560630), (284213, 919374493), (284213, 922927368), (284213, 3029701978), (284213, 3052338941), (284213, 137377857), (284213, 141026521), (284213, 2415574441), (284213, 2420218534), (284213, 2418552965), (284213, 2420025714), (284213, 2422775870), (284213, 2428675502), (284213, 2430308838), (284213, 2438740898), (284213, 2504297820), (284213, 2503211326), (284213, 2506610545), (284213, 2605055627), (284213, 2612396396), (284213, 2621904503), (284213, 3394543455), (284213, 3409964405), (284213, 3411589506), (284213, 3418729672), (284213, 2224899284), (284213, 2231689989), (284213, 1848894038), (284213, 1852114871), (284213, 2131863387), (284213, 1483389682), (284213, 1488539374), (284213, 2268288138), (284213, 2350713619), (284213, 2359810706), (284213, 2372213644), (284285, 33636635), (284285, 38918853), (284285, 207492014), (284285, 211105414), (284285, 209106001), (284285, 2035802185), (284285, 2040048200), (284285, 2041046794), (284285, 2043145379), (284285, 3297108619), (284285, 3303926356), (284285, 2274703655), (284285, 2277048543), (284285, 1055039111), (284285, 1060993406), (284285, 1064710980), (284285, 1634400284), (284285, 1318769950), (284285, 1323925394), (284285, 1496090057), (284285, 1499018814), (284285, 1502656421), (284285, 1507985474), (284285, 2088236582), (284285, 2391859388), (284285, 2528689805), (284285, 2531981691), (284285, 289970618), (284285, 293436195), (284285, 295551209), (284285, 301354985), (284285, 1975185812), (284285, 1981802885), (284285, 1981728817), (284285, 1988449684), (284285, 1336050263), (284285, 1341048289), (284285, 1342572231), (284285, 1346029309), (284285, 1347730150), (284285, 1352460232), (284285, 1356522892), (284285, 1360273610), (284285, 2319781514), (284285, 2339487592), (284285, 2347412184), (284285, 499284505), (284285, 511307700), (284285, 511659385), (284285, 515075587), (284285, 518058934), (284285, 520115069), (284285, 4427480685), (284285, 4427214569), (284285, 4425194545), (284285, 4431674790), (284285, 994260527), (284285, 1368910955), (284285, 1367175833), (284285, 1374033876), (284285, 1386606346), (284285, 1384656211), (284285, 1388721050), (284285, 2988973121), (284285, 3539747618), (284285, 3539948481), (284285, 3543847957), (284285, 3549235811), (284285, 3557730189), (284285, 3561061238), (284285, 3562357872), (284285, 3736526628), (284285, 3899225877), (284285, 965426172), (284285, 985220014), (284285, 982609611), (284285, 3851092389), (284285, 3873535558), (284285, 878678881), (284285, 877534158), (284285, 1112401192), (284285, 1113847945), (284285, 1119980367), (284285, 1119739228), (284285, 1213485460), (284285, 1212962367), (284285, 1209893812), (284285, 1210513185), (284285, 1667135505), (284285, 1677575261), (284285, 1678529787), (284285, 1679020084), (284285, 1680126507), (284285, 1682568392), (284285, 4313186893), (284285, 4313573020), (284285, 4334181927), (284285, 4343598423), (284285, 4343111497), (284285, 2475734564), (284285, 2481757675), (284285, 2488125156), (284285, 2915221137), (284285, 738665916), (284285, 741982827), (284285, 746218586), (284285, 752141300), (284285, 749366728), (284285, 3498515680), (284285, 3501962006), (284285, 3509413595), (284285, 3513463997), (284285, 3521214100), (284285, 3523923789), (284285, 3527148776), (284285, 3529424154), (284285, 4522870758), (284285, 4530531752), (284285, 4531286513), (284285, 4532704105), (284285, 4535318163), (284285, 999722262), (284285, 999639892), (284285, 1004143263), (284285, 1008291274), (284285, 1009068788), (284285, 1014251719), (284285, 1018751664), (284285, 318037786), (284285, 1791752), (284285, 6631312), (284285, 20343623), (284285, 24914142), (284285, 23817893), (284285, 29496117), (284285, 337960251), (284285, 339777781), (284285, 345955525), (284285, 3264329230), (284285, 3277039668), (284285, 3280522094), (284285, 3288572213), (284285, 3285459952), (284285, 3289974173), (284285, 2699486820), (284285, 2706709718), (284285, 2708450023), (284285, 2715022648), (284285, 2717134080), (284285, 2726881985), (284285, 2729471569), (284285, 2738134601), (284285, 569151765), (284285, 580055061), (284285, 589659059), (284285, 591731538), (284285, 3764654213), (284285, 3766633368), (284285, 3767776533), (284285, 3769891373), (284285, 3784015485), (284285, 3788803651), (284285, 3447301163), (284285, 3447748620), (284285, 3452792303), (284285, 3455822623), (284285, 1408782805), (284285, 1423828443), (284285, 1424526754), (284285, 1431683050), (284285, 1431554252), (284285, 1433526949), (284285, 1433966573), (284285, 1434837632), (284285, 3914706362), (284285, 3916728508), (284285, 3096931846), (284285, 3109674767), (284285, 3118643771), (284285, 3120852711), (284285, 3123163858), (284285, 263409022), (284285, 264805595), (284285, 1132984363), (284285, 1141354309), (284285, 2403181236), (284285, 2410061994), (284285, 2410581343), (284285, 2420440861), (284285, 2426118246), (284285, 2424641838), (284285, 2426852503), (284285, 2814178068), (284285, 2818715882), (284285, 2832045213), (284285, 2838340009), (284285, 2842810245), (284285, 2064669890), (284285, 2062241295), (284285, 2075547338), (284285, 2078554501), (284285, 472356237), (284285, 469880658), (284285, 471529263), (284285, 477279259), (284285, 479120967), (284285, 493123521), (284285, 494394252), (284285, 267986317), (284285, 276563131), (284285, 278691898), (284285, 1027481328), (284285, 1033005308), (284285, 1042589452), (284285, 1044480023), (284285, 1049475782), (284285, 958584594), (284285, 1064510129), (284285, 1074940088), (284285, 1075860391), (284285, 1077647874), (284285, 1080733737), (284285, 1082844284), (284285, 1083090494), (284285, 1084306108), (284285, 2007264489), (284285, 2005942665), (284285, 2009769254), (284285, 2013570114), (284285, 2018725197), (284285, 2020547109), (284285, 2021933564), (284285, 2030266599), (284285, 2032450362), (284285, 1880842442), (284285, 1933228445), (284285, 2447083686), (284285, 2447550855), (284285, 2451578843), (284285, 2448134399), (284285, 2449062459), (284285, 2467807740), (284285, 2467737635), (284285, 1277564030), (284285, 1281031825), (284285, 1279591708), (284285, 1283322289), (284285, 1280885026), (284285, 81715919), (284285, 89073466), (284285, 93300422), (284285, 98318393), (284285, 107274046), (284285, 108976283), (284285, 3664835635), (284285, 3992966842), (284285, 4011081818), (284285, 1514233299), (284285, 1517779743), (284285, 3888472645), (284285, 3888601315), (284285, 3891832409), (284285, 3894775501), (284285, 3894216640), (284285, 1481162541), (284285, 1481920076), (284285, 1482835779), (284285, 2677519370), (284285, 2685378112), (284285, 927160095), (284285, 927497797), (284285, 930770716), (284285, 940680339), (284285, 940120878), (284285, 1804778257), (284285, 1846269012), (284285, 1852121785), (284285, 1859822692), (284285, 2428680540), (284285, 2432059909), (284285, 2432274807), (284285, 2433676724), (284285, 2436907400), (284285, 114227165), (284285, 118813100), (284285, 119854869), (284285, 1236941725), (284285, 1244353619), (284285, 1247194558), (284285, 3799454738), (284285, 3804615423), (284285, 4046609616), (284285, 653960435), (284285, 652177471), (284285, 663054336), (284285, 662844404), (284285, 666231330), (284285, 666468179), (284285, 642376419), (284285, 638295840), (284285, 643955605), (284285, 4344292495), (284285, 4356839593), (284285, 4354445572), (284285, 4358443170), (284285, 4369908750), (284285, 3938661551), (284285, 3939715319), (284285, 71548953), (284285, 74549569), (284285, 880103889), (284285, 881303288), (284285, 905825136), (284285, 904061103), (284285, 3670175691), (284285, 3696469718), (284285, 142479400), (284285, 145283521), (284285, 179001330), (284285, 445793581), (284285, 466272300), (284285, 3715772524), (284285, 3719852500), (284285, 3733180613), (284285, 1088508975), (284285, 1145467198), (284285, 1151266404), (284285, 1808427330), (284285, 1809710763), (284285, 1812320841), (284285, 1820820115), (284285, 2095007346), (284285, 2104592507), (284285, 2103855408), (284285, 2108306080), (284285, 2109271786), (284285, 2117857285), (284285, 848447837), (284285, 856174467), (284285, 860936750), (284285, 857166302), (284285, 867527628), (284285, 789101954), (284285, 793344912), (284285, 826501817), (284285, 830422228), (284285, 2354565969), (284285, 2364296788), (284285, 2365005382), (284285, 2368317937), (284285, 2367116792), (284285, 2380688017), (284285, 2386424498), (284285, 2172562332), (284285, 2175297375), (284285, 3987338150), (284285, 3985471723), (284285, 1732140134), (284285, 1737964909), (284285, 1737269125), (284285, 2763584811), (284285, 2761699162), (284285, 2787649561), (284285, 2783757993), (284285, 221375462), (284285, 228010991), (284285, 227997239), (284285, 232023015), (284285, 237258038), (284285, 1202552334), (284285, 1205558747), (284285, 2863500526), (284285, 3143395864), (284285, 3145473019), (284285, 3142672197), (284285, 3155672659), (284285, 3159725898), (284285, 3176674767), (284285, 49327304), (284285, 51966999), (284285, 50991772), (284285, 56769031), (284285, 3128601358), (284285, 3473856416), (284285, 3485469945), (284285, 3488494086), (284285, 3491189660), (284285, 1303104112), (284285, 1317064589), (284285, 4476425860), (284285, 4476635023), (284285, 4474642035), (284285, 531286244), (284285, 531171042), (284285, 533538576), (284285, 2349726439), (284285, 598172167), (284285, 1590053392), (284285, 4187413855), (284285, 4187515076), (284285, 4199055247), (284285, 4205918535), (284285, 4209481820), (284285, 4210250607), (284285, 4212741169), (284285, 3189979761), (284285, 3576944315), (284285, 3582787808), (284285, 124890803), (284285, 128593653), (284285, 134192443), (284285, 4062671970), (284285, 4064068763), (284285, 4067239530), (284285, 4065582707), (284285, 4074020680), (284285, 4083839685), (284285, 2947395090), (284285, 2951352243), (284285, 2966408513), (284285, 1526185387), (284285, 1536956181), (284285, 1540881221), (284285, 1547594968), (284285, 1546480615), (284285, 1554461844), (284285, 1553990579), (284285, 1558659666), (284285, 1181186845), (284285, 1188987304), (284285, 1194215486), (284285, 1192391174), (284285, 4541157492), (284285, 4542353894), (284285, 4545060420), (284285, 4088806780), (284285, 4094638019), (284285, 4098551678), (284285, 4113883459), (284285, 2793055639), (284285, 2798678607), (284285, 2798253493), (284285, 2799388220), (284285, 4506005222), (284285, 4515308092), (284285, 4031532173), (284285, 4033464554), (284285, 4036450349), (284285, 3218558722), (284285, 3220173293), (284285, 3234664471), (284285, 3954497072), (284285, 3964109543), (284285, 3964040362), (284285, 3974321805), (284285, 2543325311), (284285, 2557821913), (284285, 2570083423), (284285, 2574513368), (284285, 2574530554), (284285, 2854765782), (284285, 2495023029), (284285, 2496415031), (284285, 2508346508), (284285, 1156903442), (284285, 1158609187), (284285, 1168769728), (284285, 1178084482), (284285, 1390833349), (284285, 1397271529), (284285, 4234350388), (284285, 4242975373), (284285, 4244107018), (284285, 4246759476), (284285, 4245155105), (284285, 4255872468), (284285, 4265483715), (284285, 359861273), (284285, 356807290), (284285, 363158730), (284285, 364679871), (284285, 374267876), (284285, 374964355), (284285, 617397162), (284285, 621443034), (284285, 628517435), (284285, 632096325), (284285, 629972737), (284285, 631561557), (284285, 570528019), (284285, 725296237), (284285, 728397244), (284285, 733621346), (284285, 732625064), (284285, 3239890293), (284285, 3245823575), (284285, 3250254587), (284285, 3319498880), (284285, 3318885122), (284285, 4144723400), (284285, 4148293515), (284285, 4161924759), (284285, 4163402479), (284285, 4164596973), (284285, 4169621121), (284285, 428299462), (284285, 430849026), (284285, 434528389), (284285, 3017881115), (284285, 3025060409), (284285, 3036538705), (284285, 4438208984), (284285, 4445776145), (284285, 4454725285), (284285, 4465041007), (284285, 2627315119), (284285, 2632630668), (284285, 3086180553), (284285, 4130015795), (284285, 4129535537), (284285, 4132903868), (284285, 4131879802), (284285, 3586448737), (284285, 3585257593), (284285, 3591548434), (284285, 3597136432), (284285, 1453646501), (284285, 1453394389), (284285, 1454912549), (284285, 1464433830), (284285, 1467713759), (284285, 1472607900), (284285, 1474612360), (284285, 1695969550), (284285, 3702035888), (284285, 3702913333), (284285, 3703273081), (284285, 3708070573), (284285, 3640486603), (284285, 3645099634), (284285, 3648292247), (284285, 3649412794), (284285, 3653604567), (284285, 3657341809), (284285, 3655532747), (284285, 2919734105), (284285, 2929949555), (284285, 2930746508), (284285, 2289473863), (284285, 2296411633), (284285, 2299771376), (284285, 2309048269), (284285, 1636202918), (284285, 1645959396), (284285, 1654379098), (284285, 1653545117), (284285, 3334753510), (284285, 3338599243), (284285, 3341062871), (284285, 3357318236), (284285, 1705198184), (284285, 2660109036), (284285, 2660604168), (284285, 2667238044), (284285, 2668818992), (284285, 3840835079), (284285, 3846328622), (284285, 3849715392), (284285, 2181819357), (284285, 2189693645), (284285, 2190834704), (284285, 2200077542), (284285, 2205325284), (284285, 2156623210), (284285, 2160175496), (284285, 2162830462), (284285, 680997030), (284285, 1557374534), (284285, 1562463496), (284285, 2588034839), (284285, 4291645864), (284285, 4291586639), (284285, 4288910191), (284285, 4298147467), (284285, 4303792264), (284285, 2221482201), (284285, 2230410656), (284285, 2226912354), (284285, 2232618144), (284285, 2241745500), (284285, 1611628179), (284285, 1620847371), (284285, 1619594895), (284285, 1621232047), (284285, 1624832068), (284285, 1622288958), (284285, 1628767303), (284285, 715301923), (284285, 762673007), (284285, 779440973), (284285, 537343574), (284285, 551389400), (284285, 558474796), (284285, 2123245760), (284285, 2123831256), (284285, 2123358944), (284285, 2127196523), (284285, 3824979784), (284285, 3829749701), (284285, 3829602784), (284285, 3832534806), (284285, 3833791484), (284285, 3835217665), (284285, 3835225258), (284285, 2316264651), (284285, 2316472662), (284285, 2604542625), (284285, 2610252456), (284285, 1936070412), (284285, 1939557644), (284285, 1955132989), (284285, 1963769478), (284285, 1962334784), (284285, 1440446284), (284285, 1441631203), (284285, 1448795376), (284285, 1575105042), (284285, 1578912544), (284285, 1583614545), (284285, 1908544073), (284285, 1918862607), (284285, 384818546), (284285, 386612138), (284285, 386157439), (284285, 410934606), (284285, 3384359403), (284285, 3397459330), (284285, 1755542416), (284285, 1758367607), (284285, 1764209356), (284285, 3565184557), (284285, 3571149500), (284285, 3577533637), (284285, 3578623768), (284285, 1633497595), (284285, 2181476454), (284285, 2891059727), (284285, 1844160455), (284285, 1893945497), (284285, 1902215134), (284285, 1902818884), (284285, 1904485161), (284285, 1903669559), (284285, 806886478), (284285, 814075225), (284285, 815490484), (284285, 826280584), (284285, 828708533), (284285, 685859801), (284285, 695523491), (284285, 3418048170), (284285, 3416611686), (284285, 3417502152), (284285, 3424208656), (284285, 3425996629), (284285, 3432660137), (284285, 3437811780), (284285, 3442885413), (284285, 4225832291), (284285, 2988724606), (284285, 2992734704), (284285, 2991656108), (284285, 3000263065), (284285, 3000813723), (284285, 3012919644), (284285, 3016312492), (284285, 1774510750), (284285, 1778605508), (284285, 1793359632), (284285, 1791786552), (284285, 3042958985), (284285, 3055930105), (284285, 3062660960), (284285, 3065496828), (284285, 1249638545), (284285, 1249132525), (284285, 1251279641), (284285, 1254052680), (284285, 1259588595), (284420, 539128223), (284420, 545479469), (284420, 554820629), (284420, 115520963), (284420, 124027725), (284420, 761830354), (284420, 770327522), (284420, 779142990), (284420, 221396615), (284420, 226580476), (284420, 567764851), (284420, 702751748), (284420, 703343056), (284420, 710168965), (284420, 710255179), (284420, 706581110), (284420, 714736907), (284420, 718659675), (284420, 266449051), (284420, 268086034), (284420, 269348598), (284420, 180119365), (284420, 181342878), (284420, 182761887), (284420, 188577848), (284420, 206984651), (284420, 341077336), (284420, 346105362), (284420, 349672357), (284420, 351569065), (284420, 356238344), (284420, 362163171), (284420, 74356679), (284420, 76099347), (284420, 83312403), (284420, 83549510), (284420, 84557546), (284420, 824935127), (284420, 39331445), (284420, 42695382), (284420, 44976026), (284420, 45790626), (284420, 49614502), (284420, 49913708), (284420, 311776749), (284420, 311292049), (284420, 602319153), (284420, 605042484), (284420, 610296169), (284420, 611554790), (284420, 615690924), (284420, 837034831), (284420, 683484639), (284420, 684036108), (284420, 688983914), (284420, 686839120), (284420, 689928610), (284420, 865769334), (284420, 869910303), (284420, 879893854), (284420, 1697303), (284420, 6260834), (284420, 19294636), (284420, 486072716), (284420, 491193335), (284420, 492555496), (284420, 497392958), (284420, 210336339), (284420, 211860757), (284420, 213688846), (284420, 791437469), (284420, 719643516), (284420, 29425048), (284420, 92082036), (284420, 96739409), (284420, 97800624), (284420, 97337893), (284420, 452800622), (284420, 456406796), (284420, 461540870), (284420, 464421590), (284420, 466737474), (284420, 473645423), (284420, 574296094), (284420, 573242421), (284420, 574026493), (284420, 577617819), (284420, 582590925), (284420, 582808247), (284420, 584193170), (284420, 588006353), (284420, 584878719), (284420, 590089264), (284420, 591146042), (284420, 595655923), (284420, 593333270), (284420, 142650498), (284420, 154649468), (284420, 158288622), (284420, 159733046), (284420, 160386284), (284420, 162780228), (284420, 736792752), (284420, 753378631), (284420, 753299727), (284420, 756595628), (284420, 422387882), (284420, 424041189), (284420, 795253705), (284420, 795308538), (284420, 801593761), (284420, 810351015), (284420, 812264259), (284420, 816635806), (284420, 134552400), (284420, 134358313), (284420, 136596608), (284420, 138899145), (284420, 400306445), (284420, 403975414), (284420, 63106344), (284420, 637133359), (284420, 640704129), (284420, 639383097), (284420, 638221644), (284420, 640443440), (284420, 649494235), (284420, 654370201), (284420, 660451521), (284420, 433674322), (284420, 444356967), (284420, 449700597), (284420, 446825156), (284420, 237606548), (284420, 625295020), (284420, 626138552), (284420, 631776751), (284420, 634025163), (284420, 858217350), (284420, 859103533), (284420, 864868915), (284420, 320666263), (284420, 320356077), (284420, 321392648), (284420, 285596176), (284420, 286694903), (284420, 301330657), (284420, 302938873), (284420, 305858325), (284420, 697345733), (284420, 701365521), (284420, 504050941), (284420, 502874016), (284420, 507356339), (284420, 523579699), (284420, 372479898), (284420, 374838099), (284420, 379566261), (284420, 380545961), (284420, 250187950), (284427, 392505551), (284427, 395651523), (284427, 401558190), (284427, 406646309), (284427, 409731287), (284427, 413609670), (284427, 414395604), (284427, 418597068), (284427, 425648311), (284427, 433407176), (284427, 436905648), (284427, 435526791), (284427, 438153275), (284427, 445512213), (284427, 275044163), (284427, 273829489), (284427, 323666982), (284427, 325959511), (284427, 329028621), (284427, 329744850), (284427, 333257718), (284427, 527991808), (284427, 529145325), (284427, 531064604), (284427, 168456998), (284427, 172993232), (284427, 172574594), (284427, 175001222), (284427, 192361040), (284427, 197284137), (284427, 166785118), (284427, 235561491), (284427, 238193036), (284427, 238993558), (284427, 243002439), (284427, 449041407), (284427, 87027154), (284427, 92532393), (284427, 230838287), (284427, 62101100), (284427, 67110341), (284427, 299121380), (284427, 338106066), (284427, 492081093), (284427, 123543582), (284427, 127859101), (284427, 132636482), (284427, 135808177), (284427, 384003532), (284427, 485960543), (284427, 486543570), (284427, 354893417), (284427, 358945218), (284427, 368267679), (284427, 370030262), (284427, 370658075), (284427, 521025752), (284427, 522173165), (284427, 321510001), (284427, 40621793), (284427, 49529220), (284427, 48664553), (284427, 186240430), (284427, 184852511), (284427, 185054426), (284427, 203369931), (284427, 218126342), (284427, 220250159), (284427, 221979185), (284427, 20311217), (284427, 20174496), (284427, 28935019), (284427, 33942277), (284427, 11268392), (284427, 13096636), (284427, 18423084), (284427, 93163524), (284427, 107085366), (284427, 110646694), (284427, 115464096), (284427, 457748267), (284427, 459063076), (284427, 458448322), (284427, 465382096), (284427, 472063680), (284427, 473272866), (284427, 472105785), (284427, 477176977), (284427, 133380466), (284427, 145753675), (284427, 149946247), (284427, 152458404), (284427, 157132206), (284427, 247819894), (284427, 255323953), (284427, 261286872)]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/DataPrepJobProperties.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/DataPrepJobProperties.py
new file mode 100644
index 0000000000000000000000000000000000000000..25488fdf6b865abdd52a140e34222a0cddb15a39
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/DataPrepJobProperties.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+# From Marcelo Vogel to allow setting the name of the output ROOT file for DAPR0
+# See https://its.cern.ch/jira/browse/PRODSYS-601 for more info
+
+from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
+from AthenaCommon.JobProperties import jobproperties
+
+class outputFile(JobProperty):
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = 'PILEUP.root'
+
+## Definition of the flag container
+class DataPrepJobProperties(JobPropertyContainer):
+ """Container for the DerivationFrameworkDataPrep key flags
+ """
+ pass
+
+## adding the container to the general top-level container
+jobproperties.add_Container(DataPrepJobProperties)
+
+## adding the flag to the container
+jobproperties.DataPrepJobProperties.add_JobProperty( outputFile )
+
+## shortcut to access flags
+DataPrepFlags = jobproperties.DataPrepJobProperties
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/python/__init__.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/__init__.py
similarity index 98%
rename from Trigger/TrigConfiguration/TrigConfDBConnection/python/__init__.py
rename to PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/__init__.py
index fb371954d109441dbb60525991778e35647f9173..74583d364ec2ca794156596c7254d9b234a940c6 100644
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/python/__init__.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/python/__init__.py
@@ -1,3 +1,2 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR0.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR0.py
new file mode 100644
index 0000000000000000000000000000000000000000..7c53c5b1dc6e58ad9ab4768015c5fa5abb588dc2
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR0.py
@@ -0,0 +1,24 @@
+#====================================================================
+# DAPR0.py
+# reductionConf flag DAPR0 in Reco_tf.py
+#====================================================================
+
+from DerivationFrameworkCore.DerivationFrameworkMaster import *
+streamName = derivationFlags.WriteDAOD_DAPR0Stream.StreamName
+fileName = buildFileName( derivationFlags.WriteDAOD_DAPR0Stream )
+from DerivationFrameworkDataPrep.DataPrepJobProperties import DataPrepFlags
+pileupFileName = DataPrepFlags.outputFile()
+DAPR0Stream = MSMgr.NewPoolRootStream( streamName, fileName )
+
+
+##use pileupreweighting provider to generate a df.metadata.root prw config file
+##only to run if the input file is post-digitization (i.e. dont run this on EVNT)
+from RecExConfig.InputFilePeeker import inputFileSummary
+
+if 'metadata' in inputFileSummary and '/Digitization/Parameters' in inputFileSummary['metadata']:
+ ToolSvc += CfgMgr.CP__PileupReweightingTool("auto",ConfigFiles=[],LumiCalcFiles=[])
+ DerivationFrameworkJob += CfgMgr.CP__PileupReweightingProvider(ConfigOutputStream="DFMETADATA",Tool=ToolSvc.auto,RunSystematics=False)
+ if not hasattr(svcMgr,'THistSvc'):
+ svcMgr += CfgMgr.THistSvc()
+ histString = "DFMETADATA DATAFILE=\'"+pileupFileName+"\' OPT=\'RECREATE\'"
+ svcMgr.THistSvc.Output += [histString]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR1.py
new file mode 100644
index 0000000000000000000000000000000000000000..f61767146f41a062075f807aac47c5739057e8b8
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR1.py
@@ -0,0 +1,55 @@
+#====================================================================
+# DAPR1.py
+# reductionConf flag DAPR1 in Reco_tf.py
+#====================================================================
+
+from DerivationFrameworkCore.DerivationFrameworkMaster import *
+from DerivationFrameworkJetEtMiss.JetCommon import *
+#from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+#from DerivationFrameworkJetEtMiss.METCommon import *
+
+#====================================================================
+# SKIMMING TOOL
+#====================================================================
+# NOTE: need to be able to OR isSimulated as an OR with the trigger
+trigger = '(EF_j360_a4tchad || HLT_j360_a4tchad || L1_BCM_AC_CA_BGRP0 || L1_BCM_Wide_EMPTY || L1_BCM_Wide_UNPAIRED_ISO || L1_BCM_Wide_UNPAIRED_NONISO || L1_BCM_Wide_CALIB || L1_BCM_Wide_ABORTGAPNOTCALIB || L1_BCM_AC_UNPAIRED_ISO || L1_BCM_CA_UNPAIRED_ISO || L1_BCM_AC_UNPAIRED_NONISO || L1_BCM_CA_UNPAIRED_NONISO || L1_BCM_AC_ABORTGAPNOTCALIB || L1_BCM_CA_ABORTGAPNOTCALIB || L1_BCM_AC_CALIB || L1_BCM_CA_CALIB || L1_J12_UNPAIRED_ISO || L1_J12_UNPAIRED_NONISO || L1_J12_ABORTGAPNOTCALIB || L1_J12 || L1_J12_EMPTY)'
+expression = trigger+' || (EventInfo.eventTypeBitmask==1)'
+
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
+DAPR1SkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "DAPR1SkimmingTool1",
+ expression = expression)
+ToolSvc += DAPR1SkimmingTool
+
+#=======================================
+# CREATE THE DERIVATION KERNEL ALGORITHM
+#=======================================
+
+from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__DerivationKernel
+DerivationFrameworkJob += CfgMgr.DerivationFramework__DerivationKernel("DAPR1Kernel",
+ SkimmingTools = [DAPR1SkimmingTool])
+
+
+#====================================================================
+# SET UP STREAM
+#====================================================================
+streamName = derivationFlags.WriteDAOD_DAPR1Stream.StreamName
+fileName = buildFileName( derivationFlags.WriteDAOD_DAPR1Stream )
+DAPR1Stream = MSMgr.NewPoolRootStream( streamName, fileName )
+DAPR1Stream.AcceptAlgs(["DAPR1Kernel"])
+
+#====================================================================
+# Add the containers to the output stream - slimming done here
+#====================================================================
+from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
+DAPR1SlimmingHelper = SlimmingHelper("DAPR1SlimmingHelper")
+DAPR1SlimmingHelper.SmartCollections = ["Muons", "PrimaryVertices"]
+DAPR1SlimmingHelper.AllVariables = ["AntiKt4LCTopoJets",
+ "AntiKt4EMTopoJets",
+ "CaloCalTopoClusters",
+ "MuonSegments" ]
+DAPR1SlimmingHelper.IncludeMuonTriggerContent = True
+DAPR1SlimmingHelper.IncludeEGammaTriggerContent = True
+DAPR1SlimmingHelper.IncludeBPhysTriggerContent = True
+DAPR1SlimmingHelper.IncludeJetTauEtMissTriggerContent = True
+
+DAPR1SlimmingHelper.AppendContentToStream(DAPR1Stream)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR2.py
new file mode 100644
index 0000000000000000000000000000000000000000..153be9c802751d51481ef431db449b1ad059b865
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkDataPrep/share/DAPR2.py
@@ -0,0 +1,35 @@
+#====================================================================
+# DAPR2.py
+# reductionConf flag DAPR2 in Reco_tf.py
+# Special event picking format, to be used in case of event index
+# failure
+#====================================================================
+
+from DerivationFrameworkCore.DerivationFrameworkMaster import *
+
+#====================================================================
+# EVENT PICKING
+#====================================================================
+from DerivationFrameworkDataPrep.DAPR2EventList import EventList
+seq = CfgMgr.AthSequencer("DFEventPickingSequence")
+from GaudiSequencer.PyComps import PyEvtFilter
+seq += PyEvtFilter(
+ 'DFEventPickingAlg',
+ # the store-gate key. leave as an empty string to take any eventinfo instance
+ evt_info='',
+ OutputLevel=Lvl.WARNING)
+seq.DFEventPickingAlg.evt_list = EventList
+DerivationFrameworkJob += seq
+#====================================================================
+# SET UP STREAM
+#====================================================================
+streamName = derivationFlags.WriteDAOD_DAPR2Stream.StreamName
+fileName = buildFileName( derivationFlags.WriteDAOD_DAPR2Stream )
+DAPR2Stream = MSMgr.NewPoolRootStream( streamName, fileName )
+DAPR2Stream.AcceptAlgs(["DFEventPickingAlg"])
+#====================================================================
+# Store all containers
+#====================================================================
+from PrimaryDPDMaker import PrimaryDPD_OutputDefinitions as dpdOutput
+excludeList = []
+dpdOutput.addAllItemsFromInputExceptExcludeList( streamName, excludeList )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py
index ecb463322a0284c92500917c22a5ede7c820ebd8..88c71f05efcbd7e83478895207add5d6bdbcd37a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py
@@ -2,5 +2,5 @@
InDetTrackParticlesCPContent = [
"InDetTrackParticles",
-"InDetTrackParticlesAux.phi.theta.qOverP.chiSquared.numberDoF.numberOfInnermostPixelLayerHits.numberOfPixelHits.numberOfPixelHoles.numberOfPixelSharedHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTSharedHits.numberOfSCTDeadSensors"
+"InDetTrackParticlesAux.phi.theta.qOverP.chiSquared.numberDoF.numberOfInnermostPixelLayerHits.numberOfPixelHits.numberOfPixelHoles.numberOfPixelSharedHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTSharedHits.numberOfSCTDeadSensors.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag"
]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2LCTopoJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2LCTopoJetsCPContent.py
index 0cfdc2899869749953553a9c21741bd4fb7e112e..a297308e633821b34dfa83cc9235a6fcee15b48e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2LCTopoJetsCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2LCTopoJetsCPContent.py
@@ -4,7 +4,7 @@ AntiKt2LCTopoJetsCPContent = [
"Kt4LCTopoOriginEventShape",
"Kt4LCTopoOriginEventShapeAux.Density",
"AntiKt2LCTopoJets",
-"AntiKt2LCTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.NumTrkPt500.SumPtTrkPt500.EnergyPerSampling.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.DetectorEta.DetectorY.FracSamplingMax.FracSamplingMaxIndex.GhostTrack.Jvt.JVFCorr.JvtRpt.NumTrkPt1000.TrackWidthPt1000.GhostMuonSegmentCount.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor.Timing",
+"AntiKt2LCTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.NumTrkPt500.SumPtTrkPt500.EnergyPerSampling.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.DetectorEta.DetectorY.FracSamplingMax.FracSamplingMaxIndex.GhostTrack.Jvt.JVFCorr.JvtRpt.NumTrkPt1000.TrackWidthPt1000.GhostMuonSegmentCount.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor.Timing.EMFrac.HECFrac.AverageLArQF.NegativeE.LArQuality.HECQuality",
"MET_Track",
"MET_TrackAux.name.mpx.mpy",
"PrimaryVertices",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt6LCTopoJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt6LCTopoJetsCPContent.py
index c88b609afbe6629269b1636751d0ea0476694fd9..1dd1e51247f3dc3848c114da903c8f64e1be7bd6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt6LCTopoJetsCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt6LCTopoJetsCPContent.py
@@ -4,7 +4,7 @@ AntiKt6LCTopoJetsCPContent = [
"Kt4LCTopoOriginEventShape",
"Kt4LCTopoOriginEventShapeAux.Density",
"AntiKt6LCTopoJets",
-"AntiKt6LCTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.NumTrkPt500.SumPtTrkPt500.EnergyPerSampling.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.DetectorEta.DetectorY.FracSamplingMax.FracSamplingMaxIndex.GhostTrack.Jvt.JVFCorr.JvtRpt.NumTrkPt1000.TrackWidthPt1000.GhostMuonSegmentCount.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor.Timing",
+"AntiKt6LCTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.NumTrkPt500.SumPtTrkPt500.EnergyPerSampling.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.DetectorEta.DetectorY.FracSamplingMax.FracSamplingMaxIndex.GhostTrack.Jvt.JVFCorr.JvtRpt.NumTrkPt1000.TrackWidthPt1000.GhostMuonSegmentCount.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor.Timing.EMFrac.HECFrac.AverageLArQF.NegativeE.LArQuality.HECQuality",
"MET_Track",
"MET_TrackAux.name.mpx.mpy",
"PrimaryVertices",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt
index 1cff0de860dccf00883eeaf3d730fab3e0747a29..fbe51bc9e84ae03ce248cdd4e7bdb09d2be9e088 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package( ROOT COMPONENTS Core MathCore )
# Component(s) in the package:
#the library is used by the MCP software https://gitlab.cern.ch/atlas-mcp/MuonPerformanceAnalysis
atlas_add_library( DerivationFrameworkMuonsLib
- DerivationFrameworkMuons/*.h src/*.cxx src/components/*.cxx
+ DerivationFrameworkMuons/*.h src/*.cxx
PUBLIC_HEADERS DerivationFrameworkMuons
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthContainers AthenaBaseComps AthenaKernel CaloEvent CaloGeoHelpers DerivationFrameworkInterfaces ExpressionEvaluationLib FourMomUtils GaudiKernel ICaloTrkMuIdTools InDetTrackSelectionToolLib MCTruthClassifierLib RecoToolInterfaces TrigDecisionToolLib TrigMuonMatchingLib TrkExInterfaces TrkParameters TrkSurfaces muonEvent xAODBase xAODCaloEvent xAODEventInfo xAODJet xAODMuon xAODPrimitives xAODTracking xAODTruth )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt
index 76dad01ad304c27c4370d7c49466a9e5967350bb..2c2d90c58d5ea575e536c6e036ea34f366ce3a4c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/CMakeLists.txt
@@ -66,5 +66,5 @@ if( XAOD_STANDALONE )
endif()
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/create_input.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/create_input.py
index f1b161dacf85c9de9a8ee08ee542c60e02e86e3a..7114879c35211ff0efefaa1ca94da2af69283060 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/create_input.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/create_input.py
@@ -2,6 +2,7 @@
# this file do not work out of the box
+import shutil
import ROOT
from array import array
import numpy as np
@@ -27,7 +28,8 @@ assert old_ct_sys
file_christophe = ROOT.TFile("~/ElectronEnergyScaleFactor.root")
scales_christophe = file_christophe.Get("alpha68")
ct_christophe = file_christophe.Get("sigma24")
-scales_sys_christophe = file_christophe.Get("systAlpha") # sum of 8 / 13 TeV diff + 64 / 32 bins diff
+# sum of 8 / 13 TeV diff + 64 / 32 bins diff
+scales_sys_christophe = file_christophe.Get("systAlpha")
ct_sys_christophe = file_christophe.Get("systSigma") # 8 / 13 TeV diff
assert scales_christophe
@@ -39,7 +41,7 @@ assert ct_sys_christophe
def qsum_histograms(histo1, histo2):
new_histo = histo1.Clone()
new_histo.Reset()
- for ibin in xrange(histo1.GetNbinsX() + 2):
+ for ibin in range(histo1.GetNbinsX() + 2):
value1 = histo1.GetBinContent(ibin)
central_value = histo1.GetBinCenter(ibin)
ibin2 = histo2.FindBin(central_value)
@@ -127,23 +129,23 @@ def merge_histograms(old, new, merge_error=True):
UNDERFLOW = 0
OVERFLOW = new.GetNbinsX() + 1
- for iold in xrange(1, old.GetNbinsX()):
- l = old.GetBinLowEdge(iold)
- r = l + old.GetBinWidth(iold)
+ for iold in range(1, old.GetNbinsX()):
+ low = old.GetBinLowEdge(iold)
+ r = low + old.GetBinWidth(iold)
- il_new = new.FindFixBin(l)
+ il_new = new.FindFixBin(low)
ir_new = new.FindFixBin(r)
remainer = None
if il_new == UNDERFLOW and ir_new == UNDERFLOW:
- new_binning.append((l, r))
+ new_binning.append((low, r))
new_values.append(old.GetBinContent(iold))
new_errors.append(old.GetBinError(iold))
elif il_new == UNDERFLOW and ir_new > UNDERFLOW and ir_new < OVERFLOW:
- if abs(new.GetBinLowEdge(1) - l) < 1E-100:
+ if abs(new.GetBinLowEdge(1) - low) < 1E-100:
continue
- new_binning.append((l, new.GetBinLowEdge(1)))
+ new_binning.append((low, new.GetBinLowEdge(1)))
new_values.append(old.GetBinContent(iold))
new_errors.append(old.GetBinError(iold))
if ir_new == OVERFLOW:
@@ -151,27 +153,29 @@ def merge_histograms(old, new, merge_error=True):
break
last_old = iold
- for inew in xrange(1, new.GetNbinsX() + 1):
- l = new.GetBinLowEdge(inew)
- r = l + new.GetBinWidth(inew)
- new_binning.append((l, r))
+ for inew in range(1, new.GetNbinsX() + 1):
+ low = new.GetBinLowEdge(inew)
+ r = low + new.GetBinWidth(inew)
+ new_binning.append((low, r))
new_values.append(new.GetBinContent(inew))
new_errors.append(new.GetBinError(inew))
if remainer is not None:
- new_binning.append((new.GetBinLowEdge(new.GetNbinsX()), old.GetBinLowEdge(remainer) + old.GetBinWidth(remainer)))
+ new_binning.append((new.GetBinLowEdge(new.GetNbinsX()),
+ old.GetBinLowEdge(remainer)
+ + old.GetBinWidth(remainer)))
new_values.append(old.GetBinContent(remainer))
new_errors.append(old.GetBinError(remainer))
- for iold in xrange(last_old, old.GetNbinsX() + 1):
- l = old.GetBinLowEdge(iold)
- r = l + old.GetBinWidth(iold)
+ for iold in range(last_old, old.GetNbinsX() + 1):
+ low = old.GetBinLowEdge(iold)
+ r = low + old.GetBinWidth(iold)
- il_new = new.FindFixBin(l)
+ il_new = new.FindFixBin(low)
ir_new = new.FindFixBin(r)
if il_new == OVERFLOW and ir_new == OVERFLOW:
- new_binning.append((l, r))
+ new_binning.append((low, r))
new_values.append(old.GetBinContent(iold))
new_errors.append(old.GetBinError(iold))
elif il_new < OVERFLOW and ir_new == OVERFLOW:
@@ -183,7 +187,8 @@ def merge_histograms(old, new, merge_error=True):
new_edges = array('f', [x[0] for x in new_binning] + [new_binning[-1][1]])
histo_type = type(new)
- result = histo_type(new.GetName(), new.GetTitle(), len(new_edges) - 1, new_edges)
+ result = histo_type(new.GetName(), new.GetTitle(),
+ len(new_edges) - 1, new_edges)
for i, (v, e) in enumerate(zip(new_values, new_errors), 1):
result.SetBinContent(i, v)
if merge_error:
@@ -223,15 +228,16 @@ histo_scale.SetName("alphaZee_errStat")
histo_ct.SetName("ctZee_errStat")
# this created a file structured as the official one, with empty directories
-#output_file = create_structured_file("calibration_constants_run2.root")
-import shutil
+# output_file = create_structured_file("calibration_constants_run2.root")
print(old_filename)
shutil.copy2(old_filename, "xxx.root")
output_file = ROOT.TFile("xxx.root", "update")
create_new_directories(output_file)
-output_file.GetDirectory("Scales").GetDirectory("es2015PRE").WriteObject(histo_scale, "alphaZee_errStat")
-output_file.GetDirectory("Resolution").GetDirectory("es2015PRE").WriteObject(histo_ct, "ctZee_errStat")
+output_file.GetDirectory("Scales").GetDirectory(
+ "es2015PRE").WriteObject(histo_scale, "alphaZee_errStat")
+output_file.GetDirectory("Resolution").GetDirectory(
+ "es2015PRE").WriteObject(histo_ct, "ctZee_errStat")
# systematics
@@ -239,10 +245,13 @@ new_scale_sys = qsum_histograms(scales_sys_christophe, old_scale_sys)
new_ct_sys = qsum_histograms(ct_sys_christophe, old_ct_sys)
new_scale_sys = merge_histograms(old_scale_sys, new_scale_sys, False)
new_ct_sys = merge_histograms(old_ct_sys, new_ct_sys, False)
-new_scale_sys.SetTitle("es2015PRE scales sys = es2012c sys + 7/13 TeV diff + 34/68 bin diff")
+new_scale_sys.SetTitle(
+ "es2015PRE scales sys = es2012c sys + 7/13 TeV diff + 34/68 bin diff")
new_ct_sys.SetTitle("es2015 ct sys = es2012c sys + 7/13 TeV diff")
-output_file.GetDirectory("Scales").GetDirectory("es2015PRE").WriteObject(new_scale_sys, "alphaZee_errSyst")
-output_file.GetDirectory("Resolution").GetDirectory("es2015PRE").WriteObject(new_ct_sys, "ctZee_errSyst")
+output_file.GetDirectory("Scales").GetDirectory(
+ "es2015PRE").WriteObject(new_scale_sys, "alphaZee_errSyst")
+output_file.GetDirectory("Resolution").GetDirectory(
+ "es2015PRE").WriteObject(new_ct_sys, "ctZee_errSyst")
legend3 = ROOT.TLegend(0.6, 0.7, 0.9, 0.9)
legend3.SetBorderSize(0)
@@ -277,8 +286,10 @@ legend4.Draw()
# stefano input for sensitivity
stefano_file = ROOT.TFile("egammaEnergyCorrectionDataMC15.root")
-copy_dir(stefano_file.GetDirectory("PSRecalibration"), output_file.GetDirectory("PSRecalibration").GetDirectory("es2015PRE"))
-copy_dir(stefano_file.GetDirectory("S1Recalibration"), output_file.GetDirectory("S1Recalibration").GetDirectory("es2015PRE"))
+copy_dir(stefano_file.GetDirectory("PSRecalibration"),
+ output_file.GetDirectory("PSRecalibration").GetDirectory("es2015PRE"))
+copy_dir(stefano_file.GetDirectory("S1Recalibration"),
+ output_file.GetDirectory("S1Recalibration").GetDirectory("es2015PRE"))
# correction for uA2MeV first week 2015
@@ -286,4 +297,4 @@ f_ua2mev = ROOT.TFile.Open("~/uA2MeV.root")
histo_ua2mev = f_ua2mev.Get("histo_uA2MeV_week12")
output_file.Get("Scales").Get("es2015PRE").WriteTObject(histo_ua2mev)
-raw_input()
+input("Press Key")
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/dump_layer.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/dump_layer.py
index 42f5aa849b457a45faf34b41d7af5b542d8a581c..53d0d86e27080abcba14a29a6ce742c492aad32b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/dump_layer.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/dump_layer.py
@@ -31,26 +31,34 @@ def main(path, particle):
layers = "rawcl_Es0", "rawcl_Es1", "rawcl_Es2", "rawcl_Es3"
layers = [prefix + "_" + v for v in layers]
- title = ["ratio_Es0_true_E", "ratio_Es1_true_E", "ratio_Es2_true_E", "ratio_Es3_true_E"]
+ title = ["ratio_Es0_true_E",
+ "ratio_Es1_true_E",
+ "ratio_Es2_true_E",
+ "ratio_Es3_true_E"]
aetaCalo = "abs(" + prefix + "_" + "cl_etaCalo" + ")"
truth_E = prefix + "_truth_E"
- ratio_layers = ["%s / %s" % (l, truth_E) for l in layers]
+ ratio_layers = ["%s / %s" % (layer, truth_E) for layer in layers]
truth_eta = prefix + "_truth_eta"
truth_pt = "(%s / cosh(%s))" % (truth_E, truth_eta)
- matched = "abs(({0}_rawcl_Es0 + {0}_rawcl_Es1 + {0}_rawcl_Es2 + {0}_rawcl_Es3)/{0}_truth_E - 1)<1".format(prefix)
+ matched = ("abs(({0}_rawcl_Es0 + "
+ "{0}_rawcl_Es1 + {0}_rawcl_Es2 + "
+ "{0}_rawcl_Es3)/{0}_truth_E - 1)<1").format(prefix)
vars_to_plot = ratio_layers
selection += " && " + "(" + matched + ")"
pt_binning = [0, 5E3, 10E3, 15E3, 20E3,
- 30E3, 35E3, 40E3, 45E3, 50E3, 55E3, 60E3, 65E3, 70E3, 75E3, 80E3, 85E3, 90E3,
+ 30E3, 35E3, 40E3, 45E3, 50E3, 55E3, 60E3, 65E3,
+ 70E3, 75E3, 80E3, 85E3, 90E3,
100E3, 110E3, 120E3, 130E3,
140E3, 160E3, 180E3, 200E3, 220E3,
250E3, 300E3, 350E3, 400E3, 450E3, 500E3, 550E3, 600E3,
700E3, 800E3, 900E3, 1000E3,
1200E3, 1400E3, 1600E3, 1800E3, 2000E3,
2500E3]
- aeta_binning = [0, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 0.8, 0.85, 0.9, 1.0,
- 1.1, 1.2, 1.3, 1.425, 1.550, 1.6, 1.65, 1.7, 1.75, 1.8, 1.9, 2.0, 2.1,
+ aeta_binning = [0, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6,
+ 0.7, 0.75, 0.8, 0.85, 0.9, 1.0,
+ 1.1, 1.2, 1.3, 1.425, 1.550, 1.6,
+ 1.65, 1.7, 1.75, 1.8, 1.9, 2.0, 2.1,
2.2, 2.3, 2.35, 2.4, 2.5]
pt_binning = array('d', pt_binning)
aeta_binning = array('d', aeta_binning)
@@ -62,7 +70,8 @@ def main(path, particle):
print("plotting counting")
histo_name = "histo_count_%s" % particle
- histo_count = ROOT.TH2F(histo_name, "count %s" % particle, len(pt_binning) - 1, pt_binning, len(aeta_binning) - 1, aeta_binning)
+ histo_count = ROOT.TH2F(histo_name, "count %s" % particle, len(
+ pt_binning) - 1, pt_binning, len(aeta_binning) - 1, aeta_binning)
chain.Draw(aetaCalo + ":" + truth_pt + ">>" + histo_name, selection)
result = []
@@ -73,7 +82,8 @@ def main(path, particle):
sel = selection + " && abs(ph_zconv) < 5000"
else:
sel = selection
- histo = ROOT.TProfile2D(histo_name, t, len(pt_binning) - 1, pt_binning, len(aeta_binning) - 1, aeta_binning)
+ histo = ROOT.TProfile2D(histo_name, t, len(
+ pt_binning) - 1, pt_binning, len(aeta_binning) - 1, aeta_binning)
arg = v + ":" + aetaCalo + ":" + truth_pt + ">>" + histo_name
chain.Draw(arg, sel, "profcolz")
histo.GetXaxis().SetTitle("true pT [MeV]")
@@ -82,10 +92,18 @@ def main(path, particle):
result.append(histo_count)
return result
+
if __name__ == "__main__":
output_file = ROOT.TFile.Open("average_layers.root", "recreate")
- result = main("/storage_tmp/atlas/MVA2015/inputs_MC15/photon_grid_v5/data-output/*/*.root", "unconv")
- result += main("/storage_tmp/atlas/MVA2015/inputs_MC15/photon_grid_v5/data-output/*/*.root", "conv")
- result += main("/storage_tmp/atlas/MVA2015/inputs_MC15/electron_local_v5.1/data-output/mc15_electron.root", "electron")
+ result = main(
+ "/storage_tmp/atlas/MVA2015/inputs_MC15/"
+ "photon_grid_v5/data-output/*/*.root",
+ "unconv")
+ result += main("/storage_tmp/atlas/MVA2015/inputs_MC15/"
+ "photon_grid_v5/data-output/*/*.root",
+ "conv")
+ result += main("/storage_tmp/atlas/MVA2015/inputs_MC15/"
+ "electron_local_v5.1/data-output/mc15_electron.root",
+ "electron")
for r in result:
r.Write()
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/merge_scale_histograms.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/merge_scale_histograms.py
index 12548deec608a8b987000f970a951dd89968082d..3e6510d4fa3fee6701bbb0906168137cb4056487 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/merge_scale_histograms.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/merge_scale_histograms.py
@@ -3,21 +3,26 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from array import array
+import logging
+import ROOT
doc = """
This is an utility to merge histograms. The common case is when you have
old scale factors for the whole calorimeter and new scale factor only for
a subpart.
"""
-import ROOT
ROOT.PyConfig.IgnoreCommandLineOptions = True
-import logging
logging.basicConfig(level=logging.INFO)
-from array import array
+
def merge_histograms(old, new, merge_error=True):
- print("old binning: " + ", ".join(("%.3f" % old.GetBinLowEdge(ibin)) for ibin in xrange(1, old.GetNbinsX() + 2)))
- print("new binning: " + ", ".join(("%.3f" % new.GetBinLowEdge(ibin)) for ibin in xrange(1, new.GetNbinsX() + 2)))
+ print("old binning: " + ", ".join(("%.3f" % old.GetBinLowEdge(ibin))
+ for ibin in range(1, old.GetNbinsX()
+ + 2)))
+ print("new binning: " + ", ".join(("%.3f" % new.GetBinLowEdge(ibin))
+ for ibin in range(1, new.GetNbinsX()
+ + 2)))
new_binning = []
new_values = []
@@ -25,56 +30,50 @@ def merge_histograms(old, new, merge_error=True):
UNDERFLOW = 0
OVERFLOW = new.GetNbinsX() + 1
- for iold in xrange(1, old.GetNbinsX()):
- l = old.GetBinLowEdge(iold)
- r = l + old.GetBinWidth(iold)
+ for iold in range(1, old.GetNbinsX()):
+ low = old.GetBinLowEdge(iold)
+ r = low + old.GetBinWidth(iold)
- il_new = new.FindFixBin(l)
+ il_new = new.FindFixBin(low)
ir_new = new.FindFixBin(r)
remainer = None
if il_new == UNDERFLOW and ir_new == UNDERFLOW:
- print("1. adding %.3f - %.3f from old" % (l, r))
- new_binning.append((l, r))
+ print("1. adding %.3f - %.3f from old" % (low, r))
+ new_binning.append((low, r))
new_values.append(old.GetBinContent(iold))
new_errors.append(old.GetBinError(iold))
elif il_new == UNDERFLOW and ir_new > UNDERFLOW:
- if abs(new.GetBinLowEdge(1) - l) < 1E-100:
+ if abs(new.GetBinLowEdge(1) - low) < 1E-100:
continue
- new_binning.append((l, new.GetBinLowEdge(1)))
+ new_binning.append((low, new.GetBinLowEdge(1)))
new_values.append(old.GetBinContent(iold))
new_errors.append(old.GetBinError(iold))
if ir_new == OVERFLOW:
- remainer = iold
+ remainer = iold # noqa: F841
print("breaking")
break
last_old = iold
- for inew in xrange(1, new.GetNbinsX() + 1):
- l = new.GetBinLowEdge(inew)
- r = l + new.GetBinWidth(inew)
- print("2. adding %.3f - %.3f from new" % (l, r))
- new_binning.append((l, r))
+ for inew in range(1, new.GetNbinsX() + 1):
+ low = new.GetBinLowEdge(inew)
+ r = low + new.GetBinWidth(inew)
+ print("2. adding %.3f - %.3f from new" % (low, r))
+ new_binning.append((low, r))
new_values.append(new.GetBinContent(inew))
new_errors.append(new.GetBinError(inew))
- """
- if remainer is not None:
- print("3. adding %.3f - %.3f from old" % (new.GetBinLowEdge(new.GetNbinsX()), old.GetBinLowEdge(remainer) + old.GetBinWidth(remainer)))
- new_binning.append((new.GetBinLowEdge(new.GetNbinsX()), old.GetBinLowEdge(remainer) + old.GetBinWidth(remainer)))
- new_values.append(old.GetBinContent(remainer))
- new_errors.append(old.GetBinError(remainer))
- """
- for iold in xrange(last_old, old.GetNbinsX() + 1):
- l = old.GetBinLowEdge(iold)
- r = l + old.GetBinWidth(iold)
-
- il_new = new.FindFixBin(l)
+
+ for iold in range(last_old, old.GetNbinsX() + 1):
+ low = old.GetBinLowEdge(iold)
+ r = low + old.GetBinWidth(iold)
+
+ il_new = new.FindFixBin(low)
ir_new = new.FindFixBin(r)
if il_new == OVERFLOW and ir_new == OVERFLOW:
- print("4. adding %.3f - %.3f from old" % (l, r))
- new_binning.append((l, r))
+ print("4. adding %.3f - %.3f from old" % (low, r))
+ new_binning.append((low, r))
new_values.append(old.GetBinContent(iold))
new_errors.append(old.GetBinError(iold))
elif il_new < OVERFLOW and ir_new == OVERFLOW:
@@ -87,19 +86,20 @@ def merge_histograms(old, new, merge_error=True):
print(new_binning)
new_edges = array('f', [x[0] for x in new_binning] + [new_binning[-1][1]])
histo_type = type(new)
- result = histo_type(new.GetName(), new.GetTitle(), len(new_edges) - 1, new_edges)
+ result = histo_type(new.GetName(), new.GetTitle(),
+ len(new_edges) - 1, new_edges)
for i, (v, e) in enumerate(zip(new_values, new_errors), 1):
result.SetBinContent(i, v)
if merge_error:
result.SetBinError(i, e)
- print("merged binning: " + ", ".join(("%.3f" % result.GetBinLowEdge(ibin)) for ibin in xrange(1, result.GetNbinsX() + 1)))
-
+ print("merged binning: " + ", ".join(("%.3f" % result.GetBinLowEdge(ibin))
+ for ibin in range(1, result.GetNbinsX()
+ + 1)))
return result
-
if __name__ == "__main__":
try:
ROOT.gROOT.ProcessLine(".x ~/atlasstyle/AtlasStyle.C")
@@ -110,20 +110,13 @@ if __name__ == "__main__":
import argparse
parser = argparse.ArgumentParser(description=doc,
- formatter_class=argparse.RawTextHelpFormatter,
- epilog='''example (merge scales 2015PRE + 2015 summer): ./merge_scale_histograms.py ../../RootCoreBin/download/ElectronPhotonFourMomentumCorrection/v7/egammaEnergyCorrectionData.root:Scales/es2015PRE/alphaZee_errStat ~/Scaricati/EnergyScaleFactors.root:centVal_alpha --title="2015 summer" --name alphaZee_errStat
-
-example (merge ct 2015PRE + 2015 summer): ./merge_scale_histograms.py ../../RootCoreBin/download/ElectronPhotonFourMomentumCorrection/v7/egammaEnergyCorrectionData.root:Resolution/es2015PRE/ctZee_errStat ~/Scaricati/EnergyScaleFactors.root:centVal_c --title "2015 summer" --name ctZee_errStat
-
-example (merge scales sys 2015PRE + 2015 summer): ./merge_scale_histograms.py ../../RootCoreBin/download/ElectronPhotonFourMomentumCorrection/v7/egammaEnergyCorrectionData.root:Scales/es2015PRE/alphaZee_errSyst ~/Scaricati/EnergyScaleFactors.root:totSyst_alpha --title="2015 summer" --name alphaZee_errSyst
-
-example (merge ct sys 2015PRE + 2015 summer): ./merge_scale_histograms.py ../../RootCoreBin/download/ElectronPhotonFourMomentumCorrection/v7/egammaEnergyCorrectionData.root:Resolution/es2015PRE_res_improved/ctZee_errSyst ~/Scaricati/EnergyScaleFactors.root:totSyst_c --title="2015 summer" --name ctZee_errSyst
-''')
+ formatter_class=argparse.RawTextHelpFormatter)
parser.add_argument('histo_old')
parser.add_argument('histo_new')
parser.add_argument('--title', help='title of the new histogram')
parser.add_argument('--name', help='name of the new histogram')
- parser.add_argument('--recreate', help='create a new file', action='store_true')
+ parser.add_argument(
+ '--recreate', help='create a new file', action='store_true')
parser.add_argument('--output-filename', default='output.root')
args = parser.parse_args()
@@ -139,7 +132,8 @@ example (merge ct sys 2015PRE + 2015 summer): ./merge_scale_histograms.py ../../
if not histo_new:
raise IOError("cannot find histogram %s" % args.histo_new)
- logging.info("going to merge %s with %s", histo_old.GetName(), histo_new.GetName())
+ logging.info("going to merge %s with %s",
+ histo_old.GetName(), histo_new.GetName())
histo_merged = merge_histograms(histo_old, histo_new)
canvas = ROOT.TCanvas()
@@ -159,11 +153,12 @@ example (merge ct sys 2015PRE + 2015 summer): ./merge_scale_histograms.py ../../
legend.SetBorderSize(0)
legend.Draw()
- fout = ROOT.TFile.Open(args.output_filename, "recreate" if args.recreate else "update")
+ fout = ROOT.TFile.Open(args.output_filename,
+ "recreate" if args.recreate else "update")
if args.title is not None:
histo_merged.SetTitle(args.title)
name = args.name or histo_old.GetName()
histo_merged.SetName(name)
histo_merged.Write()
- raw_input()
+ input("press a key")
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/plot.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/plot.py
index ad16fedfaff2bde5b5a6bbf843fb96462f156898..8a8a5c221739fb116213912d28af570b9288dfaa 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/plot.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/plot.py
@@ -2,68 +2,78 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-import numpy as np
+""" Produce plots about egamma calibration systematics and corrections """
+
import logging
import os
-from itertools import tee, izip, cycle, chain, product
-import matplotlib as mpl
-mpl.use('Agg')
-import matplotlib.pyplot as plt
-import matplotlib.patches as patches
-from matplotlib.ticker import MaxNLocator
-import matplotlib.lines as mlines
-import tqdm
-import colorlog
-import seaborn as sns
-from functools import wraps
import time
from fnmatch import fnmatch
+from functools import wraps
+from itertools import chain, cycle, product, tee
+
+import colorlog
+import matplotlib as mpl
+mpl.use("Agg")
+
+import matplotlib.lines as mlines
+import matplotlib.patches as patches
+import matplotlib.pyplot as plt
+import numpy as np
import ROOT
+import seaborn as sns
+import tqdm
+from matplotlib.ticker import MaxNLocator
+from matplotlib import rcParams
+
+
ROOT.PyConfig.IgnoreCommandLineOptions = True
-plt.rcParams['image.cmap'] = 'coolwarm' # RdBu_r
+plt.rcParams["image.cmap"] = "coolwarm" # RdBu_r
-from matplotlib import rcParams
-rcParams['font.family'] = 'sans-serif'
-rcParams['mathtext.fontset'] = 'stixsans'
-rcParams['mathtext.default'] = 'rm'
-rcParams['font.sans-serif'] = 'helvetica, Helvetica, Nimbus Sans L, Mukti Narrow, FreeSans'
+rcParams["font.family"] = "sans-serif"
+rcParams["mathtext.fontset"] = "stixsans"
+rcParams["mathtext.default"] = "rm"
+rcParams["font.sans-serif"] = "helvetica, Helvetica, Nimbus Sans L, Mukti Narrow, FreeSans"
# axes
-rcParams['axes.labelsize'] = 20
-rcParams['xtick.minor.visible'] = True
-rcParams['ytick.minor.visible'] = True
-rcParams['xtick.direction'] = 'in'
-rcParams['ytick.direction'] = 'in'
-rcParams['xtick.labelsize'] = 19
-rcParams['xtick.major.size'] = 12
-rcParams['xtick.minor.size'] = 6
-rcParams['ytick.labelsize'] = 19
-rcParams['ytick.major.size'] = 14
-rcParams['ytick.minor.size'] = 7
-rcParams['lines.markersize'] = 8
-rcParams['ytick.right'] = True
-rcParams['xtick.top'] = True
+rcParams["axes.labelsize"] = 20
+rcParams["xtick.minor.visible"] = True
+rcParams["ytick.minor.visible"] = True
+rcParams["xtick.direction"] = "in"
+rcParams["ytick.direction"] = "in"
+rcParams["xtick.labelsize"] = 19
+rcParams["xtick.major.size"] = 12
+rcParams["xtick.minor.size"] = 6
+rcParams["ytick.labelsize"] = 19
+rcParams["ytick.major.size"] = 14
+rcParams["ytick.minor.size"] = 7
+rcParams["lines.markersize"] = 8
+rcParams["ytick.right"] = True
+rcParams["xtick.top"] = True
# rcParams['lines.markeredgewidth'] = 0. # not working, it changes other stuff
# legend
-rcParams['legend.numpoints'] = 1
-rcParams['legend.fontsize'] = 19
-rcParams['legend.labelspacing'] = 0.3
-#rcParams['legend.frameon'] = False
+rcParams["legend.numpoints"] = 1
+rcParams["legend.fontsize"] = 19
+rcParams["legend.labelspacing"] = 0.3
+# rcParams['legend.frameon'] = False
-extensions = 'pdf', 'png'
+extensions = "pdf", "png"
def check_status_code(func):
def wrapper(self, *args):
status = func(self, *args)
if not status.isSuccess():
- raise ValueError('status is not success')
+ raise ValueError("status is not success")
return status
+
return wrapper
-ROOT.CP.EgammaCalibrationAndSmearingTool.initialize = check_status_code(ROOT.CP.EgammaCalibrationAndSmearingTool.initialize)
+
+ROOT.CP.EgammaCalibrationAndSmearingTool.initialize = check_status_code(
+ ROOT.CP.EgammaCalibrationAndSmearingTool.initialize
+)
def timed(method):
@@ -73,29 +83,37 @@ def timed(method):
result = method(*args, **kw)
te = time.time()
- log.info("function %s run in %d second", method.__name__, te-ts)
+ log.info("function %s run in %d second", method.__name__, te - ts)
return result
+
return timed
-def plot_ATLAS(fig, x, y, label='Internal', fontsize=20):
- l = fig.text(x, y, 'ATLAS', fontsize=fontsize, fontstyle='italic', fontweight='bold')
+
+def plot_ATLAS(fig, x, y, label="Internal", fontsize=20):
+ label = fig.text(x, y, "ATLAS", fontsize=fontsize, fontstyle="italic", fontweight="bold")
+
def on_draw(event):
- x_right = l.get_window_extent().inverse_transformed(fig.transFigure).max[0]
+ x_right = label.get_window_extent().transformed(fig.transFigure.inverted()).max[0]
fig.text(x_right, y, " " + label, fontsize=fontsize)
fig.canvas.mpl_disconnect(cid)
return False
- cid = fig.canvas.mpl_connect('draw_event', on_draw)
+
+ cid = fig.canvas.mpl_connect("draw_event", on_draw)
fig.canvas.draw()
-fout = ROOT.TFile('output_plot.root', 'recreate')
+
+fout = ROOT.TFile("output_plot.root", "recreate")
+
def pairwise(iterable):
"s -> (s0,s1), (s1,s2), (s2, s3), ..."
a, b = tee(iterable)
next(b, None)
- return izip(a, b)
+ return zip(a, b)
+
def divide_square(n, horizontal=True):
+ """ divide a figure into a square number of subplots in an optimized way """
if horizontal:
x = np.ceil(np.sqrt(n))
y = np.floor(np.sqrt(n))
@@ -109,13 +127,12 @@ def divide_square(n, horizontal=True):
return int(x), int(y)
-
def histo2data(histo):
xs = []
ys = []
exs = []
eys = []
- for ibin in xrange(1, histo.GetNbinsX() + 1):
+ for ibin in range(1, histo.GetNbinsX() + 1):
xs.append(histo.GetBinCenter(ibin))
ys.append(histo.GetBinContent(ibin))
eys.append(histo.GetBinError(ibin))
@@ -124,14 +141,15 @@ def histo2data(histo):
def systematics_from_tool(tool, only_scale=True, only_resolution=False, only_up=True):
+ """ return name of the systematics """
_ = tool.recommendedSystematics()
for sys in _:
sys_name = sys.name()
- if only_scale and 'RESOLUTION' in sys_name:
+ if only_scale and "RESOLUTION" in sys_name:
continue
- if only_resolution and 'SCALE' in sys_name:
+ if only_resolution and "SCALE" in sys_name:
continue
- if only_up and '1down' in sys_name:
+ if only_up and "1down" in sys_name:
continue
yield sys
@@ -153,13 +171,13 @@ def generator_photon(self):
factory = ROOT.EgammaFactory(store)
for eta in np.arange(-2.5, 2.5, 0.05):
- for e in np.arange(1E3, 1000E3, 100E3):
+ for e in np.arange(1e3, 1000e3, 100e3):
photon = factory.create_photon(eta, 0.1, e, 0)
yield photon
store.clear()
-def calibrate_eta_pt(tool, etas, pts, simulation=True, particle='unconverted'):
+def calibrate_eta_pt(tool, etas, pts, simulation=True, particle="unconverted"):
log.debug("creating TEvent and EgammaFactory")
event = ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
@@ -169,33 +187,33 @@ def calibrate_eta_pt(tool, etas, pts, simulation=True, particle='unconverted'):
log.debug("looping")
for ieta, eta in enumerate(etas):
for ipt, pt in enumerate(pts):
- if particle == 'unconverted':
+ if particle == "unconverted":
p = factory.create_photon(eta, 0.1, pt * np.cosh(eta), 0)
- elif particle == 'converted':
+ elif particle == "converted":
p = factory.create_photon(eta, 0.1, pt * np.cosh(eta), 100)
- elif particle == 'electron':
+ elif particle == "electron":
p = factory.create_electron(eta, 0.1, pt * np.cosh(eta))
else:
raise ValueError()
result[ipt, ieta] = tool.getEnergy(p, ei)
log.debug("deleting event")
del event
- log.debug("returning result %s" % result)
+ log.debug("returning result %s", result)
return result
-def eval_sys_eta_phi(tool, etas, phis, pt, simulation, particle='unconverted'):
+def eval_sys_eta_phi(tool, etas, phis, pt, simulation, particle="unconverted"):
event = ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
result = np.ones((len(etas), len(phis)))
ei = factory.create_eventinfo(simulation, 100000)
for ieta, eta in enumerate(etas):
for iphi, phi in enumerate(phis):
- if particle == 'unconverted':
+ if particle == "unconverted":
p = factory.create_photon(eta, phi, pt * np.cosh(eta), 0)
- elif particle == 'converted':
+ elif particle == "converted":
p = factory.create_photon(eta, phi, pt * np.cosh(eta), 100)
- elif particle == 'electron':
+ elif particle == "electron":
p = factory.create_electron(eta, phi, pt * np.cosh(eta))
else:
raise ValueError()
@@ -213,12 +231,12 @@ def eval_eta_slice(tool, etas, pts, ptype, only_material=False, only_up=True):
results = {}
for sys in all_syst:
sys_name = sys.name()
- if 'RESOLUTION' in sys_name:
+ if "RESOLUTION" in sys_name:
continue
- if '1down' in sys_name and only_up:
+ if "1down" in sys_name and only_up:
continue
if only_material:
- if 'MAT' not in sys_name:
+ if "MAT" not in sys_name:
continue
log.info("computing sys %s, %d eta samplings", sys_name, len(etas))
sys_set = ROOT.CP.SystematicSet()
@@ -235,51 +253,75 @@ def eval_eta_slice(tool, etas, pts, ptype, only_material=False, only_up=True):
def beautify_sysname(sysname):
- d = {"EG_SCALE_PEDESTAL": "Pedestal",
- "EG_SCALE_L2GAIN": "L2 gain",
- "EG_SCALE_L1GAIN": "L1 gain",
- "EG_SCALE_PS": r"$\alpha_{PS}$",
- "EG_SCALE_S12": r"$\alpha_{1/2}$",
- "EG_SCALE_S12EXTRALASTETABINRUN2": r"$\alpha_{1/2}$ [2.4-2.5]",
- "EG_SCALE_ZEESYST": r"$Z\to ee$ cal. (sys)",
- "EG_SCALE_ZEESTAT": r"$Z\to ee$ cal. (stat)",
- "PH_SCALE_LEAKAGEUNCONV": "Leakage unconverted",
- "EG_SCALE_MATID": "ID material",
- "EG_SCALE_MATCRYO": "Cryo material",
- "EG_SCALE_MATPP0": "PP0 material",
- "EG_SCALE_WTOTS1": "$w_{tots1}$ non-lin.",
- "EG_SCALE_CONVEFFICIENCY": "Conversion efficiency",
- "EG_SCALE_MATCALO": "Calo material",
- "EG_SCALE_ZEE_STAT": r"$Z\to ee$ (stat)",
- "EG_SCALE_G4": "Geant4",
- "PH_SCALE_LEAKAGECONV": "Leakage converted",
- "PH_SCALE_CONVRADIUS": "Conv. radius",
- "PH_SCALE_CONVFAKERATE": "Conv. fake rate",
- "PH_SCALE_CONVEFFICIENCY": "Conv. efficiency",
- "EG_SCALE_LARCALIB": r"$\alpha_{1/2}$ $\mu\to e$ extrap.",
- "EG_SCALE_E4SCINTILLATOR": "Scintillators",
- "EG_SCALE_LARTEMPERATURE_EXTRA2016PRE": r"Temp. 2015 $\to$ 2016",
- "EG_SCALE_LARCALIB_EXTRA2015PRE": r"$\alpha_{1/2}$ Run 1 $\to$ Run 2",
- }
+ d = {
+ "EG_SCALE_PEDESTAL": "Pedestal",
+ "EG_SCALE_L2GAIN": "L2 gain",
+ "EG_SCALE_L1GAIN": "L1 gain",
+ "EG_SCALE_PS": r"$\alpha_{PS}$",
+ "EG_SCALE_S12": r"$\alpha_{1/2}$",
+ "EG_SCALE_S12EXTRALASTETABINRUN2": r"$\alpha_{1/2}$ [2.4-2.5]",
+ "EG_SCALE_ZEESYST": r"$Z\to ee$ cal. (sys)",
+ "EG_SCALE_ZEESTAT": r"$Z\to ee$ cal. (stat)",
+ "PH_SCALE_LEAKAGEUNCONV": "Leakage unconverted",
+ "EG_SCALE_MATID": "ID material",
+ "EG_SCALE_MATCRYO": "Cryo material",
+ "EG_SCALE_MATPP0": "PP0 material",
+ "EG_SCALE_WTOTS1": "$w_{tots1}$ non-lin.",
+ "EG_SCALE_CONVEFFICIENCY": "Conversion efficiency",
+ "EG_SCALE_MATCALO": "Calo material",
+ "EG_SCALE_ZEE_STAT": r"$Z\to ee$ (stat)",
+ "EG_SCALE_G4": "Geant4",
+ "PH_SCALE_LEAKAGECONV": "Leakage converted",
+ "PH_SCALE_CONVRADIUS": "Conv. radius",
+ "PH_SCALE_CONVFAKERATE": "Conv. fake rate",
+ "PH_SCALE_CONVEFFICIENCY": "Conv. efficiency",
+ "EG_SCALE_LARCALIB": r"$\alpha_{1/2}$ $\mu\to e$ extrap.",
+ "EG_SCALE_E4SCINTILLATOR": "Scintillators",
+ "EG_SCALE_LARTEMPERATURE_EXTRA2016PRE": r"Temp. 2015 $\to$ 2016",
+ "EG_SCALE_LARCALIB_EXTRA2015PRE": r"$\alpha_{1/2}$ Run 1 $\to$ Run 2",
+ }
return d.get(sysname, sysname)
+
def beautify_particle(particle):
- d = {'electron': 'Electrons',
- 'converted': 'Converted photons',
- 'unconverted': 'Unconverted photons'}
+ d = {
+ "electron": "Electrons",
+ "converted": "Converted photons",
+ "unconverted": "Unconverted photons",
+ }
return d.get(particle, particle).capitalize()
-def plot_all_syst_eta_slice(etabins, supersampling_eta=3, esmodel='es2012c', decorrelation='FULL_v1', ptype='unconverted', pts=np.logspace(np.log10(5E3), 6, 100),
- basedir='plot', only_material=False, beautify_sysnames=False,
- sys_order=None, superimpose_all=False, skip_null_sys=False, min_sys=-0.02, max_sys=0.02,
- only_up=True, debug=False, legend_outside=False, symmetrize_labels=False, log_x=False,
- plot_qsum=False, abs_sys=False, atlas_label='Internal'):
+
+def plot_all_syst_eta_slice(
+ etabins,
+ supersampling_eta=3,
+ esmodel="es2012c",
+ decorrelation="FULL_v1",
+ ptype="unconverted",
+ pts=np.logspace(np.log10(5e3), 6, 100),
+ basedir="plot",
+ only_material=False,
+ beautify_sysnames=False,
+ sys_order=None,
+ superimpose_all=False,
+ skip_null_sys=False,
+ min_sys=-0.02,
+ max_sys=0.02,
+ only_up=True,
+ debug=False,
+ legend_outside=False,
+ symmetrize_labels=False,
+ log_x=False,
+ plot_qsum=False,
+ abs_sys=False,
+ atlas_label="Internal",
+):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
tool.setProperty("ESModel", esmodel)
tool.setProperty("decorrelationModel", decorrelation)
- tool.setProperty("int")("doSmearing", 0)
- log.warning('setting randomRunNumber to 297730')
- tool.setProperty("int")("randomRunNumber", 297730)
+ tool.setProperty[bool]("doSmearing", 0)
+ log.warning("setting randomRunNumber to 297730")
+ tool.setProperty[int]("randomRunNumber", 297730)
if debug:
tool.msg().setLevel(0)
@@ -289,32 +331,82 @@ def plot_all_syst_eta_slice(etabins, supersampling_eta=3, esmodel='es2012c', dec
tool_all = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_all")
tool_all.setProperty("ESModel", esmodel)
tool_all.setProperty("decorrelationModel", "1NP_v1")
- tool_all.setProperty("int")("doSmearing", 0)
- log.warning('setting randomRunNumber to 297730')
- tool_all.setProperty("int")("randomRunNumber", 297730)
+ tool_all.setProperty[bool]("doSmearing", 0)
+ log.warning("setting randomRunNumber to 297730")
+ tool_all.setProperty[int]("randomRunNumber", 297730)
tool_all.initialize()
-
-
# compute the eta-inclusive one, just to sort
- log.info('compute sys inclusively, just to sort sys by importance')
- results = eval_eta_slice(tool, np.linspace(-2.5, 2.5, 20),
- np.linspace(10E3, 200E3, 10), # use this range to mimic the range in the paper
- ptype, only_material)
+ log.info("compute sys inclusively, just to sort sys by importance")
+ results = eval_eta_slice(
+ tool,
+ np.linspace(-2.5, 2.5, 20),
+ np.linspace(10e3, 200e3, 10), # use this range to mimic the range in the paper
+ ptype,
+ only_material,
+ )
sorted_sys_name = sorted(list(results), key=lambda k: -np.max(np.abs(results[k])))
if skip_null_sys:
- sorted_sys_name = [sys_name for sys_name in sorted_sys_name if np.sum(results[sys_name]) != 0]
- if sys_order:
- if sys_order == 'paper_run1':
- partitions = [["EG_SCALE_PS__1up", "EG_SCALE_S12__1up", "EG_SCALE_LARCALIB__1up", "EG_SCALE_L2GAIN__1up"],
- ["EG_SCALE_MATID__1up", "EG_SCALE_MATCRYO__1up", "EG_SCALE_MATCALO__1up", "EG_SCALE_ZEESYST__1up"]]
+ sorted_sys_name = [
+ sys_name for sys_name in sorted_sys_name if np.sum(results[sys_name]) != 0
+ ]
+ if sys_order is not None:
+ if sys_order == "paper_run1":
+ partitions = [
+ [
+ "EG_SCALE_PS__1up",
+ "EG_SCALE_S12__1up",
+ "EG_SCALE_LARCALIB__1up",
+ "EG_SCALE_L2GAIN__1up",
+ ],
+ [
+ "EG_SCALE_MATID__1up",
+ "EG_SCALE_MATCRYO__1up",
+ "EG_SCALE_MATCALO__1up",
+ "EG_SCALE_ZEESYST__1up",
+ ],
+ ]
if esmodel == "es2016PRE":
- partitions += [["EG_SCALE_PEDESTAL__1up", "EG_SCALE_LARCALIB_EXTRA2015PRE__1up", "EG_SCALE_LARTEMPERATURE_EXTRA2016PRE__1up", "EG_SCALE_E4SCINTILLATOR__1up"]]
- elif sys_order == 'paper_run2':
- partitions = [["EG_SCALE_PS__1up", "EG_SCALE_S12__1up", "EG_SCALE_LARCALIB__1up", "EG_SCALE_LARCALIB_EXTRA2015PRE__1up", "EG_SCALE_S12EXTRALASTETABINRUN2"],
- ["EG_SCALE_MATID__1up", "EG_SCALE_MATCRYO__1up", "EG_SCALE_MATCALO__1up", "EG_SCALE_MATPP0__1up", "EG_SCALE_ZEESYST__1up"],
- ["EG_SCALE_L2GAIN__1up", "EG_SCALE_WTOTS1__1up", "EG_SCALE_PEDESTAL__1up", "EG_SCALE_E4SCINTILLATOR__1up"],
- ["PH_SCALE_CONVEFFICIENCY__1up", "PH_SCALE_CONVFAKERATE__1up", "PH_SCALE_CONVRADIUS__1up", "PH_SCALE_LEAKAGECONV__1up", "PH_SCALE_LEAKAGEUNCONV__1up"]]
+ partitions += [
+ [
+ "EG_SCALE_PEDESTAL__1up",
+ "EG_SCALE_LARCALIB_EXTRA2015PRE__1up",
+ "EG_SCALE_LARTEMPERATURE_EXTRA2016PRE__1up",
+ "EG_SCALE_E4SCINTILLATOR__1up",
+ ]
+ ]
+ elif sys_order == "paper_run2":
+ partitions = [
+ [
+ "EG_SCALE_PS__1up",
+ "EG_SCALE_S12__1up",
+ "EG_SCALE_LARCALIB__1up",
+ "EG_SCALE_LARCALIB_EXTRA2015PRE__1up",
+ "EG_SCALE_S12EXTRALASTETABINRUN2",
+ ],
+ [
+ "EG_SCALE_MATID__1up",
+ "EG_SCALE_MATCRYO__1up",
+ "EG_SCALE_MATCALO__1up",
+ "EG_SCALE_MATPP0__1up",
+ "EG_SCALE_ZEESYST__1up",
+ ],
+ [
+ "EG_SCALE_L2GAIN__1up",
+ "EG_SCALE_WTOTS1__1up",
+ "EG_SCALE_PEDESTAL__1up",
+ "EG_SCALE_E4SCINTILLATOR__1up",
+ ],
+ [
+ "PH_SCALE_CONVEFFICIENCY__1up",
+ "PH_SCALE_CONVFAKERATE__1up",
+ "PH_SCALE_CONVRADIUS__1up",
+ "PH_SCALE_LEAKAGECONV__1up",
+ "PH_SCALE_LEAKAGEUNCONV__1up",
+ ],
+ ]
+ else:
+ raise ValueError("cannot understand sys_order = %s" % sys_order)
flat_list = [item for sublist in partitions for item in sublist]
remainers = [item for item in sorted_sys_name if item not in flat_list]
partitions = chain(partitions, partition(remainers, 4))
@@ -323,75 +415,104 @@ def plot_all_syst_eta_slice(etabins, supersampling_eta=3, esmodel='es2012c', dec
partitions = list(partitions)
for etamin, etamax in tqdm.tqdm(etabins):
- log.info('plotting eta range %.2f %.2f', etamin, etamax)
+ log.info("plotting eta range %.2f %.2f", etamin, etamax)
etas = np.linspace(etamin, etamax, supersampling_eta + 2)[1:-1]
results = eval_eta_slice(tool, etas, pts, ptype, only_material, only_up=only_up)
- qsum = np.sqrt((np.array(results.values()) ** 2).sum(axis=0))
+ result_values = np.array(list(results.values()))
+ qsum = np.sqrt((result_values ** 2).sum(axis=0))
if superimpose_all:
results_all = eval_eta_slice(tool_all, etas, pts, ptype, only_up=False)
for ip, p in enumerate(partitions):
- log.info('plotting %d/%d', ip + 1, len(partitions))
+ log.info("plotting %d/%d", ip + 1, len(partitions))
f, ax = plt.subplots()
if superimpose_all:
- #max_up_down = np.max(np.abs([results_all["EG_SCALE_ALL__1down"],
- #results_all["EG_SCALE_ALL__1up"]]), axis=0)
- #ax.fill_between(pts / 1E3, -max_up_down * 100., max_up_down * 100,
- #color='0.8', label='total')
- #ax.plot(pts/1E3, np.sqrt(np.sum([r ** 2 for r in results.values()], axis=0)) * 100., 'r:')
+ # max_up_down = np.max(np.abs([results_all["EG_SCALE_ALL__1down"],
+ # results_all["EG_SCALE_ALL__1up"]]), axis=0)
+ # ax.fill_between(pts / 1E3, -max_up_down * 100., max_up_down * 100,
+ # color='0.8', label='total')
+ # ax.plot(pts/1E3, np.sqrt(np.sum([r ** 2 for r in results.values()], axis=0)) * 100., 'r:')
if only_up:
if abs_sys:
- ax.fill_between(pts / 1E3, 0, results_all["EG_SCALE_ALL__1up"] * 100,
- color='0.8', label='Total')
+ ax.fill_between(
+ pts / 1e3,
+ 0,
+ results_all["EG_SCALE_ALL__1up"] * 100,
+ color="0.8",
+ label="Total",
+ )
else:
- ax.fill_between(pts / 1E3, -results_all["EG_SCALE_ALL__1up"] * 100., results_all["EG_SCALE_ALL__1up"] * 100,
- color='0.8', label='Total')
+ ax.fill_between(
+ pts / 1e3,
+ -results_all["EG_SCALE_ALL__1up"] * 100.0,
+ results_all["EG_SCALE_ALL__1up"] * 100,
+ color="0.8",
+ label="Total",
+ )
else:
- ax.fill_between(pts / 1E3, results_all["EG_SCALE_ALL__1down"] * 100., results_all["EG_SCALE_ALL__1up"] * 100,
- color='0.8', label='Total')
+ ax.fill_between(
+ pts / 1e3,
+ results_all["EG_SCALE_ALL__1down"] * 100.0,
+ results_all["EG_SCALE_ALL__1up"] * 100,
+ color="0.8",
+ label="Total",
+ )
for isys, sys_name in enumerate(p):
- color = 'C%d' % isys # TODO: fix, use cycle
+ color = "C%d" % isys # TODO: fix, use cycle
if sys_name not in results:
- continue ## TODO: FIXME
+ continue # TODO: FIXME
r = results[sys_name]
r[np.isnan(r)] = 0
- sys_label = beautify_sysname(sys_name.replace('__1up', '')) if beautify_sysnames else sys_name
+ sys_label = (
+ beautify_sysname(sys_name.replace("__1up", ""))
+ if beautify_sysnames
+ else sys_name
+ )
if not only_up:
sys_label += " UP"
if abs_sys:
mask_positive = r >= 0
r = np.abs(r)
- ax.plot(pts[mask_positive] / 1E3, r[mask_positive] * 100., label=sys_label, color=color)
- ax.plot(pts[~mask_positive] / 1E3, r[~mask_positive] * 100., "--", color=color)
+ ax.plot(
+ pts[mask_positive] / 1e3,
+ r[mask_positive] * 100.0,
+ label=sys_label,
+ color=color,
+ )
+ ax.plot(pts[~mask_positive] / 1e3, r[~mask_positive] * 100.0, "--", color=color)
else:
- ax.plot(pts / 1E3, r * 100., label=sys_label, color=color)
+ ax.plot(pts / 1e3, r * 100.0, label=sys_label, color=color)
if not only_up:
ax.set_prop_cycle(None)
for sys_name in p:
- sys_name = sys_name.replace('up', 'down')
+ sys_name = sys_name.replace("up", "down")
if sys_name not in results:
- continue ## TODO: FIXME
+ continue # TODO: FIXME
r = results[sys_name]
r[np.isnan(r)] = 0
- sys_label = beautify_sysname(sys_name.replace('__1down', '')) if beautify_sysnames else sys_name
- sys_label += ' DOWN'
- ax.plot(pts / 1E3, r * 100., label=sys_label, linestyle='--')
+ sys_label = (
+ beautify_sysname(sys_name.replace("__1down", ""))
+ if beautify_sysnames
+ else sys_name
+ )
+ sys_label += " DOWN"
+ ax.plot(pts / 1e3, r * 100.0, label=sys_label, linestyle="--")
if plot_qsum:
- ax.plot(pts / 1E3, qsum * 100, label='quadrature sum', linestyle=':')
+ ax.plot(pts / 1e3, qsum * 100, label="quadrature sum", linestyle=":")
- ax.set_xlabel('$E_T$ [GeV]', ha='right', x=1., fontsize=19)
+ ax.set_xlabel("$E_T$ [GeV]", ha="right", x=1.0, fontsize=19)
if abs_sys:
- ax.set_ylabel('Uncertainty [%]', ha='right', y=1., fontsize=19)
+ ax.set_ylabel("Uncertainty [%]", ha="right", y=1.0, fontsize=19)
else:
- ax.set_ylabel('Signed uncertainty [%]', ha='right', y=1., fontsize=19)
+ ax.set_ylabel("Signed uncertainty [%]", ha="right", y=1.0, fontsize=19)
- ax.tick_params(axis='both', which='major', labelsize=17)
+ ax.tick_params(axis="both", which="major", labelsize=17)
- ax.axis('tight')
+ ax.axis("tight")
if max_sys is None and min_sys is None:
max_sys = max(2, np.max(np.abs(ax.get_ylim())))
@@ -400,108 +521,149 @@ def plot_all_syst_eta_slice(etabins, supersampling_eta=3, esmodel='es2012c', dec
ax.set_ylim(min_sys * 100, max_sys * 100)
if legend_outside:
- ax.legend(bbox_to_anchor=(0., 1., 1, 0.2), mode='expand', borderaxespad=0.,
- loc=3, frameon=True, fontsize=17 if only_up else 14, borderpad=1, ncol=1 if only_up else 2)
+ ax.legend(
+ bbox_to_anchor=(0.0, 1.0, 1, 0.2),
+ mode="expand",
+ borderaxespad=0.0,
+ loc=3,
+ frameon=True,
+ fontsize=17 if only_up else 14,
+ borderpad=1,
+ ncol=1 if only_up else 2,
+ )
f.subplots_adjust(top=0.65)
plot_ATLAS(f, 0.2, 0.58, label=atlas_label)
f.text(0.2, 0.2, beautify_particle(ptype), transform=ax.transAxes, fontsize=16)
- f.text(0.2, 0.25, r'$%.2f < \eta < %.2f$' % (etamin, etamax), transform=ax.transAxes, fontsize=16)
+ f.text(
+ 0.2,
+ 0.25,
+ r"$%.2f < \eta < %.2f$" % (etamin, etamax),
+ transform=ax.transAxes,
+ fontsize=16,
+ )
else:
- ax.legend(loc=1, frameon=False, fontsize=13 if only_up else 9, borderpad=1, ncol=1 if only_up else 2)
+ ax.legend(
+ loc=1,
+ frameon=False,
+ fontsize=13 if only_up else 9,
+ borderpad=1,
+ ncol=1 if only_up else 2,
+ )
plot_ATLAS(f, 0.16, 0.80, label=atlas_label, fontsize=19)
f.text(0.16, 0.74, beautify_particle(ptype), transform=ax.transAxes, fontsize=16)
- f.text(0.16, 0.68, r'$%.2f < \eta < %.2f$' % (etamin, etamax), transform=ax.transAxes, fontsize=16)
+ f.text(
+ 0.16,
+ 0.68,
+ r"$%.2f < \eta < %.2f$" % (etamin, etamax),
+ transform=ax.transAxes,
+ fontsize=16,
+ )
if log_x:
- ax.set_xscale('log')
+ ax.set_xscale("log")
for extension in extensions:
- f.savefig(os.path.join(basedir, "%s_%s_%s_%.2f_%.2f_%d.%s" % (ptype, esmodel, decorrelation, etamin, etamax, ip, extension)), bbox_inches='tight')
+ f.savefig(
+ os.path.join(
+ basedir,
+ "%s_%s_%s_%.2f_%.2f_%d.%s"
+ % (ptype, esmodel, decorrelation, etamin, etamax, ip, extension),
+ ),
+ bbox_inches="tight",
+ )
plt.close(f)
def values2histo(name, title, x, y):
histo = ROOT.TH1F(name, title, len(x) - 1, x)
- for ibin, yy, in enumerate(y, 1):
+ for (
+ ibin,
+ yy,
+ ) in enumerate(y, 1):
histo.SetBinContent(ibin, yy)
return histo
-def plot_all_Zee_syst(etas, pt=100E3, basedir='plots'):
+def plot_all_Zee_syst(etas, pt=100e3, basedir="plots"):
tool_es2012c = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2012c")
tool_es2012c.setProperty("ESModel", "es2012c")
- tool_es2012c.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_es2012c.setProperty("int")("doSmearing", 0)
+ tool_es2012c.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_es2012c.setProperty[int]("doSmearing", 0)
tool_es2012c.initialize()
tool_es2015PRE = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE")
tool_es2015PRE.setProperty("ESModel", "es2015PRE")
- tool_es2015PRE.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_es2015PRE.setProperty("int")("doSmearing", 0)
+ tool_es2015PRE.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_es2015PRE.setProperty[bool]("doSmearing", 0)
tool_es2015PRE.initialize()
tool_es2015PRE_notemp = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE_notemp")
tool_es2015PRE_notemp.setProperty("ESModel", "es2015PRE")
- tool_es2015PRE_notemp.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_es2015PRE_notemp.setProperty("int")("doSmearing", 0)
- tool_es2015PRE_notemp.setProperty("int")("use_temp_correction201215", 0)
+ tool_es2015PRE_notemp.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_es2015PRE_notemp.setProperty[bool]("doSmearing", 0)
+ tool_es2015PRE_notemp.setProperty[int]("use_temp_correction201215", 0)
tool_es2015PRE_notemp.initialize()
tools = [tool_es2012c, tool_es2015PRE_notemp, tool_es2015PRE]
- nominal_es2012c = calibrate_eta_pt(tool_es2012c, etas, [pt], particle='electron')[0]
- nominal_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle='electron')[0]
- nominal_es2015PRE_notemp = calibrate_eta_pt(tool_es2015PRE_notemp, etas, [pt], particle='electron')[0]
+ nominal_es2012c = calibrate_eta_pt(tool_es2012c, etas, [pt], particle="electron")[0]
+ nominal_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle="electron")[0]
+ nominal_es2015PRE_notemp = calibrate_eta_pt(
+ tool_es2015PRE_notemp, etas, [pt], particle="electron"
+ )[0]
# up variations
- sys = ROOT.CP.SystematicVariation('EG_SCALE_ZEESYST', 1)
+ sys = ROOT.CP.SystematicVariation("EG_SCALE_ZEESYST", 1)
sys_set = ROOT.CP.SystematicSet()
sys_set.insert(sys)
for tool in tools:
tool.applySystematicVariation(sys_set)
- sys_up_es2012c = calibrate_eta_pt(tool_es2012c, etas, [pt], particle='electron')[0]
- sys_up_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle='electron')[0]
- sys_up_es2015PRE_notemp = calibrate_eta_pt(tool_es2015PRE_notemp, etas, [pt], particle='electron')[0]
+ sys_up_es2012c = calibrate_eta_pt(tool_es2012c, etas, [pt], particle="electron")[0]
+ sys_up_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle="electron")[0]
+ sys_up_es2015PRE_notemp = calibrate_eta_pt(
+ tool_es2015PRE_notemp, etas, [pt], particle="electron"
+ )[0]
ratio_sys_up_es2012c = sys_up_es2012c / nominal_es2012c - 1
ratio_sys_up_es2015PRE = sys_up_es2015PRE / nominal_es2015PRE - 1
ratio_sys_up_es2015PRE_notemp = sys_up_es2015PRE_notemp / nominal_es2015PRE_notemp - 1
# down variations
- sys = ROOT.CP.SystematicVariation('EG_SCALE_ZEESYST', -1)
+ sys = ROOT.CP.SystematicVariation("EG_SCALE_ZEESYST", -1)
sys_set = ROOT.CP.SystematicSet()
sys_set.insert(sys)
for tool in tools:
tool.applySystematicVariation(sys_set)
- sys_down_es2012c = calibrate_eta_pt(tool_es2012c, etas, [pt], particle='electron')[0]
- sys_down_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle='electron')[0]
- sys_down_es2015PRE_notemp = calibrate_eta_pt(tool_es2015PRE_notemp, etas, [pt], particle='electron')[0]
+ sys_down_es2012c = calibrate_eta_pt(tool_es2012c, etas, [pt], particle="electron")[0]
+ sys_down_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle="electron")[0]
+ sys_down_es2015PRE_notemp = calibrate_eta_pt(
+ tool_es2015PRE_notemp, etas, [pt], particle="electron"
+ )[0]
ratio_sys_down_es2012c = sys_down_es2012c / nominal_es2012c - 1
ratio_sys_down_es2015PRE = sys_down_es2015PRE / nominal_es2015PRE - 1
ratio_sys_down_es2015PRE_notemp = sys_down_es2015PRE_notemp / nominal_es2015PRE_notemp - 1
# up stat
- sys = ROOT.CP.SystematicVariation('EG_SCALE_ZEESTAT', 1)
+ sys = ROOT.CP.SystematicVariation("EG_SCALE_ZEESTAT", 1)
sys_set = ROOT.CP.SystematicSet()
sys_set.insert(sys)
tool_es2015PRE.applySystematicVariation(sys_set)
- stat_up_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle='electron')[0]
+ stat_up_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle="electron")[0]
ratio_stat_up = stat_up_es2015PRE / nominal_es2015PRE - 1
-
# down stat
- sys = ROOT.CP.SystematicVariation('EG_SCALE_ZEESTAT', -1)
+ sys = ROOT.CP.SystematicVariation("EG_SCALE_ZEESTAT", -1)
sys_set = ROOT.CP.SystematicSet()
sys_set.insert(sys)
tool_es2015PRE.applySystematicVariation(sys_set)
- stat_down_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle='electron')[0]
+ stat_down_es2015PRE = calibrate_eta_pt(tool_es2015PRE, etas, [pt], particle="electron")[0]
ratio_stat_down = stat_down_es2015PRE / nominal_es2015PRE - 1
ratio_full_down = -np.sqrt(ratio_stat_down ** 2 + ratio_sys_down_es2015PRE ** 2)
@@ -509,49 +671,91 @@ def plot_all_Zee_syst(etas, pt=100E3, basedir='plots'):
fig, ax = plt.subplots()
- ax.fill_between(etas, ratio_full_down, ratio_full_up, color='#d69e8f', interpolate=False, label='$\cdots\oplus$ stat = 2015PRE (stat $\oplus$ sys)', alpha=0.6)
- ax.fill_between(etas, ratio_sys_down_es2015PRE, ratio_sys_up_es2015PRE, color='#d7d790', interpolate=False, label='$\cdots\oplus$ temp = 2015PRE sys', alpha=0.6)
- ax.fill_between(etas, ratio_sys_down_es2015PRE_notemp, ratio_sys_up_es2015PRE_notemp, color='#91da95', label='$\cdots\oplus$ 7/8 TeV diff $\oplus$ 34/68 bins diff', alpha=0.6)
- ax.fill_between(etas, ratio_sys_down_es2012c, ratio_sys_up_es2012c, color='#93dcd1', interpolate=False, label='2012c', alpha=0.6)
+ ax.fill_between(
+ etas,
+ ratio_full_down,
+ ratio_full_up,
+ color="#d69e8f",
+ interpolate=False,
+ label=r"$\cdots\oplus$ stat = 2015PRE (stat $\oplus$ sys)",
+ alpha=0.6,
+ )
+ ax.fill_between(
+ etas,
+ ratio_sys_down_es2015PRE,
+ ratio_sys_up_es2015PRE,
+ color="#d7d790",
+ interpolate=False,
+ label=r"$\cdots\oplus$ temp = 2015PRE sys",
+ alpha=0.6,
+ )
+ ax.fill_between(
+ etas,
+ ratio_sys_down_es2015PRE_notemp,
+ ratio_sys_up_es2015PRE_notemp,
+ color="#91da95",
+ label=r"$\cdots\oplus$ 7/8 TeV diff $\oplus$ 34/68 bins diff",
+ alpha=0.6,
+ )
+ ax.fill_between(
+ etas,
+ ratio_sys_down_es2012c,
+ ratio_sys_up_es2012c,
+ color="#93dcd1",
+ interpolate=False,
+ label="2012c",
+ alpha=0.6,
+ )
p1 = patches.Rectangle((0, 0), 1, 1, color="#d69e8f")
p2 = patches.Rectangle((0, 0), 1, 1, color="#d7d790")
p3 = patches.Rectangle((0, 0), 1, 1, color="#91da95")
p4 = patches.Rectangle((0, 0), 1, 1, color="#93dcd1")
- legend1 = ax.legend([p4, p3, p2, p1], ['2012c',
- '$\cdots\oplus$ 7/8 TeV diff $\oplus$ 34/68 bins diff',
- '$\cdots\oplus$ temp = 2015PRE sys',
- '$\cdots\oplus$ stat = 2015PRE (stat $\oplus$ sys)',
- ], loc='upper right', numpoints=1, title='errors')
+ legend1 = ax.legend(
+ [p4, p3, p2, p1],
+ [
+ "2012c",
+ r"$\cdots\oplus$ 7/8 TeV diff $\oplus$ 34/68 bins diff",
+ r"$\cdots\oplus$ temp = 2015PRE sys",
+ r"$\cdots\oplus$ stat = 2015PRE (stat $\oplus$ sys)",
+ ],
+ loc="upper right",
+ numpoints=1,
+ title="errors",
+ )
f = ROOT.TFile("~/Data6_scaledData.root")
histo_scale = f.Get("alpha")
x, ex, y, ey = histo2data(histo_scale)
- h1 = ax.errorbar(x, y, yerr=ey, xerr=ex, fmt='o', zorder=11)
+ h1 = ax.errorbar(x, y, yerr=ey, xerr=ex, fmt="o", zorder=11)
f2 = ROOT.TFile("~/uA2MeV.root")
histo_uA2MeV = f2.Get("histo_uA2MeV_week12")
x, ex, y, ey = histo2data(histo_uA2MeV)
- line_uA2MeV, = ax.plot(x, y - 1, 'k-', zorder=10, label='expected deviation')
- ax.plot(-x, y - 1, 'k-', zorder=10)
+ (line_uA2MeV,) = ax.plot(x, y - 1, "k-", zorder=10, label="expected deviation")
+ ax.plot(-x, y - 1, "k-", zorder=10)
- ax.set_xlabel('$\eta$')
+ ax.set_xlabel(r"$\eta$")
ax.set_ylim(-0.08, 0.08)
-
- ax.legend([h1, line_uA2MeV], ['scales 13 TeV|es2015 PRE', 'expected deviation'], loc='lower right', numpoints=1)
+ ax.legend(
+ [h1, line_uA2MeV],
+ ["scales 13 TeV|es2015 PRE", "expected deviation"],
+ loc="lower right",
+ numpoints=1,
+ )
ax.add_artist(legend1)
ax.grid()
- fig.savefig('Zee_sys.png')
- fig.savefig('Zee_sys.svg')
- fig.savefig('Zee_sys.pdf')
+ fig.savefig("Zee_sys.png")
+ fig.savefig("Zee_sys.svg")
+ fig.savefig("Zee_sys.pdf")
-def plot_all_syst_fixed_pt(tools, names, labels, pt=100E3, ptype='unconverted', basedir='plots'):
+def plot_all_syst_fixed_pt(tools, names, labels, pt=100e3, ptype="unconverted", basedir="plots"):
for tool in tools:
empty_set = ROOT.CP.SystematicSet()
tool.applySystematicVariation(empty_set)
@@ -577,21 +781,15 @@ def plot_all_syst_fixed_pt(tools, names, labels, pt=100E3, ptype='unconverted',
ax.grid()
ax.legend()
- ax.set_ylabel('effect [%]')
- ax.set_title(ptype + " " + sys_name + " at $p_{T}$ = %.2f GeV" % (pt / 1E3))
- ax.set_xlabel('$\eta$')
+ ax.set_ylabel("effect [%]")
+ ax.set_title(ptype + " " + sys_name + " at $p_{T}$ = %.2f GeV" % (pt / 1e3))
+ ax.set_xlabel(r"$\eta$")
for extension in extensions:
- f.savefig(os.path.join(basedir, "%s_%s_pt_%.2f.%s" % (ptype, sys_name, pt / 1E3, extension)))
+ f.savefig(
+ os.path.join(basedir, "%s_%s_pt_%.2f.%s" % (ptype, sys_name, pt / 1e3, extension))
+ )
plt.close(f)
-def get_property_from_tool(tool, property_name):
- # really?
- result = ROOT.std.string()
- status = tool.getPropertyMgr().getProperty(property_name).getString(result)
- if not status.isSuccess():
- raise ValueError("cannot find property %s in tool %s" % (property_name, tool))
- return str(ss)[1:-1]
-
def compute_or_read_sys(tool, ptypes, eta_edges, pt_edges):
empty_set = ROOT.CP.SystematicSet()
@@ -613,7 +811,12 @@ def compute_or_read_sys(tool, ptypes, eta_edges, pt_edges):
for iptype, ptype in enumerate(ptypes):
log.debug("computing for particle=%s", ptype)
tool.applySystematicVariation(empty_set)
- log.debug("computing nominal energies for eta=%s, pt=%s, particle=%s", eta_midpoints, pt_midpoints, ptype)
+ log.debug(
+ "computing nominal energies for eta=%s, pt=%s, particle=%s",
+ eta_midpoints,
+ pt_midpoints,
+ ptype,
+ )
values_nominal = calibrate_eta_pt(tool, eta_midpoints, pt_midpoints, particle=ptype)
pbar.update(1)
@@ -631,10 +834,22 @@ def compute_or_read_sys(tool, ptypes, eta_edges, pt_edges):
return results
+
@timed
-def compare_sys(esmodels=None, ptypes=None, decorrelation='FULL_ETACORRELATED_v1', eta_edges=None, pt_edges=None, basedir='plots', smearing=False, only_up=True, abs_sys=False, log_x=False):
- esmodels = esmodels or ['es2012c']
- ptypes = ptypes or ['electron']
+def compare_sys(
+ esmodels=None,
+ ptypes=None,
+ decorrelation="FULL_ETACORRELATED_v1",
+ eta_edges=None,
+ pt_edges=None,
+ basedir="plots",
+ smearing=False,
+ only_up=True,
+ abs_sys=False,
+ log_x=False,
+):
+ esmodels = esmodels or ["es2012c"]
+ ptypes = ptypes or ["electron"]
if pt_edges is None:
pt_edges = np.linspace(0, 100, 5)
if eta_edges is None:
@@ -643,21 +858,24 @@ def compare_sys(esmodels=None, ptypes=None, decorrelation='FULL_ETACORRELATED_v1
eta_edges = np.asarray(eta_edges)
pt_midpoints = 0.5 * (pt_edges[1:] + pt_edges[:-1])
- eta_midpoints = 0.5 * (eta_edges[1:] + eta_edges[:-1])
- log.info('comparing systematics for esmodels=%s, ptypes=%s, #pt-bins=%d, #eta-bins=%d' % (esmodels, ptypes, len(pt_edges) - 1, len(eta_edges) - 1))
+
+ log.info(
+ "comparing systematics for esmodels=%s, ptypes=%s, #pt-bins=%d, #eta-bins=%d",
+ (esmodels, ptypes, len(pt_edges) - 1, len(eta_edges) - 1)
+ )
effects = {}
for esmodel in esmodels:
- log.info("creating tool for %s" % esmodel)
+ log.info("creating tool for %s", esmodel)
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
tool.setProperty("ESModel", esmodel)
tool.setProperty("decorrelationModel", decorrelation)
- tool.setProperty("int")("randomRunNumber", 297730)
+ tool.setProperty[int]("randomRunNumber", 297730)
if not smearing:
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty[bool]("doSmearing", 0)
tool.initialize()
- log.info('computing systematics for %s' % esmodel)
+ log.info("computing systematics for %s", esmodel)
sys_values = compute_or_read_sys(tool, ptypes, eta_edges, pt_edges)
effects[esmodel] = sys_values
@@ -666,8 +884,11 @@ def compare_sys(esmodels=None, ptypes=None, decorrelation='FULL_ETACORRELATED_v1
del tool
def sorting_function(sys):
- return max(np.abs(effects[esmodel][ptype].get(sys, np.zeros(1))).max() for esmodel in esmodels for ptype in ptypes)
-
+ return max(
+ np.abs(effects[esmodel][ptype].get(sys, np.zeros(1))).max()
+ for esmodel in esmodels
+ for ptype in ptypes
+ )
all_sys = set()
for effects_esmodel in effects.values():
@@ -675,16 +896,21 @@ def compare_sys(esmodels=None, ptypes=None, decorrelation='FULL_ETACORRELATED_v1
all_sys |= set(effects_particle.keys())
if only_up:
- all_sys = set(s for s in all_sys if '__1up' in s)
- all_sys = set(s for s in all_sys if 'RESOLUTION' not in s)
+ all_sys = set(s for s in all_sys if "__1up" in s)
+ all_sys = set(s for s in all_sys if "RESOLUTION" not in s)
sorted_sys = sorted(all_sys, key=sorting_function, reverse=True)
log.info("plot")
- log.info("sorted sys: %s" % sorted_sys)
+ log.info("sorted sys: %s", sorted_sys)
colors = sns.color_palette("Set2", len(esmodels))
- line_styles = '--', ':', '-'
-
- for ptype, (ieta, (eta1, eta2)) in tqdm.tqdm(product(ptypes, enumerate(pairwise(eta_edges))), total=len(ptypes) * (len(eta_edges) - 1), desc='plotting', leave=False):
+ line_styles = "--", ":", "-"
+
+ for ptype, (ieta, (eta1, eta2)) in tqdm.tqdm(
+ product(ptypes, enumerate(pairwise(eta_edges))),
+ total=len(ptypes) * (len(eta_edges) - 1),
+ desc="plotting",
+ leave=False,
+ ):
nsub_x, nsub_y = divide_square(len(sorted_sys))
fig, axs = plt.subplots(nsub_x, nsub_y, figsize=(14, 8), sharex=True)
if hasattr(axs, "flat"):
@@ -699,9 +925,13 @@ def compare_sys(esmodels=None, ptypes=None, decorrelation='FULL_ETACORRELATED_v1
values = np.abs(values)
else:
values = np.zeros_like(pt_midpoints)
- ax.plot(pt_midpoints / 1E3, values * 100, label=esmodel,
- ls=line_styles[iesmodel],
- color=colors[iesmodel])
+ ax.plot(
+ pt_midpoints / 1e3,
+ values * 100,
+ label=esmodel,
+ ls=line_styles[iesmodel],
+ color=colors[iesmodel],
+ )
ylimits = [0.01, 0.3, 0.7, 2.1, 5] # possible y-axis maxima
for ylimit in ylimits:
@@ -712,48 +942,64 @@ def compare_sys(esmodels=None, ptypes=None, decorrelation='FULL_ETACORRELATED_v1
ax.set_ylim(-ylimit, ylimit)
break
- title = sys.replace('EG_SCALE_', '').replace('PH_SCALE_', '').replace('__1up', '')
+ title = sys.replace("EG_SCALE_", "").replace("PH_SCALE_", "").replace("__1up", "")
if len(title) > 17:
title = title[:17] + "..."
ax.set_title(title, fontsize=9)
- ax.yaxis.set_major_locator(MaxNLocator(6, prune='both'))
+ ax.yaxis.set_major_locator(MaxNLocator(6, prune="both"))
ax.xaxis.set_major_locator(MaxNLocator(4))
- ax.tick_params(axis='both', which='major', labelsize=8)
- ax.tick_params(axis='y', which='minor', left='off', right='off')
+ ax.tick_params(axis="both", which="major", labelsize=8)
+ ax.tick_params(axis="y", which="minor", left="off", right="off")
if log_x:
- ax.set_xscale('log')
- ax.set_ylabel('')
+ ax.set_xscale("log")
+ ax.set_ylabel("")
for ax in axs:
if ax.is_last_row():
- ax.set_xlabel('$p_{T}$ [GeV]', fontsize=11)
+ ax.set_xlabel("$p_{T}$ [GeV]", fontsize=11)
if ax.is_first_col():
ax.set_ylabel("effect [%]", fontsize=11)
fig.subplots_adjust(wspace=0.4, hspace=0.27, bottom=0.15)
- handles = [mlines.Line2D([], [], color=colors[i], ls=line_styles[i]) for i in range(len(esmodels))]
+ handles = [
+ mlines.Line2D([], [], color=colors[i], ls=line_styles[i]) for i in range(len(esmodels))
+ ]
labels = esmodels
- fig.legend(handles,
- labels,
- ncol=len(esmodels), loc='upper center',
- bbox_to_anchor=(0.1, -0.14, 0.7, 0.2),
- mode='expand',
- borderaxespad=0.
+ fig.legend(
+ handles,
+ labels,
+ ncol=len(esmodels),
+ loc="upper center",
+ bbox_to_anchor=(0.1, -0.14, 0.7, 0.2),
+ mode="expand",
+ borderaxespad=0.0,
)
- fig.suptitle(r'%s $|\eta|\in [%.2f, %.2f]$' % (ptype, eta1, eta2), fontsize=14)
+ fig.suptitle(r"%s $|\eta|\in [%.2f, %.2f]$" % (ptype, eta1, eta2), fontsize=14)
- figname = 'compare_sys_%s_eta_%.2f_%.2f_vs_pT' % (ptype, eta1, eta2)
- log.info("saving %s" % figname)
+ figname = "compare_sys_%s_eta_%.2f_%.2f_vs_pT" % (ptype, eta1, eta2)
+ log.info("saving %s", figname)
for extension in extensions:
fig.savefig(os.path.join(basedir, "%s.%s" % (figname, extension)))
plt.close(fig)
@timed
-def plot_all_syst_eta_pt(esmodel='es2012c', decorrelation='FULL_v1', ptype='unconverted',
- basedir='plots', eta_range=None, pt_range=None, log_pt=False, abs_sys=False, only_up=False, sys_filters=None, min_value=None, max_value=None):
+def plot_all_syst_eta_pt(
+ esmodel="es2012c",
+ decorrelation="FULL_v1",
+ ptype="unconverted",
+ basedir="plots",
+ eta_range=None,
+ pt_range=None,
+ log_pt=False,
+ abs_sys=False,
+ only_up=False,
+ sys_filters=None,
+ min_value=None,
+ max_value=None,
+):
"""
Plot a 2D map (eta, pT) of the value of the systematic in %
"""
@@ -761,9 +1007,9 @@ def plot_all_syst_eta_pt(esmodel='es2012c', decorrelation='FULL_v1', ptype='unco
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
tool.setProperty("ESModel", esmodel)
tool.setProperty("decorrelationModel", decorrelation)
- tool.setProperty("int")("doSmearing", 0)
- log.warning('setting randomRunNumber to 297730')
- tool.setProperty("int")("randomRunNumber", 297730)
+ tool.setProperty[int]("doSmearing", 0)
+ log.warning("setting randomRunNumber to 297730")
+ tool.setProperty[int]("randomRunNumber", 297730)
tool.initialize()
etas = eta_range if eta_range is not None else np.arange(-3, 3, 0.1)
@@ -778,14 +1024,14 @@ def plot_all_syst_eta_pt(esmodel='es2012c', decorrelation='FULL_v1', ptype='unco
for sys in tqdm.tqdm(all_syst):
sys_name = sys.name()
if "RESOLUTION" in sys_name:
- log.debug('skipping %s', sys_name)
+ log.debug("skipping %s", sys_name)
continue
if only_up and "1up" not in sys_name:
- log.debug('skipping %s', sys_name)
+ log.debug("skipping %s", sys_name)
continue
if sys_filters is not None:
if not any(fnmatch(sys_name, sys_filter) for sys_filter in sys_filters):
- log.debug('skipping %s', sys_name)
+ log.debug("skipping %s", sys_name)
continue
nplotted += 1
log.info("computing sys %s", sys_name)
@@ -802,36 +1048,41 @@ def plot_all_syst_eta_pt(esmodel='es2012c', decorrelation='FULL_v1', ptype='unco
ratio[np.isnan(ratio)] = 1
ratio = ratio - 1
vmax = max_value or np.percentile(np.abs(ratio), 95)
- vmin = min_value or -vmax
if abs_sys:
ratio = np.abs(ratio)
f, ax = plt.subplots()
- p = ax.pcolormesh(etas, pts / 1E3, ratio * 100., vmin=-vmax * 100, vmax=vmax * 100)
- ax.set_title("%s\n%s\n%s" % (ptype, esmodel, sys_name), loc='left')
- ax.set_xlabel('$\eta$', x=1., ha='right')
- ax.set_ylabel('$p_T$ [GeV]', y=1., ha='right')
+ p = ax.pcolormesh(etas, pts / 1e3, ratio * 100.0, vmin=-vmax * 100, vmax=vmax * 100)
+ ax.set_title("%s\n%s\n%s" % (ptype, esmodel, sys_name), loc="left")
+ ax.set_xlabel(r"$\eta$", x=1.0, ha="right")
+ ax.set_ylabel(r"$p_T$ [GeV]", y=1.0, ha="right")
if log_pt:
- ax.set_yscale('log')
+ ax.set_yscale("log")
cb = f.colorbar(p)
- cb.ax.set_ylabel('systematic effect [%]')
+ cb.ax.set_ylabel("systematic effect [%]")
for extension in extensions:
- f.savefig(os.path.join(basedir, "%s_%s_%s_%s.%s" % (ptype, esmodel, decorrelation, sys_name, extension)))
+ f.savefig(
+ os.path.join(
+ basedir, "%s_%s_%s_%s.%s" % (ptype, esmodel, decorrelation, sys_name, extension)
+ )
+ )
plt.close(f)
if nplotted == 0:
- log.warning('no systematic plotted')
+ log.warning("no systematic plotted")
else:
- log.info('%d systematic plotted' % nplotted)
+ log.info("%d systematic plotted", nplotted)
@timed
-def plot_all_scales(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.01), add_patch=False, debug=False):
- log.info("comparing scale factors %s" % esmodels)
+def plot_all_scales(
+ esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.01), add_patch=False, debug=False
+):
+ log.info("comparing scale factors %s", esmodels)
log.warning("<mu> fixed")
labels = labels or esmodels
scales = {}
- to_legend = []
+
for esmodel, label in zip(esmodels, labels):
energy_with = []
energy_without = []
@@ -853,23 +1104,23 @@ def plot_all_scales(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.
if debug:
tool.msg().setLevel(0)
tool.setProperty("ESModel", esmodel)
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty[bool]("doSmearing", 0)
for k, v, t in zip(key_properties, value_properties, type_properties):
- tool.setProperty(t)(k, v)
+ tool.setProperty[t](k, v)
- tool_with.setProperty("int")("doScaleCorrection", 1)
- tool_without.setProperty("int")("doScaleCorrection", 0)
+ tool_with.setProperty[bool]("doScaleCorrection", 1)
+ tool_without.setProperty[bool]("doScaleCorrection", 0)
tool_with.initialize()
tool_without.initialize()
- event = ROOT.xAOD.TEvent()
+ event = ROOT.xAOD.TEvent() # noqa: F841
factory = ROOT.EgammaFactory()
log.warning("using eveninfo 266904")
ei = factory.create_eventinfo(False, 266904)
for eta in etas:
- el = factory.create_electron(eta, 0.1, 40E3)
+ el = factory.create_electron(eta, 0.1, 40e3)
en_with = tool_with.getEnergy(el, ei)
en_without = tool_without.getEnergy(el, ei)
energy_with.append(en_with)
@@ -877,19 +1128,53 @@ def plot_all_scales(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.
scales[label] = np.array(energy_without) / np.array(energy_with) - 1
f, ax = plt.subplots()
- for k, v in scales.iteritems():
+ for k, v in scales.items():
ax.plot(etas, v * 100, label=k)
- ax.set_xlabel("$\eta$", fontsize=15, x=1, ha='right')
+ ax.set_xlabel(r"$\eta$", fontsize=15, x=1, ha="right")
ax.set_ylabel("energy without scale factors / energy with scale factors - 1 [%]", fontsize=10)
ax.grid()
if add_patch:
- ax.add_patch(patches.Rectangle((-2.47, -0.013 * 100 - 0.0168 * 100), +2.47-1.55, 2 * 0.0168 * 100, alpha=0.4, label='13 TeV scales 3 bins', color='k'))
- #ax.add_patch(patches.Rectangle((-1.55, 0.00419 * 100 - 0.001 * 100), +1.55 - 1.37, 2 * 0.001 * 100, alpha=0.4, color='k'))
- ax.add_patch(patches.Rectangle((-1.37, -0.0121 * 100 - 0.0052 * 100), 2 * +1.37, 2 * 0.0052 * 100, alpha=0.4, color='k'))
- ax.add_patch(patches.Rectangle((1.55, -0.013 * 100 - 0.0168 * 100), +2.47-1.55, 2 * 0.0168 * 100, alpha=0.4, color='k'))
+ ax.add_patch(
+ patches.Rectangle(
+ (-2.47, -0.013 * 100 - 0.0168 * 100),
+ +2.47 - 1.55,
+ 2 * 0.0168 * 100,
+ alpha=0.4,
+ label="13 TeV scales 3 bins",
+ color="k",
+ )
+ )
+ # ax.add_patch(patches.Rectangle((-1.55, 0.00419 * 100 - 0.001 * 100), +1.55 - 1.37, 2 * 0.001 * 100, alpha=0.4, color='k'))
+ ax.add_patch(
+ patches.Rectangle(
+ (-1.37, -0.0121 * 100 - 0.0052 * 100),
+ 2 * +1.37,
+ 2 * 0.0052 * 100,
+ alpha=0.4,
+ color="k",
+ )
+ )
+ ax.add_patch(
+ patches.Rectangle(
+ (1.55, -0.013 * 100 - 0.0168 * 100),
+ +2.47 - 1.55,
+ 2 * 0.0168 * 100,
+ alpha=0.4,
+ color="k",
+ )
+ )
- ax.add_patch(patches.Rectangle((-2.47, -0.00649344*100 - 0.00465043*100), +2.47 * 2, 2 * 0.00465043 * 100, alpha=0.5, label='13 TeV scales 1 bin', color='orange'))
+ ax.add_patch(
+ patches.Rectangle(
+ (-2.47, -0.00649344 * 100 - 0.00465043 * 100),
+ +2.47 * 2,
+ 2 * 0.00465043 * 100,
+ alpha=0.5,
+ label="13 TeV scales 1 bin",
+ color="orange",
+ )
+ )
ax.legend()
@@ -901,9 +1186,9 @@ def plot_all_scales(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.
reference = labels[0]
ratio = {label: scales[label] - scales[reference] for label in labels}
f, ax = plt.subplots()
- for k, v in ratio.iteritems():
+ for k, v in ratio.items():
ax.plot(etas, v, label=k)
- ax.set_xlabel("$\eta$", fontsize=15, x=1, ha='right')
+ ax.set_xlabel(r"$\eta$", fontsize=15, x=1, ha="right")
ax.set_ylabel("scales - scales (%s)" % reference, fontsize=10)
ax.grid()
ax.legend()
@@ -914,7 +1199,6 @@ def plot_all_scales(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.
plt.close(f)
-
def plot_all_cterms(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.01)):
labels = labels or esmodels
cterms_all_models = {}
@@ -922,41 +1206,53 @@ def plot_all_cterms(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.
tool_with = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_with")
tool_with.setProperty("ESModel", esmodel)
- tool_with.setProperty("int")("doSmearing", 1)
+ tool_with.setProperty[bool]("doSmearing", 1)
tool_with.initialize()
tool_without = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_without")
tool_without.setProperty("ESModel", esmodel)
- tool_without.setProperty("int")("doSmearing", 0)
+ tool_without.setProperty[bool]("doSmearing", 0)
tool_without.initialize()
- event = ROOT.xAOD.TEvent()
+ event = ROOT.xAOD.TEvent() # noqa: F841
factory = ROOT.EgammaFactory()
ei = factory.create_eventinfo(True, 100000)
cterms = []
for eta in etas:
- el = factory.create_electron(eta, 0.1, 40E3)
+ el = factory.create_electron(eta, 0.1, 40e3)
en_without = tool_without.getEnergy(el, ei)
ratios = np.zeros(1000)
- for repetition in xrange(1000):
+ for repetition in range(1000):
en_with = tool_with.getEnergy(el, ei)
ratios[repetition] = en_with / en_without
cterms.append(np.std(ratios))
cterms_all_models[label] = cterms
f, ax = plt.subplots()
- for k, v in cterms_all_models.iteritems():
+ for k, v in cterms_all_models.items():
ax.plot(etas, v, label=k)
- ax.set_xlabel("$\eta$")
+ ax.set_xlabel(r"$\eta$")
ax.set_ylabel("std (energy with additional cterm / energy without)")
- ax.add_patch(patches.Rectangle((-2.47, 0.028 - 0.027), +2.47-1.55, 2 * 0.027, alpha=0.4, label='13 TeV cterm 3 bins', color='k'))
- ax.add_patch(patches.Rectangle((-1.37, -0.003 - 0.014), +1.37 * 2, 2 * 0.014, alpha=0.4, color='k'))
- ax.add_patch(patches.Rectangle((1.55, 0.028 - 0.027), +2.47-1.55, 2 * 0.027, alpha=0.4, color='k'))
+ ax.add_patch(
+ patches.Rectangle(
+ (-2.47, 0.028 - 0.027),
+ +2.47 - 1.55,
+ 2 * 0.027,
+ alpha=0.4,
+ label="13 TeV cterm 3 bins",
+ color="k",
+ )
+ )
+ ax.add_patch(
+ patches.Rectangle((-1.37, -0.003 - 0.014), +1.37 * 2, 2 * 0.014, alpha=0.4, color="k")
+ )
+ ax.add_patch(
+ patches.Rectangle((1.55, 0.028 - 0.027), +2.47 - 1.55, 2 * 0.027, alpha=0.4, color="k")
+ )
ax.set_ylim(-0.03, 0.06)
-
ax.grid()
ax.legend()
for extension in extensions:
@@ -964,7 +1260,9 @@ def plot_all_cterms(esmodels, basedir, labels=None, etas=np.arange(-4.5, 4.5, 0.
plt.close(f)
-def compare_two_tools_eta(tool1, tool2, pt, simulation, name, basedir, title, particle='unconverted'):
+def compare_two_tools_eta(
+ tool1, tool2, pt, simulation, name, basedir, title, particle="unconverted"
+):
etas = np.arange(-4.5, 4.5, 0.01)
r1 = calibrate_eta_pt(tool1, etas, [pt], simulation, particle)
r2 = calibrate_eta_pt(tool2, etas, [pt], simulation, particle)
@@ -974,17 +1272,19 @@ def compare_two_tools_eta(tool1, tool2, pt, simulation, name, basedir, title, pa
f, ax = plt.subplots()
r = np.nan_to_num(r)
ax.plot(etas, r * 100)
- ax.set_xlabel('$\eta$')
- ax.set_ylabel('effect [%]')
+ ax.set_xlabel(r"$\eta$")
+ ax.set_ylabel("effect [%]")
ax.set_title(title)
- ax.axis('tight')
+ ax.axis("tight")
ax.grid()
for extension in extensions:
f.savefig(os.path.join(basedir, name + "." + extension))
plt.close(f)
-def compare_two_tools_eta_phi(tool1, tool2, pt, simulation, name, basedir, title, particle='unconverted'):
+def compare_two_tools_eta_phi(
+ tool1, tool2, pt, simulation, name, basedir, title, particle="unconverted"
+):
etas = np.arange(-4.5, 4.5, 0.1)
phis = np.arange(-np.pi, np.pi, 0.1)
r1 = eval_sys_eta_phi(tool1, etas, phis, pt, simulation, particle)
@@ -993,18 +1293,20 @@ def compare_two_tools_eta_phi(tool1, tool2, pt, simulation, name, basedir, title
f, ax = plt.subplots()
m = np.max(np.abs(r))
p = ax.pcolormesh(phis, etas, r * 100, vmin=-m * 100, vmax=m * 100)
- ax.set_xlabel('$\phi$')
- ax.set_ylabel('$\eta$')
+ ax.set_xlabel(r"$\phi$")
+ ax.set_ylabel(r"$\eta$")
ax.set_title(title)
- ax.axis('tight')
+ ax.axis("tight")
cb = f.colorbar(p)
- cb.ax.set_ylabel('ratio to nominal [%]')
+ cb.ax.set_ylabel("ratio to nominal [%]")
for extension in extensions:
f.savefig(os.path.join(basedir, name + "." + extension))
plt.close(f)
-def compare_two_tools_eta_pt(tool1, tool2, simulation, name, basedir, title, particle='unconverted'):
+def compare_two_tools_eta_pt(
+ tool1, tool2, simulation, name, basedir, title, particle="unconverted"
+):
etas = np.arange(-4.5, 4.5, 0.05)
pts = np.logspace(3.2, 6, 50)
r1 = calibrate_eta_pt(tool1, etas, pts, simulation, particle)
@@ -1013,15 +1315,15 @@ def compare_two_tools_eta_pt(tool1, tool2, simulation, name, basedir, title, par
f, ax = plt.subplots()
r = np.nan_to_num(r)
m = np.max(np.abs(r))
- p = ax.pcolormesh(etas, pts / 1E3, r * 100, vmin=-m * 100, vmax=m * 100)
- ax.set_yscale('log')
- ax.set_ylabel('$p_T$ [GeV]')
- ax.set_xlabel('$\eta$')
+ p = ax.pcolormesh(etas, pts / 1e3, r * 100, vmin=-m * 100, vmax=m * 100)
+ ax.set_yscale("log")
+ ax.set_ylabel("$p_T$ [GeV]")
+ ax.set_xlabel(r"$\eta$")
ax.set_title(title)
- ax.axis('tight')
+ ax.axis("tight")
cb = f.colorbar(p)
- cb.ax.set_ylabel('ratio to nominal [%]')
+ cb.ax.set_ylabel("ratio to nominal [%]")
for extension in extensions:
f.savefig(os.path.join(basedir, name + "." + extension))
plt.close(f)
@@ -1030,71 +1332,91 @@ def compare_two_tools_eta_pt(tool1, tool2, simulation, name, basedir, title, par
def check_gain(basedir, esmodel):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool.setProperty("ESModel", esmodel)
- tool.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool.setProperty[bool]("doSmearing", 0)
tool.initialize()
tool_no_gain = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool_no_gain.setProperty("ESModel", esmodel)
- tool_no_gain.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_no_gain.setProperty("int")("doSmearing", 0)
- tool_no_gain.setProperty("int")("useGainCorrection", 0)
+ tool_no_gain.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_no_gain.setProperty[bool]("doSmearing", 0)
+ tool_no_gain.setProperty[bool]("useGainCorrection", 0)
tool_no_gain.initialize()
- for ptype in 'electron', 'unconverted', 'converted':
- compare_two_tools_eta_pt(tool_no_gain, tool,
- simulation=False,
- name='gain_%s_%s' % (esmodel, ptype),
- basedir=basedir, particle=ptype,
- title='gain correction effect - %s - %s' % (esmodel, ptype))
+ for ptype in "electron", "unconverted", "converted":
+ compare_two_tools_eta_pt(
+ tool_no_gain,
+ tool,
+ simulation=False,
+ name="gain_%s_%s" % (esmodel, ptype),
+ basedir=basedir,
+ particle=ptype,
+ title="gain correction effect - %s - %s" % (esmodel, ptype),
+ )
+
+ compare_two_tools_eta(
+ tool_no_gain,
+ tool,
+ 40e3,
+ simulation=False,
+ name="gain_%s_%s_40GeV" % (esmodel, "electron"),
+ basedir=basedir,
+ title="gain correction effect - %s 40 GeV electron" % esmodel,
+ particle="electron",
+ )
- compare_two_tools_eta(tool_no_gain, tool, 40E3,
- simulation=False,
- name='gain_%s_%s_40GeV' % (esmodel, 'electron'),
- basedir=basedir, title='gain correction effect - %s 40 GeV electron' % esmodel,
- particle='electron')
def check_fast(basedir, esmodel):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool.setProperty("ESModel", esmodel)
- tool.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool.setProperty[bool]("doSmearing", 0)
tool.initialize()
tool_fast = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool_fast.setProperty("ESModel", esmodel)
- tool_fast.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_fast.setProperty("int")("doSmearing", 0)
- tool_fast.setProperty("bool")("useAFII", True)
+ tool_fast.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_fast.setProperty[bool]("doSmearing", 0)
+ tool_fast.setProperty[bool]("useAFII", True)
tool_fast.initialize()
- for ptype in 'electron', 'converted', 'unconverted':
- compare_two_tools_eta(tool_fast, tool,
- pt=100E3, simulation=True,
- name='fast_%s_%s' % (esmodel, ptype),
- basedir=basedir, particle=ptype,
- title='fast correction effect %s %s 100 GeV' % (esmodel, ptype))
+ for ptype in "electron", "converted", "unconverted":
+ compare_two_tools_eta(
+ tool_fast,
+ tool,
+ pt=100e3,
+ simulation=True,
+ name="fast_%s_%s" % (esmodel, ptype),
+ basedir=basedir,
+ particle=ptype,
+ title="fast correction effect %s %s 100 GeV" % (esmodel, ptype),
+ )
def check_uniformity(basedir, esmodel):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool.setProperty("ESModel", esmodel)
- tool.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool.setProperty[bool]("doSmearing", 0)
tool.initialize()
tool_no_uniformity = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool_no_uniformity.setProperty("ESModel", esmodel)
- tool_no_uniformity.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_no_uniformity.setProperty("int")("doSmearing", 0)
- tool_no_uniformity.setProperty("int")("usePhiUniformCorrection", 0)
+ tool_no_uniformity.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_no_uniformity.setProperty[bool]("doSmearing", 0)
+ tool_no_uniformity.setProperty[bool]("usePhiUniformCorrection", 0)
tool_no_uniformity.initialize()
- compare_two_tools_eta_phi(tool_no_uniformity, tool,
- pt=100E3, simulation=False,
- name='uniformity_%s' % esmodel,
- basedir=basedir, particle='unconverted',
- title='uniformity correction effect - %s - unconverted 100 GeV' % esmodel)
+ compare_two_tools_eta_phi(
+ tool_no_uniformity,
+ tool,
+ pt=100e3,
+ simulation=False,
+ name="uniformity_%s" % esmodel,
+ basedir=basedir,
+ particle="unconverted",
+ title="uniformity correction effect - %s - unconverted 100 GeV" % esmodel,
+ )
def compare_all_syst_fixed_pt(basedir, esmodels, names=None, labels=None):
@@ -1105,8 +1427,8 @@ def compare_all_syst_fixed_pt(basedir, esmodels, names=None, labels=None):
if type(esmodel) is str:
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_%s" % esmodel)
tool.setProperty("ESModel", esmodel)
- tool.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool.setProperty[bool]("doSmearing", 0)
tool.initialize()
tools.append(tool)
else:
@@ -1115,7 +1437,7 @@ def compare_all_syst_fixed_pt(basedir, esmodels, names=None, labels=None):
def plot_resolution_eta_pt(basedir, tool, pts, etas, ptype, title):
- event = ROOT.xAOD.TEvent()
+ event = ROOT.xAOD.TEvent() # noqa: F841
factory = ROOT.EgammaFactory()
result = np.ones((len(pts), len(etas)))
eta_centers = 0.5 * (etas[1:] + etas[:-1])
@@ -1139,35 +1461,43 @@ def plot_resolution_eta_pt(basedir, tool, pts, etas, ptype, title):
fig, ax = plt.subplots()
vmin, vmax = np.percentile(result, (2, 98))
- p = ax.pcolormesh(pts / 1E3, etas, result, vmin=vmin, vmax=vmax)
+ p = ax.pcolormesh(pts / 1e3, etas, result, vmin=vmin, vmax=vmax)
ax.set_title(title)
- ax.axis('tight')
- ax.set_xlabel('$p_T$ [GeV]')
- ax.set_ylabel('$\eta$')
- ax.set_xscale('log')
+ ax.axis("tight")
+ ax.set_xlabel(r"$p_T$ [GeV]")
+ ax.set_ylabel(r"$\eta$")
+ ax.set_xscale("log")
cb = fig.colorbar(p)
- cb.ax.set_ylabel('resolution')
+ cb.ax.set_ylabel("resolution")
for extension in extensions:
- fig.savefig(os.path.join(basedir, 'resolution_%s.%s' % (ptype, extension)))
+ fig.savefig(os.path.join(basedir, "resolution_%s.%s" % (ptype, extension)))
def plot_resolution_error(basedir, **kwargs):
- esmodels = kwargs["esmodels"] or ('es2012c', 'es2015PRE', 'es2015PRE_res_improved', 'es2016PRE', 'es2017')
+ esmodels = kwargs["esmodels"] or (
+ "es2012c",
+ "es2015PRE",
+ "es2015PRE_res_improved",
+ "es2016PRE",
+ "es2017",
+ )
if kwargs["eta_bins"] is not None:
eta_bins = pairwise(kwargs["eta_bins"])
else:
eta_bins = (0, 0.4), (0.4, 0.6), (0.6, 1.37), (1.52, 1.8), (1.8, 2.37)
for esmodel in esmodels:
- log.debug("plotting resolution error for %s" % esmodel)
+ log.debug("plotting resolution error for %s", esmodel)
tool = ROOT.AtlasRoot.egammaEnergyCorrectionTool()
- if kwargs['debug']:
+ if kwargs["debug"]:
tool.msg().setLevel(0)
tool.setESModel(getattr(ROOT.egEnergyCorr, esmodel))
tool.initialize()
- for particle in ('electron', 'converted', 'unconverted'):
- log.info('plotting resolution %s', particle)
+ for particle in ("electron", "converted", "unconverted"):
+ log.info("plotting resolution %s", particle)
for eta_min, eta_max in tqdm.tqdm(eta_bins):
- plot_resolution_error_bin(eta_min, eta_max, particle, esmodel, basedir, tool=tool, **kwargs)
+ plot_resolution_error_bin(
+ eta_min, eta_max, particle, esmodel, basedir, tool=tool, **kwargs
+ )
def plot_resolution_error_bin(eta_min, eta_max, particle, esmodel, basedir, tool=None, **kwargs):
@@ -1176,145 +1506,184 @@ def plot_resolution_error_bin(eta_min, eta_max, particle, esmodel, basedir, tool
tool.setESModel(getattr(ROOT.egEnergyCorr, esmodel))
tool.initialize()
- ptype = {"electron": ROOT.PATCore.ParticleType.Electron,
- "unconverted": ROOT.PATCore.ParticleType.UnconvertedPhoton,
- "converted": ROOT.PATCore.ParticleType.ConvertedPhoton
- }[particle]
-
- variations_name_up = {"Zsmearing up": ROOT.egEnergyCorr.Resolution.ZSmearingUp,
- "sampling up": ROOT.egEnergyCorr.Resolution.SamplingTermUp,
- "material ID up": ROOT.egEnergyCorr.Resolution.MaterialIDUp,
- "material calo up": ROOT.egEnergyCorr.Resolution.MaterialCaloUp,
- "material gap up": ROOT.egEnergyCorr.Resolution.MaterialGapUp,
- "material cryo up": ROOT.egEnergyCorr.Resolution.MaterialCryoUp,
- "pileup up": ROOT.egEnergyCorr.Resolution.PileUpUp,
- "material ibl up": ROOT.egEnergyCorr.Resolution.MaterialIBLUp,
- "material pp0 up": ROOT.egEnergyCorr.Resolution.MaterialPP0Up,
- "all up": ROOT.egEnergyCorr.Resolution.AllUp}
- variations_name_down = {"Zsmearing down": ROOT.egEnergyCorr.Resolution.ZSmearingDown,
- "sampling down": ROOT.egEnergyCorr.Resolution.SamplingTermDown,
- "material ID down": ROOT.egEnergyCorr.Resolution.MaterialIDDown,
- "material calo down": ROOT.egEnergyCorr.Resolution.MaterialCaloDown,
- "material gap down": ROOT.egEnergyCorr.Resolution.MaterialGapDown,
- "material cryo down": ROOT.egEnergyCorr.Resolution.MaterialCryoDown,
- "pileup down": ROOT.egEnergyCorr.Resolution.PileUpDown,
- "material ibl down": ROOT.egEnergyCorr.Resolution.MaterialIBLDown,
- "material pp0 down": ROOT.egEnergyCorr.Resolution.MaterialPP0Down,
-
- "all down": ROOT.egEnergyCorr.Resolution.AllDown}
-# ^ ^
+ ptype = {
+ "electron": ROOT.PATCore.ParticleType.Electron,
+ "unconverted": ROOT.PATCore.ParticleType.UnconvertedPhoton,
+ "converted": ROOT.PATCore.ParticleType.ConvertedPhoton,
+ }[particle]
+
+ variations_name_up = {
+ "Zsmearing up": ROOT.egEnergyCorr.Resolution.ZSmearingUp,
+ "sampling up": ROOT.egEnergyCorr.Resolution.SamplingTermUp,
+ "material ID up": ROOT.egEnergyCorr.Resolution.MaterialIDUp,
+ "material calo up": ROOT.egEnergyCorr.Resolution.MaterialCaloUp,
+ "material gap up": ROOT.egEnergyCorr.Resolution.MaterialGapUp,
+ "material cryo up": ROOT.egEnergyCorr.Resolution.MaterialCryoUp,
+ "pileup up": ROOT.egEnergyCorr.Resolution.PileUpUp,
+ "material ibl up": ROOT.egEnergyCorr.Resolution.MaterialIBLUp,
+ "material pp0 up": ROOT.egEnergyCorr.Resolution.MaterialPP0Up,
+ "all up": ROOT.egEnergyCorr.Resolution.AllUp,
+ }
+ variations_name_down = {
+ "Zsmearing down": ROOT.egEnergyCorr.Resolution.ZSmearingDown,
+ "sampling down": ROOT.egEnergyCorr.Resolution.SamplingTermDown,
+ "material ID down": ROOT.egEnergyCorr.Resolution.MaterialIDDown,
+ "material calo down": ROOT.egEnergyCorr.Resolution.MaterialCaloDown,
+ "material gap down": ROOT.egEnergyCorr.Resolution.MaterialGapDown,
+ "material cryo down": ROOT.egEnergyCorr.Resolution.MaterialCryoDown,
+ "pileup down": ROOT.egEnergyCorr.Resolution.PileUpDown,
+ "material ibl down": ROOT.egEnergyCorr.Resolution.MaterialIBLDown,
+ "material pp0 down": ROOT.egEnergyCorr.Resolution.MaterialPP0Down,
+ "all down": ROOT.egEnergyCorr.Resolution.AllDown,
+ }
+ # ^ ^
all_errors = [{}, {}] # up and down
-# ,--,
+ # ,--,
- pt_range = kwargs.get('pt_bins')
+ pt_range = kwargs.get("pt_bins")
if pt_range is None:
- pr_range = np.linspace(10E3, 2000E3, 100)
+ pt_range = np.linspace(10e3, 2000e3, 100)
- nsamples_eta = kwargs['super_sampling_eta'] or 5
+ nsamples_eta = kwargs["super_sampling_eta"] or 5
eta_range = np.linspace(eta_min, eta_max, nsamples_eta + 2)[1:-1]
-
only_up = True
- for side, errors, variations_name in zip(("up", "down"), all_errors, (variations_name_up, variations_name_down)):
- if only_up and side == 'down':
+ for side, errors, variations_name in zip(
+ ("up", "down"), all_errors, (variations_name_up, variations_name_down)
+ ):
+ if only_up and side == "down":
continue
- quadrature_sum = np.zeros((len(pt_range), len(eta_range)))
- for variation_name, variation_id in variations_name.iteritems():
+
+ for variation_name, variation_id in variations_name.items():
errors_var_pt_eta = np.zeros((len(pt_range), len(eta_range)))
for ipt, pt in enumerate(pt_range):
for ieta, eta in enumerate(eta_range):
energy = pt * np.cosh(eta)
- log.debug("evaluating systematics %s in eta=%.2f pt=%.2f on resolution" % (variation_name, eta, pt))
- errors_var_pt_eta[ipt, ieta] = tool.getResolutionError(energy, eta, eta, ptype, variation_id)
- errors[variation_name] = errors_var_pt_eta.mean(axis=1) # average over different eta points inside the eta-bin
- if kwargs['abs_sys']:
+ log.debug(
+ "evaluating systematics %s in eta=%.2f pt=%.2f on resolution",
+ (variation_name, eta, pt)
+ )
+ errors_var_pt_eta[ipt, ieta] = tool.getResolutionError(
+ ROOT.PATCore.ParticleDataType.Full, energy, eta, eta, ptype, variation_id
+ )
+ errors[variation_name] = errors_var_pt_eta.mean(
+ axis=1
+ ) # average over different eta points inside the eta-bin
+ if kwargs["abs_sys"]:
errors[variation_name] = np.abs(errors[variation_name])
- sorted_keys_up = sorted(variations_name_up.keys(), key=lambda x: np.abs(all_errors[0][x].mean()))
- totals = [np.sqrt(np.sum(e ** 2 for k, e in errors.iteritems() if "all " not in k)) for errors in all_errors]
+# sorted_keys_up = sorted(
+# variations_name_up.keys(), key=lambda x: np.abs(all_errors[0][x].mean())
+# )
+ totals = [
+ np.sqrt(np.sum([e ** 2 for k, e in errors.items() if "all " not in k]))
+ for errors in all_errors
+ ]
fig, ax = plt.subplots()
if only_up:
- ax.fill_between(pt_range / 1E3, 0, all_errors[0]['all up'], color='0.8')
+ ax.fill_between(pt_range / 1e3, 0, all_errors[0]["all up"], color="0.8")
else:
- ax.fill_between(pt_range / 1E3, all_errors[0]['all up'], all_errors[1]['all down'], color='0.8')
-# ax.fill_between(pt_range / 1E3, totals[0], -totals[-1], color='0.8')
-# totals[1] *= -1
+ ax.fill_between(
+ pt_range / 1e3, all_errors[0]["all up"], all_errors[1]["all down"], color="0.8"
+ )
+ # ax.fill_between(pt_range / 1E3, totals[0], -totals[-1], color='0.8')
+ # totals[1] *= -1
- colors = ['b', 'g', 'r', 'c', 'm', 'y', 'violet', 'pink', 'orange']
- props = mpl.rcParams["axes.prop_cycle"]
+ colors = ["b", "g", "r", "c", "m", "y", "violet", "pink", "orange"]
+ props = mpl.rcParams["axes.prop_cycle"] # noqa: F841
- for side, errors, total in zip(('up', 'down'), all_errors, totals):
- if only_up and side == 'down':
+ for side, errors, total in zip(("up", "down"), all_errors, totals):
+ if only_up and side == "down":
continue
- #ax.plot(pt_range / 1E3, total, label='sum %s' % side, color='k')
- ax.plot(pt_range / 1E3, errors['all %s' % side], 'k', label='all %s' % side)
+ # ax.plot(pt_range / 1E3, total, label='sum %s' % side, color='k')
+ ax.plot(pt_range / 1e3, errors["all %s" % side], "k", label="all %s" % side)
colors_iter = cycle(colors)
for k in sorted(errors.keys()):
- if 'all' in k:
+ if "all" in k:
continue
v = errors[k]
linestyle = "-"
if "down" in k:
- linestyle = '--'
+ linestyle = "--"
if "all" in k:
linestyle = ":"
- ax.plot(pt_range / 1E3, v, linestyle, label=k, color=next(colors_iter))
+ ax.plot(pt_range / 1e3, v, linestyle, label=k, color=next(colors_iter))
fig.text(0.16, 0.73, beautify_particle(particle), transform=ax.transAxes, fontsize=15)
- fig.text(0.16, 0.67, r'$%.2f < \eta < %.2f$' % (eta_min, eta_max), transform=ax.transAxes, fontsize=15)
+ fig.text(
+ 0.16,
+ 0.67,
+ r"$%.2f < \eta < %.2f$" % (eta_min, eta_max),
+ transform=ax.transAxes,
+ fontsize=15,
+ )
ax.set_title("%s" % esmodel)
- ax.set_ylabel('relative resolution error [%]', ha='right', y=1., fontsize=19)
- ax.set_xlabel('$E_T$ [GeV]', ha='right', x=1., fontsize=19)
- if kwargs['abs_sys']:
+ ax.set_ylabel("relative resolution error [%]", ha="right", y=1.0, fontsize=19)
+ ax.set_xlabel("$E_T$ [GeV]", ha="right", x=1.0, fontsize=19)
+ if kwargs["abs_sys"]:
ax.set_ylim(0, 0.6)
else:
- ax_set_ylim(-1.7, 1.7)
- ax.set_xlim(np.min(pt_range) / 1E3, np.max(pt_range) / 1E3)
+ ax.set_ylim(-1.7, 1.7)
+ ax.set_xlim(np.min(pt_range) / 1e3, np.max(pt_range) / 1e3)
fig.subplots_adjust(bottom=0.35)
- ax.legend(loc=3, bbox_to_anchor=(0., -0.5, 1, 0.2), mode="expand",
- ncol=4, borderaxespad=0., fontsize=10)
+ ax.legend(
+ loc=3,
+ bbox_to_anchor=(0.0, -0.5, 1, 0.2),
+ mode="expand",
+ ncol=4,
+ borderaxespad=0.0,
+ fontsize=10,
+ )
- plot_ATLAS(fig, 0.16, 0.8, 'Internal', fontsize=19)
+ plot_ATLAS(fig, 0.16, 0.8, "Internal", fontsize=19)
- if kwargs['grid']:
+ if kwargs["grid"]:
ax.grid()
- filename = os.path.join(basedir, 'error_relresolution_%s_%s_eta%.2f-%.2f' % (esmodel, particle, eta_min, eta_max))
- for ext in 'png', 'pdf':
- fig.savefig(filename + "." + ext, bbox_inches='tight')
+ filename = os.path.join(
+ basedir, "error_relresolution_%s_%s_eta%.2f-%.2f" % (esmodel, particle, eta_min, eta_max)
+ )
+ for ext in "png", "pdf":
+ fig.savefig(filename + "." + ext, bbox_inches="tight")
plt.close(fig)
-def list_systematics(esmodels, decorrelation='FULL_ETACORRELATED_v1'):
+
+def list_systematics(esmodels, decorrelation="FULL_ETACORRELATED_v1"):
if type(esmodels) is str:
esmodels = [esmodels]
elif esmodels is None:
- log.warning('no esmodel specified, using es2012c')
- esmodels = ['es2012c']
+ log.warning("no esmodel specified, using es2012c")
+ esmodels = ["es2012c"]
syslist_esmodel = {}
for esmodel in esmodels:
- log.debug("creating tool for %s" % esmodel)
+ log.debug("creating tool for %s", esmodel)
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
tool.setProperty("ESModel", esmodel)
tool.setProperty("decorrelationModel", decorrelation)
tool.initialize()
syslist_esmodel[esmodel] = [s.name() for s in systematics_from_tool(tool, only_scale=False)]
- for esmodel, sys_list in syslist_esmodel.iteritems():
+ for esmodel, sys_list in syslist_esmodel.items():
print("esmodel: %s %s UP variations" % (esmodel, len(sys_list)))
for sysname in sys_list:
print(" {:10s}".format(sysname))
if len(esmodels) > 1:
- log.info('comparing the %s esmodels' % len(esmodels))
+ log.info("comparing the %s esmodels", len(esmodels))
all_sys = set([item for sublist in syslist_esmodel.values() for item in sublist])
- print(' ' * 40 + ''.join(' [%d] ' % i for i in range(len(esmodels))))
+ print(" " * 40 + "".join(" [%d] " % i for i in range(len(esmodels))))
for sysname in sorted(all_sys):
- cross = ''.join([' x ' if sysname in syslist_esmodel[esmodel] else ' ' for esmodel in esmodels])
- print(('{:40s}'.format(sysname) + cross))
+ cross = "".join(
+ [
+ " x " if sysname in syslist_esmodel[esmodel] else " "
+ for esmodel in esmodels
+ ]
+ )
+ print(("{:40s}".format(sysname) + cross))
for iesmodel, esmodel in enumerate(esmodels):
print("[%d] = %s" % (iesmodel, esmodel))
@@ -1322,8 +1691,10 @@ def list_systematics(esmodels, decorrelation='FULL_ETACORRELATED_v1'):
@timed
def main():
from argparse import ArgumentParser, RawDescriptionHelpFormatter
- parser = ArgumentParser(formatter_class=RawDescriptionHelpFormatter,
- epilog="""
+
+ parser = ArgumentParser(
+ formatter_class=RawDescriptionHelpFormatter,
+ epilog="""
to produce paper plots for systematics:
python plot.py sys_eta_slices --beautify-sysnames --sys-order paper_run1 --superimpose-all --skip-null-sys --esmodels es2016PRE --min-sys-value -0.01 --max-sys-value 0.02 --symmetrize-labels --pt-bins-logspace 5E3 1E6 100
@@ -1332,7 +1703,6 @@ to produce paper plots for systematics:
to produce paper plot for resolution (the name of the esmodels here are the ones used by the internal class)
python plot.py resolution-err --esmodels es2017 --abs-sys --pt-bins-linspace 5E3 200E3 200
-
to compare systematics between tools vs pT:
python plot.py compare_sys --particles electron converted unconverted --esmodels es2016data_mc15c_summer_improved es2016data_mc15c_summer --eta-bins 0 0.6 1.0 1.37 1.55 1.82 2.47 --pt-bins-logspace 5E3 1500E3 50 --abs-sys --log-x
@@ -1344,40 +1714,90 @@ to produce scale factor correction (doScaleCorrection on/off):
to list the systematics:
python plot.py list-systematics --esmodels es2012c es2016data_mc15c_summer es2016data_mc15c_summer_improved es2017_R21_PRE
-""")
- parser.add_argument('action', choices=['compare_sys', 'compute_sys', 'uA2MeV',
- 'zee', 'material', 'scale', 'cterm',
- 'all', 'gain', 'uniformity',
- 'sys_fixed_pt', 'sys_eta_slices',
- 'all_sys', 'resolution', 'fast', 'resolution-err', 'list-systematics'],
- default='all', help='what to do')
- parser.add_argument('--esmodels', nargs='*', help='esmodel to consider')
- parser.add_argument('--decorrelation', default='FULL_ETACORRELATED_v1')
- parser.add_argument('--particles', nargs='*', help='the particle (electron/converted/unconverted)', default=['electron'])
- parser.add_argument('--beautify-sysnames', action='store_true')
- parser.add_argument('--eta-bins', nargs='*', type=float, help='edges of the eta-bins')
- parser.add_argument('--eta-bins-linspace', nargs=3, type=float, help='edge of the eta-bins as min max nbins')
- parser.add_argument('--pt-bins', nargs='*', type=float, help='edges of the pt-bins')
- parser.add_argument('--pt-bins-linspace', nargs=3, type=float, help='edge of the eta-bins as min max nbins')
- parser.add_argument('--pt-bins-logspace', nargs=3, type=float, help='edge of the eta-bins as min max nbins')
- parser.add_argument('--super-sampling-eta', type=int, default=5, help='how many point to average inside a bin')
- parser.add_argument('--sys-order', choices=['paper_run1', 'paper_run2'], default='how to order systematics, options: paper_run1, paper_run2')
- parser.add_argument('--debug', action='store_true')
- parser.add_argument('--superimpose-all', action='store_true', help='superimpose sum of systematics')
- parser.add_argument('--skip-null-sys', action='store_true', help='do not plot null systematics')
- parser.add_argument('--yrange', nargs=2, type=float)
- parser.add_argument('--add-down', action='store_true', help='plot also the down systematics')
- parser.add_argument('--legend-outside', action='store_true', help='draw the legend outside the plot')
- parser.add_argument('--symmetrize-labels', action='store_true')
- parser.add_argument('--abs-sys', action='store_true', help='consider the abs value of the systeamatics')
- parser.add_argument('--log-x', action='store_true', help='use log scale')
- parser.add_argument('--log-pt', action='store_true', help='use log scale for pT')
- parser.add_argument('--sys-filters', nargs='*', help='list of wildcard to filter systematic names')
- parser.add_argument('--min-sys-value', type=float, help='min value for the systematic axis')
- parser.add_argument('--max-sys-value', type=float, help='max value for the systematic axis')
- parser.add_argument('--grid', action='store_true', help='show grid')
- parser.add_argument('--plot-qsum', action='store_true', help='plot the quadrature sum of the systematics for debug (should be equal to 1NP up)')
- parser.add_argument('--atlas-label', help='Internal, Preliminary, ..., use "" for papers')
+""",
+ )
+ parser.add_argument(
+ "action",
+ choices=[
+ "compare_sys",
+ "compute_sys",
+ "uA2MeV",
+ "zee",
+ "material",
+ "scale",
+ "cterm",
+ "all",
+ "gain",
+ "uniformity",
+ "sys_fixed_pt",
+ "sys_eta_slices",
+ "all_sys",
+ "resolution",
+ "fast",
+ "resolution-err",
+ "list-systematics",
+ ],
+ default="all",
+ help="what to do",
+ )
+ parser.add_argument("--esmodels", nargs="*", help="esmodel to consider")
+ parser.add_argument("--decorrelation", default="FULL_ETACORRELATED_v1")
+ parser.add_argument(
+ "--particles",
+ nargs="*",
+ help="the particle (electron/converted/unconverted)",
+ default=["electron"],
+ )
+ parser.add_argument("--beautify-sysnames", action="store_true")
+ parser.add_argument("--eta-bins", nargs="*", type=float, help="edges of the eta-bins")
+ parser.add_argument(
+ "--eta-bins-linspace", nargs=3, type=float, help="edge of the eta-bins as min max nbins"
+ )
+ parser.add_argument("--pt-bins", nargs="*", type=float, help="edges of the pt-bins")
+ parser.add_argument(
+ "--pt-bins-linspace", nargs=3, type=float, help="edge of the eta-bins as min max nbins"
+ )
+ parser.add_argument(
+ "--pt-bins-logspace", nargs=3, type=float, help="edge of the eta-bins as min max nbins"
+ )
+ parser.add_argument(
+ "--super-sampling-eta", type=int, default=5, help="how many point to average inside a bin"
+ )
+ parser.add_argument(
+ "--sys-order",
+ choices=["paper_run1", "paper_run2"],
+ help="how to order systematics, options: paper_run1, paper_run2",
+ )
+ parser.add_argument("--debug", action="store_true")
+ parser.add_argument(
+ "--superimpose-all", action="store_true", help="superimpose sum of systematics"
+ )
+ parser.add_argument("--skip-null-sys", action="store_true", help="do not plot null systematics")
+ parser.add_argument("--yrange", nargs=2, type=float)
+ parser.add_argument("--add-down", action="store_true", help="plot also the down systematics")
+ parser.add_argument(
+ "--legend-outside", action="store_true", help="draw the legend outside the plot"
+ )
+ parser.add_argument("--symmetrize-labels", action="store_true")
+ parser.add_argument(
+ "--abs-sys", action="store_true", help="consider the abs value of the systeamatics"
+ )
+ parser.add_argument("--log-x", action="store_true", help="use log scale")
+ parser.add_argument("--log-pt", action="store_true", help="use log scale for pT")
+ parser.add_argument(
+ "--sys-filters", nargs="*", help="list of wildcard to filter systematic names"
+ )
+ parser.add_argument("--min-sys-value", type=float, help="min value for the systematic axis")
+ parser.add_argument("--max-sys-value", type=float, help="max value for the systematic axis")
+ parser.add_argument("--grid", action="store_true", help="show grid")
+ parser.add_argument(
+ "--plot-qsum",
+ action="store_true",
+ help="plot the quadrature sum of the systematics for debug (should be equal to 1NP up)",
+ )
+ parser.add_argument(
+ "--atlas-label", default="Internal", help='Internal, Preliminary, ..., use "" for papers'
+ )
args = parser.parse_args()
if args.debug:
@@ -1385,184 +1805,267 @@ to list the systematics:
log.debug("DEBUG activated")
if args.eta_bins_linspace:
- args.eta_bins = np.linspace(args.eta_bins_linspace[0], args.eta_bins_linspace[1], args.eta_bins_linspace[2] + 1)
+ args.eta_bins = np.linspace(
+ args.eta_bins_linspace[0], args.eta_bins_linspace[1], int(args.eta_bins_linspace[2] + 1)
+ )
if args.pt_bins_linspace:
- args.pt_bins = np.linspace(args.pt_bins_linspace[0], args.pt_bins_linspace[1], args.pt_bins_linspace[2] + 1)
+ args.pt_bins = np.linspace(
+ args.pt_bins_linspace[0], args.pt_bins_linspace[1], int(args.pt_bins_linspace[2] + 1)
+ )
if args.pt_bins_logspace:
- args.pt_bins = np.logspace(np.log10(args.pt_bins_logspace[0]), np.log10(args.pt_bins_logspace[1]), args.pt_bins_logspace[2] + 1)
+ args.pt_bins = np.logspace(
+ np.log10(args.pt_bins_logspace[0]),
+ np.log10(args.pt_bins_logspace[1]),
+ int(args.pt_bins_logspace[2] + 1),
+ )
- basedir = 'plots'
+ basedir = "plots"
if not os.path.exists(basedir):
os.makedirs(basedir)
- if args.action == 'list-systematics':
+ if args.action == "list-systematics":
list_systematics(args.esmodels, args.decorrelation)
- if args.action == 'compute_sys':
- log.info('computing systematics')
- for esmodel in args.esmodels or ['es2012c']:
+ if args.action == "compute_sys":
+ log.info("computing systematics")
+ for esmodel in args.esmodels or ["es2012c"]:
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
tool.setProperty("ESModel", esmodel)
- tool.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool.setProperty("int")("doSmearing", 0)
+ tool.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool.setProperty[bool]("doSmearing", 0)
tool.initialize()
- result = compute_or_read_sys(tool, ['electron'], args.eta_bins, args.pt_bins)
+ result = compute_or_read_sys(tool, ["electron"], args.eta_bins, args.pt_bins)
print(result)
- if args.action == 'compare_sys':
+ if args.action == "compare_sys":
log.info("comparing systematics")
- compare_sys(args.esmodels, ptypes=args.particles, decorrelation=args.decorrelation,
- eta_edges=args.eta_bins, pt_edges=args.pt_bins, abs_sys=args.abs_sys, log_x=args.log_x)
+ compare_sys(
+ args.esmodels,
+ ptypes=args.particles,
+ decorrelation=args.decorrelation,
+ eta_edges=args.eta_bins,
+ pt_edges=args.pt_bins,
+ abs_sys=args.abs_sys,
+ log_x=args.log_x,
+ )
- if args.action == 'resolution-err':
+ if args.action == "resolution-err":
log.info("plotting resolution error")
- plot_resolution_error(basedir='plots', **vars(args))
+ plot_resolution_error(basedir="plots", **vars(args))
- if args.action == 'zee' or args.action == 'all':
+ if args.action == "zee" or args.action == "all":
log.info("plotting scale systematics")
- plot_all_Zee_syst(etas=np.arange(-2.5, 2.5, 0.01), pt=100E3, basedir='plots')
+ plot_all_Zee_syst(etas=np.arange(-2.5, 2.5, 0.01), pt=100e3, basedir="plots")
- if args.action == 'all' or args.action == 'uA2MeV':
+ if args.action == "all" or args.action == "uA2MeV":
log.info("plotting uA2MeV")
- tool_es2015PRE_nouA2MeV = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE_nouA2MeV")
+ tool_es2015PRE_nouA2MeV = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2015PRE_nouA2MeV"
+ )
tool_es2015PRE_nouA2MeV.setProperty("ESModel", "es2015PRE")
- tool_es2015PRE_nouA2MeV.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_es2015PRE_nouA2MeV.setProperty("int")("doSmearing", 0)
- tool_es2015PRE_nouA2MeV.setProperty("int")("use_uA2MeV_2015_first2weeks_correction", 0)
+ tool_es2015PRE_nouA2MeV.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_es2015PRE_nouA2MeV.setProperty[bool]("doSmearing", 0)
+ tool_es2015PRE_nouA2MeV.setProperty[bool]("use_uA2MeV_2015_first2weeks_correction", 0)
tool_es2015PRE_nouA2MeV.initialize()
tool_es2015PRE = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE")
tool_es2015PRE.setProperty("ESModel", "es2015PRE")
- tool_es2015PRE.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_es2015PRE.setProperty("int")("doSmearing", 0)
+ tool_es2015PRE.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_es2015PRE.setProperty[bool]("doSmearing", 0)
tool_es2015PRE.initialize()
- compare_two_tools_eta(tool_es2015PRE, tool_es2015PRE_nouA2MeV,
- 100E3, simulation=False,
- name="uA2MeV", basedir=basedir,
- title="with uA2MeV correction / without",
- particle='electron')
+ compare_two_tools_eta(
+ tool_es2015PRE,
+ tool_es2015PRE_nouA2MeV,
+ 100e3,
+ simulation=False,
+ name="uA2MeV",
+ basedir=basedir,
+ title="with uA2MeV correction / without",
+ particle="electron",
+ )
del tool_es2015PRE_nouA2MeV
del tool_es2015PRE
- if args.action == 'all' or args.action == 'scale':
+ if args.action == "all" or args.action == "scale":
log.info("plotting scales")
- plot_all_scales(esmodels=args.esmodels,
- labels=args.esmodels,
- basedir=basedir, etas=np.arange(-2.5, 2.5, 0.01),
- add_patch=False, debug=args.debug)
- if args.action == 'all' or args.action == 'fast':
+ plot_all_scales(
+ esmodels=args.esmodels,
+ labels=args.esmodels,
+ basedir=basedir,
+ etas=np.arange(-2.5, 2.5, 0.01),
+ add_patch=False,
+ debug=args.debug,
+ )
+ if args.action == "all" or args.action == "fast":
log.info("plotting full / fast scale")
check_fast(basedir, "es2015PRE")
- plot_all_scales(esmodels=("es2015PRE", ("es2015PRE", ("useAFII",), (True,), (bool,))),
- labels=("2015PRE", "2015PRE FAST"),
- basedir=basedir, etas=np.arange(-2.5, 2.5, 0.01))
- if args.action == 'all' or args.action == 'cterm':
+ plot_all_scales(
+ esmodels=("es2015PRE", ("es2015PRE", ("useAFII",), (True,), (bool,))),
+ labels=("2015PRE", "2015PRE FAST"),
+ basedir=basedir,
+ etas=np.arange(-2.5, 2.5, 0.01),
+ )
+ if args.action == "all" or args.action == "cterm":
log.info("plotting smearings")
- plot_all_cterms(esmodels=("es2012c", "es2012XX", "es2015PRE"), labels=("2012", "new", "new + temp"), basedir=basedir, etas=np.arange(-2.5, 2.5, 0.01))
+ plot_all_cterms(
+ esmodels=("es2012c", "es2012XX", "es2015PRE"),
+ labels=("2012", "new", "new + temp"),
+ basedir=basedir,
+ etas=np.arange(-2.5, 2.5, 0.01),
+ )
- if args.action == 'gain' or args.action == "all":
- check_gain(basedir, 'es2015PRE')
+ if args.action == "gain" or args.action == "all":
+ check_gain(basedir, "es2015PRE")
- if args.action == 'uniformity' or args.action == 'all':
- check_uniformity(basedir, 'es2012c')
- check_uniformity(basedir, 'es2015PRE')
+ if args.action == "uniformity" or args.action == "all":
+ check_uniformity(basedir, "es2012c")
+ check_uniformity(basedir, "es2015PRE")
- if args.action == 'sys_fixed_pt' or args.action == 'all':
+ if args.action == "sys_fixed_pt" or args.action == "all":
tool_es2015PRE_notemp = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE_notemp")
tool_es2015PRE_notemp.setProperty("ESModel", "es2015PRE")
- tool_es2015PRE_notemp.setProperty("decorrelationModel", 'FULL_ETACORRELATED_v1')
- tool_es2015PRE_notemp.setProperty("int")("doSmearing", 0)
- tool_es2015PRE_notemp.setProperty("int")("use_temp_correction201215", 0)
+ tool_es2015PRE_notemp.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1")
+ tool_es2015PRE_notemp.setProperty[bool]("doSmearing", 0)
+ tool_es2015PRE_notemp.setProperty[bool]("use_temp_correction201215", 0)
tool_es2015PRE_notemp.initialize()
- compare_all_syst_fixed_pt(basedir, ('es2012c', tool_es2015PRE_notemp, 'es2015PRE'),
- names=('es2012c', 'es2015_no_temp', 'es2015PRE'),
- labels=('es2012c', '$\oplus$ 7/8 diff $\oplus$ 34/68 diff', '$\oplus$ LAr temperature'))
+ compare_all_syst_fixed_pt(
+ basedir,
+ ("es2012c", tool_es2015PRE_notemp, "es2015PRE"),
+ names=("es2012c", "es2015_no_temp", "es2015PRE"),
+ labels=("es2012c", r"$\oplus$ 7/8 diff $\oplus$ 34/68 diff", r"$\oplus$ LAr temperature"),
+ )
- if args.action == 'sys_eta_slices' or args.action == 'all':
+ if args.action == "sys_eta_slices" or args.action == "all":
if not args.eta_bins:
- eta_bins = ((0., 0.6), (0.6, 1.45), (1.52, 1.7), (1.7, 1.9), (1.9, 2.5), (1.4, 1.6))
- log.warning('no eta-binning specified using %s', eta_bins)
+ eta_bins = ((0.0, 0.6), (0.6, 1.45), (1.52, 1.7), (1.7, 1.9), (1.9, 2.5), (1.4, 1.6))
+ log.warning("no eta-binning specified using %s", eta_bins)
else:
eta_bins = list(pairwise(args.eta_bins))
- log.info('eta-bin: %s', eta_bins)
- for ptype in 'electron', 'unconverted', 'converted':
- log.debug("plot all sys FULL_ETACORRELATED_v1 eta slice %s" % ptype)
- plot_all_syst_eta_slice(eta_bins, supersampling_eta=args.super_sampling_eta, esmodel=args.esmodels[0],
- decorrelation='FULL_ETACORRELATED_v1', ptype=ptype, basedir=basedir,
- beautify_sysnames=args.beautify_sysnames, sys_order=args.sys_order,
- superimpose_all=args.superimpose_all, skip_null_sys=args.skip_null_sys,
- max_sys=args.max_sys_value, min_sys=args.min_sys_value,
- debug=args.debug,
- only_up=not args.add_down, symmetrize_labels=args.symmetrize_labels,
- legend_outside=args.legend_outside, pts=args.pt_bins, log_x=args.log_x, plot_qsum=args.plot_qsum, abs_sys=args.abs_sys, atlas_label=args.atlas_label)
-
- if args.action == 'material' or args.action == 'all':
- if not os.path.exists('material'):
- os.makedirs('material')
- etabins = ((0., 0.6), (0.6, 1.45), (1.52, 1.7), (1.7, 1.9), (1.9, 2.5))
- for ptype in 'electron', 'unconverted', 'converted':
- plot_all_syst_eta_slice(etabins, supersampling_eta=args.super_sampling_eta, esmodel=args.esmodels[0],
- decorrelation='FULL_ETACORRELATED_v1', ptype=ptype, basedir="material",
- only_material=True, beautify_sysnames=args.beautify_sysnames,
- sys_order=args.sys_order,
- skip_null_sys=args.skip_null_sys,
- max_sys=args.max_sys_value, min_sys=args.min_sys_value,
- debug=args.debug, only_up=not args.add_down,
- legend_outside=args.legend_outside, symmetrize_labels=args.symmetrize_labels, log_x=args.log_x, plot_qsum=args.plot_qsum, abs_sys=args.abs_sys, atlas_label=args.atlas_label)
-
- if args.action == 'all_sys' or args.action == 'all':
+ log.info("eta-bin: %s", eta_bins)
+ for ptype in "electron", "unconverted", "converted":
+ log.debug("plot all sys FULL_ETACORRELATED_v1 eta slice %s", ptype)
+ plot_all_syst_eta_slice(
+ eta_bins,
+ supersampling_eta=args.super_sampling_eta,
+ esmodel=args.esmodels[0],
+ decorrelation="FULL_ETACORRELATED_v1",
+ ptype=ptype,
+ basedir=basedir,
+ beautify_sysnames=args.beautify_sysnames,
+ sys_order=args.sys_order,
+ superimpose_all=args.superimpose_all,
+ skip_null_sys=args.skip_null_sys,
+ max_sys=args.max_sys_value,
+ min_sys=args.min_sys_value,
+ debug=args.debug,
+ only_up=not args.add_down,
+ symmetrize_labels=args.symmetrize_labels,
+ legend_outside=args.legend_outside,
+ pts=args.pt_bins,
+ log_x=args.log_x,
+ plot_qsum=args.plot_qsum,
+ abs_sys=args.abs_sys,
+ atlas_label=args.atlas_label,
+ )
+
+ if args.action == "material" or args.action == "all":
+ if not os.path.exists("material"):
+ os.makedirs("material")
+ etabins = ((0.0, 0.6), (0.6, 1.45), (1.52, 1.7), (1.7, 1.9), (1.9, 2.5))
+ for ptype in "electron", "unconverted", "converted":
+ plot_all_syst_eta_slice(
+ etabins,
+ supersampling_eta=args.super_sampling_eta,
+ esmodel=args.esmodels[0],
+ decorrelation="FULL_ETACORRELATED_v1",
+ ptype=ptype,
+ basedir="material",
+ only_material=True,
+ beautify_sysnames=args.beautify_sysnames,
+ sys_order=args.sys_order,
+ skip_null_sys=args.skip_null_sys,
+ max_sys=args.max_sys_value,
+ min_sys=args.min_sys_value,
+ debug=args.debug,
+ only_up=not args.add_down,
+ legend_outside=args.legend_outside,
+ symmetrize_labels=args.symmetrize_labels,
+ log_x=args.log_x,
+ plot_qsum=args.plot_qsum,
+ abs_sys=args.abs_sys,
+ atlas_label=args.atlas_label,
+ )
+
+ if args.action == "all_sys" or args.action == "all":
for esmodel in args.esmodels:
for ptype in args.particles:
- log.info("plotting sys for %s %s" % (ptype, esmodel))
- plot_all_syst_eta_pt(esmodel=esmodel, decorrelation=args.decorrelation,
- ptype=ptype, basedir=basedir,
- eta_range=args.eta_bins, pt_range=args.pt_bins, log_pt=args.log_pt,
- abs_sys=args.abs_sys, sys_filters=args.sys_filters,
- min_value=args.min_sys_value, max_value=args.max_sys_value)
-
-
- if args.action == "resolution" or args.action == 'all':
+ log.info("plotting sys for %s %s", ptype, esmodel)
+ plot_all_syst_eta_pt(
+ esmodel=esmodel,
+ decorrelation=args.decorrelation,
+ ptype=ptype,
+ basedir=basedir,
+ eta_range=args.eta_bins,
+ pt_range=args.pt_bins,
+ log_pt=args.log_pt,
+ abs_sys=args.abs_sys,
+ sys_filters=args.sys_filters,
+ min_value=args.min_sys_value,
+ max_value=args.max_sys_value,
+ )
+
+ if args.action == "resolution" or args.action == "all":
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
- tool.setProperty("ESModel", 'es2015PRE')
+ tool.setProperty("ESModel", "es2015PRE")
tool.initialize()
pts = np.logspace(3.2, 6, 50)
etas = np.linspace(-2.49, 2.49, 100)
- plot_resolution_eta_pt(basedir, tool, pts, etas, 'electron', title="resolution electron es2015PRE")
- plot_resolution_eta_pt(basedir, tool, pts, etas, 'converted', title="resolution converted es2015PRE")
- plot_resolution_eta_pt(basedir, tool, pts, etas, 'unconverted', title="resolution unconverted es2015PRE")
+ plot_resolution_eta_pt(
+ basedir, tool, pts, etas, "electron", title="resolution electron es2015PRE"
+ )
+ plot_resolution_eta_pt(
+ basedir, tool, pts, etas, "converted", title="resolution converted es2015PRE"
+ )
+ plot_resolution_eta_pt(
+ basedir, tool, pts, etas, "unconverted", title="resolution unconverted es2015PRE"
+ )
+
+
+if __name__ == "__main__":
-if __name__ == '__main__':
class TqdmLoggingHandler(logging.Handler):
- def __init__ (self, level = logging.NOTSET):
- super (self.__class__, self).__init__ (level)
+ def __init__(self, level=logging.NOTSET):
+ super(self.__class__, self).__init__(level)
- def emit (self, record):
+ def emit(self, record):
try:
- msg = self.format (record)
- tqdm.tqdm.write (msg)
- self.flush ()
+ msg = self.format(record)
+ tqdm.tqdm.write(msg)
+ self.flush()
except (KeyboardInterrupt, SystemExit):
raise
- except:
+ except Exception:
self.handleError(record)
-
log = logging.getLogger(__name__)
log.setLevel(logging.INFO)
handler = TqdmLoggingHandler()
- handler.setFormatter(colorlog.ColoredFormatter('%(log_color)s %(name)-23s %(levelname)-7s %(message)s',
- log_colors={
- 'DEBUG': 'cyan',
- 'INFO': 'blue',
- 'SUCCESS:': 'green',
- 'WARNING': 'yellow',
- 'ERROR': 'red',
- 'CRITICAL': 'red,bg_white'},))
+ handler.setFormatter(
+ colorlog.ColoredFormatter(
+ "%(log_color)s %(name)-23s %(levelname)-7s %(message)s",
+ log_colors={
+ "DEBUG": "cyan",
+ "INFO": "blue",
+ "SUCCESS:": "green",
+ "WARNING": "yellow",
+ "ERROR": "red",
+ "CRITICAL": "red,bg_white",
+ },
+ )
+ )
log.addHandler(handler)
- log.info("importing framework packages")
- ROOT.gROOT.ProcessLine(".x $ROOTCOREDIR/scripts/load_packages.C")
main()
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/run_xAOD_ElectronPhotonFourMomentumCorrection.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/run_xAOD_ElectronPhotonFourMomentumCorrection.py
index 6a847f6627a54e0811054a888830f98375cc0664..b8ec3bc45f38103fe3ecc01d72749fa5d808900e 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/run_xAOD_ElectronPhotonFourMomentumCorrection.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/python/run_xAOD_ElectronPhotonFourMomentumCorrection.py
@@ -37,12 +37,12 @@ def xAOD_particle_generator(tree, collection_getter, newevent_function=None, end
elif type(event_numbers) is int:
event_numbers = [event_numbers]
- for ievent in xrange(tree.GetEntries()):
+ for ievent in range(tree.GetEntries()):
tree.GetEntry(ievent)
ei = tree.EventInfo
event_number = ei.eventNumber()
if event_numbers:
- if not event_number in event_numbers:
+ if event_number not in event_numbers:
continue
logging.debug("=== event number %d ievent = %d", event_number, ievent)
if newevent_function is not None:
@@ -50,7 +50,7 @@ def xAOD_particle_generator(tree, collection_getter, newevent_function=None, end
collection = collection_getter(tree)
- for i in xrange(collection.size()):
+ for i in range(collection.size()):
p = collection.at(i)
if min_pt is not None and p.pt() < min_pt:
continue
@@ -93,7 +93,7 @@ def main(filename, **args):
f.Print()
return
- logging.info("input has %d entries" % tree.GetEntries())
+ logging.info("input has %d entries", tree.GetEntries())
logging.debug("initializing tool")
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
@@ -168,7 +168,6 @@ def main(filename, **args):
fout.Close()
if __name__ == '__main__':
- ROOT.gROOT.ProcessLine(".x $ROOTCOREDIR/scripts/load_packages.C")
import argparse
parser = argparse.ArgumentParser(description='Run on xAOD and dump calibrated energy for electron and photons',
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test.py
index ce598840a5fd4716323e1ba1d07406cbe4694a51..7d51513b54e2dd9c70ce1910b5e8639e9c19d5ba 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test.py
@@ -10,6 +10,7 @@ import random
RUN2016 = 297730l
RUN2015 = 252604l
+
def arange(xmin, xmax, delta):
# just to don't inject dep from numpy
result = []
@@ -35,7 +36,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
def setUpClass(cls):
cls.event = ROOT.xAOD.TEvent()
cls.factory = ROOT.EgammaFactory()
- cls.tool_es2012c = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2012c")
+ cls.tool_es2012c = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2012c")
def test_initialization(self):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
@@ -48,14 +50,19 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
self.assertTrue(tool.setProperty("ESModel", "es2010").isSuccess())
self.assertTrue(tool.initialize().isSuccess())
- def generator_kinematics(self, eta_range=None, e_range=None, phi_range=None):
+ def generator_kinematics(self, eta_range=None,
+ e_range=None,
+ phi_range=None):
eta_range = eta_range or arange(-2.49, 2.49, 0.05)
e_range = e_range or arange(5E3, 1000E3, 100E3)
phi_range = phi_range or [0.]
from itertools import product
return product(e_range, eta_range, phi_range)
- def generator_photon(self, eta_range=None, e_range=None, phi_range=None):
+ def generator_photon(self,
+ eta_range=None,
+ e_range=None,
+ phi_range=None):
random.seed(10)
factory = self.factory
for e, eta, phi in self.generator_kinematics(eta_range, e_range, phi_range):
@@ -66,21 +73,34 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
yield factory.create_unconverted_photon(eta, phi, e)
factory.clear()
- def generator_converted(self, eta_range=None, e_range=None, phi_range=None):
+ def generator_converted(self, eta_range=None,
+ e_range=None,
+ phi_range=None):
factory = self.factory
- for e, eta, phi in self.generator_kinematics(eta_range, e_range, phi_range):
+ for e, eta, phi in self.generator_kinematics(eta_range,
+ e_range,
+ phi_range):
yield factory.create_converted_photon(eta, phi, e)
factory.clear()
- def generator_unconverted(self, eta_range=None, e_range=None, phi_range=None):
+ def generator_unconverted(self, eta_range=None,
+ e_range=None,
+ phi_range=None):
factory = self.factory
- for e, eta, phi in self.generator_kinematics(eta_range, e_range, phi_range):
+ for e, eta, phi in self.generator_kinematics(eta_range,
+ e_range,
+ phi_range):
yield factory.create_unconverted_photon(eta, phi, e)
factory.clear()
- def generator_electron(self, eta_range=None, e_range=None, phi_range=None):
+ def generator_electron(self,
+ eta_range=None,
+ e_range=None,
+ phi_range=None):
factory = self.factory
- for e, eta, phi in self.generator_kinematics(eta_range, e_range, phi_range):
+ for e, eta, phi in self.generator_kinematics(eta_range,
+ e_range,
+ phi_range):
yield factory.create_electron(eta, phi, e)
factory.clear()
@@ -96,7 +116,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
"""
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
self.assertTrue(tool.setProperty("ESModel", "es2012c").isSuccess())
- self.assertTrue(tool.setProperty("int")("randomRunNumber", RUN2015).isSuccess())
+ self.assertTrue(tool.setProperty("int")(
+ "randomRunNumber", RUN2015).isSuccess())
self.assertTrue(tool.setProperty("int")("doSmearing", 0).isSuccess())
tool.msg().setLevel(ROOT.MSG.WARNING)
@@ -118,7 +139,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_2015PRE")
self.assertTrue(tool.setProperty("ESModel", "es2015PRE").isSuccess())
self.assertTrue(tool.setProperty("int")("doSmearing", 0).isSuccess())
- self.assertTrue(tool.setProperty("decorrelationModel", "1NP_v1"). isSuccess())
+ self.assertTrue(tool.setProperty(
+ "decorrelationModel", "1NP_v1"). isSuccess())
tool.msg().setLevel(ROOT.MSG.WARNING)
self.assertTrue(tool.initialize().isSuccess())
ei = self.factory.create_eventinfo(True, 100000) # simulation
@@ -141,12 +163,15 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
ei = self.factory.create_eventinfo(True, 100000) # simulation
for el in self.generator_electron():
e_before = el.e()
- e_cluster = el.caloCluster().energyBE(0) + el.caloCluster().energyBE(1) + el.caloCluster().energyBE(2) + el.caloCluster().energyBE(3)
+ e_cluster = el.caloCluster().energyBE(0) + el.caloCluster().energyBE(1) + \
+ el.caloCluster().energyBE(2) + el.caloCluster().energyBE(3)
tool.applyCorrection(el, ei)
e_after = el.e()
if e_before > 7E3:
self.assertTrue(abs(e_before / e_after - 1) < 0.5,
- msg="energy cluser/calibrated very different at eta = %f: %f/%f, e0=%.2f, e1=%.2f, e2=%.2f, e3=%.2f" % (el.eta(), e_cluster, e_after, el.caloCluster().energyBE(0), el.caloCluster().energyBE(1), el.caloCluster().energyBE(2), el.caloCluster().energyBE(3)))
+ msg="energy cluser/calibrated very different at eta = %f: %f/%f, e0=%.2f, e1=%.2f, e2=%.2f, e3=%.2f" % (el.eta(),
+ e_cluster, e_after, el.caloCluster().energyBE(0), el.caloCluster().energyBE(1),
+ el.caloCluster().energyBE(2), el.caloCluster().energyBE(3)))
self.assertGreater(e_after, 0)
def test_es2012XX(self):
@@ -264,11 +289,14 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
import random
import csv
with open("testmva_%s_%s_%s.csv" % (esmodel, particle, "data" if isdata else "fullsim"), 'wb') as csvfile:
- spamwriter = csv.writer(csvfile, delimiter=' ', quotechar='|', quoting=csv.QUOTE_MINIMAL)
+ spamwriter = csv.writer(
+ csvfile, delimiter=' ', quotechar='|', quoting=csv.QUOTE_MINIMAL)
if particle == "photon":
- spamwriter.writerow(('eta', 'phi', 'e0', 'e1', 'e2', 'e3', 'e', 'rconv', 'zconv', 'output'))
+ spamwriter.writerow(
+ ('eta', 'phi', 'e0', 'e1', 'e2', 'e3', 'e', 'rconv', 'zconv', 'output'))
elif particle == "electron":
- spamwriter.writerow(('eta', 'phi', 'e0', 'e1', 'e2', 'e3', 'e', 'output'))
+ spamwriter.writerow(
+ ('eta', 'phi', 'e0', 'e1', 'e2', 'e3', 'e', 'output'))
for eta in arange(-3.0, 3.0, 0.05):
phi = 0
@@ -321,11 +349,13 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
import os
basedir = os.path.dirname(os.path.abspath(__file__))
- filename = os.path.join(basedir, "testmva_%s_%s_%s.csv" % (esmodel, particle, "data" if isdata else "fullsim"))
+ filename = os.path.join(basedir, "testmva_%s_%s_%s.csv" % (
+ esmodel, particle, "data" if isdata else "fullsim"))
import csv
with open(filename, 'rb') as csvfile:
- reader = csv.reader(csvfile, delimiter=' ', quotechar='|', quoting=csv.QUOTE_MINIMAL)
+ reader = csv.reader(csvfile, delimiter=' ',
+ quotechar='|', quoting=csv.QUOTE_MINIMAL)
next(reader, None) # skip header
for row in reader:
args = map(float, row[:-1])
@@ -333,7 +363,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
'photon': self.factory.create_photon}[particle](*args)
tool.applyCorrection(p, ei)
calibrated_energy = p.e()
- self.assertAlmostEqual(calibrated_energy, float(row[-1]), delta=0.1)
+ self.assertAlmostEqual(
+ calibrated_energy, float(row[-1]), delta=0.1)
self.factory.clear()
def test_list_syst(self):
@@ -347,56 +378,84 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
"""
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
tool.msg().setLevel(ROOT.MSG.WARNING)
- self.assertTrue(tool.setProperty("int")("useMVACalibration", 0).isSuccess())
+ self.assertTrue(tool.setProperty("int")(
+ "useMVACalibration", 0).isSuccess())
self.assertTrue(tool.setProperty("ESModel", model).isSuccess())
if decorrelation is not None:
- self.assertTrue(tool.setProperty("decorrelationModel", decorrelation).isSuccess())
+ self.assertTrue(tool.setProperty(
+ "decorrelationModel", decorrelation).isSuccess())
if decorrelation_scale is not None:
- self.assertTrue(tool.setProperty("decorrelationModelScale", decorrelation_scale).isSuccess())
+ self.assertTrue(tool.setProperty(
+ "decorrelationModelScale", decorrelation_scale).isSuccess())
if decorrelation_resolution is not None:
- self.assertTrue(tool.setProperty("decorrelationModelResolution", decorrelation_resolution).isSuccess())
+ self.assertTrue(tool.setProperty(
+ "decorrelationModelResolution", decorrelation_resolution).isSuccess())
tool.msg().setLevel(ROOT.MSG.WARNING)
if success:
- self.assertTrue(tool.initialize().isSuccess(), msg='cannot initialize tool with %s' % model)
+ self.assertTrue(tool.initialize().isSuccess(),
+ msg='cannot initialize tool with %s' % model)
else:
- self.assertFalse(tool.initialize().isSuccess(), msg='should not possible to initialize tool with %s' % model)
+ self.assertFalse(tool.initialize().isSuccess(
+ ), msg='should not possible to initialize tool with %s' % model)
return
sys_list = get_names_sys(tool)
if type(allsyst) is int:
- self.assertEqual(len(sys_list), allsyst, msg='actual (expected) number of sys %d(%d): %s' % (len(sys_list), allsyst, sys_list))
+ self.assertEqual(len(sys_list), allsyst, msg='actual (expected) number of sys %d(%d): %s' % (
+ len(sys_list), allsyst, sys_list))
else:
self.assertItemsEqual(sys_list, allsyst)
return sys_list
-
list_1NP_scale = ['EG_SCALE_ALL__1down', 'EG_SCALE_ALL__1up']
- list_1NP_resolution = ['EG_RESOLUTION_ALL__1down', 'EG_RESOLUTION_ALL__1up']
- list_FULL_resolution = ['EG_RESOLUTION_MATERIALCALO__1down', 'EG_RESOLUTION_MATERIALCALO__1up',
- 'EG_RESOLUTION_MATERIALCRYO__1down', 'EG_RESOLUTION_MATERIALCRYO__1up',
- 'EG_RESOLUTION_MATERIALGAP__1down', 'EG_RESOLUTION_MATERIALGAP__1up',
- 'EG_RESOLUTION_MATERIALID__1down', 'EG_RESOLUTION_MATERIALID__1up',
- 'EG_RESOLUTION_PILEUP__1down', 'EG_RESOLUTION_PILEUP__1up',
- 'EG_RESOLUTION_SAMPLINGTERM__1down', 'EG_RESOLUTION_SAMPLINGTERM__1up',
- 'EG_RESOLUTION_ZSMEARING__1down', 'EG_RESOLUTION_ZSMEARING__1up']
- list_1NPCOR_PLUS_UNCOR_scale = ['EG_SCALE_ALLCORR__1down', 'EG_SCALE_ALLCORR__1up',
- 'EG_SCALE_E4SCINTILLATOR__1down', 'EG_SCALE_E4SCINTILLATOR__1up',
- 'EG_SCALE_LARCALIB_EXTRA2015PRE__1down', 'EG_SCALE_LARCALIB_EXTRA2015PRE__1up',
- 'EG_SCALE_LARTEMPERATURE_EXTRA2015PRE__1down', 'EG_SCALE_LARTEMPERATURE_EXTRA2015PRE__1up',
- 'EG_SCALE_LARTEMPERATURE_EXTRA2016PRE__1down', 'EG_SCALE_LARTEMPERATURE_EXTRA2016PRE__1up']
- _test_list_syst("es2015PRE", "1NP_v1", None, None, list_1NP_scale + list_1NP_resolution)
- _test_list_syst("es2012c", "1NP_v1", None, None, list_1NP_scale + list_1NP_resolution)
- _test_list_syst("es2016PRE", None, "1NP_v1", "1NP_v1", list_1NP_scale + list_1NP_resolution)
- _test_list_syst("es2016PRE", None, "1NP_v1", "FULL_v1", list_1NP_scale + list_FULL_resolution)
- _test_list_syst("es2015PRE", "1NPCOR_PLUS_UNCOR", None, None, list_1NP_resolution + list_1NPCOR_PLUS_UNCOR_scale)
- _test_list_syst("es2015PRE", "1NP_v1", "1NPCOR_PLUS_UNCOR", None, list_1NP_resolution + list_1NPCOR_PLUS_UNCOR_scale)
- _test_list_syst("es2015c_summer", "1NP_v1", None, None, list_1NP_scale + list_1NP_resolution)
+ list_1NP_resolution = [
+ 'EG_RESOLUTION_ALL__1down', 'EG_RESOLUTION_ALL__1up']
+ list_FULL_resolution = ['EG_RESOLUTION_MATERIALCALO__1down',
+ 'EG_RESOLUTION_MATERIALCALO__1up',
+ 'EG_RESOLUTION_MATERIALCRYO__1down',
+ 'EG_RESOLUTION_MATERIALCRYO__1up',
+ 'EG_RESOLUTION_MATERIALGAP__1down',
+ 'EG_RESOLUTION_MATERIALGAP__1up',
+ 'EG_RESOLUTION_MATERIALID__1down',
+ 'EG_RESOLUTION_MATERIALID__1up',
+ 'EG_RESOLUTION_PILEUP__1down',
+ 'EG_RESOLUTION_PILEUP__1up',
+ 'EG_RESOLUTION_SAMPLINGTERM__1down',
+ 'EG_RESOLUTION_SAMPLINGTERM__1up',
+ 'EG_RESOLUTION_ZSMEARING__1down',
+ 'EG_RESOLUTION_ZSMEARING__1up']
+ list_1NPCOR_PLUS_UNCOR_scale = ['EG_SCALE_ALLCORR__1down',
+ 'EG_SCALE_ALLCORR__1up',
+ 'EG_SCALE_E4SCINTILLATOR__1down',
+ 'EG_SCALE_E4SCINTILLATOR__1up',
+ 'EG_SCALE_LARCALIB_EXTRA2015PRE__1down',
+ 'EG_SCALE_LARCALIB_EXTRA2015PRE__1up',
+ 'EG_SCALE_LARTEMPERATURE_EXTRA2015PRE__1down',
+ 'EG_SCALE_LARTEMPERATURE_EXTRA2015PRE__1up',
+ 'EG_SCALE_LARTEMPERATURE_EXTRA2016PRE__1down',
+ 'EG_SCALE_LARTEMPERATURE_EXTRA2016PRE__1up']
+ _test_list_syst("es2015PRE", "1NP_v1", None, None,
+ list_1NP_scale + list_1NP_resolution)
+ _test_list_syst("es2012c", "1NP_v1", None, None,
+ list_1NP_scale + list_1NP_resolution)
+ _test_list_syst("es2016PRE", None, "1NP_v1", "1NP_v1",
+ list_1NP_scale + list_1NP_resolution)
+ _test_list_syst("es2016PRE", None, "1NP_v1", "FULL_v1",
+ list_1NP_scale + list_FULL_resolution)
+ _test_list_syst("es2015PRE", "1NPCOR_PLUS_UNCOR", None,
+ None, list_1NP_resolution + list_1NPCOR_PLUS_UNCOR_scale)
+ _test_list_syst("es2015PRE", "1NP_v1", "1NPCOR_PLUS_UNCOR",
+ None, list_1NP_resolution + list_1NPCOR_PLUS_UNCOR_scale)
+ _test_list_syst("es2015c_summer", "1NP_v1", None, None,
+ list_1NP_scale + list_1NP_resolution)
_test_list_syst("es2015PRE", "FULL_ETACORRELATED_v1", None, None, 58)
_test_list_syst("es2012c", "FULL_ETACORRELATED_v1", None, None, 54)
_test_list_syst("es2016PRE", "FULL_ETACORRELATED_v1", None, None, 62)
- _test_list_syst("es2015c_summer", "FULL_ETACORRELATED_v1", None, None, 60)
- _test_list_syst("es2016data_mc15c", "FULL_ETACORRELATED_v1", None, None, 68)
+ _test_list_syst("es2015c_summer",
+ "FULL_ETACORRELATED_v1", None, None, 60)
+ _test_list_syst("es2016data_mc15c",
+ "FULL_ETACORRELATED_v1", None, None, 68)
_test_list_syst("es2012c", "FULL_v1", None, None, 148)
_test_list_syst("es2012c", None, "FULL_v1", "FULL_v1", 148)
_test_list_syst("es2015PRE", "FULL_v1", None, None, 158)
@@ -404,9 +463,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
_test_list_syst("es2015PRE", None, None, None, 158)
# these works, but generate FATALS, as expected
- _test_list_syst("es2016PRE", "1NP_v1", "1NP_v1", "1NP_v1", [], success=False)
-
-
+ _test_list_syst("es2016PRE", "1NP_v1", "1NP_v1",
+ "1NP_v1", [], success=False)
def test_same_smearing(self):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
@@ -462,7 +520,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
tool.applySystematicVariation(sys_set).ignore()
e_zee_syst = tool.getEnergy(ph, ei)
sys_set = ROOT.CP.SystematicSet()
- sys_set.insert(ROOT.CP.SystematicVariation("EG_SCALE_LARCALIB__ETABIN0", 1.))
+ sys_set.insert(ROOT.CP.SystematicVariation(
+ "EG_SCALE_LARCALIB__ETABIN0", 1.))
tool.applySystematicVariation(sys_set).ignore()
e_larcalib__bin0 = tool.getEnergy(ph, ei)
if abs(ph.eta()) < 2.47:
@@ -478,9 +537,11 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
def test_intermodule_correction_working(self):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool")
self.assertTrue(tool.setProperty("ESModel", "es2012c").isSuccess())
- tool_no_correction = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_no_correction")
+ tool_no_correction = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_no_correction")
tool_no_correction.setProperty("ESModel", "es2012c").ignore()
- tool_no_correction.setProperty("int")("useIntermoduleCorrection", 0).ignore()
+ tool_no_correction.setProperty("int")(
+ "useIntermoduleCorrection", 0).ignore()
self.assertTrue(tool.initialize().isSuccess())
self.assertTrue(tool_no_correction.initialize().isSuccess())
@@ -493,7 +554,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
energy.append(tool.getEnergy(ph, ei))
energy_no_correction.append(tool_no_correction.getEnergy(ph, ei))
- self.assertFalse(all([x == y for x, y in zip(energy, energy_no_correction)]))
+ self.assertFalse(
+ all([x == y for x, y in zip(energy, energy_no_correction)]))
def test_idempotence(self):
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE")
@@ -516,23 +578,26 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
def test_1NP_vs_FULL_es2017(self):
""" check that the 1NP model is the squared sum of the single systematics """
- tool_1NP = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2016data_mc15c_1NP")
+ tool_1NP = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2016data_mc15c_1NP")
tool_1NP.setProperty("ESModel", "es2016data_mc15c").ignore()
tool_1NP.setProperty("decorrelationModel", "1NP_v1").ignore()
tool_1NP.setProperty("int")("randomRunNumber", RUN2015).ignore()
- #tool_1NP.setProperty("int")("doSmearing", 0).ignore() # remove
- #tool_1NP.msg().setLevel(ROOT.MSG.DEBUG)
+ # tool_1NP.setProperty("int")("doSmearing", 0).ignore() # remove
+ # tool_1NP.msg().setLevel(ROOT.MSG.DEBUG)
tool_1NP.initialize().ignore()
- tool_FULL = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2016data_mc15c_FULL")
+ tool_FULL = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2016data_mc15c_FULL")
tool_FULL.setProperty("ESModel", "es2016data_mc15c").ignore()
tool_FULL.setProperty("int")("randomRunNumber", RUN2015).ignore()
# use ETACORRELATED to compare. FULL_v1 will differ (very small difference) since by default
# FULL_v1 divide the ZEESTAT by the sqrt(#bins)
- tool_FULL.setProperty("decorrelationModel", "FULL_ETACORRELATED_v1").ignore()
- #tool_FULL.setProperty("int")("doSmearing", 0).ignore() # remove
- #tool_FULL.msg().setLevel(ROOT.MSG.DEBUG)
+ tool_FULL.setProperty("decorrelationModel",
+ "FULL_ETACORRELATED_v1").ignore()
+ # tool_FULL.setProperty("int")("doSmearing", 0).ignore() # remove
+ # tool_FULL.msg().setLevel(ROOT.MSG.DEBUG)
tool_FULL.initialize().ignore()
ei = self.factory.create_eventinfo(True, 100000) # MC
@@ -550,9 +615,11 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
all_syst_FULL = tool_FULL.recommendedSystematics()
all_syst_1NP = tool_1NP.recommendedSystematics()
- self.assertTrue('EG_SCALE_ALL__1up' in [s.name() for s in list(all_syst_1NP)])
+ self.assertTrue('EG_SCALE_ALL__1up' in [
+ s.name() for s in list(all_syst_1NP)])
- all_syst_FULL_scale_up = [s for s in all_syst_FULL if ('SCALE' in s.name() and '__1up' in s.name())]
+ all_syst_FULL_scale_up = [s for s in all_syst_FULL if (
+ 'SCALE' in s.name() and '__1up' in s.name())]
all_biases = []
for sys in all_syst_FULL_scale_up:
@@ -561,12 +628,11 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
tool_FULL.applySystematicVariation(sys_set).ignore()
e = tool_FULL.getEnergy(particle, ei)
bias = e - e_full
- #print "{:<40} {:10.5f} {:10.5f}".format(sys.name(), e, bias)
+ # print "{:<40} {:10.5f} {:10.5f}".format(sys.name(), e, bias)
all_biases.append(bias)
sum_quadrature = math.sqrt(sum([b * b for b in all_biases]))
- #print "bias sum quadrature: ", sum_quadrature
-
+ # print "bias sum quadrature: ", sum_quadrature
bias_up, bias_down = None, None
for sys in all_syst_1NP:
@@ -581,12 +647,13 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
bias_up = bias
elif sys.name() == 'EG_SCALE_ALL__1down':
bias_down = bias
- #print sys.name() + "\t" + str(bias)
-
+ # print sys.name() + "\t" + str(bias)
- self.assertAlmostEqual(sum_quadrature, bias_up, delta=1, msg="sum of errors not equal to 1NP (up) %.7f!=%.7f" % (sum_quadrature, bias_up))
+ self.assertAlmostEqual(sum_quadrature, bias_up, delta=1,
+ msg="sum of errors not equal to 1NP (up) %.7f!=%.7f" % (sum_quadrature, bias_up))
# TODO: check why fails
- #self.assertAlmostEqual(sum_quadrature, -bias_down, delta=1, msg="sum of errors not equal to 1NP (down) %.7f!=%.7f" % (sum_quadrature, bias_down))
+ # self.assertAlmostEqual(sum_quadrature, -bias_down, delta=1,
+ # msg="sum of errors not equal to 1NP (down) %.7f!=%.7f" % (sum_quadrature, bias_down))
def test_1NP_100GeV_electron_es2015PRE(self):
"""
@@ -595,7 +662,8 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
"""
tool = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE")
self.assertTrue(tool.setProperty("ESModel", "es2015PRE").isSuccess())
- self.assertTrue(tool.setProperty("decorrelationModel", "1NP_v1").isSuccess())
+ self.assertTrue(tool.setProperty(
+ "decorrelationModel", "1NP_v1").isSuccess())
tool.msg().setLevel(ROOT.MSG.WARNING)
tool.initialize().ignore()
ei = self.factory.create_eventinfo(False, 100000) # data
@@ -632,13 +700,15 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
check that es2015cPRE == es2015PRE for electron except for crack region [1.4-1.6]
check that es2015cPRE == es2015PRE for photons
"""
- tool_es2015PRE = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015PRE")
+ tool_es2015PRE = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2015PRE")
tool_es2015PRE.setProperty("ESModel", "es2015PRE").ignore()
tool_es2015PRE.setProperty("decorrelationModel", "1NP_v1").ignore()
tool_es2015PRE.setProperty("int")("doSmearing", 0).ignore()
tool_es2015PRE.initialize().ignore()
- tool_es2015cPRE = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015cPRE")
+ tool_es2015cPRE = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2015cPRE")
tool_es2015cPRE.setProperty("ESModel", "es2015cPRE").ignore()
tool_es2015cPRE.setProperty("decorrelationModel", "1NP_v1").ignore()
tool_es2015cPRE.setProperty("int")("doSmearing", 0).ignore()
@@ -651,7 +721,7 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
e_es2015PRE = tool_es2015PRE.getEnergy(el, ei)
e_es2015cPRE = tool_es2015cPRE.getEnergy(el, ei)
- #print el.eta(), el.e(), e_es2015PRE, e_es2015cPRE
+ # print el.eta(), el.e(), e_es2015PRE, e_es2015cPRE
if 1.4 < abs(el.eta()) < 1.6:
self.assertNotAlmostEqual(e_es2015PRE, e_es2015cPRE)
else:
@@ -670,16 +740,20 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
check that es2015c_summer == es2015cPRE for electrons
!= for photons
"""
- tool_es2015c_summer = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015c_summer")
+ tool_es2015c_summer = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2015c_summer")
tool_es2015c_summer.setProperty("ESModel", "es2015c_summer").ignore()
- tool_es2015c_summer.setProperty("decorrelationModel", "1NPCOR_PLUS_UNCOR").ignore()
+ tool_es2015c_summer.setProperty(
+ "decorrelationModel", "1NPCOR_PLUS_UNCOR").ignore()
tool_es2015c_summer.setProperty("int")("doSmearing", 0).ignore()
tool_es2015c_summer.msg().setLevel(ROOT.MSG.WARNING)
tool_es2015c_summer.initialize().ignore()
- tool_es2015cPRE = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015cPRE")
+ tool_es2015cPRE = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2015cPRE")
tool_es2015cPRE.setProperty("ESModel", "es2015cPRE").ignore()
- tool_es2015cPRE.setProperty("decorrelationModel", "1NPCOR_PLUS_UNCOR").ignore()
+ tool_es2015cPRE.setProperty(
+ "decorrelationModel", "1NPCOR_PLUS_UNCOR").ignore()
tool_es2015cPRE.setProperty("int")("doSmearing", 0).ignore()
tool_es2015cPRE.msg().setLevel(ROOT.MSG.WARNING)
tool_es2015cPRE.initialize().ignore()
@@ -701,15 +775,18 @@ class TestEgammaCalibrationAndSmearingTool(unittest.TestCase):
e_es2015cPRE = tool_es2015cPRE.getEnergy(ph, ei)
self.assertGreater(e_es2015cPRE, 0)
self.assertNotAlmostEqual(e_es2015c_summer, e_es2015cPRE,
- msg="e_es2015c_summer == e_es2015cPRE == %.2f at eta=%.2f for photons" % (e_es2015c_summer, ph.eta()))
+ msg="e_es2015c_summer == e_es2015cPRE == %.2f at eta=%.2f for photons" % (e_es2015c_summer,
+ ph.eta()))
def test_es2015c_summer_data(self):
"""
check that energy > 0
"""
- tool_es2015c_summer = ROOT.CP.EgammaCalibrationAndSmearingTool("tool_es2015c_summer")
+ tool_es2015c_summer = ROOT.CP.EgammaCalibrationAndSmearingTool(
+ "tool_es2015c_summer")
tool_es2015c_summer.setProperty("ESModel", "es2015c_summer").ignore()
- tool_es2015c_summer.setProperty("decorrelationModel", "1NPCOR_PLUS_UNCOR").ignore()
+ tool_es2015c_summer.setProperty(
+ "decorrelationModel", "1NPCOR_PLUS_UNCOR").ignore()
tool_es2015c_summer.msg().setLevel(ROOT.MSG.WARNING)
tool_es2015c_summer.initialize().ignore()
@@ -728,5 +805,5 @@ if __name__ == '__main__':
ROOT.gROOT.ProcessLine(".x $ROOTCOREDIR/scripts/load_packages.C")
# from ROOT import EgammaCalibPeriodRunNumbersExample
- #ROOT.xAOD.TReturnCode.enableFailure()
+ # ROOT.xAOD.TReturnCode.enableFailure()
unittest.main()
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_factory.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_factory.py
index ff2ae3998b8014c9efb8f7405a883bd8e030e215..644e69fe4f8ce8419ddff62f334f96649fc683cc 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_factory.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_factory.py
@@ -8,7 +8,7 @@ import unittest
class TestEgammaFactory(unittest.TestCase):
def test_eventinfo(self):
- event = ROOT.xAOD.TEvent()
+ ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
ei1 = factory.create_eventinfo(True, 100000)
self.assertTrue(ei1.eventType(ROOT.xAOD.EventInfo.IS_SIMULATION))
@@ -16,7 +16,7 @@ class TestEgammaFactory(unittest.TestCase):
self.assertFalse(ei2.eventType(ROOT.xAOD.EventInfo.IS_SIMULATION))
def test_unconverted(self):
- event = ROOT.xAOD.TEvent()
+ ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
runnumber = 10000
@@ -32,11 +32,13 @@ class TestEgammaFactory(unittest.TestCase):
self.assertAlmostEqual(ph.caloCluster().eta(), eta)
self.assertAlmostEqual(ph.phi(), phi)
self.assertAlmostEqual(ph.caloCluster().phi(), phi)
- self.assertAlmostEqual(ph.caloCluster().auxdata("float")("etaCalo"), eta)
- self.assertAlmostEqual(ph.caloCluster().auxdata("float")("phiCalo"), phi)
+ self.assertAlmostEqual(
+ ph.caloCluster().auxdata("float")("etaCalo"), eta)
+ self.assertAlmostEqual(
+ ph.caloCluster().auxdata("float")("phiCalo"), phi)
self.assertAlmostEqual(ph.e(), e, delta=0.01)
self.assertEqual(ph.caloCluster().e(), e)
- for i in xrange(3):
+ for i in range(3):
self.assertGreater(ph.caloCluster().energyBE(i), 0)
def test_converted(self):
@@ -56,15 +58,17 @@ class TestEgammaFactory(unittest.TestCase):
self.assertAlmostEqual(ph.caloCluster().eta(), eta)
self.assertAlmostEqual(ph.phi(), phi)
self.assertAlmostEqual(ph.caloCluster().phi(), phi)
- self.assertAlmostEqual(ph.caloCluster().auxdata("float")("etaCalo"), eta)
- self.assertAlmostEqual(ph.caloCluster().auxdata("float")("phiCalo"), phi)
+ self.assertAlmostEqual(
+ ph.caloCluster().auxdata("float")("etaCalo"), eta)
+ self.assertAlmostEqual(
+ ph.caloCluster().auxdata("float")("phiCalo"), phi)
self.assertAlmostEqual(ph.e(), e, delta=0.01)
self.assertEqual(ph.caloCluster().e(), e)
- for i in xrange(3):
+ for i in range(3):
self.assertGreater(ph.caloCluster().energyBE(i), 0)
def test_photon(self):
- event = ROOT.xAOD.TEvent()
+ ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
runnumber = 10000
@@ -89,8 +93,10 @@ class TestEgammaFactory(unittest.TestCase):
self.assertAlmostEqual(ph.caloCluster().eta(), eta)
self.assertAlmostEqual(ph.phi(), phi)
self.assertAlmostEqual(ph.caloCluster().phi(), phi)
- self.assertAlmostEqual(ph.caloCluster().auxdata("float")("etaCalo"), eta)
- self.assertAlmostEqual(ph.caloCluster().auxdata("float")("phiCalo"), phi)
+ self.assertAlmostEqual(
+ ph.caloCluster().auxdata("float")("etaCalo"), eta)
+ self.assertAlmostEqual(
+ ph.caloCluster().auxdata("float")("phiCalo"), phi)
self.assertAlmostEqual(ph.e(), e, delta=0.01)
self.assertEqual(ph.caloCluster().e(), e)
@@ -101,7 +107,7 @@ class TestEgammaFactory(unittest.TestCase):
tool.applyCorrection(ph, ei)
def test_electron(self):
- event = ROOT.xAOD.TEvent()
+ ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
runnumber = 10000
@@ -124,14 +130,16 @@ class TestEgammaFactory(unittest.TestCase):
self.assertAlmostEqual(el.caloCluster().eta(), eta)
self.assertAlmostEqual(el.phi(), phi)
self.assertAlmostEqual(el.caloCluster().phi(), phi)
- self.assertAlmostEqual(el.caloCluster().auxdata("float")("etaCalo"), eta)
- self.assertAlmostEqual(el.caloCluster().auxdata("float")("phiCalo"), phi)
+ self.assertAlmostEqual(
+ el.caloCluster().auxdata("float")("etaCalo"), eta)
+ self.assertAlmostEqual(
+ el.caloCluster().auxdata("float")("phiCalo"), phi)
self.assertAlmostEqual(el.e(), e, delta=0.01)
self.assertEqual(el.caloCluster().e(), e)
self.assertAlmostEqual(el.trackParticle().eta(), eta, delta=0.00001)
def test_clean(self):
- event = ROOT.xAOD.TEvent()
+ ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
runnumber = 10000
@@ -147,7 +155,7 @@ class TestEgammaFactory(unittest.TestCase):
self.assertAlmostEqual(el.eta(), 1)
def test_decoration(self):
- event = ROOT.xAOD.TEvent()
+ ROOT.xAOD.TEvent()
factory = ROOT.EgammaFactory()
runnumber = 10000
@@ -158,7 +166,6 @@ class TestEgammaFactory(unittest.TestCase):
el.auxdecor("double")("mydeco")
el.auxdataConst("double")("mydeco")
- #factory.clear()
el = factory.create_electron(1, 2, 3, 4, 5, 6, 7)
el.auxdataConst("double")("mydeco")
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_resolution.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_resolution.py
index b4a330f56aceeb8ef213a825043a182c0c7a807f..72b99d4cbf6ffdc8e8b839d3f65b3d2bbdcb2351 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_resolution.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/test/ut_test_resolution.py
@@ -31,16 +31,16 @@ class TestEgammaResolution(unittest.TestCase):
cls.factory = ROOT.EgammaFactory()
def loop_combination(self, eta_min=-2.5, eta_max=2.5, eta_step=0.05,
- energy_min=0, energy_max=200E3, energy_step=10E3,
- ptypes=(0, 1, 2, 3),
- resol_types=(0, 1, 2)):
+ energy_min=0, energy_max=200E3, energy_step=10E3,
+ ptypes=(0, 1, 2, 3),
+ resol_types=(0, 1, 2)):
for ptype in ptypes:
for resol_type in resol_types:
for eta in arange(eta_min, eta_max, eta_step):
for energy in arange(energy_min, energy_max, energy_step):
yield ptype, energy, eta, resol_type
- #@unittest.expectedFailure # return nan in the crack (1.37-1.52), inf at >= 2.4
+ # @unittest.expectedFailure # return nan in the crack (1.37-1.52), inf at >= 2.4
def test_resolution_positive(self):
for ptype, energy, eta, resol_type in self.loop_combination():
for tool in self.tool_run1, self.tool_run2:
@@ -49,7 +49,8 @@ class TestEgammaResolution(unittest.TestCase):
if ptype == 3:
continue
resolution = tool.getResolution(ptype, energy, eta, resol_type)
- self.assertFalse(math.isnan(resolution), msg="resolution is nan for eta=%f" % eta)
+ self.assertFalse(math.isnan(resolution),
+ msg="resolution is nan for eta=%f" % eta)
self.assertGreater(resolution, 0)
def create_response_run1(self):
@@ -57,9 +58,13 @@ class TestEgammaResolution(unittest.TestCase):
this should not be executed, to don't invalidate reference file created
on 2015-04-27 with ElectronPhotonFourMomentumCorrection-00-01-23
"""
- fout = ROOT.TFile("$ROOTCOREBIN/data/ElectronPhotonFourMomentumCorrection/test_resolution_nonregression_run1_data.root", "recreate")
- tree = ROOT.TTree("test_resolution_nonregression_data_run1", "test_resolution_nonregression_data")
- data_ptype, data_resol_type, data_eta, data_energy, data_resolution = map(lambda t: array(t, [0]), ('i', 'i', 'f', 'f', 'f'))
+ fout = ROOT.TFile(
+ "$ROOTCOREBIN/data/ElectronPhotonFourMomentumCorrection/test_resolution_nonregression_run1_data.root",
+ "recreate")
+ tree = ROOT.TTree("test_resolution_nonregression_data_run1",
+ "test_resolution_nonregression_data")
+ data_ptype, data_resol_type, data_eta, data_energy, data_resolution = map(
+ lambda t: array(t, [0]), ('i', 'i', 'f', 'f', 'f'))
tree.Branch("ptype", data_ptype, "ptype/I")
tree.Branch("resol_type", data_resol_type, "resol_type/I")
@@ -68,7 +73,8 @@ class TestEgammaResolution(unittest.TestCase):
tree.Branch("resolution", data_resolution, "resolution/F")
for ptype, energy, eta, resol_type in self.loop_combination_run1():
- resolution = self.tool_run1.getResolution(ptype, energy, eta, resol_type)
+ resolution = self.tool_run1.getResolution(
+ ptype, energy, eta, resol_type)
data_ptype[0] = ptype
data_energy[0] = energy
data_eta[0] = eta
@@ -86,18 +92,23 @@ class TestEgammaResolution(unittest.TestCase):
for eta in arange(0, 1.37, 0.1):
for e in arange(10E3, 1000E3, 100E3):
for t in 0, 1, 2:
- resolution_run1 = self.tool_run1.getResolution(ptype, e, eta, t)
- resolution_run2 = tool_run2.getResolution(ptype, e, eta, t)
- self.assertNotAlmostEqual(resolution_run1, resolution_run2,
- msg="resolution should be different for particle=%d, eta=%f, e=%d, rtype=%d" % (ptype, eta, e, t))
+ resolution_run1 = self.tool_run1.getResolution(
+ ptype, e, eta, t)
+ resolution_run2 = tool_run2.getResolution(
+ ptype, e, eta, t)
+ self.assertNotAlmostEqual(resolution_run1,
+ resolution_run2,
+ msg="resolution should be different for particle=%d, eta=%f, e=%d, rtype=%d" % (ptype,
+ eta, e, t))
def test_nonregression_run1(self):
from PathResolver import PathResolver
- rootfile = PathResolver.FindCalibFile("ElectronPhotonFourMomentumCorrection/v8/test_resolution_nonregression_run1_data.root")
+ rootfile = PathResolver.FindCalibFile(
+ "ElectronPhotonFourMomentumCorrection/v8/test_resolution_nonregression_run1_data.root")
f = ROOT.TFile(rootfile)
tree = f.Get("test_resolution_nonregression_data_run1")
- for ievent in xrange(tree.GetEntries()):
+ for ievent in range(tree.GetEntries()):
tree.GetEntry(ievent)
resolution = self.tool_run1.getResolution(tree.ptype,
@@ -105,12 +116,20 @@ class TestEgammaResolution(unittest.TestCase):
tree.resol_type)
expected_response = tree.resolution
if math.isnan(resolution):
- self.assertTrue(math.isnan(expected_response), msg="resolution is nan, but expected resonse is %f" % expected_response)
+ self.assertTrue(math.isnan(
+ expected_response), msg="resolution is nan, but expected resonse is %f" % expected_response)
elif math.isnan(expected_response):
- self.assertTrue(math.isnan(resolution), msg="expected response is nan, but resolution is %f" % resolution)
+ self.assertTrue(math.isnan(
+ resolution), msg="expected response is nan, but resolution is %f" % resolution)
else:
self.assertAlmostEqual(resolution, expected_response,
- msg="resolution mismatch %f != %f at eta=%f, energy=%f, ptype=%d, resol_type=%d" % (resolution, expected_response, tree.eta, tree.energy, tree.ptype, tree.resol_type))
+ msg="resolution mismatch %f != %f at eta=%f, energy=%f, ptype=%d, resol_type=%d" % (
+ resolution,
+ expected_response,
+ tree.eta,
+ tree.energy,
+ tree.ptype,
+ tree.resol_type))
@unittest.skip("CHECK")
def test_resolution_interface(self):
@@ -125,22 +144,29 @@ class TestEgammaResolution(unittest.TestCase):
for energy in energies:
if particle == 'unconverted':
p = self.factory.create_photon(0., 0.1, energy, 0)
- r1 = tool.resolution(energy, 0., 0., ROOT.PATCore.ParticleType.UnconvertedPhoton)
+ r1 = tool.resolution(
+ energy, 0., 0.,
+ ROOT.PATCore.ParticleType.UnconvertedPhoton)
r2 = tool.getResolution(p)
self.assertAlmostEqual(r1, r2)
elif particle == 'converted':
p = self.factory.create_photon(0., 0.1, energy, 100)
- r1 = tool.resolution(energy, 0., 0., ROOT.PATCore.ParticleType.ConvertedPhoton)
+ r1 = tool.resolution(
+ energy, 0., 0.,
+ ROOT.PATCore.ParticleType.ConvertedPhoton)
r2 = tool.getResolution(p)
self.assertAlmostEqual(r1, r2)
elif particle == 'electron':
p = self.factory.create_electron(0., 0.1, energy)
- r1 = tool.resolution(energy, 0., 0., ROOT.PATCore.ParticleType.Electron)
+ r1 = tool.resolution(
+ energy, 0., 0.,
+ ROOT.PATCore.ParticleType.Electron)
r2 = tool.getResolution(p)
self.assertAlmostEqual(r1, r2)
else:
raise ValueError()
+
if __name__ == '__main__':
ROOT.gROOT.ProcessLine(".x $ROOTCOREDIR/scripts/load_packages.C")
unittest.main()
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/CMakeLists.txt
index ca06985255b764a063706588123a5fee269f361f..1498568361a382adabbbe0d7d0d968a0b6e735fe 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/CMakeLists.txt
@@ -4,7 +4,7 @@
atlas_subdir( ElectronPhotonShowerShapeFudgeTool )
# External dependencies:
-find_package( ROOT COMPONENTS Core MathCore Hist Graph RIO )
+find_package( ROOT COMPONENTS Core MathCore Hist Graf RIO )
# Component(s) in the package:
atlas_add_library( ElectronPhotonShowerShapeFudgeToolLib
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
index 23923003e442d5483e6a00eba2985ab319177853..a3178fe0f472f69390f168cc72d3b2db9240623e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
@@ -64,7 +64,7 @@ AsgPhotonEfficiencyCorrectionTool::AsgPhotonEfficiencyCorrectionTool( std::strin
declareProperty( "CorrectionFileNameUnconv", m_corrFileNameUnconv="",
"File that stores the correction factors for simulation for unconverted photons");
- declareProperty("MapFilePath", m_mapFile = "" ,
+ declareProperty("MapFilePath", m_mapFile = "PhotonEfficiencyCorrection/2015_2018/rel21.2/Summer2020_Rec_v1/map1.txt",
"Full path to the map file");
declareProperty( "ForceDataType", m_dataTypeOverwrite=-1,
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
index 03a6d01115cce93170b3bea1bcaba06718243287..9cd1a70bd5a8821925ebe4df7d863e3d93bfd651 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
@@ -28,5 +28,7 @@ atlas_add_dictionary( PhotonVertexSelectionDict
LINK_LIBRARIES PhotonVertexSelectionLib )
# Test(s) in the package:
-atlas_add_test( PhotonVertexSelection_test
- SCRIPT test/testPhotonVertexSelection.py )
+if( NOT XAOD_ANALYSIS )
+ atlas_add_test( PhotonVertexSelection_test
+ SCRIPT test/testPhotonVertexSelection.py )
+endif()
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt
index 035ff8a01ef37f1b38264961041da650d70e7f85..e613f35f296578d248c395d433028ba4c72dd015 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt
@@ -47,7 +47,7 @@ endif()
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-if (NOT XAOD_STANDALONE)
+if (NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS)
atlas_add_test( flake8_test
SCRIPT ${ATLAS_FLAKE8} ${CMAKE_CURRENT_SOURCE_DIR}/test
POST_EXEC_SCRIPT nopost.sh )
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx
index 1f3b1a95c823965296866ba3117ef71cd29ef6d3..b521064476b21aedecaa804578c574d1f1f6f41c 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/HbbTag.cxx
@@ -161,9 +161,9 @@ namespace {
return {hk::eta, j.eta()};
};
} else {
- // for now we assume everything we read from b-tagging is a double,
+ // for now we assume everything we read from b-tagging is a float,
// this is only true for DL1 scores.
- return BTagPairGetter<double>(key);
+ return BTagPairGetter<float>(key);
}
}
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
index d355ea90553dd55f57501cb71b20376ccc09f3b7..c44cbab6be97bf0ca31f30df7acdd49076b7e087 100644
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
* */
@@ -560,6 +560,7 @@ namespace Analysis {
TObjArray * toa = dynamic_cast<TObjArray*>(hPointer.get());
if (toa) {
ATH_MSG_DEBUG("#BTAG# The TObjArray to build the input variables of BDT for " << tagger<< " is valid");
+ toa->SetOwner (true);
std::vector<std::string> inputVars; inputVars.clear();
std::string commaSepVars="";
TObjString *tos= nullptr;
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx
index cb9c2ad8fb43bc5b6f0ac08be242dc1a1ca9fc8c..052149243d102d52b619b8304a555f0007ee468f 100755
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx
@@ -213,7 +213,8 @@ StatusCode JetTagMonitorAlgorithm::fillHistograms( const EventContext& ctx ) con
//////////////////////
bool useTriggerDecisionTool = true;
- const auto& trigDecTool = getTrigDecisionTool();
+ const auto* trigDecTool = (getTrigDecisionTool().empty() ?
+ nullptr : getTrigDecisionTool().operator->());
// only apply trigger selection if bool is true (false for express stream) and trigDecTool is ok
if (useTriggerDecisionTool && trigDecTool != 0) {
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataContainer.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataContainer.cxx
index a4282a8e0e9b9c1ce05cc070d82be6fb21427df1..b5b064be8c4ab47530aa3841c8b68078f0738a00 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataContainer.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/Root/CalibrationDataContainer.cxx
@@ -880,6 +880,7 @@ CalibrationDataHistogramContainer::getInterpolatedUncertainty(TH1* hist) const
// Copied from TH3::Interpolate()
+ yAxis = hist->GetYaxis();
zAxis = hist->GetZaxis();
Int_t ubx = xAxis->FindBin(m_vars[0]);
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingTruthTaggingTool.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingTruthTaggingTool.cxx
index 3f728ee3f1a855b1239591f4d9259e53427203ad..3d864fa7a1fcb290bf8cc4235c528c7a9dcb062b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingTruthTaggingTool.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingTruthTaggingTool.cxx
@@ -1126,7 +1126,6 @@ StatusCode BTaggingTruthTaggingTool::getDirectTaggedJets(TRFinfo &trfinf,std::ve
double BTaggingTruthTaggingTool::getEvtSF(TRFinfo &trfinf,int sys){
- ANA_CHECK_SET_TYPE (StatusCode);
double SF = 1.;
std::vector<bool> is_tagged;
ANA_CHECK_THROW( getDirectTaggedJets(trfinf,is_tagged) );
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx
index f79401d6fe905d7c4ac3801ef6021c39bbe57d22..34fb5811805a110fd59d823411d20ec73686c1a6 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx
@@ -86,9 +86,12 @@ namespace TestMuonSF {
MuonSFBranches::MuonSFBranches(TTree* tree, const ToolHandle<CP::IMuonEfficiencyScaleFactors> &handle, const std::string& rel_name) :
MuonEffiBranches(tree),
m_handle(handle),
- m_uncorrelate_sys(dynamic_cast<const CP::MuonEfficiencyScaleFactors*>(handle.operator->())->uncorrelate_sys()),
m_release(rel_name),
- m_SFs() {
+ m_SFs()
+ {
+ auto mesf = dynamic_cast<const CP::MuonEfficiencyScaleFactors*>(handle.operator->());
+ if (!mesf) std::abort();
+ m_uncorrelate_sys = mesf->uncorrelate_sys();
}
CP::CorrectionCode MuonSFBranches::fill(const xAOD::Muon& muon) {
/// Only the raw systematic sets have been activated
diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py
index 70f399fe7c4c16d4fca0d7199c3179db6ad29a4a..6aff290decc86039d1b9c0060ad946a72eeb5dba 100644
--- a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py
+++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDAOD_tf.py
@@ -15,11 +15,12 @@ def getSubSequences(sequence,sequenceList):
getSubSequences(item,sequenceList)
return
-if hasattr(runArgs, "reductionConf"):
- msg.info('Will attempt to make the following reduced formats: {0}'.format(runArgs.reductionConf))
-else:
- msg.error('AOD Reduction job started, but with no "reductionConf" array - aborting')
- raise RuntimeError("No reductions configured")
+if not hasattr(runArgs, "outputNTUP_PILEUPFile"):
+ if hasattr(runArgs, "reductionConf"):
+ msg.info('Will attempt to make the following reduced formats: {0}'.format(runArgs.reductionConf))
+ else:
+ msg.error('AOD Reduction job started, but with no "reductionConf" array - aborting')
+ raise RuntimeError("No reductions configured")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
@@ -66,6 +67,13 @@ else:
msg.error('AOD Reduction job started, but with no AOD inputs - aborting')
raise RuntimeError("No AOD input")
+# Deal appropriately with NTUP_PILEUP
+if hasattr(runArgs, "outputNTUP_PILEUPFile"):
+ from DerivationFrameworkDataPrep.DataPrepJobProperties import DataPrepFlags
+ DataPrepFlags.outputFile = runArgs.outputNTUP_PILEUPFile
+ runArgs.outputDAOD_DAPR0File = "DAOD_DAPR0.root"
+ runArgs.reductionConf = "DAPR0"
+
listOfFlags=[]
try:
diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.ESDtoDPD_tf.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.ESDtoDPD_tf.py
index 995cee0bfd60bfe61a4e65fe48f4f969bd67b948..db29173e9193e713298b5f8886df6a2c054fa10d 100644
--- a/PhysicsAnalysis/PATJobTransforms/share/skeleton.ESDtoDPD_tf.py
+++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.ESDtoDPD_tf.py
@@ -38,19 +38,25 @@ rec.DPDMakerScripts.append(SetupOutputDPDs(runArgs,listOfFlags))
rec.OutputFileNameForRecoStep="ESDtoDPD"
+# New-style config
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
## Input
if hasattr(runArgs,"inputFile"): athenaCommonFlags.FilesInput.set_Value_and_Lock( runArgs.inputFile )
if hasattr(runArgs,"inputBSFile"):
globalflags.InputFormat.set_Value_and_Lock('bytestream')
athenaCommonFlags.BSRDOInput.set_Value_and_Lock( runArgs.inputBSFile )
+ ConfigFlags.Input.Files = athenaCommonFlags.BSRDOInput()
if hasattr(runArgs,"inputRDOFile"):
rec.readRDO.set_Value_and_Lock( True )
globalflags.InputFormat.set_Value_and_Lock('pool')
athenaCommonFlags.PoolRDOInput.set_Value_and_Lock( runArgs.inputRDOFile )
+ ConfigFlags.Input.Files = athenaCommonFlags.PoolRDOInput()
if hasattr(runArgs,"inputESDFile"):
globalflags.InputFormat.set_Value_and_Lock('pool')
rec.readESD.set_Value_and_Lock( True )
athenaCommonFlags.PoolESDInput.set_Value_and_Lock( runArgs.inputESDFile )
+ ConfigFlags.Input.Files = athenaCommonFlags.PoolESDInput()
if hasattr(runArgs,"inputTAGFile"):
rec.readTAG.set_Value_and_Lock( True )
rec.readESD.set_Value_and_Lock( True )
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
index e67aa8c518ce4fc90c245b771ba439776ffbbf3f..beeb35a7053b5fe461165741d042af4a8596fc7b 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
@@ -7,26 +7,10 @@ from RecExConfig.RecFlags import rec as recFlags
tool1 = MuonPhysValMonitoring__MuonPhysValMonitoringTool( name = 'muphysval' )
tool1.IsData = not recFlags.doTruth()
-#
-tool1.MuonContainerName = 'Muons'
+#add if you need any of the following containers
+#tool1.FwdTrackContainerName='InDetForwardTrackParticles'
tool1.SlowMuonContainerName = ''
-tool1.MuonTruthParticleContainerName = 'MuonTruthParticles'
-tool1.DoBinnedResolutionPlots = True
-#comment out if you don't need any of the following containers
-tool1.TrackContainerName = 'InDetTrackParticles'
-# #tool1.FwdTrackContainerName='InDetForwardTrackParticles'
-tool1.MuonTrackContainerName = 'MuonSpectrometerTrackParticles'
-tool1.MuonExtrapolatedTrackContainerName = 'ExtrapolatedMuonTrackParticles'
-tool1.MuonOnlyExtrapolatedTrackContainerName = 'MSOnlyExtrapolatedMuonTrackParticles'
-tool1.MuonSegmentContainerName = 'MuonSegments'
-
-
-#tool1.MuonTruthParticleContainerName = 'MuonTruthParticle' # uncomment for release 19
-# tool1.DoTrigMuonValidation =True
-# tool1.DoTrigMuonEFValidation = True
-# tool1.DoTrigMuonL2Validation = True
-# tool1.DoTrigMuonL1Validation = True
tool1.SelectHLTMuonItems = [
["HLT_mu20","L1_MU20"],
["HLT_mu20_iloose_L1MU15","L1_MU15"],
@@ -54,9 +38,11 @@ tool1.SelectMuonWorkingPoints = [ 1 ]
tool1.SelectMuonAuthors = [ 1, 2, 4 ,5, 6, 8, 9 ]
#Select Muon Categories... (origin of muons, empty: all categories, 0: ALL, 1: PROMPT, 2: IN-FLIGHT, 3: NON-ISOLATED, 4: REST)
-#tool1.SelectMuonCategories = [ 0, 1, 2, 3, 4 ] # all possible categories
tool1.SelectMuonCategories = [ 0, 1 ] # lighter version, good for official validation tasks overriden when in data mode
+if not recFlags.doTruth():
+ tool1.SelectMuonCategories = [0, 1, 4]
+
from IsolationSelection.IsolationSelectionConf import CP__IsolationSelectionTool
IsolationTool = CP__IsolationSelectionTool( "IsolationSelectionTool",
CalibFileName = "IsolationSelection/v1/MC15_Z_Jpsi_cutMap.root",
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py
index 178a553d4897a8ed8b118dba3a537b8042a6be33..1b900146981e8c2c672882481cc1205817dc0063 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DESDM_IDALIGN.py
@@ -153,8 +153,8 @@ outList = CfgItemList( 'IDALIGN',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py
index b0cd14500f25833560ca663c5f87e351cbfb5726..95d0fdbf71a1f727dffcc18e8d325d3a2d2e0f0c 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DESD_DEDX.py
@@ -152,8 +152,8 @@ outList = CfgItemList( 'DEDX',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDESDM_MS.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDESDM_MS.py
index ad5c959959a81636c7265d95f0449310a5369bd6..a7b01fe321f85c3a0723cc18b503aacdae2080d4 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDESDM_MS.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDESDM_MS.py
@@ -344,7 +344,7 @@ AlignmentTriggerMuonStream.AddItem(["Muon::TgcPrepDataContainer#*"])
AlignmentTriggerMuonStream.AddItem(["Muon::CscPrepDataContainer#*"])
AlignmentTriggerMuonStream.AddItem(["Muon::MdtPrepDataContainer#*"])
#Alignment
-AlignmentTriggerMuonStream.AddItem(["Trk::SegmentCollection#MuonSegments"])
+AlignmentTriggerMuonStream.AddItem(["Trk::SegmentCollection#TrackMuonSegments"])
AlignmentTriggerMuonStream.AddItem(["xAOD::VertexContainer#PrimaryVertices"])
AlignmentTriggerMuonStream.AddItem(["xAOD::VertexAuxContainer#PrimaryVerticesAux.-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"])
AlignmentTriggerMuonStream.AddItem(["TrackCollection#MuonSpectrometerTracks"])
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py
index 92370c88d5d037fde1235d5083abb7bfbf9f90c2..8925dacd9863e91fe0395f0c984df528c334119d 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_AllCells.py
@@ -152,8 +152,8 @@ outList = CfgItemList( 'ALLCELLS',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py
index 873ea275292f6a9908f400d994e874f08530393a..0500c707c20068418d8b012c9ea25e5e1a8926a1 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EGamma.py
@@ -369,8 +369,8 @@ outList = CfgItemList( 'EGAMMA',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py
index 32a9cd5799e55cb02e324e21ea67b58a77e5ec10..0d6c6aa615fad538623c0c304f24ffde163180d2 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_EOverP.py
@@ -167,8 +167,8 @@ outList = CfgItemList( 'EOVERP',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py
index 6821fb98a2a6bd80fc811fb5cc7f07655c493339..15d33cdef8320fd21741a349f0823a819835c0ba 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_Jet.py
@@ -291,8 +291,8 @@ outList = CfgItemList( 'CALJET',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py
index abf3d52003fa9f20a05c379a8f0475ca9e48f396..d965f339be0c331fc3218f96a185fdcf0550795c 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_PhotonJet.py
@@ -119,8 +119,8 @@ outList = CfgItemList( 'PHOJET',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py
index 0f143aff04297f108361abad00ce2009db0a7fb6..5c64c8c8bc808901b93ea108b768e625e0b16edb 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_SGLEL.py
@@ -119,8 +119,8 @@ outList = CfgItemList( 'SGLEL',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
index b0867f88fef0d64acf48517d7b1766cb8c5df8de..190c826e3e5a292f5eab8350f2650bcdbb3d4bc9 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/PerfDPD_TtbarMuon.py
@@ -165,8 +165,8 @@ outList = CfgItemList( 'SLTTMU',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py
index 4c9c35e07be4ee08f3ced719ad8951530da714cb..773475f23e848c4e6474a1174b4c0412d225391a 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDPD_HIPs.py
@@ -117,8 +117,8 @@ outList = CfgItemList( 'HIPsStream',
'xAOD::TrigNavigationAuxInfo#TrigNavigationAux.',
'xAOD::TrigDecision#xTrigDecision',
'xAOD::JetEtRoI#LVL1JetEtRoI',
- 'Trk::SegmentCollection#MuonSegments',
- 'Trk::SegmentCollection#NCB_MuonSegments',
+ 'Trk::SegmentCollection#TrackMuonSegments',
+ 'Trk::SegmentCollection#NCB_TrackMuonSegments',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMPFlowAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux.',
'xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4LCTopoAux.',
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx
index 8de567057700fdaeb175621923d3ad86e4305a43..f7a8c104d090de6cc3bd4786736c612e93f51d61 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx
@@ -75,11 +75,11 @@ TauTruthMatchingTool::getTruth(const xAOD::TauJet& xTau,
// if matched to a truth tau return its pointer, else return a null pointer
static SG::AuxElement::ConstAccessor<char> accIsTruthMatched("IsTruthMatched");
- if ((bool)accIsTruthMatched(xTau))
+ static SG::AuxElement::ConstAccessor< ElementLink< xAOD::TruthParticleContainer > > accTruthTau("truthParticleLink");
+ if ((accIsTruthMatched.isAvailable(xTau) && accIsTruthMatched(xTau)) || accTruthTau.isAvailable(xTau))
{
if (m_bWriteTruthTaus or m_bTruthTauAvailable)
{
- static SG::AuxElement::ConstAccessor< ElementLink< xAOD::TruthParticleContainer > > accTruthTau("truthParticleLink");
if (accTruthTau(xTau).isValid())
{
return *accTruthTau(xTau);
@@ -340,7 +340,7 @@ StatusCode TauTruthMatchingTool::findTruthTau(const xAOD::TauJet& xTau,
{
// check if decorations were already added to the first passed tau
if (!m_bIsTruthMatchedAvailable.isValid()) {
- bool avail = xTau.isAvailable<char>("IsTruthMatched");
+ bool avail = xTau.isAvailable<char>("IsTruthMatched") || xTau.isAvailable<ElementLink< xAOD::TruthParticleContainer >>("truthParticleLink");
m_bIsTruthMatchedAvailable.set (avail);
}
if (*m_bIsTruthMatchedAvailable.ptr())
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
index a4f0a384c00445eb92a221c179933e10f0039d46..eb65cc8ee14b26cf428560ad8d2c87c5b4d298e2 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
@@ -76,6 +76,7 @@ int main( int argc, char* argv[] )
// ===========================================================================
ToolHandle<TauAnalysisTools::ITauTruthMatchingTool> T2MT( "TauAnalysisTools::TauTruthMatchingTool/TauTruthMatchingTool");
ANA_CHECK(AthAnalysisHelper::setProperty(T2MT, "WriteTruthTaus", true));
+ ANA_CHECK(AthAnalysisHelper::setProperty(T2MT, "TruthJetContainerName", "AntiKt4TruthDressedWZJets"));
ANA_CHECK(T2MT.retrieve());
// ===========================================================================
@@ -117,7 +118,8 @@ int main( int argc, char* argv[] )
<< ", prong = " << int(xTau->nTracks())
<< ", charge = " << int(xTau->charge()));
- if ((bool)xTau->auxdata<char>("IsTruthMatched") && (xTruthTau != nullptr))
+ bool avail = xTau->isAvailable<char>("IsTruthMatched") || xTau->isAvailable<ElementLink< xAOD::TruthParticleContainer >>("truthParticleLink");
+ if (avail && (xTruthTau != nullptr))
{
if (xTruthTau->isTau())
{
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/ObjectLoaderStandardCuts.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/ObjectLoaderStandardCuts.cxx
index facd9d7573205eff47da7eabf960615d4091a2a4..f6f6b5af79c7dcb8a7343475943f20fc4fef555b 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/ObjectLoaderStandardCuts.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/ObjectLoaderStandardCuts.cxx
@@ -92,10 +92,8 @@ namespace top {
///-- Muons --///
if (topConfig->useMuons()) {
if (topConfig->useAntiMuons()) objectSelection->muonSelection(new top::AntiMuonMC15(topConfig->muonPtcut(),
- new top::StandardIsolation(
- topConfig->muonIsolation(),
- topConfig->
- muonIsolationLoose())));
+ new top::AntiMuonIsolation(
+ topConfig->muonIsolation())));
else objectSelection->muonSelection(new top::MuonMC15(topConfig->muonPtcut(),
new top::StandardIsolation(topConfig->muonIsolation(),
topConfig->muonIsolationLoose()),
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
index e82352ac44cba16f8d770a6a616f20d1605c9ae9..f316a07c1299e6778de0b2ca43ce348555685e71 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
@@ -125,7 +125,7 @@ namespace top {
"Allows muon reconstruction using 2-station muons with missing inner MS station for |eta|<1.3 for Loose tree - Default: True (only for HighPt)",
"True");
registerParameter("MuonIsolation",
- "Isolation to use : PflowTight_VarRad, PflowTight_FixedRad, PflowLoose_VarRad, PflowLoose_FixedRad, HighPtTrackOnly, TightTrackOnly_VarRad, TightTrackOnly_FixedRad, PLVTight, PLVLoose, Tight_VarRad, Tight_FixedRad, Loose_VarRad, Loose_FixedRad, FCTight, FCLoose, FCTightTrackOnly, FCTightTrackOnly_FixedRad, FCLoose_FixedRad, FCTight_FixedRad, FixedCutPflowTight, FixedCutPflowLoose, FCTight_FixedRad, None",
+ "Isolation to use : PflowTight_VarRad, PflowTight_FixedRad, PflowLoose_VarRad, PflowLoose_FixedRad, HighPtTrackOnly, TightTrackOnly_VarRad, TightTrackOnly_FixedRad, PLVTight, PLVLoose, Tight_VarRad, Tight_FixedRad, Loose_VarRad, Loose_FixedRad, FCTight, FCLoose, FCTightTrackOnly, FCTightTrackOnly_FixedRad, FCLoose_FixedRad, FCTight_FixedRad, FixedCutPflowTight, FixedCutPflowLoose, FCTight_FixedRad, AntiMuon_nominal, AntiMuon_shapeSyst1, AntiMuon_shapeSyst2, None",
"PflowTight_FixedRad");
registerParameter("MuonIsolationLoose",
"Isolation to use : PflowTight_VarRad, PflowTight_FixedRad, PflowLoose_VarRad, PflowLoose_FixedRad, HighPtTrackOnly, TightTrackOnly_VarRad, TightTrackOnly_FixedRad, PLVTight, PLVLoose, Tight_VarRad, Tight_FixedRad, Loose_VarRad, Loose_FixedRad, FCTight, FCLoose, FCTightTrackOnly, FCTightTrackOnly_FixedRad, FCLoose_FixedRad, FCTight_FixedRad, FixedCutPflowTight, FixedCutPflowLoose, FCTight_FixedRad, None",
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/AntiMuonMC15.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/AntiMuonMC15.cxx
index 979bd53901cd55562e1a374f29ea2eb4957be8fe..090bec4dbaf097a2e318bf4b5fee7d64be17e1b4 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/AntiMuonMC15.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/AntiMuonMC15.cxx
@@ -7,13 +7,11 @@
#include "TopEvent/EventTools.h"
namespace top {
- AntiMuonMC15::AntiMuonMC15(const double ptcut, IsolationBase* /* isolation */) :
+ AntiMuonMC15::AntiMuonMC15(const double ptcut, AntiMuonIsolation* isolation) :
m_ptcut(ptcut),
- m_muonSelectionTool("CP::MuonSelectionTool") {
- //m_muonSelectionToolLoose("CP::MuonSelectionToolLoose"),
- //m_isolation(isolation)
+ m_muonSelectionTool("CP::MuonSelectionTool"),
+ m_isolation(isolation) {
top::check(m_muonSelectionTool.retrieve(), "Failed to retrieve muonSelectionTool");
-// top::check( m_muonSelectionToolLoose.retrieve() , "Failed to retrieve muonSelectionToolLoose" );
}
bool AntiMuonMC15::passSelection(const xAOD::Muon& mu) const {
@@ -22,22 +20,7 @@ namespace top {
///-- https://twiki.cern.ch/twiki/bin/view/AtlasProtected/MCPAnalysisGuidelinesMC15 --///
if (!m_muonSelectionTool->accept(mu)) return false;
-
- if (mu.energyLossType() != xAOD::Muon::NotIsolated) return false;
-
- float eloss = 0;
- bool ok = mu.parameter(eloss, xAOD::Muon::EnergyLoss);
- if (ok && eloss > 6000) return false;
-
- float etcone20 = 0, ptvarcone40 = 0;
- ok = mu.isolation(etcone20, xAOD::Iso::etcone20);
- if (ok && etcone20 / mu.pt() < 0.03) return false;
-
- //if (mu.auxdataConst<float>("miniIso")/mu.pt() > .1) return false;
- ok = mu.isolation(ptvarcone40, xAOD::Iso::ptvarcone40);
- if (ok && ptvarcone40 / mu.pt() > 0.1) return false;
-
- return true;
+ return m_isolation->passSelection(mu);
}
bool AntiMuonMC15::passSelectionLoose(const xAOD::Muon& /*mu*/) const {
@@ -53,9 +36,9 @@ namespace top {
// << " * quality=" << m_quality << " (tight=0, medium=1, loose=2, v.loose=3)\n"
<< " * Everything else from muon tool - fill this in?\n";
-// if (!m_isolation)
-// os << " * No isolation requirement\n";
-// else
-// m_isolation->print(os);
+ if (!m_isolation)
+ os << " * No isolation requirement\n";
+ else
+ m_isolation->print(os);
}
}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/IsolationTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/IsolationTools.cxx
index ece125b44f9b17cc7f6ab6c5e7abce7513f85fa5..ca7568df92ad3b1e0825a1e26f6f697089a1d077 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/IsolationTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/IsolationTools.cxx
@@ -105,6 +105,79 @@ namespace top {
os << " * Approximate Mini Isolation\n";
os << " * iso/pT > " << m_fraction << "\n";
}
+
+ AntiMuonIsolation::AntiMuonIsolation(const std::string& workingPoint) :
+ m_workingPoint(workingPoint) {
+ if (m_workingPoint.substr(0,9) != "AntiMuon_") {
+ ATH_MSG_WARNING("Ignoring isolation working point \""
+ << workingPoint
+ << "\" which is not appropriate for AntiMuons.\n"
+ << "Will use \"AntiMuon_nominal\" instead.");
+ m_workingPoint = "AntiMuon_nominal";
+ }
+ else if (m_workingPoint != "AntiMuon_nominal"
+ && m_workingPoint != "AntiMuon_shapeSyst1"
+ && m_workingPoint != "AntiMuon_shapeSyst2") {
+ ATH_MSG_ERROR("Cannot use undefined isolation working point "
+ << workingPoint
+ << " for AntiMuons.\n"
+ << "Should be one of \"AntiMuon_nominal\", \"AntiMuon_shapeSyst1\", \"AntiMuon_shapeSyst2\".");
+ throw std::runtime_error("Attempt to use inappropriate isolation working point for AntiMuons");
+ }
+ }
+
+ bool AntiMuonIsolation::passSelection(const xAOD::IParticle& p) const {
+ //muons
+ if (p.type() != xAOD::Type::Muon) {
+ ATH_MSG_ERROR("Cannot use this function for anything else but muons");
+ throw std::runtime_error("Cannot use this function for anything else but muons");
+ }
+
+ const xAOD::Muon* mu = dynamic_cast<const xAOD::Muon*>(&p);
+ if (mu == nullptr) {
+ ATH_MSG_ERROR("Impossible to cast pointer to xAOD::IParticle into pointer to xAOD::Muon");
+ throw std::runtime_error("Impossible to cast pointer to xAOD::IParticle into pointer to xAOD::Muon");
+ }
+
+ if (mu->energyLossType() != xAOD::Muon::NotIsolated) return false;
+
+ float eloss = 0;
+ bool ok = mu->parameter(eloss, xAOD::Muon::EnergyLoss);
+ if (ok && eloss > 6000) return false;
+
+ float etcone20 = 0, ptvarcone40 = 0;
+ ok = mu->isolation(etcone20, xAOD::Iso::etcone20);
+ if (ok && etcone20 / mu->pt() < 0.03) return false;
+
+ ok = mu->isolation(ptvarcone40, xAOD::Iso::ptvarcone40);
+ if (m_workingPoint == "AntiMuon_nominal") {
+ if (ok && ptvarcone40 / mu->pt() > 0.1) return false;
+ }
+ else if (m_workingPoint == "AntiMuon_shapeSyst1") {
+ if (ok && ptvarcone40 / mu->pt() > 0.05) return false;
+ }
+ else if (m_workingPoint == "AntiMuon_shapeSyst2") {
+ if (ok && (ptvarcone40 / mu->pt() <= 0.05 || ptvarcone40 / mu->pt() > 0.1)) return false;
+ }
+
+ return true;
+ }
+
+ void AntiMuonIsolation::print(std::ostream& os) const {
+ os << " * AntiMuon Isolation : " << m_workingPoint << "\n";
+ os << " * energyLossType : NotIsolated\n";
+ os << " * EnergyLoss <= 6 GeV\n";
+ os << " * etcone20/pT > 0.03\n";
+ if (m_workingPoint == "AntiMuon_nominal") {
+ os << " * ptvarcone40/pT <= 0.1\n";
+ }
+ else if (m_workingPoint == "AntiMuon_shapeSyst1") {
+ os << " * ptvarcone40/pT <= 0.05\n";
+ }
+ else if (m_workingPoint == "AntiMuon_shapeSyst2") {
+ os << " * 0.05 < ptvarcone40/pT <= 0.1\n";
+ }
+ }
StandardIsolation::StandardIsolation(const std::string& tightLeptonIsolation,
const std::string& looseLeptonIsolation) :
@@ -123,6 +196,23 @@ namespace top {
if (tightLeptonIsolation == "None") m_doTightIsolation = false;
if (looseLeptonIsolation == "None") m_doLooseIsolation = false;
+
+ if ( tightLeptonIsolation == "AntiMuon_nominal"
+ || tightLeptonIsolation == "AntiMuon_shapeSyst1"
+ || tightLeptonIsolation == "AntiMuon_shapeSyst2" ) {
+ ATH_MSG_ERROR("Cannot use isolation working point "
+ << tightLeptonIsolation
+ << " which is suitable for AntiMuons only.");
+ throw std::runtime_error("Attempt to use inappropriate isolation working point, suitable for AntiMuons only");
+ }
+ if ( looseLeptonIsolation == "AntiMuon_nominal"
+ || looseLeptonIsolation == "AntiMuon_shapeSyst1"
+ || looseLeptonIsolation == "AntiMuon_shapeSyst2" ) {
+ ATH_MSG_ERROR("Cannot use isolation working point "
+ << looseLeptonIsolation
+ << " which is suitable for AntiMuons only.");
+ throw std::runtime_error("Attempt to use inappropriate isolation working point, suitable for AntiMuons only");
+ }
}
bool StandardIsolation::passSelection(const xAOD::IParticle& p) const {
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx
index 2430e825e7a9119a554b1dcb0bfec77f6652e589..784e2854a250c6ed2bd5ef65705b5279c4951d54 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx
@@ -523,8 +523,7 @@ namespace top {
"TopObjectSelection::applySelectionPreOverlapRemovalLargeRJets() failed to retrieve large R jets");
for (auto jetPtr : *jets) {
- //char decoration = m_largeJetSelection->passSelection(*jetPtr);
- char decoration = '0';
+ char decoration = m_largeJetSelection->passSelection(*jetPtr);
jetPtr->auxdecor<char>(m_passPreORSelection) = decoration;
jetPtr->auxdecor<char>(m_ORToolDecoration) = decoration * 2;
if (m_doLooseCuts) {
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/AntiMuonMC15.h b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/AntiMuonMC15.h
index 66c7dbec39e0ebd000e5e7fd653038ab6dfa9bbc..f2649f72dc3f12941d7bf296d4ea0c4585434b18 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/AntiMuonMC15.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/AntiMuonMC15.h
@@ -24,7 +24,7 @@ namespace top {
* @param isolation The isolation the user wants to apply. Don't want any
* isolation to be applied? Then leave this as a nullptr.
*/
- AntiMuonMC15(const double ptcut, IsolationBase* isolation);
+ AntiMuonMC15(const double ptcut, AntiMuonIsolation* isolation);
///Does nothing.
virtual ~AntiMuonMC15() {}
@@ -53,10 +53,9 @@ namespace top {
///Proper tool to select muons.
ToolHandle<CP::IMuonSelectionTool> m_muonSelectionTool;
-// ToolHandle<CP::IMuonSelectionTool> m_muonSelectionToolLoose;
///Isolation tool, can be nullptr meaning "no isolation requirement"
-// std::unique_ptr<top::IsolationBase> m_isolation;
+ std::unique_ptr<top::AntiMuonIsolation> m_isolation;
};
}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/IsolationTools.h b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/IsolationTools.h
index f503b60d8f4b5fc965a8e2f88bcd3508eeb27067..895812faecad09a375fb8dd066ed01bb512888bf 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/IsolationTools.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/IsolationTools.h
@@ -191,6 +191,40 @@ namespace top {
double m_fractionLoose;
};
+/**
+ * @brief Apply the cuts relevant for Anti-muon model
+ */
+ class AntiMuonIsolation: public IsolationBase {
+ public:
+ /**
+ * @brief Applies the cuts to etcone and ptcone like we used to in Run-I
+ *
+ * This sets up the isolation tool and configures it with the cuts.
+ */
+ AntiMuonIsolation(const std::string& workingPoint = "AntiMuon_Nominal");
+
+ /**
+ * @brief Does this particle pass the anti-muon isolation cuts?
+ *
+ * @param p Particle that we're worried about.
+ * @return True if it passes the isolation cuts.
+ */
+ virtual bool passSelection(const xAOD::IParticle& p) const override;
+
+ /**
+ * @brief Loose WP not implemented for Anti-muon
+ *
+ * @param p Particle that we're worried about.
+ * @return Always true.
+ */
+ virtual bool passSelectionLoose(const xAOD::IParticle& /*p*/) const override {return true;};
+
+ ///Come on, you really need me to tell you what this does?
+ virtual void print(std::ostream& os) const override;
+ protected:
+ std::string m_workingPoint;
+ };
+
/**
* @brief Apply the cuts to etcone and ptcone like we used to in Run-I
*/
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
index 244d7303f5916148a2f54993846f4c1ad419f37c..ac997ed1b6ecdad7cf9dc05e6decdc85c229ef9f 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
@@ -249,17 +249,15 @@ namespace top {
if (m_config->jetSubstructureName() == "SubjetMaker") m_jetSubstructure.reset(new top::SubjetMaker);
///-- Large R jet truth labeling --///
-// m_jetTruthLabelingTool = nullptr;
-// if (m_config->isMC() && m_config->useLargeRJets()) {
-// m_jetTruthLabelingTool = std::unique_ptr<JetTruthLabelingTool>(new JetTruthLabelingTool("JetTruthLabeling"));
-// // For DAOD_PHYS we need to pass few more arguments as it uses TRUTH3
-// if (m_config->getDerivationStream() == "PHYS") {
-// top::check(m_jetTruthLabelingTool->setProperty("UseTRUTH3", true), "Failed to set UseTRUTH3 for m_jetTruthLabelingTool");
-// top::check(m_jetTruthLabelingTool->setProperty("TruthBosonContainerName", "TruthBoson"), "Failed to set truth container name for m_jetTruthLabelingTool");
-// top::check(m_jetTruthLabelingTool->setProperty("TruthTopQuarkContainerName", "TruthTop"), "Failed to set truth container name for m_jetTruthLabelingTool");
-// }
-// top::check(m_jetTruthLabelingTool->initialize(), "Failed to initialize m_jetTruthLabelingTool");
-// }
+ m_jetTruthLabelingTool = nullptr;
+ if (m_config->isMC() && m_config->useLargeRJets()) {
+ m_jetTruthLabelingTool = std::unique_ptr<JetTruthLabelingTool>(new JetTruthLabelingTool("JetTruthLabeling"));
+ // For DAOD_PHYS we need to pass few more arguments as it uses TRUTH3
+ top::check(m_jetTruthLabelingTool->setProperty("UseTRUTH3", true), "Failed to set UseTRUTH3 for m_jetTruthLabelingTool");
+ top::check(m_jetTruthLabelingTool->setProperty("TruthBosonContainerName", "TruthBoson"), "Failed to set truth container name for m_jetTruthLabelingTool");
+ top::check(m_jetTruthLabelingTool->setProperty("TruthTopQuarkContainerName", "TruthTop"), "Failed to set truth container name for m_jetTruthLabelingTool");
+ top::check(m_jetTruthLabelingTool->initialize(), "Failed to initialize m_jetTruthLabelingTool");
+ }
// set the systematics list
m_config->systematicsJets(specifiedSystematics());
@@ -383,7 +381,13 @@ namespace top {
///-- Apply calibration --///
///-- Calibrate jet container --///
- top::check(m_jetCalibrationTool->applyCalibration(*(shallow_xaod_copy.first)), "Failed to applyCalibration");
+ if (isLargeR) {
+ top::check(m_jetCalibrationToolLargeR->applyCalibration(*(shallow_xaod_copy.first)),
+ "Failed to do applyCalibration on large-R jets");
+ } else {
+ top::check(m_jetCalibrationTool->applyCalibration(*(shallow_xaod_copy.first)),
+ "Failed to do applyCalibration on small-R jets");
+ }
///-- Loop over the xAOD Container --///
for (const auto jet : *(shallow_xaod_copy.first)) {
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
index 37f031371e6e342188ef75f0532a8d0f423804c0..b01090ce82aaa543803df98165ad2e5c669fcd47 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
@@ -111,16 +111,8 @@ EtaPtFilterTool::~EtaPtFilterTool()
ATH_MSG_DEBUG("Calling destructor");
}
-///////////////////////////////////////////////////////////////////
-/// Const methods:
-///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////
-/// Non-const methods:
-///////////////////////////////////////////////////////////////////
-
-StatusCode EtaPtFilterTool::buildMcAod( const McEventCollection* in,
- McEventCollection* out )
+StatusCode EtaPtFilterTool::buildMcAod( const McEventCollection* in,McEventCollection* out )
{
if ( 0 == in || 0 == out ) {
ATH_MSG_ERROR("Invalid pointer to McEventCollection !" << endmsg
@@ -169,16 +161,12 @@ StatusCode EtaPtFilterTool::buildMcAod( const McEventCollection* in,
return StatusCode::SUCCESS;
}
-///////////////////////////////////////////////////////////////////
-/// Protected methods:
-///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
/// Const methods:
///////////////////////////////////////////////////////////////////
-StatusCode EtaPtFilterTool::buildGenEvent( const HepMC::GenEvent* in,
- HepMC::GenEvent* out )
+StatusCode EtaPtFilterTool::buildGenEvent( const HepMC::GenEvent* in, HepMC::GenEvent* out )
{
if ( 0 == in || 0 == out ) {
ATH_MSG_ERROR("Invalid pointer to GenEvent !!" << endmsg
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
index 03c37d15f2b291873984ae33f74926321dd9dd6e..1be0b58a98a30449434465bee131c34665b1b741 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
@@ -86,21 +86,6 @@ GenAodValidationTool::~GenAodValidationTool()
}
-///////////////////////////////////////////////////////////////////
-/// Const methods:
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Non-const methods:
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Protected methods:
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Const methods:
-///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
/// Non-const methods:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx
index 1ae2edd6ddd24251f90b3364f41366b9338445b1..0577d31c2acd2ed330a31ad8e079da44c7d69ba0 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx
@@ -220,11 +220,8 @@ StatusCode PileupFilterTool::selectSpclMcBarcodes()
HepMC::GenEvent::particle_const_iterator partE = genEvent->particles_end();
for ( ; part != partE; ++part ) {
const int id = (*part)->pdg_id();
- //const int ida = std::abs(id);
const HepMC::FourVector hlv = (*part)->momentum();
const double pt = hlv.perp();
- //const double eta = hlv.pseudoRapidity();
- //const double mass = hlv.m();
const int barcode = (*part)->barcode();
const HepMC::GenVertex * decayVtx = (*part)->end_vertex();
const HepMC::GenVertex * prodVtx = (*part)->production_vertex();
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
index 2bf794a86ecfbaf6e3c102ab77368fe7f6ac43da..f75434c6f5d251fabb679221acad5828f8adf6be 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
@@ -160,7 +160,7 @@ SpclMcValidationTool::executeTool( const McEventCollection* mcEvents,
const TruthParticle * mc = *itrPart;
auto hepMc = mc->genParticle();
- if ( hepMc->momentum() != mc->hlv() ) {
+ if ( hepMc->momentum() != HepMC::FourVector(mc->hlv().x(),mc->hlv().y(),mc->hlv().z(),mc->hlv().t()) ) {
ATH_MSG_ERROR("TruthParticle and GenParticle-link don't have same 4-mom !!");
return StatusCode::FAILURE;
}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleCnvTool.cxx
index b4211ce14cbac77e95c486619a0d794613a30a1c..80740b4f461f72dcd69261c342813750c7fb1e30 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleCnvTool.cxx
@@ -260,16 +260,16 @@ TruthParticleCnvTool::convert( const McEventCollection * mcCollection,
container->setGenEvent( mcCollection, genEventIndex, sg );
// reserve enough space for the container so we don't have to relocate it
+#ifdef HEPMC3
+ container->reserve( container->size() + evt->particles().size() );
+#else
container->reserve( container->size() + evt->particles_size() );
+#endif
/// Create a map to enhance access between GenParticles and TruthParticles
TruthParticleContainer::Map_t bcToMcPart = container->m_particles;
- const HepMC::GenEvent::particle_const_iterator itrEnd = evt->particles_end();
- for ( HepMC::GenEvent::particle_const_iterator itrPart=evt->particles_begin();
- itrPart != itrEnd;
- ++itrPart ) {
- const HepMC::GenParticle * hepMcPart = (*itrPart);
+ for (auto hepMcPart: *evt) {
TruthParticle * mcPart = new TruthParticle( hepMcPart, container );
container->push_back( mcPart );
@@ -285,7 +285,6 @@ TruthParticleCnvTool::convert( const McEventCollection * mcCollection,
ATH_MSG_ERROR("TruthParticle is not wrapping the GenParticle : "
<< HepMC::barcode(hepMcPart) << " !!");
}
- //bcToMcPart[ hepMcPart->barcoade() ] = mcPart;
HepMcParticleLink mcLink( HepMC::barcode(hepMcPart), genEventIndex, EBC_MAINEVCOLL, HepMcParticleLink::IS_POSITION, sg ); // FIXME assuming that we are using the hard-scatter McEventCollection - would need to pass this info as an argument to the convert function.
bcToMcPart[ mcLink.compress() ] = mcPart;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.cxx
index 3ba9430a9030bf03d244a9c8dd18c62722e6a148..46e310db2fd1fa6686b3649762f6c97956c5d867 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.cxx
@@ -57,9 +57,6 @@ VtxBasedFilterTool::~VtxBasedFilterTool()
ATH_MSG_DEBUG("Calling destructor");
}
-///////////////////////////////////////////////////////////////////
-/// Const methods:
-///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
/// Non-const methods:
@@ -117,13 +114,6 @@ StatusCode VtxBasedFilterTool::buildMcAod( const McEventCollection* in,
return StatusCode::SUCCESS;
}
-///////////////////////////////////////////////////////////////////
-/// Protected methods:
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Const methods:
-///////////////////////////////////////////////////////////////////
StatusCode VtxBasedFilterTool::buildGenEvent( const HepMC::GenEvent* in,
HepMC::GenEvent* out )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McVtxFilter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McVtxFilter.cxx
index d889a933d07f142d74ef9a9dfb4becebef1a63a1..119d24a1c28f8157b24e487180be2dc0fb8cf9e4 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McVtxFilter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McVtxFilter.cxx
@@ -124,8 +124,6 @@ McVtxFilter & McVtxFilter::operator=(const McVtxFilter &rhs)
return *this;
}
-/// Destructor
-///////////////
///////////////////////////////////////////////////////////////////
/// Const methods:
diff --git a/Projects/AnalysisBase/build_externals.sh b/Projects/AnalysisBase/build_externals.sh
index 081074ee028a714ee67378639158b08bc53e935b..cd54bc498a1a98511bd69467118231a6408b7b01 100755
--- a/Projects/AnalysisBase/build_externals.sh
+++ b/Projects/AnalysisBase/build_externals.sh
@@ -85,7 +85,7 @@ fi
# Get the version of AnalysisBase for the build.
version=`cat ${thisdir}/version.txt`
# Generate hash of any extra cmake arguments.
-cmakehash=`echo -n "${EXTRACMAKE}" | openssl md5 | awk '{print $2}'`
+cmakehash=`echo -n "${EXTRACMAKE[@]}" | openssl md5 | awk '{print $2}'`
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AnalysisBaseExternals/externals-${version}-${cmakehash}.stamp
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 56cafc4159cf2c35a23fbdc27a1487c2c1f1784e..6f29fd3eb990ff12d604939b940912adf42c1ecb 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.92
+AnalysisBaseExternalsVersion = 2.0.94
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index b83b59bc01c3b407939963b18e3ff717469c9122..042da7766479858823e78e34db4f7e38768ff29e 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -125,6 +125,7 @@
+ Trigger/TrigEvent/TrigRoiConversion
+ Trigger/TrigEvent/TrigSteeringEvent
+ Trigger/TrigSteer/TrigCompositeUtils
++ Trigger/TrigT1/TrigT1MuctpiBits
#+ Trigger/TrigValidation/TrigAnalysisTest
#
diff --git a/Projects/AnalysisBase/version.txt b/Projects/AnalysisBase/version.txt
index 469a03d2db00c39b1d36b8f2151608ba8f6f5da5..16085fbb4e04138e9f8bb12eb89e4f03914071a1 100644
--- a/Projects/AnalysisBase/version.txt
+++ b/Projects/AnalysisBase/version.txt
@@ -1 +1 @@
-22.2.5
+22.2.6
diff --git a/Projects/AthAnalysis/build_externals.sh b/Projects/AthAnalysis/build_externals.sh
index a204d1b32c07e8ccaadcfb2bf722cf822254d3b0..daf7ace342e3997bf513ae839671f4726303a7a0 100755
--- a/Projects/AthAnalysis/build_externals.sh
+++ b/Projects/AthAnalysis/build_externals.sh
@@ -25,7 +25,7 @@ BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_2"
- -DATLAS_GAUDI_TAG="v35r0.001")
+ -DATLAS_GAUDI_TAG="v35r0.002")
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
@@ -91,7 +91,7 @@ fi
# Get the version of AthAnalysis for the build.
version=`cat ${thisdir}/version.txt`
# Generate hash of any extra cmake arguments.
-cmakehash=`echo -n "${EXTRACMAKE}" | openssl md5 | awk '{print $2}'`
+cmakehash=`echo -n "${EXTRACMAKE[@]}" | openssl md5 | awk '{print $2}'`
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthAnalysisExternals/externals-${version}-${cmakehash}.stamp
diff --git a/Projects/AthAnalysis/externals.txt b/Projects/AthAnalysis/externals.txt
index 3eab080a196206b8e710e1e7f958d51b271fb1ae..9443bd3f4f3dea1c6751a62350016b6d2f653883 100644
--- a/Projects/AthAnalysis/externals.txt
+++ b/Projects/AthAnalysis/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthAnalysisExternalsVersion = 2.0.92
+AthAnalysisExternalsVersion = 2.0.94
diff --git a/Projects/AthAnalysis/package_filters.txt b/Projects/AthAnalysis/package_filters.txt
index dee4753b679ef9a44fa5a89f590cf68b7c7e31c7..2983b41d79d9debd6688af53dc22db71c7b6a192 100644
--- a/Projects/AthAnalysis/package_filters.txt
+++ b/Projects/AthAnalysis/package_filters.txt
@@ -19,13 +19,14 @@
# EDM:
+ Event/EventPrimitives
+ Event/FourMomUtils
++ Event/PyDumper
+ Event/xAOD/xAODMetaDataCnv
+ Event/xAOD/xAODTriggerCnv
+ Event/xAOD/xAODTrackingCnv
+ Event/xAOD/xAODEventFormatCnv
+ Event/xAOD/xAODCoreCnv
+ Event/xAOD/xAODTruthCnv
-#+ Event/xAOD/xAODEventInfoCnv
++ Event/xAOD/xAODEventInfoCnv
- Event/xAOD/.*Cnv
+ Event/xAOD/.*
@@ -128,6 +129,7 @@
+ Trigger/TrigEvent/TrigRoiConversion
+ Trigger/TrigEvent/TrigSteeringEvent
+ Trigger/TrigSteer/TrigCompositeUtils
++ Trigger/TrigT1/TrigT1MuctpiBits
+ Trigger/TrigValidation/TrigAnalysisTest
#+ Trigger/TriggerSimulation/TrigBtagEmulationTool
#+ Reconstruction/RecoTools/IsolationTool
@@ -137,6 +139,7 @@
# Core Athena (would like to reduce) :
+ Control/AthAllocators
++ Control/AthenaConfiguration
+ Control/AthenaServices
+ Control/StoreGate
+ Control/SGComps
diff --git a/Projects/AthAnalysis/version.txt b/Projects/AthAnalysis/version.txt
index d4b369b4e5d8570b7a4ffd09e3e1336fcc9bc5e1..16085fbb4e04138e9f8bb12eb89e4f03914071a1 100644
--- a/Projects/AthAnalysis/version.txt
+++ b/Projects/AthAnalysis/version.txt
@@ -1 +1 @@
-22.2.4
+22.2.6
diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt
index 75a5c2a00faed82b2de4470ed64d4a9f0d7aa7a1..0a88450493ede6a79d2766f9f926996887f94a44 100644
--- a/Projects/AthDataQuality/CMakeLists.txt
+++ b/Projects/AthDataQuality/CMakeLists.txt
@@ -18,7 +18,7 @@ set( TDAQ-COMMON_ATROOT
find_package( AtlasCMake REQUIRED )
# Build the project against LCG:
-set( LCG_VERSION_POSTFIX "python3_ATLAS_2"
+set( LCG_VERSION_POSTFIX "python3_ATLAS_3"
CACHE STRING "Version postfix for the LCG release to use" )
set( LCG_VERSION_NUMBER 98
CACHE STRING "Version number for the LCG release to use" )
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 7e3bc3a47628b9f91246708f0ba969a8cf2717ee..03b2a975de183d7c18f8f7b5d521e02b19ebc9bc 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.92
+AtlasExternalsVersion = 2.0.94
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index 2046b1fcfd9ec5e9027991c98b56411968e9a27d..bd2ac7f080289cb577f94878332d7bc539783389 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -24,8 +24,8 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_2"
- -DATLAS_GAUDI_TAG="v35r0.001")
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_3"
+ -DATLAS_GAUDI_TAG="v35r0.002")
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
@@ -99,7 +99,7 @@ fi
# Get the version of AthGeneration for the build.
version=`cat ${thisdir}/version.txt`
# Generate hash of any extra cmake arguments.
-cmakehash=`echo -n "${EXTRACMAKE}" | openssl md5 | awk '{print $2}'`
+cmakehash=`echo -n "${EXTRACMAKE[@]}" | openssl md5 | awk '{print $2}'`
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthGenerationExternals/externals-${version}-${cmakehash}.stamp
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index 02a983fc934c03ae6d4b280dcd9ef40553564b27..a736ffea2ce44ddea34822334d8ea27b1f204cf3 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.92
+AthGenerationExternalsVersion = 2.0.94
diff --git a/Projects/AthGeneration/package_filters.txt b/Projects/AthGeneration/package_filters.txt
index bf3abe287df13a90b486fafae8b561d834c242f5..aebd621cc191fec4601797f7bf221e97443c6e73 100644
--- a/Projects/AthGeneration/package_filters.txt
+++ b/Projects/AthGeneration/package_filters.txt
@@ -152,7 +152,6 @@
+ Event/xAOD/xAODTruthCnv
+ External/AtlasDataArea
+ External/Pythia8
-+ Generators/Charybdis_i
- Generators/TrackRecordGenerator
+ Generators/.*
+ InnerDetector/InDetExample/InDetRecExample
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index ab39eecffaa9a7c4de00be785b8398248e0998ed..e7ce96a862f4eaa93610260a301753cda19fbe60 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -24,8 +24,8 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_2"
- -DATLAS_GAUDI_TAG="v35r0.001")
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_3"
+ -DATLAS_GAUDI_TAG="v35r0.002")
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
@@ -91,7 +91,7 @@ fi
# Get the version of AthSimulation for the build.
version=`cat ${thisdir}/version.txt`
# Generate hash of any extra cmake arguments.
-cmakehash=`echo -n "${EXTRACMAKE}" | openssl md5 | awk '{print $2}'`
+cmakehash=`echo -n "${EXTRACMAKE[@]}" | openssl md5 | awk '{print $2}'`
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthSimulationExternals/externals-${version}-${cmakehash}.stamp
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 278b93235d145f4353089bd59c0b6801c6feeb5c..6615a651a02d54ca1f30d7d97eed48d0d6a45943 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.92
+AthSimulationExternalsVersion = 2.0.94
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 7ebc708d1a567c7a5fbcd541d4103cadb0f25d9d..807280b7e7cb85821cc381eaa080bb03e85a1c8a 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -76,6 +76,7 @@ if( AtlasHIP_FOUND )
endif()
# Find some auxiliary packages:
+find_package( Frontier_Client )
find_package( Doxygen )
find_package( PNG )
find_package( VDT )
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 01e4fbb871eb9836877ecc2ab867733475d5dc26..32400efb469dccaf3512dd712b3155cecf49bf7e 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -24,8 +24,8 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_2"
- -DATLAS_GAUDI_TAG="v35r0.001")
+EXTRACMAKE=(-DLCG_VERSION_NUMBER=98 -DLCG_VERSION_POSTFIX="python3_ATLAS_3"
+ -DATLAS_GAUDI_TAG="v35r0.002")
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
@@ -99,7 +99,7 @@ fi
# Get the version of Athena for the build.
version=`cat ${thisdir}/version.txt`
# Generate hash of any extra cmake arguments.
-cmakehash=`echo -n "${EXTRACMAKE}" | openssl md5 | awk '{print $2}'`
+cmakehash=`echo -n "${EXTRACMAKE[@]}" | openssl md5 | awk '{print $2}'`
# Check if previous externals build can be reused:
externals_stamp=${BUILDDIR}/build/AthenaExternals/externals-${version}-${cmakehash}.stamp
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index d69bd120be45f15d8b8cb7449ea942641d1d214b..71e844821ddef9fb3758f147a71c238f1968d50a 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.92
+AthenaExternalsVersion = 2.0.94
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index ae41cc700aaa99fc9740407114bfb3d9b5486b79..09ca4fcf0c5101addc1df87a9cebb4ea4095fcf4 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.92
+VP1LightExternalsVersion = 2.0.94
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecUtils.py b/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecUtils.py
index 81a1276ab39618a80a51bfcd682d3d0d59670cb0..716c4e13f991cdc561400a836e022cd6261dc0b6 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecUtils.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecUtils.py
@@ -8,8 +8,8 @@ from JetRec.JetRecFlags import jetFlags
def AddToOutputList(tname, objType='xAOD::JetContainer') :
#filter container based on package flags
- if HIJetFlags.UnsubtractedSuffix() in tname and not HIJetFlags.WriteUnsubtracted() : return
- if HIJetFlags.SeedSuffix() in tname and not HIJetFlags.WriteSeeds() : return
+ if HIJetFlags.UnsubtractedSuffix() in str(tname) and not HIJetFlags.WriteUnsubtracted() : return
+ if HIJetFlags.SeedSuffix() in str(tname) and not HIJetFlags.WriteSeeds() : return
has_key=False
for k in HIJetFlags.HIJetOutputList() :
@@ -120,7 +120,7 @@ def MakeModulatorTool(mod_key, **kwargs) :
def MakeSubtractionTool(shapeKey, moment_name='', momentOnly=False, **kwargs) :
HIJetConstituentSubtractionTool=CompFactory.HIJetConstituentSubtractionTool
- suffix=shapeKey
+ suffix=shapeKey.toStringProperty()
if momentOnly : suffix+='_'+moment_name
if 'modulator' in kwargs.keys() : mod_tool=kwargs['modulator']
@@ -371,7 +371,8 @@ def HITruthParticleCopy() :
def BuildHarmonicName(shape_key, **kwargs) :
tname=shape_key
if 'harmonics' in kwargs.keys() :
- for n in kwargs['harmonics'] : tname += '_V%d' % n
+ for n in kwargs['harmonics'] :
+ tname = str(tname) + str('_V%d' % n)
return tname
def GetNullModulator() :
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py b/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
index 6b3eceb986b555e628ea75c62dd81db92ce6e2e3..16b212838a3b966e2be1413e349df7433e9187e5 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
@@ -197,7 +197,7 @@ unsubtr_suffix=HIJetFlags.UnsubtractedSuffix()
for k in jtm.jetrecs :
if unsubtr_suffix in k.name() :
in_name=k.OutputContainer
- out_name=in_name.replace("_%s" % unsubtr_suffix,"")
+ out_name=in_name.toStringProperty().replace("_%s" % unsubtr_suffix,"")
#>slight tweak in case R=1.0 jets are requestd, add some substructure tools
modifiers=GetHIModifierList(out_name,hi_tools)
if '10HIJets' in k.name() :
diff --git a/Reconstruction/Jet/JetMomentTools/CMakeLists.txt b/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
index 832412f363214f985b1eec465fbb37088995a27f..199ae2a0aabbb0982197463d5220f84c3f448d81 100644
--- a/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
@@ -27,15 +27,11 @@ if( NOT XAOD_STANDALONE )
LINK_LIBRARIES ${Boost_LIBRARIES} ${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} AsgTools CaloIdentifier xAODCaloEvent xAODJet GaudiKernel JetCalibToolsLib JetEDM JetInterface JetRecLib JetUtils PFlowUtilsLib PathResolver JetMomentToolsLib ${extra_libs} )
endif()
-#if( XAOD_STANDALONE )
atlas_add_dictionary( JetMomentToolsDict
Root/JetMomentToolsDict.h
Root/selection.xml
LINK_LIBRARIES JetMomentToolsLib PFlowUtilsLib )
-#endif()
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_runtime( share/*.root )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_data( share/*.root )
-
diff --git a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexTaggerTool.h b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexTaggerTool.h
index aa52d5990dc300d3fd2ccf95f5b2b74374d7ccb4..2227f68e2e2708b5eaed6daa4426921e36f51836 100644
--- a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexTaggerTool.h
+++ b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexTaggerTool.h
@@ -21,7 +21,7 @@
/// JVFCorr: a corrected JVF calculation accounting for the number of PU tracks in the event.
///
/// Calculation requires three main types of information
-/// 1. Vertex container for the event (from evtStore), with respect to which the JVT track sums
+/// 1. Vertex container for the event (from evtStore), with respect to which the JVT track sums
/// 2. Tracks associated to each of the input jet (in the jet aux store)
/// 3. Track vertex association object (from evtStore)
/// 4. The track container needed for PU track counting
@@ -44,7 +44,7 @@
/// AssociatedTracks - name for attribute holding the list of associated tracks
/// TrackVertexAssociation - name for the container holding the track-vertex associations
/// TrackSelector - tool to select tracks (none ==> no selection)
-/// JVTFileName - ROOT Filename containing JVT likelihood histogram
+/// JVTFileName - ROOT Filename containing JVT likelihood histogram
/// JVTLikelihoodHistName - JVT Likelihood histogram name
/// JVTName - name for the 3 JVT attributes (default is "JVT")
/// K_JVFCorrScale - the scale factor for pileup tracks in the JVFCorr calculation (default is 0.01)
@@ -107,7 +107,7 @@ private: // data
// Configurable parameters
Gaudi::Property<std::string> m_jetContainerName{this,"JetContainer", "", "SG key for the input jet container"};
Gaudi::Property<std::string> m_jvtlikelihoodHistName{this, "JVTLikelihoodHistName", "JVTRootCore_kNN100trim_pt20to50_Likelihood", "JVT likelihood histogram name"};
- Gaudi::Property<std::string> m_jvtfileName{this, "JVTFileName", "JVTlikelihood_20140805.root", "JVT likelihood file name"};
+ Gaudi::Property<std::string> m_jvtfileName{this, "JVTFileName", "JetMomentTools/JVTlikelihood_20140805.root", "JVT likelihood file name"};
SG::ReadHandleKey<xAOD::VertexContainer> m_vertexContainer_key{this, "VertexContainer", "PrimaryVertices", "SG key for input vertex container"};
SG::ReadDecorHandleKey<xAOD::JetContainer> m_jvfCorrKey{this, "JVFCorrName", "JVFCorr", "SG key for input JVFCorr decoration"};
@@ -123,4 +123,3 @@ private: // data
#endif
-
diff --git a/Reconstruction/Jet/JetMomentTools/python/GhostAssociation.py b/Reconstruction/Jet/JetMomentTools/python/GhostAssociation.py
index 69cf912d32e544fde5b49c644aec375ba48b4223..09d8d3b0c3283074d4dbcead50e56b9c775a2d49 100644
--- a/Reconstruction/Jet/JetMomentTools/python/GhostAssociation.py
+++ b/Reconstruction/Jet/JetMomentTools/python/GhostAssociation.py
@@ -1,8 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from __future__ import print_function
-
-from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.AlgSequence import AlgSequence
def interpretJetName(jetcollName, finder = None,input=None, mainParam=None):
# first step : guess the finder, input , mainParam, if needed
if finder is None:
diff --git a/Reconstruction/Jet/JetMomentTools/python/JetCopyMomentsAlg.py b/Reconstruction/Jet/JetMomentTools/python/JetCopyMomentsAlg.py
deleted file mode 100644
index 34de18617863d5299dd0536af71076746f9008d0..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetMomentTools/python/JetCopyMomentsAlg.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# @file: JetMomentTools/python/JetCopyMomentsAlg.py.py
-# @purpose: <Copy some moments from a collection to another >
-# @author: P-A Delsart <delsart in2p3 fr>
-
-__doc__ = 'some documentation here'
-__version__ = '$Revision: 1.5 $'
-__author__ = 'Sebastien Binet <binet@cern.ch>'
-
-import AthenaCommon.SystemOfUnits as Units
-import AthenaPython.PyAthena as PyAthena
-from AthenaPython.PyAthena import StatusCode
-import ROOT
-
-class JetCopyMomentsAlg (PyAthena.Alg):
- 'put some documentation here'
- def __init__(self, name='JetCopyMomentsAlg', **kw):
- ## init base class
- kw['name'] = name
- super(JetCopyMomentsAlg, self).__init__(**kw)
-
- ## properties and data members
- self.Moments = kw.get('Moments', []) # default value
- self.JetCollectionSrc = kw.get('JetCollectionSrc', "") # default value
- self.JetCollectionDest = kw.get('JetCollectionDest', "") # default value
- return
-
- def initialize(self):
- self.msg.info('==> initialize...')
- self.sg = PyAthena.py_svc ('StoreGateSvc')
- return StatusCode.Success
-
- def execute(self):
- jcoll_src = list(self.sg.retrieve('JetCollection', self.JetCollectionSrc))
- jcoll_dest = list(self.sg.retrieve('JetCollection', self.JetCollectionDest))
-
- # sort on constit scale to help with ordering.
- jcoll_dest.sort(key= lambda x: x.pt(2) )
- jcoll_src.sort(key= lambda x: x.pt(2) )
- getMoment = ROOT.Jet.getMoment
- moments = self.Moments
-
- dr = ROOT.JetDistances.deltaR
- needUnorderedMatch = False
- for i, (jS, jD) in enumerate(zip(jcoll_src, jcoll_dest)):
- if dr(jS,jD)>0.05:
- needUnorderedMatch = True
- break
- for m in moments:
- jD.setMoment(m,jS.getMoment(m))
-
- if needUnorderedMatch :
- # this may happen because of final Pt cut and a calibration changing order w.r.t lcscale.
- # fall back to a double loop with deltaR check on remaining jets
- jcoll_src = jcoll_src[i:]
- jcoll_dest = jcoll_dest[i:]
- for jS in jcoll_src:
- for jD in jcoll_dest:
- if dr(jS,jD)<0.05:
- for m in moments:
- jD.setMoment(m,jS.getMoment(m))
-
-
-
- return StatusCode.Success
-
- def finalize(self):
- self.msg.info('==> finalize...')
- return StatusCode.Success
-
- # class JetCopyMomentsAlg
diff --git a/Reconstruction/Jet/JetMomentTools/python/JetMomentsConfigHelpers.py b/Reconstruction/Jet/JetMomentTools/python/JetMomentsConfigHelpers.py
deleted file mode 100644
index 17936d2531bc8262a9b0d8fc8abbc28da003bd94..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetMomentTools/python/JetMomentsConfigHelpers.py
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-"""
-A set of helper function to configure calculations of additionnal jet moments.
-
-"""
-from JetRec.JetAlgConfiguration import checkAndUpdateOptions, standardJetOption
-from RecExConfig.RecFlags import rec
-from AthenaCommon.SystemOfUnits import GeV
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.Logging import logging
-from AthenaCommon.JobProperties import jobproperties
-
-from JetRec.JetRecFlags import jetFlags
-from JetRec.JetFinderConfig import setupAreaCalculation
-
-from JetMomentTools.SetupJetMomentTools import *
-
-
-## A dedicated logger
-_momlog = logging.getLogger( 'JetMomentConfig' )
-
-
-# We try to schedule cpu intensive moment calculation only once. This requires to keep track of
-# moments already scheduled for a given collection. Use this dictionnary.
-_specialMomentAlgDict = {}
-
-# Some moments request can translate in modification of option to already scheduled moment tool.
-# so we keep only one main algorithm (JetAlgorithm or JetMomentCalculator) per jet collection, in order to be able to
-# retrieve & modify the relevant moment tool.
-# However this can cause dependency issue :
-# for example, truth ghostAssoc requires JetTruthParticleFilter to run before. If a 1st call doesn't require truth ghost assoc, then later a 2nd call does, then JetTruthParticleFilter will be scheduled *after* the moment calculator alg...
-# workaround : move by jand JetTruthParticleFilter at a proper place in the topSequence or the PreD3PDSequence.
-def moveAlgInSequence(alg, seq, newpos):
- l = seq.getChildren()
- delattr(seq, alg.getName())
- seq.insert(newpos, alg)
-
-
-def checkRequiredAlgPosition(seq, momAlg, requiredAlg):
- topSeq = AlgSequence()
-
- if requiredAlg in topSeq:
- truthInd = topSeq.getChildren().index(requiredAlg)
- if momAlg in topSeq:
- index = topSeq.getChildren().index(momAlg)
- else:
- # then it is in seq, and seq must be in topSeq
- index = topSeq.getChildren().index(seq)
- # make sure requiredAlg is before index
- if truthInd > index:
- moveAlgInSequence(requiredAlg, topSeq, index)
- else:
- # will move requiredAlg in topSeq before seq and momAlg
- # where is momAlg ?
- seqInd = topSeq.getChildren().index(seq)
- if momAlg in topSeq:
- index = topSeq.getChildren().index(momAlg)
- else:
- index = seqInd
- delattr(seq, requiredAlg.getName())
- topSeq.insert(index, requiredAlg)
-
-
-
-def checkTruthParticleFilterPosition(seq, momAlg):
- from JetSimTools.JetTruthParticleFilterGetter import JetTruthParticleFilterGetter
- truthAlg = JetTruthParticleFilterGetter().alg
- checkRequiredAlgPosition(seq, momAlg, truthAlg)
-
-
-
-def retrieveFinderTool(toolSeq):
- from JetRec.JetRecConf import JetConeFinderTool, JetFastJetFinderTool
- for t in toolSeq:
- if isinstance(t, JetFastJetFinderTool) or isinstance(t, JetConeFinderTool):
- return t
-
-
-import inspect
-def whosdaddy():
- l = [ ll[3] for ll in inspect.stack()[2:] ]
- return l
-
-
-
-
-
-# Helper functions to schedule jet moments.
-# They are typically wrappers around functions in SetupJetMomentTools which are as generic as possible
-# The wrappers below also perform tasks related to the particular jet collection or configuration sequence.
-def scheduleMFTool(toolType,jetcollname, jf, alg, seq ,*l):
- from JetMomentTools.SetupJetMomentTools import getMatchingFractionTool
- tool, requiredAlg = getMatchingFractionTool(jetcollname, toolType, seq)
- checkRequiredAlgPosition(seq, alg, requiredAlg)
- return tool
-
-from JetMomentTools.JetMomentToolsConf import JetWidthTool, NumTowerInJetTool, JetEinSamplingTool
-
-
-# The dictionnary below lists the known standard moments and how to compute them.
-# keys in the dict are shorcuts, they might represent several moments
-# values are function used to actually schedule the moment calculations
-defaultMoments = {
- 'ghostAssoc' : lambda *l : None,
- 'area' : lambda jcoll,jetfinder,*l : setupAreaCalculation(jetfinder, "ActiveArea", addArea4Vec=True, addSecondArea=jetFlags.jetPerformanceJob() ) ,
- 'quality' : lambda jetcollname,*l : getCaloQualityTool(doCellBasedVars = (jetcollname=="AntiKt4TopoEMJets" or "Tower" in jetcollname ), computeFromCluster = "Tower" not in jetcollname ),
- 'ktDeltaR' : lambda *l : getsubJetsMomentTool(),
- 'isolation' : lambda *l : getJetIsolationTool("JetIsolation"),
- 'jvf' : lambda jetcollname,*l : getJetVertexAssociationTool(toolName=jetcollname+'JVAtool') ,
- 'jvt' : lambda jetcollname,*l : getJetVertexAssociationTool(toolName=jetcollname+'JVAtool') ,
- 'trackMoments' : lambda *l : getJetTracksMomentTool(),
- 'clusMoments' : lambda *l : getJetClusterMomentTool(),
- 'truthMF' : lambda *l : scheduleMFTool("Truth",*l) ,
- 'trackMF' : lambda *l : scheduleMFTool("Track",*l) ,
- 'larHV' : lambda *l : getJetLArHVMomentTool(),
- 'width' : lambda *l : JetWidthTool(),
- 'eInSampling' : lambda *l : JetEinSamplingTool(),
- 'numTowerJet' : lambda *l : NumTowerInJetTool(),
- 'badChanCorr' : lambda jc,jf,alg,seq,jetAlgConfigDict : getJetBadChanCorrTool(**jetAlgConfigDict),
- 'origin' : lambda jetcollname,*l : getORIGINMoments(jetcollname),
- }
-
-
-## The list of standard moments keys used in reconstruction.
-standardMoments = standardJetOption("jetMoments")
-
-class TestWithMsg(object):
- """Simply a boolean and a str message explaining why the boolean is False
- Also supports & and | operation (logical and or) with concatenation of message"""
- jetcollname=""
- def __init__(self, test, failmsg):
- self.test, self.failmsg= test, failmsg
- def check(self, mName):
- if self.test:
- return True
- _momlog.info( "No "+mName+" moments for "+self.jetcollname+". Reason : "+self.failmsg)
- return False
- def __and__(self, o ):
- test = self.test and o.test
- failmsg = [ t.failmsg for t in (self,o) if not t.test ]
- return TestWithMsg( test, ' AND '.join(failmsg) )
- def __or__(self, o ):
- test = self.test or o.test
- failmsg = '' if test else self.failmsg+' AND '+o.failmsg
- return TestWithMsg( test, failmsg )
-
-
-def checkMomentAvailability(jetcollname, momentList, jetAlgConfigDict={}):
- """ Input : a jet collection name (jetcollname), list of moment keys (momentList), a jet alg configuration dict (as in JetRec.JetAlgConfiguration)
- returns a filtered list of moment keys where moments incompatible with the jet collection or the job conditions are removed.
- """
- # we'll need to know what the input file is
- from JetRec.JetGetters import guessInputFileType
- inputFileType = guessInputFileType()
-
-
-
- from AthenaCommon.DetFlags import DetFlags
- from AthenaCommon.AppMgr import ToolSvc
- from AthenaCommon.GlobalFlags import globalflags
- from JetRec.TrackSelectionForJets import tracksAvailableForJets
-
- TestWithMsg.jetcollname = jetcollname
- # short cut flags
- # use TestWithMsg rather than simply bool only to be able to display a reason for the rejection of the moment.
- accessCells = TestWithMsg( (inputFileType=="RDO") or (inputFileType=="ESD") , "No CaloCell available")
- caloJet = TestWithMsg( ("Topo" in jetcollname) or ("Tower" in jetcollname), "Not calo jets")
- topoJet = TestWithMsg( "Topo" in jetcollname, "Not TopoCluster jets")
- lctopoJet = TestWithMsg( "LCTopo" in jetcollname, "Not LC TopoCluster jets")
- notTruthJet = TestWithMsg( 'Truth' not in jetcollname, "Is Truth jets")
- tracksAvailable = TestWithMsg( tracksAvailableForJets(), "Tracks selection for jets impossible")
-
- trueTest = TestWithMsg(True,"")
-
- # build the conditions at which moments can be built
- compatibilityDict = {
- 'area' : TestWithMsg('Cone' not in jetcollname, "no area for cone jets"),
- 'ghostAssoc' : notTruthJet,
- 'width' : trueTest,
- 'numTowerJet' : topoJet & accessCells,
- 'quality' : caloJet,
- 'badChanCorr' : caloJet & accessCells,
- 'constitCalib': lctopoJet & TestWithMsg( not jetAlgConfigDict.get('calibName','').startswith("LC:CONST") , "Calibration differ from LC:CONST") ,
- 'jvf' : caloJet & tracksAvailable,
- 'larHV' : caloJet & TestWithMsg( (inputFileType=='RDO') and DetFlags.dcs.LAr_on() and globalflags.DataSource()=='data', "No proper LAr info available"),
- 'eInSampling' : (caloJet & accessCells) | (topoJet),
- 'truthMF' : TestWithMsg( rec.doTruth() , "Truth not available") & notTruthJet,
- 'trackMF' : notTruthJet & tracksAvailable,
- 'trackMoments': notTruthJet & tracksAvailable,
-
- }
-
- # filter moments :
- availableMoments = set([ m for m in momentList if compatibilityDict.get(m, trueTest).check(m) ])
- return availableMoments
-
-
-
-
-def findMainAlgForJetCollection(jetcollname, seq = AlgSequence()):
- """Given a JetCollection name (jetcollname) in input, returns an algorithm computing moments for this collection.
- The functions explore all know possibilities for finding such algs.
-
- The return value is (alg, set) where
- - alg is a JetAlgorithm or a JetMomentCalculator. alg can be None if nothing found or unusable in the case a JetGetter was called with the disable option.
- - set : is the set of known moments associated to the alg
- """
- # try to find a moment calculator for this collection :
- alg , existing_moments = _specialMomentAlgDict.get( jetcollname, (None,set()) )
- unknownAlg = alg is None
-
- if alg is None:
- # try to find a getter :
- from JetRec.JetGetters import retrieveConfiguredJetAlg
- alg = retrieveConfiguredJetAlg(jetcollname, retrieveGetter=True)
- if alg is not None:
- # check if usable :
- if not alg.usable():
- return ('unusable', set())
-
- # get the real JetAlgorithm
- alg = alg.jetAlgorithmHandle()
- # in this case, no moment have been associated yet
- existing_moments = set()
- if alg is None:
- # check if a collection exists in input file
- from RecExConfig.ObjKeyStore import objKeyStore
- if 'JetCollection#'+jetcollname in objKeyStore['inputFile'].list("JetCollection"):
- # then create a new moment alg for this collection
- from JetRec.JetMomentGetter import getJetMomentAlgorithm
- alg = getJetMomentAlgorithm(jetcollname, seq = seq)
- else:
- # likely to fail...
- # try to invoke a standard JetAlgorithm
- from JetRec.JetRec_defaults import standardJetAlgorithm
- try :
- alg = standardJetAlgorithm(jetcollname, seq = seq)
- except:
- alg = None #
- if unknownAlg and alg is not None:
- # we created a new alg, remember it
- _specialMomentAlgDict[jetcollname] = (alg, set() )
- return alg, existing_moments
-
-from JetRec.JetRecConf import JetAlgorithm
-from JetMomentTools.JetMomentToolsConf import JetMomentCalculator
-def addStandardMoments(jetcollname, moments=standardMoments, seq = AlgSequence(), jetAlgConfigDict={}):
- """Add a list of jet moment calculation for a given jet collection
- - jetcollname : string, the name of the jetcollection
- - moments : list of string or function. string are expected to be some of the defaultMoment shortcuts. functions must return a configured moment tool
- - seq : the AlgSequence to which the calculation is attached
- (- jetAlgConfigDict : dictionnary, used to pass JetAlgorithm configuration options when this addStandardMoments is called while configuring the JetAlgorithm.)
- Returns nothing.
- Effect : retrieve (or invoke if needed) the moment calculation algorithm dedicated to jetcollname (this can be a JetAlgorithm or a JetMomentCalculator),
- then add to this algorithm the moments requested in defaultMoment (only if they are not already scheduled).
- """
-
- if moments == []:
- # nothing to do. Return now to avoid any inconvenience
- return
-
- # retrieve the main algorithm for this jet collection
- alg, existing_moments = findMainAlgForJetCollection(jetcollname, seq)
-
-
- # check if the alg is usable ---------
- if alg == 'unusable':
- _momlog.info("No usable algorithm for "+jetcollname+". No jet moments added")
- return
- if alg is None :
- # didn't find any alg. We can't add moments
- _momlog.error("Can't create momens for "+jetcollname+" : no such collection in input or no algorithms scheduled for it")
- _momlog.error(" ---> possible solution, invoke make_StandardJetGetter() before to schedule a JetAlgorithm for "+jetcollname)
- return
-
- isJetMomentCalc = isinstance(alg, JetMomentCalculator)
-
- # filter moment list according to jet collection and other conditions
- missing_moments = checkMomentAvailability( jetcollname, set(moments) - existing_moments , jetAlgConfigDict )
-
- # enforce ghostAssoc, thus jet refinding, if area requested (could separate the 2 options with more config) when using a JetMomentCalculator
- if 'area' in missing_moments and ('ghostAssoc' not in existing_moments) and isJetMomentCalc:
- missing_moments.add('ghostAssoc')
-
-
- jetfinder = None
- # ghost association is very particular since it needs jet finding.
- if 'ghostAssoc' in missing_moments:
- gAssoc = []
- from JetRec.TrackSelectionForJets import tracksAvailableForJets
- if tracksAvailableForJets() :
- gAssoc += ["TrackAssoc"]
- if rec.doTruth():
- gAssoc+=[ "TruthAssoc"]
- if isJetMomentCalc:
- from JetMomentTools.GhostAssociation import setupGhostAssociationTool
- gtool = setupGhostAssociationTool(jetcollname, gAssoc, seq=seq)
- tmpL = alg.CalculatorTools
- alg.CalculatorTools = [gtool] + tmpL
- else: # it's a JetAlgorithm
- tmpL = list(alg.AlgTools)
- from JetRec.JetGetters import adaptToolListToGhostAssociation
- alg.AlgTools = adaptToolListToGhostAssociation(tmpL, gAssoc, seq)
- if rec.doTruth():
- checkTruthParticleFilterPosition( seq, alg)
-
- jetfinder = alg.CalculatorTools['JetGhostAsso'].JetFindingSequence["JetFastJetFinder"] if isJetMomentCalc \
- else alg.AlgTools[0].JetFindingSequence["JetFastJetFinder"]
-
- # we are done with ghostAssoc
- missing_moments.remove('ghostAssoc')
- existing_moments.add('ghostAssoc')
- else: # still need to retrieve the jetfinder
- if 'ghostAssoc' in existing_moments:
- jetfinder = alg.CalculatorTools['JetGhostAsso'].JetFindingSequence["JetFastJetFinder"] if isJetMomentCalc \
- else alg.AlgTools[0].JetFindingSequence["JetFastJetFinder"]
- else:
- jetfinder = retrieveFinderTool( alg.CalculatorTools if isJetMomentCalc else alg.AlgTools)
-
- momentTools = []
- # Loop over requested moment types and set-up the related tools
- for momentType in missing_moments:
- if callable(momentType):
- # then assume a function returning a tool has been supplied
- func = momentType
- else:
- func = defaultMoments[momentType]
- # call the setup function, add the returned tool to the sequence
- tool = func( jetcollname, jetfinder, alg, seq, jetAlgConfigDict)
- if tool is not None: # some function just adapts existing tools
- momentTools.append(tool)
-
- # add the moment tools list to the relevant alg :
- if isJetMomentCalc:
- alg.CalculatorTools += momentTools
- else:
- alg.AlgTools += momentTools
-
- _specialMomentAlgDict[jetcollname] = (alg, missing_moments.union(existing_moments) )
- return alg
-
-
-
-
-def recommendedAreaAndJVFMoments(jetcollname, oldMomentNames=False,seq=AlgSequence()):
- """Recompute the area, JVF and track related jet moment on jetcollname.
-
- jetcollname : string a JetCollection StoreGate key
- oldMomentNames : bool, if True the moment naming will be the same as in 17.2.5 and previous releases.
- """
-
- alg = addStandardMoments(jetcollname,moments = ['ghostAssoc','area','jvf', 'trackMoments'], seq=seq)
-
- return alg
-
-def recommendedAreaAndJVF_StandardJetGetter( finder, mainParam, input, oldMomentNames=False, **options):
- """Run a jet algorithm, adding the recomended area, JVF and track related jet moments calculation.
-
- all argument similar as in make_StandardJetGetter except :
-
- oldMomentNames : bool, if True the moment naming will be the same as in 17.2.5 and previous releases.
- """
- return make_StandardJetAlg(finder, mainParam, input, jetMoments = ['ghostAssoc','area','jvf', 'trackMoments'], **options)
- #alg = specialJet( finder, mainParam, input, oldMomentNames = oldMomentNames, moments=['ghostAssoc','area','jvf', 'trackMoments'], **options)
diff --git a/Reconstruction/Jet/JetRec/CMakeLists.txt b/Reconstruction/Jet/JetRec/CMakeLists.txt
index c37361923ea85d8f008a887adafc6276e62abed3..d3c3ae860f858d5c3ff2ef6f3a9dc9841a2923a5 100644
--- a/Reconstruction/Jet/JetRec/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRec/CMakeLists.txt
@@ -87,10 +87,10 @@ atlas_add_test(JetClustererTest
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${GTEST_LIBRARIES} JetRecLib )
-if ( NOT GENERATIONBASE AND NOT XAOD_STANDALONE )
+if ( NOT GENERATIONBASE AND NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
atlas_add_test(JetRecAlg_Test SCRIPT share/JetRecAlgTestCfg.py )
endif()
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/Jet/JetRec/JetRec/PseudoJetContainer.h b/Reconstruction/Jet/JetRec/JetRec/PseudoJetContainer.h
index 94eacde5975589ab50bb2cf4d540ff5f21c78642..ff826d001bd6b699cc92a761b3fe7d37030963c7 100644
--- a/Reconstruction/Jet/JetRec/JetRec/PseudoJetContainer.h
+++ b/Reconstruction/Jet/JetRec/JetRec/PseudoJetContainer.h
@@ -6,7 +6,7 @@
#define PseudoJetContainer_H
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -40,6 +40,7 @@
#include <vector>
#include <string>
#include <set>
+#include <memory>
typedef std::vector<fastjet::PseudoJet> PseudoJetVector;
@@ -51,7 +52,7 @@ public:
// Constructor from a ConstituentExtractor and vector<PseudoJet>
// PseudoJet OWNS their ConstituentExtractors
- PseudoJetContainer(const IConstituentExtractor* c,
+ PseudoJetContainer(std::unique_ptr<const IConstituentExtractor> c,
const std::vector<PseudoJet> & vecPJ,
bool debug=false);
@@ -101,8 +102,8 @@ private:
struct ExtractorRange {
ExtractorRange(unsigned int lo,
unsigned int hi,
- const IConstituentExtractor* e):
- m_lo(lo), m_hi(hi), m_e(e){
+ std::unique_ptr<const IConstituentExtractor> e):
+ m_lo(lo), m_hi(hi), m_e(std::move(e)){
}
ExtractorRange(const ExtractorRange& other)
@@ -123,19 +124,14 @@ private:
swap(*this, other);
return *this;
}
-
-
- ~ExtractorRange(){
- delete m_e;
- }
ExtractorRange bump(int step) const {
- return ExtractorRange(m_lo + step, m_hi + step, m_e->clone());
+ return ExtractorRange(m_lo + step, m_hi + step, std::unique_ptr<const IConstituentExtractor>(m_e->clone()));
}
int m_lo;
int m_hi;
- const IConstituentExtractor* m_e;
+ std::unique_ptr<const IConstituentExtractor> m_e{};
};
std::vector<ExtractorRange> m_extractorRanges;
@@ -144,7 +140,7 @@ private:
// created by the creating PseudoJetGetter. We need to keep track
// of the empty extractors to fill zero information (such as 0 counts)
// into the jets.
- std::set<const IConstituentExtractor*> m_emptyExtractors;
+ std::set<std::unique_ptr<const IConstituentExtractor>> m_emptyExtractors;
mutable bool m_debug{false};
};
diff --git a/Reconstruction/Jet/JetRec/Root/JetByVertexFinder.cxx b/Reconstruction/Jet/JetRec/Root/JetByVertexFinder.cxx
index 37803539ab0ec570a48950566b495a01c3ac07a9..0c4cabcd51bcc34121a322208de7731b65be79b5 100644
--- a/Reconstruction/Jet/JetRec/Root/JetByVertexFinder.cxx
+++ b/Reconstruction/Jet/JetRec/Root/JetByVertexFinder.cxx
@@ -84,9 +84,7 @@ int JetByVertexFinder::find_(const PseudoJetContainer& cont,
string sinp0 = xAOD::JetInput::typeName(inputtype);
ATH_MSG_DEBUG(" Input type: " << sinp0);
- // FIXME - bypass const of cont parameter
- PseudoJetContainer content = cont;
- const std::vector<PseudoJet>* vpj = content.casVectorPseudoJet();
+ const std::vector<PseudoJet>* vpj = cont.casVectorPseudoJet();
std::vector<PseudoJetVector> psjvectors;
std::vector<const Vertex*> vertices;
diff --git a/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx b/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx
index 449796aacf5631518017cf5a495ab26a179645bb..7536c404f364cb6e118e7ab1084a971092275a2b 100644
--- a/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx
+++ b/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.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
*/
// PseudoJetContainer.cxx
@@ -20,15 +20,15 @@ using fastjet::PseudoJet;
PseudoJetContainer::PseudoJetContainer() {
checkInvariants("PseudoJetContainer()");
}
-
-PseudoJetContainer::PseudoJetContainer(const IConstituentExtractor* c,
+
+PseudoJetContainer::PseudoJetContainer(std::unique_ptr<const IConstituentExtractor> c,
const std::vector<PseudoJet> & vecPJ,
bool debug){
m_debug = debug;
if (vecPJ.empty()){
- m_emptyExtractors.insert(c);
+ m_emptyExtractors.insert(std::move(c));
return;
}
@@ -37,13 +37,12 @@ PseudoJetContainer::PseudoJetContainer(const IConstituentExtractor* c,
// the limits of the Extractor index range correposnd to the
// numbering of the EDM objects in th extractors.
- m_extractorRanges.push_back(ExtractorRange(0,
- vecPJ.back().user_index(),
- c));
+ m_extractorRanges.emplace_back(0,
+ vecPJ.back().user_index(),
+ std::move(c));
if (m_debug){checkInvariants("PseudoJetContainer(vcPJ, c)");}
}
-
bool
PseudoJetContainer::extractConstituents(xAOD::Jet& jet,
const std::vector<PseudoJet>& inConstits) const
@@ -61,12 +60,12 @@ PseudoJetContainer::extractConstituents(xAOD::Jet& jet,
// to the extractor is received. But an empty list is used
// by the extractors to fill zeros into the jet.
for(const auto& er : m_extractorRanges){
- sorter.emplace(er.m_e, std::vector<int>{});
+ sorter.emplace(er.m_e.get(), std::vector<int>{});
}
// see header file for explanation of empty extractors.
for(const auto& e : m_emptyExtractors){
- sorter.emplace(e, std::vector<int>{});
+ sorter.emplace(e.get(), std::vector<int>{});
}
// check whether inputs are lgal if m_debug == true
@@ -92,7 +91,7 @@ PseudoJetContainer::extractConstituents(xAOD::Jet& jet,
if(e == m_extractorRanges.end()){return false;}
- sorter[(*e).m_e].push_back(pj_ind - (*e).m_lo);
+ sorter[(*e).m_e.get()].push_back(pj_ind - (*e).m_lo);
}
// send the jet to the each extractor with a vector of EDM
@@ -137,7 +136,7 @@ void PseudoJetContainer::append(const PseudoJetContainer* other) {
pj.set_user_index(pj.user_index() + offset);return pj;}
);
- for(auto e : other->m_emptyExtractors){m_emptyExtractors.insert(e);}
+ for(const auto &e : other->m_emptyExtractors){m_emptyExtractors.emplace(e->clone());}
if (m_debug){checkInvariants("append()");}
}
@@ -158,7 +157,7 @@ std::string PseudoJetContainer::toString(int level, int extLevel) const {
oss << "\n Extractor dump: \n";
for(const auto& er : m_extractorRanges){
oss << "Extractor at [" ;
- oss << er.m_e;
+ oss << er.m_e.get();
oss << "]\n";
oss << er.m_e->toString(extLevel) << '\n';
}
diff --git a/Reconstruction/Jet/JetRec/python/FastJetInterfaceConfig.py b/Reconstruction/Jet/JetRec/python/FastJetInterfaceConfig.py
index d9641147035eca31a06e7ddc30c70eb43925bc47..26ce5e8a3f2621d6cd0def553a01a39b3a93fe92 100644
--- a/Reconstruction/Jet/JetRec/python/FastJetInterfaceConfig.py
+++ b/Reconstruction/Jet/JetRec/python/FastJetInterfaceConfig.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-from AthenaCommon.SystemOfUnits import *
+from AthenaCommon.SystemOfUnits import GeV
from AthenaCommon.Logging import logging
from JetRec.JetRecConf import FastJetInterfaceTool
@@ -96,10 +96,10 @@ def checkAndUpdate(**options):
for k in options.keys():
if k not in defFastJetInterfaceConfigDict :
if ignoreUnknown :
- _fastjetLog.warning("Option %s unknown - ignoring it!"%(k))
+ _fastjetLog.warning("Option %s unknown - ignoring it!",k)
options.pop(k)
else :
- _fastjetLog.error("Option %s unknown - abort configuration!"%(k))
+ _fastjetLog.error("Option %s unknown - abort configuration!",k)
raise Exception
checkedOptions = dict(defFastJetInterfaceConfigDict)
@@ -114,7 +114,6 @@ def checkAndUpdate(**options):
# check settings for Strategy
key = "Strategy"
# print checkedOptions
- tag = checkedOptions[key]
_fastjetLog.info("Test option %s",key)
if checkedOptions[key] not in fastjet_conf_tags.Strategy :
_fastjetLog.error("Strategy \042%s\042 not recognized - fatal! Allowed values are: ",checkedOptions['Strategy'])
diff --git a/Reconstruction/Jet/JetRec/python/JetAlgorithm.py b/Reconstruction/Jet/JetRec/python/JetAlgorithm.py
index 24aaf13dddf0b2a13ef2d1ddf59ffb223ca4211f..79ea227347daa777062e3123ea6bb200d2de49d2 100644
--- a/Reconstruction/Jet/JetRec/python/JetAlgorithm.py
+++ b/Reconstruction/Jet/JetRec/python/JetAlgorithm.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# JetAlgorithm.py
#
@@ -40,16 +40,16 @@ def addJetRecoToAlgSequence(job =None, useTruth =None, eventShapeTools =None,
from JetRec.JetRecStandard import jtm
# Set sequence and flags as needed.
- if job == None:
+ if job is None:
from AthenaCommon.AlgSequence import AlgSequence
job = AlgSequence()
- if useTruth == None:
+ if useTruth is None:
useTruth = jetFlags.useTruth()
- if eventShapeTools == None:
+ if eventShapeTools is None:
eventShapeTools = jetFlags.eventShapeTools()
- if eventShapeTools == None:
+ if eventShapeTools is None:
eventShapeTools = []
- if separateJetAlgs == None:
+ if separateJetAlgs is None:
separateJetAlgs = jetFlags.separateJetAlgs()
@@ -198,7 +198,7 @@ def addJetRecoToAlgSequence(job =None, useTruth =None, eventShapeTools =None,
from JetRec.JetRecConf import JetToolRunner
jtm += JetToolRunner("jetrun",
EventShapeTools=[],
- Tools=rtools+jtm.jetrecs,
+ Tools=jtm.jetrecs,
Timer=jetFlags.timeJetToolRunner()
)
runners += [jtm.jetrun]
diff --git a/Reconstruction/Jet/JetRec/python/JetFlavorAlgs.py b/Reconstruction/Jet/JetRec/python/JetFlavorAlgs.py
index d80bd05895640485e7b7081152baedea8a956cf9..3bc37378ac2120d1e7271ac3ca77c80f3fdbb35b 100644
--- a/Reconstruction/Jet/JetRec/python/JetFlavorAlgs.py
+++ b/Reconstruction/Jet/JetRec/python/JetFlavorAlgs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# JetFlavorAlgs.py
#
@@ -20,7 +20,6 @@ def scheduleCopyTruthParticles():
from ParticleJetTools.ParticleJetToolsConf import CopyFlavorLabelTruthParticles
from ParticleJetTools.ParticleJetToolsConf import CopyBosonTopLabelTruthParticles
from ParticleJetTools.ParticleJetToolsConf import CopyTruthPartons
- from ParticleJetTools.CopyTruthParticlesAlg import CopyTruthParticlesAlg
tools = []
for ptype in jetFlags.truthFlavorTags():
diff --git a/Reconstruction/Jet/JetRec/python/JetRecStandard.py b/Reconstruction/Jet/JetRec/python/JetRecStandard.py
index 2773bc56b02f1af4086e9d1f0512253594b822e1..9f8f073385b046c51d0de29bdb2c982be57f9019 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecStandard.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecStandard.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# JetRecStandard.py
#
@@ -23,7 +23,6 @@ jetlog.info( myname + "Begin.")
from RecExConfig.RecFlags import rec
from InDetRecExample.InDetJobProperties import InDetFlags
-from JetRec.JetRecFlags import jetFlags
# Function to display flag value and status.
def sflagstat(flag):
@@ -106,7 +105,7 @@ if not recAlgs.doEFlow():
# Set the list of rho calculations.
# If caller has set jetFlags.eventShapeTools(), then we use those values.
-if jetFlags.eventShapeTools() == None:
+if jetFlags.eventShapeTools() is None:
jetFlags.eventShapeTools = []
if jetFlags.useTopo():
jetFlags.eventShapeTools += ['emtopo', 'lctopo']
@@ -117,7 +116,9 @@ if jetFlags.eventShapeTools() == None:
# Import the jet tool manager.
from JetRec.JetRecStandardToolManager import jtm
+jetlog.verbose("Initialised jtm with tools %s", jtm.tools)
# Import the constituent tool manager
from JetRecTools.ConstitToolManager import ctm
+jetlog.verbose("Initialised ctm with modifiers %s", ctm.modifiersMap)
jetlog.info( myname + "End." )
diff --git a/Reconstruction/Jet/JetRec/python/JetRecStandardToolManager.py b/Reconstruction/Jet/JetRec/python/JetRecStandardToolManager.py
index 4c1f68fb192209aa4b83c269981c2ba01199bbbe..5562d4a2b19c69aa453075b5b7ae3dff2ea77d71 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecStandardToolManager.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecStandardToolManager.py
@@ -15,8 +15,6 @@
from AthenaCommon import Logging
jetlog = Logging.logging.getLogger('JetRec_jobOptions')
-import copy
-
myname = "JetRecStandardToolManager.py: "
jetlog.info( myname + "Defining standard tools" )
@@ -73,13 +71,13 @@ jtm.ptminFinder = 2000
jtm.ptminFilter = 0
# Add standard tool definitions to the tool manager.
-import JetRec.JetRecStandardTools
+import JetRec.JetRecStandardTools as JetRecStandardTools
+jetlog.verbose("Use trigger store? %s", JetRecStandardTools.UseTriggerStore)
# Function to filter out skipped tools.
def filterout(skiptoolnames, tools):
outtools = []
remtoolnames = []
- nrem = 0
for tool in tools:
keep = True
for toolname in skiptoolnames:
diff --git a/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py b/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
index 954540ed1059119ad26602d40014d243ce6914a5..186a490c312dca7486c297db0143026739a93ffb 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# JetRecStandardTools.py
#
@@ -17,12 +17,9 @@
# Import the jet flags.
from JetRec.JetRecFlags import jetFlags
-if not "UseTriggerStore " in locals():
+if "UseTriggerStore " not in locals():
UseTriggerStore = False
-# get levels defined VERBOSE=1 etc.
-from GaudiKernel.Constants import *
-
from eflowRec.eflowRecFlags import jobproperties
from JetRec.JetRecStandardToolManager import jtm
@@ -38,13 +35,11 @@ from JetRecTools.JetRecToolsConf import SimpleJetTrackSelectionTool
from JetRecTools.JetRecToolsConf import TrackVertexAssociationTool
try:
- from JetRecCalo.JetRecCaloConf import MissingCellListTool
jtm.haveJetRecCalo = True
except ImportError:
jtm.haveJetRecCalo = False
from JetRec.JetRecConf import JetPseudojetRetriever
from JetRec.JetRecConf import JetConstituentsRetriever
-from JetRec.JetRecConf import JetRecTool
from JetRec.JetRecConf import JetFromPseudojet
from JetRec.JetRecConf import JetConstitRemover
from JetRec.JetRecConf import JetSorter
@@ -59,7 +54,6 @@ except ImportError:
from JetMomentTools.JetMomentToolsConf import JetWidthTool
from JetMomentTools.JetMomentToolsConf import JetCaloEnergies
try:
- from JetMomentTools.JetMomentToolsConf import JetJetBadChanCorrTool
jtm.haveJetBadChanCorrTool = True
except ImportError:
jtm.haveJetBadChanCorrTool = False
@@ -96,7 +90,7 @@ except ImportError:
try:
from ParticleJetTools.ParticleJetToolsConf import Analysis__JetQuarkLabel
jtm.haveParticleJetTools = True
-except:
+except ImportError:
jtm.haveParticleJetTools = False
if jtm.haveParticleJetTools:
from ParticleJetTools.ParticleJetToolsConf import Analysis__JetConeLabeling
@@ -295,16 +289,16 @@ jtm += MuonSegmentPseudoJetAlgorithm(
)
useVertices = True
-if False == jetFlags.useVertices:
+if not jetFlags.useVertices:
useVertices = False
-if True == jobproperties.eflowRecFlags.useUpdated2015ChargedShowerSubtraction:
+if jobproperties.eflowRecFlags.useUpdated2015ChargedShowerSubtraction:
useChargedWeights = True
else:
useChargedWeights = False
useTrackVertexTool = False
-if True == jetFlags.useTrackVertexTool:
+if jetFlags.useTrackVertexTool:
useTrackVertexTool = True
# Weight tool for charged pflow objects.
@@ -314,7 +308,7 @@ jtm += WeightPFOTool("pflowweighter")
import cppyy
try:
cppyy.load_library('libxAODBaseObjectTypeDict')
-except:
+except Exception:
pass
from ROOT import xAODType
xAODType.ObjectType
@@ -530,74 +524,6 @@ jtm += JetWidthTool("width")
# Calo layer energies.
jtm += JetCaloEnergies("jetens")
-# Read in missing cell map (needed for the following)
-# commented out : incompatible with trigger : ATR-9696
-## if jtm.haveJetRecCalo:
-## def missingCellFileReader():
-## import os
-## dataPathList = os.environ[ 'DATAPATH' ].split(os.pathsep)
-## dataPathList.insert(0, os.curdir)
-## from AthenaCommon.Utils.unixtools import FindFile
-## RefFileName = FindFile( "JetBadChanCorrTool.root" ,dataPathList, os.R_OK )
-## from AthenaCommon.AppMgr import ServiceMgr
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-## ServiceMgr.THistSvc.Input += ["JetBadChanCorrTool DATAFILE=\'%s\' OPT=\'READ\'" % RefFileName]
-## missingCellFileReader.called = True
-
-## missingCellFileReader()
-
-## jtm += MissingCellListTool(
-## "missingcells",
-## AddCellList = [],
-## RemoveCellList = [],
-## AddBadCells = True,
-## DeltaRmax = 1.0,
-## AddCellFromTool = False,
-## LArMaskBit = 608517,
-## TileMaskBit = 1,
-## MissingCellMapName = "MissingCaloCellsMap"
-## )
-
-## # Bad channel corrections from cells
-## if jtm.haveJetBadChanCorrTool:
-## jtm += JetBadChanCorrTool(
-## "bchcorrcell",
-## NBadCellLimit = 10000,
-## StreamName = "/JetBadChanCorrTool/",
-## ProfileName = "JetBadChanCorrTool.root",
-## ProfileTag = "",
-## UseCone = True,
-## UseCalibScale = False,
-## MissingCellMap = "MissingCaloCellsMap",
-## ForceMissingCellCheck = False,
-## UseClusters = False,
-## )
-
-## # Bad channel corrections from clusters
-## jtm += JetBadChanCorrTool(
-## "bchcorrclus",
-## NBadCellLimit = 0,
-## StreamName = "",
-## ProfileName = "",
-## ProfileTag = "",
-## UseCone = True,
-## UseCalibScale = False,
-## MissingCellMap = "",
-## ForceMissingCellCheck = False,
-## UseClusters = True
-## )
-
-# Jet vertex fraction.
-# jtm += JetVertexFractionTool(
-# "jvfold",
-# VertexContainer = jtm.vertexContainer,
-# AssociatedTracks = "GhostTrack",
-# TrackVertexAssociation = jtm.tvassoc.TrackVertexAssociation,
-# JVFName = "JVFOld"
-# )
-
# Jet vertex fraction with selection.
jtm += JetVertexFractionTool(
"jvf",
@@ -616,9 +542,6 @@ jtm += JetVertexFractionTool(
jtm += JetVertexTaggerTool(
"jvt",
VertexContainer = jtm.vertexContainer,
- # AssociatedTracks = "GhostTrack",
- # TrackVertexAssociation = jtm.tvassoc.TrackVertexAssociation,
- # TrackSelector = jtm.trackselloose,
JVTName = "Jvt",
)
diff --git a/Reconstruction/Jet/JetRec/python/JetRecUtils.py b/Reconstruction/Jet/JetRec/python/JetRecUtils.py
index 0d0f11efe543734dee97950f2d9084eae0ac978d..9afc11ea29c10a37006c179b20d08d6d25a7ce25 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecUtils.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecUtils.py
@@ -1,6 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.AppMgr import ToolSvc
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaCommon import Logging
jetlog = Logging.logging.getLogger('JetRec_jobOptions')
@@ -103,7 +101,6 @@ def buildJetContName(finder, mainParam, input, variableRMassScale=0, variableRMi
return buildJetAlgName(finder, mainParam, variableRMassScale, variableRMinRadius) +input+"Jets" # could be more elaborated...
def interpretJetName(jetcollName, finder = None,input=None, mainParam=None):
- myname = "JetRecUtils: "
from AthenaCommon import Logging
jetlog = Logging.logging.getLogger('JetRecUtils')
# first step : guess the finder, input , mainParam, if needed
diff --git a/Reconstruction/Jet/JetRec/python/JetToolSupport.py b/Reconstruction/Jet/JetRec/python/JetToolSupport.py
index 40c03ce0e71c2b1fdb1211875e1995acb7ffeede..185af2a244b5a8e7f2f12f4a8939891c5a80d676 100644
--- a/Reconstruction/Jet/JetRec/python/JetToolSupport.py
+++ b/Reconstruction/Jet/JetRec/python/JetToolSupport.py
@@ -40,12 +40,6 @@ jetlog = Logging.logging.getLogger('JetRec_jobOptions')
# import the jet flags.
from JetRec.JetRecFlags import jetFlags
-from GaudiKernel.Constants import (VERBOSE,
- DEBUG,
- INFO,
- WARNING,
- ERROR,
- FATAL,)
# The tool manager
class JetToolManager:
prefix = "JetToolManager: "
@@ -154,7 +148,7 @@ class JetToolManager:
# If the argument is a list, a copy is returned directly.
# Also configures any necessary container names in the copy.
def getModifiers(self, modifiersin, altname =None):
- if modifiersin == None:
+ if modifiersin is None:
if altname in ["lctopo","emtopo"]:
return self.modifiersMap[altname+"_ungroomed"]
elif "pflow" in altname:
@@ -170,7 +164,6 @@ class JetToolManager:
# the appropriate calibration tool.
def buildModifiers(self, modifiersin, finder, getters, altname, output, calibOpt, constmods=[]):
from GaudiKernel.Proxy.Configurable import ConfigurableAlgTool
- from JetRec.JetRecConf import JetFinder
outmods = []
inmods = self.getModifiers(modifiersin, altname)
ncalib = 0
@@ -240,11 +233,11 @@ class JetToolManager:
jetlog.info( sinp, cname, output )
raise TypeError
# Check that the building of the association tool has been scheduled.
- if not cname in self.jetcons:
+ if cname not in self.jetcons:
jetlog.info( self.prefix + "Truth association skipped because container is missing: " + cname )
jetlog.info( self.prefix + "Add to jetcons if input stream is expected to have this." )
tname = mod + "_" + salg + srad
- if not tname in self.tools:
+ if tname not in self.tools:
from JetMomentTools.JetMomentToolsConf import JetPtAssociationTool
self += JetPtAssociationTool(tname, JetContainer=output, MatchingJetContainer=cname, AssociationName="GhostTruth")
outmods += [self.tools[tname]]
@@ -258,12 +251,12 @@ class JetToolManager:
jetlog.info( sinp, cname, output )
raise TypeError
# Check that the building of the association tool has been scheduled.
- if not cname in self.jetcons:
+ if cname not in self.jetcons:
jetlog.info( self.prefix + "Track association skipped because container is missing: " + cname )
jetlog.info( self.prefix + "Add to jetcons if input stream is expected to have this." )
else:
tname = mod + "_" + salg + srad
- if not tname in self.tools:
+ if tname not in self.tools:
from JetMomentTools.JetMomentToolsConf import JetPtAssociationTool
self += JetPtAssociationTool(tname, JetContainer=output, MatchingJetContainer=cname, AssociationName="GhostTrack")
outmods += [self.tools[tname]]
@@ -273,7 +266,7 @@ class JetToolManager:
jetlog.info( self.prefix + "Jet filter requested without a threshold." )
raise Exception
tname = "jetpt" + str(self.ptminFilter)
- if not tname in self.tools:
+ if tname not in self.tools:
from JetRec.JetRecConf import JetFilterTool
self.add( JetFilterTool(tname, PtMin=self.ptminFilter) )
outmods += [self.tools[tname]]
@@ -292,7 +285,7 @@ class JetToolManager:
self.add(btagger)
outmods += [btagger]
elif mod == "largeR":
- outmods += jtm.modifiersMap["largeR"]
+ outmods += self.modifiersMap["largeR"]
else:
raise TypeError
# Check calibration.
@@ -336,12 +329,11 @@ class JetToolManager:
self.m_jetBuilder = self.jetBuilderWithoutArea
else:
self.m_jetBuilder = self.jetBuilderWithArea
- if self.m_jetBuilder == None:
+ if self.m_jetBuilder is None:
self.msg(0, "Jet builder must be specified")
- raise Error
+ raise Exception
from JetRec.JetRecConf import JetFinder
- areaSuffix= "Area" if ghostArea>0.0 else ""
- finder = JetFinder(toolname);
+ finder = JetFinder(toolname)
finder.JetAlgorithm = alg
finder.JetRadius = radius
finder.VariableRMinRadius = variableRMinRadius
@@ -355,7 +347,7 @@ class JetToolManager:
finder.JetBuilder = self.m_jetBuilder
self += finder
self.finders += [finder]
- hifinder = finder;
+ hifinder = finder
if type(ivtx) is int:
from JetRec.JetRecConf import JetByVertexFinder
vfinder = JetByVertexFinder(
@@ -365,7 +357,7 @@ class JetToolManager:
)
self += vfinder
self.finders += [vfinder]
- hifinder = vfinder;
+ hifinder = vfinder
return (finder, hifinder)
# Create a jet finder and rectool.
@@ -407,10 +399,10 @@ class JetToolManager:
# Accumulate all PseudoJetGetters such that we can schedule all
# needed PseudoJetAlgorithms before jet building
- self.allGetters += [getter for getter in getters if not getter in self.allGetters]
+ self.allGetters += [getter for getter in getters if getter not in self.allGetters]
# If jet finding by vertex is not specified, check for special input type names
ivtx = ivtxin
- if ivtx == None:
+ if ivtx is None:
if gettersin == "ztrack": ivtx = -1 # Find tracs separatesly for each vertex
elif gettersin == "pv0track": ivtx = 0 # Find tracks only for 1st vertex
# Retrieve/build the jet finder.
@@ -424,14 +416,13 @@ class JetToolManager:
if ptminFilter > 0.0: self.ptminFilter = ptminFilter
jetrec.JetModifiers = self.buildModifiers(modifiersin, lofinder, getters, gettersin, output, calibOpt, constmods=constmods)
self.autoconfigureModifiers(jetrec.JetModifiers, output)
- if consumers != None:
+ if consumers is not None:
jetrec.JetConsumers = consumers
self.ptminFilter = ptminSave
jetrec.Trigger = isTrigger or useTriggerStore
jetrec.Timer = jetFlags.timeJetRecTool()
#jetrec.WarnIfDuplicate = warnIfDuplicate
#jetrec.Overwrite = overwrite
- # JetRecTool.OutputLevel = VERBOSE
self += jetrec
if isTrigger:
self.trigjetrecs += [jetrec]
@@ -725,7 +716,7 @@ class JetToolManager:
jetrec.JetGroomer = groomer
jetrec.JetModifiers = self.getModifiers(modifiersin)
self.autoconfigureModifiers(jetrec.JetModifiers, output)
- if consumers != None:
+ if consumers is not None:
jetrec.JetConsumers = consumers
jetrec.Trigger = isTrigger or useTriggerStore
jetrec.Timer = jetFlags.timeJetRecTool()
@@ -772,7 +763,6 @@ class JetToolManager:
# Change the output level of a tool.
def setOutputLevel(self, toolid, level):
- from GaudiKernel.Proxy.Configurable import ConfigurableAlgTool
if type(toolid) == str:
tool = self[toolid]
else:
@@ -780,11 +770,9 @@ class JetToolManager:
locked = tool.isLocked()
oldlevel = "undefined"
if locked:
- dbglvl = 0
slock = "locked"
tool.unlock()
else:
- dbglvl = 1
slock = "unlocked"
aname = "OutputLevel"
if hasattr(tool, aname):
diff --git a/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx b/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
index fba500de2eb5c157e39df4339e16425d75a1fdb3..cf721e0d7db7329670dfe7a710f3c8477da3415b 100644
--- a/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
+++ b/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
@@ -3,14 +3,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// JetRecAlg.cxx
+// JetRecAlg.cxx
#include <memory>
#include "JetRecAlg.h"
#include "JetInterface/IJetExecuteTool.h"
#include "xAODJet/JetAuxContainer.h"
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
#include "AthenaMonitoringKernel/Monitored.h"
#endif
@@ -28,7 +28,7 @@ StatusCode JetRecAlg::initialize() {
ATH_CHECK(m_jetprovider->initWithOutput(m_output));
ATH_MSG_INFO(" Initialized IJetProvider : "<< m_jetprovider->name());
-
+
ATH_MSG_INFO(" Initialize .... List of modifiers: ");
ATH_CHECK(m_modifiers.retrieve());
for(ToolHandle<IJetModifier> t : m_modifiers){
@@ -37,7 +37,7 @@ StatusCode JetRecAlg::initialize() {
ATH_CHECK(m_output.initialize());
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
#endif
@@ -60,7 +60,7 @@ StatusCode JetRecAlg::execute(const EventContext& ctx) const {
// We can subsequently access the jets from the handle and don't have to
// worry about memory management.
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
auto t_total = Monitored::Timer<std::chrono::milliseconds>( "TIME_total" );
SG::WriteHandle<xAOD::JetContainer> jetContHandle(m_output,ctx);
@@ -117,4 +117,3 @@ StatusCode JetRecAlg::execute(const EventContext& ctx) const {
}
//**********************************************************************
-
diff --git a/Reconstruction/Jet/JetRec/src/JetRecAlg.h b/Reconstruction/Jet/JetRec/src/JetRecAlg.h
index 80e5229ba37b336b841c47224f0ba016c9a33aa4..acfb4ed1a26cc98514a3fbc1c673a4f37afd8355 100644
--- a/Reconstruction/Jet/JetRec/src/JetRecAlg.h
+++ b/Reconstruction/Jet/JetRec/src/JetRecAlg.h
@@ -4,7 +4,7 @@
*/
////////////////////////////////////////////////////
-/// \class JetRecAlg
+/// \class JetRecAlg
///
/// Algorithm tasked to create a single JetContainer
/// This algorithm makes use of 2 types of tools :
@@ -29,9 +29,9 @@
class IJetExecuteTool;
-class JetRecAlg : public AthReentrantAlgorithm {
+class JetRecAlg : public AthReentrantAlgorithm {
-public:
+public:
using AthReentrantAlgorithm::AthReentrantAlgorithm;
@@ -46,11 +46,10 @@ private:
ToolHandle<IJetProvider> m_jetprovider ={this , "Provider" , {} , "Tool providing the jets (fastjet, copy, grooming...)"};
ToolHandleArray<IJetModifier> m_modifiers = {this , "Modifiers", {}, "moment calculators" };
SG::WriteHandleKey<xAOD::JetContainer> m_output= {this, "OutputContainer", "AntiKt4LCtopoJets", "The output jet container name"};
-#if !defined (GENERATIONBASE) && !defined (XAOD_STANDALONE)
+#if !defined (GENERATIONBASE) && !defined (XAOD_ANALYSIS)
ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
#endif
-};
+};
#endif
-
diff --git a/Reconstruction/Jet/JetRec/src/MuonSegmentPseudoJetAlgorithm.cxx b/Reconstruction/Jet/JetRec/src/MuonSegmentPseudoJetAlgorithm.cxx
index 16eee29f7331cf88a2c519ecfda1fa63b8cba547..3fa800047b8c5fe8beebda4682df35743471622b 100644
--- a/Reconstruction/Jet/JetRec/src/MuonSegmentPseudoJetAlgorithm.cxx
+++ b/Reconstruction/Jet/JetRec/src/MuonSegmentPseudoJetAlgorithm.cxx
@@ -43,7 +43,7 @@ StatusCode MuonSegmentPseudoJetAlgorithm::execute(const EventContext& ctx) const
ATH_MSG_DEBUG("Created extractor: " << extractor->toString(0));
// Put the PseudoJetContainer together
- auto pjcont = std::make_unique<PseudoJetContainer>(extractor.release(), vpj);
+ auto pjcont = std::make_unique<PseudoJetContainer>(std::move(extractor), vpj);
auto outcoll = SG::makeHandle<PseudoJetContainer>(m_outcoll,ctx);
ATH_MSG_DEBUG("New PseudoJetContainer size " << pjcont->size());
diff --git a/Reconstruction/Jet/JetRec/src/PseudoJetAlgorithm.cxx b/Reconstruction/Jet/JetRec/src/PseudoJetAlgorithm.cxx
index 25f09cf804f95bd51e21a85c5e13c156add0c7b1..92ece334c49ac54e57668ffca6cebb75fc269eab 100644
--- a/Reconstruction/Jet/JetRec/src/PseudoJetAlgorithm.cxx
+++ b/Reconstruction/Jet/JetRec/src/PseudoJetAlgorithm.cxx
@@ -81,7 +81,7 @@ std::unique_ptr<PseudoJetContainer> PseudoJetAlgorithm::createPJContainer(const
}
// Put the PseudoJetContainer together
- auto pjcont = std::make_unique<PseudoJetContainer>(extractor.release(), vpj);
+ auto pjcont = std::make_unique<PseudoJetContainer>(std::move(extractor), vpj);
ATH_MSG_DEBUG("New PseudoJetContainer size " << pjcont->size());
return pjcont;
diff --git a/Reconstruction/Jet/JetRec/test/PseudoJetContainerOfflineTest.cxx b/Reconstruction/Jet/JetRec/test/PseudoJetContainerOfflineTest.cxx
index 1015c929096c2fb9d8c415785d9c16575308f529..fc5c97f6feb8b1c9d4a1aa04effc271ce4243c53 100644
--- a/Reconstruction/Jet/JetRec/test/PseudoJetContainerOfflineTest.cxx
+++ b/Reconstruction/Jet/JetRec/test/PseudoJetContainerOfflineTest.cxx
@@ -77,8 +77,8 @@ protected:
std::vector<PseudoJet> m_pjVec0;
std::vector<PseudoJet> m_pjVec1;
- IParticleExtractor* m_pExtractor_noghost;
- IParticleExtractor* m_pExtractor_ghost;
+ std::unique_ptr<const IParticleExtractor> m_pExtractor_noghost{};
+ std::unique_ptr<const IParticleExtractor> m_pExtractor_ghost{};
Jet* m_testjet0;
Jet* m_testjet1;
@@ -103,7 +103,7 @@ TEST_F(PseudoJetContainerOfflineTest, test_noghost) {
// create the PseudoContainer
- PseudoJetContainer psc(m_pExtractor_noghost, m_pjVec0);
+ PseudoJetContainer psc(std::move(m_pExtractor_noghost), m_pjVec0);
// check the pseudojet accessors
// EXPECT_TRUE(psc.asVectorPseudoJet() == m_pjVec0);
@@ -134,7 +134,7 @@ TEST_F(PseudoJetContainerOfflineTest, test_ghost) {
// The jet containers have a JetAuxContainer, and are stored in the test store
// create the PseudoContainer
- PseudoJetContainer psc(m_pExtractor_ghost, m_pjVec0);
+ PseudoJetContainer psc(std::move(m_pExtractor_ghost), m_pjVec0);
// check the pseudojet accessors
// EXPECT_TRUE(psc.asVectorPseudoJet() == m_pjVec0);
@@ -171,8 +171,8 @@ TEST_F(PseudoJetContainerOfflineTest, test_append) {
bool debug{false};
// create the PseudoContainers
- PseudoJetContainer psc0(m_pExtractor_noghost, m_pjVec0);
- PseudoJetContainer psc1(m_pExtractor_ghost, m_pjVec1);
+ PseudoJetContainer psc0(std::move(m_pExtractor_noghost), m_pjVec0);
+ PseudoJetContainer psc1(std::move(m_pExtractor_ghost), m_pjVec1);
psc0.append(&psc1);
diff --git a/Reconstruction/Jet/JetRec/test/PseudoJetContainerTriggerTest.cxx b/Reconstruction/Jet/JetRec/test/PseudoJetContainerTriggerTest.cxx
index 17119ffe7482a67bb45873b84f828eff2aa1e930..df243563d2b0d4f1b00313da844f64a90f7acbb0 100644
--- a/Reconstruction/Jet/JetRec/test/PseudoJetContainerTriggerTest.cxx
+++ b/Reconstruction/Jet/JetRec/test/PseudoJetContainerTriggerTest.cxx
@@ -82,8 +82,8 @@ protected:
std::vector<PseudoJet> m_pjVec0;
std::vector<PseudoJet> m_pjVec1;
- IParticleExtractor* m_pExtractor_noghost;
- IParticleExtractor* m_pExtractor_ghost;
+ std::unique_ptr<const IParticleExtractor> m_pExtractor_noghost{};
+ std::unique_ptr<const IParticleExtractor> m_pExtractor_ghost{};
Jet* m_testjet0;
Jet* m_testjet1;
@@ -108,7 +108,7 @@ TEST_F(PseudoJetContainerTriggerTest, test_noghost) {
// create the PseudoContainer
- PseudoJetContainer psc(m_pExtractor_noghost, m_pjVec0);
+ PseudoJetContainer psc(std::move(m_pExtractor_noghost), m_pjVec0);
// check the pseudojet accessors
EXPECT_TRUE(*psc.casVectorPseudoJet() == m_pjVec0);
@@ -138,7 +138,7 @@ TEST_F(PseudoJetContainerTriggerTest, test_ghost) {
// The jet containers have a JetAuxContainer, and are stored in the test store
// create the PseudoContainer
- PseudoJetContainer psc(m_pExtractor_ghost, m_pjVec0);
+ PseudoJetContainer psc(std::move(m_pExtractor_ghost), m_pjVec0);
// check the pseudojet accessors
EXPECT_TRUE(*psc.casVectorPseudoJet() == m_pjVec0);
@@ -174,8 +174,8 @@ TEST_F(PseudoJetContainerTriggerTest, test_append) {
bool debug{true};
// create the PseudoContainers
- PseudoJetContainer psc0(m_pExtractor_noghost, m_pjVec0);
- PseudoJetContainer psc1(m_pExtractor_ghost, m_pjVec1);
+ PseudoJetContainer psc0(std::move(m_pExtractor_noghost), m_pjVec0);
+ PseudoJetContainer psc1(std::move(m_pExtractor_ghost), m_pjVec1);
psc0.append(&psc1);
diff --git a/Reconstruction/Jet/JetRec/test/testHelpers.h b/Reconstruction/Jet/JetRec/test/testHelpers.h
index 80164291001230365bdf04986c38d3aab9b7a920..ad264b0c51f44690f96c16e27eb4e90785141734 100644
--- a/Reconstruction/Jet/JetRec/test/testHelpers.h
+++ b/Reconstruction/Jet/JetRec/test/testHelpers.h
@@ -19,6 +19,7 @@
#include <iostream>
#include <sstream>
+#include <memory>
int JetContainerIndex (0);
@@ -80,15 +81,14 @@ struct IPtoPSConverter{
}
};
-IParticleExtractor* makeExtractor(const xAOD::IParticleContainer* iparticles,
+std::unique_ptr<const IParticleExtractor> makeExtractor(const xAOD::IParticleContainer* iparticles,
bool isGhost, bool isTrigger=false){
// Create an Extractor
std::string label("EMTopo");
- IParticleExtractor* extractor = new IParticleExtractor(iparticles,
- label,
- isGhost,
- isTrigger);
- return extractor;
+ return std::make_unique<const IParticleExtractor>(iparticles,
+ label,
+ isGhost,
+ isTrigger);
}
diff --git a/Reconstruction/Jet/JetReclustering/CMakeLists.txt b/Reconstruction/Jet/JetReclustering/CMakeLists.txt
index 2290702cc364831799bd6265306777f7e12b19e5..2e8550ea5b07382221121f6998f4b9cebc10fd18 100644
--- a/Reconstruction/Jet/JetReclustering/CMakeLists.txt
+++ b/Reconstruction/Jet/JetReclustering/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_dictionary( JetReclusteringDict
LINK_LIBRARIES JetReclusteringLib )
# Test(s) in the package:
-if( NOT XAOD_STANDALONE )
+if( NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
atlas_add_test( ut_JetReclusteringTool_test
SOURCES test/ut_JetReclusteringTool_test.cxx
LINK_LIBRARIES xAODRootAccess AsgTools JetInterface xAODJet
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h
index 3433aaa688ec444a38d06b8d228731cc899de9af..74dea8c24814ed6a84d7c473c8a1e9d7b4ceb6af 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h
@@ -91,7 +91,7 @@ namespace CompScaleVar
{
// Error state
UNKNOWN=0, // Failure/unset/etc
-
+
// Scale uncertainties
FourVec, // The full jet 4-vector
Pt, // The jet pT
@@ -106,7 +106,7 @@ namespace CompScaleVar
C2Beta1, // The value of C_2^{beta=1} (ECF ratio)
Qw, // The value of Qw
TagScaleFactor, // Tagging efficiency SF
-
+
// Resolution uncertainties
MassRes, // The jet mass resolution, relative
MassResAbs, // The jet mass resolution, absolute
@@ -212,6 +212,14 @@ namespace JetTopology
TypeEnum stringToEnum(const TString type);
}
+// Unset the TRUE and FALSE macros, defined in a custom way on macOS 11.
+#ifdef TRUE
+# undef TRUE
+#endif
+#ifdef FALSE
+# undef FALSE
+#endif
+
namespace ExtendedBool
{
enum TypeEnum
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet.sh b/Reconstruction/Jet/JetValidation/test/test_jet.sh
index e564d623c95fcce5499a5ebe1df22137a81e27d9..9df2eb1d6820962d5119bab02ac7de11c8b34ac5 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet.sh
@@ -2,7 +2,10 @@
# art-description: ART test job HITS to AOD
# art-type: grid
# art-include: master/Athena
+# art-memory: 4096
# art-output: *.root
+# art-output: dcube
+# art-html: dcube
ART_PATH="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/"
ART_FILE="mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3126/HITS.12860054._032508.pool.root.1"
@@ -25,8 +28,23 @@ Reco_tf.py \
--inputHITSFile=${HITSFile} \
--outputAODFile=${ART_AOD} \
--outputNTUP_PHYSVALFile ${ART_Validation} \
- --validationFlags noExample \
+ --valid=True \
+ --validationFlags 'doInDet,doJet' \
--autoConfiguration everything \
--preExec 'from RecExConfig.RecFlags import rec;rec.doTrigger=False'
-echo "art-result: $? Reco"
+rc=$?
+echo "art-result: $rc Reco"
+
+rc2=-9999
+if [ ${rc} -eq 0 ]
+then
+ # Histogram comparison with DCube
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/JetValidation/DCUBE/jet.xml \
+ -r /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/JetValidation/reference/nightly_jet.PHYSVAL.root \
+ nightly_jet.PHYSVAL.root
+ rc2=$?
+fi
+echo "art-result: ${rc2} plot"
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9be572f487cd510e74995c4a62897fb87e9b20e8
--- /dev/null
+++ b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+# art-description: ART test job HITS to AOD
+# art-type: grid
+# art-include: master/Athena
+# art-memory: 4096
+# art-output: *.root
+# art-output: dcube
+# art-html: dcube
+
+ART_PATH="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/"
+ART_FILE="mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3126/HITS.12860054._032508.pool.root.1"
+HITSFile="${ART_PATH}${ART_FILE}"
+echo "Input HITS file for : ${HITSFile}"
+
+Nevents=3000
+echo "Number of test events : ${Nevents}"
+
+ART_AOD="nightly_jet_noPtCut.AOD.pool.root"
+echo "Output AOD file : ${ART_AOD}"
+
+ART_Validation="nightly_jet_noPtCut.PHYSVAL.root"
+echo "Output Validation file : ${ART_Validation}"
+
+echo "Submitting Reconstruction ..."
+
+Reco_tf.py \
+ --maxEvents -1 \
+ --inputHITSFile=${HITSFile} \
+ --outputAODFile=${ART_AOD} \
+ --outputNTUP_PHYSVALFile ${ART_Validation} \
+ --valid=True \
+ --validationFlags 'doInDet,doJet' \
+ --autoConfiguration everything \
+ --preExec 'from RecExConfig.RecFlags import rec;rec.doTrigger=False; from JetRec.JetRecFlags import jetFlags; jetFlags.useCalibJetThreshold.set_Value_and_Lock(False)'
+
+rc=$?
+echo "art-result: $rc Reco"
+
+rc2=-9999
+if [ ${rc} -eq 0 ]
+then
+ # Histogram comparison with DCube
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/JetValidation/DCUBE/jet.xml \
+ -r /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/JetValidation/reference/nightly_jet_noPtCut.PHYSVAL.root \
+ nightly_jet_noPtCut.PHYSVAL.root
+ rc2=$?
+fi
+echo "art-result: ${rc2} plot"
diff --git a/Reconstruction/Jet/JetValidation/test/test_met.sh b/Reconstruction/Jet/JetValidation/test/test_met.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d6b768fe9e1803c3ad4c85b038acc239d28259cd
--- /dev/null
+++ b/Reconstruction/Jet/JetValidation/test/test_met.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+# art-description: ART test job HITS to AOD
+# art-type: grid
+# art-include: master/Athena
+# art-memory: 4096
+# art-output: *.root
+# art-output: dcube
+# art-html: dcube
+
+ART_PATH="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/"
+ART_FILE="mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3126/HITS.12860054._032508.pool.root.1"
+HITSFile="${ART_PATH}${ART_FILE}"
+echo "Input HITS file for : ${HITSFile}"
+
+Nevents=3000
+echo "Number of test events : ${Nevents}"
+
+ART_AOD="nightly_met.AOD.pool.root"
+echo "Output AOD file : ${ART_AOD}"
+
+ART_Validation="nightly_met.PHYSVAL.root"
+echo "Output Validation file : ${ART_Validation}"
+
+echo "Submitting Reconstruction ..."
+
+Reco_tf.py \
+ --maxEvents -1 \
+ --inputHITSFile=${HITSFile} \
+ --outputAODFile=${ART_AOD} \
+ --outputNTUP_PHYSVALFile ${ART_Validation} \
+ --valid=True \
+ --validationFlags 'doInDet,doMET' \
+ --autoConfiguration everything \
+ --preExec 'from RecExConfig.RecFlags import rec;rec.doTrigger=False'
+
+rc=$?
+echo "art-result: $rc Reco"
+
+rc2=-9999
+if [ ${rc} -eq 0 ]
+then
+ # Histogram comparison with DCube
+ $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ -p -x dcube \
+ -c /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/JetValidation/DCUBE/met.xml \
+ -r /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/JetValidation/reference/nightly_met.PHYSVAL.root \
+ nightly_met.PHYSVAL.root
+ rc2=$?
+fi
+echo "art-result: ${rc2} plot"
diff --git a/Reconstruction/MET/METUtilities/Root/METSignificance.cxx b/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
index e1a0fce43ebc4ec8bdede04f331292f3017fbf38..21e5558d7517505e2dafd2d233d0be3c65d8406f 100644
--- a/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
+++ b/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
@@ -562,7 +562,9 @@ namespace met {
}
else{
const xAOD::TauJet* tau(static_cast<const xAOD::TauJet*>(obj));
- pt_reso = dynamic_cast<CombinedP4FromRecoTaus*>(m_tCombinedP4FromRecoTaus.get())->getCaloResolution(*tau);
+ if (auto combp4 = dynamic_cast<CombinedP4FromRecoTaus*>(m_tCombinedP4FromRecoTaus.get())) {
+ pt_reso = combp4->getCaloResolution(*tau);
+ }
if(m_doPhiReso) phi_reso = tau->pt()*0.01;
ATH_MSG_VERBOSE("tau: " << pt_reso << " " << tau->pt() << " " << tau->p4().Eta() << " " << tau->p4().Phi() << " phi reso: " << phi_reso);
diff --git a/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx b/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
index df8b54eacc983f3a0bd64aa532854eac14a41dc0..8dbe1635e5befa19ca694a99ed8eb1db62d6f58d 100644
--- a/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
@@ -265,7 +265,7 @@ int main( int argc, char* argv[]) {std::cout << __PRETTY_FUNCTION__ << std::endl
}
#ifndef XAOD_STANDALONE // POOL::TEvent should handle this when changing events
- app->finalize();
+ ANA_CHECK( app->finalize() );
#endif
xAOD::IOStats::instance().stats().printSmartSlimmingBranchList();
diff --git a/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx b/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx
index 93b116c46f913b7597992ab03209a4cef12ce4dd..3cf835bb6001165c0b2cf0a12f0c9bc02557aa9b 100644
--- a/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx
+++ b/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx
@@ -94,7 +94,8 @@ StatusCode METMonitoringAlg::fillHistograms( const EventContext& ctx ) const {
ATH_MSG_ERROR("evtStore() does not contain METAKt4EMTopo Collection with name "<< m_metAKt4EMTopoContainerKey);
return StatusCode::FAILURE;
}
- const auto& trigDecTool = getTrigDecisionTool();
+ const auto* trigDecTool = (getTrigDecisionTool().empty() ?
+ nullptr : getTrigDecisionTool().operator->());
bool isMETtopocalo = false;
for (const auto& key : m_metKeys) {
if (key == "MET_Topo") isMETtopocalo = true;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h
index aace58bb052c5de0ea208a231376724bd1bbbe0d..5e1c2c3386c9490f59d52fb03832821cbd0b4870 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h
@@ -20,7 +20,7 @@
#include <string>
-// uses (further down the call chain) the MuPatHitTool that has a mutable cache of pointers to-be-deleted and the end of the event
+// uses (further down the call chain) the MuPatHitTool that has a mutable cache of pointers to-be-deleted at the end of the event
// thus, currently, the MuonCombinedInDetExtensionAlg cannot become an AthReentrantAlgorithm
class MuonCombinedInDetExtensionAlg : public AthAlgorithm {
public:
@@ -95,8 +95,8 @@ class MuonCombinedInDetExtensionAlg : public AthAlgorithm {
SG::WriteHandleKey<Trk::SegmentCollection> m_segments{
this,
"SegmentCollection",
- "MuGirlSegments",
- "Segment collection",
+ "",
+ "specify segment collection",
};
Gaudi::Property<bool> m_usePRDs{this, "usePRDs", false};
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx
index e66d0fdc6aafec09ebd3f64f2c5d94f30348f1f5..e442f3ba5e53aa87420a859ae662cdd0889ce67a 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx
@@ -16,9 +16,14 @@
#include "xAODMuon/SlowMuonAuxContainer.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include <vector>
+namespace {
+ static constexpr const double MeVtoGeV = 1/Gaudi::Units::GeV;
+}
+
MuonCreatorAlg::MuonCreatorAlg(const std::string& name, ISvcLocator* pSvcLocator):
AthAlgorithm(name,pSvcLocator) {
}
@@ -33,8 +38,6 @@ StatusCode MuonCreatorAlg::initialize()
ATH_CHECK(m_muonCandidateCollectionName.initialize(!m_buildSlowMuon));
//Can't use a flag in intialize for an array of keys
if(!m_doSA) ATH_CHECK(m_tagMaps.initialize());
- m_segTrkContainerName = "Trk"+m_segContainerName.key();
- m_segContainerName = "xaod"+m_segContainerName.key();
ATH_CHECK(m_segContainerName.initialize());
ATH_CHECK(m_segTrkContainerName.initialize());
m_combinedTrkCollectionName = m_combinedCollectionName.key()+"Tracks";
@@ -176,26 +179,26 @@ StatusCode MuonCreatorAlg::execute()
//---------------------------------------------------------------------------------------------------------------------//
// Only run monitoring for online algorithms
- if ( not m_monTool.name().empty() ) {
+ if (!m_monTool.name().empty()) {
// Monitoring histograms and variables
auto muon_n = Monitored::Scalar<int>("muon_n", wh_muons->size());
- auto muon_pt = Monitored::Collection("muon_pt", *(wh_muons.ptr()), [](auto const& mu) {return mu->pt()/1000.0;}); // converted to GeV
+ auto muon_pt = Monitored::Collection("muon_pt", *(wh_muons.ptr()), [](auto const& mu) {return mu->pt()*MeVtoGeV;}); // converted to GeV
auto muon_eta = Monitored::Collection("muon_eta", *(wh_muons.ptr()), &xAOD::Muon_v1::eta);
auto muon_phi = Monitored::Collection("muon_phi", *(wh_muons.ptr()), &xAOD::Muon_v1::phi);
auto satrks_n = Monitored::Scalar<int>("satrks_n", wh_extrtp->size());
- auto satrks_pt = Monitored::Collection("satrks_pt", *(wh_extrtp.ptr()), [](auto const& satrk) {return satrk->pt()/1000.0;}); // converted to GeV
+ auto satrks_pt = Monitored::Collection("satrks_pt", *(wh_extrtp.ptr()), [](auto const& satrk) {return satrk->pt()*MeVtoGeV;}); // converted to GeV
auto satrks_eta = Monitored::Collection("satrks_eta", *(wh_extrtp.ptr()), &xAOD::TrackParticle_v1::eta);
auto satrks_phi = Monitored::Collection("satrks_phi", *(wh_extrtp.ptr()), &xAOD::TrackParticle_v1::phi);
auto cbtrks_n = Monitored::Scalar<int>("cbtrks_n", wh_combtp->size());
- auto cbtrks_pt = Monitored::Collection("cbtrks_pt", *(wh_combtp.ptr()), [](auto const& cbtrk) {return cbtrk->pt()/1000.0;}); // converted to GeV
+ auto cbtrks_pt = Monitored::Collection("cbtrks_pt", *(wh_combtp.ptr()), [](auto const& cbtrk) {return cbtrk->pt()*MeVtoGeV;}); // converted to GeV
auto cbtrks_eta = Monitored::Collection("cbtrks_eta", *(wh_combtp.ptr()), &xAOD::TrackParticle_v1::eta);
auto cbtrks_phi = Monitored::Collection("cbtrks_phi", *(wh_combtp.ptr()), &xAOD::TrackParticle_v1::phi);
if (!m_doSA) {
auto idtrks_n = Monitored::Scalar<int>("idtrks_n", indetCandidateCollection->size());
- auto idtrks_pt = Monitored::Collection("idtrks_pt", *indetCandidateCollection, [](auto const& idtrk) {return idtrk->indetTrackParticle().pt()/1000.0;});
+ auto idtrks_pt = Monitored::Collection("idtrks_pt", *indetCandidateCollection, [](auto const& idtrk) {return idtrk->indetTrackParticle().pt()*MeVtoGeV;});
auto idtrks_eta = Monitored::Collection("idtrks_eta", *indetCandidateCollection, [](auto const& idtrk) {return idtrk->indetTrackParticle().eta();});
auto idtrks_phi = Monitored::Collection("idtrks_phi", *indetCandidateCollection, [](auto const& idtrk) {return idtrk->indetTrackParticle().phi();});
auto monitorIt = Monitored::Group(m_monTool, muon_n, muon_pt, muon_eta, muon_phi, satrks_n, satrks_pt, satrks_eta, satrks_phi, cbtrks_n, cbtrks_pt,
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h
index 23f8b75dd562f92439e6f04036a060f1e365f74e..754f58f9aa67d1b96795a53a33b00e86bf5766cd 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h
@@ -52,8 +52,11 @@ class MuonCreatorAlg : public AthAlgorithm
SG::ReadHandleKey<InDetCandidateCollection> m_indetCandidateCollectionName{this,"InDetCandidateLocation","InDetCandidates","ID candidates"};
SG::ReadHandleKey<MuonCandidateCollection> m_muonCandidateCollectionName{this,"MuonCandidateLocation","MuonCandidates","Muon candidates"};
SG::ReadHandleKeyArray<MuonCombined::InDetCandidateToTagMap> m_tagMaps{this,"TagMaps",{"muidcoTagMap","stacoTagMap","muGirlTagMap","caloTagMap","segmentTagMap"},"ID candidate to tag maps"};
- SG::WriteHandleKey<xAOD::MuonSegmentContainer> m_segContainerName{this, "SegmentContainerName", "MuonSegments", "Segments"};
- SG::WriteHandleKey<Trk::SegmentCollection> m_segTrkContainerName{this,"TrackSegmentContainerName","MuonSegments","Track segments"};
+ SG::WriteHandleKey<xAOD::MuonSegmentContainer> m_segContainerName{this, "SegmentContainerName", "xaodMuonSegments", "Segments"};
+
+ // the following Trk::SegmentCollection MuonSegments are MuGirl segments, the standard MuonSegments are store in MuonSegmentFinderAlg.h
+ SG::WriteHandleKey<Trk::SegmentCollection> m_segTrkContainerName{this,"TrackSegmentContainerName","TrkMuonSegments","Track segments"};
+
SG::WriteHandleKey<xAOD::CaloClusterContainer> m_clusterContainerName{this, "ClusterContainerName", "MuonClusterCollection", "Clusters"};
SG::WriteHandleKey<CaloClusterCellLinkContainer> m_clusterContainerLinkName{this,"CaloClusterCellLinkName","MuonClusterCollection","Cluster links"};
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
index fff7d67d497b1fc9875e350b175ca5e06dbbbe6e..0a5c02b700c5304a2a07b5ff2d3858d3ed6b869a 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
@@ -738,7 +738,7 @@ namespace MuonCombined {
muon.setTrackParticleLink(xAOD::Muon::ExtrapolatedMuonSpectrometerTrackParticle, link );
}
else ATH_MSG_WARNING("Creating of MuGirl TrackParticle Link failed");
- }
+ }
}
if (outputData.xaodSegmentContainer){
@@ -746,10 +746,7 @@ namespace MuonCombined {
std::vector< ElementLink< xAOD::MuonSegmentContainer > > segments;
for( const auto& segLink : tag->segments() ){
-
- ElementLink<xAOD::MuonSegmentContainer> link = createMuonSegmentElementLink(segLink,
- *outputData.xaodSegmentContainer,
- outputData.muonSegmentCollection);
+ ElementLink<xAOD::MuonSegmentContainer> link = createMuonSegmentElementLink(segLink, *outputData.xaodSegmentContainer, outputData.muonSegmentCollection);
if( link.isValid() ) {
//link.toPersistent();
segments.push_back(link);
@@ -758,7 +755,7 @@ namespace MuonCombined {
else ATH_MSG_WARNING("Creating of MuGirl segment Link failed");
}
muon.setMuonSegmentLinks(segments);
- }
+ }
ATH_MSG_DEBUG("Done Adding MuGirl Muon " << tag->author() << " type " << tag->type());
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
index 36ddf5317f33b753fbe79003091aed7057eabeff..eee23de4e0d06bd323116d8d09ba4b8377ef434c 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
@@ -32,7 +32,6 @@ def MuonCaloTagAlgCfg(flags, name="MuonCaloTagAlg",**kwargs):
kwargs.setdefault("TagMap","caloTagMap")
kwargs.setdefault("CombinedTrackCollection","")
kwargs.setdefault("METrackCollection","")
- kwargs.setdefault("SegmentCollection","")
kwargs.setdefault("HasCSC", flags.Detector.GeometryCSC )
kwargs.setdefault("HasSTgc", flags.Detector.GeometrysTGC )
kwargs.setdefault("HasMM", flags.Detector.GeometryMM )
@@ -111,6 +110,7 @@ def MuonInsideOutRecoAlgCfg(flags, name="MuonInsideOutRecoAlg", **kwargs ):
kwargs.setdefault("HasSTgc", flags.Detector.GeometrysTGC )
kwargs.setdefault("HasMM", flags.Detector.GeometryMM )
kwargs.setdefault("TagMap","muGirlTagMap")
+ kwargs.setdefault("SegmentCollection","MuGirlSegments")
alg = CompFactory.MuonCombinedInDetExtensionAlg(name,**kwargs)
result.addEventAlgo( alg, primary=True )
return result
@@ -255,7 +255,8 @@ def StauCreatorAlgCfg(flags, name="StauCreatorAlg", **kwargs ):
kwargs.setdefault("ExtrapolatedLocation","ExtrapolatedStau")
kwargs.setdefault("MSOnlyExtrapolatedLocation","MSOnlyExtrapolatedStau")
kwargs.setdefault("MuonCandidateLocation","")
- kwargs.setdefault("SegmentContainerName","StauSegments")
+ kwargs.setdefault("SegmentContainerName","xaodStauSegments")
+ kwargs.setdefault("TrackSegmentContainerName","TrkStauSegments")
kwargs.setdefault("BuildSlowMuon",1)
kwargs.setdefault("ClusterContainerName", "SlowMuonClusterCollection")
kwargs.setdefault("TagMaps",["stauTagMap"])
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
index 2035e3bf58a674ac3d2823e487ba548135738547..7bfa7f169bb606ceb36caee7801b84d0c5f46b8c 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
@@ -15,24 +15,12 @@ from InDetRecExample.InDetKeys import InDetKeys
from InDetRecExample.InDetJobProperties import InDetFlags
from TriggerJobOpts.TriggerFlags import TriggerFlags
-def MuonCombinedInDetExtensionAlg(name="MuonCombinedInDetExtensionAlg",**kwargs):
- tools = []
- if muonCombinedRecFlags.doCaloTrkMuId():
- tools.append(getPublicTool("MuonCaloTagTool"))
- kwargs.setdefault("TagMap", "caloTagMap" )
- kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
- kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
- kwargs.setdefault("HasSTgc", MuonGeometryFlags.hasSTGC() )
- kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
- return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
-
def MuonCaloTagAlg(name="MuonCaloTagAlg",**kwargs):
tools = [getPublicTool("MuonCaloTagTool")]
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
kwargs.setdefault("TagMap","caloTagMap")
kwargs.setdefault("CombinedTrackCollection","")
kwargs.setdefault("METrackCollection","")
- kwargs.setdefault("SegmentCollection","")
kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
kwargs.setdefault("HasSTgc", MuonGeometryFlags.hasSTGC() )
kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
@@ -45,13 +33,11 @@ def MuonCaloTagAlg_LRT(name="MuonCaloTagAlg_LRT", **kwargs):
kwargs.setdefault("InDetCandidateLocation", MuonCbKeys.InDetTrackParticlesLargeD0())
kwargs.setdefault("CombinedTrackCollection","")
kwargs.setdefault("METrackCollection","")
- kwargs.setdefault("SegmentCollection","")
kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
kwargs.setdefault("HasSTgc", MuonGeometryFlags.hasSTGC() )
kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
-
def MuonSegmentTagAlg( name="MuonSegmentTagAlg", **kwargs ):
kwargs.setdefault("MuonSegmentTagTool", getPublicTool("MuonSegmentTagTool") )
return CfgMgr.MuonSegmentTagAlg(name,**kwargs)
@@ -63,7 +49,6 @@ def MuonSegmentTagAlg_LRT( name="MuonSegmentTagAlg_LRT", **kwargs ):
kwargs.setdefault("MuonSegmentLocation","MuonSegments")
return CfgMgr.MuonSegmentTagAlg(name,**kwargs)
-
def MuonInsideOutRecoAlg( name="MuonInsideOutRecoAlg", **kwargs ):
tools = [getPublicTool("MuonInsideOutRecoTool") ]
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
@@ -72,9 +57,9 @@ def MuonInsideOutRecoAlg( name="MuonInsideOutRecoAlg", **kwargs ):
kwargs.setdefault("HasSTgc", MuonGeometryFlags.hasSTGC() )
kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
kwargs.setdefault("TagMap","muGirlTagMap")
+ kwargs.setdefault("SegmentCollection","MuGirlSegments")
return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
-
def MuGirlAlg_LRT( name="MuGirlAlg_LRT", **kwargs ):
tools = [getPublicTool("MuonInsideOutRecoTool") ]
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
@@ -88,11 +73,7 @@ def MuGirlAlg_LRT( name="MuGirlAlg_LRT", **kwargs ):
kwargs.setdefault("CombinedTrackCollection",MuonCbKeys.MuGirlMuonsLargeD0())
kwargs.setdefault("InDetCandidateLocation",MuonCbKeys.InDetTrackParticlesLargeD0())
return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
-
-
-
-
def MuGirlStauAlg(name="MuGirlStauAlg",**kwargs):
tools = [getPublicTool("MuonStauRecoTool")]
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
@@ -199,8 +180,8 @@ def MuonCreatorAlg_LRT( name="MuonCreatorAlg_LRT",**kwargs ):
kwargs.setdefault("ExtrapolatedLocation", "ExtraPolated"+MuonCbKeys.FinalMuonsLargeD0())
kwargs.setdefault("MSOnlyExtrapolatedLocation", "MSOnlyExtraPolated"+MuonCbKeys.FinalMuonsLargeD0())
kwargs.setdefault("CombinedLocation", "Combined"+MuonCbKeys.FinalMuonsLargeD0())
- kwargs.setdefault("SegmentContainerName", "MuonSegments_LRT")
- kwargs.setdefault("TrackSegmentContainerName", "TrackMuonSegments_LRT")
+ kwargs.setdefault("SegmentContainerName", "xaodMuonSegments_LRT")
+ kwargs.setdefault("TrackSegmentContainerName", "TrkMuonSegments_LRT")
kwargs.setdefault("BuildSlowMuon", False)
kwargs.setdefault("MakeClusters", False)
kwargs.setdefault("ClusterContainerName", "")
@@ -216,7 +197,8 @@ def StauCreatorAlg( name="StauCreatorAlg", **kwargs ):
kwargs.setdefault("ExtrapolatedLocation","ExtrapolatedStau")
kwargs.setdefault("MSOnlyExtrapolatedLocation","MSOnlyExtrapolatedStau")
kwargs.setdefault("MuonCandidateLocation","")
- kwargs.setdefault("SegmentContainerName","StauSegments")
+ kwargs.setdefault("SegmentContainerName","xaodStauSegments")
+ kwargs.setdefault("TrackSegmentContainerName","TrkStauSegments")
kwargs.setdefault("BuildSlowMuon",1)
kwargs.setdefault("ClusterContainerName", "SlowMuonClusterCollection")
kwargs.setdefault("TagMaps",["stauTagMap"])
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
index c7b1a3d09ba8d3df48284b05e9af61b338e7f3f2..1b5f4ffa97ac0caa4a20181906fe83dee7855429 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
@@ -788,7 +788,8 @@ namespace MuonCombined {
if( tracks.size() == 1 ) return true;
// more than 1 track call ambiguity solver and select first track
- TrackCollection* resolvedTracks=m_trackAmbibuityResolver->process(&tracks);
+ std::unique_ptr<TrackCollection> resolvedTracks
+ (m_trackAmbibuityResolver->process(&tracks));
Trk::Track* selectedTrack = resolvedTracks->front();
// get candidate
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/RecBackgroundAlgs/BeamBackgroundFiller.h b/Reconstruction/RecBackground/RecBackgroundAlgs/RecBackgroundAlgs/BeamBackgroundFiller.h
index a1ab60154fd0731ffaac183c8b5fb11c74f39f66..3fc5e5a9b5af406459428cfa0ffca9c98150325e 100644
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/RecBackgroundAlgs/BeamBackgroundFiller.h
+++ b/Reconstruction/RecBackground/RecBackgroundAlgs/RecBackgroundAlgs/BeamBackgroundFiller.h
@@ -64,10 +64,10 @@ private:
void PrintMatchMatrix() {};
/** ReadHandleKey for Trk::SegmentCollection from CSC */
- SG::ReadHandleKey<Trk::SegmentCollection> m_cscSegmentContainerReadHandleKey{this,"cscSegmentContainerKey","NCB_MuonSegments","ReadHandleKey for Trk::SegmentCollection from CSC"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_cscSegmentContainerReadHandleKey{this,"cscSegmentContainerKey","NCB_TrackMuonSegments","ReadHandleKey for Trk::SegmentCollection from CSC"};
/** ReadHandleKey for Trk::SegmentCollection from MDT */
- SG::ReadHandleKey<Trk::SegmentCollection> m_mdtSegmentContainerReadHandleKey{this,"mdtSegmentContainerKey","MuonSegments","ReadHandleKey for Trk::SegmentCollection from MDT"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_mdtSegmentContainerReadHandleKey{this,"mdtSegmentContainerKey","TrackMuonSegments","ReadHandleKey for Trk::SegmentCollection from MDT"};
/** ReadHandleKey for CaloClusterContainer */
SG::ReadHandleKey<xAOD::CaloClusterContainer> m_caloClusterContainerReadHandleKey{this,"caloClusterContainerKey","CaloCalTopoClusters","ReadHandleKey for CaloClusterContainer"};
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/share/RecBackground_jobOptions.py b/Reconstruction/RecBackground/RecBackgroundAlgs/share/RecBackground_jobOptions.py
index 9937ad41a639135cb5d12da4e485fbd455f787ce..df66e6a5dd4fec3a3300eafc18090faebbdc5c6d 100644
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/share/RecBackground_jobOptions.py
+++ b/Reconstruction/RecBackground/RecBackgroundAlgs/share/RecBackground_jobOptions.py
@@ -8,7 +8,7 @@ if rec.doInDet() and rec.doMuon() and rec.doCalo() and \
DetFlags.detdescr.Muon_on() and DetFlags.detdescr.Calo_on() and DetFlags.detdescr.ID_on() :
include ("LArCellRec/LArCollisionTime_jobOptions.py")
from RecBackgroundAlgs.RecBackgroundAlgsConf import BeamBackgroundFiller
- BeamBackgroundFiller=BeamBackgroundFiller(cscSegmentContainerKey=("NCB_MuonSegments" if MuonGeometryFlags.hasCSC() else ""))
+ BeamBackgroundFiller=BeamBackgroundFiller(cscSegmentContainerKey=("NCB_TrackMuonSegments" if MuonGeometryFlags.hasCSC() else ""))
topSequence+=BeamBackgroundFiller
from BCM_BackgroundAlgs.BCM_BackgroundAlgsConf import BcmCollisionTimeAlg
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 9988b612aecf6cb103f2aabad48141cd2792cfb8..4e676def98726a6965b7b88bb9919e8c73869410 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -1285,6 +1285,8 @@ if ( rec.doAOD() or rec.doWriteAOD()) and not rec.readAOD() :
if ( rec.readESD() or jobproperties.egammaRecFlags.Enabled ) and not rec.ScopingLevel()==4 and rec.doEgamma :
from egammaRec import egammaKeys
addClusterToCaloCellAOD(egammaKeys.outputClusterKey())
+ addClusterToCaloCellAOD(egammaKeys.outputFwdClusterKey())
+ addClusterToCaloCellAOD(egammaKeys.outputEgammaLargeFWDClustersKey())
if "itemList" in metadata:
if ('xAOD::CaloClusterContainer', egammaKeys.EgammaLargeClustersKey()) in metadata["itemList"]:
# check first for priority if both keys are in metadata
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
index a0e2e369f75bf49365dc9f6bb50919954929ea01..6ceca97222e0be98fce44adb91a2fa8caeff1f82 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
@@ -4,7 +4,7 @@ echo "Creating new serial directory"
mkdir serial; cd serial
athena $1 | tee athenaSerial.log
rc=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestSerial.log
+xAODDigest.py AOD.pool.root | tee digestSerial.log
echo "art-result: $rc Serial"
test_postProcessing_Errors.sh athenaSerial.log | tee errorsSerial.log
@@ -15,7 +15,7 @@ mkdir threadOne; cd threadOne
athena --threads=1 $1 | tee athenaOneThread.log
rc1=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestOneThread.log
+xAODDigest.py AOD.pool.root | tee digestOneThread.log
echo "art-result: $rc1 OneThread"
test_postProcessing_Errors.sh athenaOneThread.log | tee errorsOneThread.log
@@ -39,7 +39,7 @@ mkdir threadTwo; cd threadTwo
athena --threads=2 $1 | tee athenaTwoThreads.log
rc2=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestTwoThreads.log
+xAODDigest.py AOD.pool.root | tee digestTwoThreads.log
echo "art-result: $rc2 TwoThreads"
test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log
@@ -59,7 +59,7 @@ mkdir threadFive; cd threadFive
athena --threads=5 $1 | tee athenaFiveThreads.log
rc5=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestFiveThreads.log
+xAODDigest.py AOD.pool.root | tee digestFiveThreads.log
echo "art-result: $rc5 FiveThreads"
test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh
index 5bf6a5d4ed3e5ccf0d04e34dbd0ba364a726081e..d5868c3d60b5f2fba87b97193eed7f66c05b6175 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: Athena runs jet reconstruction, using the new job configuration for Run 3, from an ESD file
-# art-type: local
+# art-type: grid
# art-athena-mt
# art-include: master/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_largeRadiusTrackingOn.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_largeRadiusTrackingOn.sh
deleted file mode 100755
index 6e42b579165a8f573a99b6f08ce5d3ea97ca9e56..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV_largeRadiusTrackingOn.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# art-description: Reco_tf runs on 13TeV collision data 2018
-# art-athena-mt: 4
-# art-type: grid
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data --preExec r2a:'from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doR3LargeD0.set_Value_and_Lock(True);InDetFlags.storeSeparateLargeD0Container.set_Value_and_Lock(True);' --maxEvents 300 --AMI=f1089 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root
-
-#Remember retval of transform as art result
-RES=$?
-echo "art-result: $RES Reco"
-return $RES
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ba16e4a32665b9d406d395b5182ed9c5057cd313
--- /dev/null
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# art-description: heavy ion reconstruction test from Sebastian Tapia
+# art-type: grid
+# art-include: master/Athena
+
+
+export TRF_ECHO=True; Reco_tf.py \
+--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_hi.00367384.physics_HardProbes.daq.RAW._lb0145._SFO-8._0001.data \
+--outputESDFile=ESD.pool.root \
+--outputAODFile=AOD.pool.root \
+--maxEvents=20 \
+--conditionsTag 'default:CONDBR2-BLKPA-2018-12' \
+--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+--autoConfiguration 'everything' \
+--steering='doRAWtoALL' \
+--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
+--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doTrigger.set_Value_and_Lock(False);TriggerFlags.AODEDMSet="AODFULL";rec.doHeavyIon.set_Value_and_Lock(True);rec.doDPD.set_Value_and_Lock(True); from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);' \
+RES=$?
+echo "art-result: $RES Reco"
+return $RES
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ce85e355342f99a048e4287d2961e49f52e12076
--- /dev/null
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# art-description: heavy ion reconstruction test from Sebastian Tapia
+# art-type: grid
+# art-include: master/Athena
+
+
+export TRF_ECHO=True; Reco_tf.py \
+--inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_a890_s3136/HITS.17784755._001903.pool.root.1 \
+--outputESDFile=ESD.pool.root \
+--outputAODFile=AOD.pool.root \
+--maxEvents=20 \
+--postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
+--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
+--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True); from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);' 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
+--autoConfiguration 'everything' \
+--DataRunNumber '313000' \
+
+RES=$?
+echo "art-result: $RES Reco"
+return $RES
+
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
index c8c0af161901c922adfe0fd2650425f9267b0778..ce865d3746f5473c9f57dfc5e850883723de0cb8 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
@@ -7,7 +7,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh
deleted file mode 100755
index b6302ccef1342164d0cb06a6bdf94812001d5dbd..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# art-description: Run reco with a latest (September 2020) MC setup with pileup. This test also enables Large Radius Tracking.
-# art-output: log.*
-# art-athena-mt: 4
-# art-type: grid
-# art-include: master/Athena
-
-export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --preExec r2e:'from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doR3LargeD0.set_Value_and_Lock(True);InDetFlags.storeSeparateLargeD0Container.set_Value_and_Lock(True);'
-RES=$?
-echo "art-result: $RES Reco"
-if [ $RES -ne 0 ];then
-return $RES
-fi
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
index acaae2dd55c79becd36633d639f940c4b7cfa801..cda40e1f6ec7063a2927f2d857435a4d6085e652 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
index 8f58826b79aa98bc47490d5749011d05992bc892..185774a7f8c00dc6a38a8f58a983254f4563d075 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
@@ -7,7 +7,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts="--stdcmalloc"
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "all:--stdcmalloc" "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh
deleted file mode 100755
index cfa60a831e59a461b40188f448df4b8fc723457c..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# art-description: Xiaohu Sun, Carl Gwilliam and Marie-Helene Genest
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-export TRF_ECHO=True; Reco_tf.py '--inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_13TeV.410500.PowhegPythia8EvtGen_A14_ttbar_hdamp172p5_nonallhad.simul.HITS.e4797_s2726.50events.pool.root' '--jobNumber=64' '--maxEvents=10' '--postInclude=RecJobTransforms/UseFrontier.py' '--preExec' 'rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' 'RAWtoESD:from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False' 'ESDtoAOD:TriggerFlags.AODEDMSet="AODFULL"' 'RAWtoESD:from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doSlimming.set_Value_and_Lock(False)' 'ESDtoAOD:from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doSlimming.set_Value_and_Lock(False)' 'RDOtoRDOTrigger:from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.triggerMenuSetup="MC_pp_v6_tight_mc_prescale"' '--skipEvents=0' '--autoConfiguration=everything' '--conditionsTag=OFLCOND-MC15c-SDR-09' '--geometryVersion=ATLAS-R2-2015-03-01-00' '--digiSeedOffset1=1' '--digiSeedOffset2=1' '--steering=doRDO_TRIG' '--outputAODFile=AOD.pool.root' '--outputRDOFile=RDO.pool.root' '--outputESDFile=ESD.pool.root' --runNumber="110401" --pileupFinalBunch 6 --inputHighPtMinbiasHitsFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_13TeV.361035.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3581_s2578_s2195/HITS.05608152._002668.pool.root.1" --inputLowPtMinbiasHitsFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_13TeV.361034.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3581_s2578_s2195/HITS.05608147._000503.pool.root.1"
-
-RES=$?
-echo "art-result: $RES Reco"
-
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh
deleted file mode 100755
index 84facbf48fcc6b6dc6f703cefea34269392e5b94..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# art-description: Jamie Boyd, Running on highmu Data at 7 TeV
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-
-export TRF_ECHO=True; Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/high_mu-data11_7TeV.00179725.physics_JetTauEtmiss.merge.RAW._lb0021.data --autoConfiguration everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --maxEvents 5 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' 'rec.doTrigger=False'
-
-RES=$?
-
-xAODDigest.py myAOD.pool.root digest.txt
-
-echo "art-result: $RES Reco"
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh
deleted file mode 100755
index f29183400662b702156844aae773d84206da6079..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# art-description: Jamie Boyd, data12_8TeV reconstruction
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-export TRF_ECHO=True; Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1 --autoConfiguration everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --maxEvents 5 --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' 'rec.doTrigger=False'
-
-RES=$?
-
-xAODDigest.py myAOD.pool.root digest.txt
-
-echo "art-result: $RES Reco"
-
-
-
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh
deleted file mode 100755
index e0c647167a851b62c65d277a4322cf6d3a450d12..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# art-description: RIG convenors - q220 reconstruction
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-export TRF_ECHO=True; Reco_tf.py --AMIConfig=q220 --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' 'DQMonFlags.doCTPMon=False' --inputBSFile='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_cos.00251363.physics_IDCosmic.merge.RAW._lb0057._SFO-ALL._0001.1'
-
-RES=$?
-echo "art-result: $RES Reco"
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh
deleted file mode 100755
index f37471dbfa6ad92ea0efa31f2660ab722ac4e93e..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#!/bin/sh
-#
-# art-description: RIG convenors - q221 reconstruction
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-export TRF_ECHO=True; Reco_tf.py --AMIConfig=q221 --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True'
-
-RES=$?
-
-xAODDigest.py myAOD.pool.root digest.txt
-
-echo "art-result: $RES Reco"
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh
deleted file mode 100755
index cc1e50caef2329e28cc254a41e96814b8b2990f7..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# art-description: RIG convenors - q222 reconstruction
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-export TRF_ECHO=True; Reco_tf.py --AMIConfig=q222 --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' 'DQMonFlags.doCTPMon=False' 'DQMonFlags.doHLTMon=False' --inputBSFile='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1'
-
-RES=$?
-
-xAODDigest.py myAOD.pool.root digest.txt
-
-echo "art-result: $RES Reco"
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh
deleted file mode 100755
index 904f55b2ed79252e887f0c194b7b15a5e6a0a859..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# art-description: RIG convenors - q223 reconstruction
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-export TRF_ECHO=True; Reco_tf.py --AMIConfig=q223 --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' 'DQMonFlags.doCTPMon=False' --inputBSFile='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_comm.00264034.physics_MinBias.daq.RAW._lb0644._SFO-6._0001.data'
-
-RES=$?
-
-xAODDigest.py myAOD.pool.root digest.txt
-
-echo "art-result: $RES Reco"
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh
deleted file mode 100755
index 3168211d06a1239fc6d17e32be67ebe7e1312c02..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# art-description: David Rousseau, data12_8TeV reconstruction, all reco switched off
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-export TRF_ECHO=True; Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1 --maxEvents 5 --autoConfiguration everything --preExec 'rec.doCalo=False' 'rec.doInDet=False' 'rec.doMuon=False' 'rec.doJetMissingETTag=False' 'rec.doEgamma=False' 'rec.doMuonCombined=False' 'rec.doTau=False' 'rec.doTrigger=False' 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' --outputESDFile my.ESD.pool.root
-
-RES=$?
-echo "art-result: $RES Reco"
-
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh
deleted file mode 100755
index fc0dbf98eaca7c4bce1f222d1e1d3321974e5872..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# art-description: Jamie Boyd - should be updated for 2015
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-export TRF_ECHO=True; Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_cos.00193024.physics_CosmicCalo.merge.RAW._lb0096._SFO-ALL._0001.1 --maxEvents 10 --autoConfiguration everything --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHIST.root --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True'
-
-RES=$?
-echo "art-result: $RES Reco"
-
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh
deleted file mode 100755
index 13cf60a58847997f242a58f5267aa34245eb8e8a..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# art-description: David Rousseau
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-
-export TRF_ECHO=True; Reco_tf.py --inputRDOFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/RDO.pool.root --maxEvents 5 --autoConfiguration everything --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' --outputESDFile my.ESD.pool.root
-
-RES=$?
-echo "art-result: $RES Reco"
-
-
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh
deleted file mode 100755
index 36541b24ed606aa555cf55f0a36bb9878dd86807..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# art-description: David Rousseau
-# art-athena-mt: 4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-
-export TRF_ECHO=True; Reco_tf.py --inputRDOFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/RDO.pool.root --maxEvents 5 --autoConfiguration everything --preExec 'rec.doDetailedAuditor=True' 'rec.doNameAuditor=True' 'rec.doCalo=False' 'rec.doInDet=False' 'rec.doMuon=False' 'rec.doJetMissingETTag=False' 'rec.doEgamma=False' 'rec.doMuonCombined=False' 'rec.doTau=False' 'rec.doTrigger=False' --outputESDFile my.ESD.pool.root
-
-RES=$?
-echo "art-result: $RES Reco"
-
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx
index 947d70a098b5cc2ef399bc95c2c851bd1687134a..fad621635042c87451f1e7196f2753a1197c6f46 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx
+++ b/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2017, 2019, 2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: CaloRingerElectronsReader.cxx 786306 2016-11-24 13:40:42Z wsfreund $
@@ -121,6 +121,7 @@ StatusCode CaloRingerElectronsReader::execute()
m_clRingsBuilderElectronFctor->operator()( electron );
}
+ m_clRingsBuilderElectronFctor->checkRelease();
}
StatusCode sc;
diff --git a/Reconstruction/eflowRec/python/PFCfg.py b/Reconstruction/eflowRec/python/PFCfg.py
index 38fa939422b5da85575fed32b5722c7347e738d2..626bc28f946f3f8a8ecec01d83230680ead81d4c 100644
--- a/Reconstruction/eflowRec/python/PFCfg.py
+++ b/Reconstruction/eflowRec/python/PFCfg.py
@@ -2,23 +2,23 @@
from AthenaConfiguration.ComponentFactory import CompFactory
def PFTrackSelectorAlgCfg(inputFlags,algName,useCaching=True):
- PFTrackSelector=CompFactory.PFTrackSelector
- PFTrackSelector=PFTrackSelector(algName)
+ PFTrackSelectorFactory=CompFactory.PFTrackSelector
+ PFTrackSelector=PFTrackSelectorFactory(algName)
from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
- Trk__ParticleCaloExtensionTool=CompFactory.Trk.ParticleCaloExtensionTool
+ Trk__ParticleCaloExtensionToolFactory=CompFactory.Trk.ParticleCaloExtensionTool
result = AtlasExtrapolatorCfg(inputFlags)
- pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = result.popPrivateTools())
+ pcExtensionTool = Trk__ParticleCaloExtensionToolFactory(Extrapolator = result.popPrivateTools())
eflowTrackCaloExtensionTool=CompFactory.eflowTrackCaloExtensionTool
TrackCaloExtensionTool=eflowTrackCaloExtensionTool(TrackCaloExtensionTool=pcExtensionTool)
- if False is useCaching:
+ if (not useCaching):
TrackCaloExtensionTool.PFParticleCache = ""
PFTrackSelector.trackExtrapolatorTool = TrackCaloExtensionTool
- InDet__InDetTrackSelectionTool=CompFactory.InDet.InDetTrackSelectionTool
- TrackSelectionTool = InDet__InDetTrackSelectionTool("PFTrackSelectionTool")
+ InDet__InDetTrackSelectionToolFactory=CompFactory.InDet.InDetTrackSelectionTool
+ TrackSelectionTool = InDet__InDetTrackSelectionToolFactory("PFTrackSelectionTool")
TrackSelectionTool.CutLevel = "TightPrimary"
TrackSelectionTool.minPt = 500.0
@@ -31,8 +31,8 @@ def PFTrackSelectorAlgCfg(inputFlags,algName,useCaching=True):
def getPFClusterSelectorTool(clustersin,calclustersin,algName):
- PFClusterSelectorTool = CompFactory.PFClusterSelectorTool
- PFClusterSelectorTool = PFClusterSelectorTool(algName)
+ PFClusterSelectorToolFactory = CompFactory.PFClusterSelectorTool
+ PFClusterSelectorTool = PFClusterSelectorToolFactory(algName)
if clustersin:
PFClusterSelectorTool.clustersName = clustersin
if calclustersin:
@@ -50,19 +50,19 @@ def getPFTrackClusterMatchingTool(inputFlags,matchCut,distanceType,clusterPositi
def getPFCellLevelSubtractionTool(inputFlags,toolName):
- PFCellLevelSubtractionTool = CompFactory.PFCellLevelSubtractionTool
- PFCellLevelSubtractionTool = PFCellLevelSubtractionTool(toolName)
+ PFCellLevelSubtractionToolFactory = CompFactory.PFCellLevelSubtractionTool
+ PFCellLevelSubtractionTool = PFCellLevelSubtractionToolFactory(toolName)
eflowCellEOverPTool_mc12_JetETMiss = CompFactory.eflowCellEOverPTool_mc12_JetETMiss
PFCellLevelSubtractionTool.eflowCellEOverPTool = eflowCellEOverPTool_mc12_JetETMiss()
- if(True is inputFlags.PF.EOverPMode):
+ if(inputFlags.PF.EOverPMode):
PFCellLevelSubtractionTool.CalcEOverP = True
PFCellLevelSubtractionTool.nMatchesInCellLevelSubtraction = -1
else:
PFCellLevelSubtractionTool.nMatchesInCellLevelSubtraction = 1
- if(True is inputFlags.PF.EOverPMode):
+ if(inputFlags.PF.EOverPMode):
PFCellLevelSubtractionTool.PFTrackClusterMatchingTool = getPFTrackClusterMatchingTool(inputFlags,0.2,"EtaPhiSquareDistance","PlainEtaPhi","CalObjBldMatchingTool")
else:
PFCellLevelSubtractionTool.PFTrackClusterMatchingTool = getPFTrackClusterMatchingTool(inputFlags,1.64,"EtaPhiSquareSignificance","GeomCenterEtaPhi","CalObjBldMatchingTool")
@@ -72,8 +72,8 @@ def getPFCellLevelSubtractionTool(inputFlags,toolName):
return PFCellLevelSubtractionTool
def getPFRecoverSplitShowersTool(inputFlags,toolName):
- PFRecoverSplitShowersTool = CompFactory.PFRecoverSplitShowersTool
- PFRecoverSplitShowersTool = PFRecoverSplitShowersTool(toolName)
+ PFRecoverSplitShowersToolFactory = CompFactory.PFRecoverSplitShowersTool
+ PFRecoverSplitShowersTool = PFRecoverSplitShowersToolFactory(toolName)
eflowCellEOverPTool_mc12_JetETMiss = CompFactory.eflowCellEOverPTool_mc12_JetETMiss
PFRecoverSplitShowersTool.eflowCellEOverPTool = eflowCellEOverPTool_mc12_JetETMiss("eflowCellEOverPTool_mc12_JetETMiss_Recover")
@@ -85,8 +85,8 @@ def getPFRecoverSplitShowersTool(inputFlags,toolName):
return PFRecoverSplitShowersTool
def getPFMomentCalculatorTool(inputFlags, momentsToCalculateList):
- PFMomentCalculatorTool = CompFactory.PFMomentCalculatorTool
- PFMomentCalculatorTool = PFMomentCalculatorTool("PFMomentCalculatorTool")
+ PFMomentCalculatorToolFactory = CompFactory.PFMomentCalculatorTool
+ PFMomentCalculatorTool = PFMomentCalculatorToolFactory("PFMomentCalculatorTool")
from CaloRec.CaloTopoClusterConfig import getTopoMoments
PFClusterMomentsMaker = getTopoMoments(inputFlags)
@@ -97,7 +97,7 @@ def getPFMomentCalculatorTool(inputFlags, momentsToCalculateList):
PFClusterCollectionTool = CompFactory.PFClusterCollectionTool
PFMomentCalculatorTool.PFClusterCollectionTool = PFClusterCollectionTool("PFClusterCollectionTool")
- if(True is inputFlags.PF.useCalibHitTruthClusterMoments):
+ if(inputFlags.PF.useCalibHitTruthClusterMoments):
PFMomentCalculatorTool.UseCalibHitTruth=True
from CaloRec.CaloTopoClusterConfig import getTopoCalibMoments
PFMomentCalculatorTool.CaloCalibClusterMomentsMaker2 = getTopoCalibMoments(inputFlags)
@@ -123,26 +123,49 @@ def getPFLCCalibTool(inputFlags):
return PFLCCalibTool
def getChargedPFOCreatorAlgorithm(inputFlags,chargedPFOOutputName):
- PFOChargedCreatorAlgorithm = CompFactory.PFOChargedCreatorAlgorithm
- PFOChargedCreatorAlgorithm = PFOChargedCreatorAlgorithm("PFOChargedCreatorAlgorithm")
+ PFOChargedCreatorAlgorithmFactory = CompFactory.PFOChargedCreatorAlgorithm
+ PFOChargedCreatorAlgorithm = PFOChargedCreatorAlgorithmFactory("PFOChargedCreatorAlgorithm")
if chargedPFOOutputName:
PFOChargedCreatorAlgorithm.PFOOutputName = chargedPFOOutputName
- if(True is inputFlags.PF.EOverPMode):
+ if(inputFlags.PF.EOverPMode):
PFOChargedCreatorAlgorithm.PFOOutputName="EOverPChargedParticleFlowObjects"
return PFOChargedCreatorAlgorithm
def getNeutralPFOCreatorAlgorithm(inputFlags,neutralPFOOutputName):
-
- PFONeutralCreatorAlgorithm = CompFactory.PFONeutralCreatorAlgorithm
- PFONeutralCreatorAlgorithm = PFONeutralCreatorAlgorithm("PFONeutralCreatorAlgorithm")
+ PFONeutralCreatorAlgorithmFactory = CompFactory.PFONeutralCreatorAlgorithm
+ PFONeutralCreatorAlgorithm = PFONeutralCreatorAlgorithmFactory("PFONeutralCreatorAlgorithm")
if neutralPFOOutputName:
PFONeutralCreatorAlgorithm.PFOOutputName = neutralPFOOutputName
- if(True is inputFlags.PF.EOverPMode):
+ if(inputFlags.PF.EOverPMode):
PFONeutralCreatorAlgorithm.PFOOutputName="EOverPNeutralParticleFlowObjects"
- if(True is inputFlags.PF.useCalibHitTruthClusterMoments and True is inputFlags.PF.addClusterMoments):
+ if(inputFlags.PF.useCalibHitTruthClusterMoments and inputFlags.PF.addClusterMoments):
PFONeutralCreatorAlgorithm.UseCalibHitTruth=True
PFONeutralCreatorAlgorithm.DoClusterMoments=inputFlags.PF.addClusterMoments
return PFONeutralCreatorAlgorithm
+
+def getChargedFlowElementCreatorAlgorithm(inputFlags,chargedFlowElementOutputName):
+ FlowElementChargedCreatorAlgorithmFactory = CompFactory.PFChargedFlowElementCreatorAlgorithm
+ FlowElementChargedCreatorAlgorithm = FlowElementChargedCreatorAlgorithmFactory("PFChargedFlowElementCreatorAlgorithm")
+ if chargedFlowElementOutputName:
+ FlowElementChargedCreatorAlgorithm.FlowElementOutputName=chargedFlowElementOutputName
+ if(inputFlags.PF.EOverPMode):
+ FlowElementChargedCreatorAlgorithm.FlowElementOutputName="EOverPChargedFlowElements"
+
+ return FlowElementChargedCreatorAlgorithm
+
+def getNeutralFlowElementCreatorAlgorithm(inputFlags,neutralFlowElementOutputName):
+ FlowElementNeutralCreatorAlgorithmFactory = CompFactory.PFNeutralFlowElementCreatorAlgorithm
+ FlowElementNeutralCreatorAlgorithm = FlowElementNeutralCreatorAlgorithmFactory("PFNeutralFlowElementCreatorAlgorithm")
+ if neutralFlowElementOutputName:
+ FlowElementNeutralCreatorAlgorithm.FlowElementOutputName=neutralFlowElementOutputName
+ if(inputFlags.PF.EOverPMode):
+ FlowElementNeutralCreatorAlgorithm.FlowElementOutputName="EOverPNeutralFlowElements"
+ if(inputFlags.PF.useCalibHitTruthClusterMoments and inputFlags.PF.addClusterMoments):
+ FlowElementNeutralCreatorAlgorithm.useCalibHitTruth=True
+
+
+ return FlowElementNeutralCreatorAlgorithm
+
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 3c08b024c15095975982d2e711c322a0bf99abca..f6202fe273c63d67bb55376e7e5faf063b2a0645 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -128,6 +128,10 @@ def PFCfg(inputFlags,**kwargs):
result.addEventAlgo(getChargedPFOCreatorAlgorithm(inputFlags,""))
result.addEventAlgo(getNeutralPFOCreatorAlgorithm(inputFlags,""))
+ from eflowRec.PFCfg import getChargedFlowElementCreatorAlgorithm,getNeutralFlowElementCreatorAlgorithm
+ result.addEventAlgo(getChargedFlowElementCreatorAlgorithm(inputFlags,""))
+ result.addEventAlgo(getNeutralFlowElementCreatorAlgorithm(inputFlags,""))
+
return result
if __name__=="__main__":
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
index 4732fd0e36283fe2257896d9b9c0289a20248c67..50481a3372a01e8c5841dc2f3dd5fe030436e902 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = """ToolFactory to instantiate egammaBremCollectionBuilder
with default configuration"""
@@ -73,7 +73,7 @@ class egammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder):
GSFBuildTRT_ElectronPidTool = (
TrackingCommon.getInDetTRT_ElectronPidTool(
name="GSFBuildTRT_ElectronPidTool",
- CalculateNNPid=True,
+ CalculateNNPid=False,
MinimumTrackPtForNNPid=0.,
private=True))
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py
index ec3efeba67d6238b800b1b0bd268ef62d0232bde..23359d40c4986c4e5a671663d404e461b2bbdb59 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py
@@ -1,6 +1,7 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactory to instantiate the EMGSFCaloExtensionBuilder with default configuration"
+__doc__ = """ToolFactory to instantiate the
+ EMGSFCaloExtensionBuilder with default configuration"""
__author__ = "Christos"
from egammaAlgs import egammaAlgsConf
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilderConfig.py
index ad5fae0a1be62ca7690b97a290e72014254dac15..38b76725cecc46c8f114d40e574c475f2743e56f 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilderConfig.py
@@ -1,15 +1,19 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = "Instantiate the EMGSFCaloExtensionBuilder with default configuration"
-
-from AthenaCommon.Logging import logging
-from AthenaConfiguration.ComponentFactory import CompFactory
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrackToCalo.TrackToCaloConfig import ParticleCaloExtensionToolCfg
-EMGSFCaloExtensionBuilder=CompFactory.EMGSFCaloExtensionBuilder
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaCommon.Logging import logging
+__doc__ = """ Instantiate the EMGSFCaloExtensionBuilder
+with default configuration """
+
+EMGSFCaloExtensionBuilder = CompFactory.EMGSFCaloExtensionBuilder
-def EMGSFCaloExtensionBuilderCfg(flags, name='EMGSFCaloExtensionBuilder', **kwargs):
+def EMGSFCaloExtensionBuilderCfg(
+ flags,
+ name='EMGSFCaloExtensionBuilder',
+ **kwargs):
mlog = logging.getLogger(name)
mlog.info('Starting configuration')
@@ -17,21 +21,25 @@ def EMGSFCaloExtensionBuilderCfg(flags, name='EMGSFCaloExtensionBuilder', **kwar
acc = ComponentAccumulator()
if "PerigeeCaloExtensionTool" not in kwargs:
- perigeeCaloExtrapAcc = ParticleCaloExtensionToolCfg(flags,
- name="PerigeeCaloExtensionTool",
- ParticleType="electron",
- StartFromPerigee=True)
+ perigeeCaloExtrapAcc = ParticleCaloExtensionToolCfg(
+ flags,
+ name="PerigeeCaloExtensionTool",
+ ParticleType="electron",
+ StartFromPerigee=True)
kwargs["PerigeeCaloExtensionTool"] = perigeeCaloExtrapAcc.popPrivateTools()
acc.merge(perigeeCaloExtrapAcc)
if "LastCaloExtensionTool" not in kwargs:
- lastCaloExtrapAcc = ParticleCaloExtensionToolCfg(flags,
- name="LastCaloExtensionTool",
- ParticleType="electron")
+ lastCaloExtrapAcc = ParticleCaloExtensionToolCfg(
+ flags,
+ name="LastCaloExtensionTool",
+ ParticleType="electron")
kwargs["LastCaloExtensionTool"] = lastCaloExtrapAcc.popPrivateTools()
acc.merge(lastCaloExtrapAcc)
- kwargs.setdefault("GFFTrkPartContainerName", flags.Egamma.Keys.Output.GSFTrackParticles)
+ kwargs.setdefault(
+ "GFFTrkPartContainerName",
+ flags.Egamma.Keys.Output.GSFTrackParticles)
emgscaloextfAlg = EMGSFCaloExtensionBuilder(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
index b8db76eb73b4fd63f89c9109321ee49dbf1f07cc..5ebb0a91a7beef48b232f51cbe5485fe487d878e 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
@@ -1,14 +1,15 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+from ROOT import egammaPID
+from ElectronPhotonSelectorTools.AsgForwardElectronIsEMSelectorsConfig import (
+ AsgForwardElectronIsEMSelectorCfg)
import cppyy
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from egammaTools.egammaOQFlagsBuilderConfig import egammaOQFlagsBuilderCfg
-EMFourMomBuilder=CompFactory.EMFourMomBuilder
-from ElectronPhotonSelectorTools.AsgForwardElectronIsEMSelectorsConfig import AsgForwardElectronIsEMSelectorCfg
-egammaForwardBuilder=CompFactory.egammaForwardBuilder
-from ROOT import egammaPID
+EMFourMomBuilder = CompFactory.EMFourMomBuilder
+egammaForwardBuilder = CompFactory.egammaForwardBuilder
cppyy.load_library('libElectronPhotonSelectorToolsDict')
@@ -21,14 +22,26 @@ def egammaForwardBuilderCfg(flags, name='egammaForwardElectron', **kwargs):
acc = ComponentAccumulator()
if "forwardelectronIsEMselectors" not in kwargs:
- LooseFwdElectronSelector = AsgForwardElectronIsEMSelectorCfg(flags, "LooseForwardElectronSelector", egammaPID.ForwardElectronIDLoose)
- MediumFwdElectronSelector = AsgForwardElectronIsEMSelectorCfg(flags, "MediumForwardElectronSelector", egammaPID.ForwardElectronIDMedium)
- TightFwdElectronSelector = AsgForwardElectronIsEMSelectorCfg(flags, "TightForwardElectronSelector", egammaPID.ForwardElectronIDTight)
+ LooseFwdElectronSelector = AsgForwardElectronIsEMSelectorCfg(
+ flags,
+ "LooseForwardElectronSelector",
+ egammaPID.ForwardElectronIDLoose)
+ MediumFwdElectronSelector = AsgForwardElectronIsEMSelectorCfg(
+ flags,
+ "MediumForwardElectronSelector",
+ egammaPID.ForwardElectronIDMedium)
+ TightFwdElectronSelector = AsgForwardElectronIsEMSelectorCfg(
+ flags,
+ "TightForwardElectronSelector",
+ egammaPID.ForwardElectronIDTight)
- kwargs.setdefault("forwardelectronIsEMselectors", [LooseFwdElectronSelector.popPrivateTools(),
- MediumFwdElectronSelector.popPrivateTools(),
- TightFwdElectronSelector.popPrivateTools()])
- kwargs.setdefault("forwardelectronIsEMselectorResultNames", ["Loose", "Medium", "Tight"])
+ kwargs.setdefault("forwardelectronIsEMselectors",
+ [LooseFwdElectronSelector.popPrivateTools(),
+ MediumFwdElectronSelector.popPrivateTools(),
+ TightFwdElectronSelector.popPrivateTools()])
+ kwargs.setdefault(
+ "forwardelectronIsEMselectorResultNames",
+ ["Loose", "Medium", "Tight"])
acc.merge(LooseFwdElectronSelector)
acc.merge(MediumFwdElectronSelector)
@@ -39,10 +52,14 @@ def egammaForwardBuilderCfg(flags, name='egammaForwardElectron', **kwargs):
kwargs["ObjectQualityTool"] = egOQ.popPrivateTools()
acc.merge(egOQ)
- kwargs.setdefault("ElectronOutputName", flags.Egamma.Keys.Output.ForwardElectrons)
- kwargs.setdefault("TopoClusterName", flags.Egamma.Keys.Input.ForwardTopoClusters)
- kwargs.setdefault("ClusterContainerName", flags.Egamma.Keys.Output.ForwardClusters)
- kwargs.setdefault("FourMomBuilderTool", EMFourMomBuilder())
+ kwargs.setdefault("ElectronOutputName",
+ flags.Egamma.Keys.Output.ForwardElectrons)
+ kwargs.setdefault("TopoClusterName",
+ flags.Egamma.Keys.Input.ForwardTopoClusters)
+ kwargs.setdefault("ClusterContainerName",
+ flags.Egamma.Keys.Output.ForwardClusters)
+ kwargs.setdefault("FourMomBuilderTool",
+ EMFourMomBuilder())
fwdAlg = egammaForwardBuilder(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlgConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlgConfig.py
index 0436e5b6d8a8a13707b79c26836cdcff1919e699..4c16498a582d84fb884c7b45625eea1b992c1a97 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlgConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaLargeClusterMakerAlgConfig.py
@@ -1,31 +1,38 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = "Configure egammaLargeClusterMaker, which chooses cells to store in the AOD"
+__doc__ = """
+ Configure egammaLargeClusterMaker,
+ which chooses cells to store in the AOD"""
__author__ = "Jovan Mitrevski"
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from egammaTools.egammaLargeClusterMakerConfig import egammaLargeClusterMakerCfg
from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
-CaloClusterMaker=CompFactory.CaloClusterMaker
+CaloClusterMaker = CompFactory.CaloClusterMaker
-def egammaLargeClusterMakerAlgCfg(flags, name = "egammaLargeClusterMaker", **kwargs):
+
+def egammaLargeClusterMakerAlgCfg(
+ flags,
+ name="egammaLargeClusterMaker",
+ **kwargs):
acc = ComponentAccumulator
-
+
kwargs.setdefault("SaveUncalibratedSignalState", False)
- kwargs.setdefault("ClustersOutputName", flags.Egamma.Keys.Output.EgammaLargeClusters)
+ kwargs.setdefault("ClustersOutputName",
+ flags.Egamma.Keys.Output.EgammaLargeClusters)
if "ClusterMakerTools" not in kwargs:
toolAcc = egammaLargeClusterMakerCfg(flags)
- kwargs["ClusterMakerTools"] = [ toolAcc.popPrivateTools() ]
+ kwargs["ClusterMakerTools"] = [toolAcc.popPrivateTools()]
acc.merge(toolAcc)
- kwargs.setdefault("ClusterCorrectionTools", make_CaloSwCorrections("ele7_11",
- suffix="Nocorr",
- version="none",
- cells_name=flags.Egamma.Keys.Input.CaloCells))
+ kwargs.setdefault("ClusterCorrectionTools",
+ make_CaloSwCorrections("ele7_11",
+ suffix="Nocorr",
+ version="none",
+ cells_name=flags.Egamma.Keys.Input.CaloCells))
acc.addEventAlgo(CaloClusterMaker(name, **kwargs))
return acc
-
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaLargeFWDClusterMakerAlg.py b/Reconstruction/egamma/egammaAlgs/python/egammaLargeFWDClusterMakerAlg.py
new file mode 100644
index 0000000000000000000000000000000000000000..55d7995fc77ce7bf75894266a0c028638a1d0a5f
--- /dev/null
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaLargeFWDClusterMakerAlg.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = """ToolFactory to instantiate egammaLargeClusterMaker
+with FWD configuration"""
+__author__ = "Jovan Mitrevski"
+
+from egammaTools.egammaToolsFactories import egammaLargeFWDClusterMakerTool
+from CaloRec import CaloRecConf
+from egammaRec.Factories import AlgFactory, FcnWrapper
+from egammaRec import egammaKeys
+from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
+
+
+def clusMakerTools():
+ return [egammaLargeFWDClusterMakerTool()]
+
+egammaLargeFWDClusterMakerAlg = AlgFactory(
+ CaloRecConf.CaloClusterMaker,
+ name="egammaLargeFWDClusterMaker",
+ SaveUncalibratedSignalState=False,
+ ClustersOutputName=egammaKeys.EgammaLargeFWDClustersKey(),
+ ClusterMakerTools=FcnWrapper(clusMakerTools),
+ ClusterCorrectionTools=make_CaloSwCorrections("FWDele6_6",
+ suffix="Nocorr",
+ version="none",
+ corrlist=[],
+ cells_name=egammaKeys.caloCellKey()))
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaLargeFWDClusterMakerAlgConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaLargeFWDClusterMakerAlgConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..054435602180a949078b671372ea4141e89b000d
--- /dev/null
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaLargeFWDClusterMakerAlgConfig.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = "Configure egammaLargeFWDClusterMaker, which chooses cells to store in the AOD"
+__author__ = "Jovan Mitrevski"
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from egammaTools.egammaLargeFWDClusterMakerConfig import egammaLargeFWDClusterMakerCfg
+from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
+CaloClusterMaker = CompFactory.CaloClusterMaker
+
+
+def egammaLargeFWDClusterMakerAlgCfg(
+ flags,
+ name="egammaLargeClusterMaker",
+ **kwargs):
+
+ acc = ComponentAccumulator
+
+ kwargs.setdefault("SaveUncalibratedSignalState", False)
+ kwargs.setdefault("ClustersOutputName",
+ flags.Egamma.Keys.Output.EgammaLargeFWDClusters)
+
+ if "ClusterMakerTools" not in kwargs:
+ toolAcc = egammaLargeFWDClusterMakerCfg(flags)
+ kwargs["ClusterMakerTools"] = [toolAcc.popPrivateTools()]
+ acc.merge(toolAcc)
+
+ kwargs.setdefault("ClusterCorrectionTools",
+ make_CaloSwCorrections("FWDele6_6",
+ suffix="Nocorr",
+ version="none",
+ cells_name=flags.Egamma.Keys.Input.CaloCells))
+
+ acc.addEventAlgo(CaloClusterMaker(name, **kwargs))
+ return acc
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py
index f80be96ec0f9a68067352d6a0934d09eeb428d0c..fd9078a89935e95b3060193dadb190848ed351c8 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilder.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = """ToolFactory to instantiate
+__doc__ = """ToolFactory to instantiate
egammaRecBuilder with default configuration"""
__author__ = "Jovan Mitrevski"
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
index 71d40ce6798b73a9d99626ec08994124d11a5143..f7ab862c60c9cb4a19845079f010f6b4bcadd828 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
@@ -1,16 +1,21 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = "Instantiate egammaRecBuilder with default configuration"
+__doc__ = """
+ Instantiate egammaRecBuilder with default configuration
+ """
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from egammaTools.EMTrackMatchBuilderConfig import EMTrackMatchBuilderCfg
from egammaTools.EMConversionBuilderConfig import EMConversionBuilderCfg
-egammaRecBuilder=CompFactory.egammaRecBuilder
+egammaRecBuilder = CompFactory.egammaRecBuilder
-def egammaRecBuilderCfg(flags, name='egammaRecBuilder', **kwargs):
+def egammaRecBuilderCfg(
+ flags,
+ name='egammaRecBuilder',
+ **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
@@ -26,8 +31,12 @@ def egammaRecBuilderCfg(flags, name='egammaRecBuilder', **kwargs):
kwargs["ConversionBuilderTool"] = emcnv.popPrivateTools()
acc.merge(emcnv)
- kwargs.setdefault("egammaRecContainer", flags.Egamma.Keys.Internal.EgammaRecs)
- kwargs.setdefault("InputTopoClusterContainerName", flags.Egamma.Keys.Internal.EgammaTopoClusters)
+ kwargs.setdefault(
+ "egammaRecContainer",
+ flags.Egamma.Keys.Internal.EgammaRecs)
+ kwargs.setdefault(
+ "InputTopoClusterContainerName",
+ flags.Egamma.Keys.Internal.EgammaTopoClusters)
egrecAlg = egammaRecBuilder(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
index ddffe1437793a92582179ea3e4aad3880838f23d..a338ede05e859912437663c2ce5d024b3844d0b0 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = "Instantiate egammaSelectedTrackCopy with default configuration"
@@ -11,7 +11,10 @@ egammaCaloClusterSelector = CompFactory.egammaCaloClusterSelector
egammaSelectedTrackCopy = CompFactory.egammaSelectedTrackCopy
-def egammaSelectedTrackCopyCfg(flags, name='egammaSelectedTrackCopy', **kwargs):
+def egammaSelectedTrackCopyCfg(
+ flags,
+ name='egammaSelectedTrackCopy',
+ **kwargs):
mlog = logging.getLogger(name)
mlog.info('Starting configuration')
@@ -19,24 +22,28 @@ def egammaSelectedTrackCopyCfg(flags, name='egammaSelectedTrackCopy', **kwargs):
acc = ComponentAccumulator()
if "egammaCaloClusterSelector" not in kwargs:
- egammaCaloClusterGSFSelector = egammaCaloClusterSelector(name='caloClusterGSFSelector',
- EMEtCut=2250.,
- EMEtSplittingFraction = 0.7,
- EMFCut=0.5
- )
+ egammaCaloClusterGSFSelector = egammaCaloClusterSelector(
+ name='caloClusterGSFSelector',
+ EMEtCut=2250.,
+ EMEtSplittingFraction=0.7,
+ EMFCut=0.5
+ )
kwargs["egammaCaloClusterSelector"] = egammaCaloClusterGSFSelector
- kwargs.setdefault("egammaCheckEnergyDepositTool", egammaCheckEnergyDepositTool())
+ kwargs.setdefault("egammaCheckEnergyDepositTool",
+ egammaCheckEnergyDepositTool())
if "ExtrapolationTool" not in kwargs:
extraptool = EMExtrapolationToolsCfg(flags)
kwargs["ExtrapolationTool"] = extraptool.popPrivateTools()
acc.merge(extraptool)
- kwargs.setdefault("ClusterContainerName",
- flags.Egamma.Keys.Internal.EgammaTopoClusters)
- kwargs.setdefault("TrackParticleContainerName",
- flags.Egamma.Keys.Input.TrackParticles)
+ kwargs.setdefault(
+ "ClusterContainerName",
+ flags.Egamma.Keys.Internal.EgammaTopoClusters)
+ kwargs.setdefault(
+ "TrackParticleContainerName",
+ flags.Egamma.Keys.Input.TrackParticles)
egseltrkcpAlg = egammaSelectedTrackCopy(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py
index 0de10c4dee171458544d367f47491f2925e1c49b..dd260c0b99f185772cd84d32da7f01753ca84aeb 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilder.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = """ToolFactory to instantiate the
two supercluster builders with default configuration"""
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
index 0205a247ecdfed330d25480904f6e5477b2da7e0..97b02ddf16770f13f539bcaeb9e2ba9aeb44d804 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
@@ -1,6 +1,7 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = "Instantiate the two supercluster builders with default configuration"
+__doc__ = """Instantiate the two supercluster
+builders with default configuration"""
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -36,9 +37,15 @@ def electronSuperClusterBuilderCfg(flags, name='electronSuperClusterBuilder', **
kwargs["ClusterCorrectionTool"] = egswtool.popPrivateTools()
acc.merge(egswtool)
- kwargs.setdefault("InputEgammaRecContainerName", flags.Egamma.Keys.Internal.EgammaRecs)
- kwargs.setdefault("SuperElectronRecCollectionName", flags.Egamma.Keys.Internal.ElectronSuperRecs)
- kwargs.setdefault("egammaCheckEnergyDepositTool", egammaCheckEnergyDepositTool())
+ kwargs.setdefault(
+ "InputEgammaRecContainerName",
+ flags.Egamma.Keys.Internal.EgammaRecs)
+ kwargs.setdefault(
+ "SuperElectronRecCollectionName",
+ flags.Egamma.Keys.Internal.ElectronSuperRecs)
+ kwargs.setdefault(
+ "egammaCheckEnergyDepositTool",
+ egammaCheckEnergyDepositTool())
kwargs.setdefault("EtThresholdCut", 1000)
elscAlg = electronSuperClusterBuilder(name, **kwargs)
@@ -47,7 +54,10 @@ def electronSuperClusterBuilderCfg(flags, name='electronSuperClusterBuilder', **
return acc
-def photonSuperClusterBuilderCfg(flags, name='photonSuperClusterBuilder', **kwargs):
+def photonSuperClusterBuilderCfg(
+ flags,
+ name='photonSuperClusterBuilder',
+ **kwargs):
from egammaAlgs.egammaAlgsConf import photonSuperClusterBuilder
@@ -71,9 +81,15 @@ def photonSuperClusterBuilderCfg(flags, name='photonSuperClusterBuilder', **kwar
kwargs["ClusterCorrectionTool"] = egswtool.popPrivateTools()
acc.merge(egswtool)
- kwargs.setdefault("InputEgammaRecContainerName", flags.Egamma.Keys.Internal.EgammaRecs)
- kwargs.setdefault("SuperPhotonRecCollectionName", flags.Egamma.Keys.Internal.PhotonSuperRecs)
- kwargs.setdefault("egammaCheckEnergyDepositTool", egammaCheckEnergyDepositTool())
+ kwargs.setdefault(
+ "InputEgammaRecContainerName",
+ flags.Egamma.Keys.Internal.EgammaRecs)
+ kwargs.setdefault(
+ "SuperPhotonRecCollectionName",
+ flags.Egamma.Keys.Internal.PhotonSuperRecs)
+ kwargs.setdefault(
+ "egammaCheckEnergyDepositTool",
+ egammaCheckEnergyDepositTool())
phscAlg = photonSuperClusterBuilder(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py
index 3b314af0653a123e0cf6cfe7d70850b5d738d486..5451f8b0c09e2b8b77ae5f94c4723337157668a3 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopier.py
@@ -1,7 +1,8 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = """
-ToolFactory to instantiate egammaTopoClusterCopier with default configuration"""
+ ToolFactory to instantiate egammaTopoClusterCopier
+ with default configuration"""
__author__ = "Jovan Mitrevski"
from egammaAlgs import egammaAlgsConf
@@ -11,8 +12,10 @@ from egammaRec.egammaRecFlags import jobproperties
egammaTopoClusterCopier = AlgFactory(
egammaAlgsConf.egammaTopoClusterCopier,
name='egammaTopoClusterCopier',
- InputTopoCollection=jobproperties.egammaRecFlags.inputTopoClusterCollection(),
- OutputTopoCollection=jobproperties.egammaRecFlags.egammaTopoClusterCollection(),
+ InputTopoCollection=(
+ jobproperties.egammaRecFlags.inputTopoClusterCollection()),
+ OutputTopoCollection=(
+ jobproperties.egammaRecFlags.egammaTopoClusterCollection()),
OutputTopoCollectionShallow="tmp_" +
jobproperties.egammaRecFlags.egammaTopoClusterCollection()
)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
index 2424f0eeb34459148cc438e5b47b96b666a505b2..a6e1077393605911e3d87b725bb8432a6a481469 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
@@ -1,25 +1,34 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = "Instantiate egammaTopoClusterCopier with default configuration"
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-egammaTopoClusterCopier=CompFactory.egammaTopoClusterCopier
+egammaTopoClusterCopier = CompFactory.egammaTopoClusterCopier
-def egammaTopoClusterCopierCfg(flags, name='egammaTopoClusterCopier', **kwargs):
+def egammaTopoClusterCopierCfg(
+ flags,
+ name='egammaTopoClusterCopier',
+ **kwargs):
mlog = logging.getLogger(name)
mlog.info('Starting configuration')
acc = ComponentAccumulator()
- kwargs.setdefault("InputTopoCollection", flags.Egamma.Keys.Input.TopoClusters)
+ kwargs.setdefault(
+ "InputTopoCollection",
+ flags.Egamma.Keys.Input.TopoClusters)
egtopocluster = flags.Egamma.Keys.Internal.EgammaTopoClusters
- kwargs.setdefault("OutputTopoCollection", egtopocluster)
- kwargs.setdefault("OutputTopoCollectionShallow", "tmp_"+egtopocluster)
+ kwargs.setdefault(
+ "OutputTopoCollection",
+ egtopocluster)
+ kwargs.setdefault(
+ "OutputTopoCollectionShallow",
+ "tmp_"+egtopocluster)
egcopierAlg = egammaTopoClusterCopier(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTrackSlimmerConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTrackSlimmerConfig.py
index a7f3ed03db4bedab249f847bf75905615768bafa..0c3192d5bb4b2359769d6cd0968c50f3136fb200 100755
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTrackSlimmerConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTrackSlimmerConfig.py
@@ -1,12 +1,15 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-egammaTrackSlimmer=CompFactory.egammaTrackSlimmer
+egammaTrackSlimmer = CompFactory.egammaTrackSlimmer
-def egammaTrackSlimmerCfg(flags, name='egammaTrackSlimmer', **kwargs):
+def egammaTrackSlimmerCfg(
+ flags,
+ name='egammaTrackSlimmer',
+ **kwargs):
mlog = logging.getLogger(name)
mlog.info('Starting configuration')
@@ -14,11 +17,16 @@ def egammaTrackSlimmerCfg(flags, name='egammaTrackSlimmer', **kwargs):
acc = ComponentAccumulator()
kwargs.setdefault("StreamName", 'StreamAOD')
- kwargs.setdefault("InputElectronContainerName", flags.Egamma.Keys.Output.Electrons)
- kwargs.setdefault("InputPhotonContainerName", flags.Egamma.Keys.Output.Photons)
- kwargs.setdefault("TrackParticleContainerName", flags.Egamma.Keys.Output.GSFTrackParticles)
- kwargs.setdefault("VertexContainerName", flags.Egamma.Keys.Output.ConversionVertices)
- kwargs.setdefault("InDetTrackParticleContainerName", flags.Egamma.Keys.Input.TrackParticles)
+ kwargs.setdefault("InputElectronContainerName",
+ flags.Egamma.Keys.Output.Electrons)
+ kwargs.setdefault("InputPhotonContainerName",
+ flags.Egamma.Keys.Output.Photons)
+ kwargs.setdefault("TrackParticleContainerName",
+ flags.Egamma.Keys.Output.GSFTrackParticles)
+ kwargs.setdefault("VertexContainerName",
+ flags.Egamma.Keys.Output.ConversionVertices)
+ kwargs.setdefault("InDetTrackParticleContainerName",
+ flags.Egamma.Keys.Input.TrackParticles)
egtrkslimmerAlg = egammaTrackSlimmer(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
index effa519afea4e57bc2d33ed68aa2f74e21380164..bf82b915619f99ecdfbb61cca6e3cb36d2ce5ce7 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
@@ -1,12 +1,12 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+from MCTruthClassifier.MCTruthClassifierConfig import MCTruthClassifierCaloTruthMatchCfg
__doc__ = "Configure egammaTruthAssociation"
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-egammaTruthAssociationAlg=CompFactory.egammaTruthAssociationAlg
-from MCTruthClassifier.MCTruthClassifierConfig import MCTruthClassifierCaloTruthMatchCfg
+egammaTruthAssociationAlg = CompFactory.egammaTruthAssociationAlg
def egammaTruthAssociationCfg(flags, name='egammaTruthAssociation', **kwargs):
@@ -21,15 +21,32 @@ def egammaTruthAssociationCfg(flags, name='egammaTruthAssociation', **kwargs):
kwargs["MCTruthClassifier"] = mctruth.popPrivateTools()
acc.merge(mctruth)
- kwargs.setdefault("ClusterContainerName", flags.Egamma.Keys.Output.CaloClusters)
- kwargs.setdefault("ElectronContainerName", flags.Egamma.Keys.Output.Electrons)
- kwargs.setdefault("PhotonContainerName", flags.Egamma.Keys.Output.Photons)
- kwargs.setdefault("FwdElectronContainerName", flags.Egamma.Keys.Output.ForwardElectrons)
- kwargs.setdefault("TruthEventContainerName", flags.Egamma.Keys.Input.TruthEvents)
- kwargs.setdefault("TruthParticleContainerName", flags.Egamma.Keys.Input.TruthParticles)
- kwargs.setdefault("EgammaTruthContainerName", flags.Egamma.Keys.Output.TruthParticles)
- kwargs.setdefault("MatchForwardElectrons", flags.Egamma.doForwardSeeded)
- kwargs.setdefault("SimBarcodeOffset", flags.Sim.SimBarcodeOffset)
+ kwargs.setdefault(
+ "ClusterContainerName",
+ flags.Egamma.Keys.Output.CaloClusters)
+ kwargs.setdefault(
+ "ElectronContainerName",
+ flags.Egamma.Keys.Output.Electrons)
+ kwargs.setdefault(
+ "PhotonContainerName",
+ flags.Egamma.Keys.Output.Photons)
+ kwargs.setdefault(
+ "FwdElectronContainerName",
+ flags.Egamma.Keys.Output.ForwardElectrons)
+ kwargs.setdefault(
+ "TruthEventContainerName",
+ flags.Egamma.Keys.Input.TruthEvents)
+ kwargs.setdefault(
+ "TruthParticleContainerName",
+ flags.Egamma.Keys.Input.TruthParticles)
+ kwargs.setdefault(
+ "EgammaTruthContainerName",
+ flags.Egamma.Keys.Output.TruthParticles)
+ kwargs.setdefault(
+ "MatchForwardElectrons",
+ flags.Egamma.doForwardSeeded)
+ kwargs.setdefault("SimBarcodeOffset",
+ flags.Sim.SimBarcodeOffset)
egtruthAlg = egammaTruthAssociationAlg(name, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
index 9d6f6725e5e6d48d2fb53a0f1c27ea74a4a796d3..33b14a49f348f32251b64b06b593693db585b3d1 100644
--- a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
@@ -1,12 +1,15 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-__doc__ = "Instantiate the two supercluster builders with default configuration"
+__doc__ = """
+ Instantiate the two supercluster
+ builders with default configuration
+ """
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-topoEgammaBuilder=CompFactory.topoEgammaBuilder
-EGammaAmbiguityTool=CompFactory.EGammaAmbiguityTool
+topoEgammaBuilder = CompFactory.topoEgammaBuilder
+EGammaAmbiguityTool = CompFactory.EGammaAmbiguityTool
def topoEgammaBuilderCfg(flags, name='topoEgammaBuilder', **kwargs):
@@ -16,11 +19,21 @@ def topoEgammaBuilderCfg(flags, name='topoEgammaBuilder', **kwargs):
acc = ComponentAccumulator()
- kwargs.setdefault("SuperElectronRecCollectionName", flags.Egamma.Keys.Internal.ElectronSuperRecs)
- kwargs.setdefault("SuperPhotonRecCollectionName", flags.Egamma.Keys.Internal.PhotonSuperRecs)
- kwargs.setdefault("ElectronOutputName", flags.Egamma.Keys.Output.Electrons)
- kwargs.setdefault("PhotonOutputName", flags.Egamma.Keys.Output.Photons)
- kwargs.setdefault("AmbiguityTool", EGammaAmbiguityTool())
+ kwargs.setdefault(
+ "SuperElectronRecCollectionName",
+ flags.Egamma.Keys.Internal.ElectronSuperRecs)
+ kwargs.setdefault(
+ "SuperPhotonRecCollectionName",
+ flags.Egamma.Keys.Internal.PhotonSuperRecs)
+ kwargs.setdefault(
+ "ElectronOutputName",
+ flags.Egamma.Keys.Output.Electrons)
+ kwargs.setdefault(
+ "PhotonOutputName",
+ flags.Egamma.Keys.Output.Photons)
+ kwargs.setdefault(
+ "AmbiguityTool",
+ EGammaAmbiguityTool())
topoegAlg = topoEgammaBuilder(flags, **kwargs)
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
index b0fdb0edc0128291be7ac0f759eb565fb05d67d8..8d23ac6a8b5cb947a4a41b961e1bbed75cc7b83c 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -63,7 +63,7 @@ StatusCode EMVertexBuilder::execute(const EventContext& ctx) const
}
std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> verticesPair =
- m_vertexFinderTool->findVertex(TPCol.cptr());
+ m_vertexFinderTool->findVertex(ctx,TPCol.cptr());
if (!verticesPair.first || !verticesPair.second){
ATH_MSG_ERROR("Null pointer to conversion container");
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
index c9b19ab18a16d09dbe1462356d439f5d62bab007..75011f7d99cefdae4ef6f98bb5e5f68b8a996e9a 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "egammaRecBuilder.h"
@@ -104,7 +104,7 @@ egammaRecBuilder::execute(const EventContext& ctx) const
const size_t nTopo = topoclusters->size();
egammaRecs->reserve(nTopo);
for (size_t i(0); i < nTopo; i++) {
- const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i);
+ const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i, ctx);
const std::vector<ElementLink<xAOD::CaloClusterContainer>> ClusterLink{
clusterLink
};
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
index 78fc6765949bd63b11b408e156f3f5329f4bef47..b88d88c25000cc18e97ca54f1dc4ba625ea8fbc1 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
@@ -61,13 +61,15 @@ etaphi_range(const CaloDetDescrManager& dd_man,
constexpr double eps = 0.001;
// Now look in the negative eta direction.
- const CaloDetDescrElement* elt_l = dd_man.get_element_raw(sampling, eta - elt->deta() - eps, phi);
+ const CaloDetDescrElement* elt_l =
+ dd_man.get_element_raw(sampling, eta - elt->deta() - eps, phi);
double deta_l = 0; // Eta difference on the low (left) side.
if (elt_l) {
deta_l = std::abs(eta - elt_l->eta_raw()) + eps;
}
// Now look in the positive eta direction.
- const CaloDetDescrElement* elt_r = dd_man.get_element_raw(sampling, eta + elt->deta() + eps, phi);
+ const CaloDetDescrElement* elt_r =
+ dd_man.get_element_raw(sampling, eta + elt->deta() + eps, phi);
double deta_r = 0; // Eta difference on the high (right) side.
if (elt_r) {
deta_r = std::abs(eta - elt_r->eta_raw()) + eps;
@@ -80,16 +82,18 @@ etaphi_range(const CaloDetDescrManager& dd_man,
// Thus we have to look again at the adjacent eta cells, and
// take the largest variation.
// Now look in the negative eta direction.
- elt_l = dd_man.get_element_raw(
- sampling, eta - elt->deta() - eps, CaloPhiRange::fix(phi - elt->dphi() - eps));
+ elt_l = dd_man.get_element_raw(sampling,
+ eta - elt->deta() - eps,
+ CaloPhiRange::fix(phi - elt->dphi() - eps));
double dphi_l = 0; // Phi difference on the low-eta () side.
if (elt_l) {
dphi_l = std::abs(CaloPhiRange::fix(phi - elt_l->phi_raw())) + eps;
}
// Now look in the positive eta direction.
- elt_r = dd_man.get_element_raw(
- sampling, eta + elt->deta() + eps, CaloPhiRange::fix(phi - elt->dphi() - eps));
+ elt_r = dd_man.get_element_raw(sampling,
+ eta + elt->deta() + eps,
+ CaloPhiRange::fix(phi - elt->dphi() - eps));
double dphi_r = 0; // Phi difference on the positive (down) side.
if (elt_r) {
dphi_r = std::abs(CaloPhiRange::fix(phi - elt_r->phi_raw())) + eps;
@@ -114,10 +118,14 @@ egammaSuperClusterBuilder::egammaSuperClusterBuilder(const std::string& name,
m_searchWindowPhiEndcap = m_searchWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
m_searchWindowEtaEndcap = m_searchWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
- m_addCellsWindowPhiBarrel = m_addCellsWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
- m_addCellsWindowEtaBarrel = m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
- m_addCellsWindowPhiEndcap = m_addCellsWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
- m_addCellsWindowEtaEndcap = m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
+ m_addCellsWindowPhiBarrel =
+ m_addCellsWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
+ m_addCellsWindowEtaBarrel =
+ m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
+ m_addCellsWindowPhiEndcap =
+ m_addCellsWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
+ m_addCellsWindowEtaEndcap =
+ m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
// the +1 is to account for the offset in the centers of the clusters
m_extraL0L1PhiSize = m_extraL0L1PhiSizeCells * s_cellPhiSize;
@@ -132,17 +140,24 @@ egammaSuperClusterBuilder::initialize()
m_searchWindowPhiEndcap = m_searchWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
m_searchWindowEtaEndcap = m_searchWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
- m_addCellsWindowPhiBarrel = m_addCellsWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
- m_addCellsWindowEtaBarrel = m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
- m_addCellsWindowPhiEndcap = m_addCellsWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
- m_addCellsWindowEtaEndcap = m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
+ m_addCellsWindowPhiBarrel =
+ m_addCellsWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
+ m_addCellsWindowEtaBarrel =
+ m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
+ m_addCellsWindowPhiEndcap =
+ m_addCellsWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
+ m_addCellsWindowEtaEndcap =
+ m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
// the +1 is to account for the offset in the centers of the clusters
m_extraL0L1PhiSize = m_extraL0L1PhiSizeCells * s_cellPhiSize;
- if (m_addCellsWindowPhiCellsBarrel % 2 == 0 || m_addCellsWindowPhiCellsEndcap % 2 == 0 ||
- m_addCellsWindowEtaCellsBarrel % 2 == 0 || m_addCellsWindowEtaCellsEndcap % 2 == 0) {
- ATH_MSG_FATAL("For adding cells relative to the hottest cell to be symmetric, the AddCells "
+ if (m_addCellsWindowPhiCellsBarrel % 2 == 0 ||
+ m_addCellsWindowPhiCellsEndcap % 2 == 0 ||
+ m_addCellsWindowEtaCellsBarrel % 2 == 0 ||
+ m_addCellsWindowEtaCellsEndcap % 2 == 0) {
+ ATH_MSG_FATAL("For adding cells relative to the hottest cell to be "
+ "symmetric, the AddCells "
"window size needs to be odd");
return StatusCode::FAILURE;
}
@@ -165,36 +180,43 @@ egammaSuperClusterBuilder::matchesInWindow(const xAOD::CaloCluster* ref,
{
// First the case where we are both endcap and barrel, i.e in the crack
// Check around both measurements of the seed
- if (ref->hasSampling(CaloSampling::EMB2) && ref->hasSampling(CaloSampling::EME2)) {
+ if (ref->hasSampling(CaloSampling::EMB2) &&
+ ref->hasSampling(CaloSampling::EME2)) {
float dEta(fabs(ref->eta() - clus->eta()));
float dPhi(fabs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
//
float dEtaBarrel(fabs(ref->etaSample(CaloSampling::EMB2) - clus->eta()));
- float dPhiBarrel(fabs(P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EMB2), clus->phi())));
+ float dPhiBarrel(fabs(
+ P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EMB2), clus->phi())));
//
float dEtaEndcap(fabs(ref->etaSample(CaloSampling::EME2) - clus->eta()));
- float dPhiEndcap(fabs(P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EME2), clus->phi())));
+ float dPhiEndcap(fabs(
+ P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EME2), clus->phi())));
// Matches any in case of split
- return ((dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel) ||
- (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap) ||
- (dEtaBarrel < m_searchWindowEtaBarrel && dPhiBarrel < m_searchWindowPhiBarrel) ||
- (dEtaEndcap < m_searchWindowEtaEndcap && dPhiEndcap < m_searchWindowPhiEndcap));
- } if (xAOD::EgammaHelpers::isBarrel(clus)) {
+ return (
+ (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel) ||
+ (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap) ||
+ (dEtaBarrel < m_searchWindowEtaBarrel &&
+ dPhiBarrel < m_searchWindowPhiBarrel) ||
+ (dEtaEndcap < m_searchWindowEtaEndcap &&
+ dPhiEndcap < m_searchWindowPhiEndcap));
+ }
+ if (xAOD::EgammaHelpers::isBarrel(clus)) {
float dEta(fabs(ref->eta() - clus->eta()));
float dPhi(fabs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
return (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel);
}
- float dEta(fabs(ref->eta() - clus->eta()));
- float dPhi(fabs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
- return (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap);
-
+ float dEta(fabs(ref->eta() - clus->eta()));
+ float dPhi(fabs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
+ return (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap);
}
std::unique_ptr<xAOD::CaloCluster>
-egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
- const std::vector<const xAOD::CaloCluster*>& clusters,
- const CaloDetDescrManager& mgr,
- xAOD::EgammaParameters::EgammaType egType) const
+egammaSuperClusterBuilder::createNewCluster(
+ const EventContext& ctx,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
+ const CaloDetDescrManager& mgr,
+ xAOD::EgammaParameters::EgammaType egType) const
{
const auto acSize = clusters.size();
@@ -204,7 +226,9 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
}
std::unique_ptr<xAOD::CaloCluster> newCluster(
- CaloClusterStoreHelper::makeCluster(clusters.at(0)->getCellLinks()->getCellContainer()));
+ CaloClusterStoreHelper::makeCluster(
+ clusters.at(0)->getCellLinks()->getCellContainer()));
+
if (!newCluster) {
ATH_MSG_ERROR("CaloClusterStoreHelper::makeCluster failed.");
return nullptr;
@@ -214,13 +238,14 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
// This will be used as the center for restricting the cluster size.
// In the future can refine (or add sanity checks) to the selection
CentralPosition cpRef = findCentralPosition(clusters);
- // these are the same as the reference but in calo frame (after the processing below)
+ // these are the same as the reference but in calo frame (after the processing
+ // below)
CentralPosition cp0 = cpRef;
-
// Get the hotest in raw co-ordinates
if (cp0.emaxB > 0) {
CaloCell_ID::CaloSample xsample = CaloCell_ID::EMB2;
- const CaloDetDescrElement* dde = mgr.get_element(xsample, cpRef.etaB, cpRef.phiB);
+ const CaloDetDescrElement* dde =
+ mgr.get_element(xsample, cpRef.etaB, cpRef.phiB);
if (dde) {
cp0.etaB = dde->eta_raw();
cp0.phiB = dde->phi_raw();
@@ -231,7 +256,8 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
}
if (cp0.emaxEC > 0) {
CaloCell_ID::CaloSample xsample = CaloCell_ID::EME2;
- const CaloDetDescrElement* dde = mgr.get_element(xsample, cpRef.etaEC, cpRef.phiEC);
+ const CaloDetDescrElement* dde =
+ mgr.get_element(xsample, cpRef.etaEC, cpRef.phiEC);
if (dde) {
cp0.etaEC = dde->eta_raw();
cp0.phiEC = dde->phi_raw();
@@ -240,7 +266,6 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
<< cpRef.etaEC << ", phi = " << cpRef.phiEC);
}
}
-
// Set the eta0/phi0 based on the references, but in raw coordinates
if (cp0.emaxB >= cp0.emaxEC) {
newCluster->setEta0(cp0.etaB);
@@ -250,51 +275,19 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
newCluster->setPhi0(cp0.phiEC);
}
- // Need a vector of element Links to the constituent Cluster
- std::vector<ElementLink<xAOD::CaloClusterContainer>> constituentLinks;
- static const SG::AuxElement::Accessor<ElementLink<xAOD::CaloClusterContainer>> sisterCluster(
- "SisterCluster");
-
- // Now add the cluster cells (other than L1 and PS)
- for (size_t i = 0; i < acSize; i++) {
- // Add te EM cells of the accumulated to the cluster
- if (addEMCellsToCluster(newCluster.get(), clusters[i], cp0).isFailure()) {
- ATH_MSG_DEBUG("There was problem adding the topocluster cells to the the cluster: "
- "potentially no L2 or L3 cells in cluster");
- return nullptr;
- }
- // Set the element Link to the constitents
- if (sisterCluster.isAvailable(*clusters[i])) {
- constituentLinks.push_back(sisterCluster(*clusters[i]));
- } else {
- ATH_MSG_WARNING("No sister Link available");
- }
- }
-
- // Now calculate the cluster size; use that for restricting the L1 cells
- PhiSize phiSize = findPhiSize(cp0, newCluster.get());
-
- // now add L1 cells
- for (size_t i = 0; i < acSize; i++) {
- // Add te EM cells of the accumulated to the cluster
- if (addL0L1EMCellsToCluster(newCluster.get(), clusters[i], cp0, phiSize).isFailure()) {
- ATH_MSG_WARNING(
- "There was problem adding the topocluster PS and L1 cells to the the cluster");
- return nullptr;
- }
+ // Actually fill the cluster here
+ if (fillClusterConstrained(*newCluster, clusters, cp0).isFailure()) {
+ ATH_MSG_DEBUG(
+ "There was problem adding the topocluster cells to the the cluster: "
+ "potentially no L2 or L3 cells in cluster");
+ return nullptr;
}
-
// Apply SW-style summation of TileGap3 cells (if necessary).
- if (addTileGap3CellsinWindow(newCluster.get(), mgr).isFailure()) {
- ATH_MSG_ERROR("Problem with the input cluster when running AddTileGap3CellsinWindow?");
+ if (addTileGap3CellsinWindow(*newCluster, mgr).isFailure()) {
+ ATH_MSG_ERROR(
+ "Problem with the input cluster when running AddTileGap3CellsinWindow?");
return nullptr;
}
-
- // Set the link from the super cluster to the constituents (accumulated) clusters used.
- static const SG::AuxElement::Accessor<std::vector<ElementLink<xAOD::CaloClusterContainer>>>
- caloClusterLinks("constituentClusterLinks");
- caloClusterLinks(*newCluster) = constituentLinks;
-
/// Calculate the kinematics of the new cluster, after all cells are added
CaloClusterKineHelper::calculateKine(newCluster.get(), true, true);
@@ -305,7 +298,8 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
// Check to see if cluster pases basic requirements. If not, kill it.
if (!m_egammaCheckEnergyDepositTool.empty() &&
- !m_egammaCheckEnergyDepositTool->checkFractioninSamplingCluster(newCluster.get())) {
+ !m_egammaCheckEnergyDepositTool->checkFractioninSamplingCluster(
+ newCluster.get())) {
ATH_MSG_DEBUG("Cluster failed sample check: dont make ROI");
return nullptr;
}
@@ -315,167 +309,227 @@ egammaSuperClusterBuilder::createNewCluster(const EventContext& ctx,
ATH_MSG_WARNING("There was problem calibrating the object");
return nullptr;
}
+
+ // EDM vector to constituent clusters
+ std::vector<ElementLink<xAOD::CaloClusterContainer>> constituentLinks;
+ static const SG::AuxElement::Accessor<ElementLink<xAOD::CaloClusterContainer>>
+ sisterCluster("SisterCluster");
+ for (size_t i = 0; i < acSize; i++) {
+ // Set the element Link to the constitents
+ if (sisterCluster.isAvailable(*clusters[i])) {
+ constituentLinks.push_back(sisterCluster(*clusters[i]));
+ } else {
+ ATH_MSG_WARNING("No sister Link available");
+ }
+ }
+ // Set the link from the super cluster to the constituents (accumulated)
+ // clusters used.
+ static const SG::AuxElement::Accessor<
+ std::vector<ElementLink<xAOD::CaloClusterContainer>>>
+ caloClusterLinks("constituentClusterLinks");
+ caloClusterLinks(*newCluster) = constituentLinks;
+
// return the new cluster
return newCluster;
}
StatusCode
-egammaSuperClusterBuilder::addEMCellsToCluster(
- xAOD::CaloCluster* newCluster,
- const xAOD::CaloCluster* ref,
+egammaSuperClusterBuilder::fillClusterConstrained(
+ xAOD::CaloCluster& tofill,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
const egammaSuperClusterBuilder::CentralPosition& cp0) const
{
- if (!newCluster || !ref) {
- ATH_MSG_ERROR("Invalid input in AddEMCellsToCluster");
- return StatusCode::FAILURE;
- }
- //
- xAOD::CaloCluster::const_cell_iterator cell_itr = ref->begin();
- xAOD::CaloCluster::const_cell_iterator cell_end = ref->end();
- // Loop over cells
- for (; cell_itr != cell_end; ++cell_itr) {
-
- // sanity check on the cell
- const CaloCell* cell = *cell_itr;
- if (!cell) {
- continue;
- }
+ /*
+ * Fill super cluster constraining its size
+ * in eta,phi around the overall hottest cell
+ * and the L2 size
+ */
+
+ // Loop for L2/L3
+ for (const xAOD::CaloCluster* tocheck : clusters) {
+ xAOD::CaloCluster::const_cell_iterator cell_itr = tocheck->begin();
+ xAOD::CaloCluster::const_cell_iterator cell_end = tocheck->end();
+ // Loop over cells
+ for (; cell_itr != cell_end; ++cell_itr) {
+ // sanity check on the cell
+ const CaloCell* cell = *cell_itr;
+ if (!cell) {
+ continue;
+ }
+ const CaloDetDescrElement* dde = cell->caloDDE();
+ if (!dde) {
+ continue;
+ }
- bool addCell = false;
+ bool addCell = false;
- // lets remove from consideration if outside the range
- if (cp0.emaxB > 0) { // has cells in the barrel
- if (fabs(cp0.etaB - cell->caloDDE()->eta_raw()) < m_addCellsWindowEtaBarrel &&
- fabs(P4Helpers::deltaPhi(cp0.phiB, cell->caloDDE()->phi_raw())) <
- m_addCellsWindowPhiBarrel) {
- addCell = true;
+ // lets remove from consideration if outside the range
+ if (cp0.emaxB > 0) { // has cells in the barrel
+ if (fabs(cp0.etaB - dde->eta_raw()) < m_addCellsWindowEtaBarrel &&
+ fabs(P4Helpers::deltaPhi(cp0.phiB, dde->phi_raw())) <
+ m_addCellsWindowPhiBarrel) {
+ addCell = true;
+ }
}
- }
- if (cp0.emaxEC > 0) { // has cells in the endcap
- if (fabs(cp0.etaEC - cell->caloDDE()->eta_raw()) < m_addCellsWindowEtaEndcap &&
- fabs(P4Helpers::deltaPhi(cp0.phiEC, cell->caloDDE()->phi_raw())) <
- m_addCellsWindowPhiEndcap) {
- addCell = true;
+ if (cp0.emaxEC > 0) { // has cells in the endcap
+ if (fabs(cp0.etaEC - dde->eta_raw()) < m_addCellsWindowEtaEndcap &&
+ fabs(P4Helpers::deltaPhi(cp0.phiEC, dde->phi_raw())) <
+ m_addCellsWindowPhiEndcap) {
+ addCell = true;
+ }
}
- }
-
- if (!addCell)
- continue;
- const CaloDetDescrElement* dde = cell->caloDDE();
- if (!dde) {
- continue;
- }
+ if (!addCell) {
+ continue;
+ }
- auto sampling = dde->getSampling();
+ auto sampling = dde->getSampling();
- // skip if sampling is L1 or presample, since that is a separate step
- if (CaloCell_ID::EMB1 == sampling || CaloCell_ID::EME1 == sampling ||
- CaloCell_ID::PreSamplerB == sampling || CaloCell_ID::PreSamplerE == sampling) {
- continue;
- }
+ // skip if sampling is L1 or presample, since that is a separate step
+ if (CaloCell_ID::EMB1 == sampling || CaloCell_ID::EME1 == sampling ||
+ CaloCell_ID::PreSamplerB == sampling ||
+ CaloCell_ID::PreSamplerE == sampling) {
+ continue;
+ }
- // For the cells we have not skipped either because TileGap, bounds, or L1
- if (dde->getSubCalo() == CaloCell_ID::LAREM) {
- // Avoid summing inner wheel Endcap cells
- if (!(dde->is_lar_em_endcap_inner())) {
- newCluster->addCell(cell_itr.index(), cell_itr.weight());
+ // For the cells we have not skipped either because TileGap, bounds, or L1
+ if (dde->getSubCalo() == CaloCell_ID::LAREM) {
+ // Avoid summing inner wheel Endcap cells
+ if (!(dde->is_lar_em_endcap_inner())) {
+ tofill.addCell(cell_itr.index(), cell_itr.weight());
+ }
}
- }
- } // Loop over cells
- if (newCluster->size() == 0) {
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
+ } // Loop over cells for L2/L3
+ } // Loop over clusters for L2/L3
-StatusCode
-egammaSuperClusterBuilder::addL0L1EMCellsToCluster(
- xAOD::CaloCluster* newCluster,
- const xAOD::CaloCluster* ref,
- const egammaSuperClusterBuilder::CentralPosition& cp0,
- const egammaSuperClusterBuilder::PhiSize& phiSize) const
-{
- if (!newCluster || !ref) {
- ATH_MSG_ERROR("Invalid input in addL0L1EMCellsToCluster");
+ // We should have a size here
+ if (tofill.size() == 0) {
return StatusCode::FAILURE;
}
-
+ // Now calculate the cluster size; use that for restricting the L1 cells
+ PhiSize phiSize = findPhiSize(cp0, tofill);
float phiPlusB = cp0.phiB + phiSize.plusB + m_extraL0L1PhiSize;
float phiMinusB = cp0.phiB - phiSize.minusB - m_extraL0L1PhiSize;
-
ATH_MSG_DEBUG("barrel phi range = " << phiMinusB << " to " << phiPlusB);
-
float phiPlusEC = cp0.phiEC + phiSize.plusEC + m_extraL0L1PhiSize;
float phiMinusEC = cp0.phiEC - phiSize.minusEC - m_extraL0L1PhiSize;
-
ATH_MSG_DEBUG("endcap phi range = " << phiMinusEC << " to " << phiPlusEC);
- //
- xAOD::CaloCluster::const_cell_iterator cell_itr = ref->begin();
- xAOD::CaloCluster::const_cell_iterator cell_end = ref->end();
- // Loop over cells
- for (; cell_itr != cell_end; ++cell_itr) {
+ // Loop for L0/L1
+ for (const xAOD::CaloCluster* tocheck : clusters) {
+ xAOD::CaloCluster::const_cell_iterator cell_itr = tocheck->begin();
+ xAOD::CaloCluster::const_cell_iterator cell_end = tocheck->end();
+ // Loop over cells
+ for (; cell_itr != cell_end; ++cell_itr) {
+ // sanity check on the cell
+ const CaloCell* cell = *cell_itr;
+ if (!cell) {
+ continue;
+ }
+ const CaloDetDescrElement* dde = cell->caloDDE();
+ if (!dde) {
+ continue;
+ }
+ bool addCell = false;
+ // lets remove from consideration if outside the range
+ if (cp0.emaxB > 0) { // has cells in the barrel
+ if (fabs(cp0.etaB - dde->eta_raw()) < m_addCellsWindowEtaBarrel &&
+ fabs(P4Helpers::deltaPhi(cp0.phiB, cell->caloDDE()->phi_raw())) <
+ m_addCellsWindowPhiBarrel) {
+ addCell = true;
+ }
+ }
+ if (cp0.emaxEC > 0) { // has cells in the endcap
+ if (fabs(cp0.etaEC - dde->eta_raw()) < m_addCellsWindowEtaEndcap &&
+ fabs(P4Helpers::deltaPhi(cp0.phiEC, cell->caloDDE()->phi_raw())) <
+ m_addCellsWindowPhiEndcap) {
+ addCell = true;
+ }
+ }
+ if (!addCell) {
+ continue;
+ }
+ auto sampling = dde->getSampling();
+
+ // only deal with L1 or PS
+ if (CaloCell_ID::EMB1 == sampling ||
+ CaloCell_ID::PreSamplerB == sampling) {
+ double cell_phi = proxim(dde->phi_raw(), cp0.phiB);
+ bool inRange = cell_phi > phiMinusB && cell_phi < phiPlusB;
+ ATH_MSG_DEBUG("Found PS or L1 cell with phi = "
+ << cell_phi << "; inRange = " << inRange);
+ if (inRange) {
+ tofill.addCell(cell_itr.index(), cell_itr.weight());
+ }
+ }
+ if (CaloCell_ID::EME1 == sampling ||
+ CaloCell_ID::PreSamplerE == sampling) {
+ double cell_phi = proxim(dde->phi_raw(), cp0.phiEC);
+ bool inRange = cell_phi > phiMinusEC && cell_phi < phiPlusEC;
+ ATH_MSG_DEBUG("Found PS or L1 cell with phi = "
+ << cell_phi << "; inRange = " << inRange);
+ if (inRange) {
+ tofill.addCell(cell_itr.index(), cell_itr.weight());
+ }
+ }
+ } // Cell Loop for L0/L1
+ } // Cluster loop for L0/L1
+ return StatusCode::SUCCESS;
+}
- // sanity check on the cell
- const CaloCell* cell = *cell_itr;
- if (!cell) {
- continue;
- }
+StatusCode
+egammaSuperClusterBuilder::addTileGap3CellsinWindow(
+ xAOD::CaloCluster& tofill,
+ const CaloDetDescrManager& mgr) const
+{
- bool addCell = false;
+ constexpr double searchWindowEta = 0.2;
+ constexpr double searchWindowPhi = 2 * M_PI / 64.0 + M_PI / 64; // ~ 0.15 rad
+ std::vector<const CaloCell*> cells;
+ cells.reserve(16);
+ const CaloCellContainer* inputcells =
+ tofill.getCellLinks()->getCellContainer();
- // lets remove from consideration if outside the range
- if (cp0.emaxB > 0) { // has cells in the barrel
- if (fabs(cp0.etaB - cell->caloDDE()->eta_raw()) < m_addCellsWindowEtaBarrel &&
- fabs(P4Helpers::deltaPhi(cp0.phiB, cell->caloDDE()->phi_raw())) <
- m_addCellsWindowPhiBarrel) {
- addCell = true;
- }
- }
- if (cp0.emaxEC > 0) { // has cells in the endcap
- if (fabs(cp0.etaEC - cell->caloDDE()->eta_raw()) < m_addCellsWindowEtaEndcap &&
- fabs(P4Helpers::deltaPhi(cp0.phiEC, cell->caloDDE()->phi_raw())) <
- m_addCellsWindowPhiEndcap) {
- addCell = true;
- }
- }
+ if (!inputcells) {
+ ATH_MSG_ERROR("No cell container in addRemainingCellsToCluster?");
+ return StatusCode::FAILURE;
+ }
- if (!addCell)
- continue;
- const CaloDetDescrElement* dde = cell->caloDDE();
- if (!dde) {
- continue;
- }
+ CaloCellList myList(inputcells);
- auto sampling = dde->getSampling();
+ const std::vector<CaloSampling::CaloSample> samples = {
+ CaloSampling::TileGap3
+ };
+ for (auto samp : samples) {
+ myList.select(mgr,
+ tofill.eta0(),
+ tofill.phi0(),
+ searchWindowEta,
+ searchWindowPhi,
+ samp);
+ cells.insert(cells.end(), myList.begin(), myList.end());
+ }
- // only deal with L1 or PS
- if (CaloCell_ID::EMB1 == sampling || CaloCell_ID::PreSamplerB == sampling) {
- double cell_phi = proxim(cell->caloDDE()->phi_raw(), cp0.phiB);
- bool inRange = cell_phi > phiMinusB && cell_phi < phiPlusB;
- ATH_MSG_DEBUG("Found PS or L1 cell with phi = " << cell_phi << "; inRange = " << inRange);
- if (inRange) {
- newCluster->addCell(cell_itr.index(), cell_itr.weight());
- }
+ for (const auto* cell : cells) {
+ if (!cell || !cell->caloDDE()) {
+ continue;
}
- if (CaloCell_ID::EME1 == sampling || CaloCell_ID::PreSamplerE == sampling) {
- double cell_phi = proxim(cell->caloDDE()->phi_raw(), cp0.phiEC);
- bool inRange = cell_phi > phiMinusEC && cell_phi < phiPlusEC;
- ATH_MSG_DEBUG("Found PS or L1 cell with phi = " << cell_phi << "; inRange = " << inRange);
- if (inRange) {
- newCluster->addCell(cell_itr.index(), cell_itr.weight());
- }
+ if ((CaloCell_ID::TileGap3 == cell->caloDDE()->getSampling()) &&
+ (std::abs(cell->caloDDE()->eta_raw()) > 1.4 &&
+ std::abs(cell->caloDDE()->eta_raw()) < 1.6)) {
+ int index = inputcells->findIndex(cell->caloDDE()->calo_hash());
+ tofill.addCell(index, 1.);
}
}
return StatusCode::SUCCESS;
}
StatusCode
-egammaSuperClusterBuilder::calibrateCluster(const EventContext& ctx,
- xAOD::CaloCluster* newCluster,
- const CaloDetDescrManager& mgr,
- const xAOD::EgammaParameters::EgammaType egType) const
+egammaSuperClusterBuilder::calibrateCluster(
+ const EventContext& ctx,
+ xAOD::CaloCluster* newCluster,
+ const CaloDetDescrManager& mgr,
+ const xAOD::EgammaParameters::EgammaType egType) const
{
ATH_CHECK(refineEta1Position(newCluster, mgr));
@@ -491,33 +545,35 @@ egammaSuperClusterBuilder::calibrateCluster(const EventContext& ctx,
newCluster->setRawPhi(newCluster->phi());
//
ATH_CHECK(fillPositionsInCalo(newCluster, mgr));
- // At this point we do not have the final tracks vertices attached on the cluster/ new egamma Rec
- // Object. So We will need at the end to do the final update in the EMClusterTool For now apply
- // just cluster info only calibration.
ATH_CHECK(m_MVACalibSvc->execute(*newCluster, egType));
return StatusCode::SUCCESS;
}
-// ==========================================================================
+
StatusCode
-egammaSuperClusterBuilder::fillPositionsInCalo(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
+egammaSuperClusterBuilder::fillPositionsInCalo(
+ xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const
{
const bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
- CaloCell_ID::CaloSample sample = isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
+ CaloCell_ID::CaloSample sample =
+ isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
// eta and phi of the cluster in the calorimeter frame
double eta;
double phi;
- m_caloCellDetPos.getDetPosition(mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
// eta in the second sampling
- m_caloCellDetPos.getDetPosition(mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
// eta in the first sampling
sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- m_caloCellDetPos.getDetPosition(mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
@@ -525,12 +581,14 @@ egammaSuperClusterBuilder::fillPositionsInCalo(xAOD::CaloCluster* cluster,
}
StatusCode
-egammaSuperClusterBuilder::refineEta1Position(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
+egammaSuperClusterBuilder::refineEta1Position(
+ xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const
{
// This only makes sense if we have cells there
- if (!cluster->hasSampling(CaloSampling::EMB1) && !cluster->hasSampling(CaloSampling::EME1)) {
+ if (!cluster->hasSampling(CaloSampling::EMB1) &&
+ !cluster->hasSampling(CaloSampling::EME1)) {
ATH_MSG_DEBUG("No layer sampling - skipping refine eta ");
return StatusCode::SUCCESS;
}
@@ -546,18 +604,21 @@ egammaSuperClusterBuilder::refineEta1Position(xAOD::CaloCluster* cluster,
}
StatusCode
-egammaSuperClusterBuilder::makeCorrection1(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr,
- const CaloSampling::CaloSample sample) const
+egammaSuperClusterBuilder::makeCorrection1(
+ xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr,
+ const CaloSampling::CaloSample sample) const
{
// Protections.
ATH_MSG_DEBUG("Hottest cell in layer 1 ATLAS co-ordinates (eta,phi): ("
- << cluster->etamax(sample) << " , " << cluster->phimax(sample) << ")");
+ << cluster->etamax(sample) << " , " << cluster->phimax(sample)
+ << ")");
if (cluster->etamax(sample) == -999. || cluster->phimax(sample) == -999.) {
return StatusCode::SUCCESS;
}
- if (fabs(cluster->etamax(sample)) < 1E-6 && fabs(cluster->phimax(sample)) < 1E-6) {
+ if (fabs(cluster->etamax(sample)) < 1E-6 &&
+ fabs(cluster->phimax(sample)) < 1E-6) {
return StatusCode::SUCCESS;
}
// Get the hotest in raw co-ordinates
@@ -569,16 +630,17 @@ egammaSuperClusterBuilder::makeCorrection1(xAOD::CaloCluster* cluster,
const CaloDetDescrElement* dde =
mgr.get_element(xsample, cluster->etamax(sample), cluster->phimax(sample));
if (!dde) {
- ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for: cluster->etamax(sample): "
- << cluster->etamax(sample) << " cluster->phimax(sample): "
- << cluster->phimax(sample) << " will not refine the position in layer1");
+ ATH_MSG_WARNING(
+ "Couldn't get CaloDetDescrElement from mgr for: cluster->etamax(sample): "
+ << cluster->etamax(sample) << " cluster->phimax(sample): "
+ << cluster->phimax(sample) << " will not refine the position in layer1");
return StatusCode::SUCCESS;
}
//
double etamax = dde->eta_raw();
double phimax = dde->phi_raw();
- ATH_MSG_DEBUG("Hottest cell in layer 1 Calo co-ordinates (eta,phi): (" << etamax << " , "
- << phimax << ")");
+ ATH_MSG_DEBUG("Hottest cell in layer 1 Calo co-ordinates (eta,phi): ("
+ << etamax << " , " << phimax << ")");
//
// now Locate the +-1 range
double detastr(-999);
@@ -589,8 +651,14 @@ egammaSuperClusterBuilder::makeCorrection1(xAOD::CaloCluster* cluster,
// Given the range refine the position employing the smaller window
if (detastr > 0 && dphistr > 0) {
CaloLayerCalculator helper;
- const auto *const cellLink = cluster->getCellLinks();
- helper.fill(cellLink->begin(), cellLink->end(), etamax, phimax, detastr, dphistr, sample);
+ const auto* const cellLink = cluster->getCellLinks();
+ helper.fill(cellLink->begin(),
+ cellLink->end(),
+ etamax,
+ phimax,
+ detastr,
+ dphistr,
+ sample);
// Here is where we (re-)fill the eta in the 1st sampling
if (helper.etam() != -999.) {
@@ -602,57 +670,13 @@ egammaSuperClusterBuilder::makeCorrection1(xAOD::CaloCluster* cluster,
return StatusCode::SUCCESS;
}
-StatusCode
-egammaSuperClusterBuilder::addTileGap3CellsinWindow(xAOD::CaloCluster* myCluster,
- const CaloDetDescrManager& mgr) const
-{
-
- if (!myCluster) {
- ATH_MSG_ERROR("Invalid input in addRemainingCellsToCluster");
- return StatusCode::FAILURE;
- }
-
- static const double searchWindowEta = 0.2;
- static const double searchWindowPhi = 2 * M_PI / 64.0 + M_PI / 64; // ~ 0.15 rad
- std::vector<const CaloCell*> cells;
- cells.reserve(16);
- const CaloCellContainer* inputcells = myCluster->getCellLinks()->getCellContainer();
-
- if (!inputcells) {
- ATH_MSG_ERROR("No cell container in addRemainingCellsToCluster?");
- return StatusCode::FAILURE;
- }
-
- CaloCellList myList(inputcells);
-
- const std::vector<CaloSampling::CaloSample> samples = { CaloSampling::TileGap3 };
- for (auto samp : samples) {
- myList.select(
- mgr, myCluster->eta0(), myCluster->phi0(), searchWindowEta, searchWindowPhi, samp);
- cells.insert(cells.end(), myList.begin(), myList.end());
- }
-
- for (const auto *cell : cells) {
- if (!cell || !cell->caloDDE()) {
- continue;
- }
- if ((CaloCell_ID::TileGap3 == cell->caloDDE()->getSampling()) &&
- (std::abs(cell->caloDDE()->eta_raw()) > 1.4 &&
- std::abs(cell->caloDDE()->eta_raw()) < 1.6)) {
- int index = inputcells->findIndex(cell->caloDDE()->calo_hash());
- myCluster->addCell(index, 1.);
- }
- }
- return StatusCode::SUCCESS;
-}
-
egammaSuperClusterBuilder::CentralPosition
egammaSuperClusterBuilder::findCentralPosition(
const std::vector<const xAOD::CaloCluster*>& clusters) const
{
CentralPosition cp;
- for (const auto *cluster : clusters) {
+ for (const auto* cluster : clusters) {
if (cluster->hasSampling(CaloSampling::EMB2)) {
float thisEmax = cluster->energy_max(CaloSampling::EMB2);
if (thisEmax > cp.emaxB) {
@@ -674,15 +698,14 @@ egammaSuperClusterBuilder::findCentralPosition(
}
egammaSuperClusterBuilder::PhiSize
-egammaSuperClusterBuilder::findPhiSize(const egammaSuperClusterBuilder::CentralPosition& cp0,
- const xAOD::CaloCluster* cluster) const
+egammaSuperClusterBuilder::findPhiSize(
+ const egammaSuperClusterBuilder::CentralPosition& cp0,
+ const xAOD::CaloCluster& cluster) const
{
PhiSize phiSize;
-
- auto cell_itr = cluster->cell_cbegin();
- auto cell_end = cluster->cell_cend();
-
+ auto cell_itr = cluster.cell_cbegin();
+ auto cell_end = cluster.cell_cend();
for (; cell_itr != cell_end; ++cell_itr) {
const CaloCell* cell = *cell_itr;
if (!cell) {
@@ -696,7 +719,7 @@ egammaSuperClusterBuilder::findPhiSize(const egammaSuperClusterBuilder::CentralP
if (CaloCell_ID::EMB2 == dde->getSampling()) {
const float phi0 = cp0.phiB;
- double cell_phi = proxim(cell->caloDDE()->phi_raw(), phi0);
+ double cell_phi = proxim(dde->phi_raw(), phi0);
if (cell_phi > phi0) {
auto diff = cell_phi - phi0;
if (diff > phiSize.plusB) {
@@ -710,7 +733,7 @@ egammaSuperClusterBuilder::findPhiSize(const egammaSuperClusterBuilder::CentralP
}
} else if (CaloCell_ID::EME2 == dde->getSampling()) {
const float phi0 = cp0.phiEC;
- double cell_phi = proxim(cell->caloDDE()->phi_raw(), phi0);
+ double cell_phi = proxim(dde->phi_raw(), phi0);
if (cell_phi > phi0) {
auto diff = cell_phi - phi0;
if (diff > phiSize.plusEC) {
@@ -726,19 +749,23 @@ egammaSuperClusterBuilder::findPhiSize(const egammaSuperClusterBuilder::CentralP
}
// some safety checks
if (phiSize.plusB > 1.0) {
- ATH_MSG_WARNING("phiSizePlusB is large: " << phiSize.plusB << ", capping at 1.0");
+ ATH_MSG_WARNING("phiSizePlusB is large: " << phiSize.plusB
+ << ", capping at 1.0");
phiSize.plusB = 1.0;
}
if (phiSize.plusEC > 1.0) {
- ATH_MSG_WARNING("phiSizePlusEC is large: " << phiSize.plusEC << ", capping at 1.0");
+ ATH_MSG_WARNING("phiSizePlusEC is large: " << phiSize.plusEC
+ << ", capping at 1.0");
phiSize.plusEC = 1.0;
}
if (phiSize.minusB > 1.0) {
- ATH_MSG_WARNING("phiSizeMinusB is large: " << phiSize.minusB << ", capping at 1.0");
+ ATH_MSG_WARNING("phiSizeMinusB is large: " << phiSize.minusB
+ << ", capping at 1.0");
phiSize.minusB = 1.0;
}
if (phiSize.minusEC > 1.0) {
- ATH_MSG_WARNING("phiSizeMinusEC is large: " << phiSize.minusEC << ", capping at 1.0");
+ ATH_MSG_WARNING("phiSizeMinusEC is large: " << phiSize.minusEC
+ << ", capping at 1.0");
phiSize.minusEC = 1.0;
}
return phiSize;
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h
index f925bbd605fd6017a2213de211df63c6e0d09294..820faf2c26d300b8e77ba28a4b9052c9252fb370 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h
@@ -103,24 +103,16 @@ private:
/** Find the size of the cluster */
PhiSize findPhiSize(const CentralPosition& cp0,
- const xAOD::CaloCluster* cluster) const;
-
- /** Add the EM cells from reference cluster to self; eta and phi are the ones
- to use for limiting size. This excludes L1 (which is done as a separate
- step). note, use raw eta and phi! */
- StatusCode addEMCellsToCluster(xAOD::CaloCluster* newCluster,
- const xAOD::CaloCluster* ref,
- const CentralPosition& cp0) const;
-
- /** Add the preshower and L1 EM cells from reference cluster to self; note,
- * use raw eta and phi! */
- StatusCode addL0L1EMCellsToCluster(xAOD::CaloCluster* newCluster,
- const xAOD::CaloCluster* ref,
- const CentralPosition& cp0,
- const PhiSize& phiSize) const;
+ const xAOD::CaloCluster& cluster) const;
+
+ /** fill Super Clusterlimiting its size.*/
+ StatusCode fillClusterConstrained(
+ xAOD::CaloCluster& tofill,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
+ const CentralPosition& cp0) const;
/** functions to add all tile Gap 3 cells in a window*/
- StatusCode addTileGap3CellsinWindow(xAOD::CaloCluster* myCluster,
+ StatusCode addTileGap3CellsinWindow(xAOD::CaloCluster& tofill,
const CaloDetDescrManager& mgr) const;
/** function to calibrate the new clusters energy */
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.cxx
index c02b7197cd35df6f63985c46250c25dbbbe737b1..643c7e50af639f5bbaa775c3396b3cf7341d6766 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "egammaTruthAssociationAlg.h"
@@ -19,7 +19,7 @@ using PhotonLink_t = ElementLink<xAOD::PhotonContainer>;
egammaTruthAssociationAlg::egammaTruthAssociationAlg(const std::string& name,
ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator)
{}
egammaTruthAssociationAlg::~egammaTruthAssociationAlg() {}
@@ -32,7 +32,8 @@ egammaTruthAssociationAlg::initialize()
// initialize the data handles
ATH_CHECK(m_truthEventContainerKey.initialize(m_doEgammaTruthContainer));
- ATH_CHECK(m_egammaTruthParticleContainerKey.initialize(m_doEgammaTruthContainer));
+ ATH_CHECK(
+ m_egammaTruthParticleContainerKey.initialize(m_doEgammaTruthContainer));
ATH_CHECK(m_truthParticleContainerKey.initialize());
// Now the standard decoration handles
@@ -73,77 +74,105 @@ egammaTruthAssociationAlg::finalize()
}
StatusCode
-egammaTruthAssociationAlg::execute_r(const EventContext& ctx) const
+egammaTruthAssociationAlg::execute(const EventContext& ctx) const
{
SG::WriteHandle<xAOD::TruthParticleContainer> egammaTruthContainer;
if (m_doEgammaTruthContainer) {
- egammaTruthContainer =
- SG::WriteHandle<xAOD::TruthParticleContainer>(m_egammaTruthParticleContainerKey, ctx);
- ATH_CHECK(egammaTruthContainer.record(std::make_unique<xAOD::TruthParticleContainer>(),
- std::make_unique<xAOD::TruthParticleAuxContainer>()));
+ egammaTruthContainer = SG::WriteHandle<xAOD::TruthParticleContainer>(
+ m_egammaTruthParticleContainerKey, ctx);
+ ATH_CHECK(egammaTruthContainer.record(
+ std::make_unique<xAOD::TruthParticleContainer>(),
+ std::make_unique<xAOD::TruthParticleAuxContainer>()));
// Add a copy of electrons and photons to the truth egamma container
- SG::ReadHandle<xAOD::TruthEventContainer> truthEvtContainer(m_truthEventContainerKey, ctx);
+ SG::ReadHandle<xAOD::TruthEventContainer> truthEvtContainer(
+ m_truthEventContainerKey, ctx);
// only for serial running. Can remove check later
if (!truthEvtContainer.isValid() || truthEvtContainer->empty()) {
- ATH_MSG_WARNING("Could not retrieve " << m_truthEventContainerKey.key()
- << " or container empty, returning");
+ ATH_MSG_WARNING("Could not retrieve "
+ << m_truthEventContainerKey.key()
+ << " or container empty, returning");
return StatusCode::SUCCESS;
}
- for (const auto& truthParticleLink : truthEvtContainer->front()->truthParticleLinks()) {
+ for (const auto& truthParticleLink :
+ truthEvtContainer->front()->truthParticleLinks()) {
if (!truthParticleLink.isValid())
continue;
const xAOD::TruthParticle* truthParticle = *truthParticleLink;
if (!isPromptEgammaParticle(truthParticle))
continue;
- getNewTruthParticle(*egammaTruthContainer, truthParticle, truthParticleLink.getDataPtr());
+ getNewTruthParticle(
+ *egammaTruthContainer, truthParticle, truthParticleLink.getDataPtr());
}
}
// Decorate containers with truth info, including links to truth particles
// Decorate the truth particles with links to the reco ones
- // note that in multithreading this must be valid; can't just fail with success.
- SG::ReadHandle<xAOD::TruthParticleContainer> truthParticles(m_truthParticleContainerKey, ctx);
+ // note that in multithreading this must be valid; can't just fail with
+ // success.
+ SG::ReadHandle<xAOD::TruthParticleContainer> truthParticles(
+ m_truthParticleContainerKey, ctx);
// accessors
- static const SG::AuxElement::Accessor<ClusterLink_t> accClusLink("recoClusterLink");
- static const SG::AuxElement::Accessor<ElectronLink_t> accElLink("recoElectronLink");
- static const SG::AuxElement::Accessor<PhotonLink_t> accPhLink("recoPhotonLink");
+ static const SG::AuxElement::Accessor<ClusterLink_t> accClusLink(
+ "recoClusterLink");
+ static const SG::AuxElement::Accessor<ElectronLink_t> accElLink(
+ "recoElectronLink");
+ static const SG::AuxElement::Accessor<PhotonLink_t> accPhLink(
+ "recoPhotonLink");
if (m_matchElectrons) {
ATH_MSG_DEBUG("About to match electrons");
- ATH_CHECK(match(*truthParticles, m_electronDecKeys, accElLink, egammaTruthContainer.ptr()));
+ ATH_CHECK(match(ctx,
+ *truthParticles,
+ m_electronDecKeys,
+ accElLink,
+ egammaTruthContainer.ptr()));
}
if (m_matchPhotons) {
ATH_MSG_DEBUG("About to match photons");
- ATH_CHECK(match(*truthParticles, m_photonDecKeys, accPhLink, egammaTruthContainer.ptr()));
+ ATH_CHECK(match(ctx,
+ *truthParticles,
+ m_photonDecKeys,
+ accPhLink,
+ egammaTruthContainer.ptr()));
}
if (m_matchClusters) {
ATH_MSG_DEBUG("About to match clusters");
- ATH_CHECK(match(*truthParticles, m_clusterDecKeys, accClusLink, egammaTruthContainer.ptr()));
+ ATH_CHECK(match(ctx,
+ *truthParticles,
+ m_clusterDecKeys,
+ accClusLink,
+ egammaTruthContainer.ptr()));
}
if (m_matchForwardElectrons) {
ATH_MSG_DEBUG("About to match fwd electrons");
- ATH_CHECK(match(*truthParticles, m_fwdElectronDecKeys, accElLink, egammaTruthContainer.ptr()));
+ ATH_CHECK(match(ctx,
+ *truthParticles,
+ m_fwdElectronDecKeys,
+ accElLink,
+ egammaTruthContainer.ptr()));
}
return StatusCode::SUCCESS;
}
bool
-egammaTruthAssociationAlg::isPromptEgammaParticle(const xAOD::TruthParticle* truth) const
+egammaTruthAssociationAlg::isPromptEgammaParticle(
+ const xAOD::TruthParticle* truth) const
{
- if ((truth->pdgId() != 22 && abs(truth->pdgId()) != 11) || truth->status() == 2 ||
- truth->status() == 3 || truth->barcode() > m_barcodeOffset || truth->pt() < m_minPt){
+ if ((truth->pdgId() != 22 && abs(truth->pdgId()) != 11) ||
+ truth->status() == 2 || truth->status() == 3 ||
+ truth->barcode() > m_barcodeOffset || truth->pt() < m_minPt) {
return false;
}
@@ -185,10 +214,14 @@ egammaTruthAssociationAlg::getNewTruthParticle(
truthParticle->setProdVtxLink(truth->prodVtxLink());
truthParticle->setDecayVtxLink(truth->decayVtxLink());
- static const SG::AuxElement::Accessor<ClusterLink_t> accClusLink("recoClusterLink");
- static const SG::AuxElement::Accessor<ElectronLink_t> accElLink("recoElectronLink");
- static const SG::AuxElement::Accessor<PhotonLink_t> accPhLink("recoPhotonLink");
- static const SG::AuxElement::Accessor<TruthLink_t> accTruthLink("truthParticleLink");
+ static const SG::AuxElement::Accessor<ClusterLink_t> accClusLink(
+ "recoClusterLink");
+ static const SG::AuxElement::Accessor<ElectronLink_t> accElLink(
+ "recoElectronLink");
+ static const SG::AuxElement::Accessor<PhotonLink_t> accPhLink(
+ "recoPhotonLink");
+ static const SG::AuxElement::Accessor<TruthLink_t> accTruthLink(
+ "truthParticleLink");
static const SG::AuxElement::Accessor<int> accType("truthType");
static const SG::AuxElement::Accessor<int> accOrigin("truthOrigin");
@@ -213,7 +246,7 @@ egammaTruthAssociationAlg::getEgammaTruthParticle(
const xAOD::TruthParticle* truth,
xAOD::TruthParticleContainer& egammaTruthContainer) const
{
- if (!truth){
+ if (!truth) {
return nullptr;
}
// Find the original truth particle for electrons from conversions
@@ -226,7 +259,7 @@ egammaTruthAssociationAlg::getEgammaTruthParticle(
}
// In case truth became null in the above loop
- if (!truth){
+ if (!truth) {
return nullptr;
}
for (auto egammaTruth : egammaTruthContainer) {
@@ -240,8 +273,9 @@ egammaTruthAssociationAlg::getEgammaTruthParticle(
//// The templated functions
template<class T>
StatusCode
-egammaTruthAssociationAlg::initializeDecorKeys(SG::WriteDecorHandleKeyArray<T>& keys,
- const std::string& name)
+egammaTruthAssociationAlg::initializeDecorKeys(
+ SG::WriteDecorHandleKeyArray<T>& keys,
+ const std::string& name)
{
if (!keys.empty()) {
ATH_MSG_FATAL("The WriteDecorHandle should not be configured directly.");
@@ -258,16 +292,17 @@ egammaTruthAssociationAlg::initializeDecorKeys(SG::WriteDecorHandleKeyArray<T>&
// constructor
template<class T>
egammaTruthAssociationAlg::writeDecorHandles<T>::writeDecorHandles(
- const SG::WriteDecorHandleKeyArray<T>& hkeys)
- : el(hkeys.at(0))
- , type(hkeys.at(1))
- , origin(hkeys.at(2))
+ const SG::WriteDecorHandleKeyArray<T>& hkeys,const EventContext& ctx)
+ : el(hkeys.at(0),ctx)
+ , type(hkeys.at(1),ctx)
+ , origin(hkeys.at(2),ctx)
{}
template<class T>
egammaTruthAssociationAlg::MCTruthInfo_t
-egammaTruthAssociationAlg::particleTruthClassifier(const T* particle,
- Cache* extrapolationCache) const
+egammaTruthAssociationAlg::particleTruthClassifier(
+ const T* particle,
+ Cache* extrapolationCache) const
{
MCTruthInfo_t info;
IMCTruthClassifier::Info mcinfo;
@@ -283,17 +318,20 @@ egammaTruthAssociationAlg::particleTruthClassifier(const T* particle,
* second pass based on the cluster to find true photons **/
template<>
egammaTruthAssociationAlg::MCTruthInfo_t
-egammaTruthAssociationAlg::particleTruthClassifier<xAOD::Electron>(const xAOD::Electron* electron,
- Cache* extrapolationCache) const
+egammaTruthAssociationAlg::particleTruthClassifier<xAOD::Electron>(
+ const xAOD::Electron* electron,
+ Cache* extrapolationCache) const
{
MCTruthInfo_t info;
IMCTruthClassifier::Info mcinfo;
mcinfo.extrapolationCache = extrapolationCache;
auto ret = m_mcTruthClassifier->particleTruthClassifier(electron, &mcinfo);
if (ret.first == MCTruthPartClassifier::Unknown &&
- !xAOD::EgammaHelpers::isFwdElectron(electron) && electron->caloCluster()) {
+ !xAOD::EgammaHelpers::isFwdElectron(electron) &&
+ electron->caloCluster()) {
ATH_MSG_DEBUG("Trying cluster-based truth classification for electron");
- ret = m_mcTruthClassifier->particleTruthClassifier(electron->caloCluster(), &mcinfo);
+ ret = m_mcTruthClassifier->particleTruthClassifier(electron->caloCluster(),
+ &mcinfo);
}
info.genPart = mcinfo.genPart;
info.first = ret.first;
@@ -303,13 +341,15 @@ egammaTruthAssociationAlg::particleTruthClassifier<xAOD::Electron>(const xAOD::E
template<class T, class L>
StatusCode
-egammaTruthAssociationAlg::match(const xAOD::TruthParticleContainer& truthParticles,
- const SG::WriteDecorHandleKeyArray<T>& hkeys,
- const SG::AuxElement::Accessor<L>& linkAccess,
- xAOD::TruthParticleContainer* egammaTruthContainer) const
+egammaTruthAssociationAlg::match(
+ const EventContext& ctx,
+ const xAOD::TruthParticleContainer& truthParticles,
+ const SG::WriteDecorHandleKeyArray<T>& hkeys,
+ const SG::AuxElement::Accessor<L>& linkAccess,
+ xAOD::TruthParticleContainer* egammaTruthContainer) const
{
- writeDecorHandles<T> decoHandles(hkeys);
+ writeDecorHandles<T> decoHandles(hkeys,ctx);
// Extrapolation Cache
Cache extrapolationCache{};
@@ -320,14 +360,17 @@ egammaTruthAssociationAlg::match(const xAOD::TruthParticleContainer& truthPartic
const xAOD::TruthParticle* truthParticle = info.genPart;
if (truthParticle) {
- ElementLink<xAOD::TruthParticleContainer> link(truthParticle, truthParticles);
- ATH_MSG_DEBUG("Decorating object with link to truth, index = " << link.index());
+ ElementLink<xAOD::TruthParticleContainer> link(
+ truthParticle, truthParticles, ctx);
+ ATH_MSG_DEBUG(
+ "Decorating object with link to truth, index = " << link.index());
decoHandles.el(*particle) = link;
} else {
decoHandles.el(*particle) = ElementLink<xAOD::TruthParticleContainer>();
}
decoHandles.el(*particle).toPersistent();
- ATH_MSG_DEBUG("truthType = " << info.first << " truthOrigin = " << info.second);
+ ATH_MSG_DEBUG("truthType = " << info.first
+ << " truthOrigin = " << info.second);
decoHandles.type(*particle) = static_cast<int>(info.first);
decoHandles.origin(*particle) = static_cast<int>(info.second);
@@ -337,11 +380,14 @@ egammaTruthAssociationAlg::match(const xAOD::TruthParticleContainer& truthPartic
ATH_MSG_ERROR("The egammaTruthContainer needs to be valid");
return StatusCode::FAILURE;
}
- const xAOD::TruthParticle* truth = xAOD::TruthHelpers::getTruthParticle(*particle);
+ const xAOD::TruthParticle* truth =
+ xAOD::TruthHelpers::getTruthParticle(*particle);
if (truth) {
- xAOD::TruthParticle* truthEgamma = getEgammaTruthParticle(truth, *egammaTruthContainer);
+ xAOD::TruthParticle* truthEgamma =
+ getEgammaTruthParticle(truth, *egammaTruthContainer);
if (truthEgamma) {
- // we found a truthEgamma object we should annotate if this is the best link
+ // we found a truthEgamma object we should annotate if this is the
+ // best link
bool annotateLink = true; // by default we annotate
const auto link = linkAccess(*truthEgamma); // what already exists
if (link.isValid()) {
@@ -351,13 +397,14 @@ egammaTruthAssociationAlg::match(const xAOD::TruthParticleContainer& truthPartic
std::abs(particle->e() / truthEgamma->e() - 1)) {
ATH_MSG_DEBUG(truthEgamma
<< ": "
- << " already set to a better matched particle: " << particle);
+ << " already set to a better matched particle: "
+ << particle);
annotateLink = false;
}
}
if (annotateLink) {
- L link(particle, *decoHandles.readHandle());
+ L link(particle, *decoHandles.readHandle(), ctx);
linkAccess(*truthEgamma) = link;
linkAccess(*truthEgamma).toPersistent();
}
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.h b/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.h
index f695fba988b8a67ef664ed4abaefb0b0536bf83b..363cb365e7b30c58c257e51d94e4e81a2bd0dc89 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTruthAssociationAlg.h
@@ -5,7 +5,7 @@
#ifndef EGAMMAALGS_EGAMMATRUTHASSOCIATIONALG_H
#define EGAMMAALGS_EGAMMATRUTHASSOCIATIONALG_H
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/ToolHandle.h"
#include "MCTruthClassifier/IMCTruthClassifier.h"
@@ -38,7 +38,7 @@
@author B. Lenzi J. Mitrevski C. Anastopoulos
*/
-class egammaTruthAssociationAlg : public AthAlgorithm
+class egammaTruthAssociationAlg : public AthReentrantAlgorithm
{
public:
@@ -56,13 +56,7 @@ public:
virtual StatusCode finalize() override final;
/** @brief execute on container */
- virtual StatusCode execute() override final
- {
- return execute_r(Algorithm::getContext());
- }
- // This will become the normal execute when
- // inheriting from AthReentrantAlgorithm
- StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
private:
struct MCTruthInfo_t
@@ -82,8 +76,8 @@ private:
template<class T>
struct writeDecorHandles
{
- writeDecorHandles(
- const SG::WriteDecorHandleKeyArray<T>& keys); // constructor
+ writeDecorHandles(const SG::WriteDecorHandleKeyArray<T>& keys,
+ const EventContext& ctx); // constructor
SG::WriteDecorHandle<T, ElementLink<xAOD::TruthParticleContainer>> el;
SG::WriteDecorHandle<T, int> type;
@@ -97,7 +91,8 @@ private:
* info and decorate the truth particles with links to the reco ones
* (reco<typeName>Link) **/
template<class T, class L>
- StatusCode match(const xAOD::TruthParticleContainer& truthParticles,
+ StatusCode match(const EventContext& ctx,
+ const xAOD::TruthParticleContainer& truthParticles,
const SG::WriteDecorHandleKeyArray<T>& hkeys,
const SG::AuxElement::Accessor<L>& linkAccess,
xAOD::TruthParticleContainer* egammaTruthContainer) const;
@@ -110,9 +105,10 @@ private:
/** @brief Create a copy a truth particle, add it to the new container and
* decorate it with a link to the original particle **/
- void getNewTruthParticle(xAOD::TruthParticleContainer& egammaTruthContainer,
- const xAOD::TruthParticle* truth,
- const xAOD::TruthParticleContainer* oldContainer) const;
+ void getNewTruthParticle(
+ xAOD::TruthParticleContainer& egammaTruthContainer,
+ const xAOD::TruthParticle* truth,
+ const xAOD::TruthParticleContainer* oldContainer) const;
/** @brief Return true if the truth particle is a prompt electron or photon
* **/
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py b/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
index 16e35e25216338c615d8d5d35bb1e62387e20506..1da6c4c5edfec58aa0d3ce320a578f629a044dae 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
@@ -92,7 +92,12 @@ def createEgammaConfigFlags():
egcf.addFlag("Egamma.Keys.Output.ForwardClusters", 'ForwardElectronClusters')
egcf.addFlag("Egamma.Keys.Output.ForwardClustersSuppESD", '-SisterCluster')
egcf.addFlag("Egamma.Keys.Output.ForwardClustersSuppAOD",
- '-SisterCluster.-CellLink')
+ '-SisterCluster')
+
+ # These are the clusters that are used to determine which cells to write out to AOD
+ egcf.addFlag("Egamma.Keys.Output.EgammaLargeFWDClusters", 'egamma66FWDClusters')
+ egcf.addFlag("Egamma.Keys.Output.EgammaLargeFWDClustersSuppESD", '')
+ # don't define SuppAOD because the whole container is suppressed
egcf.addFlag("Egamma.Keys.Output.Photons", 'Photons')
egcf.addFlag("Egamma.Keys.Output.PhotonsSuppESD", '')
diff --git a/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py b/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py
index 13901af9f7791796507e418386a4fae9f5d6ae07..dca122f156c00f683825a0642e5eda9dca23dc57 100755
--- a/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py
@@ -47,11 +47,11 @@ egammaForwardBuilder = AlgFactory(
class egammaForwardGetter (Configured):
-
+
def configure(self):
mlog = logging.getLogger('egammaForwardGetter.py::configure:')
mlog.info('entering')
-
+
# configure egammaForward here:
try:
self._egammaFwdBuilderHandle = egammaForwardBuilder()
@@ -59,7 +59,21 @@ class egammaForwardGetter (Configured):
mlog.error("could not get handle to egammaForward")
traceback.print_exc()
return False
+
+ # the egammaLargeFWDClusterMaker
+ # (Which chooses the cells to store in the AOD)
+ from egammaAlgs.egammaLargeFWDClusterMakerAlg import (
+ egammaLargeFWDClusterMakerAlg)
+ try:
+ self._egammaLargeClusterMaker = egammaLargeFWDClusterMakerAlg()
+ except Exception:
+ mlog.error("could not get handle to egammaLargeClusterMaker")
+ import traceback
+ traceback.print_exc()
+ return False
+
return True
-
+
def egammaFwdBuilderHandle(self):
return self._egammaFwdBuilderHandle
+
diff --git a/Reconstruction/egamma/egammaRec/python/egammaKeys.py b/Reconstruction/egamma/egammaRec/python/egammaKeys.py
index b6a4785be13a8aa29ae4da28cff92ca6522d745d..587a20400409dc5cb5b520cd9be7f6c5b24cdb93 100644
--- a/Reconstruction/egamma/egammaRec/python/egammaKeys.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaKeys.py
@@ -3,7 +3,8 @@
__doc__ = "egammaKeys.py"
__author__ = "Bruno Lenzi"
-# Name (i.e Electron) = [type =type of the collection, key = name of the collection,
+# Name (i.e Electron) = [
+# type =type of the collection, key = name of the collection,
# option = for aux container applied in ALL cases (ESD and AOD),
# option = for additional suppression for AOD only]
@@ -18,46 +19,90 @@ class egammaKeysDict:
FwdElectronisemSupress = '-isEMTight.-isEMMedium.-isEMLoose'
outputs = dict(
- Conversion=['xAOD::VertexContainer',
- 'GSFConversionVertices', '-vxTrackAtVertex.', ''],
- Cluster=['xAOD::CaloClusterContainer', 'egammaClusters', '', ''],
- EgammaLargeClusters=['xAOD::CaloClusterContainer',
- 'egamma711Clusters', '', ''], # not output to AOD
- TopoSeededCluster=['xAOD::CaloClusterContainer',
- 'egammaTopoSeededClusters', '', '-CellLink'],
- Electron=['xAOD::ElectronContainer', 'Electrons',
- '', ShowerShapesSuppress+ElectronisemSupress],
- EgammaRec=['egammaRecContainer', 'egammaRecCollection', '', ''],
- PhotonSuperRec=['egammaRecContainer',
- 'PhotonSuperRecCollection', '', ''],
- ElectronSuperRec=['egammaRecContainer',
- 'ElectronSuperRecCollection', '', ''],
+ Conversion=[
+ 'xAOD::VertexContainer',
+ 'GSFConversionVertices',
+ '-vxTrackAtVertex.',
+ ''],
+ Cluster=[
+ 'xAOD::CaloClusterContainer',
+ 'egammaClusters',
+ '',
+ ''],
+ EgammaLargeClusters=[
+ 'xAOD::CaloClusterContainer',
+ 'egamma711Clusters', '', ''],
+ EgammaLargeFWDClusters=[
+ 'xAOD::CaloClusterContainer',
+ 'egamma66FWDClusters',
+ '',
+ ''],
+ TopoSeededCluster=[
+ 'xAOD::CaloClusterContainer',
+ 'egammaTopoSeededClusters',
+ '',
+ '-CellLink'],
+ Electron=[
+ 'xAOD::ElectronContainer',
+ 'Electrons',
+ '',
+ ShowerShapesSuppress+ElectronisemSupress],
+ EgammaRec=['egammaRecContainer',
+ 'egammaRecCollection',
+ '',
+ ''],
+ PhotonSuperRec=[
+ 'egammaRecContainer',
+ 'PhotonSuperRecCollection', '', ''],
+ ElectronSuperRec=[
+ 'egammaRecContainer',
+ 'ElectronSuperRecCollection', '', ''],
FwdElectron=['xAOD::ElectronContainer',
- 'ForwardElectrons', '', FwdElectronisemSupress],
+ 'ForwardElectrons',
+ '',
+ FwdElectronisemSupress],
FwdCluster=['xAOD::CaloClusterContainer',
- 'ForwardElectronClusters', '-SisterCluster', '.-CellLink'],
- Photon=['xAOD::PhotonContainer', 'Photons', '',
+ 'ForwardElectronClusters',
+ '-SisterCluster', ''],
+ Photon=['xAOD::PhotonContainer',
+ 'Photons', '',
ShowerShapesSuppress+PhotonisemSupress],
- TrackParticle=['xAOD::TrackParticleContainer', 'GSFTrackParticles',
- '-caloExtension.-cellAssociation.-perigeeExtrapEta.-perigeeExtrapPhi', ''],
- Track=['TrackCollection', 'GSFTracks', '', ''],
+ TrackParticle=[
+ 'xAOD::TrackParticleContainer',
+ 'GSFTrackParticles',
+ '-caloExtension.-cellAssociation.-perigeeExtrapEta.-perigeeExtrapPhi', ''],
+ Track=['TrackCollection',
+ 'GSFTracks',
+ '',
+ ''],
Truth=['xAOD::TruthParticleContainer',
- 'egammaTruthParticles', '-caloExtension', '']
+ 'egammaTruthParticles',
+ '-caloExtension',
+ '']
)
#
- outputs['CellLink'] = ['CaloClusterCellLinkContainer',
- outputs['Cluster'][1] + '_links', '', '']
- outputs['TopoSeededCellLink'] = ['CaloClusterCellLinkContainer',
- outputs['TopoSeededCluster'][1] +
- '_links',
- '', '']
- outputs['FwdClusterCellLink'] = ['CaloClusterCellLinkContainer',
- outputs['FwdCluster'][1] + '_links',
- '', '']
- outputs['EgammaLargeClustersCellLink'] = ['CaloClusterCellLinkContainer',
- outputs['EgammaLargeClusters'][1] +
- '_links',
- '', '']
+ outputs['CellLink'] = [
+ 'CaloClusterCellLinkContainer',
+ outputs['Cluster'][1] + '_links', '', '']
+ outputs['TopoSeededCellLink'] = [
+ 'CaloClusterCellLinkContainer',
+ outputs['TopoSeededCluster'][1] +
+ '_links',
+ '', '']
+ outputs['FwdClusterCellLink'] = [
+ 'CaloClusterCellLinkContainer',
+ outputs['FwdCluster'][1] + '_links',
+ '', '']
+ outputs['EgammaLargeClustersCellLink'] = [
+ 'CaloClusterCellLinkContainer',
+ outputs['EgammaLargeClusters'][1] +
+ '_links',
+ '', '']
+ outputs['EgammaLargeFWDClustersCellLink'] = [
+ 'CaloClusterCellLinkContainer',
+ outputs['EgammaLargeFWDClusters'][1] +
+ '_links',
+ '', '']
#
@@ -93,3 +138,34 @@ def truthParticleKey():
def truthEventKey():
return 'TruthEvents'
+
+
+def getItem(cType, cKey):
+ """getItem(cType, cKey) -> Return item to be added
+ to the output list: <cType>#<cKey>"""
+ return '%s#%s' % (cType, cKey)
+
+
+def getAuxItem(cType, cKey, auxOptionAll='', auxOptionAOD=''):
+ """getAuxItem(cType, cKey, auxOption='')
+ -> <cType>#<cKey>Aux.<auxOption>"""
+ auxType = cType.replace('Container', 'AuxContainer')
+ auxKey = cKey + 'Aux.'
+ return '%s#%s%s%s' % (auxType, auxKey, auxOptionAll, auxOptionAOD)
+
+
+def addContainer(outputList, cType, cKey):
+ """addContainer(outputList, cType, cKey)
+ -> Add container to outputList"""
+ # Skip containers if already in outputList
+ item = getItem(cType, cKey)
+ if item not in outputList:
+ outputList.append(item)
+
+
+def addAuxContainer(outputList, cType, cKey, auxOptionAll='', auxOptionAOD=''):
+ """addAux(outputList, cType, cKey, auxOption='')
+ -> Add aux container to outputList"""
+ item = getAuxItem(cType, cKey, auxOptionAll, auxOptionAOD)
+ if item not in outputList:
+ outputList.append(item)
diff --git a/Reconstruction/egamma/egammaRec/share/egammaLRTOutputItemList_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaLRTOutputItemList_jobOptions.py
index cffca24281b41148a39d3c1753d1414eff1e0654..08eb3e8928fbc6d37dfe8195dd3f6d389b777676 100755
--- a/Reconstruction/egamma/egammaRec/share/egammaLRTOutputItemList_jobOptions.py
+++ b/Reconstruction/egamma/egammaRec/share/egammaLRTOutputItemList_jobOptions.py
@@ -3,79 +3,52 @@
__doc__ = """Add containers to ESD/AOD ItemList using
the definitions from egammaKeys"""
from egammaRec import egammaKeys
-from egammaRec.egammaKeys import egammaKeysDict
+from egammaRec.egammaKeys import (
+ egammaKeysDict,
+ getItem,
+ addContainer,
+ addAuxContainer)
from AthenaCommon.Logging import logging
from RecExConfig.RecFlags import rec
-def getItem(cType, cKey):
- """getItem(cType, cKey) -> Return item to be added
- to the output list: <cType>#<cKey>"""
- return '%s#%s' % (cType, cKey)
-
-
-def getAuxItem(cType, cKey, auxOptionAll='', auxOptionAOD=''):
- """getAuxItem(cType, cKey, auxOption='')
- -> <cType>#<cKey>Aux.<auxOption>"""
- auxType = cType.replace('Container', 'AuxContainer')
- auxKey = cKey + 'Aux.'
- return '%s#%s%s%s' % (auxType, auxKey, auxOptionAll, auxOptionAOD)
-
-
-def addContainer(outputList, cType, cKey):
- """addContainer(outputList, cType, cKey)
- -> Add container to outputList"""
- # Skip containers if already in outputList
- item = getItem(cType, cKey)
- if item not in outputList:
- outputList.append(item)
-
-
-def addAuxContainer(outputList, cType, cKey, auxOptionAll='', auxOptionAOD=''):
- """addAux(outputList, cType, cKey, auxOption='')
- -> Add aux container to outputList"""
- item = getAuxItem(cType, cKey, auxOptionAll, auxOptionAOD)
- if item not in outputList:
- outputList.append(item)
-
-
# List for of keys to be written to AOD.
# All egammaKeys.outputs but EgammaRec and TopoSeededCellLink
AOD_outputs = [i for i, j in egammaKeysDict.outputs.items()
- if i not in ('EgammaRec',
- 'ElectronSuperRec',
+ if i not in ('EgammaRec',
+ 'ElectronSuperRec',
'EgammaLargeClusters',
'EgammaLargeClustersCellLink',
'CellLink',
'TopoSeededCellLink',
- 'EgammaLargeClusters',
- 'EgammaLargeClustersCellLink',
- 'Photon',
- 'PhotonSuperRec',
- 'FwdElectron',
- 'FwdCluster',
- 'FwdClusterCellLink',
+ 'EgammaLargeClusters',
+ 'EgammaLargeClustersCellLink',
+ 'Photon',
+ 'PhotonSuperRec',
+ 'FwdElectron',
+ 'FwdCluster',
+ 'FwdClusterCellLink',
'Conversion'
- )]
+ )]
ESD_outputs = [i for i, j in egammaKeysDict.outputs.items()
- if i not in ('EgammaRec',
- 'ElectronSuperRec',
+ if i not in ('EgammaRec',
+ 'ElectronSuperRec',
'EgammaLargeClusters',
'EgammaLargeClustersCellLink',
'TopoSeededCellLink',
'CellLink',
- 'EgammaLargeClusters',
- 'EgammaLargeClustersCellLink',
- 'Photon',
- 'PhotonSuperRec',
- 'FwdElectron',
- 'FwdCluster',
- 'FwdClusterCellLink',
+ 'EgammaLargeClusters',
+ 'EgammaLargeClustersCellLink',
+ 'Photon',
+ 'PhotonSuperRec',
+ 'FwdElectron',
+ 'FwdCluster',
+ 'FwdClusterCellLink',
'Conversion'
- )]
+ )]
# Define egammaLRTAODList in the proper format (<type>#<key><option>),
# including aux containers
@@ -99,7 +72,8 @@ for i in AOD_outputs:
# Add aux containers for xAOD containers
if 'xAOD::' in cType:
- addAuxContainer(egammaLRTAODList, cType, cKey, auxOptionAll, auxOptionAOD)
+ addAuxContainer(egammaLRTAODList, cType, cKey,
+ auxOptionAll, auxOptionAOD)
for i in ESD_outputs:
cType, cKey, auxOptionAll, auxOptionAOD = egammaKeysDict.outputs[i]
@@ -107,7 +81,6 @@ for i in ESD_outputs:
# Tag LRT containers
cKey = 'LRT' + cKey
-
# Skip truth if doTruth = False
if not rec.doTruth() and 'Truth' in cKey:
continue
@@ -124,12 +97,15 @@ for i in ESD_outputs:
# Add the non xAOD kind of collection in the ESD
-egammaLRTESDList.append(getItem(egammaKeys.outputTrackType(),
- egammaKeys.outputTrackKey()).replace('#','#LRT'))
+egammaLRTESDList.append(getItem(
+ egammaKeys.outputTrackType(),
+ egammaKeys.outputTrackKey()).replace('#', '#LRT'))
egammaLRTESDList.append(getItem(egammaKeys.outputTopoSeededCellLinkType(
-), egammaKeys.outputTopoSeededCellLinkKey()).replace('#','#LRT'))
+), egammaKeys.outputTopoSeededCellLinkKey()).replace('#', '#LRT'))
logEgammaLRTOutputItemList_jobOptions = logging.getLogger(
'egammaLRTOutputItemList_jobOptions')
-logEgammaLRTOutputItemList_jobOptions.info('egammaLRTESDList: %s', egammaLRTESDList)
-logEgammaLRTOutputItemList_jobOptions.info('egammaLRTAODList: %s', egammaLRTAODList)
+logEgammaLRTOutputItemList_jobOptions.info(
+ 'egammaLRTESDList: %s', egammaLRTESDList)
+logEgammaLRTOutputItemList_jobOptions.info(
+ 'egammaLRTAODList: %s', egammaLRTAODList)
diff --git a/Reconstruction/egamma/egammaRec/share/egammaLRTRec_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaLRTRec_jobOptions.py
index 39d59d0afc3e6a4048c387aa487bec9e3d5c2232..3b7f4ca669a584887b098a494181465ba7ef7157 100755
--- a/Reconstruction/egamma/egammaRec/share/egammaLRTRec_jobOptions.py
+++ b/Reconstruction/egamma/egammaRec/share/egammaLRTRec_jobOptions.py
@@ -1,9 +1,6 @@
# all these tests, except egamma, should be in egammaGetter
-from CaloRec.CaloRecFlags import jobproperties
from egammaRec.egammaRecFlags import jobproperties
-from RecExConfig.RecFlags import rec
from AthenaCommon.Resilience import treatException
-from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
@@ -16,7 +13,7 @@ def setupGSF_LRT():
try:
from egammaRec.LRTEgammaConfig import (
LRTegammaSelectedTrackCopy)
- LRTegammaSelectedTrackCopy(doPrint=True) # for debugging
+ LRTegammaSelectedTrackCopy(doPrint=False) # for debugging
except Exception:
treatException(
"Could not set up the egamma track Selection for LRT GSF."
@@ -24,7 +21,7 @@ def setupGSF_LRT():
try:
from egammaRec.LRTEgammaConfig import (
LRTEMBremCollectionBuilder)
- LRTEMBremCollectionBuilder(doPrint=True)
+ LRTEMBremCollectionBuilder(doPrint=False)
except Exception:
treatException(
"Could not set up LRTEMBremCollectionBuilder."
@@ -32,7 +29,7 @@ def setupGSF_LRT():
try:
from egammaRec.LRTEgammaConfig import (
LRTEMGSFCaloExtensionBuilder)
- LRTEMGSFCaloExtensionBuilder(doPrint=True)
+ LRTEMGSFCaloExtensionBuilder(doPrint=False)
except Exception:
treatException("Could not set up LRTEMGSFCaloExtensionBuilder.")
@@ -45,29 +42,18 @@ def setupTopoSeededEgamma_LRT():
from egammaRec.LRTtopoEgammaGetter import LRTtopoEgammaGetter
LRTtopoEgammaGetter(ignoreExistingDataObject=True)
except Exception:
- treatException("Could not set up LRTtopoEgammaGetter. Switch it off !")
+ treatException(
+ "Could not set up LRTtopoEgammaGetter. Switch it off !")
# If we wanted Topo based cluster seeded egamma it just failed
jobproperties.egammaRecFlags.doEgammaCaloSeeded = False
LRTtopoEgammaGetter(disable=True)
-#def setupTopoSeededEgamma_LRT():
-# try:
-# from egammaRec.LRTEgammaConfig import (
-# LRTtopoEgammaBuilder)
-# LRTtopoEgammaBuilder(doPrint=True)
-# except Exception:
-# treatException("Could not set up LRTtopoEgammaBuilder. Switch it off !")
-# # If we wanted Topo based cluster seeded egamma it just failed
-# LRTtopoEgammaBuilder(disable=True)
-
-# Function to schedule the Truth Association
-
def setupTruthAssociation_LRT():
try:
from egammaRec.LRTEgammaConfig import (
LRTegammaTruthAssociationAlg)
- LRTegammaTruthAssociationAlg(doPrint=True)
+ LRTegammaTruthAssociationAlg(doPrint=False)
except Exception:
treatException(
"Could not set up LRTegammaTruthAssociationAlg. Switched off !")
diff --git a/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py
index 04f7cb9a01cac0c922828494f695fb5cba8aa77d..463e3fa26495a05cc4edac6b95e377935441b03a 100755
--- a/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py
+++ b/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py
@@ -3,55 +3,33 @@
__doc__ = """Add containers to ESD/AOD ItemList using
the definitions from egammaKeys"""
from egammaRec import egammaKeys
-from egammaRec.egammaKeys import egammaKeysDict
+from egammaRec.egammaKeys import (
+ egammaKeysDict,
+ getItem,
+ addContainer,
+ addAuxContainer)
from AthenaCommon.Logging import logging
from RecExConfig.RecFlags import rec
-def getItem(cType, cKey):
- """getItem(cType, cKey) -> Return item to be added
- to the output list: <cType>#<cKey>"""
- return '%s#%s' % (cType, cKey)
-
-
-def getAuxItem(cType, cKey, auxOptionAll='', auxOptionAOD=''):
- """getAuxItem(cType, cKey, auxOption='')
- -> <cType>#<cKey>Aux.<auxOption>"""
- auxType = cType.replace('Container', 'AuxContainer')
- auxKey = cKey + 'Aux.'
- return '%s#%s%s%s' % (auxType, auxKey, auxOptionAll, auxOptionAOD)
-
-
-def addContainer(outputList, cType, cKey):
- """addContainer(outputList, cType, cKey)
- -> Add container to outputList"""
- # Skip containers if already in outputList
- item = getItem(cType, cKey)
- if item not in outputList:
- outputList.append(item)
-
-
-def addAuxContainer(outputList, cType, cKey, auxOptionAll='', auxOptionAOD=''):
- """addAux(outputList, cType, cKey, auxOption='')
- -> Add aux container to outputList"""
- item = getAuxItem(cType, cKey, auxOptionAll, auxOptionAOD)
- if item not in outputList:
- outputList.append(item)
-
-
# List for of keys to be written to AOD.
# All egammaKeys.outputs but EgammaRec and TopoSeededCellLink
AOD_outputs = [i for i, j in egammaKeysDict.outputs.items()
- if i not in ('EgammaRec', 'PhotonSuperRec',
- 'ElectronSuperRec', 'TopoSeededCellLink',
- 'FwdClusterCellLink', 'EgammaLargeClusters',
- 'EgammaLargeClustersCellLink')]
+ if i not in ('EgammaRec',
+ 'PhotonSuperRec',
+ 'ElectronSuperRec',
+ 'TopoSeededCellLink',
+ 'EgammaLargeClusters',
+ 'EgammaLargeClustersCellLink',
+ 'EgammaLargeFWDClusters',
+ 'EgammaLargeFWDClustersCellLink')]
ESD_outputs = [i for i, j in egammaKeysDict.outputs.items()
- if i not in ('EgammaRec', 'PhotonSuperRec',
- 'ElectronSuperRec', 'TopoSeededCellLink',
- 'FwdClusterCellLink')]
+ if i not in ('EgammaRec',
+ 'PhotonSuperRec',
+ 'ElectronSuperRec',
+ 'TopoSeededCellLink')]
# Define egammaAODList in the proper format (<type>#<key><option>),
# including aux containers
diff --git a/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py
index 813a11cab2a329132bcaa325ae1881e1e30a133b..7ac2adcfcd9beacd29b5cc2ff34465a7491025f4 100755
--- a/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py
+++ b/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py
@@ -1,5 +1,5 @@
# all these tests, except egamma, should be in egammaGetter
-from CaloRec.CaloRecFlags import jobproperties
+from CaloRec.CaloRecFlags import jobproperties as caloproperties
from egammaRec.egammaRecFlags import jobproperties
from RecExConfig.RecFlags import rec
from AthenaCommon.Resilience import treatException
@@ -21,7 +21,7 @@ if not DetFlags.detdescr.ID_on():
jobproperties.egammaRecFlags.doVertexBuilding = False
# We can not run without having the Calo
-if not (rec.readESD() or jobproperties.CaloRecFlags.doCaloTopoCluster()):
+if not (rec.readESD() or caloproperties.CaloRecFlags.doCaloTopoCluster()):
jobproperties.egammaRecFlags.doEgammaCaloSeeded = False
jobproperties.egammaRecFlags.doEgammaForwardSeeded = False
diff --git a/Reconstruction/egamma/egammaTools/python/egammaLargeFWDClusterMakerConfig.py b/Reconstruction/egamma/egammaTools/python/egammaLargeFWDClusterMakerConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..2d2938619f85085afedf218d8fb36275fb716444
--- /dev/null
+++ b/Reconstruction/egamma/egammaTools/python/egammaLargeFWDClusterMakerConfig.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = "Configure egammaLargeFWDClusterMaker, which chooses cells to store in the AOD"
+__author__ = "Jovan Mitrevski"
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+egammaLargeFWDClusterMaker=CompFactory.egammaLargeFWDClusterMaker
+
+def egammaLargeFWDClusterMakerCfg(flags, **kwargs):
+
+ acc = ComponentAccumulator
+
+ kwargs.setdefault("CellsName", flags.Egamma.Keys.Input.CaloCells)
+ kwargs.setdefault("InputClusterCollection", flags.Egamma.Keys.Output.FwdCluster)
+ kwargs.setdefault("doFWDelesurraundingWindows", True)
+
+ acc.setPrivateTools(egammaLargeFWDClusterMaker(**kwargs))
+
+ return acc
+
diff --git a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
index 17caae683d5bf62f4bb1088fd7994fd1d74b494b..9871d1e65260215706205d0836961494cf8025b2 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
@@ -124,6 +124,14 @@ egammaLargeClusterMakerTool = ToolFactory(
CellsName=egammaKeys.caloCellKey()
)
+egammaLargeFWDClusterMakerTool = ToolFactory(
+ egammaToolsConf.egammaLargeClusterMaker,
+ name="egammaLCFWDMakerTool",
+ InputClusterCollection=egammaKeys.FwdClusterKey(),
+ CellsName=egammaKeys.caloCellKey(),
+ doFWDelesurraundingWindows = True
+)
+
# Electron Selectors
ElectronPIDBuilder = ToolFactory(
EMPIDBuilderElectronBase,
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
index d523fdb0e56b0701325c59104b98c3e129402dd3..8b0fdb2f16f4c1a6f5bd1b3e27cd570b82f9c557 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "EMClusterTool.h"
@@ -192,7 +192,7 @@ EMClusterTool::setNewCluster(const EventContext& ctx,
outputClusterContainer->push_back(cluster);
// Set the link to the new cluster
- ClusterLink_t clusterLink(cluster, *outputClusterContainer);
+ ClusterLink_t clusterLink(cluster, *outputClusterContainer, ctx);
const std::vector<ClusterLink_t> clusterLinks{ clusterLink };
eg->setCaloClusterLinks(clusterLinks);
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
index e57e4de298008151e97a2f31519cbe16ab8b37df..89a5c2360bdec6b9281dc926d670711ef2756496 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// INCLUDE HEADER FILES:
@@ -137,16 +137,15 @@ EMTrackMatchBuilder::trackExecute(
using EL = ElementLink<xAOD::TrackParticleContainer>;
std::vector<EL> trackParticleLinks;
trackParticleLinks.reserve(trkMatches.size());
- const std::string key = EL(*trackPC, 0).dataID();
- IProxyDict* sg = SG::CurrentEventStore::store();
+ const std::string key = EL(*trackPC, 0, ctx).dataID();
for (const TrackMatch& m : trkMatches) {
ATH_MSG_DEBUG("Match dR: " << m.dR << " second dR: " << m.seconddR
<< " hasPix: " << m.hasPix
<< " hitsScore: " << m.hitsScore);
if (key.empty()) {
- trackParticleLinks.emplace_back(*trackPC, m.trackNumber, sg);
+ trackParticleLinks.emplace_back(*trackPC, m.trackNumber, ctx);
} else {
- trackParticleLinks.emplace_back(key, m.trackNumber, sg);
+ trackParticleLinks.emplace_back(key, m.trackNumber, ctx);
}
}
eg->setTrackParticles(trackParticleLinks);
diff --git a/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx b/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx
index f14bc25c976cfa82adf19e591c95ee60e7f09a42..5b4679b947d746cb2f60d7a3a0bff72ad56e7b85 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx
+++ b/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx
@@ -5,6 +5,7 @@
#include "egammaLargeClusterMaker.h"
#include "CaloEvent/CaloCellContainer.h"
#include "CaloEvent/CaloClusterCellLink.h"
+#include "CaloUtils/CaloCellList.h"
#include "CaloUtils/CaloClusterStoreHelper.h"
#include "egammaUtils/egammaEnergyPositionAllSamples.h"
#include "xAODCaloEvent/CaloCluster.h"
@@ -52,83 +53,186 @@ egammaLargeClusterMaker::execute(const EventContext& ctx,
const CaloDetDescrManager* dd_man = nullptr;
ATH_CHECK(detStore()->retrieve(dd_man, "CaloMgr"));
-
+
// The main loop over clusters
for (const auto *cluster : *inputClusters) {
-
- // find the center of the cluster, copying the logic of
- // egammaMiddleShape.cxx
-
- // check if cluster is in barrel or in the end-cap
- if (!cluster->inBarrel() && !cluster->inEndcap()) {
- ATH_MSG_DEBUG(" Cluster is neither in Barrel nor in Endcap; skipping ");
- continue;
- }
-
- // check if cluster is in barrel or end-cap
- bool in_barrel = egammaEnergyPositionAllSamples::inBarrel(*cluster, 2);
- CaloSampling::CaloSample sam = CaloSampling::EMB2;
- if (in_barrel) {
- sam = CaloSampling::EMB2;
- } else {
- sam = CaloSampling::EME2;
- }
- // granularity in (eta,phi) in the pre sampler
- // CaloCellList needs both enums: subCalo and CaloSample
- auto eta = cluster->etaSample(sam);
- auto phi = cluster->phiSample(sam);
-
- if ((eta == 0. && phi == 0.) || fabs(eta) > 100) {
- return StatusCode::SUCCESS;
- }
-
- // Should get overritten
- bool barrel = false;
- CaloCell_ID::SUBCALO subcalo = CaloCell_ID::LAREM;
- int sampling_or_module = 0;
-
- CaloDetDescrManager::decode_sample(
+
+ if (!m_isFWD) {
+ // find the center of the cluster, copying the logic of
+ // egammaMiddleShape.cxx
+
+ // check if cluster is in barrel or in the end-cap
+ if (!cluster->inBarrel() && !cluster->inEndcap()) {
+ ATH_MSG_DEBUG(" Cluster is neither in Barrel nor in Endcap; skipping ");
+ continue;
+ }
+
+ // check if cluster is in barrel or end-cap
+ bool in_barrel = egammaEnergyPositionAllSamples::inBarrel(*cluster, 2);
+ CaloSampling::CaloSample sam = CaloSampling::EMB2;
+ if (in_barrel) {
+ sam = CaloSampling::EMB2;
+ } else {
+ sam = CaloSampling::EME2;
+ }
+
+ // granularity in (eta,phi) in the pre sampler
+ // CaloCellList needs both enums: subCalo and CaloSample
+ auto eta = cluster->etaSample(sam);
+ auto phi = cluster->phiSample(sam);
+
+ if ((eta == 0. && phi == 0.) || fabs(eta) > 100) {
+ return StatusCode::SUCCESS;
+ }
+
+ // Should get overritten
+ bool barrel = false;
+ CaloCell_ID::SUBCALO subcalo = CaloCell_ID::LAREM;
+ int sampling_or_module = 0;
+
+ CaloDetDescrManager::decode_sample(
subcalo, barrel, sampling_or_module, (CaloCell_ID::CaloSample)sam);
-
- // Get the corresponding grannularities : needs to know where you are
- // the easiest is to look for the CaloDetDescrElement
-
- const CaloDetDescrElement* dde =
- dd_man->get_element(CaloCell_ID::LAREM, 0, barrel, eta, phi);
-
- // if object does not exist then return
- if (!dde) {
- return StatusCode::SUCCESS;
- }
-
- // local granularity
- auto deta = dde->deta();
- auto dphi = dde->dphi();
-
- // search the hottest cell around the (eta,phi)
- // (eta,phi) are defined as etaSample() and phiSample
- // around this position a hot cell is searched for in a window
- // (m_neta*m_deta,m_nphi*m_dphi), by default (m_neta,m_nphi)=(7,7)
- CaloLayerCalculator calc;
- StatusCode sc = calc.fill(*dd_man,
- cellcoll.ptr(),
- cluster->etaSample(sam),
- cluster->phiSample(sam),
- m_neta * deta,
- m_nphi * dphi,
- (CaloSampling::CaloSample)sam);
- if (sc.isFailure()) {
- ATH_MSG_WARNING("CaloLayerCalculator failed fill ");
- }
- double etamax = calc.etarmax();
- double phimax = calc.phirmax();
-
- // create the new cluster
- xAOD::CaloCluster* newCluster =
- CaloClusterStoreHelper::makeCluster(collection, cellcoll.ptr());
- newCluster->setEta0(etamax);
- newCluster->setPhi0(phimax);
- newCluster->setClusterSize(xAOD::CaloCluster::SW_7_11);
- }
+
+ // Get the corresponding grannularities : needs to know where you are
+ // the easiest is to look for the CaloDetDescrElement
+
+ const CaloDetDescrElement* dde =
+ dd_man->get_element(CaloCell_ID::LAREM, 0, barrel, eta, phi);
+
+ // if object does not exist then return
+ if (!dde) {
+ return StatusCode::SUCCESS;
+ }
+
+ // local granularity
+ auto deta = dde->deta();
+ auto dphi = dde->dphi();
+
+ // search the hottest cell around the (eta,phi)
+ // (eta,phi) are defined as etaSample() and phiSample
+ // around this position a hot cell is searched for in a window
+ // (m_neta*m_deta,m_nphi*m_dphi), by default (m_neta,m_nphi)=(7,7)
+ CaloLayerCalculator calc;
+ StatusCode sc = calc.fill(*dd_man,
+ cellcoll.ptr(),
+ cluster->etaSample(sam),
+ cluster->phiSample(sam),
+ m_neta * deta,
+ m_nphi * dphi,
+ (CaloSampling::CaloSample)sam);
+ if (sc.isFailure()) {
+ ATH_MSG_WARNING("CaloLayerCalculator failed fill ");
+ }
+ double etamax = calc.etarmax();
+ double phimax = calc.phirmax();
+
+ // create the new cluster
+ xAOD::CaloCluster* newCluster =
+ CaloClusterStoreHelper::makeCluster(collection, cellcoll.ptr());
+ newCluster->setEta0(etamax);
+ newCluster->setPhi0(phimax);
+ newCluster->setClusterSize(xAOD::CaloCluster::SW_7_11);
+
+ } else {
+ // FWD cluster collection
+
+ // check if cluster is in EMEC or FCAL
+ if (cluster->inBarrel()) {
+ ATH_MSG_DEBUG(" Cluster is not in FWD; skip ");
+ continue;
+ } else {
+ ATH_MSG_DEBUG (" CLuster is FWD Cluster ");
+ }
+
+ // check if cluster is in FCAL or EMEC
+ bool in_EMEC = false;
+ if (cluster->eSample(CaloSampling::EME2) > cluster->eSample(CaloSampling::FCAL0) )
+ in_EMEC = true;
+
+ CaloSampling::CaloSample sam = CaloSampling::FCAL0;
+ if (in_EMEC) {
+ sam = CaloSampling::EME2;
+ } else {
+ sam = CaloSampling::FCAL0;
+ }
+
+ // granularity in (eta,phi) in the pre sampler
+ // CaloCellList needs both enums: subCalo and CaloSample
+ auto eta = cluster->etaSample(sam);
+ auto phi = cluster->phiSample(sam);
+
+ if ((eta == 0. && phi == 0.) || fabs(eta) > 100) {
+ return StatusCode::SUCCESS;
+ }
+
+ // Should get overritten
+ bool emec = false;
+ CaloCell_ID::SUBCALO subcalo = CaloCell_ID::LARFCAL;
+ int sampling_or_module = 0;
+
+ CaloDetDescrManager::decode_sample(subcalo, emec, sampling_or_module, (CaloCell_ID::CaloSample)sam);
+
+ // Get the corresponding grannularities : needs to know where you are
+ // the easiest is to look for the CaloDetDescrElement
+ // const CaloDetDescrElement* get_element_FCAL (const CaloDetDescriptor* reg, double eta, double phi) const;
+ const CaloDetDescrElement* dde =
+ dd_man->get_element(subcalo, sampling_or_module, emec, eta, phi);
+
+ // if object does not exist then return
+ if (!dde) {
+ return StatusCode::SUCCESS;
+ }
+
+ // local granularity
+ auto deta = dde->deta();
+ auto dphi = dde->dphi();
+
+ // search the hottest cell around the (eta,phi)
+ // (eta,phi) are defined as etaSample() and phiSample
+ // around this position a hot cell is searched for in a window
+ // (m_neta*m_deta,m_nphi*m_dphi), by default (m_neta,m_nphi)=(6,6)
+ // for EMEC-OUTER FWD much bigger cell size
+
+ // create the new cluster
+ xAOD::CaloCluster* newCluster =
+ CaloClusterStoreHelper::makeCluster(collection, cellcoll.ptr());
+
+ // if In EMEC
+ CaloLayerCalculator calc;
+ StatusCode sc = calc.fill(*dd_man,
+ cellcoll.ptr(),
+ cluster->etaSample(sam),
+ cluster->phiSample(sam),
+ m_netaFWD * deta,
+ m_nphiFWD * dphi,
+ (CaloSampling::CaloSample)sam, in_EMEC ? newCluster : nullptr);
+
+ if (sc.isFailure()) {
+ ATH_MSG_WARNING("CaloLayerCalculator failed fill for FWD cluster");
+ }
+ double etamax = calc.etarmax();
+ double phimax = calc.phirmax();
+
+ newCluster->setEta0(etamax);
+ newCluster->setPhi0(phimax);
+
+ if (!in_EMEC) {
+ // If FCAL need to add cell to cluster in a cone
+ std::vector<const CaloCell*> cells;
+ cells.reserve(300);
+ CaloCellList myList(cellcoll.ptr());
+ myList.select(cluster->etaSample(sam), cluster->phiSample(sam), m_drFWD,(CaloSampling::CaloSample)sam);
+ // myList.select(dde,newCluster->eta0(), newCluster->phi0(),m_drFWD,(CaloSampling::CaloSample)sam);
+ cells.insert(cells.end(), myList.begin(), myList.end());
+
+ for ( const auto *cell : cells ) {
+ if( !cell || !cell->caloDDE() ) continue;
+ int index = cellcoll.ptr()->findIndex(cell->caloDDE()->calo_hash());
+ if( index == -1 ) continue;
+ newCluster->addCell(index,1.);
+ }
+ }
+ }// end isFWD
+ }// main loop over clusters
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.h b/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.h
index 6dc09bf413b721d3c77d27b6d411cc0de5fb4067..27c6d547a67f80251fb7ecfa0b2e5f24468c965e 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.h
+++ b/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.h
@@ -51,6 +51,12 @@ private:
/** @brief Cell container*/
SG::ReadHandleKey<CaloCellContainer> m_cellsKey {this,
"CellsName", "AllCalo", "Names of containers which contain cells"};
+
+ /** @brief do FWD cell **/
+ Gaudi::Property<bool> m_isFWD{ this,
+ "doFWDelesurraundingWindows",
+ false,
+ "Save FWD electron surraunding windows" };
Gaudi::Property<double> m_neta {this, "Neta", 7.0,
"Number of eta cells in each sampling in which to look for hottest cell"};
@@ -58,6 +64,15 @@ private:
Gaudi::Property<double> m_nphi {this, "Nphi", 7.0,
"Number of phi cell in each sampling in which to look for hottest cell"};
+ Gaudi::Property<double> m_netaFWD {this, "NetaFWD", 6.0,
+ "Number of eta cells in each sampling in which to look for hottest cell"};
+
+ Gaudi::Property<double> m_nphiFWD {this, "NphiFWD", 6.0,
+ "Number of phi cell in each sampling in which to look for hottest cell"};
+
+ Gaudi::Property<double> m_drFWD {this, "deltaR_FCAL", 0.4,
+ "Cone size to collec cell around hottest-cell FCAL"};
+
};
diff --git a/Reconstruction/iPat/iPatInterfaces/iPatInterfaces/ITruthParameters.h b/Reconstruction/iPat/iPatInterfaces/iPatInterfaces/ITruthParameters.h
index 234ef43245caa278e7ccb0944c1aa7e2ef5bd36e..6581ddaab17876c2e139070ccab5bb10bf6ad939 100755
--- a/Reconstruction/iPat/iPatInterfaces/iPatInterfaces/ITruthParameters.h
+++ b/Reconstruction/iPat/iPatInterfaces/iPatInterfaces/ITruthParameters.h
@@ -44,7 +44,7 @@ public:
/**ITruthParameters interface:
obtain PerigeeParameters corresponding to a simulated particle from a HepMC GenParticle */
- virtual const PerigeeParameters* perigeeParameters(const HepMC::GenParticle& particle,
+ virtual const PerigeeParameters* perigeeParameters(HepMC::ConstGenParticlePtr particle,
const Amg::Vector3D& vertex) = 0;
/**ITruthParameters interface:
@@ -53,7 +53,7 @@ public:
/**ITruthParameters interface:
obtain TrackParameters corresponding to a simulated particle from a HepMC GenParticle */
- virtual const TrackParameters* trackParameters(const HepMC::GenParticle& particle) = 0;
+ virtual const TrackParameters* trackParameters(HepMC::ConstGenParticlePtr particle) = 0;
};
#endif // IPATINTERFACES_ITRUTHPARAMETERS_H
diff --git a/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py b/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py
index d65f219d642c4df446fed7e3cebe140e50e09270..5465f4a2cf49067c0e55f796672d9eee1887f204 100755
--- a/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py
+++ b/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py
@@ -89,14 +89,6 @@ if DetFlags.detdescr.ID_on() and (DetFlags.haveRIO.pixel_on() or DetFlags.haveRI
ToolSvc += TrackFollower(name = 'TrackFollower',
TRT_Recon = "TRT_Recon/TRT_Recon")
- # include the RegionSelector service
- if DetFlags.haveRIO.TRT_on():
- from AthenaCommon.AppMgr import ServiceMgr
- # from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
- # iPatRegSelSvc = RegSelSvcDefault()
- # iPatRegSelSvc.enableTRT = True
- # ServiceMgr += iPatRegSelSvc
-
# -------------------------------------------------------------
# Algorithm Private Options: iPatRec
# -------------------------------------------------------------
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/iPatTruthTrajectory/TruthParameters.h b/Reconstruction/iPat/iPatTruthTrajectory/iPatTruthTrajectory/TruthParameters.h
index 963db93f57debe7ec3a7937ed454e4806697e543..2fd6367c4ceae113ba9ef7d4d2422ba194c66fe3 100755
--- a/Reconstruction/iPat/iPatTruthTrajectory/iPatTruthTrajectory/TruthParameters.h
+++ b/Reconstruction/iPat/iPatTruthTrajectory/iPatTruthTrajectory/TruthParameters.h
@@ -10,7 +10,7 @@
#ifndef IPATTRUTHTRAJECTORY_TRUTHPARAMETERS_H
#define IPATTRUTHTRAJECTORY_TRUTHPARAMETERS_H
-//<<<<<< INCLUDES >>>>>>
+//INCLUDES
#include "AthenaBaseComps/AthAlgTool.h"
#include "AtlasHepMC/GenParticle.h"
@@ -20,7 +20,7 @@
#include "iPatInterfaces/ITruthParameters.h"
#include "iPatTrackParameters/PerigeeParameters.h"
-//<<<<<< CLASS DECLARATIONS >>>>>>
+//CLASS DECLARATIONS
class ITruthSelector;
namespace Trk { class IIntersector; }
@@ -39,14 +39,14 @@ public:
StatusCode finalize();
const PerigeeParameters* perigeeParameters(int barcode, const Amg::Vector3D& vertex);
- const PerigeeParameters* perigeeParameters(const HepMC::GenParticle& particle,
+ const PerigeeParameters* perigeeParameters(HepMC::ConstGenParticlePtr particle,
const Amg::Vector3D& vertex);
const TrackParameters* trackParameters(int barcode);
- const TrackParameters* trackParameters(const HepMC::GenParticle& particle);
+ const TrackParameters* trackParameters(HepMC::ConstGenParticlePtr particle);
private:
- const HepMC::GenParticle* findParticle(int barcode);
- void trackFromParticle(const HepMC::GenParticle& particle);
+ HepMC::ConstGenParticlePtr findParticle(int barcode);
+ void trackFromParticle(HepMC::ConstGenParticlePtr particle);
// configuration: tools etc
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/src/TruthParameters.cxx b/Reconstruction/iPat/iPatTruthTrajectory/src/TruthParameters.cxx
index 46396ea1d7fd6442f17cb2d3c6bce2dc0824231e..f7f25e06724ce9c2216ce4f66b2f8365b2c1e80e 100755
--- a/Reconstruction/iPat/iPatTruthTrajectory/src/TruthParameters.cxx
+++ b/Reconstruction/iPat/iPatTruthTrajectory/src/TruthParameters.cxx
@@ -7,7 +7,7 @@
particle, either from its barcode or from a HepMC GenParticle.
***************************************************************************/
-//<<<<<< INCLUDES >>>>>>
+//INCLUDES
#include <cmath>
#include "GaudiKernel/IPartPropSvc.h"
@@ -17,7 +17,7 @@
#include "GenInterfaces/ITruthSelector.h"
#include "iPatTruthTrajectory/TruthParameters.h"
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
+//CLASS STRUCTURE INITIALIZATION
TruthParameters::TruthParameters (const std::string& type,
const std::string& name,
@@ -39,11 +39,11 @@ TruthParameters::~TruthParameters (void)
//<<<<<< PRIVATE MEMBER FUNCTION DEFINITIONS>>>>>>
-const HepMC::GenParticle*
+HepMC::ConstGenParticlePtr
TruthParameters::findParticle (int barCode)
{
// protect against real data, fakes ...
- const HepMC::GenParticle* particle = 0;
+ HepMC::ConstGenParticlePtr particle{nullptr};
if (barCode == 0) return particle;
// retrieve McEventCollection (from truthSelector to give G3/4 simulation independence)
@@ -56,26 +56,26 @@ TruthParameters::findParticle (int barCode)
}
void
-TruthParameters::trackFromParticle(const HepMC::GenParticle& particle)
+TruthParameters::trackFromParticle(HepMC::ConstGenParticlePtr particle)
{
// protect against missing production_vertex
- if (! particle.production_vertex()) return;
+ if (! particle->production_vertex()) return;
// ensure known particle
m_intersection = 0;
- int pdgCode = particle.pdg_id();
+ int pdgCode = particle->pdg_id();
if (! m_particleDataTable->particle(std::abs(pdgCode))) return;
// fill intersection, qOverP
- Amg::Vector3D position( particle.production_vertex()->position().x(),
- particle.production_vertex()->position().y(),
- particle.production_vertex()->position().z());
- m_qOverP = 1./std::sqrt(particle.momentum().px()*particle.momentum().px() +
- particle.momentum().py()*particle.momentum().py() +
- particle.momentum().pz()*particle.momentum().pz());
- Amg::Vector3D direction( m_qOverP*particle.momentum().px(),
- m_qOverP*particle.momentum().py(),
- m_qOverP*particle.momentum().pz());
+ Amg::Vector3D position( particle->production_vertex()->position().x(),
+ particle->production_vertex()->position().y(),
+ particle->production_vertex()->position().z());
+ m_qOverP = 1./std::sqrt(particle->momentum().px()*particle->momentum().px() +
+ particle->momentum().py()*particle->momentum().py() +
+ particle->momentum().pz()*particle->momentum().pz());
+ Amg::Vector3D direction( m_qOverP*particle->momentum().px(),
+ m_qOverP*particle->momentum().py(),
+ m_qOverP*particle->momentum().pz());
m_intersection = new Trk::TrackSurfaceIntersection(position,direction,0.);
// fill trackParameters
@@ -94,7 +94,7 @@ TruthParameters::trackFromParticle(const HepMC::GenParticle& particle)
m_trackParameters.fill(position,cosPhi,sinPhi,sinThetaInv*cosTheta,sinThetaInv*m_qOverP);
}
-//<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>>
+// PUBLIC MEMBER FUNCTION DEFINITIONS
StatusCode
TruthParameters::initialize()
@@ -143,9 +143,9 @@ TruthParameters::finalize()
const PerigeeParameters*
TruthParameters::perigeeParameters (int barCode, const Amg::Vector3D& vertex)
{
- const HepMC::GenParticle* particle = findParticle(barCode);
+ auto particle = findParticle(barCode);
if (! particle) return 0;
- trackFromParticle(*particle);
+ trackFromParticle(particle);
if (! m_intersection) return 0;
Trk::PerigeeSurface surface(vertex);
@@ -181,7 +181,7 @@ TruthParameters::perigeeParameters (int barCode, const Amg::Vector3D& vertex)
}
const PerigeeParameters*
-TruthParameters::perigeeParameters (const HepMC::GenParticle& particle, const Amg::Vector3D& vertex)
+TruthParameters::perigeeParameters (HepMC::ConstGenParticlePtr particle, const Amg::Vector3D& vertex)
{
trackFromParticle(particle);
if (! m_intersection) return 0;
@@ -220,16 +220,16 @@ TruthParameters::perigeeParameters (const HepMC::GenParticle& particle, const Am
const TrackParameters*
TruthParameters::trackParameters (int barCode)
{
- const HepMC::GenParticle* particle = findParticle(barCode);
+ auto particle = findParticle(barCode);
if (! particle) return 0;
- trackFromParticle(*particle);
+ trackFromParticle(particle);
if (! m_intersection) return 0;
delete m_intersection;
return &m_trackParameters;
}
const TrackParameters*
-TruthParameters::trackParameters (const HepMC::GenParticle& particle)
+TruthParameters::trackParameters (HepMC::ConstGenParticlePtr particle)
{
trackFromParticle(particle);
if (! m_intersection) return 0;
diff --git a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
index b54d8e2dcdcc3ef99f72832fcff4acc6403268ed..1f058baac3a45d736c2f9a661c8c1875cd7a7786 100644
--- a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
+++ b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
@@ -47,7 +47,7 @@ def tauMonitoringConfig(inputFlags):
tauMonAlgEleTrig = cfgHelper.addAlgorithm( tauMonitorAlgorithm, name='tauMonAlgEleTrig')
tauMonAlgJetTrig = cfgHelper.addAlgorithm( tauMonitorAlgorithm, name='tauMonAlgJetTrig')
tauMonAlgHighPt = cfgHelper.addAlgorithm( tauMonitorAlgorithm, name='tauMonAlgHighPt')
- tauMonAlgHighPtBDTLoose = cfgHelper.addAlgorithm( tauMonitorAlgorithm, name='tauMonAlgHighPtBDTLoose')
+ tauMonAlgHighPtRNNLoose = cfgHelper.addAlgorithm( tauMonitorAlgorithm, name='tauMonAlgHighPtRNNLoose')
@@ -88,8 +88,8 @@ def tauMonitoringConfig(inputFlags):
tauMonAlgJetTrig.etaMax = 100
tauMonAlgHighPt.etaMin = -100
tauMonAlgHighPt.etaMax = 100
- tauMonAlgHighPtBDTLoose.etaMin = -100
- tauMonAlgHighPtBDTLoose.etaMax = 100
+ tauMonAlgHighPtRNNLoose.etaMin = -100
+ tauMonAlgHighPtRNNLoose.etaMax = 100
tauMonAlgBA.kinGroupName = 'tauMonKinGroupBA'
tauMonAlgCR.kinGroupName = 'tauMonKinGroupCR'
@@ -106,7 +106,7 @@ def tauMonitoringConfig(inputFlags):
tauMonAlgEleTrig.kinGroupName = 'tauMonKinGroupEleTrig'
tauMonAlgJetTrig.kinGroupName = 'tauMonKinGroupJetTrig'
tauMonAlgHighPt.kinGroupName = 'tauMonKinGroupHighPt'
- tauMonAlgHighPtBDTLoose.kinGroupName = 'tauMonKinGroupHighPtBDTLoose'
+ tauMonAlgHighPtRNNLoose.kinGroupName = 'tauMonKinGroupHighPtRNNLoose'
### STEP 4 ###
# Add some tools. N.B. Do not use your own trigger decion tool. Use the
@@ -131,7 +131,7 @@ def tauMonitoringConfig(inputFlags):
myKinGroupJetTrig = cfgHelper.addGroup(alg=tauMonAlgJetTrig, name='tauMonKinGroupJetTrig', topPath='Tau/Trigger/JetTrig' )
myKinGroupHighPt = cfgHelper.addGroup(alg=tauMonAlgHighPt, name='tauMonKinGroupHighPt', topPath='Tau/' )
- myKinGroupHighPtBDTLoose = cfgHelper.addGroup(alg=tauMonAlgHighPtBDTLoose, name='tauMonKinGroupHighPtBDTLoose', topPath='Tau/' )
+ myKinGroupHighPtRNNLoose = cfgHelper.addGroup(alg=tauMonAlgHighPtRNNLoose, name='tauMonKinGroupHighPtRNNLoose', topPath='Tau/' )
naming= {
@@ -140,7 +140,7 @@ def tauMonitoringConfig(inputFlags):
'EC': "Tau_TauE_",
'Global': "",
'HighPt': "",
- 'HighPtBDTLoose': "",
+ 'HighPtRNNLoose': "",
'EleTrig': "emTriggered_",
'JetTrig': "jetTriggered_",
'TauTrig1': "tauTriggered1_",
@@ -174,7 +174,7 @@ def tauMonitoringConfig(inputFlags):
(myKinGroupEC,'EC'),
(myKinGroupGlobal,'Global'),
(myKinGroupHighPt,'HighPt'),
- (myKinGroupHighPtBDTLoose,'HighPtBDTLoose'),
+ (myKinGroupHighPtRNNLoose,'HighPtRNNLoose'),
(myKinGroupEleTrig,'EleTrig'),
(myKinGroupJetTrig,'JetTrig'),
(myKinGroupTauTrig1, 'TauTrig1'),
@@ -205,6 +205,10 @@ def tauMonitoringConfig(inputFlags):
igroup.defineHistogram(namer('RNNJetScore','RNNJetScore','',postfix), title='RNN Jet Score',
xbins=100, xmin=0, xmax=1,path=folder)
+ igroup.defineHistogram(namer('RNNJetScoreSigTrans','RNNJetScoreSigTrans','',postfix), title='RNN Jet Score Sig Trans',
+ xbins=48, xmin=0, xmax=1.1,path=folder)
+
+
igroup.defineHistogram(namer('tauEt','tauEt','',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
xbins=60, xmin=0., xmax=300.,path=folder)
@@ -232,46 +236,46 @@ def tauMonitoringConfig(inputFlags):
if(postfix =="BA" or postfix =="CR" or postfix=="EC" or postfix.startswith('TauTrig')):
- igroup.defineHistogram(namer('tauPhiBDTLoose','phi','Identification_BDTLoose',postfix), title='Phi of tau candidates ( BDTLoose) ;Phi;Number of Candidates',
- xbins=65, xmin=PHIMIN-0.098174/2., xmax=PHIMAX+0.098174/2., path=folder+"Identification/BDTLoose" )
+ igroup.defineHistogram(namer('tauPhiRNNLoose','phi','Identification_RNNLoose',postfix), title='Phi of tau candidates ( RNNLoose) ;Phi;Number of Candidates',
+ xbins=65, xmin=PHIMIN-0.098174/2., xmax=PHIMAX+0.098174/2., path=folder+"Identification/RNNLoose" )
- igroup.defineHistogram(namer('tauEtaBDTLoose','eta','Identification_BDTLoose',postfix), title='Eta of tau candidates ( BDTLoose) ;Eta;Number of Candidates',
- xbins=51, xmin=-2.55, xmax=2.55, path=folder+"Identification/BDTLoose")
+ igroup.defineHistogram(namer('tauEtaRNNLoose','eta','Identification_RNNLoose',postfix), title='Eta of tau candidates ( RNNLoose) ;Eta;Number of Candidates',
+ xbins=51, xmin=-2.55, xmax=2.55, path=folder+"Identification/RNNLoose")
- igroup.defineHistogram(namer('tauEtBDTLoose','et','Identification_BDTLoose',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
- xbins=60, xmin=0., xmax=300.,path=folder+"Identification/BDTLoose")
+ igroup.defineHistogram(namer('tauEtRNNLoose','et','Identification_RNNLoose',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
+ xbins=60, xmin=0., xmax=300.,path=folder+"Identification/RNNLoose")
- igroup.defineHistogram(namer('NumTracksBDTLoose','NumTracks','Identification_BDTLoose',postfix), title='Number Of Tracks for Tau Candidates (BDTLoose);Number Of Tracks;Number Of Candidates',
- xbins=21, xmin=-0.5, xmax=20.5,path=folder+"Identification/BDTLoose")
+ igroup.defineHistogram(namer('NumTracksRNNLoose','NumTracks','Identification_RNNLoose',postfix), title='Number Of Tracks for Tau Candidates (RNNLoose);Number Of Tracks;Number Of Candidates',
+ xbins=21, xmin=-0.5, xmax=20.5,path=folder+"Identification/RNNLoose")
- igroup.defineHistogram(namer('tauPhiBDTMedium','phi','Identification_BDTMedium',postfix), title='Phi of tau candidates ( BDTMedium) ;Phi;Number of Candidates',
- xbins=65, xmin=PHIMIN-0.098174/2., xmax=PHIMAX+0.098174/2., path=folder+"Identification/BDTMedium" )
+ igroup.defineHistogram(namer('tauPhiRNNMedium','phi','Identification_RNNMedium',postfix), title='Phi of tau candidates ( RNNMedium) ;Phi;Number of Candidates',
+ xbins=65, xmin=PHIMIN-0.098174/2., xmax=PHIMAX+0.098174/2., path=folder+"Identification/RNNMedium" )
- igroup.defineHistogram(namer('tauEtaBDTMedium','eta','Identification_BDTMedium',postfix), title='Eta of tau candidates ( BDTMedium) ;Eta;Number of Candidates',
- xbins=51, xmin=-2.55, xmax=2.55, path=folder+"Identification/BDTMedium")
+ igroup.defineHistogram(namer('tauEtaRNNMedium','eta','Identification_RNNMedium',postfix), title='Eta of tau candidates ( RNNMedium) ;Eta;Number of Candidates',
+ xbins=51, xmin=-2.55, xmax=2.55, path=folder+"Identification/RNNMedium")
- igroup.defineHistogram(namer('tauEtBDTMedium','et','Identification_BDTMedium',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
- xbins=60, xmin=0., xmax=300.,path=folder+"Identification/BDTMedium")
+ igroup.defineHistogram(namer('tauEtRNNMedium','et','Identification_RNNMedium',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
+ xbins=60, xmin=0., xmax=300.,path=folder+"Identification/RNNMedium")
- igroup.defineHistogram(namer('NumTracksBDTMedium','NumTracks','Identification_BDTMedium',postfix), title='Number Of Tracks for Tau Candidates (BDTMedium);Number Of Tracks;Number Of Candidates',
- xbins=21, xmin=-0.5, xmax=20.5,path=folder+"Identification/BDTMedium")
- igroup.defineHistogram(namer('tauPhiEt15BDTLoose','phi','Identification_BDTLoose15GeV',postfix), title='Phi of tau candidates (Et>15, BDTLoose) ;Phi;Number of Candidates',
- xbins=65, xmin=PHIMIN-0.098174/2., xmax=PHIMAX+0.098174/2., path=folder+"Identification/BDTLoose15GeV" )
+ igroup.defineHistogram(namer('NumTracksRNNMedium','NumTracks','Identification_RNNMedium',postfix), title='Number Of Tracks for Tau Candidates (RNNMedium);Number Of Tracks;Number Of Candidates',
+ xbins=21, xmin=-0.5, xmax=20.5,path=folder+"Identification/RNNMedium")
+ igroup.defineHistogram(namer('tauPhiEt15RNNLoose','phi','Identification_RNNLoose15GeV',postfix), title='Phi of tau candidates (Et>15, RNNLoose) ;Phi;Number of Candidates',
+ xbins=65, xmin=PHIMIN-0.098174/2., xmax=PHIMAX+0.098174/2., path=folder+"Identification/RNNLoose15GeV" )
- igroup.defineHistogram(namer('tauEtaEt15BDTLoose','eta','Identification_BDTLoose15GeV',postfix), title='Eta of tau candidates (Et>15, BDTLoose) ;Eta;Number of Candidates',
- xbins=51, xmin=-2.55, xmax=2.55, path=folder+"Identification/BDTLoose15GeV")
+ igroup.defineHistogram(namer('tauEtaEt15RNNLoose','eta','Identification_RNNLoose15GeV',postfix), title='Eta of tau candidates (Et>15, RNNLoose) ;Eta;Number of Candidates',
+ xbins=51, xmin=-2.55, xmax=2.55, path=folder+"Identification/RNNLoose15GeV")
- igroup.defineHistogram(namer('nClustersEt15BDTLoose','nCluster','Identification_BDTLoose15GeV',postfix), title='Number Of CaloTopoClusters (Et>15,BDTLoose);Number Of Clusters;Number Of Candidates',
- xbins=40, xmin=0., xmax=40.,path=folder+"Identification/BDTLoose15GeV" )
+ igroup.defineHistogram(namer('nClustersEt15RNNLoose','nCluster','Identification_RNNLoose15GeV',postfix), title='Number Of CaloTopoClusters (Et>15,RNNLoose);Number Of Clusters;Number Of Candidates',
+ xbins=40, xmin=0., xmax=40.,path=folder+"Identification/RNNLoose15GeV" )
- igroup.defineHistogram(namer('NumTracksEt15BDTLoose','NumTracks','Identification_BDTLoose15GeV',postfix), title='Number Of Tracks for Tau Candidates (Et>15,BDTLoose);Number Of Tracks;Number Of Candidates',
- xbins=21, xmin=-0.5, xmax=20.5,path=folder+"Identification/BDTLoose15GeV")
+ igroup.defineHistogram(namer('NumTracksEt15RNNLoose','NumTracks','Identification_RNNLoose15GeV',postfix), title='Number Of Tracks for Tau Candidates (Et>15,RNNLoose);Number Of Tracks;Number Of Candidates',
+ xbins=21, xmin=-0.5, xmax=20.5,path=folder+"Identification/RNNLoose15GeV")
- igroup.defineHistogram(namer('tauEtEt15BDTLoose','et','Identification_BDTLoose15GeV',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
- xbins=60, xmin=0., xmax=300.,path=folder+"Identification/BDTLoose15GeV")
+ igroup.defineHistogram(namer('tauEtEt15RNNLoose','et','Identification_RNNLoose15GeV',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
+ xbins=60, xmin=0., xmax=300.,path=folder+"Identification/RNNLoose15GeV")
- igroup.defineHistogram(namer('panModeEt15BDTLoose','panMode','Identification_BDTLoose15GeV',postfix), title='tau decay mode from panTau upon JetBDTSigMedium;mode',
- xbins=5, xmin=0., xmax=5., path=folder+"Identification/BDTLoose15GeV", xlabels=["1p0n","1p1n","1pXn","3p0n","3pXn"])
+ igroup.defineHistogram(namer('panModeEt15RNNLoose','panMode','Identification_RNNLoose15GeV',postfix), title='tau decay mode from panTau upon JetRNNSigMedium;mode',
+ xbins=5, xmin=0., xmax=5., path=folder+"Identification/RNNLoose15GeV", xlabels=["1p0n","1p1n","1pXn","3p0n","3pXn"])
igroup.defineHistogram(namer('jetSeedEta','jetSeedEta','Calo',postfix), title='Calorimeter eta of tau candidates;Eta;Numbers of Candidates',path=folder+"Calo",
xbins=50, xmin=-2.5, xmax=2.5 )
@@ -312,27 +316,18 @@ def tauMonitoringConfig(inputFlags):
igroup.defineHistogram('isolFrac,LB', type='TH2F', title='Isolation Fraction vs Lumiblock;Isolation Fraction;Lumiblock', path=folder+"Calo",
xbins=51,xmin=0,xmax=1.02,ybins=1200,ymin=0.,ymax=1200.)
- igroup.defineHistogram(namer('BDTJetScore','BDTJetScore','Identification',postfix), title='BDT Score for Jet Rejection;Boosted Decision Tree Score',path=folder+"Identification",
- xbins=48, xmin=-1.1, xmax=1.1 )
-
- igroup.defineHistogram(namer('JetBDTBkgMedium','JetBDTBkgMedium','Identification',postfix), title='Loose EleBDT',path=folder+"Identification",
- xbins=2, xmin=-0.5, xmax=1.5, xlabels=["False","True"])
-
-
- igroup.defineHistogram(namer('BDTJetScoreSigTrans','BDTJetScoreSigTrans','Identification',postfix), title='Flattened signal Transformed BDT Score for Jet Rejection;Boosted Decision Tree Score',path=folder+"Identification",
- xbins=48, xmin=0, xmax=1.1 )
igroup.defineHistogram(namer('muonVeto','muonVeto','Identification',postfix), title='Muon Veto',path=folder+"Identification",
xbins=2, xmin=-0.5, xmax=1.5, xlabels=["False","True"] )
- igroup.defineHistogram(namer('tauBDTLoose','tauBDTLoose','Identification',postfix), title='Identification Flag: tauBDTLoose',path=folder+"Identification",
+ igroup.defineHistogram(namer('tauRNNLoose','tauRNNLoose','Identification',postfix), title='Identification Flag: tauRNNLoose',path=folder+"Identification",
xbins=2, xmin=-0.5, xmax=1.5 , xlabels=["False","True"])
- igroup.defineHistogram(namer('tauBDTMedium','tauBDTMedium','Identification',postfix), title='Identification Flag: tauBDTMedium',path=folder+"Identification",
+ igroup.defineHistogram(namer('tauRNNMedium','tauRNNMedium','Identification',postfix), title='Identification Flag: tauRNNMedium',path=folder+"Identification",
xbins=2, xmin=-0.5, xmax=1.5 , xlabels=["False","True"])
- igroup.defineHistogram(namer('tauBDTTight','tauBDTTight','Identification',postfix), title='Identification Flag: tauBDTTight',path=folder+"Identification",
+ igroup.defineHistogram(namer('tauRNNTight','tauRNNTight','Identification',postfix), title='Identification Flag: tauRNNTight',path=folder+"Identification",
xbins=2, xmin=-0.5, xmax=1.5, xlabels=["False","True"])
@@ -529,9 +524,9 @@ def tauMonitoringConfig(inputFlags):
igroup.defineHistogram(namer('tauEtaEt15,tauPhiEt15','tauPhiVsEta_et15','',postfix), type='TH2F', title='EtaVsEtTitle;Eta;Phi',
xbins=30,xmin=-2.55,xmax=2.55,ybins=32,ymin=PHIMIN,ymax=PHIMAX)
- if postfix == 'HighPtBDTLoose':
+ if postfix == 'HighPtRNNLoose':
- igroup.defineHistogram(namer('tauEtaEt15BDTLoose,tauPhiEt15BDTLoose','tauPhiVsEta_et15_BDTLoose','',postfix), type='TH2F', title='Phi vs Eta (Et>15, BDTLoose) ;Eta;Phi',
+ igroup.defineHistogram(namer('tauEtaEt15RNNLoose,tauPhiEt15RNNLoose','tauPhiVsEta_et15_RNNLoose','',postfix), type='TH2F', title='Phi vs Eta (Et>15, RNNLoose) ;Eta;Phi',
xbins=30,xmin=-2.55,xmax=2.55,ybins=32,ymin=PHIMIN,ymax=PHIMAX)
@@ -596,7 +591,7 @@ if __name__=='__main__':
exampleMonitorAcc.getEventAlgo('tauMonAlgEleTrig').OutputLevel = 2 # DEBUG
exampleMonitorAcc.getEventAlgo('tauMonAlgJetTrig').OutputLevel = 2 # DEBUG
exampleMonitorAcc.getEventAlgo('tauMonAlgHighPt').OutputLevel = 2 # DEBUG
- exampleMonitorAcc.getEventAlgo('tauMonAlgHighPtBDTLoose').OutputLevel = 2 # DEBUG
+ exampleMonitorAcc.getEventAlgo('tauMonAlgHighPtRNNLoose').OutputLevel = 2 # DEBUG
cfg.printConfig(withDetails=True) # set True for exhaustive info
diff --git a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
index 8abe8007f428d749ef3462d10c18a857815c2947..a40df5ef72c4d204201d7030e8ef90af0fb1de79 100644
--- a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
+++ b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
@@ -49,8 +49,8 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto tauPhi = Monitored::Scalar<float>("tauPhi",0.0);
auto tauEt = Monitored::Scalar<float>("tauEt",0.0);
- auto tauEtEt15BDTLoose = Monitored::Scalar<float>("tauEtEt15BDTLoose",0.0);
- auto panModeEt15BDTLoose = Monitored::Scalar<float>("panModeEt15BDTLoose",0.0);
+ auto tauEtEt15RNNLoose = Monitored::Scalar<float>("tauEtEt15RNNLoose",0.0);
+ auto panModeEt15RNNLoose = Monitored::Scalar<float>("panModeEt15RNNLoose",0.0);
auto panModeSubstructure = Monitored::Scalar<float>("panModeSubstructure",0.0);
auto coreTrk = Monitored::Scalar<float>("coreTrk",0.0);
auto PtTESMVA = Monitored::Scalar<float>("PtTESMVA",0.0);
@@ -60,30 +60,31 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto tauPhiEt15 = Monitored::Scalar<float>("tauPhiEt15",0.0);
auto tauEtaEt15 = Monitored::Scalar<float>("tauEtaEt15",0.0);
- auto tauPhiEt15BDTLoose = Monitored::Scalar<float>("tauPhiEt15BDTLoose",0.0);
- auto tauEtaEt15BDTLoose = Monitored::Scalar<float>("tauEtaEt15BDTLoose",0.0);
+ auto tauPhiEt15RNNLoose = Monitored::Scalar<float>("tauPhiEt15RNNLoose",0.0);
+ auto tauEtaEt15RNNLoose = Monitored::Scalar<float>("tauEtaEt15RNNLoose",0.0);
auto tauCharge = Monitored::Scalar<int>("tauCharge",0.0);
auto RNNJetScore = Monitored::Scalar<float>("RNNJetScore",0.0);
+ auto RNNJetScoreSigTrans = Monitored::Scalar<float>("RNNJetScoreSigTrans",0.0);
auto NumTracks = Monitored::Scalar<int>("NumTracks",0.0);
- auto NumTracksEt15BDTLoose = Monitored::Scalar<int>("NumTracksEt15BDTLoose",0.0);
+ auto NumTracksEt15RNNLoose = Monitored::Scalar<int>("NumTracksEt15RNNLoose",0.0);
auto nTauCandidates = Monitored::Scalar<int>("nTauCandidates",0.0);
auto nHighPtTauCandidates = Monitored::Scalar<int>("nHighPtTauCandidates",0.0);
auto nClusters = Monitored::Scalar<int>("nClusters",0.0);
- auto nClustersEt15BDTLoose = Monitored::Scalar<int>("nClustersEt15BDTLoose",0.0);
+ auto nClustersEt15RNNLoose = Monitored::Scalar<int>("nClustersEt15RNNLoose",0.0);
- auto tauEtBDTLoose = Monitored::Scalar<float>("tauEtBDTLoose",0.0);
- auto tauEtaBDTLoose = Monitored::Scalar<float>("tauEtaBDTLoose",0.0);
- auto tauPhiBDTLoose = Monitored::Scalar<float>("tauPhiBDTLoose",0.0);
- auto NumTracksBDTLoose = Monitored::Scalar<float>("NumTracksBDTLoose",0.0);
+ auto tauEtRNNLoose = Monitored::Scalar<float>("tauEtRNNLoose",0.0);
+ auto tauEtaRNNLoose = Monitored::Scalar<float>("tauEtaRNNLoose",0.0);
+ auto tauPhiRNNLoose = Monitored::Scalar<float>("tauPhiRNNLoose",0.0);
+ auto NumTracksRNNLoose = Monitored::Scalar<float>("NumTracksRNNLoose",0.0);
- auto tauEtBDTMedium = Monitored::Scalar<float>("tauEtBDTMedium",0.0);
- auto tauEtaBDTMedium = Monitored::Scalar<float>("tauEtaBDTMedium",0.0);
- auto tauPhiBDTMedium = Monitored::Scalar<float>("tauPhiBDTMedium",0.0);
- auto NumTracksBDTMedium = Monitored::Scalar<float>("NumTracksBDTMedium",0.0);
+ auto tauEtRNNMedium = Monitored::Scalar<float>("tauEtRNNMedium",0.0);
+ auto tauEtaRNNMedium = Monitored::Scalar<float>("tauEtaRNNMedium",0.0);
+ auto tauPhiRNNMedium = Monitored::Scalar<float>("tauPhiRNNMedium",0.0);
+ auto NumTracksRNNMedium = Monitored::Scalar<float>("NumTracksRNNMedium",0.0);
auto LB = Monitored::Scalar<int>("LB",0.0);
@@ -100,16 +101,13 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto jetSeedPhi = Monitored::Scalar<float>("jetSeedPhi",0.0);
auto jetSeedPt = Monitored::Scalar<float>("jetSeedPt",0.0);
- auto BDTJetScore = Monitored::Scalar<float>("BDTJetScore",0.0);
- auto BDTJetScoreSigTrans = Monitored::Scalar<float>("BDTJetScoreSigTrans",0.0);
- auto JetBDTBkgMedium = Monitored::Scalar<float>("JetBDTBkgMedium",0.0);
auto muonVeto = Monitored::Scalar<float>("muonVeto",0.0);
- auto tauBDTLoose = Monitored::Scalar<float>("tauBDTLoose",0.0);
- auto tauBDTMedium = Monitored::Scalar<float>("tauBDTMedium",0.0);
- auto tauBDTTight = Monitored::Scalar<float>("tauBDTTight",0.0);
+ auto tauRNNLoose = Monitored::Scalar<float>("tauRNNLoose",0.0);
+ auto tauRNNMedium = Monitored::Scalar<float>("tauRNNMedium",0.0);
+ auto tauRNNTight = Monitored::Scalar<float>("tauRNNight",0.0);
auto hadLeakFracFixed = Monitored::Scalar<float>("hadLeakFracFixed",0.0);
auto PSSFrac = Monitored::Scalar<float>("PSSFrac",0.0);
@@ -208,17 +206,16 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
ptIntermediateAxis = tau->ptIntermediateAxis()/GeV;
//identification
- BDTJetScore = tau->discriminant(xAOD::TauJetParameters::BDTJetScore);
- BDTJetScoreSigTrans = tau->discriminant(xAOD::TauJetParameters::BDTJetScoreSigTrans);
RNNJetScore = tau->discriminant(xAOD::TauJetParameters::TauID::RNNJetScore);
+ RNNJetScoreSigTrans = tau->discriminant(xAOD::TauJetParameters::TauID::RNNJetScoreSigTrans);
+
- JetBDTBkgMedium = tau->isTau(xAOD::TauJetParameters::JetBDTBkgMedium);
muonVeto = tau->isTau(xAOD::TauJetParameters::MuonVeto);
- tauBDTLoose = tau->isTau(xAOD::TauJetParameters::JetBDTSigLoose);
- tauBDTMedium = tau->isTau(xAOD::TauJetParameters::JetBDTSigMedium);
- tauBDTTight = tau->isTau(xAOD::TauJetParameters::JetBDTSigTight);
+ tauRNNLoose = tau->isTau(xAOD::TauJetParameters::JetRNNSigLoose);
+ tauRNNMedium = tau->isTau(xAOD::TauJetParameters::JetRNNSigMedium);
+ tauRNNTight = tau->isTau(xAOD::TauJetParameters::JetRNNSigTight);
dRmax = tau->detail<float>(xAOD::TauJetParameters::dRmax);
EMPOverTrkSysP = tau->detail<float>(xAOD::TauJetParameters::EMPOverTrkSysP);
@@ -255,7 +252,8 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
int panModeDummy = -1 ;
int panModeSubstructureDummy = -1 ;
- const auto& trigDecTool = getTrigDecisionTool();
+ const auto* trigDecTool = (getTrigDecisionTool().empty() ?
+ nullptr : getTrigDecisionTool().operator->());
if (m_etaMin < std::abs(tauEta) && std::abs(tauEta) < m_etaMax){
nTauCandidates +=1;
@@ -265,7 +263,7 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
nHighPtTaus +=1;
}
- if (m_kinGroupName != "tauMonKinGroupHighPt"&& m_kinGroupName!="tauMonKinGroupHighPtBDTLoose"){
+ if (m_kinGroupName != "tauMonKinGroupHighPt"&& m_kinGroupName!="tauMonKinGroupHighPtRNNLoose"){
if (
(
@@ -289,49 +287,49 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
(m_kinGroupName == "tauMonKinGroupJetTrig" && trigDecTool !=0 && trigDecTool->isPassed("HLT_j[2-9][0-9]_.*"))
){
- if(m_kinGroupName != "tauMonKinGroupGlobal" && tauEt > lowerEtThreshold && tauBDTLoose){
- tauPhiEt15BDTLoose = tau->phi();
- tauEtaEt15BDTLoose = tau->eta();
- tauEtEt15BDTLoose = tau->pt()/GeV;
- nClustersEt15BDTLoose = tau->detail<int>(xAOD::TauJetParameters::numTopoClusters) ;
- NumTracksEt15BDTLoose = tau->nTracks();
+ if(m_kinGroupName != "tauMonKinGroupGlobal" && tauEt > lowerEtThreshold && tauRNNLoose){
+ tauPhiEt15RNNLoose = tau->phi();
+ tauEtaEt15RNNLoose = tau->eta();
+ tauEtEt15RNNLoose = tau->pt()/GeV;
+ nClustersEt15RNNLoose = tau->detail<int>(xAOD::TauJetParameters::numTopoClusters) ;
+ NumTracksEt15RNNLoose = tau->nTracks();
tau->panTauDetail(xAOD::TauJetParameters::PanTau_DecayMode, panModeDummy);
- panModeEt15BDTLoose = panModeDummy;
+ panModeEt15RNNLoose = panModeDummy;
fill(tool
- ,tauPhiEt15BDTLoose
- ,tauEtaEt15BDTLoose
- ,nClustersEt15BDTLoose
- ,NumTracksEt15BDTLoose
- ,tauEtEt15BDTLoose
- ,panModeEt15BDTLoose);
+ ,tauPhiEt15RNNLoose
+ ,tauEtaEt15RNNLoose
+ ,nClustersEt15RNNLoose
+ ,NumTracksEt15RNNLoose
+ ,tauEtEt15RNNLoose
+ ,panModeEt15RNNLoose);
}
- if(m_kinGroupName != "tauMonKinGroupGlobal" && tauBDTLoose){
- tauPhiBDTLoose = tau->phi();
- tauEtaBDTLoose = tau->eta();
- tauEtBDTLoose = tau->pt()/GeV;
- NumTracksBDTLoose = tau->nTracks();
+ if(m_kinGroupName != "tauMonKinGroupGlobal" && tauRNNLoose){
+ tauPhiRNNLoose = tau->phi();
+ tauEtaRNNLoose = tau->eta();
+ tauEtRNNLoose = tau->pt()/GeV;
+ NumTracksRNNLoose = tau->nTracks();
fill(tool
- ,tauPhiBDTLoose
- ,tauEtaBDTLoose
- ,NumTracksBDTLoose
- ,tauEtBDTLoose);
+ ,tauPhiRNNLoose
+ ,tauEtaRNNLoose
+ ,NumTracksRNNLoose
+ ,tauEtRNNLoose);
}
- if(m_kinGroupName != "tauMonKinGroupGlobal" && tauBDTMedium){
- tauPhiBDTMedium = tau->phi();
- tauEtaBDTMedium = tau->eta();
- tauEtBDTMedium = tau->pt()/GeV;
- NumTracksBDTMedium = tau->nTracks();
+ if(m_kinGroupName != "tauMonKinGroupGlobal" && tauRNNMedium){
+ tauPhiRNNMedium = tau->phi();
+ tauEtaRNNMedium = tau->eta();
+ tauEtRNNMedium = tau->pt()/GeV;
+ NumTracksRNNMedium = tau->nTracks();
fill(tool
- ,tauPhiBDTMedium
- ,tauEtaBDTMedium
- ,NumTracksBDTMedium
- ,tauEtBDTMedium);
+ ,tauPhiRNNMedium
+ ,tauEtaRNNMedium
+ ,NumTracksRNNMedium
+ ,tauEtRNNMedium);
}
@@ -461,15 +459,12 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
,etEMAtEMScale
,etHadAtEMScale
,tauCharge
- ,BDTJetScore
- ,BDTJetScoreSigTrans
- ,JetBDTBkgMedium
,RNNJetScore
+ ,RNNJetScoreSigTrans
,muonVeto
- ,tauBDTLoose
- ,tauBDTMedium
- ,tauBDTTight
- ,BDTJetScore
+ ,tauRNNLoose
+ ,tauRNNMedium
+ ,tauRNNTight
,PSSFrac
,hadLeakFracFixed
,etHotShotWinOverPtLeadTrk
@@ -513,20 +508,20 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
fill(tool,LB,tauPhiEt15,tauEtaEt15);
}
- if ((m_kinGroupName == "tauMonKinGroupHighPtBDTLoose") && tauEt > lowerEtThreshold &&tauBDTLoose){
- tauPhiEt15BDTLoose = tau->phi();
- tauEtaEt15BDTLoose = tau->eta();
- tauEtEt15BDTLoose = tau->pt()/GeV; //GeV
+ if ((m_kinGroupName == "tauMonKinGroupHighPtRNNLoose") && tauEt > lowerEtThreshold &&tauRNNLoose){
+ tauPhiEt15RNNLoose = tau->phi();
+ tauEtaEt15RNNLoose = tau->eta();
+ tauEtEt15RNNLoose = tau->pt()/GeV; //GeV
- nClustersEt15BDTLoose = tau->detail<int>(xAOD::TauJetParameters::numTopoClusters) ;
- NumTracksEt15BDTLoose = tau->nTracks();
+ nClustersEt15RNNLoose = tau->detail<int>(xAOD::TauJetParameters::numTopoClusters) ;
+ NumTracksEt15RNNLoose = tau->nTracks();
fill(tool
,LB
- ,tauPhiEt15BDTLoose
- ,tauEtaEt15BDTLoose
- ,nClustersEt15BDTLoose
- ,NumTracksEt15BDTLoose
- ,tauEtEt15BDTLoose);
+ ,tauPhiEt15RNNLoose
+ ,tauEtaEt15RNNLoose
+ ,nClustersEt15RNNLoose
+ ,NumTracksEt15RNNLoose
+ ,tauEtEt15RNNLoose);
}
}
}
diff --git a/Reconstruction/tauRec/src/TauThinningAlg.cxx b/Reconstruction/tauRec/src/TauThinningAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..cc7bb45e63821ea08f14ec3eaee26c006e8fc46c
--- /dev/null
+++ b/Reconstruction/tauRec/src/TauThinningAlg.cxx
@@ -0,0 +1,135 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
+*/
+
+#include "TauThinningAlg.h"
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/ThinningHandle.h"
+#include "tauRecTools/HelperFunctions.h"
+
+/**
+ * @brief Gaudi initialize method.
+ */
+StatusCode TauThinningAlg::initialize()
+{
+ ATH_CHECK( m_taus.initialize(m_streamName) );
+ ATH_CHECK( m_tauTracks.initialize(m_streamName) );
+ ATH_CHECK( m_neutralPFOs.initialize(m_streamName) );
+ ATH_CHECK( m_pi0clusters.initialize(m_streamName) );
+ ATH_CHECK( m_pi0CellLinks.initialize(m_streamName) );
+ ATH_CHECK( m_finalPi0s.initialize(m_streamName) );
+ ATH_CHECK( m_shotPFOs.initialize(m_streamName) );
+ ATH_CHECK( m_shotclusters.initialize(m_streamName) );
+ ATH_CHECK( m_shotCellLinks.initialize(m_streamName) );
+ ATH_CHECK( m_hadronicPFOs.initialize(m_streamName) );
+ ATH_CHECK( m_secondaryVertices.initialize(m_streamName) );
+
+ return StatusCode::SUCCESS;
+}
+
+/**
+ * @brief Execute the algorithm.
+ * @param ctx Current event context.
+ */
+StatusCode TauThinningAlg::execute (const EventContext& ctx) const
+{
+ SG::ThinningHandle<xAOD::TauJetContainer> taus (m_taus, ctx);
+ taus.thinAll();
+
+ SG::ThinningHandle<xAOD::TauTrackContainer> tauTracks (m_tauTracks, ctx);
+ tauTracks.thinAll();
+
+ SG::ThinningHandle<xAOD::PFOContainer> neutralPFOs (m_neutralPFOs, ctx);
+ neutralPFOs.thinAll();
+
+ SG::ThinningHandle<xAOD::CaloClusterContainer> pi0clusters (m_pi0clusters, ctx);
+ pi0clusters.thinAll();
+
+ SG::ThinningHandle<CaloClusterCellLinkContainer> pi0CellLinks (m_pi0CellLinks, ctx);
+ pi0CellLinks.thinAll();
+
+ SG::ThinningHandle<xAOD::ParticleContainer> finalPi0s (m_finalPi0s, ctx);
+ finalPi0s.thinAll();
+
+ SG::ThinningHandle<xAOD::PFOContainer> shotPFOs (m_shotPFOs, ctx);
+ shotPFOs.thinAll();
+
+ SG::ThinningHandle<xAOD::CaloClusterContainer> shotclusters (m_shotclusters, ctx);
+ shotclusters.thinAll();
+
+ SG::ThinningHandle<CaloClusterCellLinkContainer> shotCellLinks (m_shotCellLinks, ctx);
+ shotCellLinks.thinAll();
+
+ SG::ThinningHandle<xAOD::PFOContainer> hadronicPFOs (m_hadronicPFOs, ctx);
+ hadronicPFOs.thinAll();
+
+ SG::ThinningHandle<xAOD::VertexContainer> secondaryVertices (m_secondaryVertices, ctx);
+ secondaryVertices.thinAll();
+
+ for (const xAOD::TauJet* tau : *taus) {
+
+ if(tau->pt() < m_minTauPt) continue;
+
+ // keep tau
+ taus.keep(tau->index());
+
+ // keep tau tracks
+ for(const xAOD::TauTrack* track : tau->allTracks()) {
+ tauTracks.keep(track->index());
+ }
+
+ // keep neutral PFOs, pi0 clusters and cell links
+ for(size_t i=0; i<tau->nNeutralPFOs(); i++) {
+ neutralPFOs.keep(tau->neutralPFO(i)->index());
+
+ const xAOD::CaloCluster* cluster = tau->neutralPFO(i)->cluster(0);
+ pi0clusters.keep(cluster->index());
+
+ const CaloClusterCellLink* cellLinks = cluster->getCellLinks();
+ CaloClusterCellLinkContainer::const_iterator cellLinks_it = std::find(pi0CellLinks->begin(), pi0CellLinks->end(), cellLinks);
+ if(cellLinks_it != pi0CellLinks->end()) {
+ size_t link_index = std::distance(pi0CellLinks->begin(), cellLinks_it);
+ pi0CellLinks.keep(link_index);
+ }
+ else {
+ ATH_MSG_WARNING( "Could not find cluster cell link in " << m_pi0CellLinks.key() << ", won't be saved in xAOD." );
+ }
+ }
+
+ // keep final pi0s
+ for(size_t i=0; i<tau->nPi0s(); i++) {
+ finalPi0s.keep(tau->pi0(i)->index());
+ }
+
+ // keep shot PFOs, clusters and cell links
+ for(size_t i=0; i<tau->nShotPFOs(); i++) {
+ shotPFOs.keep(tau->shotPFO(i)->index());
+
+ const xAOD::CaloCluster* cluster = tau->shotPFO(i)->cluster(0);
+ shotclusters.keep(cluster->index());
+
+ const CaloClusterCellLink* cellLinks = cluster->getCellLinks();
+ CaloClusterCellLinkContainer::const_iterator cellLinks_it = std::find(shotCellLinks->begin(), shotCellLinks->end(), cellLinks);
+ if(cellLinks_it != shotCellLinks->end()) {
+ size_t link_index = std::distance(shotCellLinks->begin(), cellLinks_it);
+ shotCellLinks.keep(link_index);
+ }
+ else {
+ ATH_MSG_WARNING( "Could not find cluster cell link in " << m_shotCellLinks.key() << ", won't be saved in xAOD." );
+ }
+ }
+
+ // keep hadronic PFOs
+ for(size_t i=0; i<tau->nHadronicPFOs(); i++) {
+ hadronicPFOs.keep(tau->hadronicPFO(i)->index());
+ }
+
+ // keep secondary vertex when present
+ static const SG::AuxElement::ConstAccessor< ElementLink< xAOD::VertexContainer > > secondaryVertexAcc( "secondaryVertexLink" );
+ if(secondaryVertexAcc(*tau)) {
+ secondaryVertices.keep(tau->secondaryVertex()->index());
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Reconstruction/tauRec/src/TauThinningAlg.h b/Reconstruction/tauRec/src/TauThinningAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..7636fa474c9585dc697e7e2bab12c258eb117409
--- /dev/null
+++ b/Reconstruction/tauRec/src/TauThinningAlg.h
@@ -0,0 +1,98 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
+*/
+
+#ifndef TAUREC_TAUTHINNING_H
+#define TAUREC_TAUTHINNING_H
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "xAODTau/TauJetContainer.h"
+#include "xAODTau/TauTrackContainer.h"
+#include "xAODPFlow/PFOContainer.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "CaloEvent/CaloClusterCellLinkContainer.h"
+#include "xAODTracking/VertexContainer.h"
+#include "xAODParticleEvent/ParticleContainer.h"
+#include "StoreGate/ThinningHandleKey.h"
+#include "GaudiKernel/SystemOfUnits.h"
+
+/**
+ * @brief Thin taus below a minimum pt threshold
+ *
+ * Thinning algorithm that removes entries from all tau-related containers for tau candidates below a minimum pt threshold
+ */
+class TauThinningAlg : public AthReentrantAlgorithm
+{
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+
+ public:
+
+ /**
+ * @brief Gaudi initialize method.
+ */
+ virtual StatusCode initialize() override;
+
+ /**
+ * @brief Execute the algorithm.
+ * @param ctx Current event context.
+ */
+ virtual StatusCode execute(const EventContext& ctx) const override;
+
+
+ private:
+
+ // tau pt threshold (pt = ptFinalCalib as TauThinning is run after tau reconstruction)
+ Gaudi::Property<double> m_minTauPt
+ { this, "MinTauPt", 0.* Gaudi::Units::GeV, "Minimum tau pt" };
+
+ // Name of the stream being thinned
+ StringProperty m_streamName
+ { this, "StreamName", "StreamAOD", "Name of the stream being thinned" };
+
+ // Tau container to thin
+ SG::ThinningHandleKey<xAOD::TauJetContainer> m_taus
+ { this, "Taus", "TauJets", "Tau container to thin" };
+
+ // Tau track container to thin
+ SG::ThinningHandleKey<xAOD::TauTrackContainer> m_tauTracks
+ { this, "TauTracks", "TauTracks", "Tau track container to thin" };
+
+ // Tau neutral PFO container to thin
+ SG::ThinningHandleKey<xAOD::PFOContainer> m_neutralPFOs
+ { this, "TauNeutralPFOs", "TauNeutralParticleFlowObjects", "Tau neutral PFO container to thin" };
+
+ // Tau pi0 cluster container to thin
+ SG::ThinningHandleKey<xAOD::CaloClusterContainer> m_pi0clusters
+ { this, "TauPi0Clusters", "TauPi0Clusters", "Tau pi0 cluster container to thin" };
+
+ // Tau pi0 cluster cell link container to thin
+ SG::ThinningHandleKey<CaloClusterCellLinkContainer> m_pi0CellLinks
+ { this, "Pi0CellLinks", "TauPi0Clusters_links", "Tau pi0 cluster cell link container to thin" };
+
+ // Tau final pi0 container to thin
+ SG::ThinningHandleKey<xAOD::ParticleContainer> m_finalPi0s
+ { this, "TauFinalPi0s", "TauFinalPi0s", "Tau final pi0 container to thin" };
+
+ // Tau shot PFO container to thin
+ SG::ThinningHandleKey<xAOD::PFOContainer> m_shotPFOs
+ { this, "TauShotPFOs", "TauShotParticleFlowObjects", "Tau shot PFO container to thin" };
+
+ // Tau shot cluster container to thin
+ SG::ThinningHandleKey<xAOD::CaloClusterContainer> m_shotclusters
+ { this, "TauShotClusters", "TauShotClusters", "Tau shot cluster container to thin" };
+
+ // Tau shot cluster cell link container to thin
+ SG::ThinningHandleKey<CaloClusterCellLinkContainer> m_shotCellLinks
+ { this, "ShotCellLinks", "TauShotClusters_links", "Tau shot cluster cell link container to thin" };
+
+ // Tau hadronic PFO container to thin
+ SG::ThinningHandleKey<xAOD::PFOContainer> m_hadronicPFOs
+ { this, "TauHadronicPFOs", "TauHadronicParticleFlowObjects", "Tau hadronic PFO container to thin" };
+
+ // Tau secondary vertex container to thin
+ SG::ThinningHandleKey<xAOD::VertexContainer> m_secondaryVertices
+ { this, "TauSecondaryVertices", "TauSecondaryVertices", "Tau secondary vertex container to thin" };
+
+};
+
+#endif // not TAUREC_TAUTHINNING_H
diff --git a/Reconstruction/tauRec/src/components/tauRec_entries.cxx b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
index b95afa30f2c1cbfe0e31416300252f613e446658..65c3f697d17e3b05642ffaa4cdd1416b667409b3 100644
--- a/Reconstruction/tauRec/src/components/tauRec_entries.cxx
+++ b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
@@ -2,8 +2,10 @@
#include "../TauRunnerAlg.h"
#include "../TauCellThinningAlg.h"
#include "../ClusterCellRelinkAlg.h"
+#include "../TauThinningAlg.h"
DECLARE_COMPONENT( TauProcessorAlg )
DECLARE_COMPONENT( TauRunnerAlg )
DECLARE_COMPONENT( TauCellThinningAlg )
DECLARE_COMPONENT( ClusterCellRelinkAlg )
+DECLARE_COMPONENT( TauThinningAlg )
diff --git a/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx b/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
index 25c566020dfe15eebeedf070273ea24493d8e13d..f032164f3e20d73d6b0297b60a19b1beacf0cbf2 100644
--- a/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
+++ b/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// local include(s)
@@ -32,7 +32,6 @@ StatusCode MvaTESVariableDecorator::initialize() {
StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
- // Decorate event info
// need to check mu can be retrieved via EventInfo for Run3 trigger
int mu = 0;
SG::ReadDecorHandle<xAOD::EventInfo, float> eventInfoDecorHandle( m_aveIntPerXKey );
@@ -45,7 +44,6 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
int nVtxPU = 0;
if(!m_vertexContainerKey.empty()) {
- // Get the primary vertex container from StoreGate
SG::ReadHandle<xAOD::VertexContainer> vertexInHandle( m_vertexContainerKey );
if (!vertexInHandle.isValid()) {
ATH_MSG_WARNING ("Could not retrieve HiveDataObj with key " << vertexInHandle.key() << ", will set nVtxPU=0.");
@@ -59,13 +57,12 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
}
}
- SG::AuxElement::Accessor<float> acc_mu("mu");
- SG::AuxElement::Accessor<int> acc_nVtxPU("nVtxPU");
+ static const SG::AuxElement::Accessor<float> acc_mu("mu");
+ static const SG::AuxElement::Accessor<int> acc_nVtxPU("nVtxPU");
acc_mu(xTau) = mu;
acc_nVtxPU(xTau) = nVtxPU;
- // Decorate jet seed variables
double center_lambda=0. , first_eng_dens=0. , em_probability=0. , second_lambda=0. ;
double mean_center_lambda=0. , mean_first_eng_dens=0. , mean_em_probability=0. , mean_second_lambda=0. ;
double mean_presampler_frac=0., lead_cluster_frac = 0. ;
@@ -116,7 +113,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
mean_presampler_frac += (cluster.eSample(CaloSampling::PreSamplerB) + cluster.eSample(CaloSampling::PreSamplerE));
}
- // ----calculate mean values
+ // calculate mean values
if(Etot>0.) {
mean_center_lambda /= Etot;
mean_first_eng_dens /= Etot;
@@ -125,7 +122,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
mean_presampler_frac /= Etot;
lead_cluster_frac /= Etot;
- mean_first_eng_dens = TMath::Log10(mean_first_eng_dens/Etot);
+ if(mean_first_eng_dens>0.) mean_first_eng_dens = TMath::Log10(mean_first_eng_dens/Etot);
}
// cluster-based upsilon, ranges from -1 to 1
@@ -133,18 +130,18 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
if(clusters_had_P4.E()+clusters_EM_P4.E()!=0.)
upsilon_cluster = (clusters_had_P4.E()-clusters_EM_P4.E())/(clusters_had_P4.E()+clusters_EM_P4.E());
- // ----decorating jet seed information to tau
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanCenterLambda, (float) mean_center_lambda);
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanFirstEngDens, (float) mean_first_eng_dens);
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanEMProbability, (float) mean_em_probability);
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanSecondLambda, (float) mean_second_lambda);
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanPresamplerFrac, (float) mean_presampler_frac);
- SG::AuxElement::Accessor<float> acc_ClusterTotalEnergy("ClusterTotalEnergy");
+
+ static const SG::AuxElement::Accessor<float> acc_ClusterTotalEnergy("ClusterTotalEnergy");
acc_ClusterTotalEnergy(xTau) = (float) Etot;
// online-specific, not defined in TauDefs enum
- SG::AuxElement::Accessor<float> acc_LeadClusterFrac("LeadClusterFrac");
- SG::AuxElement::Accessor<float> acc_UpsilonCluster("UpsilonCluster");
+ static const SG::AuxElement::Accessor<float> acc_LeadClusterFrac("LeadClusterFrac");
+ static const SG::AuxElement::Accessor<float> acc_UpsilonCluster("UpsilonCluster");
acc_LeadClusterFrac(xTau) = (float) lead_cluster_frac;
acc_UpsilonCluster(xTau) = (float) upsilon_cluster;
@@ -152,7 +149,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
return StatusCode::SUCCESS;
}
- // ----retrieve Ghost Muon Segment Count (for punch-through studies)
+ // retrieve Ghost Muon Segment Count (for punch-through studies)
if (! xTau.jetLink().isValid()) {
ATH_MSG_ERROR("Tau jet link is invalid.");
return StatusCode::FAILURE;
@@ -163,7 +160,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
if(!jetSeed->getAttribute<int>("GhostMuonSegmentCount", nMuSeg)) nMuSeg=0;
xTau.setDetail(xAOD::TauJetParameters::GhostMuonSegmentCount, nMuSeg);
- // ----summing corrected Pi0 PFO energies
+ // summing corrected Pi0 PFO energies
TLorentzVector Pi0_totalP4;
Pi0_totalP4.SetPtEtaPhiM(0,0,0,0);
@@ -173,7 +170,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
double Pi0_totalE = Pi0_totalP4.E();
- // ----summing charged PFO energies
+ // summing charged PFO energies
TLorentzVector charged_totalP4;
charged_totalP4.SetPtEtaPhiM(0,0,0,0);
@@ -183,9 +180,9 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
double charged_totalE = charged_totalP4.E();
- // ----calculate relative difference and decorate to tau
+ // calculate relative difference and decorate onto tau
double relDiff=0.;
- if(Pi0_totalE+charged_totalE){
+ if(Pi0_totalE+charged_totalE != 0.){
relDiff = (charged_totalE - Pi0_totalE) / (charged_totalE + Pi0_totalE) ;
}
xTau.setDetail(xAOD::TauJetParameters::PFOEngRelDiff, (float) relDiff);
diff --git a/Reconstruction/tauRecTools/src/TauTrackFinder.cxx b/Reconstruction/tauRecTools/src/TauTrackFinder.cxx
index 18dac06cc77585f14acc34a2093160ede275c4a5..cfbd16fc26e3a3885f8c640cf6c42ab782bd1161 100644
--- a/Reconstruction/tauRecTools/src/TauTrackFinder.cxx
+++ b/Reconstruction/tauRecTools/src/TauTrackFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAOD_ANALYSIS
@@ -7,7 +7,6 @@
#include "TrkParametersIdentificationHelpers/TrackParametersIdHelper.h"
#include "xAODTau/TauJet.h"
-#include "xAODTau/TauJetContainer.h"
#include "xAODTau/TauTrackContainer.h"
#include "TauTrackFinder.h"
@@ -208,6 +207,8 @@ StatusCode TauTrackFinder::executeTrackFinder(xAOD::TauJet& pTau, xAOD::TauTrack
//These are set again in TauTrackClassifier
pTau.setDetail(xAOD::TauJetParameters::nChargedTracks, (int) pTau.nTracks());
pTau.setDetail(xAOD::TauJetParameters::nIsolatedTracks, (int) pTau.nTracks(xAOD::TauJetParameters::classifiedIsolation));
+ // keep track of total number of associated tracks, in case of tau track thinning
+ pTau.setDetail(xAOD::TauJetParameters::nAllTracks, (int) pTau.nAllTracks());
for (unsigned int i = 0; i < otherTracks.size(); ++i) {
const xAOD::TrackParticle* trackParticle = otherTracks.at(i);
@@ -295,8 +296,7 @@ StatusCode TauTrackFinder::executeTrackFinder(xAOD::TauJet& pTau, xAOD::TauTrack
// store information only in ExtraDetailsContainer
if(!m_bypassExtrapolator)
{
- StatusCode sc;
- sc = extrapolateToCaloSurface(pTau);
+ StatusCode sc = extrapolateToCaloSurface(pTau);
if (sc.isFailure() && !sc.isRecoverable()) {
ATH_MSG_ERROR("couldn't extrapolate tracks to calo surface");
return StatusCode::FAILURE;
@@ -530,7 +530,7 @@ float TauTrackFinder::getZ0(const xAOD::TrackParticle* track, const xAOD::Vertex
if (!track) return MAX;
- const Trk::Perigee* perigee = 0;
+ const Trk::Perigee* perigee = nullptr;
if (vertex) perigee = m_trackToVertexTool->perigeeAtVertex(*track, vertex->position());
else perigee = m_trackToVertexTool->perigeeAtVertex(*track); //will use beamspot or 0,0,0 instead
@@ -553,7 +553,7 @@ bool TauTrackFinder::isLargeD0Track(const xAOD::TrackParticle* track) const
ATH_MSG_DEBUG("LargeD0Track found");
return true;
}
- return false;
+ return false;
}
#endif
diff --git a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
index 4a7ac7cb8306a1e7eaa59e694a2c936ca99be7a1..bdb8d282cd049346d5dcf8b7efad246bd458e27e 100644
--- a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
+++ b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
@@ -51,7 +51,6 @@ namespace SimTesting {
protected:
virtual void SetUp() override {
m_alg = new Simulation::BeamEffectsAlg{"BeamEffectsAlg", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/Simulation/Digitization/python/DigitizationConfigFlags.py b/Simulation/Digitization/python/DigitizationConfigFlags.py
index 9bd2e33ff737f667d4c49bc24e0e364e21fda3ee..b89326551cc61149148edab42e7e275e486888b8 100644
--- a/Simulation/Digitization/python/DigitizationConfigFlags.py
+++ b/Simulation/Digitization/python/DigitizationConfigFlags.py
@@ -140,9 +140,6 @@ def createDigitizationCfgFlags():
flags.addFlag("Digitization.PU.NumberOfCavern", 0.0)
# Repeating pattern to determine which events to simulate when using Stepping Cache
flags.addFlag("Digitization.PU.SignalPatternForSteppingCache", [])
- # Configure EvtIdModifierSvc with a list of dictionaries of the form:
- # {'run': 152166, 'lb': 202, 'starttstamp': 1269948352889940910, 'dt': 104.496, 'evts': 1, 'mu': 0.005, 'force_new': False}
- flags.addFlag("Digitization.PU.RunAndLumiOverrideList", [])
return flags
diff --git a/Simulation/Digitization/python/DigitizationParametersConfig.py b/Simulation/Digitization/python/DigitizationParametersConfig.py
index 87f1fc7848f82c7dd1a44dd9e4050abce941e975..07779269ecc5c26c723cc13d89d36e9cec0f9cd1 100644
--- a/Simulation/Digitization/python/DigitizationParametersConfig.py
+++ b/Simulation/Digitization/python/DigitizationParametersConfig.py
@@ -1,27 +1,13 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from AthenaKernel.EventIdOverrideConfig import getMinMaxRunNumbers
from AthenaCommon.Logging import logging
logDigitizationWriteMetadata = logging.getLogger( 'DigitizationParametersConfig' )
-myRunNumber = 0
-myEndRunNumber = 2147483647 # the max run number
-
-def getRunNumberRangeForOutputMetadata(ConfigFlags):
- myRunNumber = ConfigFlags.Input.RunNumber[0]
- myEndRunNumber = 2147483647 # the max run number
-
- if myRunNumber > 0 :
- logDigitizationWriteMetadata.info('Found Run Number %s in hits file metadata.', str(myRunNumber) )
- myEndRunNumber = myRunNumber+1 # got a reasonable run number so set end run to be the next run after this one.
- else :
- logDigitizationWriteMetadata.info('Found unexpected Run Number %s in hits file metadata. Not overriding RunNumber to match hits file for this job.', str(myRunNumber) )
- myRunNumber = 0
- return myRunNumber, myEndRunNumber
-
def writeDigitizationMetadata(ConfigFlags):
from IOVDbMetaDataTools import ParameterDbFiller
dbFiller = ParameterDbFiller.ParameterDbFiller()
- myRunNumber, myEndRunNumber = getRunNumberRangeForOutputMetadata(ConfigFlags)
+ myRunNumber, myEndRunNumber = getMinMaxRunNumbers(ConfigFlags)
logDigitizationWriteMetadata.debug('ParameterDbFiller BeginRun = %s', str(myRunNumber) )
dbFiller.setBeginRun(myRunNumber)
logDigitizationWriteMetadata.debug('ParameterDbFiller EndRun = %s', str(myEndRunNumber) )
diff --git a/Simulation/Digitization/python/PileUpConfigNew.py b/Simulation/Digitization/python/PileUpConfigNew.py
index 72194f7b362e3679e982a3a2e75ee9e8a38c3c21..691d9ed1002194e7a242bad98b926ca2bb68073f 100644
--- a/Simulation/Digitization/python/PileUpConfigNew.py
+++ b/Simulation/Digitization/python/PileUpConfigNew.py
@@ -311,7 +311,7 @@ def PileUpEventLoopMgrCfg(flags, name="PileUpEventLoopMgr", **kwargs):
kwargs.setdefault("firstXing", flags.Digitization.PU.InitialBunchCrossing)
kwargs.setdefault("lastXing", flags.Digitization.PU.FinalBunchCrossing)
- if flags.Digitization.PU.RunAndLumiOverrideList:
+ if flags.Input.RunAndLumiOverrideList:
kwargs.setdefault("MaxMinBiasCollPerXing", maxNevtsPerXing(flags))
acc.merge(LumiProfileSvcCfg(flags))
kwargs.setdefault("BeamLuminosity", acc.getService("LumiProfileSvc"))
diff --git a/Simulation/Digitization/python/RunDependentConfigNew.py b/Simulation/Digitization/python/RunDependentConfigNew.py
index 8aa31ec86093535dd3e094d90c7bae1e60fa1c11..84273ffbe66029ffeb4b2bd167866876494a117b 100644
--- a/Simulation/Digitization/python/RunDependentConfigNew.py
+++ b/Simulation/Digitization/python/RunDependentConfigNew.py
@@ -8,74 +8,10 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
# Auxiliary
-def add_modifier(run_nbr=None, evt_nbr=None, time_stamp=None, lbk_nbr=None, nevts=1):
-
- if run_nbr is None:
- modify_run_nbr = 0
- run_nbr = 0
- else:
- modify_run_nbr = 1
-
- if evt_nbr is None:
- modify_evt_nbr = 0
- evt_nbr = 0
- else:
- modify_evt_nbr = 1
-
- if time_stamp is None:
- modify_time_stamp = 0
- time_stamp = 0
- else:
- modify_time_stamp = 1
-
- if lbk_nbr is None:
- modify_lbk_nbr = 0
- lbk_nbr = 0
- else:
- modify_lbk_nbr = 1
-
- mod_bit = int(0b0000
- | (modify_run_nbr << 0)
- | (modify_evt_nbr << 1)
- | (modify_time_stamp << 2)
- | (modify_lbk_nbr << 3))
-
- return [run_nbr, evt_nbr, time_stamp, lbk_nbr, nevts, mod_bit]
-
-
-def buildListOfModifiers(flags):
- # migrated from RunDMCFlags.py
- Modifiers = []
- pDicts = flags.Digitization.PU.RunAndLumiOverrideList
- DataRunNumber = flags.Digitization.DataRunNumber
-
- if pDicts:
- for el in pDicts:
- evt_nbr = el.get("evt_nbr", None)
- Modifiers += add_modifier(run_nbr=el["run"], evt_nbr=evt_nbr, time_stamp=el["starttstamp"], lbk_nbr=el["lb"], nevts=el["evts"])
- elif DataRunNumber:
- assert DataRunNumber >= 0, (
- "flags.Digitization.DataRunNumber %d is negative. "
- "Use a real run number from data." % DataRunNumber)
-
- # Using event numbers to avoid "some very large number" setting
- totalNumber = 1000000
- if flags.Exec.MaxEvents > 0:
- totalNumber = flags.Exec.MaxEvents + 1
- if flags.Exec.SkipEvents > 0:
- totalNumber += flags.Exec.SkipEvents
-
- InitialTimeStamp = flags.Sim.RunToTimestampDict.get(DataRunNumber, 1)
-
- FirstLB = 1
- Modifiers += add_modifier(run_nbr=DataRunNumber, lbk_nbr=FirstLB, time_stamp=InitialTimeStamp, nevts=totalNumber)
- return Modifiers
-
-
def maxNevtsPerXing(flags):
"""Return the largest minbias pileup value, for PileUpEvtLoopMgr caches"""
# migrated from DigitizationFlags.py
- pDicts = flags.Digitization.PU.RunAndLumiOverrideList
+ pDicts = flags.Input.RunAndLumiOverrideList
return max(element["mu"] for element in pDicts)
@@ -83,7 +19,7 @@ def runLumiListAndScaleFactorLists(flags):
# migrated from DigitizationFlags.py
runLumiList = []
scaleFactorList = []
- pDicts = flags.Digitization.PU.RunAndLumiOverrideList
+ pDicts = flags.Input.RunAndLumiOverrideList
MaxCollisionsPerXing = maxNevtsPerXing(flags)
for element in pDicts:
run = element["run"]
@@ -99,22 +35,6 @@ def runLumiListAndScaleFactorLists(flags):
# Config
-def EvtIdModifierSvcCfg(flags, name="EvtIdModifierSvc", **kwargs):
- acc = ComponentAccumulator()
-
- if flags.Sim.DoFullChain:
- kwargs.setdefault("EvtStoreName", "OriginalEvent_SG")
- else:
- kwargs.setdefault("EvtStoreName", "StoreGateSvc")
-
- Modifiers = buildListOfModifiers(flags)
- if len(Modifiers) > 0:
- kwargs.setdefault("Modifiers", Modifiers)
-
- acc.addService(CompFactory.EvtIdModifierSvc(name, **kwargs), create=True)
- return acc
-
-
def LumiProfileSvcCfg(flags, name="LumiProfileSvc", **kwargs):
acc = ComponentAccumulator()
runLumiList, scaleFactorList = runLumiListAndScaleFactorLists(flags)
diff --git a/Simulation/Digitization/share/LVL1Digitization.py b/Simulation/Digitization/share/LVL1Digitization.py
index 08b7003db7c407720f0e616445c8ea14ee9aefeb..92f0ce869753f8ba3e3ff03f349ba913a5ed40ec 100755
--- a/Simulation/Digitization/share/LVL1Digitization.py
+++ b/Simulation/Digitization/share/LVL1Digitization.py
@@ -114,8 +114,13 @@ if DetFlags.digitize.LVL1_on():
# TrigT1Muctpi Algos
#--------------------------------------------------------------
if DetFlags.simulateLVL1.RPC_on() or DetFlags.simulateLVL1.TGC_on():
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
- topSequence += L1Muctpi()
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1
+ topSequence += L1MuctpiPhase1()
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
+ topSequence += L1Muctpi()
#-------------------------------------------------------
# TrigT1CaloSim Algos
diff --git a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
index 74545bff07333b3b15196f3829c88466c493d4b1..6f34bdafd0d2e2a8c7c2002fc436b7aa1579cb9b 100755
--- a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
@@ -126,7 +126,7 @@ ConfigFlags.Tile.correctTime = False
ConfigFlags.lock()
# test this flag
-ConfigFlags.Sim.RunToTimestampDict
+ConfigFlags.IOVDb.RunToTimestampDict
# Core components
acc = MainServicesCfg(ConfigFlags)
diff --git a/Simulation/G4Atlas/G4AtlasApps/python/G4Atlas_MetadataNew.py b/Simulation/G4Atlas/G4AtlasApps/python/G4Atlas_MetadataNew.py
index f075b62cf8440aee82b94af16c38f39da67b2ae6..d37613c34c0b8952b1469fed909df6e694e4072e 100644
--- a/Simulation/G4Atlas/G4AtlasApps/python/G4Atlas_MetadataNew.py
+++ b/Simulation/G4Atlas/G4AtlasApps/python/G4Atlas_MetadataNew.py
@@ -2,6 +2,7 @@
### This module contains functions which may need to peek at the input file metadata
+from AthenaKernel.EventIdOverrideConfig import getMinMaxRunNumbers
## Get the logger
from AthenaCommon.Logging import logging
simMDlog = logging.getLogger('Sim_Metadata')
@@ -26,7 +27,6 @@ def fillAtlasMetadata(ConfigFlags, dbFiller):
#---------
## Simulated detector flags: add each enabled detector to the simulatedDetectors list
- from AthenaCommon.DetFlags import DetFlags # noqa: F401
simDets = []
for det in ['Pixel','SCT','TRT','BCM','Lucid','ZDC','ALFA','AFP','FwdRegion','LAr','HGTD','Tile','MDT','CSC','TGC','RPC','MM','sTGC','Truth','LVL1']:
attrname = "Detector.Geometry"+det
@@ -50,22 +50,10 @@ def fillISFMetadata(dbFiller):
dbFiller.addSimParam('Simulator', ISF_Flags.Simulator())
-def getRunNumberRangeForOutputMetadata(ConfigFlags):
- myRunNumber = ConfigFlags.Input.RunNumber[0]
- myEndRunNumber = 2147483647 # the max run number
-
- #if myRunNumber > 0 :
- # simMDlog.info('Found Run Number %s in hits file metadata.', str(myRunNumber) )
- # myEndRunNumber = myRunNumber+1 # got a reasonable run number so set end run to be the next run after this one.
- #else :
- # simMDlog.info('Found unexpected Run Number %s in hits file metadata. Not overriding RunNumber to match hits file for this job.', str(myRunNumber) )
- # myRunNumber = 0
- return myRunNumber, myEndRunNumber
-
def writeSimulationParametersMetadata(ConfigFlags):
from IOVDbMetaDataTools import ParameterDbFiller
dbFiller = ParameterDbFiller.ParameterDbFiller()
- myRunNumber, myEndRunNumber = getRunNumberRangeForOutputMetadata(ConfigFlags)
+ myRunNumber, myEndRunNumber = getMinMaxRunNumbers(ConfigFlags)
simMDlog.debug('ParameterDbFiller BeginRun = %s', str(myRunNumber) )
dbFiller.setBeginRun(myRunNumber)
simMDlog.debug('ParameterDbFiller EndRun = %s', str(myEndRunNumber) )
diff --git a/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py b/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
index 764ce875c6dadf879dd6f4d1b3c600975974bd28..c9eac2b62a4cc30e34da8dbaa1de78da71a564b0 100644
--- a/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
+++ b/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
@@ -127,14 +127,6 @@ def createSimConfigFlags():
scf.addFlag("Sim.Fatras.GaussianMixtureModel", True) # use Gaussian mixture model for Multiple Scattering
scf.addFlag("Sim.Fatras.BetheHeitlerScale", 1.) # scale to Bethe-Heitler contribution
- # Run dependent simulation
- # map from runNumber to timestamp; migrated from RunDMCFlags.py
- def getRunToTimestampDict():
- # this wrapper is intended to avoid an initial import
- from G4AtlasApps.RunToTimestampData import RunToTimestampDict
- return RunToTimestampDict
- scf.addFlag("Sim.RunToTimestampDict", lambda prevFlags: getRunToTimestampDict())
-
scf.addFlag("Sim.BeamPipeCut", 100.0)
scf.addFlag("Sim.TightMuonStepping", False)
diff --git a/Simulation/G4Atlas/G4AtlasTests/src/TruthTestTool.cxx b/Simulation/G4Atlas/G4AtlasTests/src/TruthTestTool.cxx
index a5dac7b791caa2292e377df2d7dd6a2a152d0c1b..454f5bf9adb2078eea289a38cdfa212d01f89421 100644
--- a/Simulation/G4Atlas/G4AtlasTests/src/TruthTestTool.cxx
+++ b/Simulation/G4Atlas/G4AtlasTests/src/TruthTestTool.cxx
@@ -224,7 +224,6 @@ StatusCode TruthTestTool::processEvent()
}
int npart_prim=0, npart_sec=0;
- HepMC::GenEvent::particle_const_iterator currentGenParticleIter;
for (auto currentGenParticle: *(*currentGenEventIter)) {
const HepMC::FourVector mom = currentGenParticle->momentum();
@@ -284,8 +283,9 @@ StatusCode TruthTestTool::processEvent()
m_particle_type->Fill( particleType );
if ( HepMC::barcode(currentGenParticle)<200000 ) {
- m_p_gen->Fill( mom.rho() );
- m_log_p_gen->Fill( log(mom.rho()) );
+ double momentum=std::sqrt(mom.x()*mom.x()+mom.y()*mom.y()+mom.z()*mom.z());
+ m_p_gen->Fill( momentum );
+ m_log_p_gen->Fill( std::log(momentum) );
m_eta_gen->Fill( mom.eta() );
m_phi_gen->Fill( mom.phi() );
++npart_prim;
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
index 7fac942845dd71d4a412af3dd78c9a96dd21e040..fd4559f57b4cae43f77538200fcdb060d8469f91 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
@@ -56,7 +56,6 @@ class CollectionMerger_test : public ::testing::Test {
protected:
virtual void SetUp() override {
m_alg = new ISF::CollectionMerger{"CollectionMerger", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
index bb5bf49a7643574cf7dbaef9276c920b4c93c970..32cf0185a8ca147ca43a5898c279cf79a3c9a5d8 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
@@ -310,7 +310,6 @@ protected:
if(!service) {
return nullptr;
}
- EXPECT_TRUE( service->setProperties().isSuccess() );
EXPECT_TRUE( service->configure().isSuccess() );
EXPECT_TRUE( m_svcMgr->addService(service).isSuccess() );
// assert that finalize() gets called once per test case
@@ -333,7 +332,6 @@ protected:
return nullptr;
}
- EXPECT_TRUE( tool->setProperties().isSuccess() );
EXPECT_TRUE( tool->configure().isSuccess() );
// assert that finalize() gets called once per test case
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
index a5323da69977a4e5773baaae2d83c2b6df30878f..b108828792f95f0c48ad1ecbe95ac43490227dd4 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
@@ -102,7 +102,6 @@ class InputConverter_test: public ::testing::Test {
SmartIF<IService>& serviceSmartPointer = m_svcLoc->service("ISF::InputConverter/InputConverter");
m_svc = dynamic_cast<ISF::InputConverter*>(serviceSmartPointer.get());
EXPECT_NE(nullptr, m_svc);
- ASSERT_TRUE( m_svc->setProperties().isSuccess() );
ASSERT_TRUE( m_svc->configure().isSuccess() );
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
index f3d593c8f8dfd7b1d935265dd8db399ef5d8b76c..dad163f26f65d4b4c5d9928399f7abb3d51b2de8 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
@@ -189,7 +189,6 @@ namespace ISFTesting {
m_svc = dynamic_cast<ISF::TruthSvc*>(svc.get());
ASSERT_NE(nullptr, m_svc);
- ASSERT_TRUE( m_svc->setProperties().isSuccess() );
ASSERT_TRUE( m_svc->configure().isSuccess() );
}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
index 814e201541956b3b7fb93c94048d5d5fc5cbbb1f..45d8d29cb4d3a77f9620420b0607c40a0b0c71ce 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
@@ -41,6 +41,7 @@ atlas_add_root_dictionary( ISF_FastCaloSimEvent _dictSource
ISF_FastCaloSimEvent/TFCSParametrization.h
ISF_FastCaloSimEvent/TFCSInvisibleParametrization.h
ISF_FastCaloSimEvent/TFCSInitWithEkin.h
+ ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
ISF_FastCaloSimEvent/TFCSEnergyInterpolationLinear.h
ISF_FastCaloSimEvent/TFCSEnergyInterpolationPiecewiseLinear.h
ISF_FastCaloSimEvent/TFCSEnergyInterpolationSpline.h
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
index 03c4fe28ed5656207ddaee6dd82289fd96d41d42..8567ec9c6b3c392056a5e0ca8c0fe29527e42515 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
@@ -26,6 +26,7 @@
#include "ISF_FastCaloSimEvent/TFCSParametrization.h"
#include "ISF_FastCaloSimEvent/TFCSInvisibleParametrization.h"
#include "ISF_FastCaloSimEvent/TFCSInitWithEkin.h"
+#include "ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h"
#include "ISF_FastCaloSimEvent/TFCSEnergyInterpolationLinear.h"
#include "ISF_FastCaloSimEvent/TFCSEnergyInterpolationPiecewiseLinear.h"
#include "ISF_FastCaloSimEvent/TFCSEnergyInterpolationSpline.h"
@@ -295,6 +296,7 @@
#pragma link C++ class TFCSParametrization+;
#pragma link C++ class TFCSInvisibleParametrization+;
#pragma link C++ class TFCSInitWithEkin+;
+#pragma link C++ class TFCSEnergyInterpolationHistogram+;
#pragma link C++ class TFCSEnergyInterpolationLinear+;
#pragma link C++ class TFCSEnergyInterpolationPiecewiseLinear-;
#pragma link C++ class TFCSEnergyInterpolationSpline+;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
new file mode 100644
index 0000000000000000000000000000000000000000..a730b92e93431ebca8515c8afd0354d1a39a8243
--- /dev/null
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
@@ -0,0 +1,48 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef ISF_FASTCALOSIMEVENT_TFCSEnergyInterpolationHistogram_h
+#define ISF_FASTCALOSIMEVENT_TFCSEnergyInterpolationHistogram_h
+
+#include "ISF_FastCaloSimEvent/TFCSParametrization.h"
+#include "TH1F.h"
+
+class TFCSEnergyInterpolationHistogram:public TFCSParametrization {
+public:
+ TFCSEnergyInterpolationHistogram(const char* name=nullptr, const char* title=nullptr);
+
+ enum FCSEnergyInitializationStatusBits {
+ kOnlyScaleEnergy = BIT(15) ///< Set this bit in the TObject bit field the simulated energy should only be scaled by the spline
+ };
+
+ bool OnlyScaleEnergy() const {return TestBit(kOnlyScaleEnergy);};
+ void set_OnlyScaleEnergy() {SetBit(kOnlyScaleEnergy);};
+ void reset_OnlyScaleEnergy() {ResetBit(kOnlyScaleEnergy);};
+
+ virtual bool is_match_Ekin_bin(int /*Ekin_bin*/) const override {return true;};
+ virtual bool is_match_calosample(int /*calosample*/) const override {return true;};
+
+ ///Initialize interpolation from histogram
+ ///x values should be Ekin, y values should <E(reco)/Ekin(true)>
+ void InitFromHist(const TH1F& hist) {m_hist=hist;};
+
+ const TH1F& hist() const {return m_hist;};
+
+ ///Initialize simulstate with the mean reconstructed energy in the calorimater expeted from the true kinetic energy
+ virtual FCSReturnCode simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const override;
+ void Print(Option_t *option="") const override;
+
+ static void unit_test(TFCSSimulationState* simulstate=nullptr,TFCSTruthState* truth=nullptr, const TFCSExtrapolationState* extrapol=nullptr,TH1F* hist=nullptr);
+private:
+ TH1F m_hist;
+
+ ClassDefOverride(TFCSEnergyInterpolationHistogram,1) //TFCSEnergyInterpolationHistogram
+};
+
+#if defined(__ROOTCLING__) && defined(__FastCaloSimStandAlone__)
+#pragma link C++ class TFCSEnergyInterpolationHistogram+;
+#endif
+
+#endif
+
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..90937730936ae0385aef6916ba9a91534fff2c4a
--- /dev/null
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx
@@ -0,0 +1,147 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h"
+#include "ISF_FastCaloSimEvent/TFCSSimulationState.h"
+#include "ISF_FastCaloSimEvent/TFCSTruthState.h"
+#include "ISF_FastCaloSimEvent/TFCSExtrapolationState.h"
+#include "TFile.h"
+#include "TCanvas.h"
+#include "TGraph.h"
+#include "TAxis.h"
+#include <iostream>
+#include <vector>
+
+#ifdef __FastCaloSimStandAlone__
+namespace Gaudi {
+ namespace Units {
+ constexpr double megaelectronvolt = 1.;
+ constexpr double kiloelectronvolt = 1.e-3 * megaelectronvolt;
+ constexpr double keV = kiloelectronvolt;
+ }
+}
+#else
+#include "GaudiKernel/SystemOfUnits.h"
+#endif
+
+//=============================================
+//======= TFCSEnergyInterpolation =========
+//=============================================
+
+TFCSEnergyInterpolationHistogram::TFCSEnergyInterpolationHistogram(const char* name, const char* title):TFCSParametrization(name,title)
+{
+}
+
+FCSReturnCode TFCSEnergyInterpolationHistogram::simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState*) const
+{
+ float Emean;
+ float Einit;
+ const float Ekin=truth->Ekin();
+ if(OnlyScaleEnergy()) Einit=simulstate.E();
+ else Einit=Ekin;
+ if(Einit<m_hist.GetXaxis()->GetBinLowEdge(1)) {
+ Emean=m_hist.GetBinContent(1)*Einit;
+ } else {
+ if(Einit>m_hist.GetXaxis()->GetBinUpEdge(m_hist.GetNbinsX())) {
+ Emean=m_hist.GetBinContent(m_hist.GetNbinsX())*Einit;
+ } else {
+ Emean=m_hist.GetBinContent(m_hist.GetXaxis()->FindBin(Einit))*Einit;
+ }
+ }
+
+ if(OnlyScaleEnergy()) {
+ ATH_MSG_DEBUG("set E="<<Emean<<" for true Ekin="<<truth->Ekin()<<" and E="<<Einit);
+ }
+ else{
+ ATH_MSG_DEBUG("set E="<<Emean<<" for true Ekin="<<truth->Ekin());
+ }
+ simulstate.set_E(Emean);
+
+ return FCSSuccess;
+}
+
+void TFCSEnergyInterpolationHistogram::Print(Option_t *option) const
+{
+ TString opt(option);
+ bool shortprint=opt.Index("short")>=0;
+ bool longprint=msgLvl(MSG::DEBUG) || (msgLvl(MSG::INFO) && !shortprint);
+ TString optprint=opt;
+ optprint.ReplaceAll("short","");
+ TFCSParametrization::Print(option);
+
+ if(longprint) ATH_MSG_INFO(optprint <<(OnlyScaleEnergy()?" E()*":" Ekin()*")<<"histNbins="<<m_hist.GetNbinsX()
+ <<" "<<m_hist.GetXaxis()->GetBinLowEdge(1)<<"<=Ekin<="<<m_hist.GetXaxis()->GetBinUpEdge(m_hist.GetNbinsX()));
+}
+
+void TFCSEnergyInterpolationHistogram::unit_test(TFCSSimulationState* simulstate,TFCSTruthState* truth, const TFCSExtrapolationState* extrapol,TH1F* hist)
+{
+ if(!simulstate) simulstate=new TFCSSimulationState();
+ if(!truth) truth=new TFCSTruthState();
+ if(!extrapol) extrapol=new TFCSExtrapolationState();
+
+ if(!hist) {
+ hist = new TH1F("h1", "h1 title", 16, 0., 512.);
+ hist->SetBinContent( 1,0.687165);
+ hist->SetBinContent( 2,0.756837);
+ hist->SetBinContent( 3,0.836673);
+ hist->SetBinContent( 4,0.896336);
+ hist->SetBinContent( 5,0.889785);
+ hist->SetBinContent( 6,0.901266);
+ hist->SetBinContent( 7,0.888937);
+ hist->SetBinContent( 8,0.919943);
+ hist->SetBinContent( 9,0.941806);
+ hist->SetBinContent(10,0.934668);
+ hist->SetBinContent(11,0.939502);
+ hist->SetBinContent(12,0.940796);
+ hist->SetBinContent(13,0.945894);
+ hist->SetBinContent(14,0.955445);
+ hist->SetBinContent(15,0.955593);
+ hist->SetBinContent(16,0.943673);
+ }
+
+ TH1F* hdraw=(TH1F*)hist->Clone();
+ hdraw->SetMarkerColor(46);
+ hdraw->SetMarkerStyle(8);
+
+ TFCSEnergyInterpolationHistogram test("testTFCSEnergyInterpolationHistogram","test TFCSEnergyInterpolationHistogram");
+ test.set_pdgid(22);
+ test.set_Ekin_nominal(0.5*(hdraw->GetXaxis()->GetBinLowEdge(1)+hdraw->GetXaxis()->GetBinUpEdge(hdraw->GetNbinsX())));
+ test.set_Ekin_min(hdraw->GetXaxis()->GetBinLowEdge(1));
+ test.set_Ekin_max(hdraw->GetXaxis()->GetBinUpEdge(hdraw->GetNbinsX()));
+ test.set_eta_nominal(0.225);
+ test.set_eta_min(0.2);
+ test.set_eta_max(0.25);
+ test.InitFromHist(*hist);
+ //test.set_OnlyScaleEnergy();
+ test.Print();
+ test.hist().Dump();
+
+ truth->set_pdgid(22);
+
+ TGraph* gr=new TGraph();
+ gr->SetNameTitle("testTFCSEnergyInterpolationHistogramLogX","test TFCSEnergyInterpolationHistogram");
+ gr->GetXaxis()->SetTitle("Ekin [MeV]");
+ gr->GetYaxis()->SetTitle("<E(reco)>/Ekin(true)");
+
+ int ip=0;
+ for(float Ekin=std::max(test.Ekin_min()*0.25,0.1);Ekin<=test.Ekin_max()*4;Ekin*=1.05) {
+ //Init LorentzVector for truth. For photon Ekin=E
+ truth->SetPxPyPzE(Ekin,0,0,Ekin);
+ simulstate->set_E(Ekin);
+ if (test.simulate(*simulstate,truth,extrapol) != FCSSuccess) {
+ return;
+ }
+ gr->SetPoint(ip,Ekin,simulstate->E()/Ekin);
+ ++ip;
+ }
+
+ //Drawing doesn't make sense inside athena and necessary libraries not linked by default
+ #if defined(__FastCaloSimStandAlone__)
+ TCanvas* c=new TCanvas(hdraw->GetName(),hdraw->GetTitle());
+ hdraw->Draw("HIST");
+ gr->Draw("same,APL");
+ c->SetLogx();
+ #endif
+}
+
diff --git a/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py b/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py
index 2031035e3a0fb7e3ff0395edf11c841679c7460d..5085814f5c9819e58bda06d424f6aec7f0e79b62 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py
+++ b/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py
@@ -33,7 +33,7 @@ def DefaultSimSelectorCfg(flags, name="ISF_DefaultSimSelector", **kwargs):
def DefaultParticleKillerSelectorCfg(flags, name="ISF_DefaultParticleKillerSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.ParticleKiller)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -43,7 +43,7 @@ def DefaultParticleKillerSelectorCfg(flags, name="ISF_DefaultParticleKillerSelec
def PileupParticleKillerSelectorCfg(flags, name="ISF_PileupParticleKillerSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
kwargs.setdefault("PileupBCID", [1])
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.ParticleKiller)
acc.addPublicTool(CompFactory.ISF.KinematicPileupSimSelector(name, **kwargs))
@@ -52,7 +52,7 @@ def PileupParticleKillerSelectorCfg(flags, name="ISF_PileupParticleKillerSelecto
def DefaultGeant4SelectorCfg(flags, name="ISF_DefaultGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -61,7 +61,7 @@ def DefaultGeant4SelectorCfg(flags, name="ISF_DefaultGeant4Selector", **kwargs):
def DefaultAFIIGeant4SelectorCfg(flags, name="ISF_DefaultAFIIGeant4Selector", **kwargs):
acc = AFIIGeant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
acc.merge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -69,7 +69,7 @@ def DefaultAFIIGeant4SelectorCfg(flags, name="ISF_DefaultAFIIGeant4Selector", **
def DefaultLongLivedGeant4SelectorCfg(flags, name="ISF_DefaultLongLivedGeant4Selector", **kwargs):
acc = LongLivedGeant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_LongLivedGeant4SimSvc"))
acc.merge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -77,7 +77,7 @@ def DefaultLongLivedGeant4SelectorCfg(flags, name="ISF_DefaultLongLivedGeant4Sel
def DefaultAFII_QS_Geant4SelectorCfg(flags, name="ISF_DefaultAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -85,7 +85,7 @@ def DefaultAFII_QS_Geant4SelectorCfg(flags, name="ISF_DefaultAFII_QS_Geant4Selec
def FullGeant4SelectorCfg(flags, name="ISF_FullGeant4Selector", **kwargs):
acc = ComponentAccumulator()
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
acc.merge(FullGeant4SimCfg(flags))
kwargs.setdefault("Simulator", acc.getService("ISF_FullGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
@@ -95,7 +95,7 @@ def FullGeant4SelectorCfg(flags, name="ISF_FullGeant4Selector", **kwargs):
def PassBackGeant4SelectorCfg(flags, name="ISF_PassBackGeant4Selector", **kwargs):
acc = PassBackGeant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_PassBackGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -104,7 +104,7 @@ def PassBackGeant4SelectorCfg(flags, name="ISF_PassBackGeant4Selector", **kwargs
def DefaultFastCaloSimSelectorCfg(flags, name="ISF_DefaultFastCaloSimSelector", **kwargs):
acc = FastCaloSimSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -113,7 +113,7 @@ def DefaultFastCaloSimSelectorCfg(flags, name="ISF_DefaultFastCaloSimSelector",
def DefaultLegacyAFIIFastCaloSimSelectorCfg(flags, name="ISF_DefaultLegacyAFIIFastCaloSimSelector", **kwargs):
acc = LegacyAFIIFastCaloSimSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_LegacyAFIIFastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -122,7 +122,7 @@ def DefaultLegacyAFIIFastCaloSimSelectorCfg(flags, name="ISF_DefaultLegacyAFIIFa
def DefaultFastCaloSimV2SelectorCfg(flags, name="ISF_DefaultFastCaloSimV2Selector", **kwargs):
acc = FastCaloSimV2SvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimSvcV2"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSimV2)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -131,7 +131,7 @@ def DefaultFastCaloSimV2SelectorCfg(flags, name="ISF_DefaultFastCaloSimV2Selecto
def DefaultDNNCaloSimSelectorCfg(flags, name="ISF_DefaultDNNCaloSimSelector", **kwargs):
acc = DNNCaloSimSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_DNNCaloSimSvc"))
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
return acc
@@ -140,7 +140,7 @@ def DefaultDNNCaloSimSelectorCfg(flags, name="ISF_DefaultDNNCaloSimSelector", **
def FastHitConvAlgFastCaloSimSelectorCfg(flags, name="ISF_FastHitConvAlgFastCaloSimSelector", **kwargs):
acc = ComponentAccumulator()
acc.merge(FastHitConvAlgFastCaloSimSvcCfg(flags))
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastHitConvAlgFastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -150,7 +150,7 @@ def FastHitConvAlgFastCaloSimSelectorCfg(flags, name="ISF_FastHitConvAlgFastCalo
def FastHitConvAlgLegacyAFIIFastCaloSimSelectorCfg(flags, name="ISF_FastHitConvAlgLegacyAFIIFastCaloSimSelector", **kwargs):
acc = ComponentAccumulator()
acc.merge(FastHitConvAlgLegacyAFIIFastCaloSimSvcCfg(flags))
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastHitConvAlgLegacyAFIIFastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -159,7 +159,7 @@ def FastHitConvAlgLegacyAFIIFastCaloSimSelectorCfg(flags, name="ISF_FastHitConvA
def DefaultFatrasSelectorCfg(flags, name="ISF_DefaultFatrasSelector", **kwargs):
acc = fatrasSimServiceIDCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -169,7 +169,7 @@ def DefaultFatrasSelectorCfg(flags, name="ISF_DefaultFatrasSelector", **kwargs):
def DefaultFatrasNewExtrapolationSelectorCfg(flags, name="ISF_DefaultFatrasNewExtrapolationSelector", **kwargs):
acc = ComponentAccumulator()
acc.merge(fatrasNewExtrapolationSimServiceIDCfg(flags))
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasNewExtrapolationSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -178,7 +178,7 @@ def DefaultFatrasNewExtrapolationSelectorCfg(flags, name="ISF_DefaultFatrasNewEx
def DefaultParametricSimulationSelectorCfg(flags, name="ISF_DefaultParametricSimulationSelector", **kwargs):
acc = ComponentAccumulator()
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", "ISF_ParametricSimSvc") # TODO
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Parametric)
acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
@@ -196,7 +196,7 @@ def FatrasPileupSelectorCfg(flags, name="ISF_FatrasPileupSelector", **kwargs):
acc = ComponentAccumulator()
acc.merge(fatrasPileupSimServiceIDCfg(flags))
kwargs.setdefault("PileupBCID", [1])
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasPileupSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FatrasPileup)
acc.merge(PileupSimSelectorCfg(flags, name, **kwargs))
@@ -210,7 +210,7 @@ def FatrasPileupSelectorCfg(flags, name="ISF_FatrasPileupSelector", **kwargs):
def FastCaloSimPileupSelectorCfg(flags, name="ISF_FastCaloSimPileupSelector", **kwargs):
acc = FastCaloSimPileupSvcCfg(flags)
kwargs.setdefault("PileupBCID" , flags.Sim.FastChain.BCID)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimPileupSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSimPileup)
acc.merge(PileupSimSelectorCfg(flags, name, **kwargs))
@@ -220,7 +220,7 @@ def FastCaloSimPileupSelectorCfg(flags, name="ISF_FastCaloSimPileupSelector", **
def FastCaloSimPileupOTSelectorCfg(flags, name="ISF_FastCaloSimPileupOTSelector", **kwargs):
acc = FastCaloSimPileupOTSvcCfg(flags)
kwargs.setdefault("PileupBCID", flags.Sim.FastChain.BCID)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimPileupOTSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSimPileup)
acc.merge(PileupSimSelectorCfg(flags, name, **kwargs))
@@ -231,7 +231,7 @@ def FastCaloSimPileupOTSelectorCfg(flags, name="ISF_FastCaloSimPileupOTSelector"
def ElectronGeant4SelectorCfg(flags, name="ISF_ElectronGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
kwargs.setdefault("ParticlePDG", 11)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
@@ -241,7 +241,7 @@ def ElectronGeant4SelectorCfg(flags, name="ISF_ElectronGeant4Selector", **kwargs
def NeutralGeant4SelectorCfg(flags, name="ISF_NeutralGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
kwargs.setdefault("Charge", 0)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
@@ -252,7 +252,7 @@ def ProtonAFIIGeant4SelectorCfg(flags, name="ISF_ProtonAFIIGeant4Selector", **kw
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 750)
kwargs.setdefault("ParticlePDG", 2212)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
@@ -261,7 +261,7 @@ def ProtonAFIIGeant4SelectorCfg(flags, name="ISF_ProtonAFIIGeant4Selector", **kw
def ProtonAFII_QS_Geant4SelectorCfg(flags, name="ISF_ProtonAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(ProtonAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -271,7 +271,7 @@ def PionAFIIGeant4SelectorCfg(flags, name="ISF_PionAFIIGeant4Selector", **kwargs
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 200)
kwargs.setdefault("ParticlePDG", 211)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
@@ -282,7 +282,7 @@ def PionG4FastCaloGeant4Selector(flags, name="ISF_PionG4FastCaloGeant4Selector",
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxEkin", 200)
kwargs.setdefault("ParticlePDG", 211)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -292,7 +292,7 @@ def ProtonG4FastCaloGeant4Selector(flags, name="ISF_ProtonG4FastCaloGeant4Select
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxEkin", 400)
kwargs.setdefault("ParticlePDG", 2212)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -302,7 +302,7 @@ def NeutronG4FastCaloGeant4Selector(flags, name="ISF_NeutronG4FastCaloGeant4Sele
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxEkin", 400)
kwargs.setdefault("ParticlePDG", 2112)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -312,7 +312,7 @@ def ChargedKaonG4FastCaloGeant4Selector(flags, name="ISF_ChargedKaonG4FastCaloGe
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxEkin", 400)
kwargs.setdefault("ParticlePDG", 321)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -322,7 +322,7 @@ def KLongG4FastCaloGeant4Selector(flags, name="ISF_KLongG4FastCaloGeant4Selector
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxEkin", 400)
kwargs.setdefault("ParticlePDG", 130)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -330,7 +330,7 @@ def KLongG4FastCaloGeant4Selector(flags, name="ISF_KLongG4FastCaloGeant4Selector
def PionAFII_QS_Geant4SelectorCfg(flags, name="ISF_PionAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(PionAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -340,7 +340,7 @@ def ChargedKaonAFIIGeant4SelectorCfg(flags, name="ISF_ChargedKaonAFIIGeant4Selec
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 750)
kwargs.setdefault("ParticlePDG", 321)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
@@ -349,7 +349,7 @@ def ChargedKaonAFIIGeant4SelectorCfg(flags, name="ISF_ChargedKaonAFIIGeant4Selec
def ChargedKaonAFII_QS_Geant4SelectorCfg(flags, name="ISF_ChargedKaonAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(ChargedKaonAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -359,7 +359,7 @@ def KLongAFIIGeant4SelectorCfg(flags, name="ISF_KLongAFIIGeant4Selector", **kwar
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 750)
kwargs.setdefault("ParticlePDG", 130)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
@@ -368,7 +368,7 @@ def KLongAFIIGeant4SelectorCfg(flags, name="ISF_KLongAFIIGeant4Selector", **kwar
def KLongAFII_QS_Geant4SelectorCfg(flags, name="ISF_KLongAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(KLongAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -383,7 +383,7 @@ def MuonSelectorCfg(flags, name="ISF_MuonSelector", **kwargs):
def MuonGeant4SelectorCfg(flags, name="ISF_MuonGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(MuonSelectorCfg(flags, name, **kwargs))
@@ -392,7 +392,7 @@ def MuonGeant4SelectorCfg(flags, name="ISF_MuonGeant4Selector", **kwargs):
def MuonAFIIGeant4SelectorCfg(flags, name="ISF_MuonAFIIGeant4Selector", **kwargs):
acc = AFIIGeant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(MuonGeant4SelectorCfg(flags, name, **kwargs))
@@ -401,7 +401,7 @@ def MuonAFIIGeant4SelectorCfg(flags, name="ISF_MuonAFIIGeant4Selector", **kwargs
def MuonAFII_QS_Geant4SelectorCfg(flags, name="ISF_MuonAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(MuonGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -409,7 +409,7 @@ def MuonAFII_QS_Geant4SelectorCfg(flags, name="ISF_MuonAFII_QS_Geant4Selector",
def MuonFatrasSelectorCfg(flags, name="ISF_MuonFatrasSelector", **kwargs):
acc = fatrasSimServiceIDCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
acc.merge(MuonSelectorCfg(flags, name, **kwargs))
@@ -419,7 +419,7 @@ def MuonFatrasSelectorCfg(flags, name="ISF_MuonFatrasSelector", **kwargs):
def MuonFatrasPileupSelectorCfg(flags, name="ISF_MuonFatrasPileupSelector", **kwargs):
acc = ComponentAccumulator()
acc.merge(fatrasPileupSimServiceIDCfg(flags))
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasPileupSimSvc"))
kwargs.setdefault("PileupBCID", [1])
kwargs.setdefault("ParticlePDG", 13)
@@ -430,7 +430,7 @@ def MuonFatrasPileupSelectorCfg(flags, name="ISF_MuonFatrasPileupSelector", **kw
def WithinEta5FastCaloSimSelectorCfg(flags, name="ISF_WithinEta5FastCaloSimSelector", **kwargs):
acc = FastCaloSimSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimSvc"))
kwargs.setdefault("MinPosEta", -5.0)
kwargs.setdefault("MaxPosEta", 5.0)
@@ -441,7 +441,7 @@ def WithinEta5FastCaloSimSelectorCfg(flags, name="ISF_WithinEta5FastCaloSimSelec
def EtaGreater5ParticleKillerSimSelectorCfg(flags, name="ISF_EtaGreater5ParticleKillerSimSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("MinPosEta", -5.0)
kwargs.setdefault("MaxPosEta", 5.0)
@@ -453,7 +453,7 @@ def EtaGreater5ParticleKillerSimSelectorCfg(flags, name="ISF_EtaGreater5Particle
def EtaGreater5PileupParticleKillerSimSelectorCfg(flags, name="ISF_EtaGreater5PileupParticleKillerSimSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("MinPosEta", -5.0)
kwargs.setdefault("MaxPosEta", 5.0)
@@ -476,7 +476,7 @@ def PhotonConeSelectorCfg(flags, name="ISF_PhotonConeSelector", **kwargs):
def PhotonConeFatrasSelectorCfg(flags, name="ISF_PhotonConeFatrasSelector", **kwargs):
acc = fatrasSimServiceIDCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
acc.merge(PhotonConeSelectorCfg(flags, name, **kwargs))
@@ -485,7 +485,7 @@ def PhotonConeFatrasSelectorCfg(flags, name="ISF_PhotonConeFatrasSelector", **kw
def PhotonConeGeant4SelectorCfg(flags, name="ISF_PhotonConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(PhotonConeSelectorCfg(flags, name, **kwargs))
@@ -508,7 +508,7 @@ def HiggsLeptonsConeSimSelectorCfg(flags, name="ISF_HiggsLeptonsConeSimSelector"
def HiggsLeptonsConeGeant4SelectorCfg(flags, name="ISF_HiggsLeptonsConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(HiggsLeptonsConeSimSelectorCfg(flags, name, **kwargs))
@@ -530,7 +530,7 @@ def HiggsLeptonsConeGeant4CaloSelectorCfg(flags, name="ISF_HiggsLeptonsConeGeant
def WLeptonsConeGeant4SelectorCfg(flags, name="ISF_WLeptonsConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
kwargs.setdefault("ConeCreatorMinPt", 0.)
@@ -548,7 +548,7 @@ def ZLeptonsDirectionConeGeant4SelectorCfg(flags, name="ISF_ZLeptonsDirectionCon
# this selector picks all particles with a mometum direction
# within DeltaR<ConeSize relative to the Z decay lepton directions
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
kwargs.setdefault("ConeCreatorMinPt", 0.)
@@ -571,7 +571,7 @@ def ZLeptonsPositionConeGeant4SelectorCfg(flags, name="ISF_ZLeptonsPositionConeG
def JPsiLeptonsConeGeant4SelectorCfg(flags, name="ISF_JPsiLeptonsConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
kwargs.setdefault("ConeCreatorMinPt", 0.)
@@ -603,7 +603,7 @@ def BHadronProductsSimSelectorCfg(flags, name="ISF_BHadronProductsSimSelector",
def BHadronProductsGeant4SelectorCfg(flags, name="ISF_BHadronProductsGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(BHadronProductsSimSelectorCfg(flags, name, **kwargs))
@@ -612,7 +612,7 @@ def BHadronProductsGeant4SelectorCfg(flags, name="ISF_BHadronProductsGeant4Selec
def BHadronProductsFatrasSelectorCfg(flags, name="ISF_BHadronProductsFatrasSelector", **kwargs):
acc = fatrasSimServiceIDCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
acc.merge(BHadronProductsSimSelectorCfg(flags, name, **kwargs))
@@ -631,7 +631,7 @@ def TauProductsSimSelectorCfg(flags, name="ISF_TauProductsSimSelector", **kwargs
def TauProductsGeant4SelectorCfg(flags, name="ISF_TauProductsGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(TauProductsSimSelectorCfg(flags, name, **kwargs))
@@ -650,7 +650,7 @@ def ZProductsSimSelectorCfg(flags, name="ISF_ZProductsSimSelector", **kwargs):
def ZProductsGeant4SelectorCfg(flags, name="ISF_ZProductsGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(ZProductsSimSelectorCfg(flags, name, **kwargs))
@@ -661,7 +661,7 @@ def ZProductsGeant4SelectorCfg(flags, name="ISF_ZProductsGeant4Selector", **kwar
def SubDetStickyGeant4SimSelectorCfg(flags, name="ISF_SubDetStickyGeant4SimSelector", **kwargs):
acc = Geant4SimCfg(flags)
kwargs.setdefault("RequiresUnchangedGeoID", True)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("PrevSimSvc", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
@@ -673,7 +673,7 @@ def GlobalStickyGeant4SimSelectorCfg(flags, name="ISF_GlobalStickyGeant4SimSelec
acc = Geant4SimCfg(flags)
kwargs.setdefault("PrevSimSvc", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("RequiresUnchangedGeoID", False)
- if flags.Concurrency.NumThreads == 0:
+ if flags.Concurrency.NumThreads == 0 and 'MT' not in flags.Sim.ISF.Simulator:
kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.addPublicTool(CompFactory.ISF.HistorySimSelector(name, **kwargs))
diff --git a/Simulation/SimuJobTransforms/python/ISF_Skeleton.py b/Simulation/SimuJobTransforms/python/ISF_Skeleton.py
index 2073c899f0841d11da52eeab6d73c25c56d03328..a5396254fdfac73601ac399282fb06c025982481 100644
--- a/Simulation/SimuJobTransforms/python/ISF_Skeleton.py
+++ b/Simulation/SimuJobTransforms/python/ISF_Skeleton.py
@@ -4,44 +4,6 @@ import sys
from PyJobTransforms.CommonRunArgsToFlags import commonRunArgsToFlags
from OverlayConfiguration.OverlayHelpers import accFromFragment
-# based on https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Control/AthenaServices/python/Configurables.py#0247
-def EvtIdModifierSvc_add_modifier(svc,
- run_nbr=None, evt_nbr=None, time_stamp=None, lbk_nbr=None,
- nevts=1):
- if run_nbr is None:
- modify_run_nbr = 0
- run_nbr = 0
- else:
- modify_run_nbr = 1
-
-
- if evt_nbr is None:
- modify_evt_nbr = 0
- evt_nbr = 0
- else:
- modify_evt_nbr = 1
-
- if time_stamp is None:
- modify_time_stamp = 0
- time_stamp = 0
- else:
- modify_time_stamp = 1
-
- if lbk_nbr is None:
- modify_lbk_nbr = 0
- lbk_nbr = 0
- else:
- modify_lbk_nbr = 1
-
- mod_bit = int(0b0000
- | (modify_run_nbr << 0)
- | (modify_evt_nbr << 1)
- | (modify_time_stamp << 2)
- | (modify_lbk_nbr << 3))
-
- svc.Modifiers += [run_nbr, evt_nbr, time_stamp, lbk_nbr,
- nevts, mod_bit]
-
def defaultSimulationFlags(ConfigFlags):
"""Fill default simulation flags"""
# TODO: how to autoconfigure those
@@ -137,6 +99,8 @@ def fromRunArgs(runArgs):
if hasattr(runArgs, 'DataRunNumber'):
ConfigFlags.Input.RunNumber = [runArgs.DataRunNumber] # is it updating?
+ ConfigFlags.Input.OverrideRunNumber = True
+ ConfigFlags.Input.LumiBlockNumber = [1] # dummy value
if hasattr(runArgs, 'outputHITSFile'):
ConfigFlags.Sim.PhysicsList = runArgs.physicsList
@@ -180,26 +144,6 @@ def fromRunArgs(runArgs):
from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
cfg.merge(PoolReadCfg(ConfigFlags))
cfg.merge(PoolWriteCfg(ConfigFlags))
- # todo its own cfg ...
- #todo check evtMax=-1 works with this method
- myRunNumber = 284500
- myFirstLB = 1
- myInitialTimeStamp = 1446539185
- from AthenaConfiguration.ComponentFactory import CompFactory
- evtIdModifierSvc = CompFactory.EvtIdModifierSvc(EvtStoreName="StoreGateSvc")
- iovDbMetaDataTool = CompFactory.IOVDbMetaDataTool()
- iovDbMetaDataTool.MinMaxRunNumbers = [myRunNumber, 2147483647]
- cfg.addPublicTool(iovDbMetaDataTool)
- EvtIdModifierSvc_add_modifier(evtIdModifierSvc, run_nbr=myRunNumber, lbk_nbr=myFirstLB, time_stamp=myInitialTimeStamp, nevts=evtMax)
- eventSelector = cfg.getService("EventSelector")
- eventSelector.OverrideRunNumber = True
- eventSelector.RunNumber = myRunNumber
- eventSelector.FirstLB = myFirstLB
- eventSelector.InitialTimeStamp = myInitialTimeStamp # Necessary to avoid a crash
- if hasattr(eventSelector, "OverrideRunNumberFromInput"):
- eventSelector.OverrideRunNumberFromInput = True
- cfg.addService(evtIdModifierSvc, create=True)
- # ... up to here?
# add BeamEffectsAlg
from BeamEffects.BeamEffectsAlgConfig import BeamEffectsAlgCfg
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_premixing_for_MT.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_premixing_for_MT.sh
new file mode 100755
index 0000000000000000000000000000000000000000..269a9f584656378705c8721a5c98783f9f62ecb9
--- /dev/null
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_premixing_for_MT.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# art-description: Run MC16a pile-up pre-mixing with 2016a geometry and conditions, 25ns pile-up, MT output containers
+# art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
+# art-output: mc16a_premixing_MT.RDO.pool.root
+
+DigiOutFileName="mc16a_premixing_MT.RDO.pool.root"
+
+HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
+LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
+
+
+Digi_tf.py \
+--PileUpPremixing True \
+--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/mc16_valid.422075.ParticleGun_single_nu_Pt50.simul.HITS.e6739_e5984_s3126.HITS.14436922._003949.pool.root \
+--conditionsTag default:OFLCOND-MC16-SDR-16 \
+--digiSeedOffset1 170 --digiSeedOffset2 170 \
+--geometryVersion default:ATLAS-R2-2016-01-00-01 \
+--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
+--inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} \
+--jobNumber 1 \
+--maxEvents 25 \
+--numberOfCavernBkg 0 \
+--numberOfHighPtMinBias 0.116075313 \
+--numberOfLowPtMinBias 44.3839246425 \
+--outputRDOFile ${DigiOutFileName} \
+--digiSteeringConf "StandardSignalOnlyTruth" \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--pileupFinalBunch 6 \
+--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' \
+'all:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.experimentalDigi += ["OverlayMT"];' \
+--preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configEvtNbr_sequential.py,RunDependentSimData/configLumi_run284500_mc16a.py' \
+--skipEvents 0
+
+rc=$?
+echo "art-result: $rc Digi_tf.py"
+rc1=-9999
+rc2=-9999
+rc3=-9999
+rc4=-9999
+
+# get reference directory
+source DigitizationCheckReferenceLocation.sh
+echo "Reference set being used: " ${DigitizationTestsVersion}
+
+if [ $rc -eq 0 ]
+then
+ # Do reference comparisons
+ art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName
+ rc1=$?
+fi
+echo "art-result: $rc1 diff-pool"
+#
+#
+#
+if [ $rc -eq 0 ]
+then
+ art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed
+ rc2=$?
+fi
+echo "art-result: $rc2 diff-root"
+#
+if [ $rc -eq 0 ]
+then
+ checkFile ./$DigiOutFileName
+ rc3=$?
+fi
+echo "art-result: $rc3 checkFile"
+#
+#
+if [ $rc -eq 0 ]
+then
+ ArtPackage=$1
+ ArtJobName=$2
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
+ rc4=$?
+fi
+echo "art-result: $rc4 art-compare"
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh
index c921a9a239ce88376c6822b60a646afe8f3fe0b2..dcb6bc98f60126718f0a74822f3d4b39ed7b889f 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_qballs.sh
@@ -29,7 +29,7 @@ Digi_tf.py \
--numberOfLowPtMinBias 44.3839246425 \
--outputRDOFile ${DigiOutFileName} \
--digiSteeringConf "StandardSignalOnlyTruth" \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--pileupFinalBunch 6 \
--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh
index 9af380649f491e495983b8ec14051c7a1469a468..1519b6e7e9156995a21e73279f5fad82c1e01478 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh
@@ -28,7 +28,7 @@ Digi_tf.py \
--numberOfLowPtMinBias 44.3839246425 \
--outputRDOFile ${DigiOutFileName} \
--digiSteeringConf "StandardSignalOnlyTruth" \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--pileupFinalBunch 6 \
--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh
index fa896292876eeef91dce7931676aef1a793cb01e..2651628a537dbbc61fb96439187e4f179e368592 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing.sh
@@ -29,7 +29,7 @@ Digi_tf.py \
--numberOfLowPtMinBias 80.290021063135 \
--outputRDOFile ${DigiOutFileName} \
--digiSteeringConf "StandardSignalOnlyTruth" \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--pileupFinalBunch 6 \
--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh
index 56b985466e63891865932c754a88f363f6d2d473..2221e437ebaf542e23a9eb642a2aa88f8ad125c3 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_premixing_for_MT.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# art-description: Run MC16 pile-up pre-mixing with 2016d geometry and conditions, 25ns pile-up, MT output containers
+# art-description: Run MC16d pile-up pre-mixing with 2016d geometry and conditions, 25ns pile-up, MT output containers
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.3/Athena
@@ -29,10 +29,11 @@ Digi_tf.py \
--numberOfLowPtMinBias 80.290021063135 \
--outputRDOFile ${DigiOutFileName} \
--digiSteeringConf "StandardSignalOnlyTruth" \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--pileupFinalBunch 6 \
---preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' 'all:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.experimentalDigi += ["OverlayMT"];' \
+--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
+'all:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.experimentalDigi += ["OverlayMT"];' \
--preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configEvtNbr_sequential.py,RunDependentSimData/configLumi_run300000_mc16d.py' \
--skipEvents 0
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh
index 26d54d5b1439d75c49f4fce050d8d94aa4c32496..b2c3f0ad7fbc0991d6e968b4c7aa089b162bc52a 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh
@@ -34,7 +34,7 @@ Digi_tf.py \
--numberOfLowPtMinBias 80.290021063135 \
--outputRDOFile ${DigiOutFileName} \
--digiSteeringConf "StandardSignalOnlyTruth" \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--pileupFinalBunch 6 \
--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_premixing_for_MT.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_premixing_for_MT.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f11cf9391b6ec6cb8abea6357269e8c6b6c379a0
--- /dev/null
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_premixing_for_MT.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# art-description: Run MC16e pile-up pre-mixing with 2018 geometry and conditions, 25ns pile-up, MT output containers
+# art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
+# art-output: mc16e_premixing_MT.RDO.pool.root
+
+DigiOutFileName="mc16e_premixing_MT.RDO.pool.root"
+
+HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
+LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
+
+
+Digi_tf.py \
+--PileUpPremixing True \
+--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/mc16_valid.422075.ParticleGun_single_nu_Pt50.simul.HITS.e6739_e5984_s3126.HITS.14436922._003949.pool.root \
+--conditionsTag default:OFLCOND-MC16-SDR-25 \
+--digiSeedOffset1 170 --digiSeedOffset2 170 \
+--geometryVersion default:ATLAS-R2-2016-01-00-01 \
+--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
+--inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} \
+--jobNumber 1 \
+--maxEvents 25 \
+--numberOfCavernBkg 0 \
+--numberOfHighPtMinBias 0.2595392 \
+--numberOfLowPtMinBias 99.2404608 \
+--outputRDOFile ${DigiOutFileName} \
+--digiSteeringConf "StandardSignalOnlyTruth" \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--pileupFinalBunch 6 \
+--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
+'all:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.experimentalDigi += ["OverlayMT"];' \
+--preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configEvtNbr_sequential.py,RunDependentSimData/configLumi_run310000.py' \
+--skipEvents 0
+
+rc=$?
+echo "art-result: $rc Digi_tf.py"
+rc1=-9999
+rc2=-9999
+rc3=-9999
+rc4=-9999
+
+# get reference directory
+source DigitizationCheckReferenceLocation.sh
+echo "Reference set being used: " ${DigitizationTestsVersion}
+
+if [ $rc -eq 0 ]
+then
+ # Do reference comparisons
+ art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName
+ rc1=$?
+fi
+echo "art-result: $rc1 diff-pool"
+#
+#
+#
+if [ $rc -eq 0 ]
+then
+ art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root --mode=semi-detailed
+ rc2=$?
+fi
+echo "art-result: $rc2 diff-root"
+#
+if [ $rc -eq 0 ]
+then
+ checkFile ./$DigiOutFileName
+ rc3=$?
+fi
+echo "art-result: $rc3 checkFile"
+#
+#
+if [ $rc -eq 0 ]
+then
+ ArtPackage=$1
+ ArtJobName=$2
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
+ rc4=$?
+fi
+echo "art-result: $rc4 art-compare"
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh
index e01270130e5e8fee704f6aeb272976f450b7a114..baeda2c244c388aae2465cb4092b8af37a1b363b 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16e_ttbar.sh
@@ -22,7 +22,7 @@ LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0Ch
Digi_tf.py \
--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
---conditionsTag default:OFLCOND-MC16-SDR-20 \
+--conditionsTag default:OFLCOND-MC16-SDR-25 \
--digiSeedOffset1 170 --digiSeedOffset2 170 \
--geometryVersion default:ATLAS-R2-2016-01-00-01 \
--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
@@ -30,11 +30,11 @@ Digi_tf.py \
--jobNumber 568 \
--maxEvents 25 \
--numberOfCavernBkg 0 \
---numberOfHighPtMinBias 0.2099789464 \
---numberOfLowPtMinBias 80.290021063135 \
+--numberOfHighPtMinBias 0.2595392 \
+--numberOfLowPtMinBias 99.2404608 \
--outputRDOFile ${DigiOutFileName} \
--digiSteeringConf "StandardSignalOnlyTruth" \
---postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--pileupFinalBunch 6 \
--preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
diff --git a/Simulation/Tools/HitAnalysis/src/TruthHitAnalysis.cxx b/Simulation/Tools/HitAnalysis/src/TruthHitAnalysis.cxx
index 278d1b99adbf4c3114d8c96cd22373f2b37fb29f..350c9c07ac0f7068e9c4dddc93cc4c23225132ae 100755
--- a/Simulation/Tools/HitAnalysis/src/TruthHitAnalysis.cxx
+++ b/Simulation/Tools/HitAnalysis/src/TruthHitAnalysis.cxx
@@ -249,11 +249,16 @@ StatusCode TruthHitAnalysis::execute() {
if (currentGenEventIter != mcCollection->end()) {
int nvtx = 0;
int nvtx_sec=0;
- for (HepMC::GenEvent::vertex_const_iterator vtx=(*currentGenEventIter)->vertices_begin(); vtx!=(*currentGenEventIter)->vertices_end(); ++vtx) {
- double x = (*vtx)->position().x();
- double y = (*vtx)->position().y();
- double z = (*vtx)->position().z();
- double r = sqrt(x*x+y*y);
+#ifdef HEPMC3
+ for (auto vtx: (*currentGenEventIter)->vertices()) {
+#else
+ for (HepMC::GenEvent::vertex_const_iterator vtxit=(*currentGenEventIter)->vertices_begin(); vtxit!=(*currentGenEventIter)->vertices_end(); ++vtxit) {
+ auto vtx=*vtxit;
+#endif
+ double x = vtx->position().x();
+ double y = vtx->position().y();
+ double z = vtx->position().z();
+ double r = std::sqrt(x*x+y*y);
m_h_vtx_x->Fill(x);
m_h_vtx_y->Fill(y);
m_h_vtx_r->Fill(r);
@@ -284,9 +289,9 @@ StatusCode TruthHitAnalysis::execute() {
int npart_prim=0;
int npart_sec=0;
- HepMC::GenEvent::particle_const_iterator currentGenParticleIter;
- for (currentGenParticleIter=(*currentGenEventIter)->particles_begin(); currentGenParticleIter!=(*currentGenEventIter)->particles_end(); ++currentGenParticleIter) {
- const HepMC::FourVector mom = (*currentGenParticleIter)->momentum();
+
+ for (auto currentGenParticle: *(*currentGenEventIter)) {
+ const HepMC::FourVector mom = currentGenParticle->momentum();
m_h_truth_px->Fill(mom.x());
m_h_truth_py->Fill(mom.y());
@@ -294,27 +299,27 @@ StatusCode TruthHitAnalysis::execute() {
m_h_truth_pt->Fill(mom.perp());
m_h_truth_eta->Fill(mom.eta());
m_h_truth_phi->Fill(mom.phi());
- m_h_barcode->Fill((*currentGenParticleIter)->barcode());
- m_h_part_status->Fill((*currentGenParticleIter)->status());
+ m_h_barcode->Fill(HepMC::barcode(currentGenParticle));
+ m_h_part_status->Fill(currentGenParticle->status());
m_truth_px->push_back(mom.x());
m_truth_py->push_back(mom.y());
m_truth_pz->push_back(mom.z());
m_truth_pt->push_back(mom.perp());
m_truth_eta->push_back(mom.eta());
m_truth_phi->push_back(mom.phi());
- m_barcode->push_back((*currentGenParticleIter)->barcode());
- m_status->push_back((*currentGenParticleIter)->status());
+ m_barcode->push_back(HepMC::barcode(currentGenParticle));
+ m_status->push_back(currentGenParticle->status());
- int pdg = (*currentGenParticleIter)->pdg_id();
+ int pdg = currentGenParticle->pdg_id();
m_pdgid->push_back(pdg);
- if ((*currentGenParticleIter)->barcode() < 200000) {
+ if (HepMC::barcode(currentGenParticle) < 200000) {
m_h_part_pdgid->Fill(pdg);
- m_h_part_p->Fill(mom.rho());
+ m_h_part_p->Fill(std::sqrt(mom.x()*mom.x()+mom.y()*mom.y()+mom.z()*mom.z()));
m_h_part_eta->Fill(mom.eta());
m_h_part_phi->Fill(mom.phi());
++npart_prim;
- if ((*currentGenParticleIter)->barcode() < 10000) {
+ if (HepMC::barcode(currentGenParticle) < 10000) {
m_h_n_generations->Fill(0);
}
else {
@@ -324,7 +329,7 @@ StatusCode TruthHitAnalysis::execute() {
else {
m_h_part_pdgid_sec->Fill(pdg);
++npart_sec;
- const int gen = (*currentGenParticleIter)->barcode()/1000000 + 2;
+ const int gen = HepMC::barcode(currentGenParticle)/1000000 + 2;
m_h_n_generations->Fill(gen);
}
} // End iteration over particles
diff --git a/TileCalorimeter/TileConditions/TileConditions/TileBadChanTool.h b/TileCalorimeter/TileConditions/TileConditions/TileBadChanTool.h
index f7af1ad527f9c8ee5597324dc4e469b655005038..52c7df546971a3b788ee5e01b2b0c530f7545acb 100644
--- a/TileCalorimeter/TileConditions/TileConditions/TileBadChanTool.h
+++ b/TileCalorimeter/TileConditions/TileConditions/TileBadChanTool.h
@@ -51,7 +51,9 @@ class TileBadChanTool: public extends<AthAlgTool, ITileBadChanTool, ICaloBadChan
* @brief ICaloBadChanTool interface.
* @param cell_id Calo cell identifier
*/
- virtual CaloBadChannel caloStatus(Identifier cell_id) const override;
+ using ICaloBadChanTool::caloStatus;
+ virtual CaloBadChannel caloStatus(const EventContext& ctx,
+ Identifier cell_id) const override;
//===============================================================
//=== ITileBadChanTool methods
diff --git a/TileCalorimeter/TileConditions/src/TileBadChanTool.cxx b/TileCalorimeter/TileConditions/src/TileBadChanTool.cxx
index 7417de199984e25b6f27dcada43f34b7e3c1083b..9b70a2572c63bf870fbf957a7e1de7276db6f25b 100644
--- a/TileCalorimeter/TileConditions/src/TileBadChanTool.cxx
+++ b/TileCalorimeter/TileConditions/src/TileBadChanTool.cxx
@@ -81,7 +81,9 @@ StatusCode TileBadChanTool::finalize() {
//
//____________________________________________________________________
-CaloBadChannel TileBadChanTool::caloStatus(Identifier cell_id) const {
+CaloBadChannel
+TileBadChanTool::caloStatus(const EventContext& ctx, Identifier cell_id) const
+{
CaloBadChannel::BitWord res = 0;
@@ -94,7 +96,7 @@ CaloBadChannel TileBadChanTool::caloStatus(Identifier cell_id) const {
std::abort();
}
- SG::ReadCondHandle<TileBadChannels> badChannels(m_badChannelsKey);
+ SG::ReadCondHandle<TileBadChannels> badChannels(m_badChannelsKey,ctx);
IdentifierHash hash1_id(elem->onl1());
IdentifierHash hash2_id(elem->onl2());
diff --git a/TileCalorimeter/TileTrackingGeometry/CMakeLists.txt b/TileCalorimeter/TileTrackingGeometry/CMakeLists.txt
index fc4d3393492d3b88163b17f4fb51bbbc7ce82f85..1f77414b14b76c701e2a388073a77af04d3a4042 100644
--- a/TileCalorimeter/TileTrackingGeometry/CMakeLists.txt
+++ b/TileCalorimeter/TileTrackingGeometry/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_component( TileTrackingGeometry
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces CaloDetDescrLib StoreGateLib TileDetDescr TrkDetDescrGeoModelCnv TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes CaloTrackingGeometryLib )
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces CaloDetDescrLib StoreGateLib TileDetDescr TrkDetDescrGeoModelCnv TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes CaloTrackingGeometryLib CxxUtils )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h b/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h
index 863678fc4fdaf6f3c53990712e1f7afe986b2f02..bd3a93c594e189ff4f1b7fb5e550a0a8f8ebbbbd 100755
--- a/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h
+++ b/TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h
@@ -12,11 +12,15 @@
// Gaudi
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
+#include "CxxUtils/checker_macros.h"
// Trk
#include "TrkDetDescrInterfaces/ITrackingVolumeBuilder.h"
#include "CaloTrackingGeometry/ICaloSurfaceBuilder.h"
+#include "TrkGeometry/Material.h"
// STL
#include <vector>
+#include <memory>
+#include <mutex>
class TileDetDescrManager;
class CaloDetDescrManager;
@@ -70,6 +74,8 @@ namespace Tile {
void printInfo(GeoPVConstLink pv) const;
void printChildren(GeoPVConstLink pv, int igen, Amg::Transform3D trIn) const;
+ void throwIntoGarbage (std::unique_ptr<Trk::Material> mat) const;
+
const TileDetDescrManager* m_tileMgr; //!< Calo DetDescrMgr
std::string m_tileMgrLocation; //!< Location of the CaloDetDescrMgr
@@ -84,6 +90,8 @@ namespace Tile {
bool m_forceSymmetry; //!< forces volume symmetry between negative/positive part
+ mutable std::mutex m_garbageMutex;
+ mutable std::vector<std::unique_ptr<Trk::Material> > m_garbage ATLAS_THREAD_SAFE;
};
} // end of namespace
diff --git a/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx b/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
index ca6732cc16d8bfbd893ecdf86c5104ec51e553fb..6e09f563e3a7fb8fa2766b5a81b7a0648fb58d6d 100755
--- a/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
+++ b/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
@@ -185,8 +185,8 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > exitSurf = m_surfBuilder->exitSurfaces();
// averaged material properties
- const Trk::Material* barrelProperties = new Trk::Material(22.7, 212., 45.8, 21.4, 0.0062);
- const Trk::Material* extendedBarrelProperties = new Trk::Material(22.7, 210., 45.8, 21.4, 0.0062);
+ auto barrelProperties = std::make_unique<Trk::Material>(22.7, 212., 45.8, 21.4, 0.0062);
+ auto extendedBarrelProperties = std::make_unique<Trk::Material>(22.7, 210., 45.8, 21.4, 0.0062);
// material properties with layer encoding - to be defined later
const Trk::BinnedMaterial* barrelMaterialBinned = 0;
const Trk::BinnedMaterial* extendedMaterialBinned = 0;
@@ -201,10 +201,10 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
// layer material can be adjusted here
std::vector<Trk::IdentifiedMaterial> matTB;
int baseID = Trk::GeometrySignature(Trk::Calo)*1000 + 12;
- matTB.emplace_back(barrelProperties,0);
- matTB.emplace_back(barrelProperties,baseID);
- matTB.emplace_back(barrelProperties,baseID+1);
- matTB.emplace_back(barrelProperties,baseID+2);
+ matTB.emplace_back(barrelProperties.get(),0);
+ matTB.emplace_back(barrelProperties.get(),baseID);
+ matTB.emplace_back(barrelProperties.get(),baseID+1);
+ matTB.emplace_back(barrelProperties.get(),baseID+2);
// material index
std::vector<size_t> ltb{0,1,2,3};
@@ -212,10 +212,10 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
// layer material can be adjusted here
std::vector<Trk::IdentifiedMaterial> matETB;
baseID = Trk::GeometrySignature(Trk::Calo)*1000 + 18;
- matETB.emplace_back(extendedBarrelProperties,0);
- matETB.emplace_back(extendedBarrelProperties,baseID);
- matETB.emplace_back(extendedBarrelProperties,baseID+1);
- matETB.emplace_back(extendedBarrelProperties,baseID+2);
+ matETB.emplace_back(extendedBarrelProperties.get(),0);
+ matETB.emplace_back(extendedBarrelProperties.get(),baseID);
+ matETB.emplace_back(extendedBarrelProperties.get(),baseID+1);
+ matETB.emplace_back(extendedBarrelProperties.get(),baseID+2);
// layer material can be adjusted here
//Trk::MaterialProperties barrelFingerGapProperties = Trk::MaterialProperties(1., 130./0.35, 0.003*pow(0.35,3),30.);
@@ -292,7 +292,7 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
steps.push_back(depth);
Trk::BinUtility* rBU = new Trk::BinUtility(steps, Trk::open, Trk::binR);
- barrelMaterialBinned = new Trk::BinnedMaterial(barrelProperties,rBU,ltb,matTB);
+ barrelMaterialBinned = new Trk::BinnedMaterial(barrelProperties.get(),rBU,ltb,matTB);
tileBarrel = new Trk::AlignableTrackingVolume(0,align,
tileBarrelBounds,
@@ -356,7 +356,7 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
steps.push_back(tileExtendedBounds->outerRadius());
Trk::BinUtility* eBU = new Trk::BinUtility(steps, Trk::open, Trk::binR);
- extendedMaterialBinned = new Trk::BinnedMaterial(extendedBarrelProperties,eBU,ltb,matETB);
+ extendedMaterialBinned = new Trk::BinnedMaterial(extendedBarrelProperties.get(),eBU,ltb,matETB);
tileExtendedTrackingVolume = new Trk::AlignableTrackingVolume(new Amg::Transform3D(Amg::Translation3D(childPosition)),
align,
@@ -381,7 +381,7 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
steps.push_back(tileExtendedBounds->outerRadius());
Trk::BinUtility* eBU = new Trk::BinUtility(steps, Trk::open, Trk::binR);
- extendedMaterialBinned = new Trk::BinnedMaterial(extendedBarrelProperties,eBU,ltb,matETB);
+ extendedMaterialBinned = new Trk::BinnedMaterial(extendedBarrelProperties.get(),eBU,ltb,matETB);
tileExtendedTrackingVolume = new Trk::AlignableTrackingVolume(new Amg::Transform3D(Amg::Translation3D(childPosition)),
align,
@@ -441,9 +441,9 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
std::vector<Trk::IdentifiedMaterial> matITC;
// layer material can be adjusted here
baseID = Trk::GeometrySignature(Trk::Calo)*1000;
- matITC.emplace_back(barrelProperties,baseID+15);
- matITC.emplace_back(barrelProperties,baseID+16);
- matITC.emplace_back(barrelProperties,baseID+17);
+ matITC.emplace_back(barrelProperties.get(),baseID+15);
+ matITC.emplace_back(barrelProperties.get(),baseID+16);
+ matITC.emplace_back(barrelProperties.get(),baseID+17);
// ITCPlug1
double p1Z = 0.5*(plug1Z-plug1hZ+tileExtZ);
@@ -462,8 +462,8 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
std::vector<float> bpsteps{float(plug1R), float(tileBarrelBounds->outerRadius())};
Trk::BinUtility* rBU = new Trk::BinUtility(bpsteps, Trk::open, Trk::binR);
Trk::BinUtility* rBUc = rBU->clone();
- const Trk::BinnedMaterial* plug1MatPos = new Trk::BinnedMaterial(barrelProperties,rBU,dummylay,matITC);
- const Trk::BinnedMaterial* plug1MatNeg = new Trk::BinnedMaterial(barrelProperties,rBUc,dummylay,matITC);
+ const Trk::BinnedMaterial* plug1MatPos = new Trk::BinnedMaterial(barrelProperties.get(),rBU,dummylay,matITC);
+ const Trk::BinnedMaterial* plug1MatNeg = new Trk::BinnedMaterial(barrelProperties.get(),rBUc,dummylay,matITC);
Amg::Transform3D* align=0;
@@ -497,8 +497,8 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
std::vector<float> p2steps{float(plug2R), float(plug1R)};
Trk::BinUtility* p2BU = new Trk::BinUtility(p2steps, Trk::open, Trk::binR);
Trk::BinUtility* p2BUc = p2BU->clone();
- const Trk::BinnedMaterial* plug2MatPos = new Trk::BinnedMaterial(barrelProperties,p2BU,p2lay,matITC);
- const Trk::BinnedMaterial* plug2MatNeg = new Trk::BinnedMaterial(barrelProperties,p2BUc,p2lay,matITC);
+ const Trk::BinnedMaterial* plug2MatPos = new Trk::BinnedMaterial(barrelProperties.get(),p2BU,p2lay,matITC);
+ const Trk::BinnedMaterial* plug2MatNeg = new Trk::BinnedMaterial(barrelProperties.get(),p2BUc,p2lay,matITC);
Trk::AlignableTrackingVolume* itcPlug2Pos = new Trk::AlignableTrackingVolume(itcP2PosTransform, align,
itcPlug2Bounds,
@@ -530,7 +530,7 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
std::vector<size_t> glay(1,2);
std::vector<float> gsteps{float(gapi-gapBounds->halflengthZ()), float(gapi+gapBounds->halflengthZ())};
Trk::BinUtility* gp = new Trk::BinUtility(gsteps, Trk::open, Trk::binZ);
- const Trk::BinnedMaterial* gpMat = new Trk::BinnedMaterial(barrelProperties,gp,glay,matITC);
+ const Trk::BinnedMaterial* gpMat = new Trk::BinnedMaterial(barrelProperties.get(),gp,glay,matITC);
Trk::AlignableTrackingVolume* gapPos = new Trk::AlignableTrackingVolume(gapPosTransform, align,
gapBounds,
@@ -540,7 +540,7 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
std::vector<float> nsteps{float(-gapi-gapBounds->halflengthZ()), float(-gapi+gapBounds->halflengthZ())};
Trk::BinUtility* gn = new Trk::BinUtility(nsteps, Trk::open, Trk::binZ);
- const Trk::BinnedMaterial* gnMat = new Trk::BinnedMaterial(barrelProperties,gn,glay,matITC);
+ const Trk::BinnedMaterial* gnMat = new Trk::BinnedMaterial(barrelProperties.get(),gn,glay,matITC);
Trk::AlignableTrackingVolume* gapNeg = new Trk::AlignableTrackingVolume(gapNegTransform, align,
gapBounds->clone(),
@@ -795,6 +795,9 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
printCheckResult(msg(MSG::DEBUG), tileGirder);
} // end of detailed output
+ throwIntoGarbage (std::move (barrelProperties));
+ throwIntoGarbage (std::move (extendedBarrelProperties));
+
return tileTrackingVolumes;
}
@@ -857,3 +860,10 @@ void Tile::TileVolumeBuilder::printChildren(const PVConstLink pv,int igen, Amg::
}
}
+
+
+void Tile::TileVolumeBuilder::throwIntoGarbage (std::unique_ptr<Trk::Material> mat) const
+{
+ std::scoped_lock lock (m_garbageMutex);
+ m_garbage.push_back (std::move (mat));
+}
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh
index f60236d56b2993128a3a3ba98d54c3c6aefc92ac..dff226907f85ce8206a66671304173e3117db593 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_https.sh
@@ -9,6 +9,6 @@
set -e
export ATHENA_CORE_NUMBER=2
-Reco_tf.py --AMI q431 --multiprocess--inputBSFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
+Reco_tf.py --AMI q431 --multiprocess --inputBSFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_HTTPS"
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh
index 7e19dba9ff457af307e3d82c648d3248ad120e10..90c4403d0741d62e3792a0784fbb9be2283262b9 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_raw_root.sh
@@ -9,6 +9,6 @@
set -e
export ATHENA_CORE_NUMBER=2
-Reco_tf.py --AMI q431 --multiproces --inputBSFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
+Reco_tf.py --AMI q431 --multiprocess --inputBSFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data15_13TeV/71/42/data15_13TeV.00284285.physics_Main.daq.RAW._lb0856._SFO-1._0003.data --outputESDFile art.pool.root
echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputBS_protocol_ROOT"
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 0fbea1060ec9066ea5bee727c901d0cd42320a9d..3be71b3829ddcceb2a6ab279d13f64292183bb2e 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
- 284500 87473001 122 130 4 1 8 2 6 7 4 3
+ 284500 87473001 122 129 4 1 8 2 6 7 4 3
284500 87473014 83 80 6 0 10 1 9 7 5 2
- 284500 87473022 38 29 4 0 4 1 3 3 2 1
+ 284500 87473022 38 30 4 0 4 2 2 4 3 1
284500 87473032 30 33 4 1 10 4 6 5 2 3
- 284500 87473037 62 38 7 0 12 2 10 6 4 2
- 284500 87473040 107 96 10 1 17 1 16 10 5 5
- 284500 87473051 140 112 11 1 16 1 15 23 16 7
+ 284500 87473037 62 39 7 0 13 2 11 5 3 2
+ 284500 87473040 107 95 10 1 17 1 16 10 5 5
+ 284500 87473051 140 111 11 1 16 1 15 23 16 7
284500 87473063 62 76 5 2 7 1 6 6 4 2
284500 87473068 25 34 1 1 0 0 0 0 0 0
- 284500 87473075 60 85 6 0 5 0 5 6 5 1
- 284500 87473084 78 85 7 2 14 1 13 9 3 6
+ 284500 87473075 60 87 6 0 5 0 5 6 5 1
+ 284500 87473084 78 87 7 2 14 1 13 9 3 6
284500 87473091 41 49 3 0 4 2 2 4 2 2
284500 87473096 66 75 3 2 3 0 3 4 3 1
- 284500 87473104 64 62 6 0 5 1 4 4 3 1
- 284500 87473114 89 81 7 2 12 1 11 9 6 3
+ 284500 87473104 64 63 6 0 6 2 4 4 3 1
+ 284500 87473114 89 80 7 2 12 1 11 9 6 3
284500 87473121 93 100 6 3 15 4 11 8 6 2
- 284500 87473132 84 57 9 1 12 0 12 3 3 0
- 284500 87473137 94 70 8 3 15 0 15 8 8 0
- 284500 87473144 78 65 7 1 8 2 6 8 6 2
- 284500 87473154 86 88 7 0 13 3 10 10 4 6
- 284500 87473162 53 52 4 0 7 0 7 3 2 1
+ 284500 87473132 84 56 9 1 12 0 12 3 3 0
+ 284500 87473137 94 71 8 3 15 0 15 9 9 0
+ 284500 87473144 78 66 7 1 8 2 6 8 6 2
+ 284500 87473154 86 88 7 0 14 3 11 9 4 5
+ 284500 87473162 53 51 4 0 7 0 7 3 2 1
284500 87473167 77 54 6 3 14 2 12 13 8 5
- 284500 87473171 77 70 8 3 4 2 2 6 5 1
- 284500 87473184 75 86 5 2 8 1 7 5 3 2
+ 284500 87473171 77 69 8 3 4 2 2 5 4 1
+ 284500 87473184 75 87 5 2 8 1 7 5 3 2
284500 87473192 55 52 4 1 7 4 3 5 4 1
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 997e935bd5782d51fb237592f6d83a4b0745d99b..fa7194dfd35bf013b8502adea860043314ec573e 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons
330470 1183722158 1 0 0 0
- 330470 1183722342 394 429 16 0
- 330470 1183727953 532 588 11 4
- 330470 1183732647 467 484 12 1
+ 330470 1183722342 394 428 16 0
+ 330470 1183727953 532 590 11 4
+ 330470 1183732647 467 485 12 1
330470 1183733040 381 288 6 1
330470 1183734651 361 368 14 3
- 330470 1183735332 406 386 9 1
- 330470 1183736475 741 686 15 1
+ 330470 1183735332 406 385 9 1
+ 330470 1183736475 741 684 15 1
330470 1183738728 1 0 0 0
330470 1183738949 368 444 9 1
330470 1183742489 152 127 2 1
330470 1183743040 285 326 5 0
- 330470 1183746343 492 495 12 0
+ 330470 1183746343 492 492 12 0
330470 1183746710 6 0 0 0
330470 1183751782 239 246 2 0
330470 1183752624 347 366 7 2
330470 1183753006 357 398 11 3
330470 1183754806 470 423 14 0
- 330470 1183769295 342 336 7 2
+ 330470 1183769295 342 335 7 2
330470 1183769939 348 362 10 3
330470 1183773832 307 209 7 0
330470 1183775209 57 0 0 0
- 330470 1183787124 431 382 10 2
+ 330470 1183787124 431 383 10 2
330470 1183787946 321 324 5 1
330470 1183795329 458 355 18 0
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index f8d45345731f77dd1435e9f3e1b8fdf12b73d5f5..8ccd831bb2faf218696cdd8f72d7fbf8f4df4977 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -31,10 +31,10 @@ ciRefFileMap = {
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
'overlay-d1498-22.0' : 'v38',
- 'overlay-d1592-22.0' : 'v1',
+ 'overlay-d1592-22.0' : 'v2',
'overlay-bkg-21.0' : 'v1',
'overlay-bkg-22.0' : 'v4',
- 'dataoverlay-d1590-22.0' : 'v4',
+ 'dataoverlay-d1590-22.0' : 'v5',
'dataoverlay-hits-22.0' : 'v1',
}
diff --git a/Tools/PyJobTransforms/python/trfAMI.py b/Tools/PyJobTransforms/python/trfAMI.py
index 2c3fd4044963d5f9d076bc8c6f361ece88fda70a..8cbf661b2c92eff49689215f27f3495fc5028754 100644
--- a/Tools/PyJobTransforms/python/trfAMI.py
+++ b/Tools/PyJobTransforms/python/trfAMI.py
@@ -356,13 +356,11 @@ def getTrfConfigFromPANDA(tag):
if arg.lstrip('-').startswith('input') and arg.endswith('File'):
value=physics.pop(arg)
msg.debug("Found input file argument %s=%s.", arg, value )
- fmt=arg.lstrip('-').replace('input','').replace('File','')
- trf.inFiles[arg]=getInputFileName(arg)
+ trf.inFiles[arg]=value
elif arg.lstrip('-').startswith('output') and arg.endswith('File'):
value=physics.pop(arg)
msg.debug("Found output file argument %s=%s.", arg, value )
- fmt=arg.lstrip('-').replace('output','').replace('File','')
- trf.outFiles[arg]=getOutputFileName(fmt)
+ trf.outFiles[arg]=value
msg.debug("Checking for not set arguments...")
for arg,value in listitems(physics):
@@ -471,7 +469,7 @@ def getTrfConfigFromAMI(tag, suppressNonJobOptions = True):
if suppressNonJobOptions:
for k in list(physics):
- if k in ['productionStep', 'transformation', 'SWReleaseCache']:
+ if k in ['inputs', 'outputs', 'productionStep', 'transformation', 'SWReleaseCache']:
physics.pop(k)
for k, v in iteritems(physics):
@@ -490,13 +488,11 @@ def getTrfConfigFromAMI(tag, suppressNonJobOptions = True):
if arg.lstrip('-').startswith('input') and arg.endswith('File'):
value = physics.pop(arg)
msg.debug("Found input file argument %s=%s.", arg, value)
- fmt = arg.lstrip('-').replace('input', '').replace('File', '')
- trf.inFiles[arg] = getInputFileName(arg)
+ trf.inFiles[arg] = value
elif arg.lstrip('-').startswith('output') and arg.endswith('File'):
value = physics.pop(arg)
msg.debug("Found output file argument %s=%s.", arg, value)
- fmt = arg.lstrip('-').replace('output', '').replace('File', '')
- trf.outFiles[arg] = getOutputFileName(fmt)
+ trf.outFiles[arg] = value
msg.debug("Checking for not set arguments...")
for arg, value in listitems(physics):
diff --git a/Tools/PyJobTransforms/test/test_trfAMI.py b/Tools/PyJobTransforms/test/test_trfAMI.py
index 143d070c90ce1edfa9e4f3f0aa734489bbfccbc2..7a53f02421ff81992f58fd43be7b87dcac82461e 100755
--- a/Tools/PyJobTransforms/test/test_trfAMI.py
+++ b/Tools/PyJobTransforms/test/test_trfAMI.py
@@ -154,7 +154,9 @@ class trfAMIUnitTests(unittest.TestCase):
self.assertEqual(tag.trfs[0].release, 'AtlasProduction,19.1.1.9')
self.assertEqual(tag.trfs[0].newTransform, True)
self.assertEqual(tag.trfs[0].physics, physics)
- self.assertEqual(tag.trfs[0].inFiles, {'inputHighPtMinbiasHitsFile': 'myHighPtMinbiasHits', 'inputLowPtMinbiasHitsFile': 'myLowPtMinbiasHits'})
+ self.assertEqual(tag.trfs[0].inFiles, {
+ 'inputHighPtMinbiasHitsFile': 'mc14_13TeV.119996.Pythia8_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3038_s1967_s2007',
+ 'inputLowPtMinbiasHitsFile': 'mc14_13TeV.119995.Pythia8_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3038_s1967_s2007'})
self.assertEqual(tag.trfs[0].outFiles, {})
self.assertEqual(tag.trfs[0].outputs, {})
self.assertEqual(tag.trfs[0].inDS, None)
@@ -223,8 +225,9 @@ class trfAMIUnitTests(unittest.TestCase):
self.assertEqual(tag.trfs[0].release, 'AtlasProduction,20.1.4.5')
self.assertEqual(tag.trfs[0].newTransform, True)
self.assertEqual(tag.trfs[0].physics, physics)
- self.assertEqual(tag.trfs[0].inFiles, {'inputHighPtMinbiasHitsFile': 'myHighPtMinbiasHits',
- 'inputLowPtMinbiasHitsFile': 'myLowPtMinbiasHits'})
+ self.assertEqual(tag.trfs[0].inFiles, {
+ 'inputHighPtMinbiasHitsFile': 'mc15_valid.361035.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3581_s2578_s2169_tid05098387_00',
+ 'inputLowPtMinbiasHitsFile': 'mc15_valid.361034.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3581_s2578_s2169_tid05098374_00'})
self.assertEqual(tag.trfs[0].outFiles, {})
self.assertEqual(tag.trfs[0].outputs, {})
self.assertEqual(tag.trfs[0].inDS, None)
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
index d87153490dbf123def419f9078d6f3bbf0970b07..88776414085941ce55990d390f6005a22da8048e 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
@@ -25,7 +25,7 @@
namespace Acts {
class TrackingGeometry;
namespace detail {
- class Step;
+ struct Step;
}
}
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/IActsPropStepRootWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/IActsPropStepRootWriterSvc.h
index abcde5cd7fa2e8cce3768000d2ecf431f497f3e2..e7653a923bcfffd8928e58b70cd9df17cc2c7984 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/IActsPropStepRootWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/IActsPropStepRootWriterSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ACTSGEOMETRY_IACTSPROPSTEPROOTWRITERSVC_H
@@ -10,7 +10,7 @@
namespace Acts {
namespace detail {
- class Step;
+ struct Step;
}
}
diff --git a/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx b/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx
index 6229793ec97c2e20f0f6de51dfa8761f43da190f..5e8c33835bd5ab150553a839494de1da941f59da 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ActsGeometry/ActsPropStepRootWriterSvc.h"
@@ -120,8 +120,6 @@ ActsPropStepRootWriterSvc::writeThread()
void
ActsPropStepRootWriterSvc::doWrite(const StepVector& steps, size_t evtNum)
{
- using ag = Acts::GeometryIdentifier;
-
m_eventNum = evtNum;
m_s_pX.clear();
m_s_pY.clear();
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/BinnedMaterial.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/BinnedMaterial.h
index d7bcd1bc2cda00b7c3c941c17715bb496e2cb901..b3f05a29713e479d9df87dc56d8483fd29fbadb1 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/BinnedMaterial.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/BinnedMaterial.h
@@ -53,11 +53,11 @@ namespace Trk {
{}
/** Constructor with averaged material and binning in 1D*/
- BinnedMaterial(const Material*& mat, BinUtility*& bu, const std::vector<size_t>& index,
+ BinnedMaterial(const Material* mat, BinUtility*& bu, const std::vector<size_t>& index,
const std::vector<IdentifiedMaterial>& detailedMat);
/** Constructor with averaged material and binning in 2D*/
- BinnedMaterial(const Material*& mat, BinUtility*& bu, std::vector< Trk::BinUtility*>& bVec,
+ BinnedMaterial(const Material* mat, BinUtility*& bu, std::vector< Trk::BinUtility*>& bVec,
const std::vector<std::vector<size_t> >& index,
const std::vector<IdentifiedMaterial>& detailedMat);
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/BinnedMaterial.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/BinnedMaterial.cxx
index 351094fa2cfa695d1c8d28971c1581c22088caa3..dea51ba1813e750af641b142f906748a36846755 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/src/BinnedMaterial.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/BinnedMaterial.cxx
@@ -5,7 +5,7 @@
#include "TrkGeometry/BinnedMaterial.h"
/** Constructor with averaged material and binning in 1D*/
-Trk::BinnedMaterial::BinnedMaterial(const Trk::Material*& mat, Trk::BinUtility*& bu, const std::vector<size_t>& index,
+Trk::BinnedMaterial::BinnedMaterial(const Trk::Material* mat, Trk::BinUtility*& bu, const std::vector<size_t>& index,
const std::vector<Trk::IdentifiedMaterial>& detailedMat ) :
Trk::Material(*mat),
m_matVec (detailedMat),
@@ -14,7 +14,7 @@ Trk::BinnedMaterial::BinnedMaterial(const Trk::Material*& mat, Trk::BinUtility*&
}
/** Constructor with averaged material and binning in 2D*/
-Trk::BinnedMaterial::BinnedMaterial(const Trk::Material*& mat, Trk::BinUtility*& bu, std::vector< Trk::BinUtility*>& bVec,
+Trk::BinnedMaterial::BinnedMaterial(const Trk::Material* mat, Trk::BinUtility*& bu, std::vector< Trk::BinUtility*>& bVec,
const std::vector<std::vector<size_t> >& index,
const std::vector<Trk::IdentifiedMaterial>& detailedMat ) :
Trk::Material(*mat),
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.h
index 60ee6ea87fed1f56e8807a616da6585214a3295f..d38c5f9e771410f817509915881c672c1128aeab 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.h
@@ -9,9 +9,7 @@
#ifndef TRKSURFACES_DISTANCESOLUTION_H
#define TRKSURFACES_DISTANCESOLUTION_H
-// STD
-#include <iostream>
-#include <math.h>
+#include <cmath>
namespace Trk {
@@ -26,14 +24,19 @@ namespace Trk {
class DistanceSolution
{
public:
- /**Default Constructor*/
- DistanceSolution();
-
- /**Constructor*/
- DistanceSolution(int num, double current = 0., bool signedDist = false, double first = 0., double second = 0.);
-
- /**Destructor*/
- virtual ~DistanceSolution() = default;
+ DistanceSolution() = default;
+ DistanceSolution(const DistanceSolution&) = default;
+ DistanceSolution(DistanceSolution&&) = default;
+ DistanceSolution& operator=(const DistanceSolution&) = default;
+ DistanceSolution& operator=(DistanceSolution&&) = default;
+ ~DistanceSolution() = default;
+
+ /**Constructor*/
+ DistanceSolution(int num,
+ double current = 0.,
+ bool signedDist = false,
+ double first = 0.,
+ double second = 0.);
// methods to access solutions
/** Number of intersection solutions*/
@@ -42,7 +45,8 @@ public:
/** Distance to first intersection solution along direction*/
double first() const;
- /** Distance to second intersection solution along direction (for a cylinder surface)*/
+ /** Distance to second intersection solution along direction (for a cylinder
+ * surface)*/
double second() const;
/** Absolute Distance to closest solution */
@@ -51,14 +55,15 @@ public:
/** Distance to point of closest approach along direction*/
double toPointOfClosestApproach() const;
- /** Current distance to surface (spatial), signed (along/opposite to surface normal) if input argument true (absolute
- * value by default)*/
+ /** Current distance to surface (spatial), signed (along/opposite to surface
+ * normal) if input argument true (absolute value by default)*/
double currentDistance(bool signedDist = false) const;
- /** This method indicates availability of signed current distance (false for Perigee and StraighLineSurface) */
+ /** This method indicates availability of signed current distance (false for
+ * Perigee and StraighLineSurface) */
bool signedDistance() const;
-protected:
+private:
int m_num;
double m_first;
double m_second;
@@ -66,54 +71,7 @@ protected:
bool m_signedDist;
};
-inline int
-DistanceSolution::numberOfSolutions() const
-{
- return m_num;
-}
-
-inline double
-DistanceSolution::first() const
-{
- return m_first;
-}
-
-inline double
-DistanceSolution::second() const
-{
- return m_second;
-}
-
-inline double
-DistanceSolution::absClosest() const
-{
- if (m_num > 1)
- return (m_first * m_first < m_second * m_second) ? fabs(m_first) : fabs(m_second);
- else
- return fabs(m_first);
-}
-
-inline double
-DistanceSolution::toPointOfClosestApproach() const
-{
- return m_first;
-}
-
-inline double
-DistanceSolution::currentDistance(bool signedDist) const
-{
- if (signedDist)
- return m_current;
- else
- return fabs(m_current);
-}
-
-inline bool
-DistanceSolution::signedDistance() const
-{
- return m_signedDist;
-}
-
} // end of namespace
+#include "TrkSurfaces/DistanceSolution.icc"
#endif // TRKSURFACES_DISTANCESOLUTION_H
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.icc
new file mode 100644
index 0000000000000000000000000000000000000000..15ef7e32d23aef44aad1bbcc8319eae1f3bb6b93
--- /dev/null
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DistanceSolution.icc
@@ -0,0 +1,69 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+namespace Trk {
+inline DistanceSolution::DistanceSolution(int num,
+ double current,
+ bool signedDist,
+ double first,
+ double second)
+ : m_num(num)
+ , m_first(first)
+ , m_second(second)
+ , m_current(current)
+ , m_signedDist(signedDist)
+{}
+
+inline int
+DistanceSolution::numberOfSolutions() const
+{
+ return m_num;
+}
+
+inline double
+DistanceSolution::first() const
+{
+ return m_first;
+}
+
+inline double
+DistanceSolution::second() const
+{
+ return m_second;
+}
+
+inline double
+DistanceSolution::absClosest() const
+{
+ if (m_num > 1) {
+ return (m_first * m_first < m_second * m_second) ? std::abs(m_first)
+ : std::abs(m_second);
+ } else {
+ return std::abs(m_first);
+ }
+}
+
+inline double
+DistanceSolution::toPointOfClosestApproach() const
+{
+ return m_first;
+}
+
+inline double
+DistanceSolution::currentDistance(bool signedDist) const
+{
+ if (signedDist) {
+ return m_current;
+ } else {
+ return std::abs(m_current);
+ }
+}
+
+inline bool
+DistanceSolution::signedDistance() const
+{
+ return m_signedDist;
+}
+
+} // end of namespace
+
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/src/DistanceSolution.cxx b/Tracking/TrkDetDescr/TrkSurfaces/src/DistanceSolution.cxx
deleted file mode 100644
index a7d7a4cdf54896944a2b300672f0aa0f5635abf6..0000000000000000000000000000000000000000
--- a/Tracking/TrkDetDescr/TrkSurfaces/src/DistanceSolution.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// DistanceSolution.cxx, (c) ATLAS Detector Software
-///////////////////////////////////////////////////////////////////
-
-// Trk
-#include "TrkSurfaces/DistanceSolution.h"
-
-// default constructor
-Trk::DistanceSolution::DistanceSolution()
- : m_num()
- , m_first()
- , m_second()
- , m_current()
- , m_signedDist()
-{}
-
-// constructor
-Trk::DistanceSolution::DistanceSolution(int num, double current, bool signedDist, double first, double second)
- : m_num(num)
- , m_first(first)
- , m_second(second)
- , m_current(current)
- , m_signedDist(signedDist)
-{}
diff --git a/Tracking/TrkEvent/TrkPatternParameters/TrkPatternParameters/PatternTrackParameters.h b/Tracking/TrkEvent/TrkPatternParameters/TrkPatternParameters/PatternTrackParameters.h
index 977d9bfda6ff21e27c2a007747609fd2c61b622f..846dcd8416053b7511cc86ca73310457f45698ad 100755
--- a/Tracking/TrkEvent/TrkPatternParameters/TrkPatternParameters/PatternTrackParameters.h
+++ b/Tracking/TrkEvent/TrkPatternParameters/TrkPatternParameters/PatternTrackParameters.h
@@ -206,7 +206,7 @@ namespace Trk {
inline void PatternTrackParameters::setParameters
(const Surface* s,const double* p)
{
- m_surface.reset(s->isFree() ? s->clone() : s);
+ m_surface.reset(s && s->isFree() ? s->clone() : s);
m_parameters[ 0] = p[ 0];
m_parameters[ 1] = p[ 1];
m_parameters[ 2] = p[ 2];
@@ -250,7 +250,7 @@ namespace Trk {
inline void PatternTrackParameters::setParametersWithCovariance
(const Surface* s,const double* p,const double* c)
{
- m_surface.reset(s->isFree() ? s->clone() : s);
+ m_surface.reset(s && s->isFree() ? s->clone() : s);
m_parameters[ 0] = p[ 0];
m_parameters[ 1] = p[ 1];
m_parameters[ 2] = p[ 2];
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
index 27073c6f43112a5e23e4e7437221c02fa04e781d..51abc695c50fc4dd0ad74de7066c989ba0108767 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
@@ -531,6 +531,9 @@ Trk::Extrapolator::extrapolateStepwiseImpl(const EventContext& ctx,
msg << "Will not cleanup " << static_cast<const void*>(cache.m_parametersOnDetElements);
throw std::logic_error(msg.str());
}
+ for (const Trk::TrackParameters* p : tmp) {
+ delete p;
+ }
tmp.clear();
}
return Trk::TrackParametersUVector(tmp.begin(), tmp.end());
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
index 3607f5e1b0c5ff11f74435934e689865e7f7321b..a623f6875f2de3dcf2dbfbb8cd412554e76dfd98 100644
--- a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
+++ b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
@@ -405,63 +405,44 @@ void Trk::TrkMaterialProviderTool::getCaloMEOT(const Trk::Track& idTrack, const
#endif
// find last ID TSOS
- DataVector<const Trk::TrackStateOnSurface>::const_iterator lastIDwP = inputTSOS_ID->end();
- DataVector<const Trk::TrackStateOnSurface>::const_iterator it = inputTSOS_ID->end()-1;
- DataVector<const Trk::TrackStateOnSurface>::const_iterator itFront = inputTSOS_ID->begin();
- while(*it) {
+ DataVector<const Trk::TrackStateOnSurface>::const_reverse_iterator lastIDwP = inputTSOS_ID->rbegin();
+ for (auto it = inputTSOS_ID->rbegin(); it != inputTSOS_ID->rend(); ++it) {
if(this->getVolumeByGeo(*it)==1 && (*it)->trackParameters()) {
lastIDwP = it;
break;
}
- if(it==itFront) break;
- --it;
}
// find first MS TSOS
DataVector<const Trk::TrackStateOnSurface>::const_iterator firstMS = inputTSOS_MS->end();
DataVector<const Trk::TrackStateOnSurface>::const_iterator firstMSwP = inputTSOS_MS->end();
- it = inputTSOS_MS->begin();
DataVector<const Trk::TrackStateOnSurface>::const_iterator itEnd = inputTSOS_MS->end();
- for(; it!=itEnd; ++it) {
+ for(auto it = inputTSOS_MS->begin(); it!=itEnd ; ++it) {
if(this->getVolumeByGeo(*it)==3) {// && !(*it)->type(Trk::TrackStateOnSurface::Perigee)) {
if(firstMS==itEnd)
- firstMS = it;
+ firstMS = it;
if((*it)->trackParameters() && (*it)->trackParameters()->covariance()) {
- firstMSwP = it;
- break;
+ firstMSwP = it;
+ break;
}
}
}
- if(lastIDwP == inputTSOS_ID->end()) {
+ if(lastIDwP == inputTSOS_ID->rbegin()) {
ATH_MSG_WARNING("Unable to find last ID TSOS with Track Parameters");
ATH_MSG_WARNING("Unable to update Calorimeter TSOS");
- /** deprecated outputLevel()
- if(outputLevel() >= MSG::VERBOSE) {
- for(auto m : *inputTSOS_ID)
- printTSOS(m, "DEBUG-ID-TSOS");
- }
- **/
return;
}
if(firstMS == inputTSOS_MS->end()) {
ATH_MSG_WARNING("Unable to find first MS TSOS");
ATH_MSG_WARNING("Unable to update Calorimeter TSOS");
- /** deprecated outputLevel()
- if(outputLevel() >= MSG::VERBOSE) {
- for(auto m : *inputTSOS_MS)
- printTSOS(m, "DEBUG-MS-TSOS");
- }
- **/
return;
}
// check that first MS TSOS is not a PerigeeSurface
- //bool removeOoC = false;
DataVector<const Trk::TrackStateOnSurface>::const_iterator firstMSnotPerigee = firstMS;
if( (*firstMS)->type(Trk::TrackStateOnSurface::Perigee) && (firstMS+1)!=inputTSOS_MS->end()) {
firstMSnotPerigee=firstMS+1;
- //removeOoC = true;
}
#ifdef DEBUGON
diff --git a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthToTrack.h b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthToTrack.h
index ff2438d11c26c3bfb67a77c661bd0f8eba823351..2e0801ba13a2cfc9328bf94593425365eabe9026 100644
--- a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthToTrack.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthToTrack.h
@@ -51,7 +51,7 @@ namespace Trk {
* object. (Wrapping it into a smart pointer may be the most
* convenient way to make sure the memory is freed.)
*/
- virtual const Trk::TrackParameters* makeProdVertexParameters(const HepMC::GenParticle* part) const = 0;
+ virtual const Trk::TrackParameters* makeProdVertexParameters(HepMC::ConstGenParticlePtr part) const = 0;
virtual const Trk::TrackParameters* makeProdVertexParameters(const xAOD::TruthParticle* part) const = 0;
/** This function extrapolates track to the perigee, and returns
@@ -61,7 +61,7 @@ namespace Trk {
* operator new. The caller is responsible for deletion of the
* object.
*/
- virtual const Trk::TrackParameters* makePerigeeParameters(const HepMC::GenParticle* part) const = 0;
+ virtual const Trk::TrackParameters* makePerigeeParameters(HepMC::ConstGenParticlePtr part) const = 0;
virtual const Trk::TrackParameters* makePerigeeParameters(const xAOD::TruthParticle* part) const = 0;
};
diff --git a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthTrajectoryBuilder.h b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthTrajectoryBuilder.h
index 61e708ffe730eb9a70a435936e12d8ac139059b4..b67b81d0c43d85216fcf404bb4a09a483a980364 100644
--- a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthTrajectoryBuilder.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITruthTrajectoryBuilder.h
@@ -29,13 +29,13 @@ namespace Trk {
/** Build a TruthTrajectory this particle belongs to.
* The result may be an empty TruthTrajectory (in case input did not pass the cuts).
*/
- virtual void buildTruthTrajectory(TruthTrajectory *result, const HepMC::GenParticle *input) const = 0;
+ virtual void buildTruthTrajectory(TruthTrajectory *result, HepMC::ConstGenParticlePtr input) const = 0;
/** Previous particle on the truth trajectory or 0 */
- virtual const HepMC::GenParticle *getMother(const HepMC::GenParticle *part) const = 0;
+ virtual HepMC::ConstGenParticlePtr getMother(HepMC::ConstGenParticlePtr part) const = 0;
/** Next particle on the truth trajectory or 0 */
- virtual const HepMC::GenParticle *getDaughter(const HepMC::GenParticle *part) const = 0;
+ virtual HepMC::ConstGenParticlePtr getDaughter(HepMC::ConstGenParticlePtr part) const = 0;
};
} // namespace Trk
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/DecayInFlyTruthTrajectoryBuilder.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/DecayInFlyTruthTrajectoryBuilder.cxx
index 1a77376c8404b5a6a9374dd531727b01907f0ac5..6752fe0d1b6a73086382770d40aaf903573d5b5a 100644
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/DecayInFlyTruthTrajectoryBuilder.cxx
+++ b/Tracking/TrkTools/TrkTruthCreatorTools/src/DecayInFlyTruthTrajectoryBuilder.cxx
@@ -36,17 +36,17 @@ StatusCode DecayInFlyTruthTrajectoryBuilder::initialize() {
//================================================================
void DecayInFlyTruthTrajectoryBuilder::
-buildTruthTrajectory(TruthTrajectory *result, const HepMC::GenParticle *input) const
+buildTruthTrajectory(TruthTrajectory *result, HepMC::ConstGenParticlePtr input) const
{
result->clear();
if(input) {
- const HepMC::GenParticle *next(nullptr);
- const HepMC::GenParticle *current = input;
+ HepMC::ConstGenParticlePtr next{nullptr};
+ HepMC::ConstGenParticlePtr current = input;
// Extend trajectory outwards. The last particle should go at [0]
// in the TruthTrajectory, so we need to use a tmp storage while
// traversing the structure.
- std::stack<const HepMC::GenParticle*> tmp;
+ std::stack<HepMC::ConstGenParticlePtr> tmp;
while( (next = getDaughter(current)) ) {
tmp.push(current = next);
}
@@ -69,18 +69,11 @@ buildTruthTrajectory(TruthTrajectory *result, const HepMC::GenParticle *input) c
//================================================================
DecayInFlyTruthTrajectoryBuilder::MotherDaughter
-DecayInFlyTruthTrajectoryBuilder::truthTrajectoryCuts(const HepMC::GenVertex *vtx) const
+DecayInFlyTruthTrajectoryBuilder::truthTrajectoryCuts(HepMC::ConstGenVertexPtr vtx) const
{
- const HepMC::GenParticle *mother(nullptr);
- const HepMC::GenParticle *daughter(nullptr);
-
- // only truth vertices with 1 incoming particle
- if(vtx && (vtx->particles_in_size() == 1)) {
-
- mother = *vtx->particles_in_const_begin();
- // Allow status code 1 and 2. E.g. a pion that produced a long track can decay outside of InDet and have status==2.
- if( mother && (mother->status() < 3) ) {
-
+ HepMC::ConstGenParticlePtr mother{nullptr};
+ HepMC::ConstGenParticlePtr daughter{nullptr};
+ // only truth vertices with 1 incoming particle
// Restrict to quasi-elastic processes (e.g. brems, delta-rays, pi->pi+Delta).
//
// Require not more than 2 outgoing particles. Note that
@@ -89,14 +82,21 @@ DecayInFlyTruthTrajectoryBuilder::truthTrajectoryCuts(const HepMC::GenVertex *vt
// is that with the higher energy (NOT pt).
//
// allow 1 outgoing to cover possible vertexes from interaction in detector material
- if (vtx->particles_out_size() <= 2) {
+#ifdef HEPMC3
+ if(vtx && (vtx->particles_in().size() == 1) && (vtx->particles_out().size() <= 2) ) {
+
+ mother = vtx->particles_in().front();
+#else
+ if(vtx && (vtx->particles_in_size() == 1) && (vtx->particles_out_size() <= 2) ) {
+
+ mother = *vtx->particles_in_const_begin();
+#endif
+ // Allow status code 1 and 2. E.g. a pion that produced a long track can decay outside of InDet and have status==2.
+ if( mother && (mother->status() < 3) ) {
int num_passed_cuts = 0;
- const HepMC::GenParticle *passed_cuts(nullptr);
- for(HepMC::GenVertex::particles_in_const_iterator it = vtx->particles_out_const_begin();
- it != vtx->particles_out_const_end(); ++it) {
-
- const HepMC::GenParticle *candidate = *it;
+ HepMC::ConstGenParticlePtr passed_cuts{nullptr};
+ for(HepMC::ConstGenParticlePtr candidate: *vtx){
if(candidate->pdg_id() == mother->pdg_id()) {
if(passed_cuts && (mother->pdg_id() == 11)) { // second negative electron is a special case
@@ -119,8 +119,6 @@ DecayInFlyTruthTrajectoryBuilder::truthTrajectoryCuts(const HepMC::GenVertex *vt
if(num_passed_cuts==1) { // disallow hadronic pi->N*pi etc.
daughter = passed_cuts;
}
-
- } // if (vtx->particles_out_size() <= 2)
} // if( mother && (mother->status() == 1) )
}
@@ -128,9 +126,9 @@ DecayInFlyTruthTrajectoryBuilder::truthTrajectoryCuts(const HepMC::GenVertex *vt
}
//================================================================
-const HepMC::GenParticle* DecayInFlyTruthTrajectoryBuilder::getDaughter(const HepMC::GenParticle* mother) const {
+HepMC::ConstGenParticlePtr DecayInFlyTruthTrajectoryBuilder::getDaughter(HepMC::ConstGenParticlePtr mother) const {
- const HepMC::GenParticle *daughter = nullptr;
+ HepMC::ConstGenParticlePtr daughter{nullptr};
if(mother) {
@@ -145,9 +143,9 @@ const HepMC::GenParticle* DecayInFlyTruthTrajectoryBuilder::getDaughter(const He
}
//================================================================
-const HepMC::GenParticle* DecayInFlyTruthTrajectoryBuilder::getMother(const HepMC::GenParticle* daughter) const {
+HepMC::ConstGenParticlePtr DecayInFlyTruthTrajectoryBuilder::getMother(HepMC::ConstGenParticlePtr daughter) const {
- const HepMC::GenParticle *mother = nullptr;
+ HepMC::ConstGenParticlePtr mother{nullptr};
if(daughter) {
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/DetailedTrackTruthBuilder.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/DetailedTrackTruthBuilder.cxx
index e560005102d3c15c47fc65608d53cfdb865f4dab..04e2724ff88ce47df8cfa86cb09da857d20beca7 100755
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/DetailedTrackTruthBuilder.cxx
+++ b/Tracking/TrkTools/TrkTruthCreatorTools/src/DetailedTrackTruthBuilder.cxx
@@ -165,7 +165,7 @@ buildDetailedTrackTruth(DetailedTrackTruthCollection *output,
const TruthTrajectory& t = i->second.trajectory();
msg(MSG::VERBOSE)<<"Particles on the trajectory:\n";
for(unsigned k=0; k<t.size(); ++k) {
- msg(MSG::VERBOSE)<<*t[k]<<"\n";
+ msg(MSG::VERBOSE)<<t[k]<<"\n";
}
msg(MSG::VERBOSE)<<"\n"<<endmsg;
}
@@ -353,12 +353,12 @@ void DetailedTrackTruthBuilder::addTrack(DetailedTrackTruthCollection *output,
while(!seeds.empty()) {
HepMcParticleLink link = *seeds.begin();
Sprout current_sprout;
- std::queue<const HepMC::GenParticle*> tmp;
+ std::queue<HepMC::ConstGenParticlePtr> tmp;
ExtendedEventIndex eventIndex(link, proxy);
const HepMC::GenParticle *current = link.cptr();
do {
- HepMcParticleLink curlink( eventIndex.makeLink(current->barcode(), proxy));
+ HepMcParticleLink curlink( eventIndex.makeLink(HepMC::barcode(current), proxy));
// remove the current particle from the list of particles to consider (if it is still there)
seeds.erase(curlink);
@@ -410,7 +410,7 @@ void DetailedTrackTruthBuilder::addTrack(DetailedTrackTruthCollection *output,
// This may add only hits that are *not* on the current track.
// Thus no need to update stats track and stats common.
- const HepMC::GenParticle* current = *s->second.begin();
+ auto current = *s->second.begin();
while( (current = m_truthTrajBuilder->getDaughter(current)) ) {
s->second.push_front(current);
}
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/ElasticTruthTrajectoryBuilder.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/ElasticTruthTrajectoryBuilder.cxx
index be2b26513633c4e512218be24255bec0cea5eedc..5a76927964deadcff3abebe627b2c36448047fb4 100644
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/ElasticTruthTrajectoryBuilder.cxx
+++ b/Tracking/TrkTools/TrkTruthCreatorTools/src/ElasticTruthTrajectoryBuilder.cxx
@@ -36,17 +36,17 @@ StatusCode ElasticTruthTrajectoryBuilder::initialize() {
//================================================================
void ElasticTruthTrajectoryBuilder::
-buildTruthTrajectory(TruthTrajectory *result, const HepMC::GenParticle *input) const
+buildTruthTrajectory(TruthTrajectory *result, HepMC::ConstGenParticlePtr input) const
{
result->clear();
if(input) {
- const HepMC::GenParticle *next(nullptr);
- const HepMC::GenParticle *current = input;
+ HepMC::ConstGenParticlePtr next(nullptr);
+ HepMC::ConstGenParticlePtr current = input;
// Extend trajectory outwards. The last particle should go at [0]
// in the TruthTrajectory, so we need to use a tmp storage while
// traversing the structure.
- std::stack<const HepMC::GenParticle*> tmp;
+ std::stack<HepMC::ConstGenParticlePtr> tmp;
while( (next = getDaughter(current)) ) {
tmp.push(current = next);
}
@@ -69,15 +69,19 @@ buildTruthTrajectory(TruthTrajectory *result, const HepMC::GenParticle *input) c
//================================================================
ElasticTruthTrajectoryBuilder::MotherDaughter
- ElasticTruthTrajectoryBuilder::truthTrajectoryCuts(const HepMC::GenVertex *vtx) const
+ ElasticTruthTrajectoryBuilder::truthTrajectoryCuts(HepMC::ConstGenVertexPtr vtx) const
{
- const HepMC::GenParticle *mother(nullptr);
- const HepMC::GenParticle *daughter(nullptr);
-
+ HepMC::ConstGenParticlePtr mother{nullptr};
+ HepMC::ConstGenParticlePtr daughter{nullptr};
// only truth vertices with 1 incoming particle
+#ifdef HEPMC3
+ if(vtx && (vtx->particles_in().size() == 1)) {
+ mother = vtx->particles_in().front();
+#else
if(vtx && (vtx->particles_in_size() == 1)) {
mother = *vtx->particles_in_const_begin();
+#endif
// Allow status code 1 and 2. E.g. a pion that produced a long track can decay outside of InDet and have status==2.
if( mother && (mother->status() < 3) ) {
@@ -89,14 +93,14 @@ ElasticTruthTrajectoryBuilder::MotherDaughter
// is that with the higher energy (NOT pt).
//
// allow 1 outgoing to cover possible vertexes from interaction in detector material
+#ifdef HEPMC3
+ if (vtx->particles_out().size() <= 2) {
+#else
if (vtx->particles_out_size() <= 2) {
-
+#endif
int num_passed_cuts = 0;
- const HepMC::GenParticle *passed_cuts(nullptr);
- for(HepMC::GenVertex::particles_in_const_iterator it = vtx->particles_out_const_begin();
- it != vtx->particles_out_const_end(); ++it) {
-
- const HepMC::GenParticle *candidate = *it;
+ HepMC::ConstGenParticlePtr passed_cuts{nullptr};
+ for(auto candidate: *vtx) {
if(candidate->pdg_id() == mother->pdg_id()) {
if(passed_cuts && (mother->pdg_id() == 11)) { // second negative electron is a special case
@@ -122,9 +126,9 @@ ElasticTruthTrajectoryBuilder::MotherDaughter
}
//================================================================
-const HepMC::GenParticle* ElasticTruthTrajectoryBuilder::getDaughter(const HepMC::GenParticle* mother) const {
+HepMC::ConstGenParticlePtr ElasticTruthTrajectoryBuilder::getDaughter(HepMC::ConstGenParticlePtr mother) const {
- const HepMC::GenParticle *daughter = nullptr;
+ HepMC::ConstGenParticlePtr daughter{nullptr};
if(mother) {
@@ -139,9 +143,9 @@ const HepMC::GenParticle* ElasticTruthTrajectoryBuilder::getDaughter(const HepMC
}
//================================================================
-const HepMC::GenParticle* ElasticTruthTrajectoryBuilder::getMother(const HepMC::GenParticle* daughter) const {
+HepMC::ConstGenParticlePtr ElasticTruthTrajectoryBuilder::getMother(HepMC::ConstGenParticlePtr daughter) const {
- const HepMC::GenParticle *mother = nullptr;
+ HepMC::ConstGenParticlePtr mother{nullptr};
if(daughter) {
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/IPRD_TruthTrajectoryBuilder.h b/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/IPRD_TruthTrajectoryBuilder.h
index 309d14623515dc70d45915a2e352ff3a53dfc5f3..58365fe2213370bbc6ecbf7fcab59b5ccf588974 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/IPRD_TruthTrajectoryBuilder.h
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/IPRD_TruthTrajectoryBuilder.h
@@ -38,7 +38,7 @@ namespace Trk {
static const InterfaceID& interfaceID() { return IID_IPRD_TruthTrajectoryBuilder; }
/** return a vector of PrepRawData trajectories - uses internal cache**/
- virtual const std::map< const HepMC::GenParticle*, PRD_TruthTrajectory >& truthTrajectories() const = 0;
+ virtual const std::map< HepMC::ConstGenParticlePtr, PRD_TruthTrajectory >& truthTrajectories() const = 0;
/** Event refresh - can't be an IIncident, because it has to run after PRD creation and PRD truth creation */
virtual StatusCode refreshEvent() = 0;
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/PRD_TruthTrajectory.h b/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/PRD_TruthTrajectory.h
index 21ff251f2e43dd3129747a08aa3ed830668a7b0f..2d3a9df02060a658c868595598f4fd0bfacf4c3e 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/PRD_TruthTrajectory.h
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackInterfaces/TrkTruthTrackInterfaces/PRD_TruthTrajectory.h
@@ -28,7 +28,7 @@ namespace Trk {
/** public members */
std::vector<const Trk::PrepRawData* > prds;
- const HepMC::GenParticle* genParticle;
+ HepMC::ConstGenParticlePtr genParticle;
size_t nDoF;
/** defualt constructor */
@@ -39,7 +39,7 @@ namespace Trk {
/** fast constructor */
PRD_TruthTrajectory( const std::vector<const Trk::PrepRawData* >& prdVec,
- const HepMC::GenParticle* gP = 0,
+ HepMC::ConstGenParticlePtr gP = nullptr,
size_t numberOfDegreesOfFreedom = 0) :
prds(prdVec),
genParticle(gP),
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.cxx
index 7b60f9c4c5d8753febe9c5c73af442944d4b9255..8d25c6114c0f098083c0df358680a1fc1f35248f 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.cxx
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.cxx
@@ -11,7 +11,6 @@
// Trk
#include "TrkToolInterfaces/IPRD_Provider.h"
#include "TrkTruthTrackInterfaces/IPRD_TruthTrajectoryManipulator.h"
-//#include "TrkEventPrimitives/GlobalPosition.h"
#include "TrkEventUtils/PrepRawDataComparisonFunction.h"
// DetectorDescription
#include "AtlasDetDescr/AtlasDetectorID.h"
@@ -97,7 +96,7 @@ StatusCode Trk::PRD_TruthTrajectoryBuilder::refreshEvent() {
}
-const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& Trk::PRD_TruthTrajectoryBuilder::truthTrajectories() const {
+const std::map<HepMC::ConstGenParticlePtr, Trk::PRD_TruthTrajectory >& Trk::PRD_TruthTrajectoryBuilder::truthTrajectories() const {
// ndof
size_t ndofTotal = 0;
size_t ndof = 0;
@@ -111,7 +110,7 @@ const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& Trk::PRD_
PRD_MultiTruthCollection::const_iterator prdMtCIterE = (*pmtCollIter)->end();
for ( ; prdMtCIter != prdMtCIterE; ++ prdMtCIter ){
// check if entry exists and if
- const HepMC::GenParticle* curGenP = (*prdMtCIter).second;
+ auto curGenP = (*prdMtCIter).second;
Identifier curIdentifier = (*prdMtCIter).first;
// apply the min pT cut
if ( curGenP->momentum().perp() < m_minPt ) continue;
@@ -123,7 +122,7 @@ const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& Trk::PRD_
// stuff it into the trajectory if you found a PRD
if (prd){
// try to find the entry for this GenParticle
- std::map< const HepMC::GenParticle*, PRD_TruthTrajectory >::iterator prdTrajIter = m_gpPrdTruthTrajectories.find(curGenP);
+ auto prdTrajIter = m_gpPrdTruthTrajectories.find(curGenP);
if ( prdTrajIter == m_gpPrdTruthTrajectories.end() ){
// first PRD associated to this: create PRD_TruthTrajectory object
Trk::PRD_TruthTrajectory newPrdTruthTrajectory;
@@ -147,8 +146,8 @@ const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& Trk::PRD_
}
// PART 2 --------------------------------------------------------------------------------------------------------
// loop through the provided list of manipulators ( sorter is included )
- std::map< const HepMC::GenParticle*, PRD_TruthTrajectory >::iterator prdTruthTrajIter = m_gpPrdTruthTrajectories.begin();
- std::map< const HepMC::GenParticle*, PRD_TruthTrajectory >::iterator prdTruthTrajIterE = m_gpPrdTruthTrajectories.end();
+ auto prdTruthTrajIter = m_gpPrdTruthTrajectories.begin();
+ auto prdTruthTrajIterE = m_gpPrdTruthTrajectories.end();
for ( ; prdTruthTrajIter != prdTruthTrajIterE; ++prdTruthTrajIter ){
//std::cout << "sorting, barcode: " << prdTruthTrajIter->first->barcode() << std::endl;
if ( m_prdTruthTrajectoryManipulators.size() ){
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.h b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.h
index 3199d6c9ed38d7c6ef22da7037ba8be0badc7f4f..6112ea9f8370335480e1159fdd42d94f4b5d20e1 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.h
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/PRD_TruthTrajectoryBuilder.h
@@ -53,7 +53,7 @@ namespace Trk {
StatusCode finalize();
/** return a vector of PrepRawData trajectories - uses internal cache**/
- const std::map< const HepMC::GenParticle*, PRD_TruthTrajectory >& truthTrajectories() const;
+ const std::map< HepMC::ConstGenParticlePtr, PRD_TruthTrajectory >& truthTrajectories() const;
/** Event refresh - can't be an IIncident, because it has to run after PRD creation and PRD truth creation */
StatusCode refreshEvent();
@@ -71,7 +71,7 @@ namespace Trk {
Gaudi::Property<double> m_minPt {this,"MinimumPt",400.,"minimum pT to be even considered"};
Gaudi::Property<bool> m_geantinos {this,"Geantinos",false,"Track geantinos or not"};
- mutable std::map< const HepMC::GenParticle*, PRD_TruthTrajectory > m_gpPrdTruthTrajectories; //!< the cache for the return (cleared by Incident)
+ mutable std::map< HepMC::ConstGenParticlePtr, PRD_TruthTrajectory > m_gpPrdTruthTrajectories; //!< the cache for the return (cleared by Incident)
};
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/TruthTrackBuilder.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/TruthTrackBuilder.cxx
index 1940d483abe38acde00dfa9fac5bbdf5ed0def2d..bda9841b728f682f5bd609f57985ca033fcab1db 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/TruthTrackBuilder.cxx
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/TruthTrackBuilder.cxx
@@ -130,7 +130,7 @@ Trk::Track* Trk::TruthTrackBuilder::createTrack(const PRD_TruthTrajectory& prdTr
ATH_MSG_VERBOSE("The PRD Truth trajectory contains " << prdTraj.prds.size() << " PRDs.");
// get the associated GenParticle
- const HepMC::GenParticle* genPart = prdTraj.genParticle;
+ auto genPart = prdTraj.genParticle;
if (!genPart) {
ATH_MSG_WARNING("No GenParticle associated to this PRD_TruthTrajectory. Ignoring track creation.");
return 0;
diff --git a/Tracking/TrkValidation/TrkValAlgs/TrkValAlgs/TrackValidationNtupleWriter.h b/Tracking/TrkValidation/TrkValAlgs/TrkValAlgs/TrackValidationNtupleWriter.h
index b5fe26995e4d217a39997ba7531c8584abfe75c0..98e06ad91b6e7c9d0bc09fea08d34bfe6a6b2c50 100644
--- a/Tracking/TrkValidation/TrkValAlgs/TrkValAlgs/TrackValidationNtupleWriter.h
+++ b/Tracking/TrkValidation/TrkValAlgs/TrkValAlgs/TrackValidationNtupleWriter.h
@@ -96,7 +96,7 @@ protected:
bool m_doTruth; //!< Switch to turn on / off truth
bool m_doTrackParticle; //! Switch to turn on/pff recording track particle trees into Ntuple
- const HepMC::GenParticle* m_visibleParticleWithoutTruth; //!< cludge to treat G4's "fake fakes"
+ HepMC::GenParticlePtr m_visibleParticleWithoutTruth; //!< cludge to treat G4's "fake fakes"
std::vector<unsigned int> m_nTrackTreeRecords;
std::vector<TTree*> m_trees; //!< Pointer to the NTuple trees (one for each input track collection)
TTree* m_eventLinkTree; //!< pointer to event-wise ntuple trees (one for all input track collections + truth)
diff --git a/Tracking/TrkValidation/TrkValAlgs/src/RecMomentumQualityValidation.cxx b/Tracking/TrkValidation/TrkValAlgs/src/RecMomentumQualityValidation.cxx
index 6b6d9248f5e57bb4e1b122ba8f078fe6b1438938..40ed122bc3d52e4939899cbda4ec4300f9ea7995 100644
--- a/Tracking/TrkValidation/TrkValAlgs/src/RecMomentumQualityValidation.cxx
+++ b/Tracking/TrkValidation/TrkValAlgs/src/RecMomentumQualityValidation.cxx
@@ -10,7 +10,6 @@
#include "TrkTrack/TrackCollection.h"
#include "TrkTruthData/TrackTruthCollection.h"
#include "TrkParameters/TrackParameters.h"
-//#include "TrkParameters/Perigee.h"
#include "AtlasHepMC/GenParticle.h"
#include "TrkToolInterfaces/ITruthToTrack.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
@@ -126,16 +125,13 @@ StatusCode Trk::RecMomentumQualityValidation::execute()
TrackCollection::const_iterator trackIterator = trackCollection->begin();
for (;trackIterator!=trackCollection->end();++trackIterator) {
- /* const Trk::TrackInfo& info = (*trackIterator)->info();
- if ( ! info.patternRecoInfo(Trk::TrackInfo::TRTStandalone) &&
- ! info.patternRecoInfo(Trk::TrackInfo::TRTSeededSingleSpTrackFinder)) { */
if (!m_trackSelector.empty() && (*trackIterator)!=NULL &&
m_trackSelector->decision(**trackIterator) ) {
const Trk::TrackParameters* generatedTrackPerigee(0);
// find matching truth particle
const TrackTruth* trackTruth = 0;
- const HepMC::GenParticle* genParticle = 0;
+ HepMC::ConstGenParticlePtr genParticle{nullptr};
TrackTruthCollection::const_iterator truthIterator
= trackTruthCollection->find( trackIterator - (*trackCollection).begin() );
if ( truthIterator == trackTruthCollection->end() ){
@@ -146,11 +142,15 @@ StatusCode Trk::RecMomentumQualityValidation::execute()
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Link to generated particle information is not there - assuming a lost G4 particle ('fake fake')." << endmsg;
// genParticle = m_visibleParticleWithoutTruth; // with pdg_id 0
} else {
+#ifdef HEPMC3
+ genParticle = trackTruth->particleLink().scptr();
+#else
genParticle = trackTruth->particleLink().cptr();
- if ( genParticle!=NULL && genParticle->pdg_id() == 0 ) {
+#endif
+ if ( genParticle && genParticle->pdg_id() == 0 ) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Associated Particle ID " << genParticle->pdg_id()
<< " does not conform to PDG requirements... ignore it!" << endmsg;
- genParticle = 0;
+ genParticle = nullptr;
}
}
}
@@ -182,7 +182,6 @@ StatusCode Trk::RecMomentumQualityValidation::execute()
if (!reconstructedPerigee) return StatusCode::FAILURE;
- // double this_eta = generatedTrackPerigee->eta();
double this_eta = reconstructedPerigee->eta();
double truth_over_recP = generatedTrackPerigee->parameters()[Trk::qOverP]
@@ -240,9 +239,9 @@ StatusCode Trk::RecMomentumQualityValidation::execute()
void Trk::RecMomentumQualityValidation::monitorTrackFits(std::vector<unsigned int>& Ntracks,
const double& eta) const {
Ntracks[Trk::RecMomentumQualityValidation::iAll] += 1;
- if (fabs(eta) < 0.80 ) ++Ntracks[Trk::RecMomentumQualityValidation::iBarrel];
- else if (fabs(eta) < 1.60) ++Ntracks[Trk::RecMomentumQualityValidation::iTransi];
- else if (fabs(eta) < 2.40) ++Ntracks[Trk::RecMomentumQualityValidation::iEndcap];
+ if (std::abs(eta) < 0.80 ) ++Ntracks[Trk::RecMomentumQualityValidation::iBarrel];
+ else if (std::abs(eta) < 1.60) ++Ntracks[Trk::RecMomentumQualityValidation::iTransi];
+ else if (std::abs(eta) < 2.40) ++Ntracks[Trk::RecMomentumQualityValidation::iEndcap];
}
diff --git a/Tracking/TrkValidation/TrkValAlgs/src/TrackValidationNtupleWriter.cxx b/Tracking/TrkValidation/TrkValAlgs/src/TrackValidationNtupleWriter.cxx
index d24e097589807a0d3a9daac874f4d3879ceb6f05..1fc34029656f793e9bbba0145a8836f49b297fd4 100644
--- a/Tracking/TrkValidation/TrkValAlgs/src/TrackValidationNtupleWriter.cxx
+++ b/Tracking/TrkValidation/TrkValAlgs/src/TrackValidationNtupleWriter.cxx
@@ -219,7 +219,7 @@ StatusCode Trk::TrackValidationNtupleWriter::initialize() {
sc = m_truthNtupleTool->initBranches(m_trackTruthClassifiers, include_jets, m_inputTrackCollection);
if (sc.isFailure()) return sc;
- m_visibleParticleWithoutTruth = new HepMC::GenParticle(HepLorentzVector(), 0);
+ m_visibleParticleWithoutTruth = HepMC::newGenParticlePtr(HepMC::FourVector(), 0);
} // if truth is activated
@@ -332,7 +332,7 @@ StatusCode Trk::TrackValidationNtupleWriter::execute() {
unsigned int nTruthTreeRecordsAtCurrentEvent = 0;
std::vector<Trk::ValidationTrackTruthData> truthData;
- std::vector<const HepMC::GenParticle*>* selecParticles = 0;
+ std::vector<HepMC::ConstGenParticlePtr>* selecParticles = nullptr;
//std::vector<const Trk::TrackParameters*> extrapolatedTruthPerigees;
//std::vector<std::vector<unsigned int> > classifications;
std::vector< Trk::GenParticleJet >* genParticleJets = 0;
@@ -377,7 +377,7 @@ StatusCode Trk::TrackValidationNtupleWriter::execute() {
if ( genParticle->production_vertex() )
{
generatedTrackPerigee = m_truthToTrack->makePerigeeParameters( genParticle );
- if (generatedTrackPerigee == NULL && genParticle->barcode() > 1000000 ) {
+ if (generatedTrackPerigee == NULL && HepMC::barcode(genParticle) > 1000000 ) {
ATH_MSG_DEBUG ("No perigee available for interacting truth particle."
<<" -> This is OK for particles from the TrackRecord, but probably"
<<" a bug for production vertex particles.");
@@ -389,7 +389,7 @@ StatusCode Trk::TrackValidationNtupleWriter::execute() {
partData.classifications.reserve(m_trackTruthClassifiers.size());
for (unsigned int toolIndex = 0 ; toolIndex < m_trackTruthClassifiers.size(); ++toolIndex )
{
- partData.classifications.push_back(m_trackTruthClassifiers[toolIndex]->classify(*genParticle));
+ partData.classifications.push_back(m_trackTruthClassifiers[toolIndex]->classify(genParticle));
}
// resize the truth to track vectors to the number of input track collections:
partData.truthToTrackIndices.resize(m_inputTrackCollection.size());
@@ -565,9 +565,6 @@ StatusCode Trk::TrackValidationNtupleWriter::writeTrackData(unsigned int trackCo
const unsigned int nTruthTreeRecordsAtCurrentEvent =
(m_doTruth ? m_truthNtupleTool->getNumberOfTreeRecords() : 0 );
- //truthData.truthToTrackIndices
- //std::vector< std::vector<unsigned int> > truthToTrackIndices(selecParticles ? selecParticles->size() : 0);
- //std::vector< std::vector<float> > truthToTrackMatchingProbabilities(selecParticles ? selecParticles->size() : 0);
int trackTreeIndexBegin = m_trees[trackColIndex]->GetEntries();
int nTracksPerEvent = 0;
@@ -594,7 +591,7 @@ StatusCode Trk::TrackValidationNtupleWriter::writeTrackData(unsigned int trackCo
if (m_doTruth){
// find matching truth particle
const TrackTruth* trackTruth = 0;
- const HepMC::GenParticle* genParticle = 0;
+ HepMC::ConstGenParticlePtr genParticle{nullptr};
TrackTruthCollection::const_iterator truthIterator = trackTruthCollection->find( trackIterator - (*tracks).begin() );
if ( truthIterator == trackTruthCollection->end() ){
ATH_MSG_DEBUG ("No matching truth particle found for track");
@@ -604,11 +601,15 @@ StatusCode Trk::TrackValidationNtupleWriter::writeTrackData(unsigned int trackCo
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Link to generated particle information is not there - assuming a lost G4 particle ('fake fake')." << endmsg;
genParticle = m_visibleParticleWithoutTruth; // with pdg_id 0
} else {
+#ifdef HEPMC3
+ genParticle = trackTruth->particleLink().scptr();
+#else
genParticle = trackTruth->particleLink().cptr();
+#endif
if ( genParticle!=NULL && genParticle->pdg_id() == 0 ) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Associated Particle ID " << genParticle->pdg_id()
<< " does not conform to PDG requirements... ignore it!" << endmsg;
- genParticle = 0;
+ genParticle = nullptr;
}
}
}
@@ -618,9 +619,7 @@ StatusCode Trk::TrackValidationNtupleWriter::writeTrackData(unsigned int trackCo
const Trk::TrackParameters* generatedTrackPerigee(0);
const Trk::TrackParameters* newTrackPerigee(0);
// fill the truth data in the track tree
- //unsigned int truthIndex = particleToIndexMap[genParticle];
int truthIndex = -1;
- //std::vector<const HepMC::GenParticle*>::const_iterator matchedPartIter = find(selecParticles->begin(), selecParticles->end(), genParticle);
// TODO: do the search somehow better:
std::vector<Trk::ValidationTrackTruthData>::iterator matchedPartIter = truthData.begin();
for (; matchedPartIter != truthData.end(); matchedPartIter++) {
@@ -636,7 +635,6 @@ StatusCode Trk::TrackValidationNtupleWriter::writeTrackData(unsigned int trackCo
generatedTrackPerigee = newTrackPerigee;
}
} else {
- //truthIndex = int(matchedPartIter - selecParticles->begin());
// store the index in the track tree of the current track (establish link from truth to track)
(*matchedPartIter).truthToTrackIndices[trackColIndex].push_back(m_nTrackTreeRecords[trackColIndex]);
(*matchedPartIter).truthToTrackMatchingProbabilities[trackColIndex].push_back(trackTruth->probability());
@@ -737,7 +735,11 @@ StatusCode Trk::TrackValidationNtupleWriter::finalize() {
msg(MSG::INFO) << "TrackValidationNtupleWriter finalize()" << endmsg;
+#ifdef HEPMC3
+ //This is smart pointer in HepMC3
+#else
delete m_visibleParticleWithoutTruth;
+#endif
for (unsigned int toolIndex = 0 ; toolIndex < m_eventPropertyNtupleTools.size(); ++toolIndex ){
if (m_eventPropertyNtupleTools[toolIndex]->resetVariables( ).isFailure()){};
}
diff --git a/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleJetFinder.h b/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleJetFinder.h
index fde30d484a15d4eae8a98ffd6076812fb75f75a6..b16a3ab46f3cd913d025816a6b43ca4a7d291c06 100644
--- a/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleJetFinder.h
+++ b/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleJetFinder.h
@@ -47,7 +47,7 @@ class IGenParticleJetFinder : virtual public IAlgTool {
This method is a factory, i.e. vector ownership is given back and
on failure condition returns NULL. */
virtual std::vector< Trk::GenParticleJet >* jetMCFinder
- (std::vector <const HepMC::GenParticle *>& ) const=0;
+ (std::vector <HepMC::ConstGenParticlePtr>& ) const=0;
};
diff --git a/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleSelector.h b/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleSelector.h
index 0e58912b073fef1eaf5768fab0b5e74f0144cf9e..ac8d6b138ee49476ea77a7ee7a8f76f287db502b 100644
--- a/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleSelector.h
+++ b/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/IGenParticleSelector.h
@@ -33,7 +33,7 @@ class IGenParticleSelector : virtual public IAlgTool {
static const InterfaceID& interfaceID();
/** explain */
- virtual std::vector<const HepMC::GenParticle *>*
+ virtual std::vector<HepMC::ConstGenParticlePtr>*
selectGenSignal (const McEventCollection*) const=0;
};
diff --git a/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/ITrackTruthClassifier.h b/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/ITrackTruthClassifier.h
index 56af45805d4908631248bcf821940a35cc15f72e..c557707b4470598e37cbd1be70f552b56d4d0b07 100644
--- a/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/ITrackTruthClassifier.h
+++ b/Tracking/TrkValidation/TrkValInterfaces/TrkValInterfaces/ITrackTruthClassifier.h
@@ -33,9 +33,9 @@ class ITrackTruthClassifier : virtual public IAlgTool {
/** explain */
virtual void initClassification(const McEventCollection&,
- const std::vector<const HepMC::GenParticle *>*) const=0;
+ const std::vector<HepMC::ConstGenParticlePtr>*) const=0;
- virtual unsigned int classify(const HepMC::GenParticle&) const = 0;
+ virtual unsigned int classify(HepMC::ConstGenParticlePtr) const = 0;
virtual std::string nameOfClassifier() const = 0;
diff --git a/Tracking/TrkValidation/TrkValTools/TrkValTools/PrimaryTruthClassifier.h b/Tracking/TrkValidation/TrkValTools/TrkValTools/PrimaryTruthClassifier.h
index 496e2a09b8d731a26b207b1bac57f719ce27d894..c3eaf26f51fe65482bef104106a649cd2bcb0271 100644
--- a/Tracking/TrkValidation/TrkValTools/TrkValTools/PrimaryTruthClassifier.h
+++ b/Tracking/TrkValidation/TrkValTools/TrkValTools/PrimaryTruthClassifier.h
@@ -18,6 +18,7 @@
#include "TrkValEvent/TruthClassificationDefs.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/SimpleVector.h"
namespace Trk {
@@ -40,9 +41,9 @@ namespace Trk {
/** explain */
virtual void initClassification(const McEventCollection&,
- const std::vector<const HepMC::GenParticle *>*) const;
+ const std::vector<HepMC::ConstGenParticlePtr>*) const;
- virtual unsigned int classify(const HepMC::GenParticle&) const;
+ virtual unsigned int classify(HepMC::ConstGenParticlePtr) const;
virtual std::string nameOfClassifier() const;
diff --git a/Tracking/TrkValidation/TrkValTools/src/PrimaryTruthClassifier.cxx b/Tracking/TrkValidation/TrkValTools/src/PrimaryTruthClassifier.cxx
index bd344c64e57067554318fcfd02eb0fcffc5a2dae..01c8f65d5657651eef274a69af00fb87f0d0351e 100644
--- a/Tracking/TrkValidation/TrkValTools/src/PrimaryTruthClassifier.cxx
+++ b/Tracking/TrkValidation/TrkValTools/src/PrimaryTruthClassifier.cxx
@@ -53,7 +53,7 @@ StatusCode Trk::PrimaryTruthClassifier::finalize() {
void Trk::PrimaryTruthClassifier::initClassification
(const McEventCollection& /*SimTracks*/,
- const std::vector<const HepMC::GenParticle *>* /*genSignal*/) const {
+ const std::vector<HepMC::ConstGenParticlePtr>* /*genSignal*/) const {
// nothing to prepare as local data at start of collection analysis
return;
@@ -62,7 +62,7 @@ void Trk::PrimaryTruthClassifier::initClassification
//////////////////////////////////////////
// classification from InDetRecStatistics
//////////////////////////////////////////
-unsigned int Trk::PrimaryTruthClassifier::classify(const HepMC::GenParticle& genParticle) const {
+unsigned int Trk::PrimaryTruthClassifier::classify(HepMC::ConstGenParticlePtr genParticle) const {
/* note on using HepMC::FourVector/3Vector against HepGeom::Point3D<double>: The versions from HepMC2 do not know
@@ -74,17 +74,17 @@ unsigned int Trk::PrimaryTruthClassifier::classify(const HepMC::GenParticle& gen
bool secondary=false;
bool truncated=false;
- if (genParticle.production_vertex()) {
- HepMC::FourVector startVertex = genParticle.production_vertex()->position();
+ if (genParticle->production_vertex()) {
+ HepMC::FourVector startVertex = genParticle->production_vertex()->position();
// primary vertex inside innermost layer?
if ( fabs(startVertex.perp()) < m_maxRStartPrimary
&& fabs(startVertex.z()) < m_maxZStartPrimary)
{
- if (genParticle.end_vertex() == 0) {
+ if (genParticle->end_vertex() == 0) {
primary=true;
} else {
- HepMC::FourVector endVertex = genParticle.end_vertex()->position();
+ HepMC::FourVector endVertex = genParticle->end_vertex()->position();
if ( endVertex.perp() > m_minREndPrimary
|| fabs(startVertex.z()) > m_minZEndPrimary)
primary=true; else truncated = true;
@@ -93,10 +93,10 @@ unsigned int Trk::PrimaryTruthClassifier::classify(const HepMC::GenParticle& gen
else if ( startVertex.perp() < m_maxRStartSecondary &&
fabs(startVertex.z()) < m_maxZStartSecondary)
{
- if (genParticle.end_vertex() == 0) {
+ if (genParticle->end_vertex() == 0) {
secondary=true;
} else {
- HepMC::FourVector endVertex = genParticle.end_vertex()->position();
+ HepMC::FourVector endVertex = genParticle->end_vertex()->position();
if (endVertex.perp() > m_minREndSecondary
|| fabs(endVertex.z()) > m_minZEndSecondary) {
secondary=true;
@@ -108,8 +108,7 @@ unsigned int Trk::PrimaryTruthClassifier::classify(const HepMC::GenParticle& gen
if (truncated) return Trk::TruthClassification::Truncated;
if (secondary) return Trk::TruthClassification::Secondary;
if (primary) return Trk::TruthClassification::Primary;
- ATH_MSG_DEBUG ( "Could not classify this particle: "
- << genParticle );
+ ATH_MSG_DEBUG ( "Could not classify this particle: " << genParticle );
return Trk::TruthClassification::OutsideClassification;
}
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/TrkPriVxPurityTool.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/TrkPriVxPurityTool.cxx
index b0effec98c423cf4b5e65be44ff9108ef912bbe8..2b437fe4cf788ab7f27ef59d000b27f925d19100 100755
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/TrkPriVxPurityTool.cxx
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/TrkPriVxPurityTool.cxx
@@ -79,36 +79,47 @@ namespace Trk {
//getting the signal event itself
McEventCollection::const_iterator it = mcCollection->begin();
const HepMC::GenEvent* genEvent= ( *it );
+#ifdef HEPMC3
+ if( genEvent->vertices().empty() ) {
+ ATH_MSG_DEBUG( "No vertices found in first GenEvent" );
+ return 0;
+ }
+ auto pv = genEvent->vertices()[0];
+#else
// std::cout<<"The ID of the first event of the collection: "<<genEvent->event_number()<<std::endl;
if( genEvent->vertices_empty() ) {
ATH_MSG_DEBUG( "No vertices found in first GenEvent" );
return 0;
}
+ auto pv = *(genEvent->vertices_begin());
+#endif
//analysing the MC event to create PV candidate
//first finding the vertex of primary pp interaction
- HepMC::GenEvent::vertex_const_iterator pv = genEvent->vertices_begin();
//and storing its position
- CLHEP::HepLorentzVector pv_pos ( ( *pv )->position().x(),
- ( *pv )->position().y(),
- ( *pv )->position().z(),
- ( *pv )->position().t() );
+ CLHEP::HepLorentzVector pv_pos ( pv ->position().x(),
+ pv ->position().y(),
+ pv ->position().z(),
+ pv ->position().t() );
double pv_r = pv_pos.perp();
double pv_z = pv_pos.z();
// storing all the ids of vertices reasonably close to the primary one.
// here the region of interest is selected.
- std::map<int,HepMC::GenVertex *> vertex_ids;
-
- for ( HepMC::GenEvent::vertex_const_iterator i = genEvent->vertices_begin();
- i != genEvent->vertices_end() ;++i ) {
- CLHEP::HepLorentzVector lv_pos ( ( *i )->position().x(),
- ( *i )->position().y(),
- ( *i )->position().z(),
- ( *i )->position().t() );
- if ( fabs ( lv_pos.perp() - pv_r ) <m_r_tol && fabs ( lv_pos.z() - pv_z ) <m_z_tol ) {
- vertex_ids[ ( *i )->barcode() ]= ( *i );
+ std::map<int,HepMC::ConstGenVertexPtr> vertex_ids;
+#ifdef HEPMC3
+ for (auto vtx: genEvent->vertices()){
+#else
+ for ( HepMC::GenEvent::vertex_const_iterator i = genEvent->vertices_begin(); i != genEvent->vertices_end() ;++i ) {
+ auto vtx=*i;
+#endif
+ CLHEP::HepLorentzVector lv_pos ( vtx->position().x(),
+ vtx->position().y(),
+ vtx->position().z(),
+ vtx->position().t() );
+ if ( std::abs ( lv_pos.perp() - pv_r ) <m_r_tol && std::abs ( lv_pos.z() - pv_z ) <m_z_tol ) {
+ vertex_ids[ HepMC::barcode(vtx) ]= vtx;
}//end of accepted vertices check
}//end of loop over all the vertices
@@ -128,7 +139,6 @@ namespace Trk {
//looping over the tracks to find those matched to the GenParticle originating from signal PV
std::vector<Trk::VxTrackAtVertex *>::const_iterator vt = tracks->begin();
std::vector<Trk::VxTrackAtVertex *>::const_iterator ve = tracks->end();
-// unsigned int total_size = 0;
unsigned int n_failed = 0;
std::vector<double> in_weights ( 0 );
std::vector<double> out_weights ( 0 );
@@ -147,7 +157,6 @@ namespace Trk {
// get to the original track particle
LinkToTrackParticleBase * tr_part = dynamic_cast< LinkToTrackParticleBase * > ( origLink );
if ( tr_part !=0 && tr_part->isValid()) {
-// ++total_size;
std::map< Rec::TrackParticleTruthKey, TrackParticleTruth>::const_iterator ttItr = trackParticleTruthCollection->end();
@@ -166,22 +175,26 @@ namespace Trk {
if (ttItr != trackParticleTruthCollection->end() ) {
const HepMcParticleLink& particleLink = ttItr->second.particleLink();
- const HepMC::GenParticle* genParticle = particleLink.cptr();
-
- if(genParticle !=0) {
- HepMC::GenEvent * tpEvent = genParticle->parent_event();
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genParticle = particleLink.scptr();
+#else
+ HepMC::ConstGenParticlePtr genParticle = particleLink.cptr();
+#endif
+
+ if(genParticle) {
+ auto tpEvent = genParticle->parent_event();
if(tpEvent==genEvent) {
- const HepMC::GenVertex * pVertex(0);
- if (genParticle!=0) pVertex = genParticle->production_vertex();
- if ( pVertex != 0 ) {
+ HepMC::ConstGenVertexPtr pVertex{nullptr};
+ if (genParticle) pVertex = genParticle->production_vertex();
+ if ( pVertex) {
int link_pid = genParticle->pdg_id();
bool primary_track = false;
bool secondary_track = false;
//loop over the particles until decision is really taken
do {
- int tvrt_code = pVertex->barcode();
- std::map<int, HepMC::GenVertex *>::const_iterator idf_res = vertex_ids.find ( tvrt_code );
+ int tvrt_code = HepMC::barcode(pVertex);
+ auto idf_res = vertex_ids.find ( tvrt_code );
//for the HepMcParticle Link, the signal event has an index 0.
// tagging on it
@@ -193,11 +206,19 @@ namespace Trk {
//this vertex is not from the central region.
//checking whether it is a bremsstrahlung
//if so, propagating track to its origin, otherwise rejecting it completely.
+#ifdef HEPMC3
+ if ( pVertex->particles_in().size() == 1 ) {
+#else
if ( pVertex->particles_in_size() == 1 ) {
+#endif
// one mother particle: is it a brem of some kind?
- HepMC::GenVertex::particles_in_const_iterator inp = pVertex->particles_in_const_begin() ;
- HepMC::GenVertex * tmpVertex_loc = ( *inp )->production_vertex();
- if ( ( *inp )->pdg_id() == link_pid && tmpVertex_loc) {
+#ifdef HEPMC3
+ auto inp = pVertex->particles_in()[0] ;
+#else
+ auto inp =*(pVertex->particles_in_const_begin()) ;
+#endif
+ auto tmpVertex_loc = inp ->production_vertex();
+ if ( inp ->pdg_id() == link_pid && tmpVertex_loc) {
// seems like a brem (this can be generator/simulation dependent unfortunately)
// continue iterating
pVertex = tmpVertex_loc;
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx
index 9174452f37c68bf1d9e2b91ddc6997c90cd1e891..4ca06b1cd1094dfc25dbd5c447e755f03c3e5ab3 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisUpdator.cxx
@@ -257,7 +257,10 @@ namespace Trk{
if (trackParametersWeight.determinant()<=0)
{
- ATH_MSG_ERROR(" The determinant of the track covariance matrix is negative: " << trackParametersWeight.determinant());
+ ATH_MSG_WARNING(" The determinant of the inverse of the track covariance matrix is negative: " << trackParametersWeight.determinant());
+ if(trk->expectedCovarianceAtPCA().determinant()<=0){
+ ATH_MSG_ERROR(" As well as the determinant of the track covariance matrix: " << trk->expectedCovarianceAtPCA().determinant());
+ }
}
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
index b32151c3f1fa03d0de0c42e346402ee91a64e368..57022185558d17a49a415c9c7cc2b3de311f215a 100755
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
@@ -111,6 +111,7 @@ namespace Trk
xAOD::Vertex * TrkV0VertexFitter::fit(const std::vector<const xAOD::TrackParticle*>& vectorTrk) const
{
Amg::Vector3D tmpVtx;
+ tmpVtx.setZero();
return fit(vectorTrk, tmpVtx);
}
@@ -205,6 +206,7 @@ namespace Trk
xAOD::Vertex * TrkV0VertexFitter::fit(const std::vector<const Trk::TrackParameters*>& originalPerigees) const
{
Amg::Vector3D tmpVtx;
+ tmpVtx.setZero();
return fit(originalPerigees, tmpVtx);
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx
index 1409b9518c1a6ca6a6298a41457d18c125e3adcc..d2bae3fc02167f13e27c3ab71d9c14d3108e3483 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitter.cxx
@@ -560,7 +560,7 @@ namespace Trk
const std::vector<const Trk::NeutralParameters*>& neutralPerigeeList,
const xAOD::Vertex& constraint) const
{
- return _fit(perigeeList,neutralPerigeeList,constraint,Amg::Vector3D(),true);
+ return _fit(perigeeList,neutralPerigeeList,constraint,Amg::Vector3D::Zero(),true);
}
xAOD::Vertex*
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromTrackAndJets.cxx b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromTrackAndJets.cxx
index 31030deee8fda53d7defec42d3e270065178768c..d38809bf8d7dc5048bb2be0d38dd0e3df6585b43 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromTrackAndJets.cxx
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromTrackAndJets.cxx
@@ -68,7 +68,7 @@ StatusCode EFMissingETFromTrackAndJets::initialize()
} // if timing service
// JVT likelihood histogram
- TString jvtFile = "JVTlikelihood_20140805.root";
+ TString jvtFile = "JetMomentTools/JVTlikelihood_20140805.root";
TString jvtName = "JVTRootCore_kNN100trim_pt20to50_Likelihood";
m_jvtLikelihood = (TH2F *) getHistogramFromFile(jvtName, jvtFile);
if (m_jvtLikelihood == nullptr) {
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerJetBuildTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerJetBuildTool.cxx
index 14e591edb494cd13d48f22d522e2c1fa2164aa61..b17a79d563e94a2641bd909ce0856e995f8d2c24 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerJetBuildTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerJetBuildTool.cxx
@@ -144,10 +144,10 @@ void TriggerJetBuildTool::prime(const xAOD::IParticleContainer* inputs){
ATH_MSG_DEBUG("Entering prime(), call " << ++m_nprime);
constexpr bool isGhost = false;
- IParticleExtractor* extractor = new IParticleExtractor(inputs,
- m_concreteTypeStr,
- isGhost,
- m_isTrigger);
+ auto extractor = std::make_unique<const IParticleExtractor>(inputs,
+ m_concreteTypeStr,
+ isGhost,
+ m_isTrigger);
ATH_MSG_DEBUG("No of IParticle inputs: " << inputs->size());
@@ -180,7 +180,7 @@ void TriggerJetBuildTool::prime(const xAOD::IParticleContainer* inputs){
- PseudoJetContainer pjc(extractor, vpj);
+ PseudoJetContainer pjc(std::move(extractor), vpj);
m_inContainer.append(&pjc);
}
@@ -194,10 +194,10 @@ void TriggerJetBuildTool::primeGhost(const xAOD::IParticleContainer* inputs, std
ATH_MSG_DEBUG("Entering primeGhost(), call " << ++m_nprime);
constexpr bool isGhost = true;
- IParticleExtractor* extractor = new IParticleExtractor(inputs,
- ghostlabel,
- isGhost,
- m_isTrigger);
+ auto extractor = std::make_unique<const IParticleExtractor>(inputs,
+ ghostlabel,
+ isGhost,
+ m_isTrigger);
ATH_MSG_DEBUG("No of ghost IParticle inputs: " << inputs->size());
@@ -231,7 +231,7 @@ void TriggerJetBuildTool::primeGhost(const xAOD::IParticleContainer* inputs, std
- PseudoJetContainer pjc(extractor, vpj);
+ PseudoJetContainer pjc(std::move(extractor), vpj);
m_inContainer.append(&pjc);
}
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter2.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter2.cxx
index 0e4f80cdc59b453b562036de2296eba82e0971df..f3b9126a4d96cd9a1b2602a0d3b0301c575e0241 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter2.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter2.cxx
@@ -37,9 +37,9 @@ void TriggerPseudoJetGetter2::prime(const xAOD::CaloClusterContainer* inputs) {
// to determine the function used to select the incomming IParticles.
constexpr bool isGhost = false;
- IConstituentExtractor* extractor = new IParticleExtractor(inputs,
- m_label,
- isGhost);
+ auto extractor = std::make_unique<const IParticleExtractor>(inputs,
+ m_label,
+ isGhost);
constexpr bool noRejection = true;
std::vector<fastjet::PseudoJet> vpj =
@@ -48,7 +48,7 @@ void TriggerPseudoJetGetter2::prime(const xAOD::CaloClusterContainer* inputs) {
m_noNegE,
noRejection);
- auto ppjc(std::make_unique<const PseudoJetContainer>(extractor, vpj));
+ auto ppjc(std::make_unique<const PseudoJetContainer>(std::move(extractor), vpj));
m_pseudoJetContainer.swap(ppjc);
}
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
index b4feab6cdfc1509ff951faf7bb923b4319baf28c..ebf02d6a7a8d09017defd602a9857fc8d0f0ba07 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
@@ -28,7 +28,6 @@
MuFastSteering::MuFastSteering(const std::string& name, ISvcLocator* svc)
: HLT::FexAlgo(name, svc),
m_timerSvc("TrigTimerSvc", name),
- m_regionSelector("RegSelSvc", name),
m_recMuonRoIUtils(),
m_rpcHits(), m_tgcHits(),
m_mdtRegion(), m_muonRoad(),
@@ -62,13 +61,6 @@ HLT::ErrorCode MuFastSteering::hltInitialize()
}
}
- // Locate RegionSelector
- if (m_regionSelector.retrieve().isFailure()) {
- ATH_MSG_ERROR("Could not retrieve the regionselector service");
- return HLT::ERROR;
- }
- ATH_MSG_DEBUG("Retrieved the RegionSelector service ");
-
// Locate DataPreparator
if (m_dataPreparator.retrieve().isFailure()) {
ATH_MSG_ERROR("Cannot retrieve Tool DataPreparator");
@@ -2277,135 +2269,3 @@ void MuFastSteering::handle(const Incident& incident) {
}
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-
-HLT::ErrorCode MuFastSteering::prepareRobRequests(const HLT::TriggerElement* inputTE){
-
- ATH_MSG_DEBUG("prepareRobRequests called");
-
- HLT::RobRequestInfo* RRInfo = config()->robRequestInfo();
-
- if (!RRInfo) {
- ATH_MSG_ERROR("Null pointer to RobRequestInfo");
- return HLT::ERROR;
- }
-
- std::vector<uint32_t> MdtRobList;
- std::vector<uint32_t> RpcRobList;
- std::vector<uint32_t> TgcRobList;
- std::vector<uint32_t> CscRobList;
-
- std::vector<const TrigRoiDescriptor*> roids;
- HLT::ErrorCode hec = getFeatures(inputTE, roids);
-
- if (hec != HLT::OK) {
- ATH_MSG_ERROR("Could not find input TE");
- return hec;
- }
-
- // RoI base data access
- for (unsigned int i=0; i < roids.size(); i++) {
-
- if ( m_use_RoIBasedDataAccess_MDT) {
-
- float roi_eta = roids[i]->eta();
- float roi_phi = roids[i]->phi();
- if (roi_phi < 0) roi_phi += 2.0 * M_PI;
-
- double etaMin = roi_eta - 0.2;
- double etaMax = roi_eta + 0.2;
- double phiMin = roi_phi - 0.2;
- double phiMax = roi_phi + 0.2;
- if( phiMin < 0 ) phiMin += 2*M_PI;
- if( phiMax < 0 ) phiMax += 2*M_PI;
- if( phiMin > 2*M_PI ) phiMin -= 2*M_PI;
- if( phiMax > 2*M_PI ) phiMax -= 2*M_PI;
-
- TrigRoiDescriptor* roi = new TrigRoiDescriptor( roi_eta, etaMin, etaMax, roi_phi, phiMin, phiMax );
- const IRoiDescriptor* iroi = (IRoiDescriptor*) roi;
-
- MdtRobList.clear();
- if ( iroi ) m_regionSelector->DetROBIDListUint(MDT, *iroi, MdtRobList);
- RRInfo->addRequestScheduledRobIDs(MdtRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << MdtRobList.size() << " Mdt Rob's,");
-
- if(roi) delete roi;
- }
-
- if ( m_use_RoIBasedDataAccess_RPC) {
-
- const IRoiDescriptor* iroi = (IRoiDescriptor*) roids[i];
-
- RpcRobList.clear();
- if ( iroi ) m_regionSelector->DetROBIDListUint(RPC, *iroi, RpcRobList);
- RRInfo->addRequestScheduledRobIDs(RpcRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << RpcRobList.size() << " Rpc Rob's,");
- }
-
- if ( m_use_RoIBasedDataAccess_TGC) {
-
- float roi_eta = roids[i]->eta();
- float roi_phi = roids[i]->phi();
- if (roi_phi < 0) roi_phi += 2.0 * M_PI;
-
- double etaMin = roi_eta - 0.2;
- double etaMax = roi_eta + 0.2;
- double phiMin = roi_phi - 0.1;
- double phiMax = roi_phi + 0.1;
- if( phiMin < 0 ) phiMin += 2*M_PI;
- if( phiMax < 0 ) phiMax += 2*M_PI;
- if( phiMin > 2*M_PI ) phiMin -= 2*M_PI;
- if( phiMax > 2*M_PI ) phiMax -= 2*M_PI;
-
- TrigRoiDescriptor* roi = new TrigRoiDescriptor( roi_eta, etaMin, etaMax, roi_phi, phiMin, phiMax );
- const IRoiDescriptor* iroi = (IRoiDescriptor*) roi;
-
- TgcRobList.clear();
- if ( iroi ) m_regionSelector->DetROBIDListUint(TGC, *iroi, TgcRobList);
- RRInfo->addRequestScheduledRobIDs(TgcRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << TgcRobList.size() << " Tgc Rob's,");
-
- if(roi) delete roi;
- }
-
- if ( m_use_RoIBasedDataAccess_CSC) {
-
- const IRoiDescriptor* iroi = (IRoiDescriptor*) roids[i];
-
- CscRobList.clear();
- if ( iroi ) m_regionSelector->DetROBIDListUint(CSC, *iroi, CscRobList);
- RRInfo->addRequestScheduledRobIDs(CscRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << CscRobList.size() << " Csc Rob's,");
- }
- }
-
- // Full data access
- if ( !m_use_RoIBasedDataAccess_MDT ) {
- MdtRobList.clear();
- m_regionSelector->DetROBIDListUint(MDT, MdtRobList);
- RRInfo->addRequestScheduledRobIDs(MdtRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << MdtRobList.size() << " Mdt Rob's,");
- }
-
- if ( !m_use_RoIBasedDataAccess_RPC ) {
- RpcRobList.clear();
- m_regionSelector->DetROBIDListUint(RPC, RpcRobList);
- RRInfo->addRequestScheduledRobIDs(RpcRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << RpcRobList.size() << " Rpc Rob's,");
- }
-
- if ( !m_use_RoIBasedDataAccess_TGC ) {
- TgcRobList.clear();
- m_regionSelector->DetROBIDListUint(TGC, TgcRobList);
- RRInfo->addRequestScheduledRobIDs(TgcRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << TgcRobList.size() << " Tgc Rob's,");
- }
-
- if ( !m_use_RoIBasedDataAccess_CSC ) {
- CscRobList.clear();
- m_regionSelector->DetROBIDListUint(CSC, CscRobList);
- RRInfo->addRequestScheduledRobIDs(CscRobList);
- ATH_MSG_DEBUG("prepareRobRequests, find " << CscRobList.size() << " Csc Rob's,");
- }
-
- return HLT::OK;
-}
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.h
index 9d1dcbf632724367128dd4bf174d5eb46003d0e8..dd91c6803769293cee08cfa4e9d0c0d6aad7f693 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.h
@@ -38,7 +38,6 @@
#include "xAODTracking/TrackParticleContainer.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-class IRegSelSvc;
class Incident;
class MsgStream;
@@ -97,9 +96,6 @@ class MuFastSteering : public HLT::FexAlgo,
// handler for "UpdateAfterFork" actions
void handle(const Incident& incident);
-
- using HLT::FexAlgo::prepareRobRequests;
- virtual HLT::ErrorCode prepareRobRequests(const HLT::TriggerElement* inputTE );
protected:
@@ -164,8 +160,6 @@ class MuFastSteering : public HLT::FexAlgo,
ServiceHandle<ITrigTimerSvc> m_timerSvc;
std::vector<TrigTimer*> m_timingTimers;
- ServiceHandle<IRegSelSvc> m_regionSelector;
-
// Tools
ToolHandle<TrigL2MuonSA::MuFastDataPreparator> m_dataPreparator {
this, "DataPreparator", "TrigL2MuonSA::MuFastDataPreparator", "data preparator" };
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py b/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py
index 9972a81fb3f88e8e0ef46393dda1e8ba326b194c..207b77f8978022a0c722a309d4305758ba7ddad0 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py
+++ b/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py
@@ -2,9 +2,11 @@
def TrackCountMonitoring():
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
- monTool.defineHistogram('ntrks', path='EXPERT', type='TH1I', title='ntrks',xbins=100, xmin=-0.5, xmax=4999.5)
+ monTool.defineHistogram('ntrks', path='EXPERT', type='TH1I', title='ntrks', xbins=100, xmin=-0.5, xmax=4999.5)
from TrigMinBias.TrigMinBiasConf import TrackCountHypoAlgMT
alg=TrackCountHypoAlgMT()
- for i in range(len(alg.min_pt)):
- monTool.defineHistogram('counts_minpTcutIndex_{}_maxZ0cutIndex_{}'.format(i,i), path='EXPERT', type='TH1I', title='counts for min pT and max z0 cut',xbins=100, xmin=-0.5, xmax=4999.5)
+ for i in range(len(alg.minPt)):
+ monTool.defineHistogram('countsForSelection{}'.format(i),
+ path='EXPERT', type='TH1I', title='counts for min pT and max z0 cut',
+ xbins=100, xmin=-0.5, xmax=4999.5)
return monTool
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx
index 171a55ba8dd8fa1418556f33dacb825607543dc5..1cebee7f19e310af9ada95a81e7daeae9bdae430 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx
@@ -8,19 +8,18 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "AthViews/ViewHelper.h"
using TrigCompositeUtils::createAndStore;
-using TrigCompositeUtils::DecisionContainer;
using TrigCompositeUtils::DecisionAuxContainer;
+using TrigCompositeUtils::DecisionContainer;
using TrigCompositeUtils::DecisionIDContainer;
using TrigCompositeUtils::decisionIDs;
-using TrigCompositeUtils::newDecisionIn;
-using TrigCompositeUtils::linkToPrevious;
-using TrigCompositeUtils::viewString;
using TrigCompositeUtils::featureString;
using TrigCompositeUtils::findLink;
using TrigCompositeUtils::LinkInfo;
+using TrigCompositeUtils::linkToPrevious;
+using TrigCompositeUtils::newDecisionIn;
+using TrigCompositeUtils::viewString;
-TrackCountHypoAlgMT::TrackCountHypoAlgMT(const std::string& name, ISvcLocator* pSvcLocator) :
-::HypoBase(name, pSvcLocator)
+TrackCountHypoAlgMT::TrackCountHypoAlgMT(const std::string &name, ISvcLocator *pSvcLocator) : ::HypoBase(name, pSvcLocator)
{
}
@@ -29,103 +28,114 @@ StatusCode TrackCountHypoAlgMT::initialize()
ATH_CHECK(m_tracksKey.initialize());
ATH_CHECK(m_trackCountKey.initialize());
renounce(m_tracksKey);
- ATH_CHECK(m_min_pt.size()==m_max_z0.size());
+ ATH_CHECK(m_minPt.size() == m_maxZ0.size());
- if (m_tracksKey.key() == "Undefined" || m_trackCountKey.key() == "Undefined") {
- ATH_MSG_ERROR("either track Key name or track count key name is undefined " );
+ if (m_tracksKey.key() == "Undefined" || m_trackCountKey.key() == "Undefined")
+ {
+ ATH_MSG_ERROR("either track Key name or track count key name is undefined ");
return StatusCode::FAILURE;
}
ATH_CHECK(m_hypoTools.retrieve());
- if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
+ if (!m_monTool.empty())
+ ATH_CHECK(m_monTool.retrieve());
return StatusCode::SUCCESS;
}
-StatusCode TrackCountHypoAlgMT::execute(const EventContext& context) const
+StatusCode TrackCountHypoAlgMT::execute(const EventContext &context) const
{
- ATH_MSG_DEBUG ( "Executing " << name() << "..." );
- auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
+ ATH_MSG_DEBUG("Executing " << name() << "...");
+ auto previousDecisionsHandle = SG::makeHandle(decisionInput(), context);
- if( not previousDecisionsHandle.isValid() ) {//implicit
- ATH_MSG_DEBUG( "No implicit RH for previous decisions "<< decisionInput().key()<<": is this expected?" );
+ if (not previousDecisionsHandle.isValid())
+ { //implicit
+ ATH_MSG_DEBUG("No implicit RH for previous decisions " << decisionInput().key() << ": is this expected?");
return StatusCode::SUCCESS;
}
- if (previousDecisionsHandle->size() == 0) {
- ATH_MSG_DEBUG( "No previous decision, nothing to do.");
+ if (previousDecisionsHandle->size() == 0)
+ {
+ ATH_MSG_DEBUG("No previous decision, nothing to do.");
return StatusCode::SUCCESS;
- } else if (previousDecisionsHandle->size() > 1) {
- ATH_MSG_ERROR("Found " << previousDecisionsHandle->size() <<" previous decisions.");
+ }
+ else if (previousDecisionsHandle->size() > 1)
+ {
+ ATH_MSG_ERROR("Found " << previousDecisionsHandle->size() << " previous decisions.");
return StatusCode::FAILURE;
}
- ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" implicit ReadHandles for previous decisions");
+ ATH_MSG_DEBUG("Running with " << previousDecisionsHandle->size() << " implicit ReadHandles for previous decisions");
+ const auto viewTrk = (previousDecisionsHandle->at(0))->objectLink<ViewContainer>(viewString());
+ ATH_CHECK(viewTrk.isValid());
+ auto tracksHandle = ViewHelper::makeHandle(*viewTrk, m_tracksKey, context);
+ ATH_CHECK(tracksHandle.isValid());
+ ATH_MSG_DEBUG("spacepoint handle size: " << tracksHandle->size() << "...");
- const auto viewTrk = (previousDecisionsHandle->at(0))->objectLink<ViewContainer>( viewString() );
- ATH_CHECK( viewTrk.isValid() );
- auto tracksHandle = ViewHelper::makeHandle( *viewTrk, m_tracksKey, context );
- ATH_CHECK( tracksHandle.isValid() );
- ATH_MSG_DEBUG ( "spacepoint handle size: " << tracksHandle->size() << "..." );
+ int ntrks = tracksHandle->size();
+ ATH_MSG_DEBUG("Successfully retrieved track container of size" << ntrks);
- int ntrks=tracksHandle->size();
- ATH_MSG_DEBUG ("Successfully retrieved track container of size" <<ntrks);
-
- std::vector<int> counts(m_min_pt.size());
- for (const auto trackPtr: *tracksHandle){
- const Trk::Perigee& aMeasPer = trackPtr->perigeeParameters();
+ std::vector<int> counts(m_minPt.size());
+ for (const auto trackPtr : *tracksHandle)
+ {
+ const Trk::Perigee &aMeasPer = trackPtr->perigeeParameters();
const double pT = aMeasPer.pT();
const double z0 = aMeasPer.parameters()[Trk::z0];
- for (long unsigned int i=0;i<m_min_pt.size();i++){
- if(pT >= m_min_pt[i] && std::fabs(z0) < m_max_z0[i]) counts[i]++;
+ for (long unsigned int i = 0; i < m_minPt.size(); i++)
+ {
+ if (pT >= m_minPt[i] && std::fabs(z0) < m_maxZ0[i])
+ counts[i]++;
}
}
- for (long unsigned int i=0;i<m_min_pt.size();i++){
- ATH_MSG_DEBUG( "Number of tracks found with pT cut= "<<m_min_pt[i] << " MeV =" <<"and z0 cut= "<<m_max_z0[i] << counts[i] );
+ for (long unsigned int i = 0; i < m_minPt.size(); i++)
+ {
+ ATH_MSG_DEBUG("Number of tracks found with pT cut= " << m_minPt[i] << " MeV ="
+ << "and z0 cut= " << m_maxZ0[i] << counts[i]);
}
// Recording Data
- auto trackCountContainer = std::make_unique< xAOD::TrigCompositeContainer>();
- auto trackCountContainerAux = std::make_unique< xAOD::TrigCompositeAuxContainer>();
+ auto trackCountContainer = std::make_unique<xAOD::TrigCompositeContainer>();
+ auto trackCountContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
trackCountContainer->setStore(trackCountContainerAux.get());
- xAOD::TrigComposite * trackCount = new xAOD::TrigComposite();
+ xAOD::TrigComposite *trackCount = new xAOD::TrigComposite();
trackCountContainer->push_back(trackCount);
trackCount->setDetail("ntrks", ntrks);
- trackCount->setDetail("pTcuts", static_cast<std::vector<float>>(m_min_pt));
- trackCount->setDetail("z0cuts", static_cast<std::vector<float>>(m_max_z0));
+ trackCount->setDetail("pTcuts", static_cast<std::vector<float>>(m_minPt));
+ trackCount->setDetail("z0cuts", static_cast<std::vector<float>>(m_maxZ0));
trackCount->setDetail("counts", counts);
// TODO revisit
- auto mon_ntrks = Monitored::Scalar<int>("ntrks",ntrks);
- Monitored::Group(m_monTool,mon_ntrks);
- for(long unsigned int i=0;i<counts.size();i++){
- auto mon_counts = Monitored::Scalar<int>("counts"+std::to_string(i),counts[i]);
- Monitored::Group(m_monTool,mon_counts);
+ auto mon_ntrks = Monitored::Scalar<int>("ntrks", ntrks);
+ Monitored::Group(m_monTool, mon_ntrks);
+ for (long unsigned int i = 0; i < counts.size(); i++)
+ {
+ auto mon_counts = Monitored::Scalar<int>("counts" + std::to_string(i), counts[i]);
+ Monitored::Group(m_monTool, mon_counts);
}
- SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
+ SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context);
auto decisions = outputHandle.ptr();
- auto d = newDecisionIn( decisions);
- linkToPrevious( d, decisionInput().key(), 0 );
+ auto d = newDecisionIn(decisions);
+ linkToPrevious(d, decisionInput().key(), 0);
TrigCompositeUtils::DecisionIDContainer prev;
- TrigCompositeUtils::decisionIDs( previousDecisionsHandle->at(0), prev );
+ TrigCompositeUtils::decisionIDs(previousDecisionsHandle->at(0), prev);
TrackCountHypoTool::TrkCountsInfo trkinfo{d, trackCount, prev};
- for(auto &tool:m_hypoTools)
+ for (auto &tool : m_hypoTools)
{
ATH_CHECK(tool->decide(trkinfo));
}
SG::WriteHandle<xAOD::TrigCompositeContainer> trackCountHandle(m_trackCountKey, context);
- ATH_CHECK(trackCountHandle.record( std::move( trackCountContainer ), std::move( trackCountContainerAux ) ) );
- d->setObjectLink( featureString(), ElementLink<xAOD::TrigCompositeContainer>( m_trackCountKey.key(), 0) );
+ ATH_CHECK(trackCountHandle.record(std::move(trackCountContainer), std::move(trackCountContainerAux)));
+ d->setObjectLink(featureString(), ElementLink<xAOD::TrigCompositeContainer>(m_trackCountKey.key(), 0));
//ATH_CHECK( hypoBaseOutputProcessing(outputHandle) );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
index 715c4de3e6556d5003215022b705bd5466135dfa..6c1c91eba2b1c4ffc73c2b5781406f54b102d636 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
@@ -27,12 +27,12 @@ public:
private:
TrackCountHypoAlgMT();
- ToolHandleArray< TrackCountHypoTool > m_hypoTools {this, "HypoTools", {},"Tools that perform actual selection"};
- SG::ReadHandleKey<xAOD::TrackParticleContainer> m_tracksKey{this,"tracksKey","Undefined",""};
- SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_trackCountKey{this,"trackCountKey","Undefined",""};
- Gaudi::Property<std::vector<float>> m_min_pt{this, "min_pt",{0.1,0.2,4.0,5.0}, "Accept events with momentum higher than this limit"};
- Gaudi::Property<std::vector<float>> m_max_z0{this, "max_z0",{100,401,200,300}, "Accept events with absolute value of vertex position lower \
- than this limit in mm; this vector has to be of the same size as min_pT vector, repetition of cut values are allowed if that makes the number of elements the same"};
- ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
+ ToolHandleArray< TrackCountHypoTool > m_hypoTools {this, "HypoTools", {}, "Tools that perform actual selection"};
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_tracksKey{this, "tracksKey", "Undefined", ""};
+ SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_trackCountKey{this, "trackCountKey", "Undefined", ""};
+ Gaudi::Property<std::vector<float>> m_minPt{this, "minPt", {0.1,0.2,4.0,5.0}, "Accept events with momentum higher than this limit"};
+ Gaudi::Property<std::vector<float>> m_maxZ0{this, "maxZ0", {100,401,200,300}, "Accept events with absolute value of vertex position lower \
+ than this limit in mm; this vector has to be of the same size as minPt vector, repetition of cut values are allowed if that makes the number of elements the same"};
+ ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool", "", "Monitoring tool"};
};
#endif // TRIGT2MINBIAS_TRACKCOUNTHYPOALGMT_H
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx
index 7b1616eb9278d5d0c668c3398bf40a6e04f26f5b..83c4fa7f761bd14ad6dbd202d54c95c81d5d0fdd 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx
@@ -3,7 +3,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "AthenaMonitoringKernel/Monitored.h"
@@ -11,19 +10,26 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
using namespace TrigCompositeUtils;
-TrackCountHypoTool::TrackCountHypoTool( const std::string& type,const std::string& name,const IInterface* parent )
-: AthAlgTool( type, name, parent ),
-m_decisionId( HLT::Identifier::fromToolName( name ) ) {}
+TrackCountHypoTool::TrackCountHypoTool(const std::string &type, const std::string &name, const IInterface *parent)
+ : AthAlgTool(type, name, parent),
+ m_decisionId(HLT::Identifier::fromToolName(name)) {}
-StatusCode TrackCountHypoTool::initialize() {
+StatusCode TrackCountHypoTool::initialize()
+{
return StatusCode::SUCCESS;
}
-StatusCode TrackCountHypoTool::decide( TrkCountsInfo& trkinfo ) const {
- if ( trkinfo.previousDecisionIDs.count( m_decisionId.numeric() ) == 0 ) {
+StatusCode TrackCountHypoTool::decide(TrkCountsInfo &trkinfo) const
+{
+ if (trkinfo.previousDecisionIDs.count(m_decisionId.numeric()) == 0)
+ {
ATH_MSG_DEBUG("Already rejected");
return StatusCode::SUCCESS;
}
+ if ( m_acceptAll ) {
+ addDecisionID(m_decisionId.numeric(), trkinfo.decision);
+ ATH_MSG_DEBUG("REGTEST event accepted because of acceptAll");
+ }
std::vector<int> counts;
@@ -34,35 +40,35 @@ StatusCode TrackCountHypoTool::decide( TrkCountsInfo& trkinfo ) const {
trkinfo.counts->getDetail<std::vector<float>>("z0cuts", z0cuts);
float countForConfiguredPtThreshold{};
bool found{false};
- for ( size_t i = 0; i < counts.size(); ++i ) {
- if ( std::abs( pTcuts[i] - m_min_pt ) < 0.001 && std::abs( z0cuts[i] - m_max_z0 ) < 0.001 ) {
+ for (size_t i = 0; i < counts.size(); ++i)
+ {
+ if (std::abs(pTcuts[i] - m_minPt) < 0.001 && std::abs(z0cuts[i] - m_maxZ0) < 0.001)
+ {
found = true;
countForConfiguredPtThreshold = counts[i];
- }
+ }
}
- if (!found ) {
- ATH_MSG_ERROR ("Unable to find tracks count for requested pT threshold " << m_min_pt << " need to fix hypo tool configuratio or add new threshold in tracks counting");
- for ( size_t i = 0; i < counts.size(); ++i ) {
- ATH_MSG_ERROR( "Count of tracks of pT above " << pTcuts[i] << " is available");
- }
- return StatusCode::FAILURE;
+
+ if (!found)
+ {
+ ATH_MSG_ERROR("Unable to find tracks count for requested pT threshold " << m_minPt << " need to fix hypo tool configuration or add new threshold in tracks counting");
+ for (size_t i = 0; i < counts.size(); ++i)
+ {
+ ATH_MSG_ERROR("Count of tracks of pT above " << pTcuts[i] << " and z0 requirement " << z0cuts[i] << " that are available");
+ }
+ return StatusCode::FAILURE;
}
- else{
- ATH_MSG_DEBUG ("REGTEST found "<<countForConfiguredPtThreshold <<" tracks for "<<m_min_pt);
+ else
+ {
+ ATH_MSG_DEBUG("REGTEST found " << countForConfiguredPtThreshold << " tracks for " << m_minPt);
}
- std::vector<bool> decisionCuts({
- (m_required_ntrks != -1 ? m_required_ntrks <= countForConfiguredPtThreshold : (bool)m_logicAnd),
- (m_max_required_ntrks != -1 ? m_max_required_ntrks > countForConfiguredPtThreshold : (bool)m_logicAnd)
- });
+
+ const bool minTrkPassed = (m_minNtrks == -1) or (countForConfiguredPtThreshold > m_minNtrks);
+ const bool maxTrkPassed = (m_maxNtrks == -1) or (countForConfiguredPtThreshold < m_maxNtrks);
- if(m_logicAnd && !std::all_of(decisionCuts.begin(),decisionCuts.end(),[](bool k ){return k; }) ){
-
- return StatusCode::SUCCESS;
- }else if(m_logicAnd==false && !std::any_of(decisionCuts.begin(),decisionCuts.end(),[](bool k ){return k; }) ){
- return StatusCode::SUCCESS;
- }else{
- addDecisionID( m_decisionId.numeric(), trkinfo.decision );
- ATH_MSG_DEBUG ("REGTEST event accepted");
+ if ( minTrkPassed and maxTrkPassed ) {
+ addDecisionID(m_decisionId.numeric(), trkinfo.decision);
+ ATH_MSG_DEBUG("REGTEST event accepted");
}
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
index 4c0347dca06f5abc52efc47254a12f2ec324d12c..f62a1800900b6d7f4fac2b1e501a3713cb950788 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
@@ -31,13 +31,11 @@ public:
private:
HLT::Identifier m_decisionId;
- Gaudi::Property<float> m_min_pt{this, "min_pt",0.1, "Accept events with momentum higher than this limit in MeV"};
- Gaudi::Property<float> m_max_z0{this, "max_z0",100, "Accept events with absolute value of vertex lower than this limit in mm"};
- Gaudi::Property<float> m_required_ntrks{this, "required_ntrks", 1, "Accept events with minimum of this number of tracks"};
- Gaudi::Property<float> m_max_required_ntrks{this, "max_required_ntrks", -1, "Accept events with maximum of this number of tracks"};
+ Gaudi::Property<float> m_minPt{this, "minPt",0.1, "Accept events with momentum higher than this limit in MeV"};
+ Gaudi::Property<float> m_maxZ0{this, "maxZ0",100, "Accept events with absolute value of vertex lower than this limit in mm"};
+ Gaudi::Property<float> m_minNtrks{this, "minNtrks", 1, "Accept events with minimum of this number of tracks, -1 means this cut is disabled"};
+ Gaudi::Property<float> m_maxNtrks{this, "maxNtrks", -1, "Accept events with maximum of this number of tracks, -1 means this cut is disabled"};
Gaudi::Property<bool> m_acceptAll{this, "acceptAll", false, "Accept all events"};
- Gaudi::Property<bool> m_cutMinAndMax{this, "cutMinAndMax", false, "take events within the given higher and lower limt/cut"};
- Gaudi::Property<bool> m_logicAnd{this, "TriggerTypeAnd", true, "And/Or Logic"};
};
#endif //> !TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h
index 66ed0062b6c5d307a14cbdde3dcde3aa0107df36..073a1e3b4fcf503562c0e07de957e4a5a6f829bc 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TrigPartialEventBuilding_RoIPEBInfoWriterTool_h
@@ -7,7 +7,6 @@
#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h"
#include "IRegionSelector/RegSelEnums.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include "IRegionSelector/IRegSelTool.h"
/** @class RoIPEBInfoWriterTool
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
deleted file mode 100644
index a237fa318f8b1e1c22c5da6a59a6ed40694c45e0..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-// ********************************************************************
-//
-// NAME: TrigDataAccessATLFAST.cxx
-// PACKAGE: Trigger/TrigAlgorithms/TrigT2CaloCommon
-//
-// AUTHOR: Denis Oliveira Damazio
-//
-// REFERENCES: This will provide infrastructure for the Tools
-// to perform their algorithms
-//
-// ********************************************************************
-
-#include "GaudiKernel/MsgStream.h"
-
-#include "CaloIdentifier/LArEM_ID.h"
-#include "LArRecEvent/LArCell.h"
-#include "LArRecEvent/LArFebEnergyCollection.h"
-
-#include "CaloIdentifier/LArEM_ID.h"
-#include "CaloEvent/CaloCluster.h"
-#include "CaloGeoHelpers/CaloSampling.h"
-
-#include "LArRawUtils/LArRoI_Map.h"
-#include "IRegionSelector/IRegSelSvc.h"
-
-#include "TrigDataAccessATLFAST.h"
-
-#include "AthenaPoolUtilities/AthenaAttributeList.h"
-
-#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-
-// Event Incident to get EventInfo
-#include "GaudiKernel/IIncidentSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // legacy trigger code
-
-// Initialize method for all tools
-// Retrieval of all Tools to be used during run
-StatusCode TrigDataAccessATLFAST::initialize()
-{
-
- ATH_MSG_DEBUG("in initialize() by TrigDataAccessATLFAST");
-
- // Some tools are necessary for the Algorithm to run
- // The RegionSelector is being retrieved here
- if( (m_pRegionSelector.retrieve()).isFailure() ) {
- ATH_MSG_FATAL("Unable to retrieve RegionSelector Service");
- return StatusCode::FAILURE;
- }
-
- // Reserve vectors space to avoid online memory allocation
- // Limits to be studied
- m_rIds.reserve(30);
- m_vrodid32.reserve(30);
- m_tile.push_back(0);
-// Event handling
- IIncidentSvc* p_incSvc;
- if ( service("IncidentSvc",p_incSvc, true).isFailure() ) {
- ATH_MSG_ERROR("Unable to get the IncidentSvc");
- }else{
- p_incSvc->addListener(this, "BeginEvent",100);
- }
- // Method not called yet
- m_iov_called=false;
- // Register function for the detector store
- const DataHandle<AthenaAttributeList> febrodmap;
- if ( detStore()->regFcn(&ITrigDataAccess::beginRunHandle,
- (ITrigDataAccess*)this,
- febrodmap, "/LAR/Identifier/FebRodMap", true).isFailure() ) { //FIXME hardcoded database folder name
- ATH_MSG_ERROR(" Can't regFnc with Condition ");
- return StatusCode::FAILURE;
- }
- // Just to the Missing Et slice
- if ( m_usefullcoll ) {
- IRegSelSvc* regSelSvc = &(*m_pRegionSelector);
- if ( detStore()->regFcn(&IRegSelSvc::handle,
- regSelSvc,
- &ITrigDataAccess::beginRunHandle_RegSelSvc,
- (ITrigDataAccess*)this,true).isFailure() ) {
- ATH_MSG_ERROR(" Can't regFnc with Condition");
- return StatusCode::FAILURE;
- }
- m_rIdsem0.reserve(12288);
- m_rIdsem1.reserve(300);
- m_rIdsem2.reserve(300);
- m_rIdsem3.reserve(300);
- m_rIdshec.reserve(4352);
- m_rIdshec0.reserve(300);
- m_rIdshec1.reserve(300);
- m_rIdshec2.reserve(300);
- m_rIdsfcalhad0.reserve(256);
- m_rIdsfcalhad1.reserve(128);
- m_rIdsfcalem0.reserve(300);
- m_rIdstile.reserve(300);
- m_vrodid32lar.reserve(300);
- m_vrodid32em.reserve(724);
- m_vrodid32hec.reserve(72);
- m_vrodid32hec0.reserve(24);
- m_vrodid32hec1.reserve(24);
- m_vrodid32hec2.reserve(24);
- m_vrodid32fcalem.reserve(8);
- m_vrodid32fcalhad.reserve(6);
- m_vrodid32tile.reserve(300);
- } // end of m_usefullcoll
-
- return StatusCode::SUCCESS;
-} // End of initialize
-
-StatusCode TrigDataAccessATLFAST::beginRunHandle(IOVSVC_CALLBACK_ARGS){
- // The ByteStreamCnv (Through LArTT_Selector needs a map of the
- // RoIs, being retrieved here
- if(toolSvc()->retrieveTool("LArRoI_Map",m_roiMap).isFailure()) {
- ATH_MSG_FATAL("Could not find LArRoI_Map");
- return StatusCode::FAILURE;
- } // End of if LArRoI_Map
-
-#ifdef DOBYTESTREAMCNV
- //m_datablock.reserve(350);
- m_larcell = new LArCellCont();
- if ( (m_larcell->initialize()).isFailure() ){
- ATH_MSG_FATAL("Could not init larcell");
- }
- m_sel= new LArTT_Selector<LArCellCont>(m_roiMap,m_larcell);
- if(m_usefullcoll){
- m_selem = new LArTT_Selector<LArCellCont>(m_roiMap,m_larcell);
- m_selhec = new LArTT_Selector<LArCellCont>(m_roiMap,m_larcell);
- m_selfcalhad = new LArTT_Selector<LArCellCont>(m_roiMap,m_larcell);
- m_selfcalem = new LArTT_Selector<LArCellCont>(m_roiMap,m_larcell);
- }
- m_tilecell = new TileCellCont();
- if ( (m_tilecell->initialize()).isFailure() ){
- ATH_MSG_FATAL("Could not init tilecell");
- }
- //m_febcoll = new LArFebEnergyCollection();
- if(m_usefullcoll){
- ATH_MSG_DEBUG("Preparing the full collections");
- if ( m_rIdsem0.size() != 0 ) m_rIdsem0.clear();
- if ( m_rIdsem1.size() != 0 ) m_rIdsem1.clear();
- if ( m_rIdsem2.size() != 0 ) m_rIdsem2.clear();
- if ( m_rIdsem3.size() != 0 ) m_rIdsem3.clear();
- if ( m_rIdshec.size() != 0 ) m_rIdshec.clear();
- if ( m_rIdshec0.size() != 0 ) m_rIdshec0.clear();
- if ( m_rIdshec1.size() != 0 ) m_rIdshec1.clear();
- if ( m_rIdsfcalhad0.size() != 0 ) m_rIdsfcalhad0.clear();
- if ( m_rIdsfcalhad1.size() != 0 ) m_rIdsfcalhad1.clear();
- if ( m_rIdsfcalem0.size() != 0 ) m_rIdsfcalem0.clear();
- if ( m_rIdstile.size() != 0 ) m_rIdstile.clear();
- } // End of m_usefullcoll
-#endif
- m_iov_called=true;
- return StatusCode::SUCCESS;
-}
-
-
-
-StatusCode TrigDataAccessATLFAST::beginRunHandle_RegSelSvc(IOVSVC_CALLBACK_ARGS){
- if(m_usefullcoll){
- ATH_MSG_DEBUG("Finalizing Preparation of full collections");
- // TrigRoiDescriptor tmproi( 0, -4.8, 4.8, 0, -M_PI, M_PI, 0, 0, 0 );
- TrigRoiDescriptor tmproi( true ); /// give it true during the constructor, you get a full scan RoI
-
- // const double mineta = -4.8;
- // const double maxeta = 4.8;
- // const double minphi = -M_PI;
- // const double maxphi = M_PI;
- // // TTEM
- // m_pRegionSelector->DetROBIDListUint(TTEM,-1,mineta,maxeta,minphi,maxphi,m_vrodid32em);
- // // TTHEC
- // m_pRegionSelector->DetROBIDListUint(TTHEC,0,mineta,maxeta,minphi,maxphi,m_vrodid32hec0);
- // m_pRegionSelector->DetROBIDListUint(TTHEC,1,mineta,maxeta,minphi,maxphi,m_vrodid32hec1);
- // m_pRegionSelector->DetROBIDListUint(TTHEC,2,mineta,maxeta,minphi,maxphi,m_vrodid32hec2);
- // // FCALHAD
- // m_pRegionSelector->DetROBIDListUint(FCALHAD,-1,mineta,maxeta,minphi,maxphi,m_vrodid32fcalhad);
- // m_pRegionSelector->DetROBIDListUint(FCALEM,-1,mineta,maxeta,minphi,maxphi,m_vrodid32fcalem);
- // // TILE
- // m_pRegionSelector->DetROBIDListUint(TILE,mineta,maxeta,minphi,maxphi,m_vrodid32tile);
- // m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32em.begin(),m_vrodid32em.end());
- // m_vrodid32hec.insert(m_vrodid32hec.end(),m_vrodid32hec0.begin(),m_vrodid32hec0.end());
- // m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32fcalhad.begin(),m_vrodid32fcalhad.end());
- // m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32fcalem.begin(),m_vrodid32fcalem.end());
- // m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32hec.begin(),m_vrodid32hec.end());
- // m_pRegionSelector->DetHashIDList(TTEM,0,mineta,maxeta,minphi,maxphi,&m_rIdsem0);
- // m_pRegionSelector->DetHashIDList(TTEM,1,mineta,maxeta,minphi,maxphi,&m_rIdsem1);
- // m_pRegionSelector->DetHashIDList(TTEM,2,mineta,maxeta,minphi,maxphi,&m_rIdsem2);
- // m_pRegionSelector->DetHashIDList(TTEM,3,mineta,maxeta,minphi,maxphi,&m_rIdsem3);
- // m_pRegionSelector->DetHashIDList(TTHEC,0,mineta,maxeta,minphi,maxphi,&m_rIdshec0);
- // m_pRegionSelector->DetHashIDList(TTHEC,1,mineta,maxeta,minphi,maxphi,&m_rIdshec1);
- // m_pRegionSelector->DetHashIDList(TTHEC,2,mineta,maxeta,minphi,maxphi,&m_rIdshec2);
- // m_pRegionSelector->DetHashIDList(FCALHAD,0,mineta,maxeta,minphi,maxphi,&m_rIdsfcalhad0);
- // m_pRegionSelector->DetHashIDList(FCALHAD,1,mineta,maxeta,minphi,maxphi,&m_rIdsfcalhad1);
- // m_pRegionSelector->DetHashIDList(FCALEM,0,mineta,maxeta,minphi,maxphi,&m_rIdsfcalem0);
- // m_pRegionSelector->DetHashIDList(TILE,mineta,maxeta,minphi,maxphi,&m_rIdstile);
-
-
- m_pRegionSelector->DetROBIDListUint(TTEM,-1, tmproi, m_vrodid32em);
- // TTHEC
- m_pRegionSelector->DetROBIDListUint(TTHEC,0, tmproi, m_vrodid32hec0);
- m_pRegionSelector->DetROBIDListUint(TTHEC,1, tmproi, m_vrodid32hec1);
- m_pRegionSelector->DetROBIDListUint(TTHEC,2, tmproi, m_vrodid32hec2);
- // FCALHAD
- m_pRegionSelector->DetROBIDListUint(FCALHAD,-1, tmproi, m_vrodid32fcalhad);
- m_pRegionSelector->DetROBIDListUint(FCALEM,-1, tmproi, m_vrodid32fcalem);
- // TILE
- m_pRegionSelector->DetROBIDListUint(TILE, tmproi, m_vrodid32tile);
- m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32em.begin(),m_vrodid32em.end());
- m_vrodid32hec.insert(m_vrodid32hec.end(),m_vrodid32hec0.begin(),m_vrodid32hec0.end());
- m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32fcalhad.begin(),m_vrodid32fcalhad.end());
- m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32fcalem.begin(),m_vrodid32fcalem.end());
- m_vrodid32lar.insert(m_vrodid32lar.end(),m_vrodid32hec.begin(),m_vrodid32hec.end());
- m_pRegionSelector->DetHashIDList(TTEM,0, tmproi, m_rIdsem0);
- m_pRegionSelector->DetHashIDList(TTEM,1, tmproi, m_rIdsem1);
- m_pRegionSelector->DetHashIDList(TTEM,2, tmproi, m_rIdsem2);
- m_pRegionSelector->DetHashIDList(TTEM,3, tmproi, m_rIdsem3);
- m_pRegionSelector->DetHashIDList(TTHEC,0, tmproi, m_rIdshec0);
- m_pRegionSelector->DetHashIDList(TTHEC,1, tmproi, m_rIdshec1);
- m_pRegionSelector->DetHashIDList(TTHEC,2, tmproi, m_rIdshec2);
- m_pRegionSelector->DetHashIDList(FCALHAD,0, tmproi, m_rIdsfcalhad0);
- m_pRegionSelector->DetHashIDList(FCALHAD,1, tmproi, m_rIdsfcalhad1);
- m_pRegionSelector->DetHashIDList(FCALEM,0, tmproi, m_rIdsfcalem0);
- m_pRegionSelector->DetHashIDList(TILE, tmproi, m_rIdstile);
-
-
- // TTEM
- m_rIdsem0.insert(m_rIdsem0.end(),m_rIdsem1.begin(),m_rIdsem1.end());
- m_rIdsem0.insert(m_rIdsem0.end(),m_rIdsem2.begin(),m_rIdsem2.end());
- m_rIdsem0.insert(m_rIdsem0.end(),m_rIdsem3.begin(),m_rIdsem3.end());
- // TTHEC
- m_rIdshec.insert(m_rIdshec.end(),m_rIdshec0.begin(),m_rIdshec0.end());
- m_rIdshec.insert(m_rIdshec.end(),m_rIdshec1.begin(),m_rIdshec1.end());
- m_rIdshec.insert(m_rIdshec.end(),m_rIdshec2.begin(),m_rIdshec2.end());
- // FCALHAD
- m_rIdsfcalhad0.insert(m_rIdsfcalhad0.end(),m_rIdsfcalhad1.begin(),m_rIdsfcalhad1.end());
-
- m_selem->setRoIs(m_rIdsem0);
- m_selhec->setRoIs(m_rIdshec);
- m_selfcalhad->setRoIs(m_rIdsfcalhad0);
- m_selfcalem->setRoIs(m_rIdsfcalem0);
- } // End of m_usefullcoll
- return StatusCode::SUCCESS;
-}
-
-// Finalize method for all tools
-StatusCode TrigDataAccessATLFAST::finalize(){
- if (msgLvl(MSG::DEBUG)) {
- ATH_MSG_INFO( "in finalize() by TrigDataAccess" );
- }
-#ifdef DOBYTESTREAMCNV
- if ( m_iov_called ){
- if ( (m_larcell->finalize()).isFailure() ){
- ATH_MSG_FATAL("Could not finish larcell");
- }
- delete m_larcell;
- if ( (m_tilecell->finalize()).isFailure() ){
- ATH_MSG_FATAL("Could not finish tilecell");
- }
- delete m_tilecell;
- delete m_sel;
- if(m_usefullcoll){
- delete m_selem;
- delete m_selhec;
- delete m_selfcalhad;
- delete m_selfcalem;
- }
- }
-#endif
- return StatusCode::SUCCESS;
-
-} // End of finalize
-
-// This should be run to provide ByteStreamCnv with rodid's to
-// look up for. addROBData only works in athenaMT
-void TrigDataAccessATLFAST::RegionSelectorRobID (const int sampling,
- const IRoiDescriptor& roi,
- const DETID detid, bool /*fetchROBs*/) {
- // Clears up m_vrodid32
- if ( m_vrodid32.size() != 0 ) m_vrodid32.clear();
- if ( detid != TILE ){
- m_pRegionSelector->DetROBIDListUint(detid,sampling, roi, m_vrodid32);
- }
- else { // TILE does not need sample
- m_pRegionSelector->DetROBIDListUint(detid, roi, m_vrodid32);
- }
- if (msgLvl(MSG::DEBUG)) {
- ATH_MSG_DEBUG( "m_vrodid32.size() = " << m_vrodid32.size() );
- for(unsigned int i = 0 ; i < m_vrodid32.size() ; i++)
- ATH_MSG_DEBUG( "m_vrodid32[" << i << "]=" << m_vrodid32[i] );
- }
-} // End of RegionSelectorRobID
-
-
-// This code should load m_listID with Detectors ID
-// Should this return a flag in case of failure?
-void TrigDataAccessATLFAST::RegionSelectorListID (const int sampling,
- const IRoiDescriptor& roi, const DETID detid) {
- // Clears up m_rIds
- if ( m_rIds.size() != 0 ) m_rIds.clear();
-
- if ( detid != TILE ){
- m_pRegionSelector->DetHashIDList(detid,sampling, roi, m_rIds);
- }
- else{ // TILE does not need sample
- m_pRegionSelector->DetHashIDList(detid, roi, m_rIds);
- }
-
- if (msgLvl(MSG::DEBUG)) {
- ATH_MSG_DEBUG( "m_rIds.size() = " << m_rIds.size() );
- for(unsigned int i = 0; i < m_rIds.size() ; i++)
- ATH_MSG_DEBUG( "m_rIds[" << i << "]=" << m_rIds[i] );
- }
-} // End of RegionSelectorListID
-
-
-
-
-
-// This method should load all the infrastructure for the offline
-// Collection of cells. The iterators m_iBegin, m_iEnd and m_it
-// will have the cells Collection to be used by the Algorithm
-StatusCode TrigDataAccessATLFAST::LoadCollections (
- LArTT_Selector<LArCellCont>::const_iterator& Begin,
- LArTT_Selector<LArCellCont>::const_iterator& End,
- const unsigned int /*sample*/, bool /*prepare*/) {
- if (msgLvl(MSG::DEBUG)) {
- ATH_MSG_DEBUG( "m_rIds.size() in LoadColl = " << m_rIds.size() );
- for(unsigned int i = 0 ; i < m_rIds.size() ; i++)
- ATH_MSG_DEBUG( "m_rIds[" << i << "]=" << m_rIds[i] );
- }
-
- Begin=End;
-
- const DataHandle<CaloCellContainer> cells;
- if (evtStore()->retrieve(cells,"AllCalo").isFailure()) {
- ATH_MSG_ERROR("Could not find AllCalo container");
- return StatusCode::FAILURE;
- } // End of if StoreGateSvc
-
- int rodidx = 0;
- for (size_t i = 0; i < m_vrodid32.size(); ++i){
- // Find the collection to fill
- const std::vector<LArCellCollection*>::const_iterator it =
- (m_larcell->find(m_vrodid32[rodidx]));
-/*
- LArCellCollection* col =
- *(m_larcell->find(m_vrodid32[rodidx]));
-*/
- if ( it != m_larcell->end() ) { // Alread decoded collection
- LArCellCollection *col = *it;
- // Fills from the container
- fillColl(cells,*col);
- // if (col->size() == 0) return StatusCode::FAILURE;
- }
- rodidx++;
-
- } // End of for through RobFrags
-
- // These iterators can be used by every Tool
- m_sel->setRoIs(m_rIds);
- Begin = m_sel->begin();
- End = m_sel->end();
- if (msgLvl(MSG::DEBUG)) {
- LArTT_Selector<LArCellCont>::const_iterator it;
- for ( it=Begin; it != End; ++it ){
- ATH_MSG_DEBUG( "Eta: " << (*it)->eta()
- << "; Phi: " << (*it)->phi() <<
- "; Energy: " << (*it)->energy() );
- } // End of for printout cells
- }
- return StatusCode::SUCCESS;
-} // End of method
-StatusCode TrigDataAccessATLFAST::LoadCollections (
- TileCellCollection::const_iterator& Begin,
- TileCellCollection::const_iterator& End,
- const unsigned int sample, bool /*prepare*/){
-
- const DataHandle<CaloCellContainer> cells;
- if (evtStore()->retrieve(cells,"AllCalo").isFailure()) {
- ATH_MSG_ERROR("Could not find AllCalo container");
- return StatusCode::FAILURE;
- } // End of if StoreGateSvc
-
- int i = sample;
- Begin=End;
- //for (size_t i = 0; i < m_listID.size(); ++i){
- m_tile[0] = m_tilecell->find_rod(m_rIds[i]);
- // Find the collection to fill
- TileCellCollection* col = NULL;
- col = *(m_tilecell->find(m_rIds[i]));
- if ( col != NULL ) {
- fillColl(cells,*col);
- Begin = col->begin();
- End = col->end();
- }
-
- //} // End of for through RobFrags
-
- if (msgLvl(MSG::DEBUG)) {
- TileCellCollection::const_iterator itt = Begin;
- for (itt=Begin;itt!=End;++itt){
- ATH_MSG_DEBUG( "Eta: " << (*itt)->eta()
- << "; Phi: " << (*itt)->phi() <<
- "; Energy: " << (*itt)->energy() <<
- "; Hash Id: " << (*itt)->caloDDE()->calo_hash() );
- } // End of for printout cells
- }
- return StatusCode::SUCCESS;
-
-} // End of LoadCollections
-
-// This method does not make sense for ATLFAST
-StatusCode TrigDataAccessATLFAST::LoadCollections (
- LArFebEnergyCollection::const_iterator& /*Begin*/,
- LArFebEnergyCollection::const_iterator& /*End*/,
- const unsigned int /*sample*/, bool /*prepare*/){
-
-/*
- m_robFrags.clear();
- m_robDataProvider->getROBData(m_vrodid32,m_robFrags);
-
- //int rodidx = 0;
- LArFebEnergyCollection* m_febcoll;
- m_febcoll = new LArFebEnergyCollection();
- for (size_t i = 0; i < m_robFrags.size(); ++i){
- m_lardecoder->check_valid(m_robFrags[i],msg());
- //m_datablock.clear();
- // Get Rod Data and size of fragment
- const uint32_t* roddata1 = 0;
- m_robFrags[i]->rod_data(roddata1);
- size_t roddatasize = m_robFrags[i]->rod_ndata();
- if (roddatasize < 3) {
- ATH_MSG_FATAL( "Error reading bytestream"<<
- "event: Empty ROD block (less than 3 words)" );
- return StatusCode::FAILURE;
- } // End of if small size
- m_lardecoder->setRobFrag(m_robFrags[i]);
- m_lardecoder->fillCollectionHLTFeb(roddata1,roddatasize,*m_febcoll);
- // if (col->size() == 0) return StatusCode::FAILURE;
-
- } // End of for through RobFrags
- // These iterators can be used by every Tool
- Begin = m_febcoll->begin();
- End = m_febcoll->end();
-
-#ifndef NDEBUG
- for(LArFebEnergyCollection::const_iterator it = Begin;
- it!=End; ++it){
- ATH_MSG_DEBUG( " Feb ID = " << (*it)->getFebId()
- << " Feb Ex = " << (*it)->getFebEx()
- << " Feb Ey = " << (*it)->getFebEy()
- << " Feb Ez = " << (*it)->getFebEz() );
- }
-#endif
-*/
- return StatusCode::SUCCESS;
-
-} // End of LoadCollections
-
-StatusCode TrigDataAccessATLFAST::LoadFullCollections (
- LArTT_Selector<LArCellCont>::const_iterator& Begin,
- LArTT_Selector<LArCellCont>::const_iterator& End,
- const DETID /*detid*/, bool /*prepare*/) {
-
- if (msgLvl(MSG::DEBUG)) {
- ATH_MSG_DEBUG( "m_rIds.size() in LoadColl = " << m_rIds.size() );
- for(unsigned int i = 0 ; i < m_rIds.size() ; i++)
- ATH_MSG_DEBUG( "m_rIds[" << i << "]=" << m_rIds[i] );
- }
-
- Begin=End;
-
- const DataHandle<CaloCellContainer> cells;
- if (evtStore()->retrieve(cells,"AllCalo").isFailure()) {
- ATH_MSG_ERROR("Could not find AllCalo container");
- return StatusCode::FAILURE;
- } // End of if StoreGateSvc
-
- int rodidx = 0;
- for (size_t i = 0; i < m_vrodid32lar.size(); ++i){
- const std::vector<LArCellCollection*>::const_iterator it =
- (m_larcell->find(m_vrodid32lar[rodidx]));
- if (it != m_larcell->end() ) {
- LArCellCollection *col = *it;
- fillColl(cells,*col);
- }
- rodidx++;
- } // End of for through RobFrags
-
-
- if (msgLvl(MSG::DEBUG)) {
- int i=0;
- LArTT_Selector<LArCellCont>::const_iterator it;
- for ( it=Begin; it != End; ++it ){
- ATH_MSG_DEBUG( "Eta: " << (*it)->eta()
- << "; Phi: " << (*it)->phi() <<
- "; Energy: " << (*it)->energy() );
- i++;
- } // End of for printout cells
- }
- return StatusCode::SUCCESS;
-} // End of method
-StatusCode TrigDataAccessATLFAST::LoadFullCollections (
- TileCellCollection::const_iterator& Begin,
- TileCellCollection::const_iterator& End,
- const unsigned int sample, bool /*prepare*/){
-
- const DataHandle<CaloCellContainer> cells;
- if (evtStore()->retrieve(cells,"AllCalo").isFailure()) {
- ATH_MSG_ERROR("Could not find AllCalo container");
- return StatusCode::FAILURE;
- } // End of if StoreGateSvc
-
-
- int i = sample;
- Begin=End;
- m_tile[0] = m_tilecell->find_rod(m_rIdstile[i]);
- // Find the collection to fill
- TileCellCollection* col = NULL;
- col = *(m_tilecell->find(m_rIdstile[i]));
- if( col!=NULL){
- fillColl(cells,*col);
- Begin = col->begin();
- End = col->end();
- }
-
- if (msgLvl(MSG::DEBUG)) {
- TileCellCollection::const_iterator itt = Begin;
- for (itt=Begin;itt!=End;++itt){
- ATH_MSG_DEBUG( "Eta: " << (*itt)->eta()
- << "; Phi: " << (*itt)->phi() <<
- "; Energy: " << (*itt)->energy() <<
- "; Hash Id: " << (*itt)->caloDDE()->calo_hash() );
- } // End of for printout cells
- }
- return StatusCode::SUCCESS;
-
-} // End of LoadCollections
-
-// The following method does not make sense to ATLFAST
-StatusCode TrigDataAccessATLFAST::LoadFullCollections (
- LArFebEnergyCollection::const_iterator& /*Begin*/,
- LArFebEnergyCollection::const_iterator& /*End*/,
- const DETID /*detid*/, bool /*prepare*/){
-
-
-/*
- m_robFrags.clear();
- switch (detid) {
- case TTEM:
- m_robDataProvider->getROBData(m_vrodid32em,m_robFrags);
- break;
- case TTHEC:
- m_robDataProvider->getROBData(m_vrodid32hec0,m_robFrags);
- break;
- case FCALEM:
- m_robDataProvider->getROBData(m_vrodid32fcalem,m_robFrags);
- break;
- case FCALHAD:
- m_robDataProvider->getROBData(m_vrodid32fcalhad,m_robFrags);
- break;
- default:
- break;
- }
-
- LArFebEnergyCollection* m_febcoll;
- m_febcoll = new LArFebEnergyCollection();
-
- for( size_t i=0; i< m_robFrags.size(); ++i){
- m_lardecoder->check_valid(m_robFrags[i],msg());
- const uint32_t* roddata1 = 0;
- m_robFrags[i]->rod_data(roddata1);
- size_t roddatasize = m_robFrags[i]->rod_ndata();
- if(roddatasize < 3) {
- ATH_MSG_FATAL( "Error reading bytestream " <<
- "event: Empty ROD block (less than 3 words)" );
- return StatusCode::FAILURE;
- }
- m_lardecoder->setRobFrag(m_robFrags[i]);
- m_lardecoder->fillCollectionHLTFeb(roddata1,roddatasize,*m_febcoll);
- }
-
- Begin = m_febcoll->begin();
- End = m_febcoll->end();
- std::cout << "This is the detectorID = " << detid << std::endl;
- std::cout << "This is the febcoll size = " << m_febcoll->size() << std::endl;
-
-#ifndef NDEBUG
- for(LArFebEnergyCollection::const_iterator it = Begin;
- it!=End; ++it){
- ATH_MSG_DEBUG( " Feb ID = " << (*it)->getFebId()
- << " Feb Ex = " << (*it)->getFebEx()
- << " Feb Ey = " << (*it)->getFebEy()
- << " Feb Ez = " << (*it)->getFebEz() );
- }
-#endif
-*/
- return StatusCode::SUCCESS;
-
-} // End of LoadFullCollections
-
-// The following method does not make sense to ATLFAST
-StatusCode TrigDataAccessATLFAST::LoadFullCollections (
- TileL2Container::const_iterator& /*Begin*/,
- TileL2Container::const_iterator& /*End*/){
- return StatusCode::SUCCESS;
-
-} // End of LoadFullCollections
-
-// handle events (beginEvent only) to prepare containers
-void TrigDataAccessATLFAST::handle(const Incident & inc ) {
- m_larcell->eventNumber(inc.context().eventID().event_number());
-}
-
-template<class T>
-void TrigDataAccessATLFAST::fillColl(const DataHandle<CaloCellContainer>& input, T& output){
- typedef typename T::iterator IT;
- IT it,end;
- it= output.begin();
- end= output.end();
- for( ; it!= end; ++it ) {
- if ( (*it)->caloDDE() != NULL ) {
- IdentifierHash id = (*it)->caloDDE()->calo_hash();
- const CaloCell* cell = NULL;
- cell = input->findCell(id);
- if ( cell != NULL ) (*it)->setEnergy(cell->energy()+1.0);
- }
- }
-}
-
-
-
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.h
deleted file mode 100644
index 2b68f8b2fc52ba037e081f9dadad899c43b23a11..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-/********************************************************************
-
- NAME: TrigDataAccessATLFAST.h
- PACKAGE: Trigger/TrigAlgorithms/TrigT2CaloCommon
-
- AUTHOR: Denis Oliveira Damazio
-
- PURPOSE: Tool designed to perform data access to
- Calorimeter cells. It does not perform
- ByteStream conversion. Just uses the ATLFast
- CaloCellContainer AllCalo. It is, however,
- driven by Region of Interest (in eta/phi)
- definition.
- *******************************************************************/
-
-#ifndef TRIGT2CALOCOMMONATLFAST_TRIGDATAACCESS_H
-#define TRIGT2CALOCOMMONATLFAST_TRIGDATAACCESS_H
-
-#include "GaudiKernel/IAlgTool.h"
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-#include "StoreGate/DataHandle.h"
-#include "CaloIdentifier/CaloIdManager.h"
-#include "TrigTimeAlgs/TrigTimerSvc.h"
-
-#include "TrigT2CaloCommon/ITrigDataAccess.h"
-#include "Identifier/IdentifierHash.h"
-
-#include "LArRecEvent/LArCellCollection.h"
-#include "LArRecEvent/LArFebEnergyCollection.h"
-
-#include "TileEvent/TileCell.h"
-
-#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "LArByteStream/LArRodDecoder.h"
-#include "TileByteStream/TileROD_Decoder.h"
-
-#include "TrigT2CaloCommon/T2GeometryTool.h"
-#include "TrigT2CaloCommon/T2Calibration.h"
-#include "CaloGeoHelpers/CaloSampling.h"
-#include "eformat/old/util.h"
-
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Incident.h"
-
-#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-
-#include "CxxUtils/phihelper.h"
-
-#include "CxxUtils/checker_macros.h"
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // legacy trigger code
-
-class IRegSelSvc;
-// class ITrigRegionSelector;
-class LArRoI_Map;
-class IROBDataProviderSvc;
-class T2CaloConfig;
-
-/** Class that provides access to data for
- Calorimeter LVL2 Algorithms */
-class TrigDataAccessATLFAST: virtual public ITrigDataAccess, public AthAlgTool,
- virtual public IIncidentListener {
- public:
- /** Real Constructor */
- TrigDataAccessATLFAST(const std::string & type, const std::string & name,
- const IInterface* parent) : AthAlgTool(type,name,parent),
- m_pRegionSelector("RegSelSvc/RegSelSvc","TrigDataAccess"){
- declareInterface<ITrigDataAccess>(this);
- declareProperty("RegSelSvc",m_pRegionSelector,"Region Selector Service access");
- // New property for MET slice
- declareProperty("loadFullCollections", m_usefullcoll=false);
- }
- /** Destructor */
- virtual ~TrigDataAccessATLFAST() { }
-
-
- /** The same function should initialize all internal Tools
- */
- StatusCode initialize();
- /** Finalize */
- StatusCode finalize();
- /** handle to init a new event */
- void handle (const Incident& );
- /** begin run handle for conditions */
- StatusCode beginRunHandle(IOVSVC_CALLBACK_ARGS);
- /** begin run handle for conditions and RegSelSvc */
- StatusCode beginRunHandle_RegSelSvc(IOVSVC_CALLBACK_ARGS);
-
- /** Expose list of ROBs */
-
- void ROBList( const IRoiDescriptor& /* roi */,
- std::vector<uint32_t>& /*vec*/){ }
-
- /// obsolete
- void ROBList( const double /* etamin */, const double /*etamax*/,
- const double /*phimin*/, const double /*phimax*/,
- std::vector<uint32_t>& /*vec*/){ }
-
-
- protected:
- // methods for tools
- // The two methods below could be united in a single one
- // They load this class with the list of ROBs to be looked after
- // By default TTEM is requested but TTHEC and TILE may also be used.
-
- void RegionSelectorListID (const int sampling, const IRoiDescriptor& roi,
- const DETID detid=TTEM);
-
- void RegionSelectorRobID (const int sampling, const IRoiDescriptor& roi,
- const DETID detid=TTEM, bool fetchROBs = true);
-
- /**
- * @brief Region Selector Input. Prepare internal tables
- * with online/offline Identifiers used in ByteStream
- * Conversion and data iterators (to Calorimeter Cells).
- * @param[in] sampling layer (not used for TileCal).
- * @param[in] IRoiDescriptor for Region of Interest definition.
- * @param[in] DETID which can be TTEM (default), TTHEC, TILE.
- */
- virtual inline void RegionSelector(const int sampling, const IRoiDescriptor& roi, const DETID detid=TTEM){
- RegionSelectorListID(sampling, roi, detid);
- RegionSelectorRobID (sampling, roi, detid);
- };
-
-
- /// obsolete
-
- /**
- * @brief Region Selector Input. Prepare internal tables
- * with online/offline Identifiers used in ByteStream
- * Conversion and data iterators (to Calorimeter Cells).
- * @param[in] sampling layer (not used for TileCal).
- * @param[in] etamin/etamax for Region of Interest definition.
- * @param[in] phimin/phimax for Region of Interest definition.
- * @param[in] DETID which can be TTEM (default), TTHEC, TILE.
- */
- void RegionSelectorListID (const int sampling,
- const double etamin, const double etamax,
- const double phimin, const double phimax,
- const DETID detid=TTEM) {
- TrigRoiDescriptor roi( 0.5*(etamin+etamax), etamin, etamax, CxxUtils::phiMean(phimin,phimax), phimin, phimax);
- RegionSelectorListID(sampling, roi, detid);
- }
-
- void RegionSelectorRobID (const int sampling, const double etamin,
- const double etamax, const double phimin, const double phimax,
- const DETID detid=TTEM, bool /* fetchROBs*/ = true) {
- TrigRoiDescriptor roi( 0.5*(etamin+etamax), etamin, etamax, CxxUtils::phiMean(phimin,phimax), phimin, phimax);
- RegionSelectorRobID(sampling, roi, detid);
- }
-
- /// obsolete methods ///
- virtual inline void RegionSelector(const int sampling,
- const double etamin, const double etamax,
- const double phimin, const double phimax,
- const DETID detid=TTEM){
- TrigRoiDescriptor roi( 0.5*(etamin+etamax), etamin, etamax, CxxUtils::phiMean(phimin,phimax), phimin, phimax);
- RegionSelector(sampling, roi, detid);
- };
-
- /**
- * @brief LoadCollections fetches data via ROBDataProvider
- * and really provides ByteStream Conversion by calling
- * detector specific (LAr or Tile) ByteStream Conversion
- * Tools within RoI as defined in the above method.
- * @param[out] LArTT_Selector<LArCellCont> outputs
- * begin, end interator to LArCells.
- * @param[in] sample (deprecated) maintained for compatibility.
- * @param[in] prepare if container should be prepared or
- * considered as already existing (multilayer HEC or Tile
- * access).
- */
- StatusCode LoadCollections (
- LArTT_Selector<LArCellCont>::const_iterator&,
- LArTT_Selector<LArCellCont>::const_iterator&,
- const unsigned int sample = 0, bool prepare=true );
- /**
- * @brief LoadCollections fetches data via ROBDataProvider
- * and really provides ByteStream Conversion by calling
- * detector specific (LAr or Tile) ByteStream Conversion
- * Tools within RoI as defined in the above method.
- * @param[out] TileCellCollection::const_iterator outputs
- * begin, end interator to TileCells.
- * @param[in] sample (deprecated) maintained for compatibility.
- * @param[in] prepare if container should be prepared or
- * considered as already existing (multilayer HEC or Tile
- * access).
- */
- StatusCode LoadCollections (
- TileCellCollection::const_iterator&,
- TileCellCollection::const_iterator&,
- const unsigned int sample = 0, bool prepare=true);
- /** MBTS collection */
- StatusCode LoadMBTS(TileCellCollection::const_iterator&,
- TileCellCollection::const_iterator&){
- return StatusCode::SUCCESS; }
- /** Load Zdc Collection */
- StatusCode LoadZdcCollection(ZdcRawChannelCollection::const_iterator&,
- ZdcRawChannelCollection::const_iterator&){
- return StatusCode::SUCCESS; }
-
- /**
- * @brief LoadCollections fetches data via ROBDataProvider
- * and really provides ByteStream Conversion by calling
- * detector specific (LAr or Tile) ByteStream Conversion
- * Tools within RoI as defined in the above method.
- * @param[out] LArFebEnergyCollection::const_iterator outputs
- * begin, end interator to LArFebEnergy Collections.
- * @param[in] sample (deprecated) maintained for compatibility.
- * @param[in] prepare if container should be prepared or
- * considered as already existing (multilayer HEC or Tile
- * access).
- */
- StatusCode LoadCollections (
- LArFebEnergyCollection::const_iterator&,
- LArFebEnergyCollection::const_iterator&,
- const unsigned int sample = 0, bool prepare=true);
- /**
- * @brief Loads the full collection for the missing et computation
- */
- StatusCode LoadFullCollections (
- LArTT_Selector<LArCellCont>::const_iterator&,
- LArTT_Selector<LArCellCont>::const_iterator&,
- DETID detid, bool prepare=true );
- /**
- * @brief Loads the full collection for the missing et computation
- */
- StatusCode LoadFullCollections (
- TileCellCollection::const_iterator&,
- TileCellCollection::const_iterator&,
- const unsigned int sample = 0, bool prepare=true );
- /**
- * @brief Loads the full collection for the missing et computation
- */
-
- StatusCode LoadFullCollections (
- LArFebEnergyCollection::const_iterator&,
- LArFebEnergyCollection::const_iterator&,
- DETID detid, bool prepare=true );
- /**
- * @brief Loads the full collection for the missing et computation
- */
- StatusCode LoadFullCollections (
- TileL2Container::const_iterator& Begin,
- TileL2Container::const_iterator& End);
- /**
- * @brief Loads the full collection fast
- */
- StatusCode LoadFullCollections (
- CaloCellContainer::const_iterator&,
- CaloCellContainer::const_iterator&){
- return StatusCode::SUCCESS; }
- /** Number of Tile Calorimeter modules found in
- * the Region of Interest */
- unsigned int TileContSize ( void ) { return m_rIds.size(); }
- /** Number of Tile Calorimeter modules found in
- * the Region of Interest MET case -> All Calo*/
- unsigned int TileFullContSize ( void ) { return m_rIdstile.size(); }
- /** Error reporting */
- uint32_t report_error ( void ) { return 0x0; }
-
- /** RegSelSvc handle */
- ServiceHandle<IRegSelSvc> m_pRegionSelector;
- /** LArRoI_Map used by LArTT_Selector */
- const LArRoI_Map* m_roiMap;
-
- /** iterators to LArCells type depending on
- access way (IDC or Cont) */
- LArTT_Selector<LArCellCont>* m_sel;
- LArTT_Selector<LArCellCont>* m_sellarfull;
- LArTT_Selector<LArCellCont>* m_selem;
- LArTT_Selector<LArCellCont>* m_selhec;
- LArTT_Selector<LArCellCont>* m_selfcalhad;
- LArTT_Selector<LArCellCont>* m_selfcalem;
- /** LArCellCont pointer - has collections of LArCells */
- LArCellCont* m_larcell;
- /** TileCellCont pointer - has collections of TileCells */
- TileCellCont* m_tilecell;
- /** Input DataBlock to pre-allocate memory space for
- ROBFragment to be decoded */
- //std::vector<uint32_t> m_datablock;
-// LArFebEnergyCollection* m_febcoll;
-
-
- // Objects that the Tools should not worry about
- private:
- /** method to fill collection with container information */
- template<class T>
- void fillColl(const DataHandle<CaloCellContainer>& input, T& output);
- /** fill vector with all RodIds and Hash Id's in initialize */
- bool m_usefullcoll;
- /** List of Hash Id's to be fetched for a given RoI. */
- std::vector<IdentifierHash> m_rIds;
- std::vector<IdentifierHash> m_rIdsem0;
- std::vector<IdentifierHash> m_rIdsem1;
- std::vector<IdentifierHash> m_rIdsem2;
- std::vector<IdentifierHash> m_rIdsem3;
- std::vector<IdentifierHash> m_rIdshec;
- std::vector<IdentifierHash> m_rIdshec0;
- std::vector<IdentifierHash> m_rIdshec1;
- std::vector<IdentifierHash> m_rIdshec2;
- std::vector<IdentifierHash> m_rIdsfcalhad0;
- std::vector<IdentifierHash> m_rIdsfcalhad1;
- std::vector<IdentifierHash> m_rIdsfcalem0;
- std::vector<IdentifierHash> m_rIdstile;
- /** List of RodIds to be fetched for a given RoI. */
- std::vector<uint32_t> m_vrodid32;
- std::vector<uint32_t> m_vrodid32lar;
- std::vector<uint32_t> m_vrodid32em;
- std::vector<uint32_t> m_vrodid32hec;
- std::vector<uint32_t> m_vrodid32hec0;
- std::vector<uint32_t> m_vrodid32hec1;
- std::vector<uint32_t> m_vrodid32hec2;
- std::vector<uint32_t> m_vrodid32fcalem;
- std::vector<uint32_t> m_vrodid32fcalhad;
- std::vector<uint32_t> m_vrodid32tile;
- /** List of Detector ID (needed for London Schema - TileCal)
- elements for offline like data organization (module
- ID for TileCal, TTsample ID for LAr).
- */
- std::vector<int> m_listID;
- /** space for Tile Calorimeter Identifier */
- std::vector<unsigned int> m_tile;
- /** check whether iov method was called */
- bool m_iov_called;
-};
-
-#endif
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/components/TrigT2CaloCommon_entries.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/components/TrigT2CaloCommon_entries.cxx
index 21f494b12ab0e4712cad7f2c9fb825a20963a9dd..c7c1a055c1dddecf75c951f3619810f6f6f7d6cc 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/components/TrigT2CaloCommon_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/components/TrigT2CaloCommon_entries.cxx
@@ -1,13 +1,11 @@
#include "TrigT2CaloCommon/T2GeometryTool.h"
#include "../TrigDataAccess.h"
-#include "../TrigDataAccessATLFAST.h"
#include "../TrigCaloDataAccessSvc.h"
#include "../TestCaloDataAccess.h"
#include "../CompareCells.h"
DECLARE_COMPONENT( T2GeometryTool )
DECLARE_COMPONENT( TrigDataAccess )
-DECLARE_COMPONENT( TrigDataAccessATLFAST )
DECLARE_COMPONENT( TrigCaloDataAccessSvc)
DECLARE_COMPONENT( TestCaloDataAccess )
DECLARE_COMPONENT( CompareCells )
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx
index 5fa15c07914445168b0189cf357fc7775aac74d0..f74fb7eac36eff6e770cb919426a56ac4c112da9 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*******************************************************
@@ -432,7 +432,7 @@ const {
ATH_MSG_DEBUG("RingSet number is: " << rs);
for(unsigned i=0;i<rset.at(rs).samples().size();i++)
ATH_MSG_DEBUG(" Calo layer ID is : "<< rset.at(rs).samples()[i] );
- ATH_MSG_DEBUG("search eta window: " << m_etaSearchWindowSize << " search phi window: " << m_phiSearchWindowSize);
+ ATH_MSG_DEBUG("search eta window: " << m_etaSearchWindowSize << " search phi window: " << m_phiSearchWindowSize);
ATH_MSG_DEBUG("deta: " << m_detaRings[rs] << " dphi: " << m_dphiRings[rs]);
ATH_MSG_DEBUG("Pattern has size equal than: " << rset.at(rs).pattern().size());
for(unsigned i=0;i<rset.at(rs).pattern().size();++i)
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
index eb09ae61f4675602702e39ab0a11241b87d52c1c..e92b6df15cd386b2695f327e10fc89001ca288c0 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -25,14 +25,12 @@
class ISvcLocator;
T2CaloEgammaReFastAlgo::T2CaloEgammaReFastAlgo(const std::string& name, ISvcLocator* pSvcLocator) :
- AthReentrantAlgorithm(name, pSvcLocator),
- m_regionSelector("RegSelSvc", name)
+ AthReentrantAlgorithm(name, pSvcLocator)
{}
StatusCode T2CaloEgammaReFastAlgo::initialize()
{
m_emAlgTools.retrieve().ignore();
- ATH_CHECK(m_regionSelector.retrieve());
ATH_CHECK(m_clusterContainerKey.initialize());
ATH_CHECK(m_roiCollectionKey.initialize());
ATH_CHECK( m_bcidAvgKey.initialize() );
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
index e0691b9ff2193eacac08fd2878822df73ecb0179..962ae5af0f5a47d078da33c257750701ac7bbe00 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -19,7 +19,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "CaloEvent/CaloBCIDAverage.h"
@@ -47,8 +46,6 @@ class T2CaloEgammaReFastAlgo : public AthReentrantAlgorithm {
// float calculateZ0(const float etaLayer1, const float etaLayer2);
private:
- ServiceHandle<IRegSelSvc> m_regionSelector;
-
// Properties:
Gaudi::Property<float> m_l1eta{this, "L1ForceEta", -10.0, "Forced LVL1 eta"};
Gaudi::Property<float> m_l1phi{this, "L1ForcePhi", -10.0, "Forced LVL1 phi"};
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py
index 675072af2226e0ae88fd28ed38f59bd530a1422a..9a180e97add0c35167c6e956d0f83977976300ae 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfigMT.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TrigTauRec.TrigTauRecConf import TrigTauRecMergedMT
-from TrigTauRec.TrigTauRecMonitoring import tauMonitoringCaloOnly
+from TrigTauRec.TrigTauRecMonitoring import tauMonitoringCaloOnly, tauMonitoringCaloOnlyMVA, tauMonitoringPreselection, tauMonitoringPrecision, tauMonitoringPrecisionMVA
class TrigTauRecMerged_TauCaloOnly (TrigTauRecMergedMT) :
@@ -45,7 +45,9 @@ class TrigTauRecMerged_TauCaloOnlyMVA (TrigTauRecMergedMT) :
def __init__(self, name = "TrigTauRecMerged_TauCaloOnlyMVA"):
super( TrigTauRecMerged_TauCaloOnlyMVA , self ).__init__( name )
-
+ self.MonTool = tauMonitoringCaloOnlyMVA()
+ self._mytools = []
+
import TrigTauRec.TrigTauAlgorithmsHolder as taualgs
tools = []
@@ -84,8 +86,9 @@ class TrigTauRecMerged_TauPreselection (TrigTauRecMergedMT) :
__slots__ = [ '_mytools']
def __init__(self, name = "TrigTauRecMerged_TauPreselection"):
super( TrigTauRecMerged_TauPreselection , self ).__init__( name )
+ self.MonTool = tauMonitoringPreselection()
self._mytools = []
-
+
import TrigTauRec.TrigTauAlgorithmsHolder as taualgs
tools = []
@@ -129,6 +132,7 @@ class TrigTauRecMerged_TauPrecision (TrigTauRecMergedMT) :
__slots__ = [ '_mytools']
def __init__(self, name = "TrigTauRecMerged_TauPrecision"):
super( TrigTauRecMerged_TauPrecision , self ).__init__( name )
+ self.MonTool = tauMonitoringPrecision()
self._mytools = []
import TrigTauRec.TrigTauAlgorithmsHolder as taualgs
@@ -189,6 +193,7 @@ class TrigTauRecMerged_TauPrecisionMVA (TrigTauRecMergedMT) :
def __init__(self, name = "TrigTauRecMerged_TauPrecisionMVA", doMVATES=False, doTrackBDT=False, doRNN=False):
super( TrigTauRecMerged_TauPrecisionMVA , self ).__init__( name )
+ self.MonTool = tauMonitoringPrecisionMVA()
import TrigTauRec.TrigTauAlgorithmsHolder as taualgs
tools = []
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py
index f47473bbe10f544d24bab72e75e9f41225203b21..ec25963ae296c32601107da55fdd91f9be1ce392 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py
@@ -107,6 +107,147 @@ class TrigTauRecValidationMonitoring(TrigTauRecOnlineMonitoring):
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
def tauMonitoringCaloOnly():
+ monTool = GenericMonitoringTool('MonTool')
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('nRoI_EFTauCells', path='EXPERT', type='TH1F', title="EF N RoI cells; N Cells; nRoIs", xbins=100, xmin=0., xmax=6000.)
+ monTool.defineHistogram('dPhiEFTau_RoI', path='EXPERT', type='TH1F', title="diff EF vs RoI phi ; Dphi; nRoIs", xbins=100, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('dEtaEFTau_RoI', path='EXPERT', type='TH1F', title="diff EF vs RoI eta ; Deta; nRoIs", xbins=80, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('dEtaEFTau_RoI, dPhiEFTau_RoI', path='EXPERT', type='TH2F', title="dEta vs dPhi in TrigTauRec FEX; Delta-eta; Delta-phi",
+ xbins=40 , xmin=-0.2, xmax=0.2,
+ ybins=40 , ymin=-0.2, ymax=0.2)
+ monTool.defineHistogram('EMRadius', path='EXPERT', type='TH1F', title="EF EMRadius; EM radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('HadRadius', path='EXPERT', type='TH1F', title="EF HadRadius; Had radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('EtHad, EtEm', path='EXPERT', type='TH2F', title="EF Et had vs Em in TrigTauRecMerged FEX; Et Had (at EM scale) [GeV]; Et EM (at EM scale) [GeV]",
+ xbins=30, xmin=0., xmax=150.,
+ ybins=30, ymin=0., ymax=150.)
+ monTool.defineHistogram('EMFrac', path='EXPERT', type='TH1F', title="EM Fraction;EM Fraction;nRoIs", xbins=70, xmin=-0.1, xmax=1.3)
+ monTool.defineHistogram('IsoFrac', path='EXPERT', type='TH1F', title="Isolation Fraction;Isolation Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('centFrac', path='EXPERT', type='TH1F', title="EF central Fraction;central Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('nCand', path='EXPERT', type='TH1F', title="Number of tau candidates;Number of tau candidates; nevents", xbins=10, xmin=-1.0, xmax=9.)
+ monTool.defineHistogram('PhiL1', path='EXPERT', type='TH1F', title="L1 RoI Phi; L1 RoI Phi; nRoIs", xbins=65, xmin=-3.1415936-0.098174/2., xmax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('EtaL1, PhiL1', path='EXPERT', type='TH2F', title="L1 ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaEF, PhiEF', path='EXPERT', type='TH2F', title="EF ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+ return monTool
+
+
+def tauMonitoringCaloOnlyMVA():
+ monTool = GenericMonitoringTool('MonTool')
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('nRoI_EFTauCells', path='EXPERT', type='TH1F', title="EF N RoI cells; N Cells; nRoIs", xbins=100, xmin=0., xmax=6000.)
+ monTool.defineHistogram('EMRadius', path='EXPERT', type='TH1F', title="EF EMRadius; EM radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('HadRadius', path='EXPERT', type='TH1F', title="EF HadRadius; Had radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('EtHad, EtEm', path='EXPERT', type='TH2F', title="EF Et had vs Em in TrigTauRecMerged FEX; Et Had (at EM scale) [GeV]; Et EM (at EM scale) [GeV]",
+ xbins=30, xmin=0., xmax=150.,
+ ybins=30, ymin=0., ymax=150.)
+ monTool.defineHistogram('EMFrac', path='EXPERT', type='TH1F', title="EM Fraction;EM Fraction;nRoIs", xbins=70, xmin=-0.1, xmax=1.3)
+ monTool.defineHistogram('IsoFrac', path='EXPERT', type='TH1F', title="Isolation Fraction;Isolation Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('centFrac', path='EXPERT', type='TH1F', title="EF central Fraction;central Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('nCand', path='EXPERT', type='TH1F', title="Number of tau candidates;Number of tau candidates; nevents", xbins=10, xmin=-1.0, xmax=9.)
+ monTool.defineHistogram('PhiL1', path='EXPERT', type='TH1F', title="L1 RoI Phi; L1 RoI Phi; nRoIs", xbins=65, xmin=-3.1415936-0.098174/2., xmax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('EtaL1, PhiL1', path='EXPERT', type='TH2F', title="L1 ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaEF, PhiEF', path='EXPERT', type='TH2F', title="EF ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+ return monTool
+
+
+def tauMonitoringPreselection():
+
+ monTool = GenericMonitoringTool('MonTool')
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('nRoI_EFTauCells', path='EXPERT', type='TH1F', title="EF N RoI cells; N Cells; nRoIs", xbins=100, xmin=0., xmax=6000.)
+ monTool.defineHistogram('nRoI_EFTauTracks', path='EXPERT', type='TH1F', title="EF N RoI Tracks; N Tracks; nRoIs", xbins=17, xmin=-2.0, xmax=15.)
+ monTool.defineHistogram('dPhiEFTau_RoI', path='EXPERT', type='TH1F', title="diff EF vs RoI phi ; Dphi; nRoIs", xbins=100, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('dEtaEFTau_RoI', path='EXPERT', type='TH1F', title="diff EF vs RoI eta ; Deta; nRoIs", xbins=80, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('dEtaEFTau_RoI, dPhiEFTau_RoI', path='EXPERT', type='TH2F', title="dEta vs dPhi in TrigTauRec FEX; Delta-eta; Delta-phi",
+ xbins=40 , xmin=-0.2, xmax=0.2,
+ ybins=40 , ymin=-0.2, ymax=0.2)
+ monTool.defineHistogram('EMRadius', path='EXPERT', type='TH1F', title="EF EMRadius; EM radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('HadRadius', path='EXPERT', type='TH1F', title="EF HadRadius; Had radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('EtHad, EtEm', path='EXPERT', type='TH2F', title="EF Et had vs Em in TrigTauRecMerged FEX; Et Had (at EM scale) [GeV]; Et EM (at EM scale) [GeV]",
+ xbins=30, xmin=0., xmax=150.,
+ ybins=30, ymin=0., ymax=150.)
+ monTool.defineHistogram('EMFrac', path='EXPERT', type='TH1F', title="EM Fraction;EM Fraction;nRoIs", xbins=70, xmin=-0.1, xmax=1.3)
+ monTool.defineHistogram('IsoFrac', path='EXPERT', type='TH1F', title="Isolation Fraction;Isolation Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('centFrac', path='EXPERT', type='TH1F', title="EF central Fraction;central Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('nWideTrk', path='EXPERT', type='TH1F', title="EF N Wide Tracks;N Wide Tracks; nRoIs", xbins=17, xmin=-2.0, xmax=15.)
+ monTool.defineHistogram('ipSigLeadTrk', path='EXPERT', type='TH1F', title="EF IPsig Leading Track;iIPsig Leading Track; nRoIs", xbins=100, xmin=-50., xmax=50)
+ monTool.defineHistogram('trFlightPathSig', path='EXPERT', type='TH1F', title="EF Flightpath sig Track;Flightpath sig Track; nRoIs", xbins=100, xmin=-20., xmax=40)
+ monTool.defineHistogram('massTrkSys', path='EXPERT', type='TH1F', title="EF Mass Trk Sys;Mass Trk Sys [GeV]; nRoIs", xbins=100, xmin=0., xmax=50.)
+ monTool.defineHistogram('dRmax', path='EXPERT', type='TH1F', title="EF dR max;dR max; nRoIs", xbins=50, xmin=-0., xmax=0.25)
+ monTool.defineHistogram('NTrk', path='EXPERT', type='TH1F', title="Number of tracks;Number of tracks; nRoIs", xbins=17, xmin=-2.0, xmax=15.)
+ monTool.defineHistogram('TrkAvgDist', path='EXPERT', type='TH1F', title="Track Average Distance; TrkAvgDist; nRoIs", xbins=41, xmin=-0.01, xmax=0.4)
+ monTool.defineHistogram('EtovPtLead', path='EXPERT', type='TH1F', title="Et over lead track Pt; EtovPtLead; nRoIs", xbins=41, xmin=-0.5, xmax=20.0)
+ monTool.defineHistogram('PSSFraction', path='EXPERT', type='TH1F', title="EF Presampler strip energy fraction;PSS energy fraction; nRoIs", xbins=50, xmin=-0.5, xmax=1.)
+ monTool.defineHistogram('EMPOverTrkSysP', path='EXPERT', type='TH1F', title="EF EMP over TrkSysP;EMP over TrkSysP; nRoIs", xbins=41, xmin=-0.5, xmax=20.0)
+ monTool.defineHistogram('ChPiEMEOverCaloEME', path='EXPERT', type='TH1F', title="EF EM energy of charged pions over calorimetric EM energy;ChPiEME over CaloEME; nRoIs", xbins=40, xmin=-20., xmax=20.)
+ monTool.defineHistogram('innerTrkAvgDist', path='EXPERT', type='TH1F', title="EF inner track average distance; innerTrkAvgDist; nRoIs", xbins=40, xmin=-0.05, xmax=0.5)
+ monTool.defineHistogram('nCand', path='EXPERT', type='TH1F', title="Number of tau candidates;Number of tau candidates; nevents", xbins=10, xmin=-1.0, xmax=9.)
+ monTool.defineHistogram('PhiL1', path='EXPERT', type='TH1F', title="L1 RoI Phi; L1 RoI Phi; nRoIs", xbins=65, xmin=-3.1415936-0.098174/2., xmax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('EtaL1, PhiL1', path='EXPERT', type='TH2F', title="L1 ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaEF, PhiEF', path='EXPERT', type='TH2F', title="EF ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+
+ return monTool
+
+
+def tauMonitoringPrecision():
+
+ monTool = GenericMonitoringTool('MonTool')
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('nRoI_EFTauCells', path='EXPERT', type='TH1F', title="EF N RoI cells; N Cells; nRoIs", xbins=100, xmin=0., xmax=6000.)
+ monTool.defineHistogram('nRoI_EFTauTracks', path='EXPERT', type='TH1F', title="EF N RoI Tracks; N Tracks; nRoIs", xbins=17, xmin=-2.0, xmax=15.)
+ monTool.defineHistogram('dPhiEFTau_RoI', path='EXPERT', type='TH1F', title="diff EF vs RoI phi ; Dphi; nRoIs", xbins=100, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('dEtaEFTau_RoI', path='EXPERT', type='TH1F', title="diff EF vs RoI eta ; Deta; nRoIs", xbins=80, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('dEtaEFTau_RoI, dPhiEFTau_RoI', path='EXPERT', type='TH2F', title="dEta vs dPhi in TrigTauRec FEX; Delta-eta; Delta-phi",
+ xbins=40 , xmin=-0.2, xmax=0.2,
+ ybins=40 , ymin=-0.2, ymax=0.2)
+ monTool.defineHistogram('EMRadius', path='EXPERT', type='TH1F', title="EF EMRadius; EM radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('HadRadius', path='EXPERT', type='TH1F', title="EF HadRadius; Had radius; nRoIs", xbins=50, xmin=-0.1, xmax=1.)
+ monTool.defineHistogram('EtHad, EtEm', path='EXPERT', type='TH2F', title="EF Et had vs Em in TrigTauRecMerged FEX; Et Had (at EM scale) [GeV]; Et EM (at EM scale) [GeV]",
+ xbins=30, xmin=0., xmax=150.,
+ ybins=30, ymin=0., ymax=150.)
+ monTool.defineHistogram('EMFrac', path='EXPERT', type='TH1F', title="EM Fraction;EM Fraction;nRoIs", xbins=70, xmin=-0.1, xmax=1.3)
+ monTool.defineHistogram('IsoFrac', path='EXPERT', type='TH1F', title="Isolation Fraction;Isolation Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('centFrac', path='EXPERT', type='TH1F', title="EF central Fraction;central Fraction; nRoIs", xbins=80, xmin=-0.4, xmax=1.2)
+ monTool.defineHistogram('nWideTrk', path='EXPERT', type='TH1F', title="EF N Wide Tracks;N Wide Tracks; nRoIs", xbins=17, xmin=-2.0, xmax=15.)
+ monTool.defineHistogram('ipSigLeadTrk', path='EXPERT', type='TH1F', title="EF IPsig Leading Track;iIPsig Leading Track; nRoIs", xbins=100, xmin=-50., xmax=50)
+ monTool.defineHistogram('trFlightPathSig', path='EXPERT', type='TH1F', title="EF Flightpath sig Track;Flightpath sig Track; nRoIs", xbins=100, xmin=-20., xmax=40)
+ monTool.defineHistogram('massTrkSys', path='EXPERT', type='TH1F', title="EF Mass Trk Sys;Mass Trk Sys [GeV]; nRoIs", xbins=100, xmin=0., xmax=50.)
+ monTool.defineHistogram('dRmax', path='EXPERT', type='TH1F', title="EF dR max;dR max; nRoIs", xbins=50, xmin=-0., xmax=0.25)
+ monTool.defineHistogram('NTrk', path='EXPERT', type='TH1F', title="Number of tracks;Number of tracks; nRoIs", xbins=17, xmin=-2.0, xmax=15.)
+ monTool.defineHistogram('TrkAvgDist', path='EXPERT', type='TH1F', title="Track Average Distance; TrkAvgDist; nRoIs", xbins=41, xmin=-0.01, xmax=0.4)
+ monTool.defineHistogram('EtovPtLead', path='EXPERT', type='TH1F', title="Et over lead track Pt; EtovPtLead; nRoIs", xbins=41, xmin=-0.5, xmax=20.0)
+ monTool.defineHistogram('PSSFraction', path='EXPERT', type='TH1F', title="EF Presampler strip energy fraction;PSS energy fraction; nRoIs", xbins=50, xmin=-0.5, xmax=1.)
+ monTool.defineHistogram('EMPOverTrkSysP', path='EXPERT', type='TH1F', title="EF EMP over TrkSysP;EMP over TrkSysP; nRoIs", xbins=41, xmin=-0.5, xmax=20.0)
+ monTool.defineHistogram('ChPiEMEOverCaloEME', path='EXPERT', type='TH1F', title="EF EM energy of charged pions over calorimetric EM energy;ChPiEME over CaloEME; nRoIs", xbins=40, xmin=-20., xmax=20.)
+ monTool.defineHistogram('innerTrkAvgDist', path='EXPERT', type='TH1F', title="EF inner track average distance; innerTrkAvgDist; nRoIs", xbins=40, xmin=-0.05, xmax=0.5)
+ monTool.defineHistogram('nCand', path='EXPERT', type='TH1F', title="Number of tau candidates;Number of tau candidates; nevents", xbins=10, xmin=-1.0, xmax=9.)
+ monTool.defineHistogram('PhiL1', path='EXPERT', type='TH1F', title="L1 RoI Phi; L1 RoI Phi; nRoIs", xbins=65, xmin=-3.1415936-0.098174/2., xmax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
+ monTool.defineHistogram('EtaL1, PhiL1', path='EXPERT', type='TH2F', title="L1 ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+ monTool.defineHistogram('EtaEF, PhiEF', path='EXPERT', type='TH2F', title="EF ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
+ xbins=51, xmin=-2.55, xmax=2.55,
+ ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+
+ return monTool
+
+
+def tauMonitoringPrecisionMVA():
monTool = GenericMonitoringTool('MonTool')
monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
monTool.defineHistogram('nRoI_EFTauCells', path='EXPERT', type='TH1F', title="EF N RoI cells; N Cells; nRoIs", xbins=100, xmin=0., xmax=6000.)
@@ -145,6 +286,9 @@ def tauMonitoringCaloOnly():
monTool.defineHistogram('EtaEF, PhiEF', path='EXPERT', type='TH2F', title="EF ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
xbins=51, xmin=-2.55, xmax=2.55,
ybins=65, ymin=-3.1415936-0.098174/2., ymax=3.1415936+0.098174/2.)
+
return monTool
+
+
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
index e160628d31864c0a176b1d339d678733e0f6f983..db507b9092fc7c38ed33cf4622bd1c11929ab77d 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
@@ -117,7 +117,7 @@ StatusCode TrigTauRecMergedMT::execute(const EventContext& ctx) const
auto dEta = Monitored::Scalar<float>("dEtaEFTau_RoI", -10.);
auto dPhi = Monitored::Scalar<float>("dPhiEFTau_RoI", -10.);
auto emRadius = Monitored::Scalar<float>("EMRadius", -0.099);
- auto hadRadius = Monitored::Scalar<float>("EMRadius", -0.099);
+ auto hadRadius = Monitored::Scalar<float>("HadRadius", -0.099);
auto EtFinal = Monitored::Scalar<float>("EtFinal", 0.);
auto Et = Monitored::Scalar<float>("Et", 0.);
auto EtHad = Monitored::Scalar<float>("EtHad",-10.);
@@ -125,12 +125,12 @@ StatusCode TrigTauRecMergedMT::execute(const EventContext& ctx) const
auto EMFrac = Monitored::Scalar<float>("EMFrac",-10.);
auto IsoFrac = Monitored::Scalar<float>("IsoFrac",-1.);
auto centFrac = Monitored::Scalar<float>("centFrac",-10.);
- auto nWideTrk = Monitored::Scalar<int>("EF_nWideTrk",0);
+ auto nWideTrk = Monitored::Scalar<int>("nWideTrk",-10);
auto ipSigLeadTrk = Monitored::Scalar<float>("ipSigLeadTrk",-1000.);
auto trFlightPathSig = Monitored::Scalar<float>("trFlightPathSig",-10.);
auto massTrkSys = Monitored::Scalar<float>("massTrkSys",-10.);
auto dRmax = Monitored::Scalar<float>("dRmax",-10.);
- auto numTrack = Monitored::Scalar<int>("EF_NTrk", -10);
+ auto numTrack = Monitored::Scalar<int>("NTrk", -10);
auto trkAvgDist = Monitored::Scalar<float>("TrkAvgDist",-1.0);
auto etovPtLead = Monitored::Scalar<float>("EtovPtLead",-10.);
auto PSSFraction = Monitored::Scalar<float>("PSSFraction",-999.9);
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisHelper.h b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisHelper.h
index eac981dbb7df70857d383570f0094fdaa861ae41..f0dbf91cb7ba87d5c712277abc34a07d21e4396c 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisHelper.h
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisHelper.h
@@ -124,7 +124,7 @@ namespace Trig{
std::vector<Feature<T> > vectorOfFeatures = features.get<T>(key);
ATH_MSG_INFO(chainName << " has " << features.get<T>().size() << " T features ");
// Loop over the features of type T
- for( const Trig::Feature<T> feature : vectorOfFeatures ) {
+ for( const Trig::Feature<T>& feature : vectorOfFeatures ) {
printFeatureAndTEInfo<T>(feature);
} // End loop over the features
}
@@ -146,13 +146,13 @@ namespace Trig{
std::vector< Trig::Feature <T1> > feature1 = comb.get<T1>(key1);
ATH_MSG_INFO("COMB Combination has " << feature1.size() << " T1 features ");
- for(const Trig::Feature<T1> feat1:feature1){
+ for(const Trig::Feature<T1>& feat1:feature1){
printFeatureAndTEInfo<T1>(feat1);
}
std::vector< Trig::Feature <T2> > feature2 = comb.get<T2>(key2);
ATH_MSG_INFO("COMB Combination has " << feature2.size() << " T2 features ");
- for(const Trig::Feature<T2> feat2:feature2){
+ for(const Trig::Feature<T2>& feat2:feature2){
printFeatureAndTEInfo<T2>(feat2);
}
}
@@ -165,7 +165,7 @@ namespace Trig{
FeatureContainer features = m_trigDecisionTool->features( chainName, condition);
std::vector<Feature<T> > vectorOfFeatures = features.get<T>(key);
// Loop over the features of type T
- for( const Trig::Feature<T> feature : vectorOfFeatures ) {
+ for( const Trig::Feature<T>& feature : vectorOfFeatures ) {
const T *cont=feature.cptr(); //Get pointer to container of type T
const xAOD::TrigPassBits *bits=(m_trigDecisionTool->ancestor<xAOD::TrigPassBits>(feature.te())).cptr();
if(!bits)
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
index a0bcc2ad47607ed47dc789051d7689a37e94a5b0..e1a73b62b6721839382b2ab7332e1db3dd0bb8d4 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
@@ -22,8 +22,7 @@ atlas_add_component( TrigEgammaAnalysisTools
LINK_LIBRARIES AsgTools AthenaBaseComps AthenaMonitoringLib TrigEgammaAnalysisToolsLib xAODEgamma )
# Install files from the package:
-atlas_install_python_modules( python/TrigEgamma*.py )
-atlas_install_joboptions( share/test*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_generic( share/trigEgammaDQ.py share/get_trigEgammaDQ.sh
DESTINATION share
EXECUTABLE )
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py
index e9cba421f6d3d988f0a9ed2a5eb768d41b0f74de..c914e5a011650905431fa3b3ff144a062b32fc96 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py
@@ -8,25 +8,19 @@ from TrigEgammaAnalysisTools import TrigEgammaAnalysisToolsConf
from AthenaCommon import CfgMgr
from AthenaCommon.AppMgr import ToolSvc
-from egammaRec.Factories import PublicToolFactory,FcnWrapper,AlgFactory, getPropertyValue
+from egammaRec.Factories import PublicToolFactory
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
import cppyy
cppyy.load_library('libElectronPhotonSelectorToolsDict')
-from ROOT import LikeEnum
-from ROOT import egammaPID
# Following loads the online selectors
from TrigEgammaHypo.TrigEgammaPidTools import ElectronPidTools
from TrigEgammaHypo.TrigEgammaPidTools import PhotonPidTools
-from TrigEgammaHypo.TrigEgammaPidTools import ElectronToolName
ElectronPidTools()
PhotonPidTools()
-from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronIsEMSelector, AsgElectronLikelihoodTool
-from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import ElectronIsEMMap,electronPIDmenu
-
# Offline selectors -- taken from latest conf
LooseElectronSelector = CfgMgr.AsgElectronIsEMSelector("T0HLTLooseElectronSelector")
MediumElectronSelector = CfgMgr.AsgElectronIsEMSelector("T0HLTMediumElectronSelector")
@@ -67,7 +61,7 @@ LuminosityCondAlgOnlineDefault (suffix = 'Online')
IneffLabels=["ClusterEtaRange","ConversionMatch","ClusterHadronicLeakage","ClusterMiddleEnergy","ClusterMiddleEratio37","ClusterMiddleEratio33","ClusterMiddleWidth","f3","ClusterStripsEratio","ClusterStripsDeltaEmax2","ClusterStripsDeltaE","ClusterStripsWtot","ClusterStripsFracm","ClusterStripsWeta1c","empty14","ClusterStripsDEmaxs1","TrackBlayer","TrackPixel","TrackSi","TrackA0","TrackMatchEta","TrackMatchPhi","TrackMatchEoverP","TrackTRTeProbabilityHT_Electron","TrackTRThits","TrackTRTratio","TrackTRTratio90","TrackA0Tight","TrackMatchEtaTight","Isolation","ClusterIsolation","TrackIsolation","No Track","No Cluster","No Object"]
from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoring_mam, monitoring_electron, monitoring_photon
-from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoringTP_electron, monitoringTP_electronZee, monitoringTP_electronJpsiee
+from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoringTP_electron, monitoringTP_electronJpsiee
from TrigEgammaMatchingTool.TrigEgammaMatchingToolConf import Trig__TrigEgammaMatchingTool
@@ -197,9 +191,6 @@ TrigEgammaNavAnalysisTool = PublicToolFactory(TrigEgammaAnalysisToolsConf.TrigEg
#############################################################################################
# Functions
-# Function to return triggerlist tools
-def getAllTools():
- return [TrigEgammaNavZeeTPCounts(),TrigEgammaNavZeeTPEff(),TrigEgammaNavZeeTPIneff(),TrigEgammaNavZeeTPRes(),]
def setRunFlag( runFlag ):
@@ -230,12 +221,6 @@ def setRunFlag( runFlag ):
-# The main algorithm
-# Add triggerlist tools to ToolHandleArray
-TrigEgammaAnalysisAlg = AlgFactory(TrigEgammaAnalysisToolsConf.TrigEgammaAnalysisAlg,
- name='TrigEgammaAnalysisAlg',
- Tools = FcnWrapper(getAllTools),
- )
@@ -246,10 +231,7 @@ def getEventSelectionTool(runFlag):
from TrigEgammaEmulationTool.TrigEgammaEmulationPidToolsConfig import getEgammaIsEMSelectorCaloOnly, \
getElectronIsEMSelector,\
getEgammaLikelihoodSelectorCaloOnly, \
- getElectronLikelihoodSelector2015,\
getElectronLikelihoodSelectorNoD0
- from AthenaCommon import CfgMgr
- from AthenaCommon.AppMgr import ToolSvc
# create all selector list. Here, the order is matter. Please check the
setRunFlag(runFlag)
@@ -277,7 +259,7 @@ def getEventSelectionTool(runFlag):
ElectronKey = 'Electrons',
MatchTool = EgammaMatchTool,
PlotTool=TrigEgammaPlotTool,
- EmulationTool=EmulationTool, # The emulation must be on in this tool.
+ #EmulationTool=EmulationTool, # The emulation must be on in this tool.
doEmulation=True,
Tools=[],
isEMResultNames=["Tight","Medium","Loose"],
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
deleted file mode 100644
index 96f9961fb6f56b6b84ac8bcfbd7c4374e8223c38..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def TrigEgammaMonTool():
- #from AthenaCommon.AppMgr import ToolSvc
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool,TrigEgammaNavTPJpsieeAnalysisTool
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaPlotTool
- from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoring_mam, monitoring_electron, monitoring_photon
- from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoringTP_electron, monitoringTP_electronZee, monitoringTP_electronJpsiee
-
-
- #Define the base path for all histograms
- basePath = '/HLT/Egamma'
-
- tagItems = ['HLT_e24_lhmedium_iloose_L1EM18VH',
- 'HLT_e24_lhmedium_iloose_L1EM20VH',
- 'HLT_e24_lhtight_iloose',
- 'HLT_e26_lhtight_iloose',
- # Primary cut-based electron triggers
- 'HLT_e24_medium_iloose_L1EM18VH',
- 'HLT_e24_medium_iloose_L1EM20VH',
- 'HLT_e24_tight_iloose',
- 'HLT_e26_tight_iloose']
-
- JpsitagItems = ['HLT_e5_tight_e4_etcut',
- 'HLT_e9_tight_e4_etcut',
- 'HLT_e14_tight_e4_etcut',
- 'HLT_e9_etcut_e5_tight',
- 'HLT_e14_etcut_e5_tight',
- # Primary cut-based electron triggers
- 'HLT_e5_tight_e4_etcut_Jpsiee',
- 'HLT_e9_tight_e4_etcut_Jpsiee',
- 'HLT_e14_tight_e4_etcut_Jpsiee',
- 'HLT_e9_etcut_e5_tight_Jpsiee',
- 'HLT_e14_etcut_e5_tight_Jpsiee']
-
- #Configure the TrigEgammaPlotTool
- PlotTool = TrigEgammaPlotTool.copy(name="TrigEgammaPlotTool",
- DirectoryPath=basePath,
- MaM=monitoring_mam,
- Efficiency=["eff_et","eff_eta","eff_mu"],
- Distribution=["et","eta","d0","d0sig"],
- Resolution=["res_et","res_eta","res_Rhad","res_Rphi","res_Reta"])
-
- #Configure emulation tools
- #from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationTool
- #EmulationPhotonTool = TrigEgammaEmulationTool.copy( TriggerList = monitoring_photon , name = "EmulationPhotonTool" )
- #EmulationElectronTool = TrigEgammaEmulationTool.copy( TriggerList = monitoring_electron , name = "EmulationElectronTool" )
- #EmulationTPElectronTool = TrigEgammaEmulationTool.copy( TriggerList = monitoringTP_electron , name = "EmulationTPElectronTool" )
- #EmulationJpsieeTool = TrigEgammaEmulationTool.copy( TriggerList = monitoringTP_electronJpsiee, name = "EmulationJpsieeTool" )
-
-
- ElectronAnalysis = TrigEgammaNavAnalysisTool(name='NavElectronAnalysis',
- Analysis='Electrons',
- PlotTool=PlotTool,
- TriggerList=monitoring_electron,
- File="",
- #doEmulation=True,
- #EmulationTool=EmulationElectronTool,
- OutputLevel=0,DetailedHistograms=False)
- PhotonAnalysis = TrigEgammaNavAnalysisTool(name='NavPhotonAnalysis',
- Analysis='Photons',
- PlotTool=PlotTool,
- TriggerList=monitoring_photon,
- File="",
- #doEmulation=True,
- #EmulationTool=EmulationPhotonTool,
- OutputLevel=0,DetailedHistograms=False)
- TPAnalysis = TrigEgammaNavTPAnalysisTool(name='NavTPAnalysis',
- Analysis='Zee',
- PlotTool=PlotTool,
- TriggerList=monitoringTP_electron,
- File="",
- TagTriggerList=tagItems,
- #doEmulation=True,
- #EmulationTool=EmulationTPElectronTool,
- RemoveCrack=False,
- OutputLevel=0,DetailedHistograms=False)
- JpsiTPAnalysis = TrigEgammaNavTPJpsieeAnalysisTool(name='NavTPJpsieeAnalysis',
- Analysis='Jpsiee',
- PlotTool=PlotTool,
- TriggerList=monitoringTP_electronJpsiee,
- File="",
- #doEmulation=True,
- #EmulationTool=EmulationJpsieeTool,
- TagTriggerList= JpsitagItems)
-
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
- TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon",
- histoPathBase=basePath,
- Tools=[
- "TrigEgammaNavAnalysisTool/NavPhotonAnalysis",
- "TrigEgammaNavAnalysisTool/NavElectronAnalysis",
- "TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
- "TrigEgammaNavTPAnalysisTool/NavTPJpsieeAnalysis"])
- #ToolSvc += TrigEgammaMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
deleted file mode 100644
index 7af1f7b52df49d14e7f0dfbf8a7e3b67b9ed0e47..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def TrigEgammaMonTool():
- #from AthenaCommon.AppMgr import ToolSvc
- from AthenaCommon import CfgMgr
- from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronIsEMSelector
- from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import ElectronIsEMMap,electronPIDmenu
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool,TrigEgammaNavTPJpsieeAnalysisTool
- from TrigEgammaAnalysisTools.TrigEgammaProbelist import default,defaultJpsi # to import probelist
- #from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # import MaM trigger list, not available!!!!
-
- # Import full trigger menu, requires setup of both MC and Physics
- # Makes available all possible triggers which can be in any dataset
- # Set final list from triggers available in data
- import TriggerMenu.menu.Physics_pp_v5 as physics_menu
- from TriggerJobOpts.TriggerFlags import TriggerFlags
-
- # Offline selectors -- taken from latest conf
- # Offline tunes for 50 ns
- LooseElectronSelector=CfgMgr.AsgElectronIsEMSelector("LooseElectron50nsSelector")
- LooseElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronIsEMLooseSelectorCutDefs.conf"
- ToolSvc+=LooseElectronSelector
- MediumElectronSelector=CfgMgr.AsgElectronIsEMSelector("MediumElectron50nsSelector")
- MediumElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronIsEMMediumSelectorCutDefs.conf"
- ToolSvc+=MediumElectronSelector
- TightElectronSelector=CfgMgr.AsgElectronIsEMSelector("TightElectron50nsSelector")
- TightElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronIsEMTightSelectorCutDefs.conf"
- ToolSvc+=TightElectronSelector
-
- LooseLHSelector=CfgMgr.AsgElectronLikelihoodTool("LooseLH50nsSelector")
- LooseLHSelector.ConfigFile="ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronLikelihoodLooseOfflineConfig2015.conf"
- ToolSvc+=LooseLHSelector
- MediumLHSelector=CfgMgr.AsgElectronLikelihoodTool("MediumLH50nsSelector")
- MediumLHSelector.ConfigFile="ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronLikelihoodMediumOfflineConfig2015.conf"
- ToolSvc+=MediumLHSelector
- TightLHSelector=CfgMgr.AsgElectronLikelihoodTool("TightLH50nsSelector")
- TightLHSelector.ConfigFile="ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronLikelihoodTightOfflineConfig2015.conf"
- ToolSvc+=TightLHSelector
-
- physics_menu.setupMenu()
- egammaMenu = TriggerFlags.EgammaSlice.signatures()
- egammaChains = []
- l1Items = []
- addItems = []
- for egchain in egammaMenu:
- egammaChains.append(egchain[0])
- l1Items.append(egchain[1])
- addItems.append(egchain[3])
- # Set list to full menu
- #probelist = egammaChains
- probelist = default
- Jpsiprobelist = defaultJpsi
- #probelist=['e5_loose_idperf','e5_lhloose_idperf','e0_perf_L1EM15','g0_perf_L1EM15']
-
- basePath = '/HLT/Egamma/'
- tagItems = ['e24_lhmedium_iloose_L1EM18VH',
- 'e24_lhmedium_iloose_L1EM20VH',
- 'e24_lhtight_iloose',
- 'e26_lhtight_iloose',
- # Primary cut-based electron triggers
- 'e24_medium_iloose_L1EM18VH',
- 'e24_medium_iloose_L1EM20VH',
- 'e24_tight_iloose',
- 'e26_tight_iloose']
-
- JpsitagItems = ['e5_tight_e4_etcut',
- 'e9_tight_e4_etcut',
- 'e14_tight_e4_etcut',
- 'e9_etcut_e5_tight',
- 'e14_etcut_e5_tight',
- # Primary cut-based electron triggers
- 'e5_tight_e4_etcut_Jpsiee',
- 'e9_tight_e4_etcut_Jpsiee',
- 'e14_tight_e4_etcut_Jpsiee',
- 'e9_etcut_e5_tight_Jpsiee',
- 'e14_etcut_e5_tight_Jpsiee']
- Analysis = TrigEgammaNavAnalysisTool(name='NavAnalysis',
- DirectoryPath=basePath+'Analysis',
- TriggerList=probelist,
- ElectronIsEMSelector =[TightElectronSelector,MediumElectronSelector,LooseElectronSelector],
- ElectronLikelihoodTool =[TightLHSelector,MediumLHSelector,LooseLHSelector],
- File="",
- OutputLevel=0,DetailedHistograms=False)
- TPAnalysis = TrigEgammaNavTPAnalysisTool(name='NavTPAnalysis',
- DirectoryPath=basePath+'TPAnalysis',
- TriggerList=probelist,
- ElectronIsEMSelector =[TightElectronSelector,MediumElectronSelector,LooseElectronSelector],
- ElectronLikelihoodTool =[TightLHSelector,MediumLHSelector,LooseLHSelector],
- File="",
- TagTriggerList=tagItems,
- RemoveCrack=False,
- OutputLevel=0,DetailedHistograms=True)
- JpsiTPAnalysis = TrigEgammaNavTPJpsieeAnalysisTool(name='NavTPJpsieeAnalysis',
- DirectoryPath=basePath+'TPJpsieeAnalysis',
- TriggerList=Jpsiprobelist,
- File="",
- TagTriggerList= JpsitagItems,
- RemoveCrack=True,
- ZeeLowerMass=2,
- ZeeUpperMass=5,
- OfflineTagMinEt=5,
- OfflineProbeMinEt=5,
- OutputLevel=0,
- DetailedHistograms=False,
- doJpsiee=True)
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
- TrigEgammaMonTool = TrigEgammaMonTool( name = "TrigEgammaMonTool",
- histoPathBase=basePath,
- Tools=["TrigEgammaNavAnalysisTool/NavAnalysis",
- "TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
- "TrigEgammaNavTPAnalysisTool/NavTPJpsieeAnalysis"])
- #ToolSvc += TrigEgammaMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
deleted file mode 100644
index 9ef1c9d4453136a3f8f9b270a1e4232cdd119011..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def TrigEgammaPhysValMonTool():
- #from AthenaCommon.AppMgr import ToolSvc
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaEmulationTool
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool, TrigEgammaNavNtuple, TrigEgammaNavTPNtuple
- from TrigEgammaAnalysisTools.TrigEgammaProbelist import default, probeListLowMidPtPhysicsTriggers # to import probelist
-
- #from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # import MaM trigger list not available!!!!
- import TriggerMenu.menu.Physics_pp_v5 as physics_menu
- import TriggerMenu.menu.MC_pp_v5 as mc_menu
- from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-
- physics_menu.setupMenu()
- mc_menu.setupMenu()
- egammaMenu = TriggerFlags.EgammaSlice.signatures()
- egammaChains = []
- l1Items = []
- addItems = []
- for egchain in egammaMenu:
- egammaChains.append(egchain[0])
- l1Items.append(egchain[1])
- addItems.append(egchain[3])
- # Set list to full menu
- #probelist = egammaChains
- probelist = default
- #probelist = list(set(default+probeListLowMidPtPhysicsTriggers))
-
-
- basePath = 'Trigger/HLT/Egamma/'
- tagItems = [
- 'e24_lhmedium_iloose_L1EM18VH',
- 'e24_lhmedium_iloose_L1EM20VH',
- 'e24_lhtight_iloose'
- 'e26_lhtight_iloose',
- #Primary cut-based electron triggers
- 'e24_medium_iloose_L1EM18VH',
- 'e24_medium_iloose_L1EM20VH',
- 'e24_tight_iloose',
- 'e26_tight_iloose'
- ]
- Analysis = TrigEgammaNavAnalysisTool(name='NavAnalysis',
- DirectoryPath=basePath+'Analysis',
- TriggerList=probelist,
- File="PhysVal")
-
- TPAnalysis = TrigEgammaNavTPAnalysisTool(name='NavTPAnalysis',
- DirectoryPath=basePath+'TPAnalysis',
- TriggerList=probelist,
- File="PhysVal",
- TagTriggerList=tagItems,
- OutputLevel=0)
-
- Emulation = TrigEgammaEmulationTool("Emulation",TriggerList=probelist)
-
-
- Ntuple = TrigEgammaNavNtuple(name="NavNtuple",
- DirectoryPath=basePath+'Ntuple',
- TriggerList=probelist,
- DoOfflineDump=False,
- ForcePidSelection=True,
- ForceProbeIsolation=False,
- ForceEtThreshold=True,
- RemoveCrack=True,
- #ForceFilterSelection=False,
- #ElectronFilterType="Tight",
- File="PhysVal",
- OutputLevel=0)
-
-
- TPNtuple = TrigEgammaNavTPNtuple(name="NavTPNtuple",
- DirectoryPath=basePath+'TPNtuple',
- TriggerList=probelist,
- File="PhysVal",
- TagTriggerList=tagItems,
- OutputLevel=0)
-
-
- from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaPhysValMonTool
- TrigEgammaPhysValMonTool = TrigEgammaPhysValMonTool( name = "TrigEgammaPhysValMonTool",
- histoPathBase=basePath,
- Tools=[
- "TrigEgammaNavAnalysisTool/NavAnalysis",
- "TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
- "TrigEgammaEmulationTool/Emulation",
- "TrigEgammaNavNtuple/NavNtuple",
- "TrigEgammaNavTPNtuple/NavTPNtuple"
- ])
-
- #ToolSvc += TrigEgammaPhysValMonTool
-
-
-
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py
index be86a3aa05aee9ad112d55350dde2e3caac6bb9c..ed20ee82f66c29ccb882c6ea16c9f6c61b4514cc 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py
@@ -9,132 +9,132 @@
#Tag items
triggerTags = [
- 'HLT_e24_lhmedium_iloose_L1EM18VH',
- 'HLT_e24_lhmedium_iloose_L1EM20VH',
- 'HLT_e24_lhtight_iloose',
- 'HLT_e26_lhtight_iloose',
- # Primary cut-based electron triggers
- 'HLT_e24_medium_iloose_L1EM18VH',
- 'HLT_e24_medium_iloose_L1EM20VH',
- 'HLT_e24_tight_iloose',
- 'HLT_e26_tight_iloose'
-]
+ 'HLT_e24_lhmedium_iloose_L1EM18VH',
+ 'HLT_e24_lhmedium_iloose_L1EM20VH',
+ 'HLT_e24_lhtight_iloose',
+ 'HLT_e26_lhtight_iloose',
+ # Primary cut-based electron triggers
+ 'HLT_e24_medium_iloose_L1EM18VH',
+ 'HLT_e24_medium_iloose_L1EM20VH',
+ 'HLT_e24_tight_iloose',
+ 'HLT_e26_tight_iloose'
+ ]
monitoring_mam = {
- 'primary_single_ele' : 'HLT_e26_lhtight_iloose',
- 'primary_single_cut_ele' : 'HLT_e24_tight_iloose',
- 'primary_single_pho' : 'HLT_g120_loose'}
+ 'primary_single_ele' : 'HLT_e26_lhtight_iloose',
+ 'primary_single_cut_ele' : 'HLT_e24_tight_iloose',
+ 'primary_single_pho' : 'HLT_g120_loose'}
# L1 Items
monitoring_L1Calo = [
- 'L1_EM20VH',
- 'L1_EM20VHI']
+ 'L1_EM20VH',
+ 'L1_EM20VHI']
# High pt electron triggers that cannot be monitored with TP Analysis
monitoring_electron=[
- 'HLT_e60_lhmedium',
- 'HLT_e60_medium',
- 'HLT_e120_lhloose',
- 'HLT_e120_loose',
- 'HLT_e140_lhloose'
-]
+ 'HLT_e60_lhmedium',
+ 'HLT_e60_medium',
+ 'HLT_e120_lhloose',
+ 'HLT_e120_loose',
+ 'HLT_e140_lhloose'
+ ]
# Full list of monitoring for photons
monitoring_photon=[
- 'HLT_g25_loose',
- 'HLT_g35_loose',
- "HLT_g25_medium",
- "HLT_g35_medium",
- 'HLT_g20_tight',
- 'HLT_g120_loose',
- 'HLT_g140_loose'
-]
+ 'HLT_g25_loose',
+ 'HLT_g35_loose',
+ "HLT_g25_medium",
+ "HLT_g35_medium",
+ 'HLT_g20_tight',
+ 'HLT_g120_loose',
+ 'HLT_g140_loose'
+ ]
# Lowest single electron triggers for TP analysis
monitoringTP_electron =[
- 'HLT_e24_lhmedium_L1EM18VH',
- 'HLT_e24_lhmedium_L1EM20VH',
- 'HLT_e24_medium_L1EM20VH',
- 'HLT_e24_lhmedium_iloose',
- 'HLT_e24_medium_iloose',
- 'HLT_e24_lhmedium_nod0_iloose',
- 'HLT_e24_lhtight_iloose',
- 'HLT_e24_tight_iloose',
- 'HLT_e26_lhtight_iloose',
- 'HLT_e26_lhtight_nod0_iloose',
- 'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e26_lhtight_nod0_ringer_iloose',
- 'HLT_e26_lhtight_nod0_ringer_ivarloose',
- 'HLT_e28_lhtight_nod0_iloose',
-]
+ 'HLT_e24_lhmedium_L1EM18VH',
+ 'HLT_e24_lhmedium_L1EM20VH',
+ 'HLT_e24_medium_L1EM20VH',
+ 'HLT_e24_lhmedium_iloose',
+ 'HLT_e24_medium_iloose',
+ 'HLT_e24_lhmedium_nod0_iloose',
+ 'HLT_e24_lhtight_iloose',
+ 'HLT_e24_tight_iloose',
+ 'HLT_e26_lhtight_iloose',
+ 'HLT_e26_lhtight_nod0_iloose',
+ 'HLT_e26_lhtight_nod0_ivarloose',
+ 'HLT_e26_lhtight_nod0_ringer_iloose',
+ 'HLT_e26_lhtight_nod0_ringer_ivarloose',
+ 'HLT_e28_lhtight_nod0_iloose',
+ ]
#Zee TP triggers
monitoringTP_electronZee = [
- 'HLT_e24_lhtight_L1EM20VH_e15_etcut_Zee',
- 'HLT_e26_lhtight_e15_etcut_Zee',
-]
+ 'HLT_e24_lhtight_L1EM20VH_e15_etcut_Zee',
+ 'HLT_e26_lhtight_e15_etcut_Zee',
+ ]
#Jpsiee TP triggers
monitoringTP_electronJpsiee = [
- "HLT_e5_loose",
- "HLT_e5_lhloose",
- "HLT_e5_vloose",
- "HLT_e5_lhvloose",
-]
+ "HLT_e5_loose",
+ "HLT_e5_lhloose",
+ "HLT_e5_vloose",
+ "HLT_e5_lhvloose",
+ ]
default = [
- 'HLT_e24_lhmedium_iloose_L1EM18VH',# Primary LH electron triggers
- 'HLT_e24_lhmedium_iloose_L1EM20VH',
- 'HLT_e24_lhtight_iloose',
- 'HLT_e24_lhtight_iloose_L1EM20VH',
- 'HLT_e26_lhtight_iloose',
- 'HLT_e26_lhtight_smooth_iloose',
- 'HLT_e60_lhmedium',
- 'HLT_e120_lhloose',
- 'HLT_e140_lhloose',
- # Primary cut-based electron triggers
- 'HLT_e24_medium_iloose_L1EM18VH',
- 'HLT_e24_medium_iloose_L1EM20VH',
- 'HLT_e24_tight_iloose',
- 'HLT_e26_tight_iloose',
- 'HLT_e60_medium',
- 'HLT_e120_loose',
- 'HLT_e140_loose',
- # Non-isolated
- 'HLT_e24_lhmedium_L1EM18VH',
- 'HLT_e24_medium_L1EM18VH',
- 'HLT_e24_lhtight_L1EM20VH',
- 'HLT_e24_tight_L1EM20VH',
- 'HLT_e24_lhmedium_L1EM20VHI',
- # Single photon
- 'HLT_g120_loose',
- 'HLT_g140_loose',
- # Suppporting triggers for alignment studies / LH ineffiency
- 'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH',
- 'HLT_e24_lhmedium_nod0_iloose_L1EM18VH',
- 'HLT_e24_lhmedium_nodeta_iloose_L1EM18VH',
- 'HLT_e24_lhmedium_nodphires_iloose_L1EM18VH',
- 'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH',
- 'HLT_e24_lhmedium_nod0_iloose_L1EM20VH',
- 'HLT_e24_lhmedium_nodeta_iloose_L1EM20VH',
- 'HLT_e24_lhmedium_nodphires_iloose_L1EM20VH',
- 'HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH',
- 'HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH',
- 'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM18VH',
- 'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM20VH',
- 'HLT_e26_lhtight_cutd0dphideta_iloose',
- 'HLT_e26_lhtight_iloose_HLTCalo',
- 'HLT_e26_lhtight_iloose_L2EFCalo',
- 'HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH',
- 'HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH',
- 'HLT_e60_lhmedium_HLTCalo',
- 'HLT_e60_lhmedium_L2EFCalo',
- 'HLT_e60_lhmedium_nod0',
- 'HLT_e60_lhmedium_cutd0dphideta',
- # Supporting trigger for background
- #'HLT_e24_vloose_L1EM18VH',
- #'HLT_e24_vloose_L1EM20VH',
+ 'HLT_e24_lhmedium_iloose_L1EM18VH',# Primary LH electron triggers
+ 'HLT_e24_lhmedium_iloose_L1EM20VH',
+ 'HLT_e24_lhtight_iloose',
+ 'HLT_e24_lhtight_iloose_L1EM20VH',
+ 'HLT_e26_lhtight_iloose',
+ 'HLT_e26_lhtight_smooth_iloose',
+ 'HLT_e60_lhmedium',
+ 'HLT_e120_lhloose',
+ 'HLT_e140_lhloose',
+ # Primary cut-based electron triggers
+ 'HLT_e24_medium_iloose_L1EM18VH',
+ 'HLT_e24_medium_iloose_L1EM20VH',
+ 'HLT_e24_tight_iloose',
+ 'HLT_e26_tight_iloose',
+ 'HLT_e60_medium',
+ 'HLT_e120_loose',
+ 'HLT_e140_loose',
+ # Non-isolated
+ 'HLT_e24_lhmedium_L1EM18VH',
+ 'HLT_e24_medium_L1EM18VH',
+ 'HLT_e24_lhtight_L1EM20VH',
+ 'HLT_e24_tight_L1EM20VH',
+ 'HLT_e24_lhmedium_L1EM20VHI',
+ # Single photon
+ 'HLT_g120_loose',
+ 'HLT_g140_loose',
+ # Suppporting triggers for alignment studies / LH ineffiency
+ 'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH',
+ 'HLT_e24_lhmedium_nod0_iloose_L1EM18VH',
+ 'HLT_e24_lhmedium_nodeta_iloose_L1EM18VH',
+ 'HLT_e24_lhmedium_nodphires_iloose_L1EM18VH',
+ 'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH',
+ 'HLT_e24_lhmedium_nod0_iloose_L1EM20VH',
+ 'HLT_e24_lhmedium_nodeta_iloose_L1EM20VH',
+ 'HLT_e24_lhmedium_nodphires_iloose_L1EM20VH',
+ 'HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH',
+ 'HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH',
+ 'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM18VH',
+ 'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM20VH',
+ 'HLT_e26_lhtight_cutd0dphideta_iloose',
+ 'HLT_e26_lhtight_iloose_HLTCalo',
+ 'HLT_e26_lhtight_iloose_L2EFCalo',
+ 'HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH',
+ 'HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH',
+ 'HLT_e60_lhmedium_HLTCalo',
+ 'HLT_e60_lhmedium_L2EFCalo',
+ 'HLT_e60_lhmedium_nod0',
+ 'HLT_e60_lhmedium_cutd0dphideta',
+ # Supporting trigger for background
+ #'HLT_e24_vloose_L1EM18VH',
+#'HLT_e24_vloose_L1EM20VH',
#'HLT_e24_lhvloose_L1EM18VH',
#'HLT_e24_lhvloose_L1EM20VH',
#'HLT_e26_lhvloose_L1EM20VH',
@@ -150,7 +150,7 @@ default = [
'HLT_e17_loose_L1EM15',
'HLT_e17_lhloose_L1EM15',
'HLT_e13_etcut_trkcut',
- # Rerun mode for photon
+ # Rerun mode for photon
# Performance and supporting triggers
#"HLT_g0_perf_L1EM3_EMPTY",
#"HLT_e0_perf_L1EM3_EMPTY",
@@ -193,190 +193,190 @@ default = [
# Samples to run - Zee and a background such as dijet or JF17 or any JF sample
probeListLowMidPtSupportingTriggers = [
- "HLT_e0_L2Star_perf_L1EM15",
- "HLT_e0_L2Star_perf_L1EM3",
- "HLT_e0_perf_L1EM15",
- "HLT_e0_perf_L1EM3",
- "HLT_e10_etcut_L1EM7",
- "HLT_e13_etcut_L1EM10_W-MT25",
- "HLT_e13_etcut_L1EM10_W-MT30",
- "HLT_e13_etcut_L1W-NOMATCH",
- "HLT_e13_etcut_L1W-NOMATCH_W-05RO-XEEMHT",
- "HLT_e13_etcut_trkcut",
- "HLT_e14_etcut",
- "HLT_e17_etcut_L1EM15",
- "HLT_e17_etcut_L2StarA_L1EM15",
- "HLT_e17_etcut_L2StarB_L1EM15",
- "HLT_e17_etcut_L2StarC_L1EM15",
- "HLT_e17_etcut_L2Star_idperf_L1EM15",
- "HLT_e17_etcut_idperf_L1EM15",
- "HLT_e18_etcut_L1EM15_W-MT35",
- "HLT_e18_etcut_trkcut",
- "HLT_e20_etcut_L1EM12",
- "HLT_e30_etcut_L1EM15",
- "HLT_e3_etcut",
- "HLT_e3_etcut_L1EM3_EMPTY",
- "HLT_e4_etcut",
- "HLT_e5_etcut",
- "HLT_e9_etcut",
- "HLT_e24_etcut",
- "HLT_e25_etcut_L1EM15",
-]
+ "HLT_e0_L2Star_perf_L1EM15",
+ "HLT_e0_L2Star_perf_L1EM3",
+ "HLT_e0_perf_L1EM15",
+ "HLT_e0_perf_L1EM3",
+ "HLT_e10_etcut_L1EM7",
+ "HLT_e13_etcut_L1EM10_W-MT25",
+ "HLT_e13_etcut_L1EM10_W-MT30",
+ "HLT_e13_etcut_L1W-NOMATCH",
+ "HLT_e13_etcut_L1W-NOMATCH_W-05RO-XEEMHT",
+ "HLT_e13_etcut_trkcut",
+ "HLT_e14_etcut",
+ "HLT_e17_etcut_L1EM15",
+ "HLT_e17_etcut_L2StarA_L1EM15",
+ "HLT_e17_etcut_L2StarB_L1EM15",
+ "HLT_e17_etcut_L2StarC_L1EM15",
+ "HLT_e17_etcut_L2Star_idperf_L1EM15",
+ "HLT_e17_etcut_idperf_L1EM15",
+ "HLT_e18_etcut_L1EM15_W-MT35",
+ "HLT_e18_etcut_trkcut",
+ "HLT_e20_etcut_L1EM12",
+ "HLT_e30_etcut_L1EM15",
+ "HLT_e3_etcut",
+ "HLT_e3_etcut_L1EM3_EMPTY",
+ "HLT_e4_etcut",
+ "HLT_e5_etcut",
+ "HLT_e9_etcut",
+ "HLT_e24_etcut",
+ "HLT_e25_etcut_L1EM15",
+ ]
# ProbeList 2 Low/mid pt physics triggers
# EmulationTool,Eff,Counts,Perf
# Samples to run Zee and any background sample dijet, JFXX
probeListLowMidPtPhysicsTriggers = [
- "HLT_e10_lhvloose_L1EM7",
- "HLT_e10_vloose_L1EM7",
- "HLT_e12_lhloose",
- "HLT_e12_loose",
- "HLT_e12_lhvloose_L1EM10VH",
- "HLT_e12_vloose_L1EM10VH",
- "HLT_e15_lhloose_L1EM13VH",
- "HLT_e15_lhvloose_L1EM13VH",
- "HLT_e15_lhvloose_L1EM7",
- "HLT_e15_loose_L1EM13VH",
- "HLT_e15_vloose_L1EM13VH",
- "HLT_e15_vloose_L1EM7",
- "HLT_e17_lhloose",
- "HLT_e17_lhmedium",
- "HLT_e17_lhmedium_iloose",
- "HLT_e17_lhvloose",
- "HLT_e17_loose",
- "HLT_e17_medium",
- "HLT_e17_medium_iloose",
- "HLT_e17_vloose",
- "HLT_e20_lhmedium",
- "HLT_e20_lhvloose",
- "HLT_e20_medium",
- "HLT_e20_vloose",
- "HLT_e20_vloose_L1EM12",
- "HLT_e24_lhmedium_L1EM15VH",
- "HLT_e24_lhmedium_L1EM18VH",
- "HLT_e24_lhmedium_iloose_L1EM18VH",
- "HLT_e24_lhmedium_iloose_L1EM20VH",
- "HLT_e24_lhtight_iloose",
- "HLT_e24_lhvloose_L1EM18VH",
- "HLT_e24_lhvloose_L1EM20VH",
- "HLT_e24_medium_L1EM15VH",
- "HLT_e24_medium_L1EM18VH",
- "HLT_e24_medium_iloose_L1EM18VH",
- "HLT_e24_medium_iloose_L1EM20VH",
- "HLT_e24_tight_L1EM20VH",
- "HLT_e24_tight_iloose",
- "HLT_e24_vloose_L1EM18VH",
- "HLT_e24_vloose_L1EM20VH",
- "HLT_e25_lhvloose_L1EM15",
- "HLT_e25_vloose_L1EM15",
- "HLT_e26_lhtight_iloose",
- "HLT_e26_lhvloose_L1EM20VH",
- "HLT_e26_tight_iloose",
- "HLT_e26_vloose_L1EM20VH",
- "HLT_e30_lhvloose_L1EM15",
- "HLT_e30_vloose_L1EM15",
-]
+ "HLT_e10_lhvloose_L1EM7",
+ "HLT_e10_vloose_L1EM7",
+ "HLT_e12_lhloose",
+ "HLT_e12_loose",
+ "HLT_e12_lhvloose_L1EM10VH",
+ "HLT_e12_vloose_L1EM10VH",
+ "HLT_e15_lhloose_L1EM13VH",
+ "HLT_e15_lhvloose_L1EM13VH",
+ "HLT_e15_lhvloose_L1EM7",
+ "HLT_e15_loose_L1EM13VH",
+ "HLT_e15_vloose_L1EM13VH",
+ "HLT_e15_vloose_L1EM7",
+ "HLT_e17_lhloose",
+ "HLT_e17_lhmedium",
+ "HLT_e17_lhmedium_iloose",
+ "HLT_e17_lhvloose",
+ "HLT_e17_loose",
+ "HLT_e17_medium",
+ "HLT_e17_medium_iloose",
+ "HLT_e17_vloose",
+ "HLT_e20_lhmedium",
+ "HLT_e20_lhvloose",
+ "HLT_e20_medium",
+ "HLT_e20_vloose",
+ "HLT_e20_vloose_L1EM12",
+ "HLT_e24_lhmedium_L1EM15VH",
+ "HLT_e24_lhmedium_L1EM18VH",
+ "HLT_e24_lhmedium_iloose_L1EM18VH",
+ "HLT_e24_lhmedium_iloose_L1EM20VH",
+ "HLT_e24_lhtight_iloose",
+ "HLT_e24_lhvloose_L1EM18VH",
+ "HLT_e24_lhvloose_L1EM20VH",
+ "HLT_e24_medium_L1EM15VH",
+ "HLT_e24_medium_L1EM18VH",
+ "HLT_e24_medium_iloose_L1EM18VH",
+ "HLT_e24_medium_iloose_L1EM20VH",
+ "HLT_e24_tight_L1EM20VH",
+ "HLT_e24_tight_iloose",
+ "HLT_e24_vloose_L1EM18VH",
+ "HLT_e24_vloose_L1EM20VH",
+ "HLT_e25_lhvloose_L1EM15",
+ "HLT_e25_vloose_L1EM15",
+ "HLT_e26_lhtight_iloose",
+ "HLT_e26_lhvloose_L1EM20VH",
+ "HLT_e26_tight_iloose",
+ "HLT_e26_vloose_L1EM20VH",
+ "HLT_e30_lhvloose_L1EM15",
+ "HLT_e30_vloose_L1EM15",
+ ]
# Compare LHTrigger to IsEMTrigger
probeListLHTriggers = [
- "HLT_e10_lhvloose_L1EM7",
- "HLT_e12_lhloose",
- "HLT_e17_lhloose",
- "HLT_e17_lhmedium",
- "HLT_e17_lhmedium_iloose",
- "HLT_e17_lhvloose",
- "HLT_e20_lhmedium",
- "HLT_e20_lhvloose",
- "HLT_e24_lhtight_iloose",
- "HLT_e26_lhtight_iloose",
- "HLT_e30_lhvloose_L1EM15",
- "HLT_e60_lhmedium",
-]
+ "HLT_e10_lhvloose_L1EM7",
+ "HLT_e12_lhloose",
+ "HLT_e17_lhloose",
+ "HLT_e17_lhmedium",
+ "HLT_e17_lhmedium_iloose",
+ "HLT_e17_lhvloose",
+ "HLT_e20_lhmedium",
+ "HLT_e20_lhvloose",
+ "HLT_e24_lhtight_iloose",
+ "HLT_e26_lhtight_iloose",
+ "HLT_e30_lhvloose_L1EM15",
+ "HLT_e60_lhmedium",
+ ]
# Compare with LH trigger above
probeListIsEMTriggers = [
- "HLT_e10_vloose_L1EM7",
- "HLT_e12_loose",
- "HLT_e17_loose",
- "HLT_e17_medium",
- "HLT_e17_medium_iloose",
- "HLT_e17_vloose",
- "HLT_e20_medium",
- "HLT_e20_vloose",
- "HLT_e24_tight_iloose",
- "HLT_e26_tight_iloose",
- "HLT_e30_vloose_L1EM15",
- "HLT_e60_medium",
-]
+ "HLT_e10_vloose_L1EM7",
+ "HLT_e12_loose",
+ "HLT_e17_loose",
+ "HLT_e17_medium",
+ "HLT_e17_medium_iloose",
+ "HLT_e17_vloose",
+ "HLT_e20_medium",
+ "HLT_e20_vloose",
+ "HLT_e24_tight_iloose",
+ "HLT_e26_tight_iloose",
+ "HLT_e30_vloose_L1EM15",
+ "HLT_e60_medium",
+ ]
# Compare with same items without L1 seed
probeListAltL1Seeds = [
- "HLT_e12_lhloose_L1EM10VH",
- "HLT_e12_loose_L1EM10VH",
- "HLT_e17_lhloose_L1EM15",
- "HLT_e17_loose_L1EM15",
- "HLT_e20_lhvloose_L1EM12",
- "HLT_e24_lhtight_L1EM20VH",
- "HLT_e24_lhtight_iloose_L1EM20VH",
- "HLT_e24_tight_iloose_L1EM20VH",
- "HLT_e24_tight_iloose_etisem_L1EM20VH",
-]
+ "HLT_e12_lhloose_L1EM10VH",
+ "HLT_e12_loose_L1EM10VH",
+ "HLT_e17_lhloose_L1EM15",
+ "HLT_e17_loose_L1EM15",
+ "HLT_e20_lhvloose_L1EM12",
+ "HLT_e24_lhtight_L1EM20VH",
+ "HLT_e24_lhtight_iloose_L1EM20VH",
+ "HLT_e24_tight_iloose_L1EM20VH",
+ "HLT_e24_tight_iloose_etisem_L1EM20VH",
+ ]
# Special triggers for hlt id performance
probeListPerfTriggers = [
- "HLT_e24_lhmedium_L2Star_idperf_L1EM20VH",
- "HLT_e24_lhmedium_idperf_L1EM20VH",
- "HLT_e24_medium1_L2Star_idperf_L1EM18VH",
- "HLT_e24_medium1_idperf_L1EM18VH",
- "HLT_e24_medium_L2Star_idperf_L1EM20VH",
- "HLT_e24_medium_idperf_L1EM20VH",
-]
+ "HLT_e24_lhmedium_L2Star_idperf_L1EM20VH",
+ "HLT_e24_lhmedium_idperf_L1EM20VH",
+ "HLT_e24_medium1_L2Star_idperf_L1EM18VH",
+ "HLT_e24_medium1_idperf_L1EM18VH",
+ "HLT_e24_medium_L2Star_idperf_L1EM20VH",
+ "HLT_e24_medium_idperf_L1EM20VH",
+ ]
# Run1 tracking triggers, for rate estimates
# Compare with same triggers w/o L2StarA
probeListRun1TrkTriggers = [
- "HLT_e24_lhmedium_iloose_L2StarA_L1EM20VH",
- "HLT_e24_medium1_iloose_L2StarA_L1EM18VH",
- "HLT_e24_medium_iloose_L2StarA_L1EM20VH",
-]
+ "HLT_e24_lhmedium_iloose_L2StarA_L1EM20VH",
+ "HLT_e24_medium1_iloose_L2StarA_L1EM18VH",
+ "HLT_e24_medium_iloose_L2StarA_L1EM20VH",
+ ]
# Run1 Pid, compare with same Run2 items
probeListRun1PidTriggers = [
- "HLT_e24_medium1_L1EM18VH",
- "HLT_e24_medium1_iloose_L1EM18VH",
- "HLT_e24_tight1_iloose",
- "HLT_e24_tight1_iloose_L1EM20VH",
- "HLT_e26_tight1_iloose",
-]
+ "HLT_e24_medium1_L1EM18VH",
+ "HLT_e24_medium1_iloose_L1EM18VH",
+ "HLT_e24_tight1_iloose",
+ "HLT_e24_tight1_iloose_L1EM20VH",
+ "HLT_e26_tight1_iloose",
+ ]
# To be compared with the default items
probeListMisalignmentTriggers = [
- "HLT_e24_lhmedium_cutd0dphideta_L1EM18VH",
- "HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH",
- "HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH",
- "HLT_e24_lhmedium_nod0_L1EM18VH",
- "HLT_e24_lhmedium_nod0_iloose_L1EM18VH",
- "HLT_e24_lhmedium_nodeta_L1EM18VH",
- "HLT_e24_lhmedium_nodeta_iloose_L1EM18VH",
- "HLT_e24_lhmedium_nodphires_L1EM18VH",
- "HLT_e24_lhmedium_nodphires_iloose_L1EM18VH",
- "HLT_e24_lhtight_cutd0dphideta_iloose",
- "HLT_e24_lhtight_cutd0dphideta_iloose_L1EM20VH",
- "HLT_e26_lhtight_cutd0dphideta_iloose",
- "HLT_e60_lhmedium_cutd0dphideta",
-]
+ "HLT_e24_lhmedium_cutd0dphideta_L1EM18VH",
+ "HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH",
+ "HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH",
+ "HLT_e24_lhmedium_nod0_L1EM18VH",
+ "HLT_e24_lhmedium_nod0_iloose_L1EM18VH",
+ "HLT_e24_lhmedium_nodeta_L1EM18VH",
+ "HLT_e24_lhmedium_nodeta_iloose_L1EM18VH",
+ "HLT_e24_lhmedium_nodphires_L1EM18VH",
+ "HLT_e24_lhmedium_nodphires_iloose_L1EM18VH",
+ "HLT_e24_lhtight_cutd0dphideta_iloose",
+ "HLT_e24_lhtight_cutd0dphideta_iloose_L1EM20VH",
+ "HLT_e26_lhtight_cutd0dphideta_iloose",
+ "HLT_e60_lhmedium_cutd0dphideta",
+ ]
# Compare with default items
probeListAltSequence = [
- "HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH",
- "HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH",
- "HLT_e24_lhtight_iloose_HLTCalo",
- "HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH",
- "HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH",
- "HLT_e24_tight_iloose_HLTCalo_L1EM20VH",
- "HLT_e24_tight_iloose_L2EFCalo_L1EM20VH",
- "HLT_e26_lhtight_iloose_HLTCalo",
-]
+ "HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH",
+ "HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH",
+ "HLT_e24_lhtight_iloose_HLTCalo",
+ "HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH",
+ "HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH",
+ "HLT_e24_tight_iloose_HLTCalo_L1EM20VH",
+ "HLT_e24_tight_iloose_L2EFCalo_L1EM20VH",
+ "HLT_e26_lhtight_iloose_HLTCalo",
+ ]
#ProbeList 3 High pt triggers
#Should run with Zprime and / or WPrime samples
@@ -387,164 +387,164 @@ probeListAltSequence = [
# Etcut Trigger list
probeListHighPtSupportingTriggers = [
- "HLT_e100_etcut",
- "HLT_e120_etcut",
- "HLT_e40_etcut_L1EM15",
- "HLT_e60_etcut",
- "HLT_e80_etcut",
- "HLT_e50_etcut_L1EM15",
-]
+ "HLT_e100_etcut",
+ "HLT_e120_etcut",
+ "HLT_e40_etcut_L1EM15",
+ "HLT_e60_etcut",
+ "HLT_e80_etcut",
+ "HLT_e50_etcut_L1EM15",
+ ]
# The Primary Trigger List
probeListHighPtPhysicsTriggers = [
- "HLT_e120_lhloose",
- "HLT_e120_lhloose_HLTCalo",
- "HLT_e120_lhvloose",
- "HLT_e120_loose",
- "HLT_e120_loose1",
- "HLT_e120_vloose",
- "HLT_e140_lhloose",
- "HLT_e140_lhloose_HLTCalo",
- "HLT_e140_loose",
- "HLT_e40_lhvloose_L1EM15",
- "HLT_e40_vloose_L1EM15",
- "HLT_e50_lhvloose_L1EM15",
- "HLT_e50_vloose_L1EM15",
- "HLT_e60_lhloose",
- "HLT_e60_lhmedium",
- "HLT_e60_lhmedium_HLTCalo",
- "HLT_e60_lhmedium_cutd0dphideta",
- "HLT_e60_lhvloose",
- "HLT_e60_loose",
- "HLT_e60_medium",
- "HLT_e60_medium1",
- "HLT_e60_vloose",
- "HLT_e70_lhloose",
- "HLT_e70_lhvloose",
- "HLT_e70_loose",
- "HLT_e70_vloose",
- "HLT_e80_lhvloose",
- "HLT_e80_vloose",
-]
+ "HLT_e120_lhloose",
+ "HLT_e120_lhloose_HLTCalo",
+ "HLT_e120_lhvloose",
+ "HLT_e120_loose",
+ "HLT_e120_loose1",
+ "HLT_e120_vloose",
+ "HLT_e140_lhloose",
+ "HLT_e140_lhloose_HLTCalo",
+ "HLT_e140_loose",
+ "HLT_e40_lhvloose_L1EM15",
+ "HLT_e40_vloose_L1EM15",
+ "HLT_e50_lhvloose_L1EM15",
+ "HLT_e50_vloose_L1EM15",
+ "HLT_e60_lhloose",
+ "HLT_e60_lhmedium",
+ "HLT_e60_lhmedium_HLTCalo",
+ "HLT_e60_lhmedium_cutd0dphideta",
+ "HLT_e60_lhvloose",
+ "HLT_e60_loose",
+ "HLT_e60_medium",
+ "HLT_e60_medium1",
+ "HLT_e60_vloose",
+ "HLT_e70_lhloose",
+ "HLT_e70_lhvloose",
+ "HLT_e70_loose",
+ "HLT_e70_vloose",
+ "HLT_e80_lhvloose",
+ "HLT_e80_vloose",
+ ]
# ProbeList 4 Photon triggers
# EmulationTool,Perf
# Sample ggH125 and background dijet / JFXX
probeListPhotonTriggers = [
- "HLT_g0_hiptrt_L1EM18VH",
- "HLT_g0_hiptrt_L1EM20VH",
- "HLT_g0_hiptrt_L1EM20VHI",
- "HLT_g0_hiptrt_L1EM22VHI",
- "HLT_g0_perf_L1EM15",
- "HLT_g0_perf_L1EM3",
- "HLT_g100_loose",
- "HLT_g10_etcut",
- "HLT_g10_loose",
- "HLT_g10_medium",
- "HLT_g120_loose",
- "HLT_g120_loose1",
- "HLT_g120_loose_HLTCalo",
- "HLT_g140_loose",
- "HLT_g15_loose",
- "HLT_g15_loose_L1EM3",
- "HLT_g15_loose_L1EM7",
- "HLT_g200_etcut",
- "HLT_g20_etcut_L1EM12",
- "HLT_g20_loose",
- "HLT_g20_loose_L1EM12",
- "HLT_g20_loose_L1EM15",
- "HLT_g20_tight",
- "HLT_g25_loose",
- "HLT_g25_loose_L1EM15",
- "HLT_g25_medium",
- "HLT_g35_loose",
- "HLT_g35_loose_L1EM15",
- "HLT_g35_loose_L1EM15_g25_loose_L1EM15",
- "HLT_g35_loose_g25_loose",
- "HLT_g35_medium",
- "HLT_g3_etcut",
- "HLT_g3_etcut_L1EM3_EMPTY",
- "HLT_g40_loose_L1EM15",
- "HLT_g40_tight",
- "HLT_g45_loose_L1EM15",
- "HLT_g45_tight",
- "HLT_g50_loose",
- "HLT_g50_loose_L1EM15",
- "HLT_g60_loose",
- "HLT_g60_loose_L1EM15VH",
- "HLT_g70_loose",
- "HLT_g80_loose",
-]
+ "HLT_g0_hiptrt_L1EM18VH",
+ "HLT_g0_hiptrt_L1EM20VH",
+ "HLT_g0_hiptrt_L1EM20VHI",
+ "HLT_g0_hiptrt_L1EM22VHI",
+ "HLT_g0_perf_L1EM15",
+ "HLT_g0_perf_L1EM3",
+ "HLT_g100_loose",
+ "HLT_g10_etcut",
+ "HLT_g10_loose",
+ "HLT_g10_medium",
+ "HLT_g120_loose",
+ "HLT_g120_loose1",
+ "HLT_g120_loose_HLTCalo",
+ "HLT_g140_loose",
+ "HLT_g15_loose",
+ "HLT_g15_loose_L1EM3",
+ "HLT_g15_loose_L1EM7",
+ "HLT_g200_etcut",
+ "HLT_g20_etcut_L1EM12",
+ "HLT_g20_loose",
+ "HLT_g20_loose_L1EM12",
+ "HLT_g20_loose_L1EM15",
+ "HLT_g20_tight",
+ "HLT_g25_loose",
+ "HLT_g25_loose_L1EM15",
+ "HLT_g25_medium",
+ "HLT_g35_loose",
+ "HLT_g35_loose_L1EM15",
+ "HLT_g35_loose_L1EM15_g25_loose_L1EM15",
+ "HLT_g35_loose_g25_loose",
+ "HLT_g35_medium",
+ "HLT_g3_etcut",
+ "HLT_g3_etcut_L1EM3_EMPTY",
+ "HLT_g40_loose_L1EM15",
+ "HLT_g40_tight",
+ "HLT_g45_loose_L1EM15",
+ "HLT_g45_tight",
+ "HLT_g50_loose",
+ "HLT_g50_loose_L1EM15",
+ "HLT_g60_loose",
+ "HLT_g60_loose_L1EM15VH",
+ "HLT_g70_loose",
+ "HLT_g80_loose",
+ ]
defaultJpsi=[
- "HLT_e5_loose",
- "HLT_e5_lhloose",
- "HLT_e5_vloose",
- "HLT_e5_lhvloose",
-]
+ "HLT_e5_loose",
+ "HLT_e5_lhloose",
+ "HLT_e5_vloose",
+ "HLT_e5_lhvloose",
+ ]
# Lowest single electron triggers for TP analysis
monitoringTP_electron_extra =[
- 'HLT_e24_lhmedium_L1EM18VH',
- 'HLT_e24_lhmedium_nod0_L1EM18VH',
- 'HLT_e24_lhmedium_nod0_L1EM20VH',
- 'HLT_e24_medium_nod0_L1EM20VH',
- 'HLT_e24_lhmedium_iloose',
- 'HLT_e24_medium_iloose',
- 'HLT_e24_lhmedium_nod0_iloose',
- 'HLT_e24_lhtight_nod0_iloose',
- 'HLT_e24_lhmedium_nod0_ivarloose',
- 'HLT_e24_lhtight_nod0_ivarloose',
- 'HLT_e24_lhtight_iloose',
- 'HLT_e24_tight_iloose',
- 'HLT_e26_lhtight_iloose',
- 'HLT_e26_lhtight_nod0_iloose',
- 'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e24_lhmedium_nod0_ringer_L1EM20VH',
- 'HLT_e24_lhmedium_nod0_ringer_iloose',
- 'HLT_e24_lhtight_nod0_ringer_iloose',
- 'HLT_e24_lhmedium_nod0_ringer_ivarloose',
- 'HLT_e24_lhtight_nod0_ringer_ivarloose',
- 'HLT_e26_lhtight_nod0_ringer_iloose',
- 'HLT_e26_lhtight_nod0_ringer_ivarloose',
- 'HLT_e28_lhtight_nod0_iloose',
- 'HLT_e28_lhtight_nod0_ringer_iloose',
- 'HLT_e28_lhtight_nod0_ringer_ivarloose',
-]
+ 'HLT_e24_lhmedium_L1EM18VH',
+ 'HLT_e24_lhmedium_nod0_L1EM18VH',
+ 'HLT_e24_lhmedium_nod0_L1EM20VH',
+ 'HLT_e24_medium_nod0_L1EM20VH',
+ 'HLT_e24_lhmedium_iloose',
+ 'HLT_e24_medium_iloose',
+ 'HLT_e24_lhmedium_nod0_iloose',
+ 'HLT_e24_lhtight_nod0_iloose',
+ 'HLT_e24_lhmedium_nod0_ivarloose',
+ 'HLT_e24_lhtight_nod0_ivarloose',
+ 'HLT_e24_lhtight_iloose',
+ 'HLT_e24_tight_iloose',
+ 'HLT_e26_lhtight_iloose',
+ 'HLT_e26_lhtight_nod0_iloose',
+ 'HLT_e26_lhtight_nod0_ivarloose',
+ 'HLT_e24_lhmedium_nod0_ringer_L1EM20VH',
+ 'HLT_e24_lhmedium_nod0_ringer_iloose',
+ 'HLT_e24_lhtight_nod0_ringer_iloose',
+ 'HLT_e24_lhmedium_nod0_ringer_ivarloose',
+ 'HLT_e24_lhtight_nod0_ringer_ivarloose',
+ 'HLT_e26_lhtight_nod0_ringer_iloose',
+ 'HLT_e26_lhtight_nod0_ringer_ivarloose',
+ 'HLT_e28_lhtight_nod0_iloose',
+ 'HLT_e28_lhtight_nod0_ringer_iloose',
+ 'HLT_e28_lhtight_nod0_ringer_ivarloose',
+ ]
### Make supproting trigger list for the emulation e/g tool
supportingTriggerList = probeListLowMidPtSupportingTriggers+probeListHighPtSupportingTriggers
# Update the supporting list with very loose chains. This will be used in data collisin matches
for trig in probeListLowMidPtPhysicsTriggers+probeListHighPtPhysicsTriggers:
- if 'vloose' in trig: supportingTriggerList.append(trig)
+ if 'vloose' in trig: supportingTriggerList.append(trig)
supportingTriggerList.extend( [
- 'HLT_e24_lhvloose_nod0_L1EM20VH',
- 'HLT_e26_lhvloose_nod0_L1EM20VH',
- 'HLT_e28_lhvloose_nod0_L1EM20VH',
- 'HLT_e140_lhvloose_nod0',
- 'HLT_e10_lhvloose_nod0_L1EM7',
- 'HLT_e10_lhvloose_nod0_L1EM7',
- 'HLT_e15_lhvloose_nod0_L1EM7',
- 'HLT_e20_lhvloose_nod0_L1EM12',
- 'HLT_e25_lhvloose_nod0_L1EM15',
- 'HLT_e30_lhvloose_nod0_L1EM15',
- 'HLT_e40_lhvloose_nod0_L1EM15',
- 'HLT_e50_lhvloose_nod0_L1EM15',
- 'HLT_e70_lhvloose_nod0',
- 'HLT_e80_lhvloose_nod0',
- 'HLT_e100_lhvloose_nod0',
- 'HLT_e120_lhvloose_nod0',
- 'HLT_e5_lhvloose_nod0',
- 'HLT_e12_lhvloose_nod0_L1EM10VH',
- 'HLT_e17_lhvloose_nod0',
- 'HLT_e20_lhvloose_nod0',
- 'HLT_e40_lhvloose_nod0',
- 'HLT_e60_lhvloose_nod0',
-] )
+ 'HLT_e24_lhvloose_nod0_L1EM20VH',
+ 'HLT_e26_lhvloose_nod0_L1EM20VH',
+ 'HLT_e28_lhvloose_nod0_L1EM20VH',
+ 'HLT_e140_lhvloose_nod0',
+ 'HLT_e10_lhvloose_nod0_L1EM7',
+ 'HLT_e10_lhvloose_nod0_L1EM7',
+ 'HLT_e15_lhvloose_nod0_L1EM7',
+ 'HLT_e20_lhvloose_nod0_L1EM12',
+ 'HLT_e25_lhvloose_nod0_L1EM15',
+ 'HLT_e30_lhvloose_nod0_L1EM15',
+ 'HLT_e40_lhvloose_nod0_L1EM15',
+ 'HLT_e50_lhvloose_nod0_L1EM15',
+ 'HLT_e70_lhvloose_nod0',
+ 'HLT_e80_lhvloose_nod0',
+ 'HLT_e100_lhvloose_nod0',
+ 'HLT_e120_lhvloose_nod0',
+ 'HLT_e5_lhvloose_nod0',
+ 'HLT_e12_lhvloose_nod0_L1EM10VH',
+ 'HLT_e17_lhvloose_nod0',
+ 'HLT_e20_lhvloose_nod0',
+ 'HLT_e40_lhvloose_nod0',
+ 'HLT_e60_lhvloose_nod0',
+ ] )
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
deleted file mode 100755
index 763707849410d0aec5a9e25fd905a847ef097379..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Job options for standalone and Tier0 running of AnalysisTools
-# Authors:
-# Ryan Mackenzie White <ryan.white@cern.ch>
-#
-# Tool and algorithm configuration done using egamma Factories
-# Default configurations found in TrigEgammaAnalysisToolsConfig
-
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'" -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from AthenaCommon.AppMgr import ToolSvc
-
-import os
-
-#print 'Set some variables for job'
-dirtouse = str()
-
-finallist=[]
-
-if 'FILE' in dir() :
- finallist.append(FILE)
-elif 'DIR' in dir() :
- dirtouse=DIR
- while( dirtouse.endswith('/') ) :
- dirtouse= dirtouse.rstrip('/')
- listfiles=os.listdir(dirtouse)
- for ll in listfiles:
- finallist.append(dirtouse+'/'+ll)
-
-if 'NOV' in dir():
- nov=NOV
-else :
- nov=-1
-
-if 'RTT' in dir():
- rttfile='root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/rtt/prod/rtt/'+RTT+'/x86_64-slc6-gcc49-opt/offline/TrigEgammaValidation/RDOtoAOD_MC_transform_Zee_25ns_pileup/AOD.Zee.25ns.pileup.pool.root'
- finallist.append(rttfile)
-
-if 'GRL' in dir():
- grl=GRL
-
-
-athenaCommonFlags.FilesInput=finallist
-athenaCommonFlags.EvtMax=nov
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doMuonCombined=False
-rec.doWriteAOD=True
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(True) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(True) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-MessageSvc.debugLimit = 20000000
-MessageSvc.infoLimit = 20000000
-# TDT
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-ToolSvc.TrigDecisionTool.TrigDecisionKey='xTrigDecision'
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Use GRL selection
-if 'GRL' in dir():
- # Configure the goodrunslist selector tool
- from GoodRunsLists.GoodRunsListsConf import *
- ToolSvc += GoodRunsListSelectorTool()
- GoodRunsListSelectorTool.GoodRunsListVec = [grl]
- GoodRunsListSelectorTool.OutputLevel = DEBUG
- from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
- topSequence = AlgSequence()
- seq = AthSequencer("AthMasterSeq")
- from GoodRunsListsUser.GoodRunsListsUserConf import *
- seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
- seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good'] ## pick up correct name from inside xml file!
-
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-topSequence += AthenaMonManager( "HLTMonManager")
-HLTMonManager = topSequence.HLTMonManager
-
-################ Mon Tools #################
-#Global HLTMonTool
-
-from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
-HLTMon = HLTMonTool(name = 'HLTMon',
- histoPathBase = "HLT");
-
-#ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ HLTMon ];
-
-from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig
-HLTEgammaMon = TrigEgammaMonToolConfig.TrigEgammaMonTool()
-HLTMonManager.AthenaMonTools += [ HLTEgammaMon ]
-HLTMonManager.FileKey = "GLOBAL"
-
-
-
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
deleted file mode 100755
index cb574e9530c73aca90ff1cd1c5632b68f6860cfd..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
+++ /dev/null
@@ -1,200 +0,0 @@
-# Job options for standalone and Tier0 running of AnalysisTools
-# Authors:
-# Ryan Mackenzie White <ryan.white@cern.ch>
-#
-# Tool and algorithm configuration done using egamma Factories
-# Default configurations found in TrigEgammaAnalysisToolsConfig
-
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'" -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.ConditionsTag="CONDBR2-BLKPA-2014-00"
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from InDetRecExample.InDetJobProperties import InDetFlags
-InDetFlags.doSecVertexFinder.set_Value_and_Lock(False)
-from AthenaCommon.AppMgr import ToolSvc
-
-import os
-
-# Use the parser
-import argparse
-#print 'Setup parser'
-parser = argparse.ArgumentParser()
-#parser.add_argument("--file", action="store",help="input file name")
-#parser.add_argument("--dirname", action="store",help="input directory")
-#parser.add_argument("--nev",default=-1,action=store,type=int,help="number of events to process")
-#parser.add_argument("--output",default="Validation",action=store,help="output file name")
-#parser.add_argument("--t0",default=False,action=store_true,help="run T0 monitoring")
-#parser.add_argument("--tagTrigger",default="e26_lhtight_iloose",action=store,help="Tag trigger to TP")
-#parser.add_argument("--useMCMenu",default=False,action=store_true,help="Use MC menu to generate trigger list")
-#parser.add_argument("--usePhysicsMenu",default=False,action=store_true,help="Use MC menu to generate trigger list")
-
-#print 'Set some variables for job'
-dirtouse = str()
-
-finallist=[]
-#print 'Now parser'
-#args = parser.parse_args()
-#print 'Now setup filelist'
-#finallist.append(args.file)
-#print 'Or set the directory'
-#dirtouse=args.dirname
-#nov=args.nev
-#while( dirtouse.endswith('/') ) :
-# dirtouse= dirtouse.rstrip('/')
-# listfiles=os.listdir(dirtouse)
-# for ll in listfiles:
-# finallist.append(dirtouse+'/'+ll)
-#outputName = args.output
-#tagItem = args.Tagtrigger
-
-if 'FILE' in dir() :
- finallist.append(FILE)
-elif 'DIR' in dir() :
- dirtouse=DIR
- while( dirtouse.endswith('/') ) :
- dirtouse= dirtouse.rstrip('/')
- listfiles=os.listdir(dirtouse)
- for ll in listfiles:
- finallist.append(dirtouse+'/'+ll)
-
-if 'NOV' in dir():
- nov=NOV
-else :
- nov=-1
-
-if 'OUTPUT' in dir():
- outputName = OUTPUT
-elif 'DOTIER0' in dir():
- outputName = ''
-else:
- outputName = 'Validation'
-
-if('TAG' in dir()):
- tagItem = TAG
-else:
- tagItem = 'e26_tight_iloose'
-
-
-athenaCommonFlags.FilesInput=finallist
-athenaCommonFlags.EvtMax=nov
-#athenaCommonFlags.EvtMax=-1
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doMuonCombined=False
-rec.doWriteAOD=False
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-
-
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(False) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(False) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-
-# TDT
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-ToolSvc.TrigDecisionTool.TrigDecisionKey='xTrigDecision'
-
-# Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool()
-GoodRunsListSelectorTool.GoodRunsListVec = ['data15_13TeV.periodAllYear_DetStatus-v63-pro18-01_DQDefects-00-01-02_PHYS_StandardGRL_All_Good.xml']
-GoodRunsListSelectorTool.OutputLevel = DEBUG
-# Set base path for monitoring/validation tools
-basePath = '/HLT/Egamma/'
-
-if 'DOTIER0' in dir():
- from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
- topSequence = AlgSequence()
- seq = AthSequencer("AthMasterSeq")
- from GoodRunsListsUser.GoodRunsListsUserConf import *
- seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
- seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good'] ## pick up correct name from inside xml file!
-
- from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
- topSequence += AthenaMonManager( "HLTMonManager")
- HLTMonManager = topSequence.HLTMonManager
-
- ################ Mon Tools #################
-
- #Global HLTMonTool
-
- from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
- HLTMon = HLTMonTool(name = 'HLTMon',
- histoPathBase = "HLT");
-
-
- #ToolSvc += HLTMon;
- HLTMonManager.AthenaMonTools += [ HLTMon ];
-
- from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig
- TrigEgammaMonTool = TrigEgammaMonToolConfig.TrigEgammaMonTool()
- HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
- HLTMonManager.FileKey = "GLOBAL"
-
-elif 'DO50ns' in dir():
- from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
- topSequence = AlgSequence()
- seq = AthSequencer("AthMasterSeq")
- from GoodRunsListsUser.GoodRunsListsUserConf import *
- seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
- seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good'] ## pick up correct name from inside xml file!
-
- from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
- topSequence += AthenaMonManager( "HLTMonManager")
- HLTMonManager = topSequence.HLTMonManager
-
- ################ Mon Tools #################
-
- #Global HLTMonTool
-
- from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
- HLTMon = HLTMonTool(name = 'HLTMon',
- histoPathBase = "HLT");
-
-
- #ToolSvc += HLTMon;
- HLTMonManager.AthenaMonTools += [ HLTMon ];
-
- from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig50ns
- TrigEgammaMonTool = TrigEgammaMonToolConfig50ns.TrigEgammaMonTool()
- HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
- HLTMonManager.FileKey = "GLOBAL"
-elif 'DOPHYSVAL' in dir():
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
-
- from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
- monMan= AthenaMonManager( "PhysValMonManager")
- monMan.FileKey = "PhysVal"
- topSequence += monMan
-
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
- ServiceMgr.THistSvc.Output += ["PhysVal DATAFILE='PhysVal.root' OPT='RECREATE'"]
- from TrigEgammaAnalysisTools import TrigEgammaPhysValMonToolConfig
- TrigEgammaPhysValMonToolConfig.TrigEgammaPhysValMonTool()
- monMan.AthenaMonTools += [ "TrigEgammaPhysValMonTool" ]
-else:
- print "No job configured, options DOPHYSVAL=True or DOTIER0=True"
-
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools_emulator.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools_emulator.py
deleted file mode 100644
index d935bbb645d21ee20a9cba0f024667550a5fbdc8..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools_emulator.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-####################################################################################################
-# Job options for standalone and Tier0 running of AnalysisTools
-# Authors:
-# Ryan Mackenzie White <ryan.white@cern.ch>
-# Joao Victor Pinto <jodafons@cern.ch>
-#
-# Tool and algorithm configuration done using egamma Factories
-#
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/\
-# valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'"
-# -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-####################################################################################################
-
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from AthenaCommon.AppMgr import ToolSvc
-import os
-
-# Define triggers for tagging
-tagList = ['HLT_e24_lhtight_nod0_ivarloose',
- 'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e28_lhtight_nod0_ivarloose']
-
-triggerList_commissioning_v1 = [
-
- # standard monitoring chains
- #'HLT_e17_lhvloose_nod0_L1EM15VHI',
- 'HLT_e17_lhvloose_nod0',
- 'HLT_e26_lhloose_nod0',
- 'HLT_e26_lhmedium_nod0',
- #'HLT_e26_lhtight_nod0',
- #'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e28_lhtight_nod0_ivarloose',
- 'HLT_e60_lhmedium_nod0_L1EM24VHI',
- 'HLT_e140_lhloose_nod0_L1EM24VHI',
- # ringer chains for the commissioning...
- #'HLT_e17_lhvloose_nod0_ringer_L1EM15VHI',
- 'HLT_e17_lhvloose_nod0_ringer',
- 'HLT_e26_lhloose_nod0_ringer',
- 'HLT_e26_lhmedium_nod0_ringer',
- #'HLT_e26_lhtight_nod0_ringer',
- #'HLT_e26_lhtight_nod0_ringer_ivarloose',
- 'HLT_e28_lhtight_nod0_ringer_ivarloose',
- 'HLT_e60_lhmedium_nod0_ringer_L1EM24VHI',
- 'HLT_e140_lhloose_nod0_ringer_L1EM24VHI',
- ]
-
-
-triggerList_monitoring_v1 = [
- # standard monitoring chains
- 'HLT_e17_lhvloose_nod0_L1EM15VHI',
- 'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e28_lhtight_nod0_icaloloose',
- 'HLT_e60_lhmedium_nod0_L1EM24VHI',
- 'HLT_e140_lhloose_nod0_L1EM24VHI',
- # no ringer chains for pos-commissioning...
- 'HLT_e17_lhvloose_nod0_noringer_L1EM15VHI',
- 'HLT_e26_lhtight_nod0_noringer_ivarloose',
- 'HLT_e28_lhtight_nod0_noringer_ivarloose',
- 'HLT_e60_lhmedium_nod0_noringer_L1EM24VHI',
- 'HLT_e140_lhloose_nod0_noringer_L1EM24VHI',
-
- ]
-
-
-triggerList = triggerList_monitoring_v1
-
-doGRL=False
-doEmulation=True
-DetailedHistograms=False
-####################################################################################################
-dirtouse = str()
-finallist=[]
-grllist=[]
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
-from glob import glob
-
-if ('FILE' in dir()):
- acf.FilesInput=[FILE]
-elif ('DIR' in dir()):
- inputFiles = glob(DIR+'*')
- acf.FilesInput=inputFiles
-if 'NOV' in dir():
- nov=NOV
-else :
- nov=500
-if 'GRL' in dir():
- grllist.append(GRL)
-else:
- #grllist.append('/afs/cern.ch/work/j/jodafons/public/data/data15_13TeV.periodAllYear_DetStatus-v79-repro20-02_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
- #grllist.append('data15_13TeV.periodAllYear_DetStatus-v79-repro20-02_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
- #grllist.append('/afs/cern.ch/work/j/jodafons/public/data/data16_13TeV.periodAllYear_DetStatus-v81-pro20-10_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
- #grllist.append('data16_13TeV.periodAllYear_DetStatus-v81-pro20-10_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
- grllist.append('data17_13TeV.periodAllYear_DetStatus-v92-pro21-05_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml')
-
-####################################################################################################
-
-acf.EvtMax=nov
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger=True
-recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doMuonCombined=False
-rec.doWriteAOD=True
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(True) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(False) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-MessageSvc.debugLimit = 20000000
-MessageSvc.infoLimit = 20000000
-
-# Add Trigger Decision Tool
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-tdt = Trig__TrigDecisionTool( "TrigDecisionTool" )
-tdt.TrigDecisionKey='xTrigDecision'
-tdt.Navigation.ReadonlyHolders=True
-ToolSvc+=tdt
-
-try:
- include ("AthenaMonitoring/DataQualityInit_jobOptions.py")
-except Exception:
- treatException("Could not load AthenaMonitoring/DataQualityInit_jobOptions.py")
-
-
-
-
-# Call top sequence
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-topSequence = AlgSequence()
-
-
-##################################### GRL Tools ##########################################
-# Good Run List (GRL)
-if doGRL:
- from PyUtils.MetaReaderPeeker import metadata
- try:
- if metadata['eventTypes'][0] == 'IS_DATA':
- from GoodRunsLists.GoodRunsListsConf import *
- ToolSvc += GoodRunsListSelectorTool()
- GoodRunsListSelectorTool.GoodRunsListVec = grllist
- from GoodRunsListsUser.GoodRunsListsUserConf import *
- seq = AthSequencer("AthFilterSeq")
- seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
- #seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good_25ns']
- seq.GRLTriggerAlg1.GoodRunsListArray = [grllist[0].replace('.xml','')]
- except:
- print("GRL not available!")
-
-##################################### Mon Tools ##########################################
-
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-topSequence += AthenaMonManager( "HLTMonManager")
-HLTMonManager = topSequence.HLTMonManager
-################ Mon Tools #################
-#Global HLTMonTool
-from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
-HLTMon = HLTMonTool(name = 'HLTMon', histoPathBase = "HLT");
-ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
-
-####################################################################################################
-#Define the base path for all histograms
-
-
-
-basePath = '/HLT/Egamma'
-#Configure the TrigEgammaPlotTool
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavTPAnalysisTool, TrigEgammaPlotTool, EfficiencyTool, DistTool, ResolutionTool
-from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoring_mam, monitoring_electron, monitoring_photon
-from TrigEgammaAnalysisTools.TrigEgammaProbelist import probeListLowMidPtSupportingTriggers, probeListHighPtSupportingTriggers
-
-PlotTool = TrigEgammaPlotTool.copy( name="TrigEgammaPlotTool",
- DirectoryPath=basePath,
- MaM=monitoring_mam,
- Efficiency=[],
- Distribution=[],
- Resolution=[])
-
-EffTool = EfficiencyTool.copy(name="EfficiencyTool",
- PlotTool=PlotTool,
- isEMResultNames=["Tight","Medium","Loose"],
- LHResultNames=["LHTight","LHMedium","LHLoose"],
- OutputLevel=0)
-
-
-
-####################################################################################################
-from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationTool
-from TrigEgammaEmulationTool.TrigEgammaEmulationEFConfig import EgammaEFElectronDefaultEmulator,EgammaEFElectronNoD0Emulator
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-# Force this emulation selector path
-TriggerFlags.EgammaSlice.pidVersion.set_Value_and_Lock("ElectronPhotonSelectorTools/trigger/rel21_20170217/")
-TriggerFlags.EgammaSlice.ringerVersion.set_Value_and_Lock("RingerSelectorTools/TrigL2_20170505_v6")
-
-EmulationElectronTool = TrigEgammaEmulationTool.copy( name="TrigEgammaEmulationTool",
- TriggerList = triggerList,
- DoL2ElectronFex=True,
- DoEFCaloPid=False,
- DoRinger=True,
- OutputLevel=0)
-
-####################################################################################################
-
-AnalysisTool = TrigEgammaNavTPAnalysisTool( name = "TrigEgammaNavTPAnalysisTool",
- Analysis='Zee',
- PlotTool=PlotTool,
- Tools=[EffTool],
- OfflineTagSelector='Tight', # 1=tight, 2=medium, 3=loose
- OfflineProbeSelector='Loose',
- DefaultProbePid='LHMedium',
- doEmulation=doEmulation,
- DetailedHistograms=DetailedHistograms,
- EmulationTool=EmulationElectronTool,
- TPTrigger=False,
- RemoveCrack=False,
- TagTriggerList=tagList,
- TriggerList=triggerList,
- OutputLevel=0)
-
-####################################################################################################
-Tools=['TrigEgammaNavTPAnalysisTool/TrigEgammaNavTPAnalysisTool']
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
-TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon", histoPathBase=basePath, Tools=Tools)
-ToolSvc += TrigEgammaMonTool
-HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool/HLTEgammaMon" ]
-HLTMonManager.FileKey = "GLOBAL"
-ToolSvc.TrigDecisionTool.Navigation.OutputLevel = WARNING
-####################################################################################################
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaEventSelectionTool.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaEventSelectionTool.py
deleted file mode 100644
index ba72df178c83f6d1e99bf66c96169841bb2868a5..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaEventSelectionTool.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-# Job options for standalone and Tier0 running of AnalysisTools
-# Authors:
-# Ryan Mackenzie White <ryan.white@cern.ch>
-#
-# Tool and algorithm configuration done using egamma Factories
-# Default configurations found in TrigEgammaAnalysisToolsConfig
-#
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'"
-# -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from AthenaCommon.AppMgr import ToolSvc
-import os
-
-doZ=True
-doFakes=True
-
-# Define triggers for tagging
-triggerTags = ['HLT_e24_lhtight_nod0_ivarloose',
- 'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e28_lhtight_nod0_ivarloose']
-
-triggerList = [
- # standard monitoring chains
- 'HLT_e26_lhtight_nod0_ivarloose',
- 'HLT_e28_lhtight_nod0_ivarloose',
- 'HLT_e60_lhmedium_nod0_L1EM24VHI',
- # no ringer chains for pos-commissioning...
- 'HLT_e26_lhtight_nod0_noringer_ivarloose_L1EM22VHI',
- 'HLT_e28_lhtight_nod0_noringer_ivarloose', # get real TDT
- 'HLT_e28_lhtight_nod0_noringer_ivarloose_L1EM24VHI',
- 'HLT_e60_lhmedium_nod0_noringer_L1EM24VHI',
- ]
-
-
-
-#print 'Set some variables for job'
-dirtouse = str()
-finallist=[]
-
-if 'FILE' in dir() :
- finallist.append(FILE)
-
-if 'DIR' in dir() :
- dirtouse=DIR
- print 'DIR = ',dirtouse
- while( dirtouse.endswith('/') ) :
- dirtouse= dirtouse.rstrip('/')
- listfiles=os.listdir(dirtouse)
- for ll in listfiles:
- finallist.append(dirtouse+'/'+ll)
-
-if 'NOV' in dir():
- nov=NOV
-else :
- nov=-1
-
-
-print finallist
-athenaCommonFlags.FilesInput=finallist
-athenaCommonFlags.EvtMax=nov
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doAOD=False
-rec.doMuonCombined=False
-rec.doWriteAOD=False
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(True) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(False) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-MessageSvc.debugLimit = 20000000
-MessageSvc.infoLimit = 20000000
-# TDT
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-tdt = Trig__TrigDecisionTool( "TrigDecisionTool" )
-tdt.TrigDecisionKey='xTrigDecision'
-tdt.Navigation.ReadonlyHolders=True
-ToolSvc+=tdt
-
-try:
- include ("AthenaMonitoring/DataQualityInit_jobOptions.py")
-except Exception:
- treatException("Could not load AthenaMonitoring/DataQualityInit_jobOptions.py")
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-topSequence += AthenaMonManager( "HLTMonManager")
-HLTMonManager = topSequence.HLTMonManager
-
-################ Mon Tools #################
-#Global HLTMonTool
-
-from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
-HLTMon = HLTMonTool(name = 'HLTMon', histoPathBase = "HLT");
-
-ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
-
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaPlotTool, getEventSelectionTool
-#Define the base path for all histograms
-basePath = '/HLT/Physval'
-
-#Configure the TrigEgammaPlotTool
-PlotTool = TrigEgammaPlotTool.copy( name="TrigEgammaPlotTool",
- DirectoryPath=basePath,
- #MaM=monitoring_mam,
- Efficiency=[],
- Distribution=[],
- Resolution=[])
-
-TrigEgammaEventSelection = getEventSelectionTool()
-
-####################################################################################################
-
-from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationTool
-from TrigEgammaEmulationTool.TrigEgammaEmulationEFConfig import EgammaEFElectronDefaultEmulator,EgammaEFElectronNoD0Emulator
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-# Force this emulation selector path
-TriggerFlags.EgammaSlice.pidVersion.set_Value_and_Lock("ElectronPhotonSelectorTools/trigger/rel21_20170217/")
-TriggerFlags.EgammaSlice.ringerVersion.set_Value_and_Lock("RingerSelectorTools/TrigL2_20170505_v6")
-
-EmulationElectronTool = TrigEgammaEmulationTool.copy( name="TrigEgammaEmulationTool",
- TriggerList = triggerList,
- DoL2ElectronFex=True,
- DoEFCaloPid=False,
- DoRinger=True,
- OutputLevel=0)
-
-####################################################################################################
-
-
-Tool = TrigEgammaEventSelection( name='EventSelection',
- Analysis='Probes',
- PlotTool=PlotTool,
- EmulationTool=EmulationElectronTool,
- File="",
- OutputLevel=0,
- DetailedHistograms=False,
- isEMResultNames=["Tight","Medium","Loose"],
- LHResultNames=["LHTight","LHMedium","LHLoose"],
- ZeeLowerMass=80,
- ZeeUpperMass=100,
- OfflineTagSelector='Tight', # 1=tight, 2=medium, 3=loose
- OfflineProbeSelector='Loose',
- ForceProbePid=False,
- OppositeCharge=True,
- OfflineTagMinEt=25,
- TagTriggerList=triggerTags,
- SelectionZ=doZ,
- SelectionFakes=doFakes,
- ApplyMinimalTrigger=False,
- DetailedDataLevel=2,
- DumpTags=False,
- TriggerList=triggerList)
-
-Tools=['TrigEgammaEventSelection/EventSelection']
-
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
-TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon",
- histoPathBase=basePath,
- Tools=Tools)
-
-ToolSvc += TrigEgammaMonTool
-
-#TrigEgammaMonToolConfig.TrigEgammaMonTool()
-HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool/HLTEgammaMon" ]
-HLTMonManager.FileKey = "GLOBAL"
-
-
-
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
index 920650f2d464b052a6ed8d8dc8b181450f28fce6..deae3973b76bd8181dc2f076692ffdb31009eaaa 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
@@ -5,6 +5,7 @@ testChains = {
// "Electrons",
// "Truth",
+#ifndef VTXANALYSIS
"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonForEF",
@@ -18,27 +19,25 @@ testChains = {
"HLT_mu28_ivarmedium_L1MU20:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
"HLT_mu28_ivarmedium_L1MU20:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
- "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF",
- "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig",
- "HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_FTF",
+ "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF:HLT_Roi_FastElectron",
+ "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig",
+ "HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_FTF:HLT_Roi_FastElectron",
"HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_IDTrig",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF:HLT_Roi_TauCore",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_FTF",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_FTF:HLT_TAURoI",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig:HLT_TAURoI",
+ "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig:HLT_Roi_TauIso",
"HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF",
"HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig",
+
+ "HLT_mb_sptrk_L1RD0_FILLED:HLT_IDTrack_MinBias_FTF",
+
+#endif
"HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS:post:rvtx=HLT_IDVertex_FS",
"HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS:post:rvtx=HLT_IDVertex_FS",
"HLT_j45_ftf_L1J15:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS:post:rvtx=HLT_IDVertex_FS",
- "HLT_mb_sptrk_L1RD0_FILLED:HLT_IDTrack_MinBias_FTF",
};
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-larged0-el.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-larged0-el.dat
new file mode 100755
index 0000000000000000000000000000000000000000..c74433b5c08980a663c418c0bab39f8637d81fb6
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-larged0-el.dat
@@ -0,0 +1,27 @@
+// emacs: this is -*- c++ -*-
+
+#define LARGED0_EL
+
+#include "TIDAdata_cuts.dat"
+
+refChain = "Truth";
+//refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+
+MinVertices = 0;
+
+
+#include "TIDAdata-chains-run3.dat"
+
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"./"}
+
+
+#include "TIDAbeam.dat"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-larged0.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-larged0.dat
new file mode 100755
index 0000000000000000000000000000000000000000..73a3c6bf8fa135dd7dc87ce5d52bd56bcbcdff74
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-larged0.dat
@@ -0,0 +1,27 @@
+// emacs: this is -*- c++ -*-
+
+#define LARGED0
+
+#include "TIDAdata_cuts.dat"
+
+refChain = "Truth";
+//refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+
+MinVertices = 0;
+
+
+#include "TIDAdata-chains-run3.dat"
+
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"./"}
+
+
+#include "TIDAbeam.dat"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-larged0-el.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-larged0-el.dat
new file mode 100755
index 0000000000000000000000000000000000000000..a9ea6505453b11af60d1ad24e42d0aa4aa3fc948
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-larged0-el.dat
@@ -0,0 +1,27 @@
+// emacs: this is -*- c++ -*-
+
+#define LARGED0_EL
+
+#include "TIDAdata_cuts-offline.dat"
+
+//refChain = "Truth";
+refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+
+MinVertices = 0;
+
+
+#include "TIDAdata-chains-run3.dat"
+
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"./"}
+
+
+#include "TIDAbeam.dat"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-larged0.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-larged0.dat
new file mode 100755
index 0000000000000000000000000000000000000000..2669ca8c7e8b67316f6d30e52e68a7dcfc999555
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-larged0.dat
@@ -0,0 +1,27 @@
+// emacs: this is -*- c++ -*-
+
+#define LARGED0
+
+#include "TIDAdata_cuts-offline.dat"
+
+//refChain = "Truth";
+refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+
+MinVertices = 0;
+
+
+#include "TIDAdata-chains-run3.dat"
+
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"./"}
+
+
+#include "TIDAbeam.dat"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-vtx.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-vtx.dat
index d644001651d9d37a0dd5e65e9f776687d1e346cc..43364ed2fca95918882eb0485fc067388ab3d07b 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-vtx.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-vtx.dat
@@ -15,6 +15,8 @@ refChain = "Offline";
//refChain = "Taus";
+#define VTXANALYSIS
+
MinVertices = 0;
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Parser.cxx b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Parser.cxx
index e0e1fc74dbbc6b7a6b276aa8d2b03741e8eb276b..cda4d7cd6befc5a59d00009ff4800abe36111806 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Parser.cxx
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/Parser.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// vim: ts=2 sw=2
@@ -158,7 +158,7 @@ int Parser::get_pass_number(const std::string & item_name)
return m_nonTOPO_items[item_name];
else
MY_MSG_WARNING(item_name << " is not in the map of items");
- return -1;
+ return -1;
}
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt
deleted file mode 100644
index bbecfb58a95c808f466e7a349123df2aadcbb68f..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TrigConfDBConnection )
-
-# External dependencies:
-find_package( Frontier_Client )
-find_package( Python COMPONENTS Development )
-find_package( Boost COMPONENTS filesystem thread system
- OPTIONAL_COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR} )
-
-# Component(s) in the package:
-atlas_add_library( TrigConfDBConnection
- src/*.cxx
- PUBLIC_HEADERS TrigConfDBConnection
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${FRONTIER_CLIENT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${FRONTIER_CLIENT_LIBRARIES} ${Python_LIBRARIES} )
-
-atlas_add_library( TrigConfDBFrontier
- src/*.cxx
- PUBLIC_HEADERS TrigConfDBConnection
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${FRONTIER_CLIENT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${FRONTIER_CLIENT_LIBRARIES} ${Python_LIBRARIES} )
-
-
-atlas_add_executable( TriggerFrontierClientTest
- src/exe/TriggerFrontierClientTest.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${FRONTIER_CLIENT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${FRONTIER_CLIENT_LIBRARIES} ${Python_LIBRARIES} TrigConfDBConnection )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/TrigConfDBConnection/HelloWorld.h b/Trigger/TrigConfiguration/TrigConfDBConnection/TrigConfDBConnection/HelloWorld.h
deleted file mode 100644
index 4e035cbc1b8a1cfa24d8e0f59e1e9233cf9b71f6..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/TrigConfDBConnection/HelloWorld.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HelloWorld_h
-#define HelloWorld_h
-
-#include <string>
-
-class HelloWorld {
-public:
- HelloWorld();
- HelloWorld(const std::string& s);
- virtual ~HelloWorld();
-
- void greetings();
- void setGreetings(const std::string& s);
- void setStrPtr(const std::string* p);
-
-private:
-
- std::string m_message;
-
-};
-
-#endif
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/python/frontier_client.py b/Trigger/TrigConfiguration/TrigConfDBConnection/python/frontier_client.py
deleted file mode 100755
index deab009a818491e31e5a36a43c5ca76fb939f60b..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/python/frontier_client.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from libTrigConfDBFrontier import Session as _Session
-from libTrigConfDBFrontier import AnyData as __AnyData
-
-import libTrigConfDBFrontier as libF
-import sys
-
-class AnyData(__AnyData):
- def __str__(self):
- return "%s %s" % (self.type(), self.getString() )
-
-
-class Session:
-
- def __getattr__(self,name):
- # forward all calls to self.__session
- if name in dir(self.__session):
- return getattr(self.__session,name)
- raise AttributeError("Session instance does not attribute %s" % name)
-
- def __init__(self, conn):
- self.__fieldNames = []
- self.__fieldTypeStr = []
- self.__fieldType = []
- self.__numberOfFields = 0
- self.__records = []
- self.__session = _Session(conn)
-
- def getData(self, requests):
- self.__session.getData(requests)
- self.__getHeader()
- self.__getAllFields()
-
-
- def getHeader(self):
- return (self.__fieldNames,self.__fieldTypeStr)
-
-
- def getRecords(self):
- return self.__records
-
-
- def getRecords2(self):
- return ( self.__mapRecord(record) for record in self.__records )
-
-
- def __mapRecord(self,record):
- return tuple( [ t(r) for (r,t) in zip(record,self.__fieldType) ] )
-
-
-
- def printHeader(self):
- for i, (fname, ftype) in enumerate(zip(self.__fieldNames,self.__fieldTypeStr)):
- print("%2i : %-20s %-10s" % (i+1, fname, ftype))
-
-
- def printRecords(self):
- for i,record in enumerate(self.getRecords()):
- print("record %4i : %r" % (i+1, record))
-
-
- def printRecords2(self):
- for i,record in enumerate(self.getRecords2()):
- print("record %4i : %r" % (i+1, record))
-
-
- def getNumberOfFields(self):
- return self.__numberOfFields
-
-
- def __getHeader(self):
- self.__fieldNames = []
- self.__fieldTypeStr = []
- self.__fieldType = []
- self.__numberOfFields = 0
- # jump to start
- self.__session.setCurrentLoad(1)
- # read first field and move
- self.__session.next()
- # and then the rest
- while not self.isEOR():
- self.__fieldNames += [self.__session.assignString()]
- self.__fieldTypeStr += [self.__session.assignString()]
- if self.__fieldTypeStr[-1].startswith("NUMBER"):
- if ",0" in self.__fieldTypeStr[-1]:
- self.__fieldType += [int]
- else:
- self.__fieldType += [float]
- elif self.__fieldTypeStr[-1].startswith("VARCHAR"):
- self.__fieldType += [str]
- else:
- self.__fieldType += [str]
- self.__numberOfFields += 1
-
-
- def __getAllFields(self):
- self.__records = []
-
- ad = AnyData()
- while self.next():
- record = tuple()
- for k in range(self.__numberOfFields):
- self.getAnyData(ad)
- if ad.type()==libF.BLOB_TYPE_INT4: record += (ad.getInt(),)
- elif ad.type()==libF.BLOB_TYPE_INT8: record += (ad.getLongLong(),)
- elif ad.type()==libF.BLOB_TYPE_FLOAT: record += (ad.getFloat(),)
- elif ad.type()==libF.BLOB_TYPE_DOUBLE: record += (ad.getDouble(),)
- elif ad.type()==libF.BLOB_TYPE_TIME: record += (ad.getLongLong(),)
- elif ad.type()==libF.BLOB_TYPE_ARRAY_BYTE:
- if not ad.getRawStrP(): record += ('NULL',)
- elif (ad.getRawStrS() == 0): record += ('',)
- else: record += ('%s' % libF.str_escape_quota(ad.getString()),)
- else:
- print("Error: unknown typeId %d" % ad.type())
- sys.exit(1)
- ad.clean()
-
- self.__records += [record]
- ad.clean()
-
- if not self.isEOF():
- print("Error: must be EOF here")
- sys.exit(1)
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/src/Bindings.cxx b/Trigger/TrigConfiguration/TrigConfDBConnection/src/Bindings.cxx
deleted file mode 100644
index 8be99d2cec61d9eac86371eebfee4a6bb26f5625..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/src/Bindings.cxx
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include <boost/python.hpp>
-
-#include "frontier_client/frontier-cpp.h"
-#include <iostream>
-
-namespace {
- std::string escape_list="\\\'";
- std::string
- str_escape_quota(const std::string& str_orig) {
- std::string str(str_orig);
- std::string::size_type pos = 0;
- for(;;) {
- pos=str.find_first_of(escape_list,pos);
- if(pos==str.npos) break;
- str.insert(pos,1,'\\');
- pos+=2;
- }
- return str;
- }
-}
-
-
-void getData(frontier::Session& s, const boost::python::list& l) {
- typedef std::vector<const frontier::Request*> RequestList;
- typedef std::vector<const frontier::Request*> RequestValueTypoe;
-
- RequestList cl;
-
- PyObject *obj_ptr = l.ptr();
- boost::python::handle<> obj_iter(PyObject_GetIter(obj_ptr));
- for(std::size_t i=0;;i++) {
- boost::python::handle<>
- py_elem_hdl(boost::python::allow_null(PyIter_Next(obj_iter.get())));
-
- if (PyErr_Occurred()) boost::python::throw_error_already_set();
- if (!py_elem_hdl.get()) break; // end of iteration
-
- boost::python::object py_elem_obj(py_elem_hdl);
- boost::python::extract<const frontier::Request*> elem_proxy(py_elem_obj);
-
- bool success = elem_proxy.check();
- if (success) {
- cl.push_back(elem_proxy());
- } else if (i == 0) {
- break;
- } else {
- PyErr_SetString(PyExc_TypeError, "All items must be of same type.");
- boost::python::throw_error_already_set();
- }
- }
- s.getData(cl);
-}
-
-// // Determine if obj_ptr can be converted in a QString
-// static void* convertible(PyObject* obj_ptr)
-// {
-// if (!PyString_Check(obj_ptr)) return 0;
-// return obj_ptr;
-// }
-
-
-PyObject*
-assignString(frontier::Session& s) {
- std::string fieldvalue;
- s.assignString(&fieldvalue);
- return PyUnicode_FromString(fieldvalue.c_str());
-}
-
-
-frontier::AnyData anydata;
-
-boost::python::object class_anydata;
-
-// frontier::AnyData
-// getAnyData1(frontier::Session& s, int not_eor) {
-// s.getAnyData(&anydata, not_eor);
-// return anydata;
-// }
-
-// frontier::AnyData
-// getAnyData11(frontier::Session& s) { return getAnyData1(s,1); }
-
-int
-getAnyData2(frontier::Session & s, frontier::AnyData & anydata, int not_eor) {
- return s.getAnyData(&anydata, not_eor);
-}
-
-int
-getAnyData21(frontier::Session & s, frontier::AnyData & anydata) { return getAnyData2(s, anydata, 1); }
-
-
-PyObject*
-getString(frontier::AnyData& data) {
- std::string* str = data.getString();
- if(str==0) return 0;
- return PyUnicode_FromString(data.getString()->c_str());
-}
-
-
-enum BLOB_TYPE {
- BLOB_TYPE_BYTE = 0,
- BLOB_TYPE_INT4 = 1,
- BLOB_TYPE_INT8 = 2,
- BLOB_TYPE_FLOAT = 3,
- BLOB_TYPE_DOUBLE = 4,
- BLOB_TYPE_TIME = 5,
- BLOB_TYPE_ARRAY_BYTE = 6,
- BLOB_TYPE_EOR = 7,
- BLOB_TYPE_NONE = (1<<7),
- BLOB_BIT_NULL = (1<<7)
-};
-
-
-BOOST_PYTHON_MODULE(libTrigConfDBFrontier)
-{
- using namespace boost::python;
-
- /***
- * function frontier::init
- ***/
- int (*init1)() = &frontier::init;
- int (*init2)(const std::string&, const std::string&) = &frontier::init;
-
- def("init", init1, "Initializes frontier client.");
- def("init", init2,
- "Initializes frontier client. \nloglevel can can be 'nolog', 'error', 'info' or 'warning' (which are equivalent), or anything else (treated as 'debug')",
- args("logfilename", "loglevel"));
- def("str_escape_quota", str_escape_quota, "add \\ before any \\\'", args("string"));
- def("getFieldTypeName", frontier::getFieldTypeName, "returns string representation of field type", args("BLOB_TYPE"));
-
-
- /***
- * class frontier::Connection
- ***/
- class_<frontier::Connection>("Connection", init<const std::string&, const std::string*>("Connection with server url and proxy url", args("self","serverurl","proxyurl")) )
- .def(init<const std::string&>("Connection with server url.", args("self","serverurl")))
- .def(init<const std::list<std::string>&, const std::list<std::string>&>("Connection with list of server urls and list of proxy urls",args("self","serverurl","proxyurl")))
- .def("setReload", &frontier::Connection::setReload)
- .def("setDefaultParams", &frontier::Connection::setDefaultParams)
- ;
-
-
- /***
- * To do the list wrapping we have two choices:
- * * wrap them with class_<> ourself or
- * * write to_python_converter() and some wrappers to extract<data> from python.
- * Our goal is to get to the working prototype as soon as we can. So in simplistic (a) approach
- * A full flexed wrapper is long and expensive, e.g. http://cci.lbl.gov/cctbx_sources/scitbx/array_family/boost_python/flex_wrapper.h
- ***/
-
-
- /***
- * class frontier::Session
- ***/
-
- //BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getAnyData_overloads, frontier::Session::getAnyData, 1, 2)
- //BOOST_PYTHON_FUNCTION_OVERLOADS(getAnyData2_overloads, getAnyData2, 2, 3)
- // int (*init1)() = &frontier::init;
- // int (*init2)(const std::string&, const std::string&) = &frontier::init;
-
-
- class_<frontier::Session>("Session", init<frontier::Connection*>() )
- .def("getData", &getData)
- .def("next", &frontier::Session::next)
- .def("isEOR", &frontier::Session::isEOR)
- .def("isEOF", &frontier::Session::isEOF)
- .def("assignString", &assignString)
- .def("getNumberOfRecords", &frontier::Session::getNumberOfRecords)
- .def("getRecNum", &frontier::Session::getRecNum)
- .def("setCurrentLoad", &frontier::Session::setCurrentLoad,
- "Each Request generates a payload. Payload numbers started with 1.\nSo, to get data for the first Request call setCurrentLoad(1)",
- args("self","n"))
- .def("getAnyData", &frontier::Session::getAnyData)
-// .def("getAnyData", &getAnyData1)
-// .def("getAnyData", &getAnyData11)
- .def("getAnyData", &getAnyData2)
- .def("getAnyData", &getAnyData21)
- ;
-
- /***
- * enum frontier::BLOB_TYPE
- ***/
- enum_<BLOB_TYPE>("BLOB_TYPE")
- .value("BLOB_TYPE_BYTE", BLOB_TYPE_BYTE )
- .value("BLOB_TYPE_INT4", BLOB_TYPE_INT4 )
- .value("BLOB_TYPE_INT8", BLOB_TYPE_INT8 )
- .value("BLOB_TYPE_FLOAT", BLOB_TYPE_FLOAT )
- .value("BLOB_TYPE_DOUBLE", BLOB_TYPE_DOUBLE )
- .value("BLOB_TYPE_TIME", BLOB_TYPE_TIME )
- .value("BLOB_TYPE_ARRAY_BYTE", BLOB_TYPE_ARRAY_BYTE)
- .value("BLOB_TYPE_EOR", BLOB_TYPE_EOR )
- .value("BLOB_TYPE_NONE", BLOB_TYPE_NONE )
- .value("BLOB_BIT_NULL", BLOB_BIT_NULL )
- .export_values()
- ;
-
- /***
- * enum frontier::encoding_t
- ***/
- enum_<frontier::encoding_t>("encoding_t")
- .value("BLOB", frontier::BLOB)
- .export_values()
- ;
-
- /***
- * class frontier::AnyData
- ***/
- class_anydata = class_<frontier::AnyData>("AnyData")
- .def("type", &frontier::AnyData::type, "type of data field")
- .def("getRawI8", &frontier::AnyData::getRawI8, "type long long")
- .def("getRawD", &frontier::AnyData::getRawD, "type double")
- .def("getRawStrP", &frontier::AnyData::getRawStrP, "type string")
- .def("getRawStrS", &frontier::AnyData::getRawStrS, "type unsigned int")
- .def("getRawI4", &frontier::AnyData::getRawI4, "type int")
- .def("getRawF", &frontier::AnyData::getRawF, "type float")
- .def("getRawB", &frontier::AnyData::getRawB, "type char")
- .def("getInt", &frontier::AnyData::getInt, "cast to type int")
- .def("getLongLong",&frontier::AnyData::getLongLong, "cast to type long long")
- .def("getFloat", &frontier::AnyData::getFloat, "cast to type float")
- .def("getDouble", &frontier::AnyData::getDouble, "cast to type double")
- .def("getString", &getString, "cast to type string")
- .def("clean", &frontier::AnyData::clean, "clean data")
- ;
-
- /***
- * class frontier::Request
- ***/
- object class_req = class_<frontier::Request>("Request", init<const std::string&, frontier::encoding_t>() )
- .def("addKey", &frontier::Request::addKey, "", args("self", "key", "value"))
- .def("encodeParam", &frontier::Request::encodeParam, "", args("value"))
- .def("setRetrieveZipLevel", &frontier::Request::setRetrieveZipLevel,
- "Set the zip level of retrieved data\nlevel 0 is off, level 1 is fast, level 5 is normal, level 9 is best\ndefault is 5",
- args("level"))
- .staticmethod("encodeParam")
- .staticmethod("setRetrieveZipLevel")
- ;
-
-
-
-}
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/src/HelloWorld.cxx b/Trigger/TrigConfiguration/TrigConfDBConnection/src/HelloWorld.cxx
deleted file mode 100644
index 95fa07a932bb84f509c0867d778f02a7ed4a8789..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/src/HelloWorld.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigConfDBConnection/HelloWorld.h"
-
-#include <iostream>
-
-HelloWorld::HelloWorld() :
- m_message("")
-{}
-
-
-HelloWorld::HelloWorld(const std::string& s) :
- m_message(s)
-{}
-
-
-HelloWorld::~HelloWorld()
-{}
-
-
-void
-HelloWorld::greetings()
-{
- std::cout << m_message << std::endl;
-}
-
-
-void
-HelloWorld::setGreetings(const std::string& s) {
- m_message = s;
-}
-
-
-void
-HelloWorld::setStrPtr(const std::string* p) {
- m_message = *p;
-}
-
-
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/src/HelloWorldBindings.cxx b/Trigger/TrigConfiguration/TrigConfDBConnection/src/HelloWorldBindings.cxx
deleted file mode 100644
index 3afedf181c3852203e7688e432de53677c802527..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/src/HelloWorldBindings.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include <boost/python.hpp>
-
-#include "TrigConfDBConnection/HelloWorld.h"
-
-
-BOOST_PYTHON_MODULE(hello_world)
-{
- using namespace boost::python;
- class_<HelloWorld>("HelloWorld", init<std::string>() )
- .def("greetings", &HelloWorld::greetings)
- .def("setGreetings", &HelloWorld::setGreetings)
- .def("setStrPtr", &HelloWorld::setStrPtr)
- ;
-}
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/src/exe/TriggerFrontierClientTest.cxx b/Trigger/TrigConfiguration/TrigConfDBConnection/src/exe/TriggerFrontierClientTest.cxx
deleted file mode 100644
index 12cb6ad5174d008726cdba13715555db0af1aa19..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/src/exe/TriggerFrontierClientTest.cxx
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * frontier client test C++ main program that can load any query
- *
- * Author: Sergey Kosyakov
- *
- * $Id: TriggerFrontierClientTest.cxx 696788 2015-09-25 09:17:58Z czodrows $
- *
- * Copyright (c) 2009, FERMI NATIONAL ACCELERATOR LABORATORY
- * All rights reserved.
- *
- * For details of the Fermitools (BSD) license see Fermilab-2009.txt or
- * http://fermitools.fnal.gov/about/terms.html
- *
- */
-#include "frontier_client/frontier-cpp.h"
-#include "frontier_client/FrontierException.hpp"
-
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
-#include <cstdlib>
-#include <cstring>
-
-#include <unistd.h>
-
-static std::string escape_list="\\\'";
-static std::string req_data="frontier_request:1:DEFAULT";
-
-static void str_escape_quota(std::string *str) {
- std::string::size_type pos = 0;
- while(1) {
- pos=str->find_first_of(escape_list,pos);
- if(pos==str->npos) return;
- //std::cout<<"pos="<<pos<<'\n';
- str->insert(pos,1,'\\');
- pos+=2;
- }
-}
-
-
-static void print_usage(char **argv) {
- std::cout<<"Usage: \n"<<argv[0]<<" -h\n\tPrint this info\n";
- std::cout<<"\n"<<argv[0]<<" [-r] [-n] [-c N] [-F N] [-f file_name]\n";
- std::cout<<" if -f file_name is missing, reads query from stdin\n";
- std::cout<<" [-r] means to force a reload\n";
- std::cout<<" [-n] means do not print data\n";
- std::cout<<" [-c N] repeat the query N count times\n";
- std::cout<<" [-F N] fork after Nth repitition\n";
-}
-
-
-
-int main(int argc, char **argv) {
- //char vc;
- int vi;
- long long vl;
- float vf;
- double vd;
- std::string stringBuf;
- std::string *vs=&stringBuf;
- frontier::AnyData ad;
- char *file_name=0;
- int do_reload=0;
- int do_print=1;
- int repeat_count=1;
- int fork_count=0;
- int idx;
- std::string sql("");
-
- try {
- frontier::init();
-
- // check for -h
- for(int arg_ind=1; arg_ind<argc; arg_ind++)
- if(strcmp(argv[arg_ind],"-h")==0) {
- print_usage(argv);
- return 0;
- }
-
-
- for(int arg_ind=1; arg_ind<argc; arg_ind++) {
-
- const char* arg = argv[arg_ind];
-
- if(strcmp(arg,"-r")==0) {
- do_reload=1;
- continue;
- }
-
- if(strcmp(arg,"-n")==0) {
- do_print=0;
- continue;
- }
-
- if(strcmp(arg,"-c")==0) {
- if(argc==++arg_ind) {
- std::cerr << "No number specified after -c option\n";
- return 2;
- }
- sscanf(argv[arg_ind],"%d",&repeat_count);
- continue;
- }
-
- if(strcmp(arg,"-F")==0) {
- if(argc==++arg_ind) {
- std::cerr << "No number specified after -F option\n";
- return 2;
- }
- sscanf(argv[arg_ind],"%d",&fork_count);
- continue;
- }
-
- if(strcmp(arg,"-f")==0) {
- if(argc==++arg_ind) {
- std::cerr << "No file name specified after -f option\n";
- return 2;
- }
- file_name=argv[arg_ind];
- continue;
- }
- }
-
- std::ifstream in_file;
- if(file_name) {
- in_file.open(file_name);
- if(!in_file.is_open()) {
- std::cerr << "Can not open file " << file_name << '\n';
- return 2;
- }
- }
-
- while(1) {
- std::string tmp;
- if(file_name) {
- if(!in_file.good()) break;
- std::getline(in_file,tmp,'\n');
- } else {
- if(!std::cin.good()) break;
- std::getline(std::cin,tmp,'\n');
- }
- sql += tmp;
- }
- if(file_name) {in_file.close();}
-
- std::cout<<"Entered:\n"<<sql<<'\n';
-
- std::string param=frontier::Request::encodeParam(sql);
- std::cout<<"Param ["<<param<<"]\n";
-
- std::list<std::string> serverList;
- //serverList.push_back("http://lxfs6043.cern.ch:8080/Frontier3D");
- std::list<std::string> proxyList;
- //frontier::DataSource ds(serverList, proxyList);
- frontier::Connection con(serverList, proxyList);
-
- for(idx=0;idx<repeat_count;idx++) {
- if((fork_count>0)&&(idx==fork_count))
- fork();
-
- frontier::Session ses(&con);
- con.setReload(do_reload);
-
- frontier::Request req(req_data,frontier::BLOB);
- req.addKey("p1",param);
-
- std::vector<const frontier::Request*> vrq;
- vrq.push_back(&req);
- ses.getData(vrq);
-
- ses.setCurrentLoad(1);
-
- int field_num=0;
-
- std::cout<<"\nObject fields:\n";
-
- ses.next();
- // MetaData consists of one record with filed names.
- // Let's go over all fields:
- std::string name,type;
-
- while(!ses.isEOR()) {
- ses.assignString(&name);
- ses.assignString(&type);
- ++field_num;
- std::cout<<field_num<<" "<<(name)<<" "<<(type)<<std::endl;
- }
-
-
- // SECOND TIME
-// ses.setCurrentLoad(1);
-// field_num=0;
-// std::cout<<"\nObject fields:\n";
-// ses.next();
-// while(!ses.isEOR()) {
-// ses.assignString(&name);
-// ses.assignString(&type);
-// ++field_num;
-// std::cout<<field_num<<" "<<(name)<<" "<<(type)<<std::endl;
-// }
- // END SECOND TIME
-
-
-
-
- int nrec=ses.getNumberOfRecords();
- std::cout<<"\nResult contains "<< nrec<<" objects.\n";
-
- while(ses.next()) {
- if(!do_print)continue;
- for(int k=0;k<field_num;k++) {
- ses.getAnyData(&ad);
- switch(ad.type()) {
- //case frontier::BLOB_TYPE_BYTE: vc=ses.getByte(); break;
- case frontier::BLOB_TYPE_INT4:
- vi=ad.getInt();
- std::cout<<vi;
- break;
- case frontier::BLOB_TYPE_INT8:
- vl=ad.getLongLong();
- std::cout<<vl;
- break;
- case frontier::BLOB_TYPE_FLOAT:
- vf=ad.getFloat();
- std::cout<<vf;
- break;
- case frontier::BLOB_TYPE_DOUBLE:
- vd=ad.getDouble();
- std::cout<<vd;
- break;
- case frontier::BLOB_TYPE_TIME:
- vl=ad.getLongLong();
- std::cout<<vl;
- break;
- case frontier::BLOB_TYPE_ARRAY_BYTE:
- if(!ad.getRawStrP()) {
- std::cout<<"NULL";
- }
- else if (ad.getRawStrS() == 0)
- std::cout<<"''";
- else if (ad.getRawStrS() > 1000)
- std::cout<<'('<<ad.getRawStrS()<<" byte blob)";
- else {
- vs=ad.getString();
- str_escape_quota(vs);
- std::cout<<'\''<<(*vs)<<'\''<<'('<<ad.getRawStrS()<<')';
- }
- break;
- default:
- std::cout<<"Error: unknown typeId "<<((int)(ad.type()))<<"\n";
- exit(1);
- }
- if(k+1<field_num) {
- std::cout<<" ";
- }
- ad.clean();
- }
- ad.clean();
- std::cout<<std::endl;
- }
- if(!ses.isEOF()) {
- std::cout<<"Error: must be EOF here\n";
- exit(1);
- }
- }
- }
- catch(const frontier::ConfigurationError& e) {
- std::cout << "Frontier configuration error caught: " << e.what() << std::endl;
- exit(1);
- }
- catch(const frontier::FrontierException& e) {
- std::cout << "Frontier exception caught: " << e.what() << std::endl;
- exit(1);
- }
- catch(std::exception& e) {
- std::cout << "Error: " << e.what() << "\n";
- exit(1);
- }
- catch(...) {
- std::cout << "Unknown exception\n";
- exit(1);
- }
-
- return 0;
-}
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/test/testFrontierClient.py b/Trigger/TrigConfiguration/TrigConfDBConnection/test/testFrontierClient.py
deleted file mode 100755
index f8cdd8aa3d1e8256a6b42edb8faa01b52077a806..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/test/testFrontierClient.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def main(sql, doReload):
-
- (ALL, VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL) = range(7)
- from AthenaCommon.Logging import logging
- log = logging.getLogger( "TrigConfigSvcUtils.py" )
- log.setLevel(VERBOSE)
-
- connection = "TRIGGERDBREPR"
-
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- tf.triggerUseFrontier = True
-
- from TrigConfigSvc.TrigConfigSvcUtils import interpretConnection
- connectionParameters = interpretConnection(connection)
-
- print "Connection: ", connectionParameters
-
- from TrigConfDBConnection import frontier_client as fc
-
- fc.init("testFrontier.log","debug")
-
- conn = fc.Connection(connectionParameters['url'])
-
- session = fc.Session(conn)
-
- conn.setReload(doReload)
-
- req = fc.Request("frontier_request:1:DEFAULT", fc.encoding_t.BLOB)
- param = fc.Request.encodeParam(sql)
- req.addKey("p1",param)
-
- session.getData([req])
-
- session.printHeader()
-
- nfield = session.getNumberOfFields()
- print "\nNumber of fields:", nfield, "\n"
-
-
- nrec = session.getNumberOfRecords()
- print "\nResult contains", nrec, "objects.\n"
-
- session.printRecords2()
-
- return 0
-
-
-
-if __name__=="__main__":
- from sys import exit
-
- doReload = True
- sql = "select distinct SM.SMT_ID, SM.SMT_NAME, SM.SMT_VERSION, SM.SMT_COMMENT, SM.SMT_ORIGIN, SM.SMT_USERNAME, SM.SMT_STATUS from ATLAS_CONF_TRIGGER_REPR.SUPER_MASTER_TABLE SM"
-
- exit(main(sql=sql, doReload=doReload))
-
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/test/testHelloWorld.py b/Trigger/TrigConfiguration/TrigConfDBConnection/test/testHelloWorld.py
deleted file mode 100755
index 6b3f554ff81c514254325d45b20eabdee16da96f..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/test/testHelloWorld.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def main():
- from TrigConfDBConnection import frontier_client as fc
-
- hw = fc.HelloWorld("Hello world!")
-
- hw.greetings()
-
- hw.setGreetings("Hello universe!")
-
- hw.greetings()
-
- hw.setStrPtr("Hello All!")
-
- hw.greetings()
-
- return 0
-
-if __name__=="__main__":
- from sys import exit
- exit(main())
-
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/test/testquery.txt b/Trigger/TrigConfiguration/TrigConfDBConnection/test/testquery.txt
deleted file mode 100644
index b23d24255d683187567a20d7427dd43412ba4244..0000000000000000000000000000000000000000
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/test/testquery.txt
+++ /dev/null
@@ -1 +0,0 @@
-select distinct SM.SMT_ID, SM.SMT_NAME, SM.SMT_VERSION, SM.SMT_COMMENT, SM.SMT_ORIGIN, SM.SMT_USERNAME, SM.SMT_STATUS from ATLAS_CONF_TRIGGER_REPR.SUPER_MASTER_TABLE SM
diff --git a/Trigger/TrigConfiguration/TrigConfMuctpi/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfMuctpi/CMakeLists.txt
index 9fb13604754f652faa44a9a0a8230701b55503da..c45939b247f5b294a12de0891ffac492a1d63ba7 100644
--- a/Trigger/TrigConfiguration/TrigConfMuctpi/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfMuctpi/CMakeLists.txt
@@ -23,3 +23,4 @@ atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( scripts/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_xmls( data/*.dtd )
+
diff --git a/Trigger/TrigConfiguration/TrigConfStorage/src/L1TopoMenuLoader.cxx b/Trigger/TrigConfiguration/TrigConfStorage/src/L1TopoMenuLoader.cxx
index 769f8dbaec292d0e81f371776b2a86852395c93d..34183f582c52b94075bf4464e998791cb423d204 100644
--- a/Trigger/TrigConfiguration/TrigConfStorage/src/L1TopoMenuLoader.cxx
+++ b/Trigger/TrigConfiguration/TrigConfStorage/src/L1TopoMenuLoader.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
*/
#include "L1TopoMenuLoader.h"
@@ -702,14 +702,12 @@ bool TrigConf::L1TopoMenuLoader::loadTopoConfig( TXC::L1TopoMenu& tcaTarget) {
fillQuery(query0.get(), attList0);
coral::ICursor& cursor0 = query0->execute();
- TXC::L1TopoConfigGlobal* l1topoconfigglobal = new TXC::L1TopoConfigGlobal();
while(cursor0.next()){
const coral::AttributeList& row0 = cursor0.currentRow();
string tc_name = row0["TC.TC_NAME"].data<string>();
string tc_value = row0["TC.TC_VALUE"].data<string>();
- l1topoconfigglobal->addTopoConfigElement(tc_name,tc_value);
tcaTarget.addL1TopoConfigGlobal(TXC::TopoConfigElement(tc_name,tc_value));
}
diff --git a/Trigger/TrigConfiguration/TrigConfStorage/src/LogicExpression.cxx b/Trigger/TrigConfiguration/TrigConfStorage/src/LogicExpression.cxx
index 1f077490875a2a50d844ff1fec3e4860d5727399..385a070811f7358a3a4066f82ee2819c21c76abb 100755
--- a/Trigger/TrigConfiguration/TrigConfStorage/src/LogicExpression.cxx
+++ b/Trigger/TrigConfiguration/TrigConfStorage/src/LogicExpression.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
*/
#include "./LogicExpression.h"
@@ -25,7 +25,9 @@ LogicExpression::LogicExpression(const std::string& name, std::ostream & o)
{}
-LogicExpression::~LogicExpression() {}
+LogicExpression::~LogicExpression()
+{
+}
bool
@@ -295,6 +297,9 @@ LogicExpression::print(const std::string& indent) const {
void
LogicExpression::clear() {
m_State = kELEMENT;
+ for (LogicExpression* e : m_SubLogics) {
+ delete e;
+ }
m_SubLogics.clear();
m_Element = "";
}
diff --git a/Trigger/TrigConfiguration/TrigConfStorage/src/ThresholdConfigLoader.cxx b/Trigger/TrigConfiguration/TrigConfStorage/src/ThresholdConfigLoader.cxx
index 40d7d496d29bbf57e59dbcd825ce1d108e2f981b..1a136dd22ac8cb86b94d742e3cd73d09c7995976 100755
--- a/Trigger/TrigConfiguration/TrigConfStorage/src/ThresholdConfigLoader.cxx
+++ b/Trigger/TrigConfiguration/TrigConfStorage/src/ThresholdConfigLoader.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
*/
#include "./ThresholdConfigLoader.h"
@@ -416,7 +416,7 @@ bool TrigConf::ThresholdConfigLoader::load( ThresholdConfig& thrConfig ) {
//tt->setNumberofValues(numberofvalues);
// trigger thresholds sorted by type
thrConfig.addTriggerThreshold(tt);
- tt = new TriggerThreshold();
+ tt = nullptr;
}
nRowsLoop2 = row["TT.L1TT_ID"].data<int>();
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfFrontier.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfFrontier.py
index 0af22a9bbeb2f3a7dba0397b3a87bfbbb56f8a16..bf9554b7d67ccef00976a697c4dff72579f7984c 100755
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfFrontier.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfFrontier.py
@@ -1,28 +1,11 @@
#!/usr/bin/env python
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from __future__ import print_function
-
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
-
-from future import standard_library
-standard_library.install_aliases()
-from builtins import map
-from builtins import str
-from builtins import zip
-from builtins import object
from AthenaCommon.Logging import logging
import time
import sys
-# useFrontierClient
-# True: one uses the python bindings of frontier_client from the TrigConfDBConnection package
-# False: one uses a purely python-based implementation
-useFrontierClient = False
-
-
def getServerUrls(frontier_servers):
"""
turns
@@ -66,29 +49,9 @@ def getFrontierCursor(url, schema, loglevel = logging.INFO):
return None
else:
log.info(f"Will use Frontier server at {url}")
- if useFrontierClient:
- log.info("Using frontier_client from TrigConfDBConnection")
- return FrontierCursor2( url = url, schema = schema)
- else:
- log.info("Using a pure python implementation of frontier")
- return FrontierCursor( url = url, schema = schema)
+
+ return FrontierCursor( url = url, schema = schema)
-# used by FrontierCursor2
-def resolvebindvars(query, bindvars):
- """Replaces the bound variables :xyz with a ? in the query and
- adding the value behind a : at the end"""
- log = logging.getLogger( "TrigConfFrontier.py" )
- log.info("Query: %s", query)
- log.info("bound variables: %r", bindvars)
- import re
- varsextract = re.findall(':([A-z0-9]*)',query)
- values = list(map(bindvars.get, varsextract))
- log.debug("Resolving bound variable %r with %r", varsextract,values)
- appendix = ":".join([str(v) for v in values])
- queryWithQuestionMarks = re.sub(':[A-z0-9]*','?', query)
- query = queryWithQuestionMarks + ':' + appendix
- log.info("Resolved query new style: %s", query)
- return query
# used by FrontierCursor
def replacebindvars(query, bindvars):
@@ -109,76 +72,6 @@ def replacebindvars(query, bindvars):
return query
-
-
-
-class FrontierCursor2(object):
- def __init__(self, url, schema, refreshFlag=False):
- log = logging.getLogger( "TrigConfFrontier.py" )
- self.url = url
- self.schema = schema
- self.refreshFlag = refreshFlag
- from TrigConfDBConnection import frontier_client as fc
- fc.init("PyFrontier","debug")
- log.debug("Frontier URL : %s", self.url)
- log.debug("Schema : %s", self.schema)
- log.debug("Refresh cache : %s", self.refreshFlag)
-
-
- def execute(self, query, bindvars={}):
- if len(bindvars)>0:
- query = resolvebindvars(query,bindvars)
-
- from TrigConfDBConnection import frontier_client as fc
- log = logging.getLogger( "TrigConfFrontier.py" )
- log.debug("Executing query : %s", query)
-
- conn = fc.Connection(self.url)
- session = fc.Session(conn)
-
- doReload = self.refreshFlag
- conn.setReload(doReload)
-
- queryStart = time.localtime()
- log.debug("Query started: %s", time.strftime("%m/%d/%y %H:%M:%S %Z", queryStart))
-
- t1 = time.time()
- req = fc.Request("frontier_request:1:DEFAULT", fc.encoding_t.BLOB)
- param = fc.Request.encodeParam(query)
- req.addKey("p1",param)
-
- session.getData([req])
- t2 = time.time()
-
- #session.printHeader()
-
- #nfield = session.getNumberOfFields()
- #print ("\nNumber of fields:", nfield, "\n")
-
- #nrec = session.getNumberOfRecords()
- #print ("\nResult contains", nrec, "objects.\n")
-
- #session.printRecords2()
- queryEnd = time.localtime()
-
- self.result = [r for r in session.getRecords2()]
- log.debug("Query ended: %s", time.strftime("%m/%d/%y %H:%M:%S %Z", queryEnd))
- log.debug("Query time: %s seconds", (t2-t1))
- log.debug("Result size: %i entries", len(self.result))
-
- def fetchall(self):
- return self.result
-
- def __str__(self):
- s = "FrontierCursor2:\n"
- s += "Using Frontier URL: %s\n" % self.url
- s += "Schema: %s\n" % self.schema
- s += "Refresh cache: %s" % self.refreshFlag
- return s
-
-
-
-
class FrontierCursor(object):
def __init__(self, url, schema, refreshFlag=False, doDecode=True, retrieveZiplevel="zip"):
self.url = url + "/Frontier"
@@ -202,7 +95,7 @@ class FrontierCursor(object):
log.debug("Refresh cache : %s", self.refreshFlag)
log.debug("Query : %s", query)
- import base64, zlib, urllib.request, urllib.error, urllib.parse, time
+ import base64, zlib, urllib.request, urllib.error, urllib.parse
self.result = None
@@ -338,11 +231,6 @@ def testQuery(query, bindvars):
return 1
return 0
-
-def testBindVarResolution(query, bindvars):
- resolvebindvars(query, bindvars)
- return 0
-
if __name__=="__main__":
log = logging.getLogger( "TrigConfFrontier.py" )
@@ -352,6 +240,5 @@ if __name__=="__main__":
query = "select distinct HPS.HPS_NAME from ATLAS_CONF_TRIGGER_RUN2_MC.HLT_PRESCALE_SET HPS where HPS.HPS_ID = :psk"
bindvars = { "psk": 260 }
- res = testBindVarResolution(query, bindvars) # query resolution for c++ frontier client
- res = max(res, testQuery(query, bindvars)) # pure python frontier query
+ res = testQuery(query, bindvars) # pure python frontier query
sys.exit(res)
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx
index 3e0924144c6d1f8b11454769783f95f3c5973444..42d6965921e1b16ebe4262c7fc4029a1e8861c71 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**************************************************************************
@@ -232,6 +232,6 @@ HLT::ErrorCode TrigL2BMuMuHypo::hltExecute(const HLT::TriggerElement* outputTE,
// store result
if(attachFeature(outputTE, xBits.release(),"passbits") != HLT::OK)
ATH_MSG_ERROR("Could not store TrigPassBits! ");
- ATH_MSG_DEBUG("End of hltExecute, passMass, passChi2, pass= " << PassedBsMass << " " << PassedChi2Cut << " " << pass);
- return HLT::OK;
+ ATH_MSG_DEBUG("End of hltExecute, passMass, passChi2, pass= " << PassedBsMass << " " << PassedChi2Cut << " " << pass);
+ return HLT::OK;
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
index 9962a8780f1f457a15d1268159cf0877e590bdf0..5f44ae2edb234625686f3aebdb9fb2968fe683f9 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
@@ -4,7 +4,6 @@ from AthenaCommon.SystemOfUnits import GeV
from AthenaCommon.Logging import logging
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
-
log = logging.getLogger('TrigEgammaFastElectronHypoTool')
def TrigEgammaFastElectronHypoToolFromDict( chainDict ):
@@ -17,41 +16,46 @@ def TrigEgammaFastElectronHypoToolFromDict( chainDict ):
from AthenaConfiguration.ComponentFactory import CompFactory
tool = CompFactory.TrigEgammaFastElectronHypoTool(name)
- monTool = GenericMonitoringTool("MonTool"+name)
- monTool.defineHistogram('CutCounter', type='TH1I', path='EXPERT', title="FastElectron Hypo Cut Counter;Cut Counter", xbins=8, xmin=-1.5, xmax=7.5, opt="kCumulative")
- monTool.defineHistogram('CaloTrackdEta', type='TH1F', path='EXPERT', title="FastElectron Hypo #Delta #eta between cluster and track;#Delta #eta;Nevents", xbins=80, xmin=-0.4, xmax=0.4)
- monTool.defineHistogram('CaloTrackdPhi', type='TH1F', path='EXPERT', title="FastElectron Hypo #Delta #phi between cluster and track;#Delta #phi;Nevents", xbins=80, xmin=-0.4, xmax=0.4)
- monTool.defineHistogram('CaloTrackEoverP', type='TH1F', path='EXPERT', title="FastElectron Hypo E/p;E/p;Nevents", xbins=120, xmin=0, xmax=12)
- monTool.defineHistogram('PtTrack', type='TH1F', path='EXPERT', title="FastElectron Hypo p_{T}^{track} [MeV];p_{T}^{track} [MeV];Nevents", xbins=50, xmin=0, xmax=100000)
- monTool.defineHistogram('PtCalo', type='TH1F', path='EXPERT', title="FastElectron Hypo p_{T}^{calo} [MeV];p_{T}^{calo} [MeV];Nevents", xbins=50, xmin=0, xmax=100000)
- monTool.defineHistogram('CaloEta', type='TH1F', path='EXPERT', title="FastElectron Hypo #eta^{calo} ; #eta^{calo};Nevents", xbins=200, xmin=-2.5, xmax=2.5)
- monTool.defineHistogram('CaloPhi', type='TH1F', path='EXPERT', title="FastElectron Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2)
-
- monTool.HistPath = 'FastElectronHypo/'+tool.getName()
- tool.MonTool = monTool
-
- nt = len( thresholds )
- tool.TrackPt = [0.0] * nt
- tool.CaloTrackdETA = [ 0.2 ] *nt
- tool.CaloTrackdPHI = [ 990. ] *nt
- tool.CaloTrackdEoverPLow = [ 0.0 ] * nt
- tool.CaloTrackdEoverPHigh = [ 999.0 ] * nt
- tool.TRTRatio = [ -999. ] * nt
-
-
- for th, thvalue in enumerate(thresholds):
- if float(thvalue) < 15:
- tool.TrackPt[ th ] = 1.0 * GeV
- elif float(thvalue) >= 15 and float(thvalue) < 20:
- tool.TrackPt[ th ] = 2.0 * GeV
- elif float(thvalue) >= 20 and float(thvalue) < 50:
- tool.TrackPt[ th ] = 3.0 * GeV
- elif float(thvalue) >= 50:
- tool.TrackPt[ th ] = 5.0 * GeV
- tool.CaloTrackdETA[ th ] = 999.
- tool.CaloTrackdPHI[ th ] = 999.
- else:
- raise RuntimeError('No threshold: Default cut configured')
+ if 'idperf' in name:
+ tool.AcceptAll = True
+
+ else:
+ monTool = GenericMonitoringTool("MonTool"+name)
+ monTool.defineHistogram('CutCounter', type='TH1I', path='EXPERT', title="FastElectron Hypo Cut Counter;Cut Counter", xbins=8, xmin=-1.5, xmax=7.5, opt="kCumulative")
+ monTool.defineHistogram('CaloTrackdEta', type='TH1F', path='EXPERT', title="FastElectron Hypo #Delta #eta between cluster and track;#Delta #eta;Nevents", xbins=80, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('CaloTrackdPhi', type='TH1F', path='EXPERT', title="FastElectron Hypo #Delta #phi between cluster and track;#Delta #phi;Nevents", xbins=80, xmin=-0.4, xmax=0.4)
+ monTool.defineHistogram('CaloTrackEoverP', type='TH1F', path='EXPERT', title="FastElectron Hypo E/p;E/p;Nevents", xbins=120, xmin=0, xmax=12)
+ monTool.defineHistogram('PtTrack', type='TH1F', path='EXPERT', title="FastElectron Hypo p_{T}^{track} [MeV];p_{T}^{track} [MeV];Nevents", xbins=50, xmin=0, xmax=100000)
+ monTool.defineHistogram('PtCalo', type='TH1F', path='EXPERT', title="FastElectron Hypo p_{T}^{calo} [MeV];p_{T}^{calo} [MeV];Nevents", xbins=50, xmin=0, xmax=100000)
+ monTool.defineHistogram('CaloEta', type='TH1F', path='EXPERT', title="FastElectron Hypo #eta^{calo} ; #eta^{calo};Nevents", xbins=200, xmin=-2.5, xmax=2.5)
+ monTool.defineHistogram('CaloPhi', type='TH1F', path='EXPERT', title="FastElectron Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2)
+
+ monTool.HistPath = 'FastElectronHypo/'+tool.getName()
+ tool.MonTool = monTool
+
+ nt = len( thresholds )
+ tool.TrackPt = [0.0] * nt
+ tool.CaloTrackdETA = [ 0.2 ] *nt
+ tool.CaloTrackdPHI = [ 990. ] *nt
+ tool.CaloTrackdEoverPLow = [ 0.0 ] * nt
+ tool.CaloTrackdEoverPHigh = [ 999.0 ] * nt
+ tool.TRTRatio = [ -999. ] * nt
+
+
+ for th, thvalue in enumerate(thresholds):
+ if float(thvalue) < 15:
+ tool.TrackPt[ th ] = 1.0 * GeV
+ elif float(thvalue) >= 15 and float(thvalue) < 20:
+ tool.TrackPt[ th ] = 2.0 * GeV
+ elif float(thvalue) >= 20 and float(thvalue) < 50:
+ tool.TrackPt[ th ] = 3.0 * GeV
+ elif float(thvalue) >= 50:
+ tool.TrackPt[ th ] = 5.0 * GeV
+ tool.CaloTrackdETA[ th ] = 999.
+ tool.CaloTrackdPHI[ th ] = 999.
+ else:
+ raise RuntimeError('No threshold: Default cut configured')
+
return tool
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx
index 92d9fea388cb9a4bc8c770d6487ada55e652ebbe..05e487b098cbda780231bddcd4056061dcf2836f 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx
@@ -76,10 +76,11 @@ StatusCode TrigEgammaFastElectronFexMT::initialize()
ATH_MSG_DEBUG("CaloTrackdEoverPLow = " << m_calotrackdeoverp_low);
ATH_MSG_DEBUG("CaloTrackdEoverPHigh = " << m_calotrackdeoverp_high);
-ATH_CHECK( m_roiCollectionKey.initialize() );
-ATH_CHECK( m_TrigEMClusterContainerKey.initialize() );
-ATH_CHECK( m_TrackParticleContainerKey.initialize() );
-ATH_CHECK( m_outputElectronsKey.initialize() );
+ ATH_CHECK( m_roiCollectionKey.initialize() );
+ ATH_CHECK( m_TrigEMClusterContainerKey.initialize() );
+ ATH_CHECK( m_TrackParticleContainerKey.initialize() );
+ ATH_CHECK( m_outputElectronsKey.initialize() );
+ ATH_CHECK( m_outputDummyElectronsKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -103,9 +104,15 @@ StatusCode TrigEgammaFastElectronFexMT::execute() {
auto trigElecColl = SG::makeHandle (m_outputElectronsKey, ctx);
ATH_CHECK( trigElecColl.record (std::make_unique<xAOD::TrigElectronContainer>(),
std::make_unique<xAOD::TrigEMClusterAuxContainer>()) );
-
+
ATH_MSG_DEBUG( "Made WriteHandle " << m_outputElectronsKey );
+ auto trigDummyElecColl = SG::makeHandle (m_outputDummyElectronsKey, ctx);
+
+ ATH_MSG_DEBUG( "Made Dummy WriteHandle " << m_outputDummyElectronsKey );
+ ATH_CHECK( trigDummyElecColl.record (std::make_unique<xAOD::TrigElectronContainer>(),
+ std::make_unique<xAOD::TrigEMClusterAuxContainer>()) );
+
auto roiCollection = SG::makeHandle(m_roiCollectionKey, ctx);
ATH_MSG_DEBUG( "Made handle " << m_roiCollectionKey );
@@ -130,7 +137,6 @@ StatusCode TrigEgammaFastElectronFexMT::execute() {
auto clusContainer = SG::makeHandle (m_TrigEMClusterContainerKey, ctx);
ATH_MSG_DEBUG( "Made handle " << m_TrigEMClusterContainerKey );
-
//JTB Should only be 1 cluster in each RoI
const xAOD::TrigEMCluster *el_t2calo_clus=(*clusContainer->begin());
@@ -146,8 +152,6 @@ StatusCode TrigEgammaFastElectronFexMT::execute() {
ATH_MSG_DEBUG("Cluster: ET=" << calo_et);
ATH_MSG_DEBUG("searching a matching track: loop over tracks");
-
-
SG::ReadHandle<xAOD::TrackParticleContainer> tracks(m_TrackParticleContainerKey, ctx);
ATH_MSG_DEBUG( "Made handle " << m_TrackParticleContainerKey );
@@ -155,7 +159,7 @@ StatusCode TrigEgammaFastElectronFexMT::execute() {
if (tracks->size() == 0){
return StatusCode::SUCCESS; // Exit early if there are no tracks
}
-
+
size_t coll_size = tracks->size();
trigElecColl->reserve(coll_size);
@@ -171,18 +175,28 @@ StatusCode TrigEgammaFastElectronFexMT::execute() {
auto mon = Monitored::Group(m_monTool, caloPtMon, trackPtMon, caloTrackDEtaMon, caloTrackDPhiMon, etOverPtMon, caloTrackDEtaNoExtrapMon );
+ // Make Dummy Electron
+ xAOD::TrigElectron* trigDummyElec = new xAOD::TrigElectron();
-
+ ElementLink<xAOD::TrackParticleContainer> trackDummyEL = ElementLink<xAOD::TrackParticleContainer> (*tracks, 0);
+
+ trigDummyElecColl->push_back(trigDummyElec);
+ trigDummyElec->init( 0,
+ 0, 0, 0,
+ clusEL,
+ trackDummyEL);
+
// loop over tracks
unsigned int track_index=0;
for(const auto trkIter:(*tracks)){
+ ATH_MSG_DEBUG("Track loop starts");
ATH_MSG_VERBOSE("AlgoId = " << (trkIter)->patternRecoInfo());
ATH_MSG_VERBOSE("At perigee:");
- ATH_MSG_VERBOSE(" Pt = " << fabs((trkIter)->pt()));
- ATH_MSG_VERBOSE(" phi = " << fabs((trkIter)->phi0()));
- ATH_MSG_VERBOSE(" eta = " << fabs((trkIter)->eta()));
- ATH_MSG_VERBOSE(" z0 = " << fabs((trkIter)->z0()));
+ ATH_MSG_DEBUG(" Pt = " << fabs((trkIter)->pt()));
+ ATH_MSG_DEBUG(" phi = " << fabs((trkIter)->phi0()));
+ ATH_MSG_DEBUG(" eta = " << fabs((trkIter)->eta()));
+ ATH_MSG_DEBUG(" z0 = " << fabs((trkIter)->z0()));
// ============================================= //
// Pt cut
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.h
index a074822965cd3559b861de98e4480c3905881795..b61461aba63c1e484fdb16a14a93952fdf2948a2 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.h
@@ -129,6 +129,10 @@ class TrigEgammaFastElectronFexMT : public AthAlgorithm {
"Electrons", // default value of StoreGate key
"output Electron container name "};
+ SG::WriteHandleKey<xAOD::TrigElectronContainer> m_outputDummyElectronsKey{ this,
+ "DummyElectronsName", // property name
+ "Electrons", // default value of StoreGate key
+ "output Dummy Electron container name "};
ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
index 6572eac08f2795dab482b2e6fc7ac4364b189265..f1aa9472e4277975d07ab44b0ab95b53ce4e02f0 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
@@ -39,6 +39,9 @@ StatusCode TrigEgammaFastElectronHypoAlgMT::execute( const EventContext& context
ATH_CHECK( previousDecisionsHandle.isValid() );
ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle->size() <<" previous decisions");
+ //Printing event No.
+ ATH_MSG_DEBUG("Event No.: "<<context.eventID().event_number());
+
// new output decisions
SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
auto decisions = outputHandle.ptr();
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.cxx
index b9f4af0006df3f2ad3a4c6da2a7a714070ff25b7..072189ed75f958e24d2a3e94266a76304d03bde4 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.cxx
@@ -50,6 +50,17 @@ TrigEgammaFastElectronHypoTool::~TrigEgammaFastElectronHypoTool() {}
bool TrigEgammaFastElectronHypoTool::decideOnSingleObject( const xAOD::TrigElectron* electron,
size_t cutIndex ) const {
+ bool pass=false;
+
+ if ( m_acceptAll ) {
+ pass = true;
+ ATH_MSG_DEBUG( "AcceptAll property is set: taking all events" );
+ return pass;
+ } else {
+ pass = false;
+ ATH_MSG_DEBUG( "AcceptAll property not set: applying selection" );
+ }
+
auto cutCounter = Monitored::Scalar<int>( "CutCounter", -1 );
auto cutIndexM = Monitored::Scalar<int>( "CutIndex", cutIndex ); // one can do 2D plots for each cut independently
auto ptCalo = Monitored::Scalar( "PtCalo", -999. );
@@ -67,8 +78,10 @@ bool TrigEgammaFastElectronHypoTool::decideOnSingleObject( const xAOD::TrigElect
caloEta, caloPhi );
const xAOD::TrackParticle* trkIter = electron-> trackParticle();
- if ( trkIter == 0 ) // disconsider candidates without track
- return false;
+ if ( trkIter == 0 ){ // disconsider candidates without track
+ pass = false;
+ return pass;
+ }
cutCounter++;
// Retrieve all quantities
@@ -84,41 +97,53 @@ bool TrigEgammaFastElectronHypoTool::decideOnSingleObject( const xAOD::TrigElect
float NStrawHits = ( float )( electron->nTRTHiThresholdHits() );
float TRTHitRatio = NStrawHits == 0 ? 1e10 : NTRHits/NStrawHits;
- ATH_MSG_VERBOSE( "Cut index " << cutIndex );
+ ATH_MSG_DEBUG( "Cut index " << cutIndex );
if ( ptCalo < m_trackPt[cutIndex] ){
- ATH_MSG_VERBOSE( "Fails pt cut" << ptCalo << " < " << m_trackPt[cutIndex] );
- return false;
+ ATH_MSG_DEBUG( "Fails pt cut" << ptCalo << " < " << m_trackPt[cutIndex] );
+ pass = false;
+ return pass;
}
cutCounter++;
if ( dEtaCalo > m_caloTrackDEta[cutIndex] ) {
- ATH_MSG_VERBOSE( "Fails dEta cut " << dEtaCalo << " < " << m_caloTrackDEta[cutIndex] );
- return false;
+ ATH_MSG_DEBUG( "Fails dEta cut " << dEtaCalo << " < " << m_caloTrackDEta[cutIndex] );
+
+ pass = false;
+ return pass;
}
cutCounter++;
if ( dPhiCalo > m_caloTrackDPhi[cutIndex] ) {
- ATH_MSG_VERBOSE( "Fails dPhi cut " << dPhiCalo << " < " << m_caloTrackDPhi[cutIndex] );
- return false;
+ ATH_MSG_DEBUG( "Fails dPhi cut " << dPhiCalo << " < " << m_caloTrackDPhi[cutIndex] );
+
+ pass = false;
+ return pass;
}
cutCounter++;
if( eToverPt < m_caloTrackdEoverPLow[cutIndex] ) {
- ATH_MSG_VERBOSE( "Fails eoverp low cut " << eToverPt << " < " << m_caloTrackdEoverPLow[cutIndex] );
- return false;
+ ATH_MSG_DEBUG( "Fails eoverp low cut " << eToverPt << " < " << m_caloTrackdEoverPLow[cutIndex] );
+
+ pass = false;
+ return pass;
}
cutCounter++;
if ( eToverPt > m_caloTrackdEoverPHigh[cutIndex] ) {
- ATH_MSG_VERBOSE( "Fails eoverp high cut " << eToverPt << " < " << m_caloTrackdEoverPHigh[cutIndex] );
- return false;
+ ATH_MSG_DEBUG( "Fails eoverp high cut " << eToverPt << " < " << m_caloTrackdEoverPHigh[cutIndex] );
+
+ pass = false;
+ return pass;
}
cutCounter++;
if ( TRTHitRatio < m_trtRatio[cutIndex] ){
- ATH_MSG_VERBOSE( "Fails TRT cut " << TRTHitRatio << " < " << m_trtRatio[cutIndex] );
- return false;
+ ATH_MSG_DEBUG( "Fails TRT cut " << TRTHitRatio << " < " << m_trtRatio[cutIndex] );
+
+ pass = false;
+ return pass;
}
cutCounter++;
ATH_MSG_DEBUG( "Passed selection" );
- return true;
+ pass = true;
+ return pass;
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx
index b01143a0c35dd9bcc093bf861e98665a7d9f0afb..8d918d83bb1a35b7b0912d36ab74ed8211eaace0 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**************************************************************************
@@ -155,7 +155,7 @@ HLT::ErrorCode TrigL2CaloLayersHypo::hltExecute(const HLT::TriggerElement* outpu
const xAOD::TrigEMCluster* pClus = vectorOfClusters.front();
m_preSampFrac=m_preSamp=m_monEta=m_monPhi=m_Energy=-9999.0;
- if ( !pClus && (pClus->energy()>0.1) && (fabsf(pClus->eta())<2.1) ) {
+ if ( ! ( pClus && (pClus->energy()>0.1) && (fabsf(pClus->eta())<2.1) ) ) {
msg() << MSG::WARNING << "No EM cluster in RoI" << endmsg;
return HLT::OK;
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
index 47cdba67e25b3dad7025dcccf721bae6d73f2e9d..ee90f693005753a07f5bdbc5faff623a626cc9ae 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
@@ -10,13 +10,13 @@
class AllJetsGrouper: public IJetGrouper{
public:
AllJetsGrouper();
- AllJetsGrouper(const HypoJetIter& b, const HypoJetIter& e);
+ AllJetsGrouper(const HypoJetCIter& b, const HypoJetCIter& e);
AllJetsGrouper(const HypoJetVector&);
std::vector<HypoJetGroupVector> group(HypoJetIter&,
HypoJetIter&) const override;
- virtual std::optional<HypoJetGroupVector> next() override;
+ virtual std::optional<HypoJetVector> next() override;
std::string getName() const override;
std::string toString() const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h
index 57f5f57d3a091299d112f793eaee4943df6a2a16..7f573fbb795ea22a97b6bb03b914fb4915cd9f47 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h
@@ -22,7 +22,7 @@ class CombinationsGrouper: public IJetGrouper{
std::vector<HypoJetGroupVector> group(HypoJetIter&,
HypoJetIter&) const override;
- std::optional<HypoJetGroupVector> next() override;
+ std::optional<HypoJetVector> next() override;
std::string getName() const override;
std::string toString() const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h
index 5830516dece0a3cebb3cfb0e2a479cd43f06e47e..02ff057f2e8891bf767fb075bbe8e16726376c93 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h
@@ -25,7 +25,7 @@ class IJetGrouper{
*/
virtual std::vector<HypoJetGroupVector> group(HypoJetIter&,
HypoJetIter&) const = 0;
- virtual std::optional<HypoJetGroupVector> next() = 0;
+ virtual std::optional<HypoJetVector> next() = 0;
virtual std::string toString() const = 0;
virtual std::string getName() const = 0;
};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h
index e26d29639fe834fea8aefe375a13160799005102..670478e06c8757ec3717334fc8dc4b4908ae1507 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h
@@ -36,7 +36,7 @@ public:
std::vector<HypoJetGroupVector>
group(HypoJetIter&, HypoJetIter&) const override;
- std::optional<HypoJetGroupVector> next() override;
+ std::optional<HypoJetVector> next() override;
std::string getName() const override;
std::string toString() const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h
index 5d0b474276c72be54531855b3e134cd85978b2a1..11323f411f1a5cb63ef8e677daa9ec7f2e446925 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h
@@ -16,13 +16,13 @@ class SingleJetGrouper: public IJetGrouper{
std::vector<HypoJetGroupVector> group(HypoJetIter&,
HypoJetIter&) const override;
- std::optional<HypoJetGroupVector> next() override;
+ std::optional<HypoJetVector> next() override;
std::string getName() const override;
std::string toString() const override;
private:
- HypoJetVector m_jets;
- std::size_t m_size;
+ HypoJetVector m_jets{};
+ std::size_t m_size{0};
std::size_t m_index{0};
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ChainLabelParser.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ChainLabelParser.py
index ae90f265012bb6015ad65fad5e4455c31b3aa237..94504552e8862f4e05cf6cb60ed5adf572026ceb 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ChainLabelParser.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ChainLabelParser.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 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
from __future__ import absolute_import
@@ -304,18 +304,12 @@ class ChainLabelParser(object):
print('error, stack size', len(self.tree), 'expected 2')
print(self.state_history)
- if len(self.tree[0].children) != 1:
- error = True
- print('error, top node has %d cdildren, expected 1' % (
- len(self.tree[0].children)))
final_state = 'end_scenario'
if self.state != final_state:
error = True
print('error: final state is %s, expected %s' % (self.state,
final_state))
- # print 'tree dump:'
- # print self.tree[0].dump()
print('parse', end=' ')
if not error:
print('succeeded')
@@ -331,8 +325,8 @@ class ChainLabelParser(object):
for c in self.tree[0].children:
c.tree_top = True
- # for now (02/01/2019), no reco. First tree is only tree is hypo
- return self.tree[0].children[0]
+ # return hypo forest (>= 1 trees)
+ return self.tree[0].children
def _test(s):
from TrigHLTJetHypo.ChainLabelParser import ChainLabelParser
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
index 656f8236623fa0ee0a1a2347685f7bbf6e05ff69..a313842708186618cb92a7bed17ed7fb4de6b81b 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
@@ -5,16 +5,13 @@ from a hypo tree."""
from __future__ import print_function
-
-from AthenaConfiguration.ComponentFactory import CompFactory
-
from collections import defaultdict
from AthenaCommon.Logging import logging
log = logging.getLogger( 'ConditionsToolSetterFastReduction' )
def is_leaf(node):
- return node.scenario in ('simple', 'etaet', 'dijet', 'qjet')
+ return node.scenario in ('simple', 'etaet', 'dijet', 'qjet', 'agg')
def is_inner(node):
@@ -26,35 +23,11 @@ class ConditionsToolSetterFastReduction(object):
"""Visitor to set instantiated AlgTools to a jet hypo tree"""
- JetMoments = {
- 'emfrac' : 'EMFrac',
- 'hecfrac' : 'HECFrac',
- }
-
- def __init__(self):
-
- # for simple, use TrigJetConditionConfig_etaet. Needs to be
- # completed because simple can conain any single jet condition
- self.tool_factories = {
- 'eta': [CompFactory.TrigJetConditionConfig_abs_eta, 0],
- 'peta': [CompFactory.TrigJetConditionConfig_signed_eta, 0],
- 'neta': [CompFactory.TrigJetConditionConfig_signed_eta, 0],
- 'et': [CompFactory.TrigJetConditionConfig_et, 0],
- 'djmass': [CompFactory.TrigJetConditionConfig_dijet_mass, 0],
- 'djdphi': [CompFactory.TrigJetConditionConfig_dijet_dphi, 0],
- 'djdeta': [CompFactory.TrigJetConditionConfig_dijet_deta, 0],
- 'qjmass': [CompFactory.TrigJetConditionConfig_qjet_mass, 0],
- 'smc': [CompFactory.TrigJetConditionConfig_smc, 0],
- 'jvt': [CompFactory.TrigJetConditionConfig_jvt, 0],
- 'all': [CompFactory.TrigJetConditionConfig_acceptAll, 0],
- 'capacitychecked':
- [CompFactory.TrigJetConditionConfig_capacitychecked, 0],
- 'fastreduction': [CompFactory.TrigJetHypoToolConfig_fastreduction, 0],
- 'helper': [CompFactory.TrigJetHypoToolHelperMT, 0],
- }
- for var in self.JetMoments:
- self.tool_factories['mom'+var] = [CompFactory.TrigJetConditionConfig_moment, 0]
+ def __init__(self, algToolFactory):
+
+ self.algToolFactory = algToolFactory
+
# map conaining parent child ids for the node
self.treeMap = {0: 0}
@@ -70,19 +43,63 @@ class ConditionsToolSetterFastReduction(object):
self._set_conditions(cn)
-
- def _get_tool_instance(self, key, extra=''):
-
- klass = self.tool_factories[key][0]
- sn = self.tool_factories[key][1]
+ def _make_el_condition_tools(self, conf_dict):
+ """conf_dict: a dict containing names of elemental conditions
+ and min, max valies. These will be used to instantiate
+ conditon building AlgTools, one for eac conditon
+
+ for 2j80_2j60, the dictionaries are:
+ {'et': {'min': '80000.0', 'max': 'inf'},
+ 'eta': {'min': '0.0', 'max': '3.2'}}
+
+ and
+
+
+ {'et': {'min': '60000.0', 'max': 'inf'},
+ 'eta': {'min': '0.0', 'max': '3.2'}})
- name = '%s_%d_fn' % (key, sn)
- if extra: name += '_' + extra
- tool = klass(name=name)
- self.tool_factories[key][1] += 1
- return tool
+ """
+ condition_tools = [] # a list of AlgTools that build elemental Conds.
+
+ for k, v in conf_dict.items(): # loop over elemental conditions
+ # k in the condition name, v contains its min, max values.
+
+ # create the AlgTool that will build the elemental condition
+ condition_tool = self.algToolFactory(k)
+ for lim, val in v.items(): # lim: min, max
+ setattr(condition_tool, lim, val)
+
+ # SPECIAL CASE: Moment tool needs the name of the
+ # moment as well as the min. max cuts:
+ if (k.startswith ('mom')):
+ moment = k[len('mom'):]
+ if moment in self.JetMoments:
+ condition_tool.moment = self.JetMoments[moment]
+ else: raise RuntimeError('%s not supported' % (moment))
+
+ # END SPECIAL CASE
+
+ condition_tools.append(condition_tool)
+
+ return condition_tools
+
+
def _make_compound_condition_tools(self, node):
+ """For each element of node.conf_attrs, construct a
+ CapacityChecledCondition. Example for chain HLT_2j80_3j60_L1J15:
+
+ First leaf node has
+ conf_attrs [1]:
+ (defaultdict(<class 'dict'>, {
+ 'et': {'min': '80000.0', 'max': 'inf'},
+ 'eta': {'min': '0.0', 'max': '3.2'}}), 2)
+
+ Second leaf node has
+ conf_attrs [1]:
+ (defaultdict(<class 'dict'>, {'et': {'min': '60000.0', 'max': 'inf'},
+ 'eta': {'min': '0.0', 'max': '3.2'}}), 3)
+ """
# compound_condition_tools:
# elemental condition maker AlgToolshelper by the compound condition
@@ -99,43 +116,49 @@ class ConditionsToolSetterFastReduction(object):
cpi = node.chainpartinds[i][0]
assert mult == node.chainpartinds[i][1]
-
- condition_tools = [] # elemental conditions for this compounnd ct.
- for k, v in c.items(): # loop over elemental conditions
- condition_tool = self._get_tool_instance(k)
- for lim, val in v.items(): # lim: min, max
- setattr(condition_tool, lim, val)
-
- # SPECIAL CASE: Moment tool needs the name of the
- # moment as well as the min. max cuts:
- if (k.startswith ('mom')):
- moment = k[len('mom'):]
- if moment in self.JetMoments:
- condition_tool.moment = self.JetMoments[moment]
- else: raise RuntimeError('%s not supported' % (moment))
-
- # END SPECIAL CASE
-
- condition_tools.append(condition_tool)
+ el_condition_tools = self._make_el_condition_tools(c)
+
# create capacitychecked condition from elemental condition
- condition_tool =self._get_tool_instance('capacitychecked')
+ condition_tool =self.algToolFactory('capacitychecked')
if cpi:
# convert label from string to int for more efficient
# processing in C++ land.
condition_tool.chainPartInd = int(cpi[len('leg'):])
- else:
- condition_tool.chainPartInd = 0
- condition_tool.conditionMakers = condition_tools
+ condition_tool.conditionMakers = el_condition_tools
condition_tool.multiplicity = mult
# add capacitychecked condition to list
outer_condition_tools.append(condition_tool)
return outer_condition_tools
+
+ def _make_filter_tool(self, node):
+ """Condtion filters use a list of CompoundCondition containing
+ single jet elemental conditions select a subset of the reco
+ jets to send to the a Condition"""
+
+ el_condition_tools = []
+ for fc, mult in node.filter_conditions:
+ assert len(fc) == 1 # 1 elemental condition
+ assert mult == 1
+ el_condition_tools.extend(self._make_el_condition_tools(fc))
+
+ if not el_condition_tools:
+ el_condition_tools.append(self.algToolFactory('all'))
+
+ capacitychecked_condition_tool = self.algToolFactory(
+ 'capacitychecked')
+
+ capacitychecked_condition_tool.conditionMakers = el_condition_tools
+ capacitychecked_condition_tool.multiplicity = 1
+
+ return capacitychecked_condition_tool
+
+
def _mod_leaf(self, node):
""" Add Condition tools to For a leaf node."""
@@ -155,36 +178,47 @@ class ConditionsToolSetterFastReduction(object):
node.compound_condition_tools = self._make_compound_condition_tools(
node)
- def report(self):
- wid = max(len(k) for k in self.tool_factories.keys())
- rep = '\n%s: ' % self.__class__.__name__
-
- rep += '\n'.join(
- ['%s: %d' % (k.ljust(wid), v[1])
- for k, v in self.tool_factories.items()])
-
- return rep
+ # make condition builder AlgTools for the condition filters.
+ # condition filters select subsets of the input jets to present
+ # to a condition,
+
+ node.filter_tool = self._make_filter_tool(node)
+
+ # if node.scenario == 'agg':
+ # print (node)
+ # assert False
+
+ def report(self):
+ return str(self.algToolFactory)
+
def _fill_tree_map(self, node, tmap):
tmap[node.node_id] = node.parent_id
for cn in node.children:
self._fill_tree_map(cn, tmap)
- def _fill_conditions_map(self, node, cmap):
+ def _fill_conditions_map(self, node, cmap, fmap):
if is_leaf(node):
assert (len(node.compound_condition_tools) == 1)
cmap[node.node_id] = node.compound_condition_tools[0]
-
+ fmap[node.node_id] = node.filter_tool
+
else:
# must have a tool for Gaudi to instantiate in
- cmap[node.node_id] = self._get_tool_instance('capacitychecked')
- cmap[node.node_id].conditionMakers = [self._get_tool_instance('all')]
+ cmap[node.node_id] = self.algToolFactory('capacitychecked')
+ cmap[node.node_id].conditionMakers = [self.algToolFactory('all')]
cmap[node.node_id].multiplicity = 1
+
+ fmap[node.node_id] = self.algToolFactory('capacitychecked')
+ fmap[node.node_id].conditionMakers = [self.algToolFactory('all')]
+ fmap[node.node_id].multiplicity = 1
+
+
for cn in node.children:
- self._fill_conditions_map(cn, cmap)
+ self._fill_conditions_map(cn, cmap, fmap)
def _map_2_vec(self, amap):
@@ -225,25 +259,21 @@ class ConditionsToolSetterFastReduction(object):
self._fill_tree_map(tree, tree_map)
for k, v in tree_map.items():
- log.debug("Tree map debug ", str(k), str(v))
+ log.debug("Tree map debug %s %s", str(k), str(v))
treeVec = self._map_2_vec(tree_map)
conditionsMap = {}
- self._fill_conditions_map(tree, conditionsMap)
+ filterConditionsMap = {}
+ self._fill_conditions_map(tree, conditionsMap, filterConditionsMap)
conditionsVec = self._map_2_vec(conditionsMap)
+ filterConditionsVec = self._map_2_vec(filterConditionsMap)
# make a config tool and provide it with condition makers
- config_tool = self._get_tool_instance('fastreduction')
+ config_tool = self.algToolFactory('fastreduction')
config_tool.conditionMakers = conditionsVec
+ config_tool.filtConditionsMakers = filterConditionsVec
config_tool.treeVector = treeVec
-
- nodestr = 'n%dp%d' % (tree.node_id, tree.parent_id)
- helper_tool = self._get_tool_instance('helper', extra=nodestr)
- helper_tool.HypoConfigurer = config_tool
- helper_tool.node_id = tree.node_id
- helper_tool.parent_id = tree.parent_id
-
- self.tool = helper_tool
-
- print (self.tool)
+ self.config_tool = config_tool
+
+ print (self.config_tool)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/FastReductionAlgToolFactory.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/FastReductionAlgToolFactory.py
new file mode 100644
index 0000000000000000000000000000000000000000..5cf284a9274fcd98d45f458e128bd8abaeb261de
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/FastReductionAlgToolFactory.py
@@ -0,0 +1,63 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+"""Instantiator for AlgTools needed by the FastReduction."""
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+class FastReductionAlgToolFactory:
+
+ def __init__(self):
+
+ self.tool_factories = {
+ 'eta': [CompFactory.TrigJetConditionConfig_abs_eta, 0],
+ 'peta': [CompFactory.TrigJetConditionConfig_signed_eta, 0],
+ 'neta': [CompFactory.TrigJetConditionConfig_signed_eta, 0],
+ 'et': [CompFactory.TrigJetConditionConfig_et, 0],
+ 'djmass': [CompFactory.TrigJetConditionConfig_dijet_mass, 0],
+ 'djdphi': [CompFactory.TrigJetConditionConfig_dijet_dphi, 0],
+ 'djdeta': [CompFactory.TrigJetConditionConfig_dijet_deta, 0],
+ 'qjmass': [CompFactory.TrigJetConditionConfig_qjet_mass, 0],
+ 'smc': [CompFactory.TrigJetConditionConfig_smc, 0],
+ 'jvt': [CompFactory.TrigJetConditionConfig_jvt, 0],
+ 'ht': [CompFactory.TrigJetConditionConfig_htfr, 0],
+ 'all': [CompFactory.TrigJetConditionConfig_acceptAll, 0],
+ 'capacitychecked':
+ [CompFactory.TrigJetConditionConfig_capacitychecked, 0],
+ 'fastreduction': [CompFactory.TrigJetHypoToolConfig_fastreduction, 0],
+ 'helper': [CompFactory.TrigJetHypoToolHelperNoGrouper, 0],
+ }
+
+
+ jetMoments = {
+ 'emfrac' : 'EMFrac',
+ 'hecfrac' : 'HECFrac',
+ }
+
+ for var in jetMoments:
+ self.tool_factories['mom'+var] = [
+ CompFactory.TrigJetConditionConfig_moment, 0]
+
+
+ def __call__(self, key, extra=''):
+
+ klass = self.tool_factories[key][0]
+ sn = self.tool_factories[key][1]
+
+ name = '%s_%d' % (key, sn)
+ if extra: name += '_' + extra
+ tool = klass(name=name)
+ self.tool_factories[key][1] += 1
+ return tool
+
+
+ def __str__(self):
+ wid = max(len(k) for k in self.tool_factories.keys())
+ rep = '\n%s: ' % self.__class__.__name__
+
+ rep += '\n'.join(
+ ['%s: %d' % (k.ljust(wid), v[1])
+ for k, v in self.tool_factories.items()])
+
+ return rep
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index 431a17d5877d26550cdcc4e0487bb84d50a97e90..3baf21b31c73367fd37987b7191bd797d9c3596a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -8,7 +8,9 @@ from TrigHLTJetHypo.ConditionsToolSetterFastReduction import (
ConditionsToolSetterFastReduction,
)
-from TrigHLTJetHypo.ConditionsToolSetterHT import ConditionsToolSetterHT
+from TrigHLTJetHypo.FastReductionAlgToolFactory import (
+ FastReductionAlgToolFactory,
+ )
from TrigHLTJetHypo.chainDict2jetLabel import chainDict2jetLabel
@@ -20,14 +22,10 @@ from TrigHLTJetHypo.NodeSplitterVisitor import NodeSplitterVisitor
from AthenaCommon.Logging import logging
log = logging.getLogger( 'TrigJetHypoToolConfig' )
-def trigJetHypoToolHelperFromDict_(
- chain_label, # simple([(260et,320eta490, leg000)])
- chain_name, # HLT_j260_320eta490_L1J75_31ETA49
- toolSetter=None):
+algToolFactory = FastReductionAlgToolFactory()
- parser = ChainLabelParser(chain_label, debug=False)
+def tree2tools(rootless_tree, toolSetter):
- rootless_tree = parser.parse()
# add a root node so that split simple nodes cann connect.
tree = Node('root')
@@ -53,18 +51,37 @@ def trigJetHypoToolHelperFromDict_(
# chain name in run 2 dicts were missing the 'HLT_' prefix
# but it seems it is necessary to run the hypos in AthenaMT ?...?
- if not chain_name.startswith('HLT_'):
- chain_name = 'HLT_' + chain_name
+ toolSetter.mod(tree)
+
+ return tree # used by debug tools
- log.info('trigJetHypoToolFromDict chain_name %s', chain_name)
- toolSetter.mod(tree)
- tool = toolSetter.tool
+def nodeForestFromChainLabel(
+ chain_label, # simple([(260et,320eta490, leg000)])
+ chain_name,): # HLT_j260_320eta490_L1J75_31ETA49
+
+ parser = ChainLabelParser(chain_label, debug=False)
+
+ return parser.parse()
+
+def trigJetHypoToolHelperFromDict_(
+ chain_label, # simple([(260et,320eta490, leg000)])
+ chain_name,): # HLT_j260_320eta490_L1J75_31ETA49
- log.debug(toolSetter.report())
+
+ node_forest = nodeForestFromChainLabel(chain_label,
+ chain_name)
+
+ helper_tool = algToolFactory('helper')
- return tool
+ for tree in node_forest:
+ toolSetter = ConditionsToolSetterFastReduction(algToolFactory)
+ tree2tools(tree, toolSetter)
+ helper_tool.HypoConfigurers.append(toolSetter.config_tool)
+ log.debug(toolSetter.report())
+
+ return helper_tool
def trigJetHypoToolHelperFromDict(chain_dict):
"""Produce a jet trigger hypo tool helper from a chainDict
@@ -91,15 +108,9 @@ def trigJetHypoToolHelperFromDict(chain_dict):
chain_name = chain_dict['chainName']
- toolSetter = None
- if 'agg' in chain_name:
- toolSetter=ConditionsToolSetterHT()
- else:
- toolSetter=ConditionsToolSetterFastReduction()
return trigJetHypoToolHelperFromDict_(chain_label,
- chain_name,
- toolSetter)
+ chain_name)
def trigJetHypoToolFromDict_(chain_dict, hypo_tool, debug=False):
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
index d01c48a6395663499eab149a73489f913a6efa31..f4e4451bbe9384ed8d24cf39c8658a31606a971c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
@@ -155,7 +155,7 @@ def _make_vbenf_label(chain_parts, leg_label):
[]
simple
(
- [(%(etlo).0fet, 500neta, leg000)(%(etlo).0fet, peta500, %(leg_label)s)]
+ [(%(fbetlo).0fet, 500neta, leg000)(%(fbetlo).0fet, peta500, %(leg_label)s)]
)
dijet
(
@@ -168,6 +168,25 @@ def _make_vbenf_label(chain_parts, leg_label):
)""" % argvals
+def _make_fbdjshared_label(chain_parts, leg_label):
+ """example label for a 2-tree forest.
+ The fbdjshared contains a dijet and forward backward jets, in separate
+ trees, to allow the fb jets to particoate in the dijet."""
+
+
+ return """
+ simple
+ (
+ [(50et, 500neta, leg000)(50et, peta500, leg000)]
+ )
+ dijet
+ (
+ [(34djmass, 26djdphi)]
+ simple
+ ([(10et, 0eta320, leg000)(20et, 0eta320, leg000)])
+ )"""
+
+
def _make_dijet_label(chain_parts, leg_label):
"""dijet label. supports dijet cuts, and cuts on particpating jets
Currently supported cuts:
@@ -297,9 +316,9 @@ def _make_agg_label(chain_parts, leg_label):
argvals['leg_label'] = leg_label
result = """
- ht([(%(htlo).0fht, %(leg_label)s)
+ agg([(%(htlo).0fht, %(leg_label)s)
(%(etlo).0fet)
- (%(etalo).0feta%(etahi).0f)
+ (%(etalo).0feta%(etahi).0f)
])""" % argvals
print (result)
return result
@@ -323,6 +342,7 @@ def chainDict2jetLabel(chain_dict):
'agg': _make_agg_label,
'vbenf': _make_vbenf_label,
'dijet': _make_dijet_label,
+ 'fbdjshared': _make_fbdjshared_label,
}
# chain_part - scenario association
@@ -348,8 +368,10 @@ def chainDict2jetLabel(chain_dict):
assert labels
nlabels = len(labels)
+ return ''.join(labels)
if nlabels == 1: return labels[0]
if nlabels == 2:
+ # two labels occur when combining simple and a non-simple scenario
alabel = """\
all([]
%s
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/jetlabel_tester.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/jetlabel_tester.py
index 5741fdbf50b80b3bb1970d75d172f0b7aa5c9e49..5f7e255371c058f0142b155c96b2ce4d290b609c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/jetlabel_tester.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/jetlabel_tester.py
@@ -4,39 +4,35 @@ from __future__ import print_function
from ChainLabelParser import ChainLabelParser
-from TrigHLTJetHypo.treeVisitors import TreeParameterExpander
-from TrigHLTJetHypo.ConditionsToolSetterFastReduction import (
- ConditionsToolSetterFastReduction,)
-def compile(label, setter, expand=False, do_dump=False, do_print=False):
+def compile(label, do_dump=False, do_print=False):
print ('compile:', label)
parser = ChainLabelParser(label, debug=False)
- tree = parser.parse()
+ forest = parser.parse()
- tree.set_ids(node_id=0, parent_id=0)
+ print ('forest has %d' % len(forest),' tree(s)\n')
-
- if expand:
- visitor = TreeParameterExpander()
- tree.accept(visitor)
+ for i, tree in enumerate(forest):
- if setter is not None:
- setter.mod(tree)
+ print ('tree ', i, '\n')
- print ('compile: tree.scenario', tree.scenario)
+ tree.set_ids(node_id=0, parent_id=0)
+
+
+ print ('compile: tree.scenario', tree.scenario)
- if do_print:
- print ('\nnode dumping top node only:\n')
- print (tree)
+ if do_print:
+ print ('\nnode dumping top node only:\n')
+ print (tree)
- if do_dump:
- print ('\nnode dump tree:\n')
- print (tree.dump())
+ if do_dump:
+ print ('\nnode dump tree:\n')
+ print (tree.dump())
- return tree
+ return forest
def compile_(label, setter=None, expand=True, do_dump=False, do_print=False):
compile(label, setter, expand, do_dump)
@@ -65,11 +61,5 @@ if __name__ == '__main__':
print('index', index)
label = test_strings[index]
- setter = ConditionsToolSetterFastReduction('toolSetterFastReduction')
-
- tree = compile(label, setter=setter, expand=True, do_dump=True)
+ tree = compile(label, do_dump=True)
- print ('tvec: %s' % str(setter.tool))
- print ('svec: %s' % setter.shared)
- print ('conditionsVec [%d]: %s' % (len(setter.conditionsVec),
- str(setter.conditionsVec)))
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py
index 7b75c37525d04072399faa426506afecf2c9919d..9bc459c46b581f42844a33fecf5078a172767305 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py
@@ -29,11 +29,14 @@ class Node(object):
# filled in by a CondtionsTollSetter:
self.compound_condition_tools = []
- # self.tool = None
- # self.compound_condition_tools = []
- # self.tree_top kludge carensure top level tools get chain name
- # as Tool name
self.chainpartinds = []
+
+ # Condition objects may have filters
+ # eg HT may have an et filter. Filters are made up of conditions
+ # and are used to form jet subsets.
+ self.filter_conditions = []
+ self.filter_tool = None
+
self.tree_top = False
self.tool = None
@@ -91,11 +94,17 @@ class Node(object):
for ca in self.conf_attrs:
s.append(indent + str(ca))
- # this attribute added by flow network setter tool
- s.append(indent + 'compound_condition_tools [%d]' % len(
- self.compound_condition_tools))
+ s.append(indent + 'filter_conditions [%d]:' % (
+ len(self.filter_conditions),))
+
+ for fc in self.filter_conditions:
+ s.append(indent + str(fc))
+
+ s.append(indent + 'compoundConditionTools [%d]:' % len(
+ self.compound_condition_tools))
+
+ s.append(indent + 'filter_tool :' + str(self.filter_tool))
- s.append(indent + 'AlgTool: %s' % str(self.tool))
s.append(indent + 'No of children: %d\n' % len(self.children))
return s
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py
index 21a0691446e324f9bfe6078a2373c848803a3c4e..ac2837ade4f77a1f58474c5f5127216df2df723a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py
@@ -11,7 +11,17 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainDefInMenu import ChainProp
from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import dictFromChainName
from chainDict2jetLabel import chainDict2jetLabel
-from TrigJetHypoToolConfig import trigJetHypoToolFromDict
+from TrigJetHypoToolConfig import (trigJetHypoToolFromDict,
+ nodeForestFromChainLabel,
+ tree2tools,)
+
+from TrigHLTJetHypo.ConditionsToolSetterFastReduction import (
+ ConditionsToolSetterFastReduction,
+)
+
+from TrigHLTJetHypo.FastReductionAlgToolFactory import (
+ FastReductionAlgToolFactory,)
+
def testChainDictMaker():
@@ -44,10 +54,9 @@ def testChainDictMaker():
ChainProp(name='HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20',
groups=SingleJetGroup),
- # ChainProp(name='HLT_j70_j50 _0eta490_invm1000j50_dphi20_deta40_L1J20',
- # l1SeedThresholds=['FSNOSEED']*2,
- # groups=MultiJetGroup),
+ ChainProp(name='HLT_j0_fbdjshared_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20',l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
]
result = []
@@ -70,6 +79,26 @@ if __name__ == '__main__':
print (chainDict2jetLabel(d[1]))
print ()
+
+ print ('\n node trees:\n')
+
+ for d in dicts:
+ print (d[0])
+ label = chainDict2jetLabel(d[1])
+ chain_name = d[1]['chainName']
+
+
+ forest = nodeForestFromChainLabel(label, chain_name)
+
+ algToolFactory = FastReductionAlgToolFactory()
+ for tree in forest:
+ toolSetter=ConditionsToolSetterFastReduction(algToolFactory)
+
+ print (tree2tools(rootless_tree=tree,
+ toolSetter=toolSetter).dump())
+ print ()
+
+
print ('\nMaking TrigJetHypoTool for each dictiomary\n')
for d in dicts:
print (d[0])
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/test_cases.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/test_cases.py
index 9dcb9f045f6477c56ba8b902133991ecd2ff663a..65ac32fc280af6f27d4170903559dd467554dde6 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/test_cases.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/test_cases.py
@@ -128,7 +128,20 @@ test_strings = [
combgen([]
dijet([(71djmass91)])
simple([(12et)(13et)])))))""",
-
+ # forest
+ """simple
+ (
+ [(50et, 500neta, leg000)(50et, peta500, leg000)]
+ )
+ dijet
+ (
+ [(34mass, 26djdphi, leg000)]
+ simple
+ (
+ [(10et, 0eta320, leg000)(20et, 0eta320, leg000)]
+ )
+ )"""
+
]
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
index 3133ab0191dbd3fb0f113c2a1f41fb9d3330eb66..a91db097e259da63274c673568464df9de136b9c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
@@ -34,13 +34,15 @@ def defaultParameters(parameter, default=''): # default if parameter unknown
'smchi': 'inf',
'jvtlo': '0',
'jvthi': 'inf',
+ 'htlo' : '1000.',
+ 'hthi' : 'inf',
}
if parameter.startswith('mom'):
parameter = 'momCuts'
if parameter not in defaults:
- print ('defaultParameters: unknown parameter, tryurning default ',
+ print ('defaultParameters: unknown parameter, returning default ',
parameter)
return defaults.get(parameter, default)
@@ -284,6 +286,47 @@ class TreeParameterExpander_simple(object):
return '%s: ' % self.__class__.__name__ + '\n'.join(self.msgs)
+class TreeParameterExpander_agg(object):
+ """Convert parameter string into duction holding low, high window
+ cut vals, as for the 'simple' scenario. Then place conditions
+ not in the agg list in the filters dict. These conditions wil be used
+ to select the subset of the jet collection to be presented to the agg
+ conditions."""
+
+ agg_conditions = ('ht',)
+
+ def __init__(self):
+ self.msgs = []
+
+ def mod(self, node):
+
+ simple_expander = TreeParameterExpander_simple()
+ simple_expander.mod(node)
+
+ # example conf_attrs:
+ # conf_attrs [3]:
+ # (defaultdict(<class 'dict'>,
+ # {'ht': {'min': '1000000.0', 'max': 'inf'}}), 1)
+ # (defaultdict(<class 'dict'>,
+ # {'et': {'min': '30000.0', 'max': 'inf'}}), 1)
+ # (defaultdict(<class 'dict'>,
+ # {'eta': {'min': '0.0', 'max': '3.2'}}), 1)
+
+
+ for ca in node.conf_attrs:
+ assert len(ca) == 2 # (dict, mult)
+ assert len(ca[0]) == 1 # one entry in dict
+ ca_keys = ca[0].keys()
+ cond_name = list(ca_keys)[0]
+ if cond_name not in self.agg_conditions:
+ node.filter_conditions.append(ca)
+ for fc in node.filter_conditions:
+ node.conf_attrs.remove(fc)
+
+ def report(self):
+ return '%s: ' % self.__class__.__name__ + '\n'.join(self.msgs)
+
+
class TreeParameterExpander_dijet(object):
"""Convert parameter string into tuples holding low, high window
cut vals. Specialistaion for the dijet scenario
@@ -360,7 +403,7 @@ class TreeParameterExpander(object):
'z': TreeParameterExpander_null,
'root': TreeParameterExpander_null,
'simple': TreeParameterExpander_simple,
- 'ht': TreeParameterExpander_simple,
+ 'agg': TreeParameterExpander_agg,
'dijet': TreeParameterExpander_dijet,
'qjet': TreeParameterExpander_simple,
'all': TreeParameterExpander_all,
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..04d82ce07394bcbf32635acd2e172bdd4b60b813
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.cxx
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <algorithm>
+
+#include "./ConditionFilter.h"
+
+ConditionFilter::ConditionFilter(ConditionPtrs& conditions):
+ m_conditions(std::move(conditions)) {
+}
+
+struct FilterPred{
+ FilterPred(const ConditionPtr& cptr,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector):
+ m_cptr(cptr), m_collector(collector) {
+ }
+
+ bool operator() (pHypoJet pjet) {
+ auto hjv = HypoJetVector{pjet};
+ return m_cptr->isSatisfied(hjv, m_collector);
+ }
+
+ const ConditionPtr& m_cptr;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& m_collector;
+};
+
+HypoJetVector
+ConditionFilter::filter (const HypoJetCIter& begin,
+ const HypoJetCIter& end,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
+
+ HypoJetVector in (begin, end);
+ auto new_end = in.end();
+
+ for (const auto& cptr : m_conditions) {
+ new_end = std::partition(in.begin(),
+ new_end,
+ FilterPred(cptr, collector));
+ }
+
+ return HypoJetVector(in.begin(), new_end);
+}
+
+std::string ConditionFilter::toString() const {
+ std::stringstream ss;
+ const void* address = static_cast<const void*>(this);
+ ss << "ConditionFilter: (" << address << ")\n"
+ << "Conditions [" << m_conditions.size() << "]:\n";
+ for (const auto& c : m_conditions) {
+ ss << " " << c->toString() << "\n\n";
+ }
+
+ return ss.str();
+}
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.h
new file mode 100644
index 0000000000000000000000000000000000000000..3911c3f5ff322a8c2d88407e9f8888d0e74fc20d
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionFilter.h
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_CONDITIONFILTER_H
+#define TRIGHLTJETHYPO_CONDITIONFILTER_H
+
+#include "./CapacityCheckedConditionsDefs.h"
+
+class ConditionFilter {
+ public:
+ ConditionFilter(ConditionPtrs&);
+
+ // find the subset of jets which satisfy a sequence of conditions
+ HypoJetVector filter (const HypoJetCIter& b,
+ const HypoJetCIter& e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&
+ ) const;
+
+ std::string toString() const;
+ private:
+ ConditionPtrs m_conditions;
+
+
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.cxx
index 7e174e07d330c3df6b6781fd99feba301e4039f6..05dafc68253b9d7ca0ab55d6707ae87dd9e214ab 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.cxx
@@ -3,6 +3,7 @@
*/
#include "./FastReducer.h"
+#include "./GrouperByCapacityFactory.h"
#include "./ITrigJetHypoInfoCollector.h"
#include <map>
@@ -36,13 +37,14 @@ struct IndexVecComp{
};
-FastReducer::FastReducer(const HypoJetGroupCIter& groups_b,
- const HypoJetGroupCIter& groups_e,
+FastReducer::FastReducer(const HypoJetCIter& jets_b,
+ const HypoJetCIter& jets_e,
const ConditionPtrs& conditions,
+ const ConditionFilters& filters,
const Tree& tree,
xAODJetCollector& jetCollector,
const Collector& collector):
- m_conditions(conditions), m_tree(tree) {
+ m_conditions(conditions), m_conditionFilters(filters), m_tree(tree) {
// create an empty vector of indices of satisfying jet groups
// for each Condition.
@@ -52,8 +54,8 @@ FastReducer::FastReducer(const HypoJetGroupCIter& groups_b,
}
- if(!findInitialJetGroups(groups_b,
- groups_e,
+ if(!findInitialJetGroups(jets_b,
+ jets_e,
collector)){
if(collector){
collector->collect("FastReducer early return",
@@ -162,57 +164,57 @@ void FastReducer::collectLeafJets(xAODJetCollector& jetCollector,
}
-bool FastReducer::findInitialJetGroups(const HypoJetGroupCIter& groups_b,
- const HypoJetGroupCIter& groups_e,
+bool FastReducer::findInitialJetGroups(const HypoJetCIter& jets_b,
+ const HypoJetCIter& jets_e,
const Collector& collector) {
/*
- Will now test the incoming jet groups against the leaf conditions.
+ Will now test the incoming jets against the leaf conditions.
*/
std::size_t ijg{0};
auto leaves = m_tree.leaves();
- for(auto iter = groups_b; iter != groups_e; ++iter){
- auto jg = *iter;
-
- if(jg.size() != 1){
- collector->collect("FastReducer", "Initial jet group size != 1");
- return false;
- }
-
- // if a jet group satisfies a condition, note the fact,
- // and store it by index
- bool jg_used{false};
+ // if a jet group satisfies a condition, note the fact,
+ // and store it by index
+
+ for(const auto& leaf: leaves){
+
+ auto& filter = m_conditionFilters[leaf];
+ auto filtered_jets = filter->filter(jets_b, jets_e, collector);
+
+ recordFiltering(leaf, jets_e-jets_b, filtered_jets.size(), collector);
+
- auto cur_jg = m_jgIndAllocator(std::vector<std::size_t>{ijg});
- for(const auto& leaf: leaves){
-
- m_testedBy[leaf].insert(cur_jg);
+ auto grouper = grouperByCapacityFactory(m_conditions[leaf]->capacity(),
+ filtered_jets.begin(),
+ filtered_jets.end());
+
+ while(true){
+ auto ojg = grouper->next();
+ if (!ojg.has_value()) {break;}
+
+ auto jg = *ojg;
+ auto jg_ind = m_jgRegister.record(jg);
+ m_testedBy[leaf].insert(jg_ind);
if (m_conditions[leaf]->isSatisfied(jg, collector)){
- jg_used= true;
- if(collector){recordJetGroup(cur_jg, jg, collector);}
+ if(collector){recordJetGroup(jg_ind, jg, collector);}
// do the following for each satisfied condition ...
- m_satisfiedBy[leaf].push_back(cur_jg);
+ m_satisfiedBy[leaf].push_back(jg_ind);
+ m_jg2elemjgs[jg_ind] = std::vector<std::size_t>{jg_ind};
+ m_indJetGroup.emplace(jg_ind, jg);
+ ++ijg;
}
}
-
- if(jg_used){
- m_jg2elemjgs[cur_jg] = std::vector<std::size_t>{cur_jg};
- m_indJetGroup.emplace(cur_jg, jg);
- ++ijg;
- }
-
}
-
+
if(collector){
for(const auto& p : m_indJetGroup){
recordJetGroup(p.first, p.second, collector);
}
}
-
-
+
// check all leaf conditions are satisfied
for (const auto& i : leaves) {
if (!capacitySatisfied(i, collector)) {
@@ -220,47 +222,9 @@ bool FastReducer::findInitialJetGroups(const HypoJetGroupCIter& groups_b,
}
}
- /*
- For the special but important case where all leaf nodes have
- the root node as a parent, check that there are enough jets
- to pass the hypo. This prevents doing a long calculation
- to discover that the hypo will fail. For example, if the chain
- requires 10j40, and there are 5 jets that pass the condition,
- each condition will be satisfied by th 5 jets, and 5^10 combinations
- will be attempted in th seach for a successful combination. As there
- are only 5 jets involved, such a combination does not exist.
-
- Such trees have a tree vector with all entries == 0.
-
- This check cannot be applied in the general case. For example,
- if the root condition requires 4 jets, and has three children,
- two of which are leaf nodes, while the other is not, then the
- check will fail the event as no jets have yet ben assigned to the
- second child, while the full popagation through the tree may pass the
- event.
-
- A possible way to tighten the chck would be to forbid children to be
- separated from thir parent by more than 1 generation.
- */
-
- if (std::all_of(m_tree.cbegin(),
- m_tree.cend(),
- [](std::size_t i){return i == 0;})) {
-
- if (m_conditions[0]->capacity() > ijg) {
-
- if (collector){
- collector->collect("FastReducer", "too few children. root capacity "
- + std::to_string(m_conditions[0]->capacity()) +
- " no of children: " + std::to_string(ijg));
- }
-
- return false;
- }
- }
-
return true;
}
+
bool FastReducer::propagateJetGroups(const Collector& collector){
@@ -395,18 +359,20 @@ bool FastReducer::propagate_(std::size_t child,
}
HypoJetVector jg;
-
+ for(const auto& i : elem_jgs){
+ jg.push_back(m_indJetGroup.at(i)[0]); // why [0]? assume elemental jg has size 1
+ }
+
// obtain an index for the new jet group.
- auto cur_jg = m_jgIndAllocator(elem_jgs);
+ // auto cur_jg = m_jgIndAllocator(elem_jgs);
+ auto cur_jg = m_jgRegister.record(jg);
if(m_testedBy[par].find(cur_jg) != m_testedBy[par].end()){
next = jg_product.next(collector);
continue;
}
m_testedBy[par].insert(cur_jg);
- for(const auto& i : elem_jgs){
- jg.push_back(m_indJetGroup.at(i)[0]); // why [0]? assume elemental jg has size 1
- }
+
if (m_conditions[par]->isSatisfied(jg, collector)){// par is a tree ind.
@@ -526,6 +492,22 @@ void FastReducer::recordJetGroup(std::size_t ind,
collector->collect(ss0.str(), ss1.str());
}
+void FastReducer::recordFiltering(std::size_t leaf_ind,
+ std::size_t n_injets,
+ int n_filteredjets,
+ const Collector& collector) const {
+
+ if(!collector) {return;}
+
+ std::stringstream ss0;
+ ss0 << "FastReducer filtering Condition index: " << leaf_ind;
+
+ std::stringstream ss1;
+ ss1 << "n jets. in: " << n_injets << " filtered: " << n_filteredjets << '\n';
+
+ collector->collect(ss0.str(), ss1.str());
+}
+
bool FastReducer::pass() const { return m_pass; }
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.h
index 7f3d1191fdd18e53c32bec702fa71b4bd4c992fb..99a374e9093c7235748d6ebd3eac69d0654bcdeb 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReducer.h
@@ -11,7 +11,10 @@
#include "./JetGroupIndAllocator.h"
#include "./xAODJetCollector.h"
#include "./ITrigJetHypoInfoCollector.h"
+#include "./JetGroupRegister.h"
+#include "./ConditionFilter.h"
#include <string>
+#include <map>
using TreeVec = std::vector<std::size_t>;
using IDJetGroup = std::map<std::size_t, HypoJetVector>;
@@ -22,14 +25,16 @@ typedef std::unique_ptr<ITrigJetHypoInfoCollector> Collector;
*/
using JetGroupInd2ElemInds = std::map<int, std::vector<std::size_t>>;
+using ConditionFilters = std::vector<std::unique_ptr<ConditionFilter>>;
class FastReducer {
public:
- FastReducer(const HypoJetGroupCIter& groups_b,
- const HypoJetGroupCIter& groups_e,
+ FastReducer(const HypoJetCIter& jets_b,
+ const HypoJetCIter& jets_e,
const ConditionPtrs& conditionObjects,
+ const ConditionFilters& conditionFilters,
const Tree& conditionsTree,
xAODJetCollector& jetCollector,
const Collector& collector);
@@ -45,8 +50,12 @@ class FastReducer {
private:
+ // conditions owned by the matcher
const ConditionPtrs& m_conditions;
+ // conditionFilters owned by the matcher
+ const ConditionFilters& m_conditionFilters;
+
/** tree structure for Conditions objects.
The conditions tree gives relations among conditions (eg parent-child
and siblings-of)
@@ -75,15 +84,16 @@ class FastReducer {
HypoJetVector m_passingJets;
- JetGroupIndAllocator m_jgIndAllocator;
-
+ // JetGroupIndAllocator m_jgIndAllocator;
+
+ JetGroupRegister m_jgRegister;
/** set up the data structures for propagation. Propagation is the
act of combining jet groups satisfying children
in preparration for testing against parent conditions.
*/
- bool findInitialJetGroups(const HypoJetGroupCIter& groups_b,
- const HypoJetGroupCIter& groups_e,
+ bool findInitialJetGroups(const HypoJetCIter& jets_b,
+ const HypoJetCIter& jets_e,
const Collector& collector);
@@ -102,6 +112,11 @@ class FastReducer {
const HypoJetVector& jg,
const Collector& collector) const;
+ void recordFiltering(std::size_t leaf_ind,
+ std::size_t n_inputjets,
+ int n_filteredjets,
+ const Collector& collector) const;
+
void collectLeafJets(xAODJetCollector& jetCollector,
const Collector& collector) const;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
index 81c85760c25499854dc9501ee5a2bc411c41a7a8..d30fb5d240ad9692cea125c2d7fa3d7ee02b7515 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
@@ -10,9 +10,11 @@
#include <algorithm>
#include <sstream>
-FastReductionMatcher::FastReductionMatcher(ConditionPtrs conditions,
+FastReductionMatcher::FastReductionMatcher(ConditionPtrs& conditions,
+ ConditionFilters& filters,
const Tree& tree):
m_conditions(std::move(conditions)),
+ m_conditionFilters(std::move(filters)),
m_tree(tree){
for (const auto& il : m_tree.leaves()){
@@ -20,12 +22,16 @@ FastReductionMatcher::FastReductionMatcher(ConditionPtrs conditions,
throw std::runtime_error("Tree leaf condition but not from ChainPart");
}
}
+ if (filters.size() != conditions.size()) {
+ throw std::runtime_error("Conditions and ConditionFilters sequence sizes differ");
+ }
+
}
std::optional<bool>
-FastReductionMatcher::match(const HypoJetGroupCIter& groups_b,
- const HypoJetGroupCIter& groups_e,
+FastReductionMatcher::match(const HypoJetCIter& jets_b,
+ const HypoJetCIter& jets_e,
xAODJetCollector& jetCollector,
const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
bool) const {
@@ -43,9 +49,10 @@ FastReductionMatcher::match(const HypoJetGroupCIter& groups_b,
*/
- FastReducer reducer(groups_b,
- groups_e,
+ FastReducer reducer(jets_b,
+ jets_e,
m_conditions,
+ m_conditionFilters,
m_tree,
jetCollector,
collector);
@@ -68,5 +75,17 @@ std::string FastReductionMatcher::toString() const {
ss << sc <<": "<< c->toString() + '\n';
}
+ ss << "FastReductionMatcher ConditionFilters ["
+ << m_conditionFilters.size() << "]: \n";
+
+
+ count = 0;
+ for(const auto& c : m_conditionFilters){
+ auto sc = std::to_string(count++);
+ sc.insert(sc.begin(), 3-sc.length(), ' ');
+ ss << sc <<": "<< c->toString() + '\n';
+ }
+
+
return ss.str();
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
index 9b1e68b8a6ff7639cc816a945e1b359d5f4863a1..ec33356e024576cf22ddc1e62731fcd26166086f 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
@@ -6,17 +6,21 @@
#define TRIGHLTJETHYPO_FASTREDUCTIONMATCHER_H
-#include "./IGroupsMatcherMT.h"
+#include "./IJetsMatcherMT.h"
#include "./CapacityCheckedConditionsDefs.h"
+#include "./ConditionFilter.h"
#include "./Tree.h"
using TreeVec = std::vector<std::size_t>;
class ITrigJetHypoInfoCollector;
-class FastReductionMatcher: public IGroupsMatcherMT {
+using ConditionFilters = std::vector<std::unique_ptr<ConditionFilter>>;
+
+class FastReductionMatcher: public IJetsMatcherMT {
public:
- FastReductionMatcher(ConditionPtrs,
+ FastReductionMatcher(ConditionPtrs&,
+ ConditionFilters&,
const Tree&);
@@ -30,8 +34,8 @@ class FastReductionMatcher: public IGroupsMatcherMT {
*/
virtual std::optional<bool>
- match(const HypoJetGroupCIter& groups_b,
- const HypoJetGroupCIter& groups_e,
+ match(const HypoJetCIter& jets_b,
+ const HypoJetCIter& jets_e,
xAODJetCollector&,
const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
bool
@@ -42,7 +46,7 @@ class FastReductionMatcher: public IGroupsMatcherMT {
private:
ConditionPtrs m_conditions;
-
+ std::vector<std::unique_ptr<ConditionFilter>> m_conditionFilters;
/** tree structure for Conditions objects.
The conditions tree gives relations among conditions (eg parent-child
and siblings-of)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f2c7e5b8269880a05227b1b85b07b79086734b15
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.cxx
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "GrouperByCapacityFactory.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h"
+
+
+std::unique_ptr<IJetGrouper> grouperByCapacityFactory(unsigned int cap,
+ const HypoJetCIter& b,
+ const HypoJetCIter& e){
+
+ std::unique_ptr<IJetGrouper> pGrouper(nullptr);
+
+ if (cap == 0) {
+ throw std::runtime_error("groupByMultFactory - attempting ctrct grouper with mult == 0");
+ } else if (cap == 1) {
+ pGrouper.reset(new SingleJetGrouper(b, e));
+ } else if (cap == std::numeric_limits<int>::max()) {
+ pGrouper.reset(new AllJetsGrouper(b, e));
+ } else {
+ pGrouper.reset(new CombinationsGrouper(cap, b, e));
+ }
+
+ return pGrouper;
+}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.h
new file mode 100644
index 0000000000000000000000000000000000000000..cf227df628d251b9a7fdba13eef6215ad561d0b3
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/GrouperByCapacityFactory.h
@@ -0,0 +1,15 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_GROUPERBYCAPACITYFACTORY_H
+#define TRIGHLTJETHYPO_GROUPERBYCAPACITYFACTORY_H
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h"
+#include <memory>
+
+std::unique_ptr<IJetGrouper> grouperByCapacityFactory(unsigned int capacity,
+ const HypoJetCIter& b,
+ const HypoJetCIter& e);
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..639cb3f465d48009d3e006303399f707e037bb14
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx
@@ -0,0 +1,64 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "./HTConditionFastReduction.h"
+#include "./ITrigJetHypoInfoCollector.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
+
+#include <sstream>
+#include <cmath>
+#include <algorithm>
+#include <numeric>
+
+HTConditionFastReduction::HTConditionFastReduction(double ht_min,
+ double ht_max):
+ m_htMin(ht_min), m_htMax(ht_max) {
+}
+
+
+bool
+HTConditionFastReduction::isSatisfied(const HypoJetVector& ips,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
+
+ auto htsum = std::accumulate(ips.begin(),
+ ips.end(),
+ 0.0,
+ [](double sum, const pHypoJet& jp){
+ return sum + jp->et();});
+ bool pass = htsum > m_htMin;
+
+ if(collector){
+ std::stringstream ss0;
+ const void* address = static_cast<const void*>(this);
+ ss0 << "HTCondition: (" << address << ") Sum(et) "
+ << htsum << " "
+ << std::boolalpha << pass << " jet group: \n";
+
+ std::stringstream ss1;
+
+ for(const auto& ip : ips){
+ address = static_cast<const void*>(ip.get());
+ ss1 << " " << address << " " << ip->eta() << " e " << ip->e() << '\n';
+ }
+ ss1 << '\n';
+ collector -> collect(ss0.str(), ss1.str());
+ }
+
+ return pass;
+
+}
+
+
+std::string HTConditionFastReduction::toString() const {
+ std::stringstream ss;
+ ss << "HTConditionFastReduction: htMin: "
+ << m_htMin;
+
+
+
+ ss <<'\n';
+
+ return ss.str();
+}
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec67e2b76765ff91b59731fd1e98bc5a65b803f6
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_HTCONDITIONFASTREDUCTION_H
+#define TRIGHLTJETHYPO_HTCONDITIONFASTREDUCTION_H
+
+/********************************************************************
+ *
+ * NAME: HTConditionFastReduction.h
+ * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+ *
+ * AUTHOR: P. Sherwood
+ *********************************************************************/
+
+#include "./IConditionMT.h"
+
+#include <string>
+#include <limits>
+// #include <memory>
+
+namespace HypoJet{
+ class IJet;
+}
+
+
+class ITrigJetHypoInfoCollector;
+
+class HTConditionFastReduction: public IConditionMT{
+ public:
+
+
+ HTConditionFastReduction(double htMin, double htMax);
+
+
+ ~HTConditionFastReduction() override {}
+
+ bool isSatisfied(const HypoJetVector&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
+
+ std::string toString() const override;
+ virtual unsigned int capacity() const override {return s_capacity;}
+
+ private:
+
+ double m_htMin;
+ double m_htMax;
+
+ const static unsigned int s_capacity{std::numeric_limits<int>::max()};
+
+
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IJetsMatcherMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IJetsMatcherMT.h
new file mode 100644
index 0000000000000000000000000000000000000000..14e38d363cb60af5be01e958a94173098a078835
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IJetsMatcherMT.h
@@ -0,0 +1,43 @@
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_IJETSMATCHERMT_H
+#define TRIGHLTJETHYPO_IJETSMATCHERMT_H
+/********************************************************************
+ *
+ * NAME: IJetsMatcherMT.h
+ * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+ *
+ * AUTHOR: P. Sherwood
+ * CREATED: March 21, 2015
+ *
+ *
+ * PABC for matching gropups of jets with Conditions.
+ *********************************************************************/
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
+#include "./ConditionsDefsMT.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
+#include <string>
+
+class ITrigJetHypoInfoCollector;
+class xAODJetCollector;
+
+class IJetsMatcherMT{
+ public:
+
+ virtual ~IJetsMatcherMT(){}
+ virtual std::optional<bool> match(const HypoJetCIter&,
+ const HypoJetCIter&,
+ xAODJetCollector&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ bool debug=false) const = 0;
+
+ virtual std::string toString() const = 0;
+};
+
+#endif
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolNoGrouperConfig.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolNoGrouperConfig.h
new file mode 100644
index 0000000000000000000000000000000000000000..c2b5b1974a991558ae91dbc002615f4db760cbbe
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolNoGrouperConfig.h
@@ -0,0 +1,53 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef TRIGHLTJETHYPO_ITRIGJETHYPOTOOLNOGROUPERCONFIG_H
+#define TRIGHLTJETHYPO_ITRIGJETHYPOTOOLNOGROUPERCONFIG_H
+
+
+#include "GaudiKernel/IAlgTool.h"
+#include "./ConditionsDefsMT.h"
+#include "./IJetsMatcherMT.h"
+#include "./ConditionFilter.h"
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerBridge.h"
+#include <optional>
+
+class ITrigJetHypoToolNoGrouperConfig : virtual public ::IAlgTool {
+ /** PABC (Pure Abstract Base Class) for JetHypoTool Condiguration classes.
+ TrigJetHypoToolHelperMT is a general purpose class to run
+ parts of a jet hypo. The Condiguration tools supply them
+ with the components according to the hypo scenario. */
+public:
+ DeclareInterfaceID(ITrigJetHypoToolNoGrouperConfig, 1, 0);
+ virtual ~ITrigJetHypoToolNoGrouperConfig(){};
+
+
+ /** check the input values */
+ virtual StatusCode checkVals() const = 0;
+
+
+ /** Provide cleaner objects to sdiscard "dirty" jets before preocessing. */
+ virtual std::vector<std::shared_ptr<ICleaner>> getCleaners() const = 0;
+
+ /** return an object that tests jet group - Conditions matching */
+ virtual std::unique_ptr<IJetsMatcherMT> getMatcher() const = 0;
+
+ /** return the Conditions (which check whether a jet group satisfies one
+ or more requirements
+ */
+ virtual std::optional<ConditionsMT> getConditions() const = 0;
+
+ /** return the ConditionFilters. These reduce the input jet collection
+ before it is passed to a Condition. Example: HT conditions sometimes
+ need and eta - Et filtered vector on which to do the Et sum.
+ */
+
+ virtual std::vector<std::unique_ptr<ConditionFilter>>
+ getConditionFilters() const = 0;
+
+ /*( Gives the minimum number of jets the helper using this Confiog
+ class will require to pass the event. */
+ virtual std::size_t requiresNJets() const =0;
+};
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/JetGroupRegister.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/JetGroupRegister.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aa873c6764c6436bf7bcb5166bea714bd63f0505
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/JetGroupRegister.cxx
@@ -0,0 +1,20 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "./JetGroupRegister.h"
+
+std::size_t JetGroupRegister::record(HypoJetVector v){
+
+ std::sort(v.begin(), v.end(), HypoJetLess());
+
+ auto it = m_reg.find(v);
+
+ if (it == m_reg.end()){
+ auto new_ind = m_reg.size();
+ m_reg[v] = new_ind;
+ return new_ind;
+ } else {
+ return it->second;
+ }
+}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/JetGroupRegister.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/JetGroupRegister.h
new file mode 100644
index 0000000000000000000000000000000000000000..7ca0aec6c1a2911ceb30990af1f7ec071ea3bd53
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/JetGroupRegister.h
@@ -0,0 +1,44 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_JETGROUPREGISTER_H
+#define TRIGHLTJETHYPO_JETGROUPREGISTER_H
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
+
+#include <map>
+#include <algorithm>
+
+// maintain a register of ordered vectors HypoJets
+
+struct HypoJetLess{
+ bool operator() (const HypoJetVector::value_type& l,
+ const HypoJetVector::value_type& r) const {
+ return l.get() < r.get();
+ }
+};
+
+struct HypoJetVectorLess{
+ bool operator() (const HypoJetVector& l,
+ const HypoJetVector& r) const {
+
+ return std::lexicographical_compare(l.begin(),
+ l.end(),
+ r.begin(),
+ r.end(),
+ HypoJetLess());
+ }
+};
+
+
+class JetGroupRegister {
+ public:
+
+ std::size_t record(HypoJetVector v); // copy vector
+
+ private:
+ std::map<HypoJetVector, std::size_t, HypoJetVectorLess> m_reg;
+
+};
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/AllJetsGrouper.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/AllJetsGrouper.cxx
index fcbfca501e77312285ce97dd51b1eae48480a0a6..17a701f3e9ff70af4eaaf14ba875be3f997dc7dd 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/AllJetsGrouper.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/AllJetsGrouper.cxx
@@ -7,8 +7,8 @@
AllJetsGrouper:: AllJetsGrouper(){}
-AllJetsGrouper:: AllJetsGrouper(const HypoJetIter& b,
- const HypoJetIter& e): m_jets(b, e){
+AllJetsGrouper:: AllJetsGrouper(const HypoJetCIter& b,
+ const HypoJetCIter& e): m_jets(b, e){
}
AllJetsGrouper:: AllJetsGrouper(const HypoJetVector& jets): m_jets{jets}{
@@ -23,14 +23,13 @@ std::vector<HypoJetGroupVector> AllJetsGrouper::group(HypoJetIter& begin,
return std::vector<HypoJetGroupVector>{hjgv};
}
-std::optional<HypoJetGroupVector> AllJetsGrouper::next(){
+std::optional<HypoJetVector> AllJetsGrouper::next(){
if (m_done){
- return std::optional<HypoJetGroupVector>();
+ return std::optional<HypoJetVector>();
}
- HypoJetGroupVector hjgv{HypoJetVector(m_jets)};
m_done = true;
- return std::make_optional<HypoJetGroupVector>(hjgv);
+ return std::make_optional<HypoJetVector>(m_jets);
}
std::string AllJetsGrouper::getName() const {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CombinationsGrouper.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CombinationsGrouper.cxx
index e05b643e00c4e575c5bb3d70fa1dfebe2b2d97d8..31a4a8e367312fe38416e5d6d17df0a693ff3f35 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CombinationsGrouper.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/CombinationsGrouper.cxx
@@ -46,7 +46,7 @@ CombinationsGrouper::group(HypoJetIter& begin, HypoJetIter& end) const {
return std::vector<HypoJetGroupVector>{hjgv};
}
-std::optional<HypoJetGroupVector>
+std::optional<HypoJetVector>
CombinationsGrouper::next() {
HypoJetGroupVector hjgv;
@@ -56,13 +56,13 @@ CombinationsGrouper::next() {
auto combs = combgen.next();
if (combs.second == false){
- std::optional<HypoJetGroupVector>();
+ std::optional<HypoJetVector>();
}
HypoJetVector v;
for(auto i : combs.first){ v.push_back(*(m_jets.begin() + i));}
- return std::make_optional<HypoJetGroupVector>(hjgv);
+ return std::make_optional<HypoJetVector>(v);
}
std::string CombinationsGrouper::getName() const {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/IndexedJetsGrouper.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/IndexedJetsGrouper.cxx
index 1abd209d030ccaf7b58acdac5423e6240711ba41..c905fc57409af698e93725b38b1b06482154c114 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/IndexedJetsGrouper.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/IndexedJetsGrouper.cxx
@@ -78,7 +78,7 @@ IndexedJetsGrouper::group(HypoJetIter& begin, HypoJetIter& end) const{
}
-std::optional<HypoJetGroupVector>
+std::optional<HypoJetVector>
IndexedJetsGrouper::next(){
// exhausts after a single group
@@ -86,14 +86,13 @@ IndexedJetsGrouper::next(){
// check if there are enough jets find the highest (last, as the vector is
// ordered) and see if it lies within the jet vector
- if (m_done) { return std::optional<HypoJetGroupVector>(); }
- if (m_indices.empty()) { return std::optional<HypoJetGroupVector>(); }
+ if (m_done) { return std::optional<HypoJetVector>(); }
+ if (m_indices.empty()) { return std::optional<HypoJetVector>(); }
- auto hjgv = HypoJetGroupVector();
auto last_jet_pos = m_indices.back();
if (m_jets.size() <= last_jet_pos) {
m_done = true;
- return std::optional<HypoJetGroupVector>();
+ return std::optional<HypoJetVector>();
}
// sort jets by descending Et
@@ -103,13 +102,12 @@ IndexedJetsGrouper::next(){
DescendingEt());
// place the jets at positions in the index vector into the inner vector
- HypoJetVector inner;
- for (auto i : m_indices){inner.push_back(*(m_jets.begin() + i));}
+ HypoJetVector hjv;
+ for (auto i : m_indices){hjv.push_back(*(m_jets.begin() + i));}
// push the inner vector into the outer vector
- hjgv.push_back(inner);
m_done = true;
- return std::make_optional<HypoJetGroupVector>(hjgv);
+ return std::make_optional<HypoJetVector>(hjv);
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/SingleJetGrouper.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/SingleJetGrouper.cxx
index 80441003fc073e648cd432ff0d7c48e109d87be8..54de42f78560c4de5b97cbcb7d5a0723ef670be2 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/SingleJetGrouper.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/SingleJetGrouper.cxx
@@ -7,12 +7,13 @@
SingleJetGrouper::SingleJetGrouper(){}
-SingleJetGrouper::SingleJetGrouper(const HypoJetVector& v): m_jets(v){
+SingleJetGrouper::SingleJetGrouper(const HypoJetVector& v):
+ m_jets(v), m_size{v.size()}{
}
SingleJetGrouper::SingleJetGrouper(const HypoJetCIter& b,
const HypoJetCIter& e):
- m_jets(b, e){
+ m_jets(b, e), m_size{m_jets.size()}{
}
std::vector<HypoJetGroupVector> SingleJetGrouper::group(HypoJetIter& begin,
@@ -28,15 +29,14 @@ std::vector<HypoJetGroupVector> SingleJetGrouper::group(HypoJetIter& begin,
return std::vector<HypoJetGroupVector>{hjgv};
}
-std::optional<HypoJetGroupVector>
+std::optional<HypoJetVector>
SingleJetGrouper::next() {
if (m_index == m_size){
- return std::optional<HypoJetGroupVector>();
+ return std::optional<HypoJetVector>();
}
- HypoJetGroupVector result;
- result.push_back(HypoJetVector{m_jets[m_index++]});
- return std::make_optional<HypoJetGroupVector>(result);
+ HypoJetVector result{m_jets[m_index++]};
+ return std::make_optional<HypoJetVector>(result);
}
std::string SingleJetGrouper::getName() const {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.h
index 77e0dcb6c7aaf661b561d70f7cdfdfb7a3d14d82..3daf31fa69706ea59502e8944f255b60ec6529f6 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.h
@@ -37,9 +37,9 @@ public extends<AthAlgTool, ITrigJetCapacityCheckedConditionConfig> {
- Gaudi::Property<std::size_t> m_chainPartInd {this,
+ Gaudi::Property<int> m_chainPartInd {this,
"chainPartInd",
- {0},
+ {-1},
"identifier for chain leg - used to group jets for jet hypo clients "};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_htfr.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_htfr.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6f0878909c7b731b1e49c1c0bb84099afe874ca6
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_htfr.cxx
@@ -0,0 +1,49 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*
+ Instantiator for Htfr Conditions
+ */
+#include "TrigJetConditionConfig_htfr.h"
+#include "GaudiKernel/StatusCode.h"
+#include "./HTConditionFastReduction.h"
+#include "./ArgStrToDouble.h"
+
+TrigJetConditionConfig_htfr::TrigJetConditionConfig_htfr(const std::string& type,
+ const std::string& name,
+ const IInterface* parent) :
+ base_class(type, name, parent){
+
+}
+
+
+StatusCode TrigJetConditionConfig_htfr::initialize() {
+ CHECK(checkVals());
+
+ return StatusCode::SUCCESS;
+}
+
+
+ConditionMT TrigJetConditionConfig_htfr::getCondition() const {
+ auto a2d = ArgStrToDouble();
+ return std::make_unique<HTConditionFastReduction>(a2d(m_min), a2d(m_max));
+}
+
+
+StatusCode TrigJetConditionConfig_htfr::checkVals() const {
+ auto a2d = ArgStrToDouble();
+ if (a2d(m_min) > a2d(m_max)){
+ ATH_MSG_ERROR("htMin > htMax");
+ return StatusCode::FAILURE;
+ }
+ return StatusCode::SUCCESS;
+}
+
+bool TrigJetConditionConfig_htfr::addToCapacity(std::size_t) {
+ return false;
+}
+
+std::size_t TrigJetConditionConfig_htfr::capacity() const {
+ return getCondition()->capacity();
+}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_htfr.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_htfr.h
new file mode 100644
index 0000000000000000000000000000000000000000..8f2f9ec067943a5c9819a24c7f47f766fd576e87
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_htfr.h
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGJETCONDITIONCONFIG_HTFR_H
+#define TRIGJETCONDITIONCONFIG_HTFR_H
+
+/*
+Condiguration AlgTool for ht conditions to be run in FastReduction
+PS
+*/
+
+#include "ITrigJetConditionConfig.h"
+#include "./ConditionsDefsMT.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
+
+class TrigJetConditionConfig_htfr:
+public extends<AthAlgTool, ITrigJetConditionConfig> {
+
+ public:
+
+ TrigJetConditionConfig_htfr(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ virtual StatusCode initialize() override;
+ virtual ConditionMT getCondition() const override;
+
+ virtual bool addToCapacity(std::size_t) override;
+ virtual std::size_t capacity() const override;
+
+ private:
+
+
+ Gaudi::Property<std::string>
+ m_min{this, "min", {}, "min HT"};
+
+ Gaudi::Property<std::string>
+ m_max{this, "max", {}, "max HT"};
+
+ StatusCode checkVals() const;
+};
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
index c819ee3580b170c7d76d5fd5fe25f403a6890a10..eb8b9b40796aa7dd45122ea4ef6325f2c4024a44 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
@@ -9,12 +9,12 @@
#include "./conditionsFactoryMT.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/TrigHLTJetHypoHelper2.h"
-#include "./groupsMatcherFactoryMT.h"
#include "./CapacityCheckedCondition.h"
+#include "./FastReductionMatcher.h"
+#include "./Tree.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
@@ -134,29 +134,49 @@ TrigJetHypoToolConfig_fastreduction::getConditions() const {
return std::make_optional<ConditionsMT>(std::move(conditions));
}
+
+std::vector<std::unique_ptr<ConditionFilter>>
+TrigJetHypoToolConfig_fastreduction::getConditionFilters() const {
+
+ auto filters = std::vector<std::unique_ptr<ConditionFilter>>();
+
+ for(const auto& cm : m_filtConditionMakers){
+ ConditionPtrs filterConditions; // will contain a single Condition
+ filterConditions.push_back(std::move(cm->getCapacityCheckedCondition()));
+ auto cf = std::make_unique<ConditionFilter>(filterConditions);
+ filters.push_back(std::move(cf));
+ }
+
+ return filters;
+}
+
// following function not used for treeless hypos
std::size_t
TrigJetHypoToolConfig_fastreduction::requiresNJets() const {
return 0;
}
-
-std::unique_ptr<IJetGrouper>
-TrigJetHypoToolConfig_fastreduction::getJetGrouper() const {
- return std::make_unique<SingleJetGrouper>();
-}
-std::unique_ptr<IGroupsMatcherMT>
+std::unique_ptr<IJetsMatcherMT>
TrigJetHypoToolConfig_fastreduction::getMatcher () const {
auto opt_conds = getCapacityCheckedConditions();
if(!opt_conds.has_value()){
- return std::unique_ptr<IGroupsMatcherMT>(nullptr);
+ return std::unique_ptr<IJetsMatcherMT>(nullptr);
}
- return groupsMatcherFactoryMT_FastReduction(std::move(*opt_conds),
- m_treeVec);
+ auto matcher = std::unique_ptr<IJetsMatcherMT>();
+ // matcher.reset(new FastReductionMatcher(std::move(*opt_conds),
+ // Tree(m_treeVec)));
+
+ auto conditions = std::move(*opt_conds);
+ auto filters = getConditionFilters();
+ auto fpm = new FastReductionMatcher(conditions,
+ filters,
+ Tree(m_treeVec));
+ matcher.reset(fpm);
+ return matcher;
}
StatusCode TrigJetHypoToolConfig_fastreduction::checkVals() const {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h
index 26a33fe89d6c5d78534ddfbd548e17c318e5e9e3..91622b23b5508e43bbb39d322e47f981670e0117 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h
@@ -13,22 +13,23 @@
*********************************************************************/
-#include "ITrigJetHypoToolConfig.h"
+#include "ITrigJetHypoToolNoGrouperConfig.h"
#include "./CapacityCheckedConditionsDefs.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+#include "./IJetsMatcherMT.h"
#include "./ConditionsDefsMT.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleaner.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerBridge.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
#include "./ITrigJetCapacityCheckedConditionConfig.h"
+#include "./ConditionFilter.h"
class TrigJetHypoToolConfig_fastreduction:
-public extends<AthAlgTool, ITrigJetHypoToolConfig> {
+public extends<AthAlgTool, ITrigJetHypoToolNoGrouperConfig> {
public:
@@ -39,17 +40,24 @@ public extends<AthAlgTool, ITrigJetHypoToolConfig> {
virtual StatusCode initialize() override;
virtual std::vector<std::shared_ptr<ICleaner>> getCleaners() const override;
- virtual std::unique_ptr<IJetGrouper> getJetGrouper() const override;
- virtual std::unique_ptr<IGroupsMatcherMT> getMatcher() const override;
+ virtual std::unique_ptr<IJetsMatcherMT> getMatcher() const override;
virtual std::optional<ConditionsMT> getConditions() const override;
+
+ virtual std::vector<std::unique_ptr<ConditionFilter>>
+ getConditionFilters() const override;
+
virtual std::size_t requiresNJets() const override;
virtual StatusCode checkVals() const override;
private:
ToolHandleArray<ITrigJetCapacityCheckedConditionConfig> m_conditionMakers{
- this, "conditionMakers", {}, "hypo tree node to conditiionMaker map"};
+ this, "conditionMakers", {}, "hypo tree Condition builder AlgTools"};
+ ToolHandleArray<ITrigJetCapacityCheckedConditionConfig> m_filtConditionMakers{
+ this, "filtConditionsMakers", {},
+ "hypo tree Condition builder AlgTools for Condition filters"};
+
Gaudi::Property<std::vector<std::size_t>> m_treeVec{
this, "treeVector", {}, "integer sequence representation of jet hypo tree"};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b73271b5df7334b340ffc2a199aff9580c220374
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx
@@ -0,0 +1,141 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "./TrigJetHypoToolHelperNoGrouper.h"
+#include "./ITrigJetHypoInfoCollector.h"
+#include "./xAODJetCollector.h"
+#include "./JetTrigTimer.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJet.h" // TLorentzVec
+#include "./nodeIDPrinter.h"
+#include "./DebugInfoCollector.h"
+#include <algorithm>
+#include <sstream>
+
+TrigJetHypoToolHelperNoGrouper::TrigJetHypoToolHelperNoGrouper(const std::string& type,
+ const std::string& name,
+ const IInterface* parent) :
+ base_class(type, name, parent){
+}
+
+StatusCode TrigJetHypoToolHelperNoGrouper::initialize() {
+
+ for (const auto& config : m_configs) {
+ m_matchers.push_back(std::move(config->getMatcher()));
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+void
+TrigJetHypoToolHelperNoGrouper::collectData(const std::string& exetime,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ const std::optional<bool>& pass) const {
+ if(!collector){return;}
+ auto helperInfo = nodeIDPrinter("TrigJetHypoToolHelperNoGrouper",
+ pass,
+ exetime
+ );
+
+ collector->collect(name(), helperInfo);
+}
+
+
+bool
+TrigJetHypoToolHelperNoGrouper::pass(HypoJetVector& jets,
+ xAODJetCollector& jetCollector,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
+
+ if(collector){
+ std::stringstream ss;
+ ss << "No of jets " + std::to_string(jets.size()) + '\n';
+ ss << jets;
+ collector->collect(name(), ss.str());
+ }
+
+ JetTrigTimer timer;
+ timer.start();
+
+ if(jets.empty()){
+ timer.stop();
+ bool pass = false;
+ collectData(timer.readAndReset(), collector, pass);
+ return pass;
+ }
+
+ // jet cleaning
+ HypoJetIter jets_begin = jets.begin();
+ HypoJetIter jets_end = jets.end();
+ for(auto cleaner: m_cleaners){
+ jets_end = std::partition(jets_begin,
+ jets_end,
+ [cleaner](const pHypoJet& j){
+ return cleaner->select(j);}
+ );
+ }
+
+ // see if matchers pass. Each matcher conatains a FastReducer tree.
+ // if > matcher, this means the conditions of different trees may
+ // share jets.
+ bool pass = true;
+ for (const auto& matcher : m_matchers){
+ auto matcher_pass = matcher->match(jets_begin,
+ jets_end,
+ jetCollector,
+ collector);
+ if (!matcher_pass.has_value()) {
+ ATH_MSG_ERROR("Matcher cannot determine result. Config error?");
+ return false;
+ }
+
+ if (!(*matcher_pass)){
+ pass = false;
+ break;
+ }
+ }
+
+ timer.stop();
+ collectData(timer.readAndReset(), collector, pass);
+
+ return pass;
+}
+
+std::string TrigJetHypoToolHelperNoGrouper::toString() const {
+
+
+ std::stringstream ss;
+ ss << name();
+
+ ss << "Cleaners:\n No of cleaners: " << m_cleaners.size() << '\n';
+
+ for(auto cleaner : m_cleaners) {
+ ss << cleaner->toString()
+ << '\n';
+ }
+
+ ss << "\nMatchers [" << m_matchers.size() << "]:\n\n";
+ unsigned int imatcher{0};
+ for (const auto & matcher : m_matchers) {
+ ss << "matcher " << imatcher++ << '\n';
+ ss << matcher -> toString();
+ }
+
+ return ss.str();
+}
+
+
+StatusCode
+TrigJetHypoToolHelperNoGrouper::getDescription(ITrigJetHypoInfoCollector& c) const {
+ c.collect(name(), toString());
+ return StatusCode::SUCCESS;
+}
+
+
+std::size_t TrigJetHypoToolHelperNoGrouper::requiresNJets() const {
+ return m_configs[0]->requiresNJets();
+}
+
+
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.h
new file mode 100644
index 0000000000000000000000000000000000000000..c398770e741ab74022aa9f21b63b895bcbc52fe0
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.h
@@ -0,0 +1,82 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_TRIGJETHYPOHELPERNOGROUPER_H
+#define TRIGHLTJETHYPO_TRIGJETHYPOHELPERNOGROUPER_H
+
+/**
+ * A configurable helper class to implement Jet Trigger algorithms.
+ * Initial jet removal from incomming container is done using the ICleaner predicates.
+ * The surviving jets are grouped into subsets by the IJetGroup object.
+ *
+ * The IMatcher objector owns a set of Conditions objects.
+ * The Matcher determines
+ * whether the container of jet groups satisfies the Conditions. If so,
+ * the event passes, otherwise it fails.
+ *
+ */
+
+#include <vector>
+#include <memory>
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleanerTool.h"
+#include "./IJetsMatcherMT.h"
+#include "./ConditionsDefsMT.h"
+
+#include "TrigHLTJetHypo/ITrigJetHypoToolHelperMT.h"
+#include "ITrigJetHypoToolNoGrouperConfig.h"
+
+class ITrigJetHypoInfoCollector;
+class xAODJetCollector;
+
+class TrigJetHypoToolHelperNoGrouper:
+public extends<AthAlgTool, ITrigJetHypoToolHelperMT> {
+
+ public:
+ TrigJetHypoToolHelperNoGrouper(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ StatusCode initialize() override;
+ virtual bool
+
+ // pass - tests wethewr a jet collection passes cuts, and collects
+ // information about the decision.
+ pass(HypoJetVector&,
+ xAODJetCollector&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
+
+ virtual std::size_t requiresNJets() const override;
+
+ virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const override;
+
+ private:
+
+ // Object that matches jet groups with Conditions
+ std::vector<std::unique_ptr<IJetsMatcherMT>> m_matchers;
+
+ // Bridge objects to ICleaner predicate function objects to allow polymorphic
+ // pointers to be used with the STL (pass by value).
+ ToolHandleArray<ICleanerTool> m_cleaners;
+
+ ///////////////////////////////
+
+ // Used to generate helper objects foe TrigHLTJetHelper
+ // from user supplied values
+ ToolHandleArray<ITrigJetHypoToolNoGrouperConfig> m_configs {
+ this, "HypoConfigurers", {},
+ "Configurers to set up TrigJetHypoHelperNoGrouper"};
+
+ Gaudi::Property<bool>
+ m_debug {this, "debug", false, "instantantiate helpers with this debug flag"};
+
+
+ void collectData(const std::string& exetime,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ const std::optional<bool>& pass) const;
+
+ virtual std::string toString() const override;
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
index d573062d7aae581e9e1356d5d313398a4319eac6..3f1141a4035749d5517fefe64a0c84ef5742ac0a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
@@ -42,17 +42,18 @@ TrigJetHypoToolMT::~TrigJetHypoToolMT(){
}
StatusCode TrigJetHypoToolMT::initialize(){
- DebugInfoCollector collector(name());
- CHECK(m_helper->getDescription(collector));
- auto s = collector.toString();
-
- for(const auto& l : lineSplitter(s)){
- ATH_MSG_INFO(l);
- }
-
+
if (m_visitDebug){
- collector.write();
+
+ DebugInfoCollector collector(name());
+ CHECK(m_helper->getDescription(collector));
+ auto s = collector.toString();
+
+ for(const auto& l : lineSplitter(s)){
+ ATH_MSG_INFO(l);
+ }
}
+
return StatusCode::SUCCESS;
}
@@ -75,7 +76,7 @@ TrigJetHypoToolMT::decide(const xAOD::JetContainer* jets,
std::unique_ptr<ITrigJetHypoInfoCollector> infocollector(nullptr);
if(m_visitDebug){
- auto collectorName = name() + std::to_string(m_eventSN->getSN());
+ auto collectorName = name() + "_" + std::to_string(m_eventSN->getSN());
infocollector.reset(new DebugInfoCollector(collectorName));
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
index 2ef7d1045234acf52559225a1bf2dc2a29c6fe95..4974748f7260026bcd956dea9e4ad01c8ba1b568 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
@@ -20,6 +20,7 @@
#include "../TrigJetConditionConfig_signed_eta.h"
#include "../TrigJetConditionConfig_et.h"
#include "../TrigJetConditionConfig_ht.h"
+#include "../TrigJetConditionConfig_htfr.h"
#include "../TrigJetConditionConfig_dijet_mass.h"
#include "../TrigJetConditionConfig_dijet_dphi.h"
#include "../TrigJetConditionConfig_dijet_deta.h"
@@ -34,6 +35,7 @@
//
#include "../TrigJetHypoToolMT.h"
#include "../TrigJetHypoToolHelperMT.h"
+#include "../TrigJetHypoToolHelperNoGrouper.h"
#include "../TrigJetTLAHypoAlgMT.h"
#include "../TrigJetTLAHypoToolMT.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/BasicCleanerTool.h"
@@ -64,6 +66,7 @@ DECLARE_COMPONENT(TrigJetConditionConfig_signed_eta)
DECLARE_COMPONENT(TrigJetConditionConfig_abs_eta)
DECLARE_COMPONENT(TrigJetConditionConfig_et)
DECLARE_COMPONENT(TrigJetConditionConfig_ht)
+DECLARE_COMPONENT(TrigJetConditionConfig_htfr)
DECLARE_COMPONENT(TrigJetConditionConfig_dijet_mass)
DECLARE_COMPONENT(TrigJetConditionConfig_dijet_deta)
DECLARE_COMPONENT(TrigJetConditionConfig_dijet_dphi)
@@ -80,6 +83,7 @@ DECLARE_COMPONENT(TrigJetHypoToolMT)
DECLARE_COMPONENT(TrigJetTLAHypoAlgMT)
DECLARE_COMPONENT(TrigJetTLAHypoToolMT)
DECLARE_COMPONENT(TrigJetHypoToolHelperMT)
+DECLARE_COMPONENT(TrigJetHypoToolHelperNoGrouper)
DECLARE_COMPONENT(BasicCleanerTool)
DECLARE_COMPONENT(AntiCleanerTool)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.cxx
index b34ebadffb584129d617aa6e72c7055113d2bee4..c7baef98e498f0081b9b07af021e768b1e972e8b 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.cxx
@@ -17,17 +17,6 @@ groupsMatcherFactoryMT_SingleCondition (ConditionsMT&& conditions){
}
-std::unique_ptr<IGroupsMatcherMT>
-groupsMatcherFactoryMT_FastReduction (ConditionPtrs&& conditions,
- const std::vector<std::size_t>& treeVec){
-
- if (conditions.size() == 1) {
- return std::make_unique<SingleConditionMatcherMT>(std::move(conditions[0]));
- } else {
- return std::make_unique<FastReductionMatcher>(std::move(conditions),
- treeVec);
- }
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.h
index b91b74c3df2786e801e0cf1f1c410097ed48a22b..cde9b776796e6d9c13459c6fc01563578aff7720 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/groupsMatcherFactoryMT.h
@@ -16,7 +16,4 @@ groupsMatcherFactoryMT_SingleCondition(ConditionsMT&&);
std::unique_ptr<IGroupsMatcherMT>
groupsMatcherFactoryMT_MaxBipartite(ConditionsMT&&);
-std::unique_ptr<IGroupsMatcherMT>
-groupsMatcherFactoryMT_FastReduction(ConditionPtrs&&,
- const std::vector<std::size_t>& treeVec);
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx
index 063bf9f17d6d80c485c0f2c5e3e43f385f773374..860b45ee76ad050b3d204912d8d35e91669d9315 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx
@@ -18,6 +18,17 @@ std::string nodeIDPrinter(const std::string& name,
return ss.str();
}
+std::string nodeIDPrinter(const std::string& name,
+ bool pass,
+ const std::string& timerStr){
+
+ std::stringstream ss;
+ ss << "name(): " << name <<" pass: " <<std::boolalpha << pass << " "
+ << timerStr << '\n';
+
+ return ss.str();
+}
+
std::string nodeIDPrinter(const std::string& name,
int nodeID,
int parentID,
@@ -34,6 +45,21 @@ std::string nodeIDPrinter(const std::string& name,
return ss.str();
}
+std::string nodeIDPrinter(const std::string& name,
+ const std::optional<bool>& pass,
+ const std::string& timerStr){
+ if(pass.has_value()){
+ return nodeIDPrinter(name, *pass, timerStr);
+ }
+
+
+ std::stringstream ss;
+
+ ss << "name(): " << name << " pass: " << "ERROR " <<timerStr << '\n';
+
+ return ss.str();
+}
+
std::string nodeIDPrinter(const std::string& name,
int nodeID,
int parentID){
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h
index 8b56fae12ccd10a8bde06911184c4960ff69636d..4fae2817f05b42c6d63213e704239b56fc5aff4c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h
@@ -25,6 +25,10 @@ std::string nodeIDPrinter(const std::string& name,
const std::optional<bool>& pass,
const std::string& time="");
+std::string nodeIDPrinter(const std::string& name,
+ const std::optional<bool>& pass,
+ const std::string& time);
+
std::string nodeIDPrinter(const std::string& name,
int nodeID,
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
index d975a6c2cfd41ac389d3779d84e28da055980d44..602d47ce93aa70f0168e75fcac792631c02249d9 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
@@ -322,18 +322,17 @@ StatusCode TrigMufastHypoTool::inclusiveSelection(std::vector<TrigMufastHypoTool
StatusCode TrigMufastHypoTool::multiplicitySelection(std::vector<TrigMufastHypoTool::MuonClusterInfo>& toolInput) const{
HLT::Index2DVec passingSelection( m_ptBins.size() );
- size_t elementIndex{ 0 };
for ( size_t cutIndex=0; cutIndex < m_ptBins.size(); ++cutIndex ) {
+ size_t elementIndex{ 0 };
for ( auto& i: toolInput ) {
if(!m_acceptAll && m_applyOR && !i.passOR) {
ATH_MSG_DEBUG("skip due to overap, DecisionID " << m_decisionId );
+ elementIndex++;
continue;
}
- elementIndex = &i - &toolInput.front();
-
// If muon event has difference DecisionID, it shouldn't apply.
if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs ) ) {
if ( decideOnSingleObject( i, cutIndex ) == true ) {
@@ -345,6 +344,7 @@ StatusCode TrigMufastHypoTool::multiplicitySelection(std::vector<TrigMufastHypoT
} else {
ATH_MSG_DEBUG("Not match DecisionID " << m_decisionId );
}
+ elementIndex++;
}
// If no object passes the selection, multipul selection should stop.
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
index dc4323fef1c0fed9a47ec5d35e2d9a774edfe370..78c4ede0260031c7e3075f2d7a412f8f1547ef77 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
@@ -275,18 +275,17 @@ StatusCode TrigmuCombHypoTool::inclusiveSelection(std::vector<TrigmuCombHypoTool
StatusCode TrigmuCombHypoTool::multiplicitySelection(std::vector<TrigmuCombHypoTool::CombinedMuonInfo>& input) const
{
HLT::Index2DVec passingSelection( m_ptBins.size() );
- size_t elementIndex{ 0 };
for ( size_t cutIndex=0; cutIndex < m_ptBins.size(); ++cutIndex ) {
+ size_t elementIndex{ 0 };
for ( auto& i: input ) {
if(!m_acceptAll && m_applyOR && !i.passOR) {
ATH_MSG_DEBUG("skip due to overap, DecisionID " << m_decisionId );
+ elementIndex++;
continue;
}
- elementIndex = &i - &input.front();
-
// If muon event has difference DecisionID, it shouldn't apply.
if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs ) ) {
if ( decideOnSingleObject( i, cutIndex ) == true ) {
@@ -298,6 +297,7 @@ StatusCode TrigmuCombHypoTool::multiplicitySelection(std::vector<TrigmuCombHypoT
} else {
ATH_MSG_DEBUG("Not match DecisionID " << m_decisionId );
}
+ elementIndex++;
}
// If no object passes the selection, multipul selection should stop.
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx
index cf9d4cba82b0bc05b141741cabf0ee27cae22cc5..fef8a085f172215baad60a42d9e0c34365a8209a 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx
@@ -276,7 +276,7 @@ HLT::ErrorCode EFHadCalibHypo::hltExecute(const HLT::TriggerElement* inputTE, bo
// Count only tracks with a certain pT:
if( fabs( (*trackIter2)->pt()) < m_maxPtInIso ) continue;
- const Trk::TrackParameters * param_at_calo = 0;
+ //const Trk::TrackParameters * param_at_calo = 0;
if( msgLvl() <= MSG::VERBOSE ){
msg() << MSG::VERBOSE << "Extrapolating track to calo." << endmsg;
@@ -339,13 +339,13 @@ HLT::ErrorCode EFHadCalibHypo::hltExecute(const HLT::TriggerElement* inputTE, bo
countTracksOnDeltaR++;
}
- if( msgLvl() <= MSG::VERBOSE )
- msg() << MSG::VERBOSE << "Extrapolated "
- << "eta = " << param_at_calo->position().eta() << " and "
- << "phi = " << param_at_calo->position().phi()
- << ", dR = " << dr << endmsg;
+ //if( msgLvl() <= MSG::VERBOSE )
+ // msg() << MSG::VERBOSE << "Extrapolated "
+ // << "eta = " << param_at_calo->position().eta() << " and "
+ // << "phi = " << param_at_calo->position().phi()
+ // << ", dR = " << dr << endmsg;
- delete param_at_calo;
+ //delete param_at_calo;
}
if( msgLvl() <= MSG::INFO )
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index 7b8c93e6aca79ac932a90249bda672b67d77c701..7dccd81c9210b034650e9f63842179ab036347af 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -172,6 +172,7 @@ class TrigEgammaMonAlgBuilder:
'HLT_e5_etcut_L1EM3',
'HLT_e5_lhtight_noringer_L1EM3',
'HLT_e5_lhtight_L1EM3',
+ 'HLT_e5_lhtight_gsf_L1EM3',
]
@@ -199,6 +200,8 @@ class TrigEgammaMonAlgBuilder:
monitoringTP_electron = [
'HLT_e17_lhvloose_L1EM15VHI',
+ 'HLT_e17_lhvloose_gsf_L1EM15VHI',
+ 'HLT_e24_lhvloose_gsf_L1EM20VH',
'HLT_e24_lhvloose_L1EM20VH',
'HLT_e26_lhloose_L1EM15VH',
'HLT_e26_lhmedium_L1EM15VH',
@@ -208,7 +211,8 @@ class TrigEgammaMonAlgBuilder:
'HLT_e26_lhtight_ivartight_L1EM15VH',
'HLT_e26_lhloose_L1EM22VHI',
'HLT_e26_lhmedium_L1EM22VHI',
- 'HLT_e26_lhtight_L1EM22VHI',
+ 'HLT_e26_lhtight_gsf_L1EM22VHI',
+ 'HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI',
'HLT_e26_lhtight_ivarloose_L1EM22VHI',
'HLT_e26_lhtight_ivarmedium_L1EM22VHI',
'HLT_e26_lhtight_ivartight_L1EM22VHI',
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index 1519f1a4e54ea744c4f49c0c93b7b0074da933be..a4c69b02dfdcc3a3799bf416aa0af15632da58d2 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -35,82 +35,54 @@ Chain2L1JetCollDict = { # set L1 jet collection name for L1 jet chains
# HLT jet collections and chains to monitor
############################################
-Chain2JetCollDict = dict() # set HLT jet collection for AT and legacy master HLT jet chains
-JetCollections = dict() # List of HLT jet collections for AT and legacy master
-TurnOnCurves = dict() # List reference chains and offline jet collections to be used for producing turn-on curves
-JetColls2Match = dict()
+Chains2Monitor = dict() # set HLT jet collection, reference chain and offline jet collection for turn-on curves, for AT and legacy master HLT jet chains
+JetCollections = dict() # List of HLT jet collections for AT and legacy master (stating which should be matched and to which offline jet collection
# AthenaMT
-JetCollections['MT'] = [
- 'HLT_AntiKt4EMTopoJets_subjesIS', # default small-R EM
- 'HLT_AntiKt10JetRCJets_subjesIS', # a10r
- 'HLT_AntiKt10LCTopoJets_subjes', # a10
- 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes', # a10t
- 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf', # pflow w/o calo+track GSC
- 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf', # pflow w/ calo+track GSC
- 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf', # pflow w/ residual + calo+track GSC
- 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf', # pflow nojcalib
- 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf', # pflow cssk nojcalib
-]
-Chain2JetCollDict['MT'] = {
- 'HLT_j420_L1J100' : 'HLT_AntiKt4EMTopoJets_subjesIS',
- 'HLT_j260_320eta490_L1J75_31ETA49' : 'HLT_AntiKt4EMTopoJets_subjesIS',
- 'HLT_5j70_0eta240_L14J20' : 'HLT_AntiKt4EMTopoJets_subjesIS',
- 'HLT_3j200_L1J100' : 'HLT_AntiKt4EMTopoJets_subjesIS',
- 'HLT_j460_a10r_L1J100' : 'HLT_AntiKt10JetRCJets_subjesIS',
- 'HLT_j460_a10_lcw_subjes_L1J100' : 'HLT_AntiKt10LCTopoJets_subjes',
- 'HLT_j460_a10t_lcw_jes_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes',
- 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes',
- 'HLT_j45_pf_ftf_L1J15' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
- 'HLT_j45_pf_subjesgscIS_ftf_L1J15' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf',
- 'HLT_j85_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
- 'HLT_j45_pf_nojcalib_ftf_L1J15' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf',
- 'HLT_j45_csskpf_nojcalib_ftf_L1J15' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf',
- 'HLT_10j40_pf_subresjesgscIS_ftf_L14J15' : 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf',
-}
-TurnOnCurves['MT'] = { # ref chain, offline jet coll
- 'HLT_j420_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
- 'HLT_3j200_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
- 'HLT_j460_a10r_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
- 'HLT_j460_a10_lcw_subjes_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
- 'HLT_j460_a10t_lcw_jes_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
- 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
- 'HLT_j85_pf_ftf_L1J20' : ['HLT_j45_pf_ftf_L1J15','AntiKt4EMPFlowJets'],
+JetCollections['MT'] = {
+ 'HLT_AntiKt4EMTopoJets_subjesIS' : { 'MatchTo' : 'AntiKt4EMPFlowJets' }, # default small-R EM
+ 'HLT_AntiKt10JetRCJets_subjesIS' : { 'MatchTo' : 'NONE' }, # a10r
+ 'HLT_AntiKt10LCTopoJets_subjes' : { 'MatchTo' : 'NONE' }, # a10
+ 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes' : { 'MatchTo' : 'NONE' }, # a10t
+ 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf' : { 'MatchTo' : 'AntiKt4EMPFlowJets' }, # pflow w/o calo+track GSC
+ 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf' : { 'MatchTo' : 'AntiKt4EMPFlowJets' }, # pflow w/ calo+track GSC
+ 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf' : { 'MatchTo' : 'AntiKt4EMPFlowJets' }, # pflow w/ residual + calo+track GSC
+ 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf' : { 'MatchTo' : 'NONE' }, # pflow nojcalib
+ 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf' : { 'MatchTo' : 'NONE' }, # pflow cssk nojcalib
}
-JetColls2Match['MT'] = {
- 'HLT_AntiKt4EMTopoJets_subjesIS' : 'AntiKt4EMPFlowJets',
- 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf' : 'AntiKt4EMPFlowJets',
- 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf' : 'AntiKt4EMPFlowJets',
- 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf' : 'AntiKt4EMPFlowJets',
+Chains2Monitor['MT'] = {
+ 'HLT_j420_L1J100' : { 'HLTColl' : 'HLT_AntiKt4EMTopoJets_subjesIS', 'RefChain' : 'HLT_j85_L1J20', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j260_320eta490_L1J75_31ETA49' : { 'HLTColl' : 'HLT_AntiKt4EMTopoJets_subjesIS', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_5j70_0eta240_L14J20' : { 'HLTColl' : 'HLT_AntiKt4EMTopoJets_subjesIS', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_3j200_L1J100' : { 'HLTColl' : 'HLT_AntiKt4EMTopoJets_subjesIS', 'RefChain' : 'HLT_j85_L1J20', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j460_a10r_L1J100' : { 'HLTColl' : 'HLT_AntiKt10JetRCJets_subjesIS', 'RefChain' : 'HLT_j85_L1J20', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j460_a10_lcw_subjes_L1J100' : { 'HLTColl' : 'HLT_AntiKt10LCTopoJets_subjes', 'RefChain' : 'HLT_j85_L1J20', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j460_a10t_lcw_jes_L1J100' : { 'HLTColl' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes', 'RefChain' : 'HLT_j85_L1J20', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : { 'HLTColl' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes', 'RefChain' : 'HLT_j85_L1J20', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j45_pf_ftf_L1J15' : { 'HLTColl' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_j45_pf_subjesgscIS_ftf_L1J15' : { 'HLTColl' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_j85_pf_ftf_L1J20' : { 'HLTColl' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf', 'RefChain' : 'HLT_j45_pf_ftf_L1J15', 'OfflineColl' : 'AntiKt4EMPFlowJets' },
+ 'HLT_j45_pf_nojcalib_ftf_L1J15' : { 'HLTColl' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_j45_csskpf_nojcalib_ftf_L1J15' : { 'HLTColl' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_10j40_pf_subresjesgscIS_ftf_L14J15' : { 'HLTColl' : 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
}
# Legacy
-JetCollections['Legacy'] = [
- 'HLT_xAOD__JetContainer_a4tcemsubjesISFS', # default small-R
- 'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS', # a10r
- 'HLT_xAOD__JetContainer_a10tclcwsubjesFS', # a10
- 'HLT_xAOD__JetContainer_a10ttclcwjesFS', # a10t
-]
-Chain2JetCollDict['Legacy'] = {
- 'HLT_j420' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
- 'HLT_j260_320eta490' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
- 'HLT_j460_a10r_L1J100' : 'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS',
- 'HLT_j460_a10_lcw_subjes_L1J100' : 'HLT_xAOD__JetContainer_a10tclcwsubjesFS',
- 'HLT_j460_a10t_lcw_jes_L1J100' : 'HLT_xAOD__JetContainer_a10ttclcwjesFS',
- 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : 'HLT_xAOD__JetContainer_a10ttclcwjesFS',
- 'HLT_5j70_0eta240' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
- 'HLT_3j200' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
-}
-TurnOnCurves['Legacy'] = { # ref chain, offline jet coll
- 'HLT_j420' : ['HLT_j175','AntiKt4EMTopoJets'],
- 'HLT_j260_320eta490' : ['HLT_j45_320eta490','AntiKt4EMTopoJets'],
- 'HLT_j460_a10r_L1J100' : ['HLT_j175','AntiKt4EMTopoJets'],
- 'HLT_j460_a10_lcw_subjes_L1J100' : ['HLT_j175','AntiKt4EMTopoJets'],
- 'HLT_j460_a10t_lcw_jes_L1J100' : ['HLT_j175','AntiKt4EMTopoJets'],
- 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : ['HLT_j175','AntiKt4EMTopoJets'],
- 'HLT_3j200' : ['HLT_j175','AntiKt4EMTopoJets'],
+JetCollections['Legacy'] = {
+ 'HLT_xAOD__JetContainer_a4tcemsubjesISFS' : { 'MatchTo' : 'NONE' }, # default small-R
+ 'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS' : { 'MatchTo' : 'NONE' }, # a10r
+ 'HLT_xAOD__JetContainer_a10tclcwsubjesFS' : { 'MatchTo' : 'NONE' }, # a10
+ 'HLT_xAOD__JetContainer_a10ttclcwjesFS' : { 'MatchTo' : 'NONE' }, # a10t
}
-JetColls2Match['Legacy'] = {
+Chains2Monitor['Legacy'] = {
+ 'HLT_j420' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS', 'RefChain' : 'HLT_j175', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j260_320eta490' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS', 'RefChain' : 'HLT_j45_320eta490', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j460_a10r_L1J100' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS', 'RefChain' : 'HLT_j175', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j460_a10_lcw_subjes_L1J100' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a10tclcwsubjesFS', 'RefChain' : 'HLT_j175', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_j460_a10t_lcw_jes_L1J100' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a10ttclcwjesFS', 'RefChain' : 'HLT_j175', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a10ttclcwjesFS', 'RefChain' : 'HLT_j175', 'OfflineColl' : 'AntiKt4EMTopoJets' },
+ 'HLT_5j70_0eta240' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS', 'RefChain' : 'NONE', 'OfflineColl' : 'NONE' },
+ 'HLT_3j200' : { 'HLTColl' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS', 'RefChain' : 'HLT_j175', 'OfflineColl' : 'AntiKt4EMTopoJets' },
}
#########################################################
@@ -133,6 +105,7 @@ def getEtaRange(chain):
# Schedule more histograms for dedicated jet collections
#########################################################
from JetMonitoring.JetMonitoringConfig import JetMonAlgSpec, HistoSpec, EventHistoSpec, SelectSpec, ToolSpec #VarSpec can be added to define specific/custom variables
+from AthenaConfiguration.ComponentFactory import CompFactory
# All offline jet collections
ExtraOfflineHists = [
@@ -186,12 +159,12 @@ def TrigJetMonConfig(inputFlags):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
cfg = ComponentAccumulator()
- # Match HLT to offline jets
- for j1,j2 in JetColls2Match[InputType].items():
- from AthenaConfiguration.ComponentFactory import CompFactory
- name = 'Matching_{}_{}'.format(j1,j2)
- alg = CompFactory.JetMatcherAlg(name, JetContainerName1=j1,JetContainerName2=j2)
- cfg.addEventAlgo(alg)
+ # Match HLT jets to offline jets
+ for hltColl,collDict in JetCollections[InputType].items():
+ if collDict['MatchTo'] != 'NONE':
+ name = 'Matching_{}_{}'.format(hltColl,collDict['MatchTo'])
+ alg = CompFactory.JetMatcherAlg(name, JetContainerName1=hltColl,JetContainerName2=collDict['MatchTo'])
+ cfg.addEventAlgo(alg)
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
@@ -221,7 +194,8 @@ def TrigJetMonConfig(inputFlags):
monitorConf.toAlg(helper)
# Loop over HLT jet chains
- for chain,jetcoll in Chain2JetCollDict[InputType].items():
+ for chain,chainDict in Chains2Monitor[InputType].items():
+ jetcoll = chainDict['HLTColl']
# kinematic plots
if AthenaMT:
chainMonitorConfT = jetChainMonitoringConfig(inputFlags,jetcoll,chain,AthenaMT,True)
@@ -229,13 +203,8 @@ def TrigJetMonConfig(inputFlags):
chainMonitorConfF = jetChainMonitoringConfig(inputFlags,jetcoll,chain,AthenaMT,False)
chainMonitorConfF.toAlg(helper)
# efficiency plots
- refChain = 'NONE'
- offlineJetColl = 'NONE'
- if chain in TurnOnCurves[InputType]:
- refChain = TurnOnCurves[InputType][chain][0]
- offlineJetColl = TurnOnCurves[InputType][chain][1]
- if offlineJetColl != 'NONE' and refChain != 'NONE':
- effMonitorConf = jetEfficiencyMonitoringConfig(inputFlags,jetcoll,offlineJetColl,chain,refChain,AthenaMT)
+ if chainDict['RefChain'] != 'NONE' and chainDict['OfflineColl'] != 'NONE':
+ effMonitorConf = jetEfficiencyMonitoringConfig(inputFlags,jetcoll,chainDict['OfflineColl'],chain,chainDict['RefChain'],AthenaMT)
effMonitorConf.toAlg(helper)
cfg.merge(helper.result())
@@ -334,7 +303,7 @@ def jetMonitoringConfig(inputFlags,jetcoll,athenaMT):
print('bottomlevel = '+str(conf.bottomLevelDir))
group = monhelper.addGroup(parentAlg, conf.Group, conf.topLevelDir+'/'+conf.bottomLevelDir+'/NoTriggerSelection/')
# define the histogram
- group.defineHistogram('ptdiff',title='title', type="TH1F", path='MatchedJets_{}'.format(JetColls2Match[InputType][jetcoll]), xbins=100 , xmin=-100000, xmax=100000. ,)
+ group.defineHistogram('ptdiff',title='title', type="TH1F", path='MatchedJets_{}'.format(JetCollections[InputType][jetcoll]['MatchTo']), xbins=100 , xmin=-100000, xmax=100000. ,)
# Declare a configuration dictionnary for a JetContainer
if isOnline:
@@ -352,8 +321,8 @@ def jetMonitoringConfig(inputFlags,jetcoll,athenaMT):
else:
for hist in ExtraLargeROnlineHists: conf.appendHistos(hist)
# Add matched jets plots
- if jetcoll in JetColls2Match[InputType]:
- matchedJetColl = JetColls2Match[InputType][jetcoll]
+ if JetCollections[InputType][jetcoll]['MatchTo'] != 'NONE':
+ matchedJetColl = JetCollections[InputType][jetcoll]['MatchTo']
name = 'jetMatched_{}_{}'.format(jetcoll,matchedJetColl)
jetmatchKey = '{}.matched_{}'.format(jetcoll,matchedJetColl)
jetptdiffKey = '{}.ptdiff_{}'.format(jetcoll,matchedJetColl)
@@ -472,7 +441,7 @@ def jetEfficiencyMonitoringConfig(inputFlags,onlinejetcoll,offlinejetcoll,chain,
# create a monitoring group with the histo path starting from the parentAlg
group = monhelper.addGroup(parentAlg, conf.Group, conf.topLevelDir+jetcollFolder+'/')
# define the histogram
- group.defineHistogram('trigPassed,jetVar',title='titletrig', type="TEfficiency", path=chainFolder, xbins=100 , xmin=0, xmax=500000. ,)
+ group.defineHistogram('trigPassed,jetVar',title='titletrig', type="TEfficiency", path=chainFolder, xbins=1000 , xmin=0, xmax=1000000. ,)
# Get jet index and eta selection for offline jets
parts = chain.split('j')
@@ -528,12 +497,16 @@ if __name__=='__main__':
# Read arguments
parser = argparse.ArgumentParser()
- parser.add_argument('--athenaMT', action='store_true', dest='athenaMT', default=False)
- parser.add_argument('--legacy', action='store_true', dest='legacy', default=False)
- parser.add_argument('--input', action='store', dest='inputFile')
- args = parser.parse_args()
- AthenaMT = args.athenaMT
- Legacy = args.legacy
+ parser.add_argument('--athenaMT', action='store_true', dest='athenaMT', default=False)
+ parser.add_argument('--legacy', action='store_true', dest='legacy', default=False)
+ parser.add_argument('--runTruthReco', action='store_true', dest='runTruthReco', default=False)
+ parser.add_argument('--printDetailedConfig', action='store_true', dest='printDetailedConfig', default=False)
+ parser.add_argument('--input', action='store', dest='inputFile')
+ args = parser.parse_args()
+ AthenaMT = args.athenaMT
+ Legacy = args.legacy
+ RunTruth = args.runTruthReco
+ PrintDetailedConfig = args.printDetailedConfig
# Protections
if AthenaMT and Legacy:
print('ERROR: Choose AthenaMT or Legacy, exiting')
@@ -567,15 +540,39 @@ if __name__=='__main__':
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg = MainServicesCfg(ConfigFlags)
+
+ # AthenaMT or Legacy
+ InputType = 'MT' if AthenaMT else 'Legacy'
+
+ # Reconstruct small-R truth jets
+ if RunTruth:
+ from JetRecConfig.StandardSmallRJets import AntiKt4Truth # import the standard definitions
+ # Add the components from our jet reconstruction job
+ from JetRecConfig.JetRecConfig import JetRecCfg
+ comp = JetRecCfg(AntiKt4Truth,ConfigFlags)
+ cfg.merge(comp)
+ # Write jet collection to AOD
+ # First define the output list
+ key = "{0}Jets".format(AntiKt4Truth.basename)
+ outputlist = ["xAOD::JetContainer#"+key,"xAOD::JetAuxContainer#"+key+"Aux.-PseudoJet"]
+ # Now get the output stream components
+ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ cfg.merge(OutputStreamCfg(ConfigFlags,"xAOD",ItemList=outputlist))
+
cfg.merge(PoolReadCfg(ConfigFlags))
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(ConfigFlags,'TrigJetMonitorAlgorithm')
+ cfg.merge(helper.result()) # merge it to add the sequence needed to add matchers
- # AthenaMT or Legacy
- InputType = 'MT' if AthenaMT else 'Legacy'
+ # Match HLT jets to offline jets
+ for hltColl,collDict in JetCollections[InputType].items():
+ if collDict['MatchTo'] != 'NONE':
+ name = 'Matching_{}_{}'.format(hltColl,collDict['MatchTo'])
+ alg = CompFactory.JetMatcherAlg(name, JetContainerName1=hltColl,JetContainerName2=collDict['MatchTo'])
+ cfg.addEventAlgo(alg,sequenceName='AthMonSeq_TrigJetMonitorAlgorithm') # Add matchers to monitoring alg sequence
# Loop over L1 jet collectoins
for jetcoll in L1JetCollections:
@@ -600,23 +597,22 @@ if __name__=='__main__':
monitorConf.toAlg(helper)
# Loop over HLT jet chains
- for chain,jetcoll in Chain2JetCollDict[InputType].items():
+ for chain,chainDict in Chains2Monitor[InputType].items():
+ jetcoll = chainDict['HLTColl']
+ # kinematic plots
if AthenaMT:
chainMonitorConfT = jetChainMonitoringConfig(ConfigFlags,jetcoll,chain,AthenaMT,True)
chainMonitorConfT.toAlg(helper)
chainMonitorConfF = jetChainMonitoringConfig(ConfigFlags,jetcoll,chain,AthenaMT,False)
chainMonitorConfF.toAlg(helper)
-
- # Produce efficiency plots
- refChain = 'NONE'
- offlineJetColl = 'NONE'
- if chain in TurnOnCurves[InputType]:
- refChain = TurnOnCurves[InputType][chain][0]
- offlineJetColl = TurnOnCurves[InputType][chain][1]
- if offlineJetColl != 'NONE' and refChain != 'NONE':
- effMonitorConf = jetEfficiencyMonitoringConfig(ConfigFlags,jetcoll,offlineJetColl,chain,refChain,AthenaMT)
+ # efficiency plots
+ if chainDict['RefChain'] != 'NONE' and chainDict['OfflineColl'] != 'NONE':
+ effMonitorConf = jetEfficiencyMonitoringConfig(ConfigFlags,jetcoll,chainDict['OfflineColl'],chain,chainDict['RefChain'],AthenaMT)
effMonitorConf.toAlg(helper)
cfg.merge(helper.result())
+ # Print config
+ cfg.printConfig(withDetails=PrintDetailedConfig)
+
cfg.run()
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.h b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.h
index 6a905fc31acaae95fb2bc43af66c1e6b2c9c0ed0..c004d0f4f4e9390c6bd0cef8b14543020fece21e 100755
--- a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.h
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigGenericMonitoringTool.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMONITORBASE_TRIGGENERICMONITORINGTOOL_H
@@ -120,9 +120,9 @@ template<class M, class P> // Mutex and Proxy type
class TrigGenericMonitoringTool : public TrigMonitorToolBase {
public:
- TrigGenericMonitoringTool<M,P>(const std::string & type,
- const std::string & name,
- const IInterface* parent);
+ TrigGenericMonitoringTool(const std::string & type,
+ const std::string & name,
+ const IInterface* parent);
virtual ~TrigGenericMonitoringTool();
virtual StatusCode bookHists();
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx
index 3f754311f8745882d66b57eb3598e2f7ed37f07f..3dc11664e00a6c140ec545591c0ac7718268c32a 100755
--- a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ********************************************************************
@@ -37,7 +37,6 @@ TrigMonitorToolBase::~TrigMonitorToolBase()
StatusCode TrigMonitorToolBase::initialize() {
- ATH_CHECK( setProperties() );
ATH_CHECK( m_histSvc.retrieve() );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
index c09400a12dac746570da1dae746a1bcc70ec921f..e83208c45753a0b9c823c59db0820c306536b076 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
@@ -230,6 +230,7 @@ class TrigTauMonAlgBuilder:
for l1seed in l1seeds:
if not l1seed :
continue
+ self.bookL1( monAlg, l1seed )
self.bookL1EffHistograms( monAlg, l1seed, nProng='1P')
self.bookL1EffHistograms( monAlg, l1seed, nProng='MP')
@@ -280,6 +281,43 @@ class TrigTauMonAlgBuilder:
defineEachStepHistograms('tauPhi','#phi', 16, -3.2, 3.2)
defineEachStepHistograms('averageMu', 'average pileup', 10, 0., 80.)
+ #
+ # Booking L1 Variables
+ #
+
+ def bookL1( self, monAlg, trigL1Item):
+
+ monGroupName = trigL1Item+'_L1'
+ monGroupPath = 'L1/'+trigL1Item+'/L1'
+
+ monGroup = self.helper.addGroup( monAlg, monGroupName,
+ self.basePath+'/'+monGroupPath )
+
+ monGroup.defineHistogram('L1RoIEt;L1RoIEta', type='TH2F', title='L1 RoI Et vs Eta; E_{T}[GeV]; #eta',
+ path=monGroupPath,
+ xbins=100,xmin=0,xmax=100,
+ ybins=100,ymin=-2.6,ymax=2.6)
+ monGroup.defineHistogram('L1RoIEt;L1RoIPhi', type='TH2F', title='L1 RoI Et vs Phi; E_{T}[GeV]; #phi',
+ path=monGroupPath,
+ xbins=100,xmin=0,xmax=100,
+ ybins=100,ymin=-3.2,ymax=3.2)
+ monGroup.defineHistogram('L1RoIEta;L1RoIPhi', type='TH2F', title='L1 RoI Eta vs Phi; #eta; #phi',
+ path=monGroupPath,
+ xbins=100,xmin=-2.6,xmax=2.6,
+ ybins=100,ymin=-3.2,ymax=3.2)
+ monGroup.defineHistogram('L1RoIEMIso', title='L1 RoI EM Isol ; E_{T}^{EM Isol}[GeV]; N RoI',xbins=16,xmin=-2,xmax=30)
+ monGroup.defineHistogram('L1RoIEta', title='L1 RoI Eta ; #eta; N RoI',xbins=100,xmin=-2.6,xmax=2.6)
+ monGroup.defineHistogram('L1RoIHadCore', title='L1 RoI HAD Core ; E_{T}^{HAD}[GeV]; N RoI',xbins=16,xmin=-2,xmax=30)
+ monGroup.defineHistogram('L1RoIHadIsol', title='L1 RoI HAD Isol ; E_{T}^{HAD Isol}[GeV]; N RoI',xbins=16,xmin=-2,xmax=30)
+ monGroup.defineHistogram('L1RoIPhi', title='L1 RoI Phi ; #phi; N RoI',xbins=100,xmin=-3.2,xmax=3.2)
+ monGroup.defineHistogram('L1RoITauClus', title='L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI',xbins=260,xmin=0,xmax=130)
+ monGroup.defineHistogram('L1RoITauClus;L1RoIEMIso', type='TH2F', title='L1 RoI TauClus vs EMiso ; E_{T}[GeV]; E_{T}^{EM Isol}[GeV]',
+ path=monGroupPath,
+ xbins=140,xmin=10,xmax=80,
+ ybins=42,ymin=-1,ymax=20)
+ monGroup.defineHistogram('L1RoIeT', title='L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI',xbins=260,xmin=0,xmax=130)
+
+
#
# Book RNN Variables
#
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
index 9dfa8256c990b7d4c695c68ddf742ed569aa991c..d86a75e07cecd2c1cddf1ffd9d1d0f9394fdca9f 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
@@ -54,7 +54,7 @@ StatusCode TrigTauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
std::vector< std::pair<const xAOD::TauJet*, const TrigCompositeUtils::Decision*>> pairObjs;
std::vector<std::string> L1seed_list;
- bool fill_l1eff = false;
+ bool fill_l1 = false;
for(const auto& trigger : m_trigList){
@@ -67,20 +67,22 @@ StatusCode TrigTauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
}
if(info.trigL1Item.empty()){ // L1 item not found
- fill_l1eff = false;
+ fill_l1 = false;
}
else if (std::find(L1seed_list.begin(), L1seed_list.end(), info.trigL1Item) == L1seed_list.end())
{
// check if L1 seed has been already filled -> L1 seed must be filled only once for triggers with same L1 seed
- fill_l1eff = true;
+ fill_l1 = true;
L1seed_list.push_back(info.trigL1Item);
} else {
- fill_l1eff = false;
+ fill_l1 = false;
}
- fillDistributions( ctx, pairObjs, trigger, info.HLTthr, fill_l1eff, info.trigL1Item, info.L1thr);
-
+ fillDistributions( ctx, pairObjs, trigger, info.HLTthr);
+ if(fill_l1){
+ fillL1Distributions( ctx, pairObjs, trigger ,info.trigL1Item, info.L1thr);
+ }
pairObjs.clear();
}
@@ -136,7 +138,7 @@ StatusCode TrigTauMonitorAlgorithm::executeNavigation( const EventContext& ctx,
return StatusCode::SUCCESS;
}
-void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::vector< std::pair< const xAOD::TauJet*, const TrigCompositeUtils::Decision * >> pairObjs, std::string trigger, float HLTthr, const bool fill_l1eff, const std::string trigL1Item, float L1thr) const
+void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::vector< std::pair< const xAOD::TauJet*, const TrigCompositeUtils::Decision * >> pairObjs, std::string trigger, float HLTthr) const
{
ATH_MSG_DEBUG ("TrigTauMonitorAlgorithm::fillDistributions");
@@ -144,8 +146,6 @@ void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::ve
std::vector<const xAOD::TauJet*> offline_for_hlt_tau_vec_1p; // offline 1p taus used for studying HLT performance
std::vector<const xAOD::TauJet*> offline_for_hlt_tau_vec_mp; // offline mp taus used for studying HLT performance
- std::vector<const xAOD::TauJet*> offline_for_l1_tau_vec_1p; // offline 1p taus used for studying L1 performance
- std::vector<const xAOD::TauJet*> offline_for_l1_tau_vec_mp; // offline mp taus used for studying L1 performance
std::vector<const xAOD::TauJet*> online_tau_vec_1p; // online 1p taus used for studying HLT performance
std::vector<const xAOD::TauJet*> online_tau_vec_mp; // online mp taus used for studying HLT performance
@@ -164,15 +164,7 @@ void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::ve
}else if(nTracks>1 && ( pairObj.first->pt() > (HLTthr-thresholdOffset)*1.e3)){
offline_for_hlt_tau_vec_mp.push_back(pairObj.first);
}
-
- // filling vectors for studying L1 performance
- if(nTracks==1 && ( pairObj.first->pt() > (L1thr-thresholdOffset)*1.e3)){
- offline_for_l1_tau_vec_1p.push_back(pairObj.first);
- }else if(nTracks>1 && ( pairObj.first->pt() > (L1thr-thresholdOffset)*1.e3)){
- offline_for_l1_tau_vec_mp.push_back(pairObj.first);
- }
}
-
// Offline
if(info.isRNN){
fillRNNInputVars( trigger, offline_for_hlt_tau_vec_1p,"1P", false );
@@ -228,19 +220,76 @@ void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::ve
fillHLTEfficiencies(ctx, trigger, offline_for_hlt_tau_vec_mp, online_tau_vec_mp, "MP");
}
- if(fill_l1eff) {
- fillL1Efficiencies(ctx, trigger, offline_for_l1_tau_vec_1p, "1P", trigL1Item);
- fillL1Efficiencies(ctx, trigger, offline_for_l1_tau_vec_mp, "MP", trigL1Item);
- }
-
offline_for_hlt_tau_vec_1p.clear();
offline_for_hlt_tau_vec_mp.clear();
- offline_for_l1_tau_vec_1p.clear();
- offline_for_l1_tau_vec_mp.clear();
online_tau_vec_1p.clear();
online_tau_vec_mp.clear();
}
+void TrigTauMonitorAlgorithm::fillL1Distributions(const EventContext& ctx, std::vector< std::pair< const xAOD::TauJet*, const TrigCompositeUtils::Decision * >> pairObjs, std::string trigger, const std::string trigL1Item, float L1thr) const
+ {
+ ATH_MSG_DEBUG ("TrigTauMonitorAlgorithm::fillL1Distributions");
+ const double thresholdOffset{10.0};
+ const TrigInfo info = getTrigInfo(trigger);
+ std::vector<const xAOD::TauJet*> tau_vec; // offline taus
+ std::vector<const xAOD::TauJet*> offline_for_l1_tau_vec_1p; // offline 1p taus
+ std::vector<const xAOD::TauJet*> offline_for_l1_tau_vec_mp; // offline mp taus
+ std::vector<const xAOD::EmTauRoI*> L1rois; // used for studying L1 performance
+
+ for( auto pairObj: pairObjs )
+ {
+ int nTracks=-1;
+ pairObj.first->detail(xAOD::TauJetParameters::nChargedTracks, nTracks);
+ ATH_MSG_DEBUG("NTracks Offline: " << nTracks);
+ // filling vectors 1p and mp
+ if(nTracks==1 && ( pairObj.first->pt() > (L1thr-thresholdOffset)*1.e3)){
+ offline_for_l1_tau_vec_1p.push_back(pairObj.first);
+ }else if(nTracks>1 && ( pairObj.first->pt() > (L1thr-thresholdOffset)*1.e3)){
+ offline_for_l1_tau_vec_mp.push_back(pairObj.first);
+ }
+ }
+
+
+ std::string tauContainerName = "HLT_TrigTauRecMerged_Precision";
+ if(trigger.find("EF_")!=std::string::npos || trigger.find("MVA_")!=std::string::npos) tauContainerName="HLT_TrigTauRecMerged_MVA";
+ ATH_MSG_DEBUG("Tau ContainerName is: " << tauContainerName);
+
+ auto vec = m_trigDecTool->features<xAOD::TauJetContainer>(trigger,TrigDefs::includeFailedDecisions , tauContainerName );
+ for( auto &featLinkInfo : vec ){
+ const auto *feat = *(featLinkInfo.link);
+ if(!feat) continue;
+ // If not pass, continue
+ const TrigCompositeUtils::Decision* decision = featLinkInfo.source;
+
+ const TrigCompositeUtils::LinkInfo<TrigRoiDescriptorCollection> initialRoILinkInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( decision, "initialRoI" );
+ if (!initialRoILinkInfo.isValid()) {
+ ATH_MSG_WARNING("Invalid TrigRoiDescriptor");
+ continue;
+ }
+ ElementLink<TrigRoiDescriptorCollection> roi = initialRoILinkInfo.link;
+ const xAOD::EmTauRoI *aEmTau_ROI = findLVL1_ROI(ctx, *roi);
+ if(!aEmTau_ROI) continue;
+ L1rois.push_back(aEmTau_ROI);
+ }
+
+ if(L1rois.size()==0) {ATH_MSG_DEBUG("L1rois vector is empty");return;}
+ else ATH_MSG_DEBUG("L1rois vector size is: "<< L1rois.size());
+
+ //if(info.isL1){
+ fillL1(trigL1Item, L1rois);
+ //}
+
+ fillL1Efficiencies(ctx, offline_for_l1_tau_vec_1p, "1P", trigL1Item, L1rois);
+ fillL1Efficiencies(ctx, offline_for_l1_tau_vec_mp, "MP", trigL1Item, L1rois);
+
+ offline_for_l1_tau_vec_1p.clear();
+ offline_for_l1_tau_vec_mp.clear();
+ L1rois.clear();
+ }
+
+
+
+
void TrigTauMonitorAlgorithm::fillHLTEfficiencies(const EventContext& ctx, const std::string trigger, std::vector<const xAOD::TauJet*> offline_tau_vec, std::vector<const xAOD::TauJet*> online_tau_vec, std::string nProng) const
{
ATH_MSG_DEBUG("Fill HLT efficiencies: " << trigger);
@@ -270,10 +319,10 @@ void TrigTauMonitorAlgorithm::fillHLTEfficiencies(const EventContext& ctx, const
}
-void TrigTauMonitorAlgorithm::fillL1Efficiencies(const EventContext& ctx, const std::string trigger, std::vector<const xAOD::TauJet*> offline_tau_vec, std::string nProng, const std::string trigL1Item) const
+void TrigTauMonitorAlgorithm::fillL1Efficiencies( const EventContext& ctx , std::vector<const xAOD::TauJet*> offline_tau_vec, std::string nProng, const std::string trigL1Item, std::vector<const xAOD::EmTauRoI*> L1rois) const
{
ATH_MSG_DEBUG("Fill L1 efficiencies: " << trigL1Item);
-
+ ATH_MSG_DEBUG("CHECK4" << L1rois.size());
std::string monGroupName = trigL1Item+"_L1_Efficiency_"+nProng;
auto monGroup = getGroup(monGroupName);
@@ -284,18 +333,6 @@ void TrigTauMonitorAlgorithm::fillL1Efficiencies(const EventContext& ctx, const
auto averageMu = Monitored::Scalar<float>(monGroupName+"_averageMu",0.0);
auto L1_match = Monitored::Scalar<bool>(monGroupName+"_L1pass",false);
- const std::vector<Trig::Feature<TrigRoiDescriptor> > vec_L1roi_EFall =
- m_trigDecTool->features(trigger,TrigDefs::alsoDeactivateTEs).get<TrigRoiDescriptor>("initialRoI",TrigDefs::alsoDeactivateTEs);
- std::vector<Trig::Feature<TrigRoiDescriptor> >::const_iterator CI = vec_L1roi_EFall.begin();
-
- std::vector<const xAOD::EmTauRoI*> L1rois;
- for (;CI!=vec_L1roi_EFall.end(); ++CI){
- if(!(CI->cptr())) continue;
- const xAOD::EmTauRoI *aEmTau_ROI = findLVL1_ROI(ctx, CI->cptr());
- if(!aEmTau_ROI) continue;
- L1rois.push_back(aEmTau_ROI);
- }
-
for(auto offline_tau : offline_tau_vec){
tauPt = offline_tau->pt()/1e3;
@@ -333,6 +370,32 @@ const xAOD::EmTauRoI* TrigTauMonitorAlgorithm::findLVL1_ROI(const EventContext&
return 0;
+}
+
+ void TrigTauMonitorAlgorithm::fillL1(const std::string trigL1Item, std::vector<const xAOD::EmTauRoI*> L1rois) const
+ {
+ ATH_MSG_DEBUG("Fill L1: " << trigL1Item);
+ //ATH_MSG_DEBUG("CHECK2" << L1rois);
+ std::string monGroupName = trigL1Item+"_L1";
+
+ auto monGroup = getGroup(monGroupName);
+ //EmTauRoI_v2.h
+
+ auto L1RoIEt = Monitored::Collection("L1RoIEt" , L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->eT()/1e3;});
+ //ATH_MSG_DEBUG("CHECK3" << L1RoIEt);
+ ATH_MSG_DEBUG("CHECK3");
+ auto L1RoIEta = Monitored::Collection("L1RoIEta" , L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->eta();});
+ auto L1RoIPhi = Monitored::Collection("L1RoIPhi" , L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->phi();});
+ auto L1RoITauClus = Monitored::Collection("L1RoITauClus", L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->tauClus();});
+ auto L1RoIisol = Monitored::Collection("L1RoIisol" , L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->isol();});
+ auto L1RoIEMIsol = Monitored::Collection("L1RoIEMIsol" , L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->emIsol();});
+ auto L1RoIHadCore = Monitored::Collection("L1RoIHadCore", L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->hadCore();});
+ auto L1RoIHadIsol = Monitored::Collection("L1RoIHadIsol", L1rois, [] (const xAOD::EmTauRoI* L1roi){ return L1roi->hadIsol();});
+
+ fill(monGroup,L1RoIEt,L1RoIEta,L1RoIPhi,L1RoITauClus,L1RoIisol,L1RoIEMIsol,L1RoIHadCore,L1RoIHadIsol);
+
+ ATH_MSG_DEBUG("AFTER L1: " << trigL1Item);
+
}
void TrigTauMonitorAlgorithm::fillBDTOut(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec,const std::string nProng) const
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.h
index 3a781ebad855ceb5f452bdcc942d79bfd60d8fec..d5d14695bf5952404f016689b08d80d2c364ae11 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.h
@@ -50,11 +50,13 @@ class TrigTauMonitorAlgorithm : public AthMonitorAlgorithm {
void fillRNNTrack(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec, bool online) const;
void fillRNNCluster(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec, bool online) const;
void fillbasicVars(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec, bool online) const;
+ void fillL1(const std::string trigL1Item, std::vector<const xAOD::EmTauRoI*> L1rois) const;
void fillBDTNoCorr(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec,const std::string nProng) const;
void fillBDTOut(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec,const std::string nProng) const;
- void fillDistributions(const EventContext& ctx, std::vector< std::pair< const xAOD::TauJet*, const TrigCompositeUtils::Decision * >> pairObjs, const std::string trigger, float HLTthr, const bool fill_l1eff, const std::string trigL1Item, float L1Tthr) const;
+ void fillDistributions(const EventContext& ctx, std::vector< std::pair< const xAOD::TauJet*, const TrigCompositeUtils::Decision * >> pairObjs, const std::string trigger, float HLTthr) const;
+ void fillL1Distributions(const EventContext& ctx, std::vector< std::pair< const xAOD::TauJet*, const TrigCompositeUtils::Decision * >> pairObjs, std::string trigger, const std::string trigL1Item, float L1thr) const;
void fillHLTEfficiencies(const EventContext& ctx,const std::string trigger, std::vector<const xAOD::TauJet*> offline_tau_vec, std::vector<const xAOD::TauJet*> online_tau_vec, std::string nProng) const;
- void fillL1Efficiencies(const EventContext& ctx, const std::string trigger, std::vector<const xAOD::TauJet*> offline_tau_vec,std::string nProng, const std::string trigL1Item) const;
+ void fillL1Efficiencies(const EventContext& ctx, std::vector<const xAOD::TauJet*> offline_tau_vec, std::string nProng, const std::string trigL1Item, std::vector<const xAOD::EmTauRoI*> L1rois) const;
inline double dR(const double eta1, const double phi1, const double eta2, const double phi2) const
{
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
index 756d4de7603190b837b6102fb4377fcac2b90e23..03b6c3775b868935b38a1291aa6868746184435f 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
@@ -47,8 +47,7 @@ This is a base class for HLT InputMakers to reduce boilerplate and enforce the c
/// does the standard handling of input decisions: read from handles with all the checks, create merged output handles and link them, copies links and return outputHandles
StatusCode decisionInputToOutput(const EventContext& context, SG::WriteHandle<TrigCompositeUtils::DecisionContainer>& outputHandle) const;
- /// Checks for merge-able Decision objects coming from N upstream filters. Check based on stored element link in typed CONTAINER with 'linkNameToMatch'
- template<typename CONTAINER>
+ /// Checks for merge-able Decision objects coming from N upstream filters. Check based on most-recent element link with name 'linkNameToMatch'. Works for any link type.
size_t matchDecision(const TrigCompositeUtils::DecisionContainer* outDecisions,
const TrigCompositeUtils::Decision* toMatch,
const std::string& linkNameToMatch) const;
@@ -68,6 +67,4 @@ This is a base class for HLT InputMakers to reduce boilerplate and enforce the c
};
-#include "InputMakerBase.icc"
-
#endif // DECISIONHANDLING_INPUTMAKERBASE_H
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.icc b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.icc
deleted file mode 100644
index 496914524d5369504f9b01b286bdfb3b62066629..0000000000000000000000000000000000000000
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.icc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-template<typename CONTAINER>
-size_t InputMakerBase::matchDecision(const TrigCompositeUtils::DecisionContainer* outDecisions,
- const TrigCompositeUtils::Decision* toMatch,
- const std::string& linkNameToMatch) const
-{
- const std::vector<TrigCompositeUtils::LinkInfo<CONTAINER>> myObject = TrigCompositeUtils::findLinks<CONTAINER>(toMatch, linkNameToMatch, TrigDefs::lastFeatureOfType);
-
- if (myObject.size() != 1) {
- ATH_MSG_ERROR("InputMakerBase::matchDecision Did not locate exactly one object of type '" << ClassID_traits<CONTAINER>::typeName() << "' having searched for a link named '" << linkNameToMatch
- << "', found " << myObject.size() << ". Unable to match this Decision object.");
- for (const auto& li : myObject) {
- ATH_MSG_ERROR(" -- " << li.link.dataID() << ":" << li.link.index() << ". Dump:" << *(li.source));
- }
- return std::numeric_limits<std::size_t>::max();
- }
-
- // Look for match
- for (size_t index = 0; index < outDecisions->size(); ++index) {
- const TrigCompositeUtils::Decision* checkDecision = outDecisions->at(index);
- if (checkDecision == nullptr) {
- ATH_MSG_ERROR("Failed to get Decision object " << index << " of " << outDecisions->size());
- return std::numeric_limits<std::size_t>::max();
- }
- const std::vector<TrigCompositeUtils::LinkInfo<CONTAINER>> checkObject = TrigCompositeUtils::findLinks<CONTAINER>(checkDecision, linkNameToMatch, TrigDefs::lastFeatureOfType);
- if (checkObject.size() != 1) {
- ATH_MSG_ERROR("Logic error. Expect myObject().size() == 1 and checkObject.size() == 1."
- << " But have checkObject.size() = " << checkObject.size() << ". Unable to match this Decision object.");
- return std::numeric_limits<std::size_t>::max();
- }
- if (myObject.at(0).link == checkObject.at(0).link) {
- return index;
- }
- }
-
- return std::numeric_limits<std::size_t>::max();
-}
diff --git a/Trigger/TrigSteer/DecisionHandling/src/HypoBase.cxx b/Trigger/TrigSteer/DecisionHandling/src/HypoBase.cxx
index 9f5244df6a12e1b00e57cac7eba1c4082dd92de0..37e07dedac8730d665463a9cf8171e32f9e77163 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/HypoBase.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/HypoBase.cxx
@@ -150,16 +150,19 @@ StatusCode HypoBase::validateLogicalFlow(const ElementLink<DecisionContainer>& d
ATH_CHECK( seed.isValid() );
DecisionIDContainer seedIDSet;
decisionIDs(*seed, seedIDSet);
- if (passed(id, seedIDSet)) {
+ // Id may be a chain-ID (represetns a whole chain) or a leg-ID (represents just a single leg of a multi-leg chain)
+ // Is ID is in this parent's set of passed IDs?
+ // Or, (if ID is a leg-ID) is the chain-ID of leg-ID in the parent's set of passed IDs?
+ if (passed(id, seedIDSet) or passed(getIDFromLeg(id).numeric(), seedIDSet)) {
++parentsWithDecision;
}
- else{ //adding also Ids from the legs
- for (auto sid: seedIDSet){
- if (TrigCompositeUtils::getIDFromLeg(sid).numeric() == id){
- ++parentsWithDecision;
- break;
- }
- }
+ else{ // Or, for each of the seed IDs, if the seed ID is a leg-ID, is the seed chain-ID of the seed leg-ID the same as ID?
+ for (auto sid: seedIDSet){
+ if (getIDFromLeg(sid).numeric() == id){
+ ++parentsWithDecision;
+ break;
+ }
+ }
}
}
if (mode == kRequireOne && parentsWithDecision == 0) {
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
index 8b445be045acfeae315b53f2388803e992dc5039..c726f8b63a77eb51942f81a0d154a562654a4bbd 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
@@ -94,13 +94,55 @@ StatusCode InputMakerBase::decisionInputToOutput(const EventContext& context, SG
bool InputMakerBase::matchInCollection(const DecisionContainer* toMatchAgainst, const Decision* toMatch, size_t& matchIndex) const {
if ( m_mergeUsingFeature ) {
- matchIndex = matchDecision<xAOD::IParticleContainer>(toMatchAgainst, toMatch, featureString());
+ matchIndex = matchDecision(toMatchAgainst, toMatch, featureString());
} else {
- matchIndex = matchDecision<TrigRoiDescriptorCollection>(toMatchAgainst, toMatch, m_roisLink.value());
+ matchIndex = matchDecision(toMatchAgainst, toMatch, m_roisLink.value());
}
return (matchIndex != std::numeric_limits<std::size_t>::max());
}
+size_t InputMakerBase::matchDecision(const DecisionContainer* outDecisions, const Decision* toMatch, const std::string& linkNameToMatch) const {
+
+ std::set<const Decision*> cache; //!< Used to accelerate the recursive typelessFindLinks. Should be cleared between uses.
+ std::vector<uint32_t> keysA;
+ std::vector<uint32_t> clidsA;
+ std::vector<uint16_t> indiciesA;
+ TrigCompositeUtils::typelessFindLinks(toMatch, linkNameToMatch, keysA, clidsA, indiciesA, TrigDefs::lastFeatureOfType, &cache);
+
+ if (keysA.size() != 1) {
+ ATH_MSG_ERROR("InputMakerBase::matchDecision Did not locate exactly one object having searched for a link named '" << linkNameToMatch
+ << "', found " << keysA.size() << ". Unable to match this Decision object.");
+ for (size_t i = 0; i < keysA.size(); ++i) {
+ ATH_MSG_ERROR(" -- Key:" << keysA.at(i) << " Index:" << indiciesA.at(i) << " CLID:" << clidsA.at(i));
+ }
+ return std::numeric_limits<std::size_t>::max();
+ }
+
+ // Look for match
+ for (size_t index = 0; index < outDecisions->size(); ++index) {
+ const TrigCompositeUtils::Decision* checkDecision = outDecisions->at(index);
+ if (checkDecision == nullptr) {
+ ATH_MSG_ERROR("Failed to get Decision object " << index << " of " << outDecisions->size());
+ return std::numeric_limits<std::size_t>::max();
+ }
+ cache.clear();
+ std::vector<uint32_t> keysB;
+ std::vector<uint32_t> clidsB;
+ std::vector<uint16_t> indiciesB;
+ TrigCompositeUtils::typelessFindLinks(checkDecision, linkNameToMatch, keysB, clidsB, indiciesB, TrigDefs::lastFeatureOfType, &cache);
+ if (keysB.size() != 1) {
+ ATH_MSG_ERROR("Logic error. Expect toMatch size == 1 (confirmed) and checkObject size == 1."
+ << " But have checkObject size = " << keysB.size() << ". Unable to match this Decision object.");
+ return std::numeric_limits<std::size_t>::max();
+ }
+ if (keysA.at(0) == keysB.at(0) and clidsA.at(0) == clidsB.at(0) and indiciesA.at(0) == indiciesB.at(0)) {
+ return index;
+ }
+ }
+
+ return std::numeric_limits<std::size_t>::max();
+}
+
void InputMakerBase::debugPrintOut(const EventContext& context, SG::WriteHandle<TrigCompositeUtils::DecisionContainer>& outputHandle) const{
size_t validInput=0;
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx b/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
index c22b1dc36611b63403237aa45c233ff6eda1bc86..51a8be09f3b36760bce5ffd47ace30050936ab0c 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
@@ -351,24 +351,54 @@ namespace TrigCompositeUtils {
{
using namespace msgFindLink;
if (visitedCache != nullptr) {
- // We only need to recursivly explore back from each node in the graph once.
+ // We only need to recursively explore back from each node in the graph once.
// We can keep a record of nodes which we have already explored, these we can safely skip over.
if (visitedCache->count(start) == 1) {
return false; // Early exit
}
}
-
+ // As the append vectors are user-supplied, perform some input validation.
+ if (keyVec.size() != clidVec.size() or clidVec.size() != indexVec.size()) {
+ ANA_MSG_WARNING("In typelessFindLinks, keyVec, clidVec, indexVec must all be the same size. Instead have:"
+ << keyVec.size() << ", " << clidVec.size() << ", " << indexVec.size());
+ return false;
+ }
+ // Locate named links. Both collections of links and individual links are supported.
bool found = false;
+ std::vector<uint32_t> tmpKeyVec;
+ std::vector<uint32_t> tmpClidVec;
+ std::vector<uint16_t> tmpIndexVec;
if (start->hasObjectCollectionLinks(linkName)) {
- found = start->typelessGetObjectCollectionLinks(linkName, keyVec, clidVec, indexVec);
+ found = start->typelessGetObjectCollectionLinks(linkName, tmpKeyVec, tmpClidVec, tmpIndexVec);
}
if (start->hasObjectLink(linkName)) {
- uint32_t key, clid;
- uint16_t index;
- found |= start->typelessGetObjectLink(linkName, key, clid, index);
- keyVec.push_back(key);
- clidVec.push_back(clid);
- indexVec.push_back(index);
+ uint32_t tmpKey, tmpClid;
+ uint16_t tmpIndex;
+ found |= start->typelessGetObjectLink(linkName, tmpKey, tmpClid, tmpIndex);
+ tmpKeyVec.push_back(tmpKey);
+ tmpClidVec.push_back(tmpClid);
+ tmpIndexVec.push_back(tmpIndex);
+ }
+ // De-duplicate
+ for (size_t tmpi = 0; tmpi < tmpKeyVec.size(); ++tmpi) {
+ bool alreadyAdded = false;
+ const uint32_t tmpKey = tmpKeyVec.at(tmpi);
+ const uint32_t tmpClid = tmpClidVec.at(tmpi);
+ const uint16_t tmpIndex = tmpIndexVec.at(tmpi);
+ for (size_t veci = 0; veci < keyVec.size(); ++veci) {
+ if (keyVec.at(veci) == tmpKey
+ and clidVec.at(veci) == tmpClid
+ and indexVec.at(veci) == tmpIndex)
+ {
+ alreadyAdded = true;
+ break;
+ }
+ }
+ if (!alreadyAdded) {
+ keyVec.push_back( tmpKey );
+ clidVec.push_back( tmpClid );
+ indexVec.push_back( tmpIndex );
+ }
}
// Early exit
if (found && behaviour == TrigDefs::lastFeatureOfType) {
@@ -395,7 +425,7 @@ namespace TrigCompositeUtils {
// only want the most recent.
// Hence we can supply TrigDefs::lastFeatureOfType. /--> parent3(link)
// We can still have more then one link found if there is a branch in the navigation. E.g. start --> parent1 --> parent2(link)
- // If both parent2 and parent3 posessed an admisable ElementLink, then the warning below will trigger, and only one of the
+ // If both parent2 and parent3 possessed an admissible ElementLink, then the warning below will trigger, and only one of the
// links will be returned (whichever of parent2 or parent3 happened to be the first seed of parent1).
std::vector<uint32_t> keyVec;
std::vector<uint32_t> clidVec;
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
index 64ea8b34ea3e283ea8b555cad3643e731409b653..84594aade1ff0bc3903d427ed51ca618e4b25a2b 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
@@ -457,7 +457,7 @@ namespace TrigCompositeUtils {
branch once a link has been located and collected.
* @param[inout] visitedCache Optional cache used by the recursive algorithm to avoid exploring each node multiple times.
*/
- bool typelessfindLinks(const Decision* start,
+ bool typelessFindLinks(const Decision* start,
const std::string& linkName,
std::vector<uint32_t>& key,
std::vector<uint32_t>& clid,
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
index 1ebbc05f0effe72fb49513c5215be18c6f1f6d53..3ed35a16063f1ca643a0c282b1b47a70410488c9 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
@@ -342,13 +342,7 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
}
-#define CREATE_XAOD_NO_MERGE(__TYPE, __STORE_TYPE) \
- { \
- xAODGenerator<xAOD::__TYPE, xAOD::__STORE_TYPE> generator; \
- ATH_CHECK( createIfMissing<xAOD::__TYPE>( context, ConstHandlesGroup<xAOD::__TYPE>( m_##__TYPE, m_##__TYPE##InViews, m_##__TYPE##Views ), generator, &HLTEDMCreator::noMerge<xAOD::__TYPE> ) ); \
- }
-
- CREATE_XAOD_NO_MERGE( TrigCompositeContainer, TrigCompositeAuxContainer );
+ CREATE_XAOD( TrigCompositeContainer, TrigCompositeAuxContainer );
CREATE_XAOD( TrigElectronContainer, TrigElectronAuxContainer );
CREATE_XAOD( ElectronContainer, ElectronAuxContainer );
CREATE_XAOD( PhotonContainer, PhotonAuxContainer );
@@ -366,18 +360,16 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
CREATE_XAOD( TauJetContainer, TauJetAuxContainer );
CREATE_XAOD( TauTrackContainer, TauTrackAuxContainer );
CREATE_XAOD( CaloClusterContainer, CaloClusterTrigAuxContainer ); // NOTE: Difference in interface and aux
- // After view collections are merged, need to update collection links
-
CREATE_XAOD( JetContainer, JetAuxContainer );
CREATE_XAOD( VertexContainer,VertexAuxContainer );
CREATE_XAOD( TrigBphysContainer, TrigBphysAuxContainer );
CREATE_XAOD( BTaggingContainer,BTaggingAuxContainer );
CREATE_XAOD( BTagVertexContainer,BTagVertexAuxContainer );
+ // After view collections are merged, need to update collection links
ATH_CHECK( fixLinks() );
#undef CREATE_XAOD
-#undef CREATE_XAOD_NO_MERGE
// special cases
#define CREATE_SHALLOW(__TYPE) \
diff --git a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
index c4712cfe0bc645cb54b714887ca0a648742122f3..3d71d15030985a80074f141d7c8fc890d9da7e3f 100644
--- a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
@@ -995,13 +995,11 @@ HLT::Algo* TrigSteer::getAlgo(const std::string& name)
if ( dynamic_cast<HLT::HypoAlgo*>(algo) ) {
BooleanProperty enabled("Enable", m_doHypo);
algo->setProperty(enabled).ignore();
- algo->setProperties().ignore();
ATH_MSG_DEBUG(( m_doHypo ? "enabling " : "disabling ") << subAlg_name << " because it is Hypo");
}
if ( dynamic_cast<HLT::TECreateAlgo*>(algo) ) {
BooleanProperty enabled("Enable", m_doFex);
algo->setProperty(enabled).ignore();
- algo->setProperties().ignore();
ATH_MSG_DEBUG((m_doFex ? "enabling " : "disabling ") << subAlg_name << " because it is Fex");
}
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
index 00ff054f95a82ee4c67e377db001c23a572538bc..db46dee51cd8ebbcc291eab8d16d3939c0b70bd6 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
@@ -200,8 +200,13 @@ elif RunSimOnData:
#rederive MuCTPI inputs to CTP from muon RDO
#writes this to the usual MuCTPICTP storegate location
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_Data
- topSequence += L1Muctpi_on_Data()
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1
+ topSequence += L1MuctpiPhase1_on_Data()
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
+ topSequence += L1Muctpi_on_Data()
from TrigT1CTMonitoring.TrigT1CTMonitoringConf import TrigT1CTMonitoring__DeriveSimulationInputs as DeriveSimulationInputs
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
index c5ad2d9d396943a14e2597f57433a6d091a6719b..cebacd448a397ee13869ac81bf486cc47bb379b3 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
@@ -184,8 +184,13 @@ if not athenaCommonFlags.isOnline() and jp.ConcurrencyFlags.NumThreads() == 0:
#svcMgr.DSConfigSvc.readLVL1Thr=True
#svcMgr.DSConfigSvc.readLVL1BG=True
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_Data
- topSequence += L1Muctpi_on_Data()
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1_on_Data
+ topSequence += L1MuctpiPhase1_on_Data()
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_Data
+ topSequence += L1Muctpi_on_Data()
from TrigT1CTMonitoring.TrigT1CTMonitoringConf import TrigT1CTMonitoring__DeriveSimulationInputs as DeriveSimulationInputs
topSequence += DeriveSimulationInputs(do_MuCTPI_input=True,
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
index 8fa5384ec267fb774e9d7b7469a7b715d77c04f1..2cc5dc070c644033c0c4855a5d6ce50a913b6832 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
@@ -802,11 +802,11 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
<< "-Pt" << dataWord.getPt();
}
-
+ /*
if (dataWord.getBCID() == multWord.getBCID()) {
// Fill the muctpi map for later comparision to RPC and TGC
muctpiCandidates.insert ( std::pair<std::string,MuCTPI_DataWord_Decoder>(keystring.str(),dataWord) );
-
+
//Use only candidates from the same BCID for overlap histograms
if (dataWord.getOverlapBits()) {
if (dataWord.getSectorLocation() == MuCTPI_RDO::ENDCAP) {
@@ -825,6 +825,7 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
}
}
}
+*/
}
for ( int y = 0; y < 96; y++ ) {
@@ -866,7 +867,7 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
* BCIDs
*/
uint16_t mictpBcid = multWord.getBCID();
- uint16_t candidateBcid = 0;
+ //uint16_t candidateBcid = 0;
uint16_t headerBcid =
(theMuCTPI_RIO) ? theMuCTPI_RIO->getHeaderBCID() : 0;
bcidMictpHeader->Fill(mictpBcid - (headerBcid & 7));
@@ -896,7 +897,7 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
forwardRoiSectorIDAll->Fill(dataWord.getSectorID()+24*dataWord.getHemisphere(), dataWord.getRoiNumber());
}
- candidateBcid = dataWord.getBCID();
+/* candidateBcid = dataWord.getBCID();
int candbcdiff = candidateBcid - mictpBcid;
if (candbcdiff > 3) candbcdiff -= 8;
@@ -911,9 +912,10 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
errorPerLumiBlock->Fill(m_currentLumiBlock);
}
else errorSummary->Fill(8,0);
-
+*/
//Use only non-vetoed candidates from the same BCID for multiplicity calculation
- if ( (dataWord.getBCID() == multWord.getBCID()) && !dataWord.getVetoed() ) {
+ if ( //(dataWord.getBCID() == multWord.getBCID()) &&
+ !dataWord.getVetoed() ) {
uint16_t candPt = dataWord.getPt();
pt->Fill(candPt);
if (0 < candPt && candPt <= MuCTPI_RDO::MULT_THRESH_NUM) {
@@ -1066,7 +1068,7 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
int rpcnum = rpcCandidates.count(it_mui->first);
if (tgcnum > 0 || rpcnum > 0 ) {
ATH_MSG(DEBUG) << "MuCTPI to RPC/TGC match found: MuCTPI key/ MuCTPI BCID / #TGC matches / #RPC matches: "
- << it_mui->first << " / " << it_mui->second.getBCID() << " / "
+ << it_mui->first << " / " << /*it_mui->second.getBCID() <<*/ " / "
<< tgcnum << " / " << rpcnum << endmsg;
} else {
if ( (it_mui->first).substr(0,2) == "BA" ) {
@@ -1089,7 +1091,7 @@ doMuctpi(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO, const DataHandle<MuCTPI_RIO
<< (it_mui->first).substr(0,2) << endmsg;
}
ATH_MSG(WARNING) << "No Muctpi to RPC/TGC match found: MuCTPI key / MuCTPI BCID: "
- << it_mui->first << " / " << it_mui->second.getBCID() << endmsg;
+ << it_mui->first << " / " << /*it_mui->second.getBCID() <<*/ endmsg;
}
}
@@ -1707,8 +1709,9 @@ doMuonRoI(const DataHandle<MuCTPI_RDO> theMuCTPI_RDO,
if (dataWord.getSectorLocation() == MuCTPI_RDO::BARREL)
sectorID=dataWord.getSectorID(1);
- if ((dataWord.getBCID() == theMuCTPI_RIO->getBCID())
- && (sectorID == secID)
+ if (//(dataWord.getBCID() == theMuCTPI_RIO->getBCID())
+ //&&
+ (sectorID == secID)
&& (dataWord.getRoiNumber() == roInum)
&& (dataWord.getSectorLocation() == sysID)
&& (dataWord.getHemisphere() == hemisphere)) {
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx
index 8ccdae03b793e07feb5599d62efc018d4b571f81..4f2f93bd06e342a2c1c7796554551a281b8e848e 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.cxx
@@ -67,6 +67,13 @@ namespace LVL1CTP {
}
+ int CTPUtil::getMult( const std::vector<unsigned int>& words, unsigned int startbit, unsigned int endbit ) {
+ std::bitset<256> bits = convertToBitset(words);
+ std::bitset<256> mask = pow( 2, endbit - startbit + 1 ) - 1;
+ bits >>= startbit;
+ return static_cast<int>((bits&mask).to_ulong());
+ }
+
unsigned int CTPUtil::getMultTopo( uint64_t word, unsigned int cableStart, unsigned int cableEnd, unsigned int clock ) {
unsigned int mult = 0;
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.h b/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.h
index c666b2db66cb08ffdc8602d780d1b200470475e2..14495854268c484bef77e484824e93892089b7ff 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.h
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPUtil.h
@@ -50,6 +50,7 @@ namespace LVL1CTP {
//! extract multiplicities using new trigger configuration interface
static int getMult( uint64_t word, unsigned int startbit, unsigned int endbit );
+ static int getMult( const std::vector<unsigned int>& words, unsigned int startbit, unsigned int endbit );
//! extract multiplicities from Topo words, were the encoding is different
static unsigned int getMultTopo( uint64_t word, unsigned int startbit, unsigned int endbit, unsigned int clock );
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
index 890651d8809413cd852e3b32e6741f3ad622525a..78a8f419f534aaf810c79565d47bb44e004a2b11 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
@@ -38,6 +38,9 @@ LVL1CTP::ResultBuilder::ResultBuilder( const std::string& type,
LVL1CTP::ResultBuilder::~ResultBuilder() {
delete m_ctpDataFormat;
+ for(auto & x : m_internalTrigger) {
+ delete x.second;
+ }
}
@@ -78,10 +81,10 @@ LVL1CTP::ResultBuilder::createTriggerConfigMaps(const ConfigSource & cfgSrc) con
}
// build map of name to ctp thresholds
- m_thrConfigMap = new ThresholdMap( cfgSrc.l1menu() );
+ m_thrConfigMap = std::make_unique<ThresholdMap>( cfgSrc.l1menu() );
// build map of name to ctp items
- m_itemConfigMap = new ItemMap( cfgSrc.l1menu() );
+ m_itemConfigMap = std::make_unique<ItemMap>( cfgSrc.l1menu() );
} else if( cfgSrc.ctpConfig() != nullptr ) {
@@ -102,9 +105,9 @@ LVL1CTP::ResultBuilder::createTriggerConfigMaps(const ConfigSource & cfgSrc) con
m_internalTrigger[ rndm->name() ] = rndm;
}
- m_thrConfigMap = new ThresholdMap( cfgSrc.ctpConfig()->menu().thresholdVector());
+ m_thrConfigMap = std::make_unique<ThresholdMap>( cfgSrc.ctpConfig()->menu().thresholdVector());
- m_itemConfigMap = new ItemMap( cfgSrc.ctpConfig()->menu().itemVector(),
+ m_itemConfigMap = std::make_unique<ItemMap>( cfgSrc.ctpConfig()->menu().itemVector(),
cfgSrc.ctpConfig()->prescaleSet() );
} else {
ATH_MSG_FATAL("No L1 trigger menu was provided");
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h
index a211285f9b046af562b1646066a8f7dcb87da868..3694457bd1e839f1bb5fe7dfc0ec2cd2e9b4fafa 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h
+++ b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h
@@ -95,8 +95,8 @@ namespace LVL1CTP {
std::vector<std::string> firedItems(const std::vector<uint32_t>& triggerWords) const;
// configuration information
- mutable ThresholdMap* m_thrConfigMap ATLAS_THREAD_SAFE { nullptr }; //!< Map between threshold objects and their CTP-internal description
- mutable ItemMap* m_itemConfigMap ATLAS_THREAD_SAFE { nullptr }; //!< Map between item objects and their CTP-internal description
+ mutable std::unique_ptr<ThresholdMap> m_thrConfigMap ATLAS_THREAD_SAFE { nullptr }; //!< Map between threshold objects and their CTP-internal description
+ mutable std::unique_ptr<ItemMap> m_itemConfigMap ATLAS_THREAD_SAFE { nullptr }; //!< Map between item objects and their CTP-internal description
mutable InternalTriggerMap m_internalTrigger ATLAS_THREAD_SAFE; //!< internal triggers BGRP and RNDM
unsigned int m_ctpVersionNumber { 4 }; //!< CTP data format version (4 in most of Run 2 and in Run 3)
CTPdataformatVersion* m_ctpDataFormat { nullptr }; //!< CTP data format details
diff --git a/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt b/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt
index e7b9dd1baab4eedcbc1d1ddb11696872a15f2433..a2c9c39cb23c6960ffec3a2f7aef51ecc790396c 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1Interfaces/CMakeLists.txt
@@ -12,8 +12,8 @@ atlas_add_library( TrigT1Interfaces
src/*.cxx
PUBLIC_HEADERS TrigT1Interfaces
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${XERCESC_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel GaudiKernel
- PRIVATE_LINK_LIBRARIES TrigConfL1Data )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${XERCESC_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel GaudiKernel TrigT1MuctpiBits
+ PRIVATE_LINK_LIBRARIES TrigConfL1Data)
atlas_add_dictionary( TrigT1InterfacesDict
TrigT1Interfaces/TrigT1InterfacesDict.h
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiTool/ITrigT1MuonRecRoiTool.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ITrigT1MuonRecRoiTool.h
similarity index 98%
rename from Trigger/TrigT1/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiTool/ITrigT1MuonRecRoiTool.h
rename to Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ITrigT1MuonRecRoiTool.h
index b706f35fe18ee8a9dc4fbba055e4da74ded97595..e2c9ddd1a280d077520fa98dcef2ad94e4b90924 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiTool/ITrigT1MuonRecRoiTool.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/ITrigT1MuonRecRoiTool.h
@@ -6,7 +6,7 @@
#define ITRIGT1MUONRECROITOOL_H
#include "GaudiKernel/IAlgTool.h"
-#include "TrigT1MuonRecRoiTool/TrigT1MuonRecRoiData.h"
+#include "TrigT1MuonRecRoiData.h"
namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInputPhase1.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInputPhase1.h
index d67fce5fd8a5be318e59b1242153c2e1dbd135ee..b25aa0904ffb58a5fb6a1b5f770da498b4b6c187 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInputPhase1.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuCTPIInputPhase1.h
@@ -68,10 +68,14 @@ namespace LVL1MUONIF {
const Lvl1MuSectorLogicDataPhase1& getSectorLogicData( size_t systemAddress,
- size_t subSystemAddress,
- size_t sectorAddress,
- int bcid=0 ) const;
-
+ size_t subSystemAddress,
+ size_t sectorAddress,
+ int bcid=0 ) const;
+ std::shared_ptr<Lvl1MuSectorLogicDataPhase1> getSectorLogicDataPtr( size_t systemAddress,
+ size_t subSystemAddress,
+ size_t sectorAddress,
+ int bcid=0 );
+
void setSectorLogicData( const Lvl1MuSectorLogicDataPhase1& data,
size_t systemAddress,
size_t subSystemAddress,
@@ -126,7 +130,6 @@ namespace LVL1MUONIF {
typedef std::vector<std::shared_ptr <Lvl1MuSectorLogicDataPhase1> > Lvl1MuVect;
typedef std::pair<int, Lvl1MuVect> Lvl1MuVectWithBC;
std::vector<Lvl1MuVectWithBC> m_data[ NumberOfMuonSystem ];
-
}; // class Lvl1MuCTPIInputPhase1
inline size_t Lvl1MuCTPIInputPhase1::idBarrelSystem() { return Barrel; }
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicDataPhase1.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicDataPhase1.h
index 4e1b7ed66eba8070798b435bfa83e1cba284745e..7e02999622351fa284c5da6f4a7c82d04126747f 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicDataPhase1.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/Lvl1MuSectorLogicDataPhase1.h
@@ -54,6 +54,7 @@ namespace LVL1MUONIF {
int goodmf( size_t id) const { return m_goodmf[ id ]; }
int innercoin( size_t id) const { return m_innercoin[ id ]; }
int bw2or3( size_t id) const { return m_bw2or3[ id ]; }
+ int veto( size_t id) const {return m_veto[ id ]; } // veto candidate for multiplicity counting due to overlap removal
void set2candidatesInSector() { m_2candidatesInSector = true; }
void clear2candidatesInSector() { m_2candidatesInSector = false;}
@@ -67,6 +68,7 @@ namespace LVL1MUONIF {
void goodmf( size_t id, int value) {m_goodmf[ id ] = value; }
void innercoin( size_t id, int value) {m_innercoin[ id ] = value; }
void bw2or3( size_t id, int value) {m_bw2or3[ id ] = value; }
+ void veto( size_t id, int value) {m_veto[ id ] = value; }
void clear();
@@ -95,6 +97,7 @@ namespace LVL1MUONIF {
std::vector<int> m_goodmf; //[m_ncand]
std::vector<int> m_innercoin; //[m_ncand]
std::vector<int> m_bw2or3; //[m_ncand]
+ std::vector<int> m_veto; //[m_ncand]
}; // class Lvl1MuSectorLogicDataPhase1
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
index a1e82a74728a96b5e644a0d5cab3f1a5a7190278..46314d5ae2a354e0fd60fa680640ab6f4fca057a 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/MuCTPICTP.h
@@ -1,10 +1,12 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1INTERFACES_MUCTPICTP_H
#define TRIGT1INTERFACES_MUCTPICTP_H
+#include <vector>
+
namespace LVL1 {
/**
@@ -23,16 +25,17 @@ namespace LVL1 {
public:
/* constructor and destructor */
MuCTPICTP( unsigned int word = 0 );
+ MuCTPICTP( std::vector<unsigned int> word);
~MuCTPICTP();
/**
* Return the muon data i.e. <code>(xxxxx|thr6|thr5|thr4|thr3|thr2|thr1)</code>
*/
- unsigned int muCTPIWord() const;
+ std::vector<unsigned int> muCTPIWord() const;
private:
/// The only data member
- const unsigned int m_MuCTPICTPWord;
+ std::vector<unsigned int> m_MuCTPICTPWord;
}; // class MuCTPICTP
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiData.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1MuonRecRoiData.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiTool/TrigT1MuonRecRoiData.h
rename to Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1MuonRecRoiData.h
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/ITrigT1MuonRecRoiTool.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/ITrigT1MuonRecRoiTool.cxx
similarity index 98%
rename from Trigger/TrigT1/TrigT1MuonRecRoiTool/src/ITrigT1MuonRecRoiTool.cxx
rename to Trigger/TrigT1/TrigT1Interfaces/src/ITrigT1MuonRecRoiTool.cxx
index a5e4762ec7ed14baecab5829e017cb7e6402e5c5..3d22cf0b28ce7dc9400e5d83abfa343efc751172 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/ITrigT1MuonRecRoiTool.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/ITrigT1MuonRecRoiTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrigT1MuonRecRoiTool/ITrigT1MuonRecRoiTool.h"
+#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
namespace LVL1{
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInputPhase1.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInputPhase1.cxx
index b93409ace6c438ac83157b0c48a8efeebd4767a9..2ae2ab1eba7907ac5570a4d6ebf8547afe2db0c1 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInputPhase1.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInputPhase1.cxx
@@ -44,10 +44,9 @@ namespace LVL1MUONIF {
/////////////
const Lvl1MuSectorLogicDataPhase1& Lvl1MuCTPIInputPhase1::getSectorLogicData( size_t systemAddress,
- size_t subSystemAddress,
- size_t sectorAddress,
- int bcid ) const {
-
+ size_t subSystemAddress,
+ size_t sectorAddress,
+ int bcid ) const {
static const Lvl1MuBarrelSectorLogicDataPhase1 dummy;
for( size_t ip=0; ip<m_data[systemAddress].size(); ip++){
int bc=((m_data[systemAddress]).at(ip)).first;
@@ -58,6 +57,19 @@ namespace LVL1MUONIF {
return dummy;
}
+ /////////////
+ std::shared_ptr<Lvl1MuSectorLogicDataPhase1> Lvl1MuCTPIInputPhase1::getSectorLogicDataPtr( size_t systemAddress,
+ size_t subSystemAddress,
+ size_t sectorAddress,
+ int bcid ) {
+ for( size_t ip=0; ip<m_data[systemAddress].size(); ip++){
+ int bc=((m_data[systemAddress]).at(ip)).first;
+ if (bc != bcid) continue;
+ return m_data[systemAddress].at(ip).second.at(getSystemIndex(systemAddress,subSystemAddress,sectorAddress));
+ }
+ return nullptr;
+ }
+
/////////////
void Lvl1MuCTPIInputPhase1::setSectorLogicData( const Lvl1MuSectorLogicDataPhase1& data,
size_t systemAddress,
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicDataPhase1.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicDataPhase1.cxx
index c9d9822076856ba533a8d2e1eeb1623170578791..58a1078fbde7d572b5680be3053e0adc6715164c 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicDataPhase1.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuSectorLogicDataPhase1.cxx
@@ -28,6 +28,7 @@ namespace LVL1MUONIF {
m_goodmf.clear();
m_innercoin.clear();
m_bw2or3.clear();
+ m_veto.clear();
}
void Lvl1MuSectorLogicDataPhase1::initialize()
@@ -44,6 +45,7 @@ namespace LVL1MUONIF {
m_goodmf.push_back(-1);
m_innercoin.push_back(-1);
m_bw2or3.push_back(-1);
+ m_veto.push_back(0);
}
}
@@ -66,6 +68,7 @@ namespace LVL1MUONIF {
m_goodmf[ i ] = right.m_goodmf[ i ];
m_innercoin[ i ] = right.m_innercoin[ i ];
m_bw2or3[ i ] = right.m_bw2or3[ i ];
+ m_veto[ i ] = right.m_veto[ i ];
}
}
return *this;
@@ -90,6 +93,7 @@ namespace LVL1MUONIF {
m_goodmf[ i ] = -1;
m_innercoin[ i ] = -1;
m_bw2or3[ i ] = -1;
+ m_veto[ i ] = 0;
}
}
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx
index 094f9e987e87b1cba1611b4ef1bfdfdae93c7f07..5731aaf03438c9e25218f86385a3972ebd350062 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/MuCTPICTP.cxx
@@ -7,15 +7,20 @@
namespace LVL1 {
MuCTPICTP::MuCTPICTP( unsigned int word )
- : m_MuCTPICTPWord( word ) {
+ {
+ m_MuCTPICTPWord.push_back(word);
+ }
+ MuCTPICTP::MuCTPICTP( std::vector<unsigned int> word )
+ : m_MuCTPICTPWord(word)
+ {
}
MuCTPICTP::~MuCTPICTP() {
}
- unsigned int MuCTPICTP::muCTPIWord() const {
+ std::vector<unsigned int> MuCTPICTP::muCTPIWord() const {
return m_MuCTPICTPWord;
}
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1MuonRecRoiData.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1MuonRecRoiData.cxx
similarity index 96%
rename from Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1MuonRecRoiData.cxx
rename to Trigger/TrigT1/TrigT1Interfaces/src/TrigT1MuonRecRoiData.cxx
index 9e701535b27c9df0d657e5b1ccdd06f3eae1a310..2db017756b0294e9382169fa62e84b88060fcfde 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1MuonRecRoiData.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/TrigT1MuonRecRoiData.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrigT1MuonRecRoiTool/TrigT1MuonRecRoiData.h"
+#include "TrigT1Interfaces/TrigT1MuonRecRoiData.h"
#include <math.h> /* M_PI */
namespace LVL1{
diff --git a/Trigger/TrigT1/TrigT1MuctpiBits/CMakeLists.txt b/Trigger/TrigT1/TrigT1MuctpiBits/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6203d37d539715c9d2b0f6fd4587120014380759
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1MuctpiBits/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name.
+atlas_subdir( TrigT1MuctpiBits )
+
+# Component(s) in the package.
+atlas_add_library( TrigT1MuctpiBits
+ TrigT1MuctpiBits/*.h
+ INTERFACE
+ PUBLIC_HEADERS TrigT1MuctpiBits )
diff --git a/Trigger/TrigT1/TrigT1MuctpiBits/TrigT1MuctpiBits/MuCTPI_Bits.h b/Trigger/TrigT1/TrigT1MuctpiBits/TrigT1MuctpiBits/MuCTPI_Bits.h
new file mode 100755
index 0000000000000000000000000000000000000000..c5cb9436a02f069516d38ec5a94822da5fb36721
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1MuctpiBits/TrigT1MuctpiBits/MuCTPI_Bits.h
@@ -0,0 +1,133 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGT1RESULT_MUCTPI_BITS_H
+#define TRIGT1RESULT_MUCTPI_BITS_H
+
+ /// Binary 111 representing the maximal multiplicity value for a given threshold
+ static constexpr uint32_t MULT_VAL = 7;
+ /// Number of multiplicity bits reserved per threshold
+ static constexpr uint32_t MULT_BITS = 3;
+ /// Defining the number of p<sub>T</sub> thresholds in the system
+ static constexpr uint32_t RUN3_MULT_THRESH_NUM = 32;
+ static constexpr uint32_t MULT_THRESH_NUM = 6;
+ /// Telling that the 3-bit BCID comes at "position 7" in the multiplicity word
+ static constexpr uint32_t RUN3_MULT_BCID_POS = 26;
+ static constexpr uint32_t MULT_BCID_POS = 7;
+
+ /// Mask for the bit showing if more than two muon candidates were in the trigger sector
+ static constexpr uint32_t CAND_OVERFLOW_MASK = 0x1;
+ /// Position of the candidate overflow mask
+ static constexpr uint32_t RUN3_CAND_OVERFLOW_SHIFT = 17;
+ static constexpr uint32_t CAND_OVERFLOW_SHIFT = 0;
+
+ /// Mask for the bit showing if more than one muon candidates were in the sector RoI
+ static constexpr uint32_t ROI_OVERFLOW_MASK = 0x1;
+ /// Position of the RoI overflow mask
+ static constexpr uint32_t RUN3_ROI_OVERFLOW_SHIFT = 13;
+ static constexpr uint32_t ROI_OVERFLOW_SHIFT = 1;
+
+ /// Mask for the full potential ROI word from the data words
+ static constexpr uint32_t ROI_MASK = 0xff; /// new in v2
+ /// Mask for extracting the RoI for barrel candidates from the data words
+ static constexpr uint32_t BARREL_ROI_MASK = 0x1f;
+ /// Mask for extracting the RoI for endcap candidates from the data words
+ static constexpr uint32_t ENDCAP_ROI_MASK = 0xff;
+ /// Mask for extracting the RoI for forward candidates from the data words
+ static constexpr uint32_t FORWARD_ROI_MASK = 0x3f;
+ /// Position of the RoI bits in the data word
+ static constexpr uint32_t RUN3_ROI_SHIFT = 0;
+ static constexpr uint32_t ROI_SHIFT = 2;
+
+//===== Need to double check that the run3 positions are correct for the OL flags=====
+ /// Mask for extracting the overlap bits for barrel candidates from the data words
+ static constexpr uint32_t RUN3_BARREL_OL_MASK = 0x1; // only the phi ovl is used in the run3 format
+ static constexpr uint32_t BARREL_OL_MASK = 0x3;
+ /// Position of the overlap bits in barrel data words
+ static constexpr uint32_t RUN3_BARREL_OL_SHIFT = 12; // this is now part of the 4 "candidate flags" bits
+ static constexpr uint32_t BARREL_OL_SHIFT = 9;
+ /// Mask for extracting the overlap bits for endcap candidates from the data words
+ static constexpr uint32_t ENDCAP_OL_MASK = 0x1;
+ /// Position of the overlap bits in endcap data words
+ //static constexpr uint32_t RUN3_ENDCAP_OL_SHIFT = 8; // 10-2 = 8 // not used in run3 format
+ static constexpr uint32_t ENDCAP_OL_SHIFT = 10;
+
+ /// Mask for extracting the p<sub>T</sub> threshold passed by the candidate from the data word
+ static constexpr uint32_t RUN3_CAND_PT_MASK = 0xf;
+ static constexpr uint32_t CAND_PT_MASK = 0x7;
+ /// Position of the p<sub>T</sub> threshold bits in the data words
+ static constexpr uint32_t RUN3_CAND_PT_SHIFT = 8;
+ static constexpr uint32_t CAND_PT_SHIFT = 11;
+
+/// gone in v2
+//These aren't part of the LVL2 word in run 2, but part of the DAQ word
+ /// Mask for extracting the last 3 bits of the BCID of the muon candidate from the data word
+ static constexpr uint32_t CAND_BCID_MASK = 0x7;
+ /// Position of the BCID bits in the data words
+ static constexpr uint32_t CAND_BCID_SHIFT = 14;
+
+ /// Mask for extracting the address of the muon candidate from the data word
+ /// This is the mask and shift for the full sector address, including the hemisphere as the least significant bit
+ static constexpr uint32_t CAND_SECTOR_ADDRESS_MASK = 0xff;
+ /// Mask for the bit showing which hemisphere the candidate came from.(1: positive; 0: negative)
+ static constexpr uint32_t SECTOR_HEMISPHERE_MASK = 0x1;
+ /// Position of the muon candidate's address in the data word
+ static constexpr uint32_t RUN3_CAND_SECTOR_ADDRESS_SHIFT = 21;
+ static constexpr uint32_t CAND_SECTOR_ADDRESS_SHIFT = 14;//17; 17 is for the DAQ word, not LVL2
+
+//====The shift doesn't correspond to the mask here (the mask corresponds to the SECTOR_ADDRESS_SHIFT above) ===
+ /// Bit in the candidate's address turned on for endcap candidates
+ static constexpr uint32_t ENDCAP_ADDRESS_MASK = 0x80;
+ /// Bit in the candidate's address turned on for forward candidates
+ static constexpr uint32_t FORWARD_ADDRESS_MASK = 0x40;
+ /// Mask for both forward and endcap bits
+ static constexpr uint32_t SUBSYS_ADDRESS_MASK = 0xc0;
+/// Position in the data word of the subsystem bits
+ static constexpr uint32_t RUN3_SUBSYS_ADDRESS_SHIFT = 27;
+ static constexpr uint32_t SUBSYS_ADDRESS_SHIFT = 20;
+
+ /// Mask for extracting the sector ID for endcap candidates from the data word
+ static constexpr uint32_t ENDCAP_SECTORID_MASK = 0x3f;
+ /// Mask for extracting the sector ID for forward candidates from the data word
+ static constexpr uint32_t FORWARD_SECTORID_MASK = 0x1f;
+ /// Mask for extracting the sector ID for barrel candidates from the data word
+ static constexpr uint32_t BARREL_SECTORID_MASK = 0x1f;
+ /// Position of the sector ID itself, which is one bit left of the full sector address
+ static constexpr uint32_t RUN3_CAND_SECTORID_SHIFT = 22;
+ static constexpr uint32_t CAND_SECTORID_SHIFT = 15;
+
+/// gone in v2
+ /// Mask for extracting the bit from the data word showing whether the candidate had the highest p<sub>T</sub> in the sector
+ static constexpr uint32_t CAND_HIGHEST_PT_MASK = 0x1;
+ /// Position of the "highest p<sub>T</sub>" bit
+ static constexpr uint32_t CAND_HIGHEST_PT_SHIFT = 22;
+
+/// gone in v2
+//These aren't part of the LVL2 word in run 2, but part of the DAQ word
+ /// Mask for extracting the bit from the data word showing if the muon candidate was sent to the RoIB
+ static constexpr uint32_t CAND_SENT_ROI_MASK = 0x1;
+ /// Position of the "candidate sent to RoIB" bit.
+ static constexpr uint32_t CAND_SENT_ROI_SHIFT = 26;
+
+ /// Position of the bit turned on for the multiplicity words that distinguishes them from the data words
+ static constexpr uint32_t RUN3_MULT_WORD_FLAG_SHIFT = 31; // is 31 correct? - check with Stefan
+ static constexpr uint32_t MULT_WORD_FLAG_SHIFT = 29;
+
+ /// Position of the bit specifying the candidate's sign
+ static constexpr uint32_t RUN3_CAND_TGC_CHARGE_SIGN_SHIFT = 12;
+ static constexpr uint32_t CAND_TGC_CHARGE_SIGN_SHIFT = 27;
+ /// Position of the bit specifying 3-station coincidence from the big wheel
+ static constexpr uint32_t RUN3_CAND_TGC_BW2OR3_SHIFT = 13;
+ /// Position of the bit specifying coincidence with inner detectors
+ static constexpr uint32_t RUN3_CAND_TGC_INNERCOIN_SHIFT = 14;
+ /// Position of the bit specifying if RoI is in a good b-field region (1=good, 0=bad)
+ static constexpr uint32_t RUN3_CAND_TGC_GOODMF_SHIFT = 15;
+
+ /// Position of the bit specifying if a candidate was vetoed in the multiplicity sum
+ static constexpr uint32_t RUN3_CAND_VETO_SHIFT = 16;
+ static constexpr uint32_t CAND_VETO_SHIFT = 28;
+
+#endif
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/CMakeLists.txt b/Trigger/TrigT1/TrigT1MuctpiPhase1/CMakeLists.txt
index b6d5d0e6957b00c7cf5bec2e0362e6aae7336cbd..02d2d0637b34ddabd1fc468efce99d4d3b3dc097 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/CMakeLists.txt
@@ -11,7 +11,12 @@ atlas_add_component( TrigT1MuctpiPhase1
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES AnalysisTriggerEvent AthenaBaseComps CxxUtils GaudiKernel PathResolver StoreGateLib TrigConfInterfaces TrigConfL1Data TrigConfMuctpi TrigT1Interfaces TrigT1Result xAODTrigger )
+ LINK_LIBRARIES AnalysisTriggerEvent
+ AthenaBaseComps CxxUtils GaudiKernel
+ PathResolver StoreGateLib TrigConfInterfaces
+ TrigConfData TrigConfL1Data TrigConfMuctpi
+ TrigT1Interfaces TrigT1Result
+ xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MUCTPI_AthTool.h b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MUCTPI_AthTool.h
index 37cd244926c598ce462a9ef133881ca4f6cc59b9..2135de4d7ff04e8910a4d5129f9ebe99e087b780 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MUCTPI_AthTool.h
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MUCTPI_AthTool.h
@@ -16,26 +16,15 @@ class description
#include "TrigT1Interfaces/MuCTPICTP.h"
#include "TrigT1Interfaces/MuCTPIL1Topo.h"
-#include "TrigT1Result/MuCTPI_RDO.h"
#include "xAODTrigger/MuonRoIContainer.h"
-#include "TrigT1MuctpiPhase1/Configuration.h"
-
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-
-//#include "TrigConfL1Data/Run3MuonTriggerThreshold.h"
-#include "TrigConfL1Data/TriggerThresholdValue.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/L1DataBaseclass.h"
-
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
-namespace TrigConf {
- class ILVL1ConfigSvc;
- class TriggerThreshold;
+namespace LVL1 {
+ class ITrigT1MuonRecRoiTool;
}
namespace LVL1MUCTPIPHASE1 {
@@ -54,6 +43,7 @@ namespace LVL1MUCTPIPHASE1 {
virtual void handle(const Incident&) override;
virtual StatusCode initialize() override;
+ virtual StatusCode start() override;
virtual StatusCode execute() override;
virtual StatusCode fillMuCTPIL1Topo(LVL1::MuCTPIL1Topo& l1topoCandidates, int bcidOffset) const override;
@@ -85,8 +75,7 @@ namespace LVL1MUCTPIPHASE1 {
SG::ReadHandleKey<LVL1MUONIF::Lvl1MuCTPIInputPhase1> m_muctpiPhase1KeyRPC{this, "MuctpiPhase1LocationRPC", "L1MuctpiStoreRPC", "Location of muctpiPhase1 for Rpc"};
SG::ReadHandleKey<LVL1MUONIF::Lvl1MuCTPIInputPhase1> m_muctpiPhase1KeyTGC{this, "MuctpiPhase1LocationTGC", "L1MuctpiStoreTGC", "Location of muctpiPhase1 for Tgc"};
- SG::ReadHandleKey<MuCTPI_RDO> m_MuCTPI_RDOReadKey{this, "MUCTPI_RDOReadKey", "MUCTPI_RDO", "Location of MuCTPI_RDO"};
- SG::WriteHandleKey<MuCTPI_RDO> m_MuCTPI_RDOWriteKey{this, "MUCTPI_RDOWriteKey", "MUCTPI_RDO", "Location of MuCTPI_RDO"};
+ SG::WriteHandleKey<LVL1::MuCTPICTP> m_MuCTPICTPWriteKey{this, "MuCTPICTPLocation", "MuCTPICTP", "Location of MuCTPICTP"};
SG::WriteHandleKey<xAOD::MuonRoIContainer> m_MuCTPI_xAODWriteKey{this, "MUCTPI_xAODLocation", "LVL1MuonRoIs", "Location of xAOD::MuonRoIContainer"};
SG::WriteHandleKey<LVL1::MuCTPIL1Topo> m_MuCTPIL1TopoKey;
SG::WriteHandleKey<LVL1::MuCTPIL1Topo> m_MuCTPIL1TopoKey_m2;
@@ -94,6 +83,8 @@ namespace LVL1MUCTPIPHASE1 {
SG::WriteHandleKey<LVL1::MuCTPIL1Topo> m_MuCTPIL1TopoKey_p1;
SG::WriteHandleKey<LVL1::MuCTPIL1Topo> m_MuCTPIL1TopoKey_p2;
+
+
// These properties control how the multiplicity summation happens:
std::string m_multiplicityStrategyName;
std::string m_multiplicityXMLFile;
@@ -116,8 +107,12 @@ namespace LVL1MUCTPIPHASE1 {
static const std::string m_DEFAULT_roibLocation;
static const std::string m_DEFAULT_geometryXMLFile;
- ServiceHandle< TrigConf::ILVL1ConfigSvc > m_configSvc;
+ ServiceHandle<StoreGateSvc> m_detStore { this, "DetectorStore", "StoreGateSvc/DetectorStore", "Detector store to get the menu" };
+
SimController* m_theMuctpi;
+ ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_rpcTool;
+ ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_tgcTool;
+
/// Function pointer to the execute function we want to use:
StatusCode ( LVL1MUCTPIPHASE1::MUCTPI_AthTool::*m_executeFunction )( void );
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MuonSectorProcessor.h b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MuonSectorProcessor.h
index 97f675dba836c332e44925aca5f1cefb6c5a8df0..6090650ae48989be410687246f89d4ea4bc08a72 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MuonSectorProcessor.h
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/MuonSectorProcessor.h
@@ -20,6 +20,8 @@ namespace LVL1 {
}
namespace LVL1MUCTPIPHASE1 {
+ class OverlapHelper;
+
class ROIObject
{
public:
@@ -38,12 +40,13 @@ namespace LVL1MUCTPIPHASE1 {
public:
- MuonSectorProcessor(int subSystem);
+ MuonSectorProcessor(bool side /*1=A,0=C*/);
~MuonSectorProcessor();
- void configure(const std::string& xmlName);
+ void configureTopo(const std::string& xmlName);
+ void configureOverlapRemoval(const std::string& lutFile);
void setInput(LVL1MUONIF::Lvl1MuCTPIInputPhase1* input);
- void removeOverlap();
+ void runOverlapRemoval();
void makeTriggerObjectSelections();
void makeL1TopoData();
LVL1::MuCTPIL1Topo getL1TopoData(int bcidOffset);
@@ -54,6 +57,8 @@ namespace LVL1MUCTPIPHASE1 {
LVL1MUONIF::Lvl1MuCTPIInputPhase1* m_muctpiInput;
LVL1::MuCTPIL1Topo* m_l1topo;
std::map<std::string, std::map<unsigned int, ROIObject> > m_roiConfig;
+ OverlapHelper* m_overlapHelper;
+ bool m_side;
};
}
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/SimController.h b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/SimController.h
index fb26282913021961c4291d9b73316077d8132d44..aedc20152c2b1c6d4b4e27ce3b2be4837b4b7c40 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/SimController.h
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/SimController.h
@@ -34,18 +34,13 @@ namespace LVL1MUCTPIPHASE1 {
SimController();
~SimController();
- void configureMSP(const std::string& xmlName);
+ void configureTopo(const std::string& geoFile);
+ void configureOverlapRemoval(const std::string& lutFile);
void processData(LVL1MUONIF::Lvl1MuCTPIInputPhase1* input, int bcid=0);
void setConfiguration( const Configuration& conf );
- const std::vector<unsigned int>& getCTPData();
LVL1::MuCTPIL1Topo getL1TopoData(int bcidOffset);
- const std::vector<unsigned int>& getDAQData();
- std::list< unsigned int > getRoIBData();
-
- bool hasBarrelCandidate();
- bool hasEndcapCandidate();
TriggerProcessor* getTriggerProcessor();
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/TriggerProcessor.h b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/TriggerProcessor.h
index 984f9acea26e673f95e7bf6d33a5ff77f3273a4c..3a440d57e7ebacd4c323b5b0ef0b755e9041f93d 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/TriggerProcessor.h
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/TrigT1MuctpiPhase1/TriggerProcessor.h
@@ -8,9 +8,12 @@
#include <vector>
#include <list>
+#include <map>
+#include <string>
+#include <utility>
namespace TrigConf {
- class TriggerThreshold;
+ class L1Menu;
}
namespace LVL1MUONIF {
@@ -27,20 +30,26 @@ namespace LVL1MUCTPIPHASE1 {
TriggerProcessor();
~TriggerProcessor();
- void setThresholds(const std::vector<TrigConf::TriggerThreshold*>& thresholds);
+ void setMenu(const TrigConf::L1Menu* l1menu);
void mergeInputs(std::vector<LVL1MUONIF::Lvl1MuCTPIInputPhase1*> inputs);
void computeMultiplicities(int bcid);
void makeTopoSelections();
const std::vector<unsigned int>& getCTPData();
- const std::vector<unsigned int>& getDAQData();
+
+ //subsystem - daq word pairs
+ const std::vector<std::pair<int, unsigned int> >& getDAQData();
private:
+ std::vector<std::string> parseString(std::string str, std::string sep);
+
std::vector<unsigned int> m_ctp_words;
- std::vector<unsigned int> m_daq_data;
+ std::vector<std::pair<int, unsigned int> > m_daq_data;
LVL1MUONIF::Lvl1MuCTPIInputPhase1* m_mergedInputs;
- std::vector<TrigConf::TriggerThreshold*> m_thresholds;
+ const TrigConf::L1Menu* m_l1menu;
+
+ std::map<std::string, std::vector<std::vector<std::string> > > m_parsed_tgcFlags;
};
}
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigT1MuctpiPhase1Config.py b/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigT1MuctpiPhase1Config.py
index b83cd57f11138ca25d4e15aca2c18c27e24c1f5f..f7e4509413084a7a46d30f806ab3ab74d100fc85 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigT1MuctpiPhase1Config.py
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigT1MuctpiPhase1Config.py
@@ -62,7 +62,7 @@ class L1MuctpiPhase1_on_Data( DefaultL1MuctpiPhase1 ):
self.RoIOutputLocID = "not_used_1"
self.CTPOutputLocID = "/Run/L1MuCTPItoCTPLocation"
self.OverlapStrategyName = "LUT"
- self.LUTXMLFile = "TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB_crc_3385316356.xml"
+ self.LUTXMLFile = "TrigConfMuctpi/overlapRun3_20201214.xml"
self.IsData=1
self.FlaggingMode = False
@@ -106,45 +106,18 @@ class DefaultL1MuctpiPhase1Tool( LVL1MUCTPIPHASE1__MUCTPI_AthTool ):
# Set properties of the LUT overlap handling:
self.OverlapStrategyName = "LUT"
self.DumpLUT = False
- self.LUTXMLFile = "UNDEFINED"
- self.RunPeriod = "UNDEFINED"
self.FlaggingMode = False
self.MultiplicityStrategyName = "INCLUSIVE"
self.GeometryXMLFile = "TrigConfMuctpi/L1MuonGeometry_20200629.xml"
# Decide which LUT to use, based on which run we are simulating:
- from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
- from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
- if ( commonGeoFlags.Run() == "RUN1" ) or ( ( commonGeoFlags.Run() == "UNDEFINED" ) and
- ( geoFlags.isIBL() is False ) ):
- self.LUTXMLFile = "TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002.xml"
- self.RunPeriod = "RUN1"
- logger.info( "Configuring MuCTPI simulation with Run 1 configuration file:" )
- logger.info( " TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002.xml" )
- logger.info( " with a RunPeriod=RUN1" )
- elif ( commonGeoFlags.Run() == "RUN2" ) or ( ( commonGeoFlags.Run() == "UNDEFINED" ) and
- ( geoFlags.isIBL() is True ) ):
- self.LUTXMLFile = "TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB.xml"
- self.RunPeriod = "RUN2"
- logger.info( "Configuring MuCTPI simulation with Run 2 configuration file:" )
- logger.info( " TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB.xml" )
- logger.info( " with a RunPeriod=RUN2" )
- else:
- self.LUTXMLFile = "TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB.xml"
- self.RunPeriod = "RUN2"
- logger.warning( "Couldn't determine which run to simulate, using Run 2 configuration file:" )
- logger.warning( " TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB.xml" )
- logger.warning( " with a RunPeriod=RUN2" )
-
- pass
-
-
- # Turn on the NIM output creation by default:
- self.DoNIMOutput = True
- # The bit settings were extracted from here:
- # https://savannah.cern.ch/bugs/?90300#comment14
- self.NIMBarrelBit = 29
- self.NIMEndcapBit = 30
+ #from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
+ #from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
+ self.LUTXMLFile = "TrigConfMuctpi/overlapRun3_20201214.xml"
+ self.RunPeriod = "RUN3"
+ logger.info( "Configuring MuCTPI simulation with " + self.RunPeriod +" configuration file:" )
+ logger.info( " "+self.LUTXMLFile )
+ logger.info( " with a RunPeriod=" + self.RunPeriod )
class L1MuctpiPhase1Tool( DefaultL1MuctpiPhase1Tool ):
@@ -194,7 +167,7 @@ class L1MuctpiPhase1Tool_on_Data( DefaultL1MuctpiPhase1Tool ):
self.RoIOutputLocID = "not_used_1"
self.CTPOutputLocID = "/Run/L1MuCTPItoCTPLocation"
self.OverlapStrategyName = "LUT"
- self.LUTXMLFile = "TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB_crc_3385316356.xml"
+ self.LUTXMLFile = "TrigConfMuctpi/overlapRun3_20201214.xml"
self.IsData=1
self.FlaggingMode = False
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthTool.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthTool.cxx
index 569cfea8c2fffce773f92f2dfcf99c7dbded8c35..b29da504279bfb398ee8c667b614e197076f8be6 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthTool.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MUCTPI_AthTool.cxx
@@ -14,11 +14,7 @@
// Headers from external packages.
// The new trigger configuration
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/Muctpi.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigConfL1Data/L1DataDef.h"
+#include "TrigConfData/L1Menu.h"
// Interfaces used by the simulation
#include "TrigT1Interfaces/MuCTPICTP.h"
@@ -28,10 +24,10 @@
#include "TrigT1Interfaces/Lvl1MuCTPIInputPhase1.h"
#include "TrigT1Interfaces/MuCTPIL1Topo.h"
-#include "TrigT1Result/MuCTPI_RDO.h"
#include "TrigT1Result/MuCTPIRoI.h"
#include "xAODTrigger/MuonRoI.h"
#include "xAODTrigger/MuonRoIAuxContainer.h"
+#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "AnalysisTriggerEvent/LVL1_ROI.h"
@@ -54,9 +50,9 @@ namespace LVL1MUCTPIPHASE1 {
:
base_class(type, name, parent),
m_MuCTPIL1TopoKey(LVL1MUCTPI::DEFAULT_MuonL1TopoLocation),
- m_MuCTPIL1TopoKey_p1(""),
- m_configSvc( "TrigConf::TrigConfigSvc/TrigConfigSvc", name ),
- m_theMuctpi(new SimController())
+ m_theMuctpi(new SimController()),
+ m_rpcTool("LVL1::TrigT1RPCRecRoiTool/LVL1__TrigT1RPCRecRoiTool"),
+ m_tgcTool("LVL1::TrigT1TGCRecRoiTool/LVL1__TrigT1TGCRecRoiTool")
{
// Init message
@@ -64,9 +60,6 @@ namespace LVL1MUCTPIPHASE1 {
ATH_MSG_INFO( "Constructor for Phase1 MUCTPI_AthTool." );
ATH_MSG_INFO( "=======================================" );
- // Declare the service handles as properties:
- declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service" );
-
// Declare the properties of the overlap treatment:
declareProperty( "OverlapStrategyName", m_overlapStrategyName = "NULL" );
declareProperty( "LUTXMLFile", m_lutXMLFile = "" );
@@ -91,6 +84,9 @@ namespace LVL1MUCTPIPHASE1 {
declareProperty( "TGCLocID", m_tgcLocId = m_DEFAULT_L1MuctpiStoreLocationTGC );
declareProperty( "RPCLocID", m_rpcLocId = m_DEFAULT_L1MuctpiStoreLocationRPC );
+ // Declare the MuonRecRoiTools
+ declareProperty( "RPCRecRoiTool", m_rpcTool, "Tool to get the eta/phi coordinates in the RPC");
+ declareProperty( "TGCRecRoiTool", m_tgcTool, "Tool to get the eta/phi coordinates in the TGC");
}
MUCTPI_AthTool::~MUCTPI_AthTool()
@@ -140,15 +136,10 @@ namespace LVL1MUCTPIPHASE1 {
return StatusCode::FAILURE;
}
- ATH_MSG_INFO( "Retrieving trigger config service" << m_configSvc );
- CHECK(m_configSvc.retrieve());
//initialize MSP ROI configuration
const std::string fullFileName = PathResolverFindCalibFile( m_geometryXMLFile );
- m_theMuctpi->configureMSP(fullFileName);
-
- m_theMuctpi->getTriggerProcessor()->setThresholds(m_configSvc->thresholdConfig()->getThresholdVector(TrigConf::L1DataDef::MUON));
- //m_theMuctpi->getTriggerProcessor()->setThresholds(m_configSvc->muctpiConfig()->thresholds()); // maybe better to switch to this once new config is implemented
+ m_theMuctpi->configureTopo(fullFileName);
//
// Set up the overlap handling of the simulation:
@@ -157,12 +148,10 @@ namespace LVL1MUCTPIPHASE1 {
if( m_overlapStrategyName == "NULL" ) {
ATH_MSG_DEBUG( "Setting overlap strategy: \"NULL\"" );
- //m_theMuctpi->setOverlapStrategy( NO_OVERLAP ); // overlap removal to be implemented later
} else if( m_overlapStrategyName == "LUT" ) {
ATH_MSG_DEBUG( "Setting overlap strategy: \"LUT\"" );
- //m_theMuctpi->setOverlapStrategy( LUT_OVERLAP ); // overlap removal to be implemented later
if( m_flagMode ) {
ATH_MSG_INFO( "Using 'flagging mode' in the overlap handling" );
@@ -171,8 +160,8 @@ namespace LVL1MUCTPIPHASE1 {
ATH_MSG_INFO( "XML LUT file defined in jobO: " << m_lutXMLFile << " with a RunPeriod=" << m_runPeriod );
const std::string fullFileName = PathResolverFindCalibFile( m_lutXMLFile );
ATH_MSG_DEBUG( "Full path to XML LUT file: " << fullFileName );
- //CHECK( m_theMuctpi->initializeLUTOverlapStrategy( fullFileName, m_flagMode,
- // m_dumpLut, m_runPeriod ) ); // overlap removal to be implemented later
+
+ m_theMuctpi->configureOverlapRemoval(fullFileName);
} else {
@@ -188,8 +177,7 @@ namespace LVL1MUCTPIPHASE1 {
//Initialize Read/WriteHandleKeys
ATH_CHECK(m_muctpiPhase1KeyRPC.initialize());
ATH_CHECK(m_muctpiPhase1KeyTGC.initialize());
- ATH_CHECK(m_MuCTPI_RDOReadKey.initialize(m_inputSource == "RDO"));
- ATH_CHECK(m_MuCTPI_RDOWriteKey.initialize(m_inputSource != "RDO"));
+ ATH_CHECK(m_MuCTPICTPWriteKey.initialize());
ATH_CHECK(m_MuCTPI_xAODWriteKey.initialize());
ATH_CHECK(m_MuCTPIL1TopoKey.initialize());
@@ -202,11 +190,26 @@ namespace LVL1MUCTPIPHASE1 {
m_MuCTPIL1TopoKey_p2 = m_MuCTPIL1TopoKey.key()+std::to_string(2);
ATH_CHECK(m_MuCTPIL1TopoKey_p2.initialize());
+ CHECK( m_rpcTool.retrieve() );
+ CHECK( m_tgcTool.retrieve() );
return StatusCode::SUCCESS;
}
+ StatusCode MUCTPI_AthTool::start()
+ {
+ ATH_MSG_INFO( "=======================================" );
+ ATH_MSG_INFO( "Start for Phase1 MUCTPI_AthTool" );
+ ATH_MSG_INFO( "=======================================" );
+
+ ATH_MSG_INFO( "initialize(): use L1 trigger menu from detector store" );
+ const TrigConf::L1Menu * l1menu = nullptr;
+ ATH_CHECK( m_detStore->retrieve(l1menu) );
+ m_theMuctpi->getTriggerProcessor()->setMenu(l1menu);
+
+ return StatusCode::SUCCESS;
+ }
//----------------------------------------------
// execute() method called once per event
@@ -394,15 +397,12 @@ namespace LVL1MUCTPIPHASE1 {
/// the standart processing is done for the central slice, with no Bcid offset
if (bcidOffset == 0 ) {
// store CTP result in interface object and put to StoreGate
- std::vector<unsigned int> ctpData = m_theMuctpi->getCTPData();
- //TEMPORARILY REMOVED UNTIL MUCTPICTP UPDATED TO VECTOR!
- //LVL1::MuCTPICTP* theCTPResult = new LVL1::MuCTPICTP( ctpData );
- //CHECK( evtStore()->record( theCTPResult, m_ctpOutputLocId ) );
- //ATH_MSG_DEBUG( "CTP word recorded to StoreGate with key: "
- // << m_ctpOutputLocId );
+ const std::vector<unsigned int>& ctpData = m_theMuctpi->getTriggerProcessor()->getCTPData();
- // create MuCTPI RDO
- const std::vector<unsigned int>& daqData = m_theMuctpi->getDAQData();
+ LVL1::MuCTPICTP* theCTPResult = new LVL1::MuCTPICTP( ctpData );
+ SG::WriteHandle<LVL1::MuCTPICTP> wh_muctpi_ctp(m_MuCTPICTPWriteKey);
+ ATH_CHECK(wh_muctpi_ctp.record(std::make_unique<LVL1::MuCTPICTP>(*theCTPResult)));
+ ATH_MSG_DEBUG( "CTP word recorded to StoreGate" );
// size check
// check that the multiplicity was properly filled
@@ -413,23 +413,21 @@ namespace LVL1MUCTPIPHASE1 {
return StatusCode::FAILURE;
}
- // data word
- std::vector<unsigned int> dataWords= daqData;
-
// create MuCTPI RDO
- auto muCTPI_RDO = std::make_unique< MuCTPI_RDO >( std::move(ctpData), std::move(dataWords) );
- SG::WriteHandle<MuCTPI_RDO> wh_muctpi_rdo(m_MuCTPI_RDOWriteKey);
- ATH_CHECK(wh_muctpi_rdo.record(std::move(muCTPI_RDO)));
- ATH_MSG_DEBUG( "MuCTPI_RDO object recorded to StoreGate");
+ const std::vector<std::pair<int, unsigned int> >& daqData = m_theMuctpi->getTriggerProcessor()->getDAQData();
// create MuCTPI xAOD
auto xAODRoIs = SG::makeHandle(m_MuCTPI_xAODWriteKey);
ATH_CHECK(xAODRoIs.record(std::make_unique<xAOD::MuonRoIContainer>(), std::make_unique<xAOD::MuonRoIAuxContainer>()));
ATH_MSG_DEBUG("Recorded MuonRoIContainer with key " << m_MuCTPI_xAODWriteKey.key());
- for (const unsigned int word : daqData) {
+ for (std::pair<int, unsigned int> word : daqData) {
xAODRoIs->push_back(new xAOD::MuonRoI);
- // RB: dummy values just to have the objects for downstream code development
- xAODRoIs->back()->initialize(word, 99, 99, "DummyThreshold", 99);
+
+ LVL1::TrigT1MuonRecRoiData roiData;
+ if (word.first == 0) roiData = m_rpcTool->roiData(word.second); // barrel
+ else roiData = m_tgcTool->roiData(word.second); // endcap/forward
+
+ xAODRoIs->back()->initialize(word.second, roiData.eta(), roiData.phi(), "DummyThreshold", 99);
}
// get outputs for L1Topo and store into Storegate
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
index 09342a8a8103a42b4dd2a7523a1cc52619d97361..d1e9ee101cd52d8bca1583045955414a8facf097 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
@@ -5,7 +5,6 @@
// First the corresponding header.
#include "TrigT1MuctpiPhase1/MuonSectorProcessor.h"
-
// The headers from other ATLAS packages,
// from most to least dependent.
#include "TrigT1Interfaces/Lvl1MuCTPIInputPhase1.h"
@@ -20,24 +19,222 @@
// System headers.
#include <string>
#include <sstream>
+#include <iostream>
+#include <map>
+#include <set>
+#include <array>
+#include <vector>
+
using boost::property_tree::ptree;
-namespace LVL1MUCTPIPHASE1 {
- MuonSectorProcessor::MuonSectorProcessor(int /*subSystem*/)
+namespace LVL1MUCTPIPHASE1 {
+ struct SectorNumberConverter {
+
+ std::pair<int,int> barrel_global2local(int sector){
+ auto inoct_sector = ((sector + 2) % 4);
+ auto mioct_number = ((sector + 2) / 4) % 8;
+ return std::make_pair(inoct_sector,mioct_number);
+ }
+
+ int barrel_local2global(int number,int mioct){
+ return ((30 + 4 * mioct) + number) % 32;
+ }
+
+ std::pair<int,int> endcap_global2local(int sector){
+ auto inoct_sector = ((sector + 1) % 6);
+ auto mioct_number = ((sector + 1) / 6) % 8;
+ return std::make_pair(inoct_sector,mioct_number);
+
+ }
+
+ int endcap_local2global(int number,int mioct){
+ return ((47 + 6 * mioct) + number) % 48;
+ }
+ std::pair<int,int> forward_global2local(int sector){
+ auto inoct_sector = (sector % 3);
+ auto mioct_number = (sector / 3) % 8;
+ return std::make_pair(inoct_sector,mioct_number);
+
+ }
+
+ int forward_local2global(int number,int mioct){
+ return ((0 + 3 * mioct) + number) % 24;
+ }
+ };
+
+ struct OverlapHelper
+ {
+ int active_side = -1;
+ std::string sub_left="";
+ std::string sub_right="";
+ int sec_left = -1;
+ int sec_right = -1;
+ std::map<int,std::set<std::string> > global_pairs;
+
+ std::array<std::map<std::string,std::vector<std::string>>,2> lhs_index;
+ std::array<std::map<std::string,std::vector<std::string>>,2> rhs_index;
+
+ std::string make_key(std::string prefix, int global_sec, int roi){
+ prefix += std::to_string(global_sec) + "_" + std::to_string(roi);
+ return prefix;
+ }
+
+ std::string make_pair(std::string lhs, std::string rhs){
+ return lhs + ":" + rhs;
+ }
+
+
+ void create_indices(){
+ for(auto side_regions : global_pairs ){
+ for(auto region : side_regions.second){
+ auto split = region.find(':');
+ auto left = region.substr(0,split);
+ auto right = region.substr(split+1,std::string::npos);
+ lhs_index[side_regions.first][left].push_back(right);
+ rhs_index[side_regions.first][right].push_back(left);
+ }
+ }
+ }
+
+ std::vector<std::string> get_lhs_keys(std::string dettype, int roi, int sector){
+ std::vector<std::string> r;
+ r.push_back(dettype + std::to_string(sector) + "_" + std::to_string(roi));
+ return r;
+ }
+
+ std::vector<std::string> get_rhs_keys(std::string dettype, int roi, int sector){
+ std::vector<std::string> r;
+ r.push_back(dettype + std::to_string(sector) + "_" + std::to_string(roi));
+ return r;
+ }
+
+ std::vector<std::string> relevant_regions(int side, const std::string& dettype, int roi, int sector){
+ std::vector<std::string> r;
+ for(auto key : get_lhs_keys(dettype,roi,sector)){
+ auto x = lhs_index[side].find(key);
+ if(x != lhs_index[side].end()){
+ for(auto rr : lhs_index[side][key]){
+ r.push_back(make_pair(key,rr));
+ }
+ }
+ }
+ for(auto key : get_rhs_keys(dettype,roi,sector)){
+ auto x = rhs_index[side].find(key);
+ if(x != rhs_index[side].end()){
+ for(auto rr : rhs_index[side][key]){
+ r.push_back(make_pair(rr,key));
+ }
+ }
+ }
+ return r;
+ }
+
+ void configure(const std::string& lutFile)
+ {
+ ptree inputTree;
+ read_xml(lutFile, inputTree);
+
+ boost::property_tree::ptree topEle = inputTree.get_child("MUCTPI_LUT");
+
+ // iterate through elements of the XML
+ for(const boost::property_tree::ptree::value_type &x: topEle) {
+
+ std::string topElementName = x.first;
+ ptree lut = x.second;
+
+
+ if (topElementName != "LUT") continue;
+
+ std::string SectorId1 = MuctpiXMLHelper::getAttribute(lut,"SectorId1");
+ std::string SectorId2 = MuctpiXMLHelper::getAttribute(lut,"SectorId2");
+
+ unsigned left_mod = 32;
+ unsigned right_mod = 32;
+ if (SectorId1[0] == 'E') left_mod = 48;
+ if (SectorId1[0] == 'F') left_mod = 24;
+ if (SectorId2[0] == 'E') right_mod = 48;
+ if (SectorId2[0] == 'F') right_mod = 24;
+
+ std::string snum_left = std::string(1,SectorId1[1])+std::string(1,SectorId1[2]);
+ sub_left = std::string(1,SectorId1[0]);
+ sec_left = std::stoi(snum_left) % left_mod;
+
+ std::string snum_right = std::string(1,SectorId2[1])+std::string(1,SectorId2[2]);
+ sub_right = std::string(1,SectorId2[0]);
+ sec_right = std::stoi(snum_right) % right_mod;
+
+ std::string side = MuctpiXMLHelper::getAttribute(lut,"Side");
+ if (side == "C") active_side = 0;
+ else active_side = 1;
+
+ for(const boost::property_tree::ptree::value_type &z: lut) {
+ std::string menuElementName = z.first;
+ ptree ele = z.second;
+
+ if (std::string("BBElement").compare(menuElementName) == 0){
+ auto roi1 = MuctpiXMLHelper::getIntAttribute(ele, "RoI1");
+ auto roi2 = MuctpiXMLHelper::getIntAttribute(ele, "RoI2");
+ auto lhs_key = make_key("B",sec_left,roi1);
+ auto rhs_key = make_key("B",sec_right,roi2);
+ auto region = make_pair(lhs_key,rhs_key);
+ global_pairs[active_side].insert(region);
+ }
+ else if (std::string("BEElement").compare(menuElementName) == 0){
+ auto roi1 = MuctpiXMLHelper::getIntAttribute(ele, "BRoI");
+ auto roi2 = MuctpiXMLHelper::getIntAttribute(ele, "ERoI");
+ auto lhs_key = make_key("B",sec_left,roi1);
+ auto rhs_key = make_key("E",sec_right,roi2);
+ auto region = make_pair(lhs_key,rhs_key);
+ global_pairs[active_side].insert(region);
+ }
+ else if (std::string("EEElement").compare(menuElementName) == 0){
+ auto roi1 = MuctpiXMLHelper::getIntAttribute(ele, "RoI1");
+ auto roi2 = MuctpiXMLHelper::getIntAttribute(ele, "RoI2");
+ auto lhs_key = make_key("E",sec_left,roi1);
+ auto rhs_key = make_key("E",sec_right,roi2);
+ auto region = make_pair(lhs_key,rhs_key);
+ global_pairs[active_side].insert(region);
+ }
+ else if (std::string("EFElement").compare(menuElementName) == 0){
+ auto roi1 = MuctpiXMLHelper::getIntAttribute(ele, "ERoI");
+ auto roi2 = MuctpiXMLHelper::getIntAttribute(ele, "FRoI");
+ auto lhs_key = make_key("E",sec_left,roi1);
+ auto rhs_key = make_key("F",sec_right,roi2);
+ auto region = make_pair(lhs_key,rhs_key);
+ global_pairs[active_side].insert(region);
+ }
+ else if (std::string("FFElement").compare(menuElementName) == 0){
+ auto roi1 = MuctpiXMLHelper::getIntAttribute(ele, "RoI1");
+ auto roi2 = MuctpiXMLHelper::getIntAttribute(ele, "RoI2");
+ auto lhs_key = make_key("F",sec_left,roi1);
+ auto rhs_key = make_key("F",sec_right,roi2);
+ auto region = make_pair(lhs_key,rhs_key);
+ global_pairs[active_side].insert(region);
+ }
+ }
+ }
+ create_indices();
+ }
+ };
+
+
+ MuonSectorProcessor::MuonSectorProcessor(bool side)
:
m_muctpiInput(nullptr),
- m_l1topo(nullptr)
+ m_l1topo(nullptr),
+ m_overlapHelper(new OverlapHelper),
+ m_side(side)
{
}
MuonSectorProcessor::~MuonSectorProcessor()
{
-
+ delete m_overlapHelper;
}
- void MuonSectorProcessor::configure(const std::string& xmlName)
+ void MuonSectorProcessor::configureTopo(const std::string& xmlName)
{
ptree inputTree;
read_xml(xmlName, inputTree);
@@ -79,15 +276,66 @@ namespace LVL1MUCTPIPHASE1 {
}
}
}
+
+ void MuonSectorProcessor::configureOverlapRemoval(const std::string& lutFile)
+ {
+ m_overlapHelper->configure(lutFile);
+ }
void MuonSectorProcessor::setInput(LVL1MUONIF::Lvl1MuCTPIInputPhase1* input)
{
m_muctpiInput=input;
}
- void MuonSectorProcessor::removeOverlap()
+ void MuonSectorProcessor::runOverlapRemoval()
{
+ std::map<std::string,std::vector<std::pair<std::shared_ptr<LVL1MUONIF::Lvl1MuSectorLogicDataPhase1>, unsigned> > > buckets;
+
+ for (size_t isys=0;isys<LVL1MUONIF::Lvl1MuCTPIInputPhase1::numberOfSystems();isys++)
+ {
+ // Sectors per system
+ LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSystem system = static_cast<LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSystem>(isys);
+ for (size_t isec=0;isec<LVL1MUONIF::Lvl1MuCTPIInputPhase1::numberOfSector(system);isec++)
+ {
+ // A+C sides
+ for (size_t isub=0;isub<2;isub++)
+ {
+ if (isub != size_t(m_side)) continue;
+ unsigned int bcid=0;//temporary
+
+ //get a pointer to this since we'll need to modify the 'veto' flag of the SL data
+ std::shared_ptr<LVL1MUONIF::Lvl1MuSectorLogicDataPhase1> sectorData = m_muctpiInput->getSectorLogicDataPtr(isys, isub, isec, bcid);
+ if (!sectorData) continue;
+
+ for (unsigned int icand=0;icand<LVL1MUONIF::NCAND[isys];icand++)
+ {
+ //build the sector name
+ std::string sectorName="";
+ if (isys == 0) sectorName="B";
+ else if (isys == 1) sectorName="E";
+ else if (isys == 2) sectorName="F";
+
+ int roiID = sectorData->roi(icand);
+ if (roiID < 0) continue;
+ int ptword = sectorData->pt(icand);
+ if (ptword < 0) continue;
+
+ for(auto rr : m_overlapHelper->relevant_regions(m_side,sectorName,roiID,isec))
+ {
+ buckets[rr].push_back(std::make_pair(sectorData, icand));
+ }
+ }
+ }
+ }
+ }
+ for(auto candidate_vector : buckets){ // loop over candidates in OL region pair
+ //for each candidate above the first, mark them as overlapping
+ for (unsigned i=1;i<candidate_vector.second.size();i++)
+ {
+ candidate_vector.second[i].first->veto(candidate_vector.second[i].second, 1);
+ }
+ }
}
void MuonSectorProcessor::makeTriggerObjectSelections()
@@ -109,6 +357,7 @@ namespace LVL1MUCTPIPHASE1 {
// A+C sides
for (size_t isub=0;isub<2;isub++)
{
+ if (isub != size_t(m_side)) continue;
unsigned int bcid=0;//temporary
const LVL1MUONIF::Lvl1MuSectorLogicDataPhase1* sectorData = &m_muctpiInput->getSectorLogicData(isys, isub, isec, bcid);
if (!sectorData)
@@ -124,7 +373,7 @@ namespace LVL1MUCTPIPHASE1 {
else if (isys == 1) sectorName<<"E";
else if (isys == 2) sectorName<<"F";
- LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSubSystem side = static_cast<LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSubSystem>(isec);
+ LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSubSystem side = static_cast<LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSubSystem>(isub);
if (isys == 0)
{
int sectorNumber=isec;
@@ -149,6 +398,8 @@ namespace LVL1MUCTPIPHASE1 {
int roiID = sectorData->roi(icand);
if (roiID < 0) continue;
+ int ptword = sectorData->pt(icand);
+ if (ptword < 0) continue;
//find the ROI object
std::map<unsigned int, ROIObject>::iterator roiItr = secItr->second.find(roiID);
@@ -159,7 +410,6 @@ namespace LVL1MUCTPIPHASE1 {
- //unsigned int bcid=0;
unsigned int ptThresholdID=0;
unsigned int ptL1TopoCode=0;
unsigned int ptValue=0;
@@ -203,6 +453,6 @@ namespace LVL1MUCTPIPHASE1 {
LVL1::MuCTPIL1Topo MuonSectorProcessor::getL1TopoData(int bcidOffset)
{
if (bcidOffset > -5 && bcidOffset < 5) return *m_l1topo;
- return LVL1::MuCTPIL1Topo(); // return junk for now but fix this when we have an established procedure for handling bcid offsets
+ return LVL1::MuCTPIL1Topo();
}
}
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/SimController.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/SimController.cxx
index 8695dcfd3b45d2b66358d24fc83c194a5b87f722..506eeff9aaac53ec2632b36231b4fc68c4148fb6 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/SimController.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/SimController.cxx
@@ -35,9 +35,14 @@ namespace LVL1MUCTPIPHASE1 {
delete m_triggerProcessor;
}
- void SimController::configureMSP(const std::string& xmlFile)
+ void SimController::configureTopo(const std::string& geoFile)
{
- for (int i=0;i<(int)m_muonSectorProcessors.size();i++) m_muonSectorProcessors[i]->configure(xmlFile);
+ for (int i=0;i<(int)m_muonSectorProcessors.size();i++) m_muonSectorProcessors[i]->configureTopo(geoFile);
+ }
+
+ void SimController::configureOverlapRemoval(const std::string& lutFile)
+ {
+ for (int i=0;i<(int)m_muonSectorProcessors.size();i++) m_muonSectorProcessors[i]->configureOverlapRemoval(lutFile);
}
// set Configuration
@@ -65,7 +70,7 @@ namespace LVL1MUCTPIPHASE1 {
for (int i=0;i<nMSP;i++)
{
m_muonSectorProcessors[i]->setInput(input);
- m_muonSectorProcessors[i]->removeOverlap();
+ m_muonSectorProcessors[i]->runOverlapRemoval();
m_muonSectorProcessors[i]->makeTriggerObjectSelections();
m_muonSectorProcessors[i]->makeL1TopoData();
processedInputs.push_back(m_muonSectorProcessors[i]->getOutput());
@@ -78,11 +83,6 @@ namespace LVL1MUCTPIPHASE1 {
m_triggerProcessor->makeTopoSelections();
}
- const std::vector<uint32_t>& SimController::getCTPData()
- {
- return m_triggerProcessor->getCTPData();
- }
-
LVL1::MuCTPIL1Topo SimController::getL1TopoData(int bcidOffset)
{
LVL1::MuCTPIL1Topo l1topo;
@@ -94,27 +94,6 @@ namespace LVL1MUCTPIPHASE1 {
return l1topo;
}
- const std::vector<unsigned int>& SimController::getDAQData()
- {
- return m_triggerProcessor->getDAQData();
- }
-
- std::list<unsigned int> SimController::getRoIBData()
- {
- std::list<unsigned int> dummy;
- return dummy;
- }
-
- bool SimController::hasBarrelCandidate()
- {
- return false;
- }
-
- bool SimController::hasEndcapCandidate()
- {
- return false;
- }
-
TriggerProcessor* SimController::getTriggerProcessor()
{
return m_triggerProcessor;
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/TriggerProcessor.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/TriggerProcessor.cxx
index 648d7ee90886483386f7eb12915daa293b0da81e..3aa3a4c5cd7c5d459b3147a67e0fda600a6f6c3c 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/TriggerProcessor.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/TriggerProcessor.cxx
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// First the corresponding header.
@@ -12,17 +12,22 @@
#include "TrigT1Interfaces/Lvl1MuSectorLogicConstantsPhase1.h"
#include "TrigT1Result/MuCTPI_RDO.h"
#include "TrigT1MuctpiPhase1/Configuration.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
+#include "TrigConfData/L1ThrExtraInfo.h"
+#include "TrigConfData/L1Threshold.h"
+#include "TrigConfData/L1Menu.h"
// Headers from external packages.
#include <math.h>
+#include <bitset>
+#include <sstream>
// System headers.
namespace LVL1MUCTPIPHASE1 {
TriggerProcessor::TriggerProcessor()
:
- m_mergedInputs(new LVL1MUONIF::Lvl1MuCTPIInputPhase1())
+ m_mergedInputs(new LVL1MUONIF::Lvl1MuCTPIInputPhase1()),
+ m_l1menu(nullptr)
{
}
@@ -33,9 +38,9 @@ namespace LVL1MUCTPIPHASE1 {
}
- void TriggerProcessor::setThresholds(const std::vector<TrigConf::TriggerThreshold*>& thresholds)
+ void TriggerProcessor::setMenu(const TrigConf::L1Menu* l1menu)
{
- m_thresholds = thresholds;
+ m_l1menu = l1menu;
}
void TriggerProcessor::mergeInputs(std::vector<LVL1MUONIF::Lvl1MuCTPIInputPhase1*> inputs)
@@ -51,8 +56,9 @@ namespace LVL1MUCTPIPHASE1 {
m_daq_data.clear();
//initialize the vector to hold the threshold multiplicities
- int nThresholds = m_thresholds.size();
- std::vector<int> multiplicities(nThresholds, 0);
+ const std::vector<std::shared_ptr<TrigConf::L1Threshold> >* thresholds = &m_l1menu->thresholds("MU");
+ int nThresholds = thresholds->size();
+ std::vector<int> multiplicities(nThresholds,0);
// Barrel + EC + Fwd
@@ -73,48 +79,25 @@ namespace LVL1MUCTPIPHASE1 {
{
int thresh = sectorData->pt(icand);
if (thresh == -1) continue; // no candidate
+ int roiID = sectorData->roi(icand);
+ if (roiID < 0) continue;
- //loop over each muon threshold and see if this candidate satisfies it
-/*This will be migrated later along with the changes needed in the TrigConfL1Data package
- for (int ithresh=0;ithresh<nThresholds;ithresh++)
- {
- const TrigConf::TriggerThreshold* thr = m_thresholds[ithresh];
- const TrigConf::Run3MuonTriggerThreshold* muthr = thr->run3MuonTriggerThreshold();
- bool passed=false;
- if (isys == LVL1MUONIF::Lvl1MuCTPIInputPhase1::idBarrelSystem())
- {
- if ((int)muthr->rpcThr()+1 >= thresh) passed=true;
- }
- else
- {
- if ((int)muthr->tgcThr()+1 >= thresh) passed=true;
- }
- if (passed) multiplicities[ithresh]++;
- }
-*/
-
- //build the daq word here
+ // Build the DAQ word
uint32_t daq_word=0;
+
+ // Some definitions that are different between subsystems
uint32_t ROI_MASK=0;
- uint32_t OL_MASK=0;
- uint32_t OL_SHIFT=0;
uint32_t SECTOR_MASK = 0;
- uint32_t SECTORID_SHIFT = MuCTPI_RDO::CAND_SECTOR_ADDRESS_SHIFT+1;
- uint32_t SUBSYS_SHIFT = MuCTPI_RDO::CAND_SECTOR_ADDRESS_SHIFT+6;
uint32_t SUBSYS_MASK = 0x3;
uint32_t SUBSYS_ID = 0; // default for barrel
if (isys == 0)
{
ROI_MASK = MuCTPI_RDO::BARREL_ROI_MASK;
- OL_MASK = MuCTPI_RDO::BARREL_OL_MASK;
- OL_SHIFT = MuCTPI_RDO::BARREL_OL_SHIFT;
SECTOR_MASK = MuCTPI_RDO::BARREL_SECTORID_MASK;
}
else if (isys == 1)
{
ROI_MASK = MuCTPI_RDO::ENDCAP_ROI_MASK;
- OL_MASK = MuCTPI_RDO::ENDCAP_OL_MASK;
- OL_SHIFT = MuCTPI_RDO::ENDCAP_OL_SHIFT;
SECTOR_MASK = MuCTPI_RDO::ENDCAP_SECTORID_MASK;
SUBSYS_ID = 2; // not a typo!
}
@@ -124,89 +107,183 @@ namespace LVL1MUCTPIPHASE1 {
SECTOR_MASK = MuCTPI_RDO::FORWARD_SECTORID_MASK;
SUBSYS_ID = 1; // not a typo!
}
+
//General formula for each subword:
//daq_word |= (subword & MuCTPI_RDO::MASK) << MuCTPI_RDO::SHIFT
- daq_word |= (sectorData->is2candidatesInSector() & MuCTPI_RDO::CAND_OVERFLOW_MASK) << MuCTPI_RDO::CAND_OVERFLOW_SHIFT;
- daq_word |= (sectorData->is2candidates(icand) & MuCTPI_RDO::ROI_OVERFLOW_MASK) << MuCTPI_RDO::ROI_OVERFLOW_SHIFT;
- daq_word |= (sectorData->roi(icand) & ROI_MASK) << MuCTPI_RDO::ROI_SHIFT;
- daq_word |= (sectorData->ovl(icand) & OL_MASK) << OL_SHIFT;
- daq_word |= (thresh & MuCTPI_RDO::CAND_PT_MASK) << MuCTPI_RDO::CAND_PT_SHIFT;
- // daq_word |= (sectorData->bcid() & MuCTPI_RDO::CAND_BCID_MASK) << MuCTPI_RDO::CAND_BCID_SHIFT; // bcid not included in this word (yet?)
-
- //set the address information
- daq_word |= (isub & MuCTPI_RDO::SECTOR_HEMISPHERE_MASK) << MuCTPI_RDO::CAND_SECTOR_ADDRESS_SHIFT;
- daq_word |= (isec & SECTOR_MASK) << SECTORID_SHIFT;
- daq_word |= (SUBSYS_ID & SUBSYS_MASK) << SUBSYS_SHIFT;
- //there are other items that are less important. let's ignore them for the moment
- m_daq_data.push_back(daq_word);
+ //ROI word
+ daq_word |= (sectorData->roi(icand) & ROI_MASK) << MuCTPI_RDO::RUN3_ROI_SHIFT;
+
+ //PT word
+ daq_word |= (thresh & MuCTPI_RDO::CAND_PT_MASK) << MuCTPI_RDO::RUN3_CAND_PT_SHIFT;
+
+ //CANDIDIATE FLAGS
+ if (isys == 0)
+ {
+ daq_word |= (sectorData->ovl(icand) & MuCTPI_RDO::RUN3_BARREL_OL_MASK) << MuCTPI_RDO::RUN3_BARREL_OL_SHIFT;
+ daq_word |= (sectorData->is2candidates(icand) & MuCTPI_RDO::ROI_OVERFLOW_MASK) << MuCTPI_RDO::RUN3_ROI_OVERFLOW_SHIFT;
+ }
+ else
+ {
+ daq_word |= (sectorData->charge(icand) & 0x1) << MuCTPI_RDO::RUN3_CAND_TGC_CHARGE_SIGN_SHIFT;
+ daq_word |= (sectorData->bw2or3(icand) & 0x1) << MuCTPI_RDO::RUN3_CAND_TGC_BW2OR3_SHIFT;
+ daq_word |= (sectorData->innercoin(icand) & 0x1) << MuCTPI_RDO::RUN3_CAND_TGC_INNERCOIN_SHIFT;
+ daq_word |= (sectorData->goodmf(icand) & 0x1) << MuCTPI_RDO::RUN3_CAND_TGC_GOODMF_SHIFT;
+ }
+
+ //CANDIDATE VETO FLAG
+ daq_word |= (sectorData->veto(icand) & 0x1) << MuCTPI_RDO::RUN3_CAND_VETO_SHIFT;
+
+ //SECTOR FLAGS
+ daq_word |= (sectorData->is2candidatesInSector() & MuCTPI_RDO::CAND_OVERFLOW_MASK) << MuCTPI_RDO::RUN3_CAND_OVERFLOW_SHIFT;
+
+ //SECTOR ADDRESS
+ daq_word |= (isub & MuCTPI_RDO::SECTOR_HEMISPHERE_MASK) << MuCTPI_RDO::RUN3_CAND_SECTOR_ADDRESS_SHIFT;
+ daq_word |= (isec & SECTOR_MASK) << MuCTPI_RDO::RUN3_CAND_SECTORID_SHIFT;
+ daq_word |= (SUBSYS_ID & SUBSYS_MASK) << MuCTPI_RDO::RUN3_SUBSYS_ADDRESS_SHIFT;
+
+
+ // Add extra bit in front to flag that this is a RUN3 RoI
+ daq_word |= 0x1 << 31;
+
+ m_daq_data.push_back(std::make_pair(SUBSYS_ID, daq_word));
+
+
+ //
+ // Perform multiplicity counting
+ //
+
+ //if this candidate has been flagged as overlapping, stop here and don't count it in the multiplicity
+ if (sectorData->veto(icand)) continue;
+
+ //loop over each muon threshold and see if this candidate satisfies it.
+ //if so, increment the multiplicity of this threshold
+ for (int ithresh=0;ithresh<nThresholds;ithresh++)
+ {
+ const TrigConf::L1Threshold_MU* thr = (const TrigConf::L1Threshold_MU*)(*thresholds)[ithresh].get();
+ bool passed=false;
+ if (isys == LVL1MUONIF::Lvl1MuCTPIInputPhase1::idBarrelSystem())
+ {
+ if (thr->region().find("ALL") == std::string::npos &&
+ thr->region().find("BA") == std::string::npos) continue;
+
+ //veto this candidate from this multiplicity if it's part of the excluded ROI list
+ std::string rpcExclROIList = thr->rpcExclROIList();
+ if (rpcExclROIList != "")
+ {
+ const std::map<std::string, std::vector<unsigned int> >* exclList = &m_l1menu->thrExtraInfo().MU().exclusionList(rpcExclROIList);
+ if (exclList->size() != 0)
+ {
+ std::stringstream sectorName;
+ sectorName<<"B";
+ int sectorNumber=isec;
+ LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSubSystem side = static_cast<LVL1MUONIF::Lvl1MuCTPIInputPhase1::MuonSubSystem>(isec);
+ if (side == LVL1MUONIF::Lvl1MuCTPIInputPhase1::idSideC()) sectorNumber += 32;
+ if (sectorNumber < 10) sectorName << "0";
+ sectorName << sectorNumber;
+
+ auto exclROIs = exclList->find(sectorName.str());
+ if (exclROIs != exclList->end())
+ {
+ bool found = false;
+ for (auto roi_itr=exclROIs->second.begin();roi_itr!=exclROIs->second.end();roi_itr++)
+ {
+ if (int(*roi_itr) == sectorData->roi(icand))
+ {
+ found=true;
+ break;
+ }
+ }
+ if (found) continue;
+ }
+ }
+ }
+
+ if ((int)thr->idxBarrel()+1 >= thresh) passed=true;
+ }
+ else
+ {
+ if (isys == LVL1MUONIF::Lvl1MuCTPIInputPhase1::idEndcapSystem())
+ {
+ if (thr->region().find("ALL") == std::string::npos &&
+ thr->region().find("EC") == std::string::npos) continue;
+ if ((int)thr->idxEndcap()+1 >= thresh) passed=true;
+ }
+ else
+ {
+ if (thr->region().find("ALL") == std::string::npos &&
+ thr->region().find("FW") == std::string::npos) continue;
+ if ((int)thr->idxForward()+1 >= thresh) passed=true;
+ }
+
+ //check tgc quality flags
+ bool F = sectorData->bw2or3(icand);
+ bool C = sectorData->innercoin(icand);
+ bool H = sectorData->goodmf(icand);
+
+ //parse the logic of the quality flag into a 2D vector, where outer layer contains the logic |'s and inner layer contains the logical &'s.
+ //save the 2D vector in a map so we don't have to parse it each time we want to check the flags.
+ std::string tgcFlags = thr->tgcFlags();
+ if (m_parsed_tgcFlags.find(tgcFlags) == m_parsed_tgcFlags.end())
+ {
+ std::vector<std::string> vec_ors = parseString(tgcFlags, "|");
+ std::vector<std::vector<std::string> > vec_flags;
+ for (unsigned ior=0;ior<vec_ors.size();ior++)
+ {
+ vec_flags.push_back(parseString(vec_ors[ior],"&"));
+ }
+ m_parsed_tgcFlags[tgcFlags] = vec_flags;
+ }
+
+ //check the quality based on the flags.
+ //loop over outer layer of "ors" and 'or' the results
+ bool passedFlags = false;
+ const std::vector<std::vector<std::string> >* vec_flags = &m_parsed_tgcFlags[tgcFlags];
+ for (auto or_itr = vec_flags->begin();or_itr!=vec_flags->end();or_itr++)
+ {
+ //loop over the inner layer of "ands" and 'and' the results
+ bool passedAnd = true;
+ for (auto and_itr = or_itr->begin();and_itr!=or_itr->end();and_itr++)
+ {
+ if (*and_itr == "F") passedAnd = passedAnd && F;
+ else if (*and_itr == "C") passedAnd = passedAnd && C;
+ else if (*and_itr == "H") passedAnd = passedAnd && H;
+ }
+ passedFlags = passedFlags || passedAnd;
+ }
+
+ if (!passedFlags) continue;
+ }
+
+ if (passed) multiplicities[ithresh]++;
+ }
}
}
}
}
-
- //build the CTP words
- unsigned int current_ctp_word=0;
- int pos=0;
- int word_size = sizeof(current_ctp_word)*8;
+
+ //build the CTP words with bitset:
+ //first build the bitset that contains the full word
+ std::bitset<256> full_ctp_word = 0;
+ unsigned pos = 0;
for (int i=0;i<nThresholds;i++)
{
- //buffer to add at the word at the end of the block, if necessary
- unsigned int word_to_add=0;
- bool add_word=false; // need this in case the word needs to be added but its empty
-
- //truncate the thresholds if they're over the number of specified bits
- int nbits = m_thresholds[i]->bitnum();
- int maxsize = std::pow(2,nbits)-1;
- if (multiplicities[i] > maxsize) multiplicities[i] = maxsize;
-
- //assign the individual multiplicity word to the CTP word
- if (pos+nbits <= word_size)
- {
- //assign the word
- current_ctp_word |= multiplicities[i] << pos;
-
- //add it to the word list if its full (or we're at the end of the threshold list) and reset
- if (pos+nbits == word_size || i == nThresholds-1)
- {
- word_to_add=current_ctp_word;
- add_word=true;
- pos=0;
- }
- else
- {
- //increment the position
- pos += nbits;
- }
- }
- else
- {//handle cases where the individual multiplicity word is split between two 32-bit words
- //truncate the multiplicity by the remaining length
- int remaining_length = word_size-pos;
- int mask = 0;
- for (int j=0;j<remaining_length;j++) mask |= 0x1 << j;
- int mult_trunc = multiplicities[i] & mask;
-
- //add this to the current word
- current_ctp_word |= mult_trunc << pos;
-
- //add the current word to the CTP word list
- word_to_add=current_ctp_word;
- add_word=true;
-
- //reset the current word and add the remainder to the new word
- current_ctp_word = multiplicities[i] >> remaining_length;
-
- //recalculate the position
- pos += nbits;
- pos -= word_size;
- }
+ auto & triggerline = m_l1menu->connector("MuCTPiOpt0").triggerLine((*thresholds)[i]->name());
+ unsigned nbits = triggerline.endbit() - triggerline.startbit() + 1;
+ std::bitset<256> mult = (multiplicities[i] << pos);
+ full_ctp_word |= mult;
+ pos += nbits;
+ }
- //add the word if its not empty, or if we're at the end of the loop;
- if (add_word || i == nThresholds-1)
- {
- m_ctp_words.push_back(word_to_add);
- }
+ //divide up into a vector of 32-bit unsigned ints
+ std::bitset<256> u32i_mask = 0xffffffff;
+ unsigned n32_ints = pos/32;
+ if (pos % 32 != 0) n32_ints += 1;
+ for (unsigned i=0;i<n32_ints;i++)
+ {
+ unsigned int word = static_cast<unsigned int>((full_ctp_word & u32i_mask).to_ulong());
+ m_ctp_words.push_back(word);
+ full_ctp_word >>= 32;
}
}
@@ -222,8 +299,37 @@ namespace LVL1MUCTPIPHASE1 {
}
- const std::vector<unsigned int>& TriggerProcessor::getDAQData()
+ const std::vector<std::pair<int, unsigned int> >& TriggerProcessor::getDAQData()
{
return m_daq_data;
}
+
+ std::vector<std::string> TriggerProcessor::parseString(std::string str, std::string sep)
+ {
+ std::vector<std::string> parsed;
+ int pos = 0;
+ bool first = true;
+ if (str.size() == 0) return parsed;
+ if (str.find(sep) == std::string::npos)
+ {
+ parsed.push_back(str);
+ return parsed;
+ }
+ while (true)
+ {
+ int newPos = str.find(sep, pos);
+ if (str.find(sep, pos) == std::string::npos)
+ {
+ if (!first) parsed.push_back(str.substr(pos, newPos-pos));
+ break;
+ }
+ std::string sub = str.substr(pos, newPos-pos);
+ parsed.push_back(sub);
+ pos = newPos+1;
+ first = false;
+ }
+ return parsed;
+ }
+
}
+
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/CMakeLists.txt b/Trigger/TrigT1/TrigT1MuonRecRoiTool/CMakeLists.txt
index 169d388e76c6f98d6d1221ccb4c2438fa4d2e3ff..27558362b0411008edc4fe98a14902d382d90fcd 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1MuonRecRoiTool/CMakeLists.txt
@@ -3,13 +3,10 @@
# Declare the package name:
atlas_subdir( TrigT1MuonRecRoiTool )
-# Component(s) in the package:
-atlas_add_library( TrigT1MuonRecRoiToolLib
- src/*.cxx
- PUBLIC_HEADERS TrigT1MuonRecRoiTool
- LINK_LIBRARIES AthenaKernel GaudiKernel MuonIdHelpersLib MuonReadoutGeometry TGCcablingInterfaceLib RPCcablingInterfaceLib RPC_CondCablingLib )
-
atlas_add_component( TrigT1MuonRecRoiTool
+ src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES TrigT1MuonRecRoiToolLib )
+ LINK_LIBRARIES AthenaKernel GaudiKernel TrigT1Interfaces MuonIdHelpersLib MuonReadoutGeometry TGCcablingInterfaceLib RPCcablingInterfaceLib RPC_CondCablingLib )
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py b/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..80696cbaa96062ae42110c577c62e67ca6d7330d
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+
+# Local (generated) configurable(s):
+from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConf import LVL1__TrigT1RPCRecRoiTool
+from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConf import LVL1__TrigT1TGCRecRoiTool
+
+def getRun3RPCRecRoiTool(name = "RPCRecRoiTool"):
+ tool = LVL1__TrigT1RPCRecRoiTool(name)
+ tool.UseRun3Config=True
+ return tool
+
+def getRun3TGCRecRoiTool(name = "TGCRecRoiTool"):
+ tool = LVL1__TrigT1TGCRecRoiTool(name)
+ tool.UseRun3Config=True
+ return tool
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.h b/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.h
index 0becbc352a4b7866be4fe7f2a16f7c58eadbb3a9..aa128bddcef1bfb94ef7307bb5d35b956a0740c9 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.h
+++ b/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.h
@@ -5,7 +5,7 @@
#ifndef TRIGT1RPCRECROITOOL_H
#define TRIGT1RPCRECROITOOL_H
-#include "TrigT1MuonRecRoiTool/ITrigT1MuonRecRoiTool.h"
+#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
namespace Muon{
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1TGCRecRoiTool.h b/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1TGCRecRoiTool.h
index 7a30990d09c5d74d2f4c5935505bea23a77545a6..6cf6077fb54b08beb8b141a79eacccb3814a6553 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1TGCRecRoiTool.h
+++ b/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1TGCRecRoiTool.h
@@ -5,7 +5,7 @@
#ifndef TRIGT1TGCRECROITOOL_H
#define TRIGT1TGCRECROITOOL_H
-#include "TrigT1MuonRecRoiTool/ITrigT1MuonRecRoiTool.h"
+#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
class TGCIdBase;
diff --git a/Trigger/TrigT1/TrigT1Result/CMakeLists.txt b/Trigger/TrigT1/TrigT1Result/CMakeLists.txt
index 971d822fa801e690863f1526fbcd3715ee053dc7..e538f9a9105db387b9f5c0d475db2a86bcb9464c 100644
--- a/Trigger/TrigT1/TrigT1Result/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1Result/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_library( TrigT1Result
src/*.cxx
PUBLIC_HEADERS TrigT1Result
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaKernel L1TopoRDO TrigT1Interfaces
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaKernel L1TopoRDO TrigT1Interfaces TrigT1MuctpiBits
PRIVATE_LINK_LIBRARIES GaudiKernel )
atlas_add_dictionary( TrigT1ResultDict
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h
index d671081166fad31a4402e275ac83177e706ab7f6..25ee090f678bbd272552578c3f85d3671808ad98 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/MuCTPI_RDO.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1RESULT_MUCTPI_RDO_H
@@ -44,6 +44,7 @@ public:
/// Enumeration defining the different sources for the muon candidates
enum SectorLocation { BARREL = 0, ENDCAP = 1, FORWARD = 2 };
+
/// "Intermediate" constructor
/**
* This constructor is tipically used for filling the object with information
@@ -140,90 +141,8 @@ public:
const std::vector< uint32_t >& dataWord() const {
return m_dataWord;
}
-
- /// Binary 111 representing the maximal multiplicity value for a given threshold
- static constexpr uint32_t MULT_VAL = 7;
- /// Number of multiplicity bits reserved per threshold
- static constexpr uint32_t MULT_BITS = 3;
- /// Defining the number of p<sub>T</sub> thresholds in the system
- static constexpr uint32_t MULT_THRESH_NUM = 6;
- /// Telling that the 3-bit BCID comes at "position 7" in the multiplicity word
- static constexpr uint32_t MULT_BCID_POS = 7;
-
- /// Weird mask for the bit showing if more than two muon candidates were in the trigger sector
- static constexpr uint32_t CAND_OVERFLOW_MASK = 0x1;
- /// Position of the candidate overflow mask
- static constexpr uint32_t CAND_OVERFLOW_SHIFT = 0;
- /// Weird mask for the bit showing if more than one muon candidates were in the sector RoI
- static constexpr uint32_t ROI_OVERFLOW_MASK = 0x1;
- /// Position of the RoI overflow mask
- static constexpr uint32_t ROI_OVERFLOW_SHIFT = 1;
-
- /// Bit in the candidate's address turned on for endcap candidates
- static constexpr uint32_t ENDCAP_ADDRESS_MASK = 0x80;
- /// Bit in the candidate's address turned on for forward candidates
- static constexpr uint32_t FORWARD_ADDRESS_MASK = 0x40;
-
- /// Mask for extracting the sector ID for endcap candidates from the data word
- static constexpr uint32_t ENDCAP_SECTORID_MASK = 0x3f;
- /// Mask for extracting the sector ID for forward candidates from the data word
- static constexpr uint32_t FORWARD_SECTORID_MASK = 0x1f;
- /// Mask for extracting the sector ID for barrel candidates from the data word
- static constexpr uint32_t BARREL_SECTORID_MASK = 0x1f;
- /// Mask for the bit showing which hemisphere the candidate came from.(1: positive; 0: negative)
- static constexpr uint32_t SECTOR_HEMISPHERE_MASK = 0x1;
-
- /// Mask for extracting the RoI for barrel candidates from the data words
- static constexpr uint32_t BARREL_ROI_MASK = 0x1f;
- /// Mask for extracting the RoI for endcap candidates from the data words
- static constexpr uint32_t ENDCAP_ROI_MASK = 0xff;
- /// Mask for extracting the RoI for forward candidates from the data words
- static constexpr uint32_t FORWARD_ROI_MASK = 0x3f;
- /// Position of the RoI bits in the data word
- static constexpr uint32_t ROI_SHIFT = 2;
-
- /// Mask for extracting the overlap bits for barrel candidates from the data words
- static constexpr uint32_t BARREL_OL_MASK = 0x3;
- /// Position of the overlap bits in barrel data words
- static constexpr uint32_t BARREL_OL_SHIFT = 9;
- /// Mask for extracting the overlap bits for endcap candidates from the data words
- static constexpr uint32_t ENDCAP_OL_MASK = 0x1;
- /// Position of the overlap bits in endcap data words
- static constexpr uint32_t ENDCAP_OL_SHIFT = 10;
-
- /// Mask for extracting the p<sub>T</sub> threshold passed by the candidate from the data word
- static constexpr uint32_t CAND_PT_MASK = 0x7;
- /// Position of the p<sub>T</sub> threshold bits in the data words
- static constexpr uint32_t CAND_PT_SHIFT = 11;
-
- /// Mask for extracting the last 3 bits of the BCID of the muon candidate from the data word
- static constexpr uint32_t CAND_BCID_MASK = 0x7;
- /// Position of the BCID bits in the data words
- static constexpr uint32_t CAND_BCID_SHIFT = 14;
-
- /// Mask for extracting the address of the muon candidate from the data word
- static constexpr uint32_t CAND_SECTOR_ADDRESS_MASK = 0xff;
- /// Position of the muon candidate's address in the data word
- static constexpr uint32_t CAND_SECTOR_ADDRESS_SHIFT = 17;
-
- /// Mask for extracting the bit from the data word showing whether the candidate had the highest p<sub>T</sub> in the sector
- static constexpr uint32_t CAND_HIGHEST_PT_MASK = 0x1;
- /// Position of the "highest p<sub>T</sub>" bit
- static constexpr uint32_t CAND_HIGHEST_PT_SHIFT = 25;
-
- /// Mask for extracting the bit from the data word showing if the muon candidate was sent to the RoIB
- static constexpr uint32_t CAND_SENT_ROI_MASK = 0x1;
- /// Position of the "candidate sent to RoIB" bit.
- static constexpr uint32_t CAND_SENT_ROI_SHIFT = 26;
-
- /// Position of the bit turned on for the multiplicity words that distinguishes them from the data words
- static constexpr uint32_t MULT_WORD_FLAG_SHIFT = 29;
-
- /// Position of the bit specifying the candidate's sign
- static constexpr uint32_t CAND_TGC_CHARGE_SIGN_SHIFT = 27;
-
- /// Position of the bit specifying if a candidate was vetoed in the multiplicity sum
- static constexpr uint32_t CAND_VETO_SHIFT = 28;
+
+#include<TrigT1MuctpiBits/MuCTPI_Bits.h>
private:
/// Variable storing the multiplicity word(s) sent to the CTP
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/selection.xml b/Trigger/TrigT1/TrigT1Result/TrigT1Result/selection.xml
index ea78cd9018421e2b8fc42aa62a4be86d53e8c25f..7245c3e8a68615073bd9b60a53e6f66fd278e493 100755
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/selection.xml
+++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/selection.xml
@@ -1,7 +1,7 @@
<lcgdict>
<!-- MuCTPI RDO -->
- <class name="MuCTPI_RDO" id="5BE3FA7E-CC70-4842-A095-CA046164764D" />
+ <!--class name="MuCTPI_RDO" id="5BE3FA7E-CC70-4842-A095-CA046164764D" /-->
<!-- CTP RDO -->
<class name="CTP_RDO" id="56C714CC-DC17-4927-B413-9151C82792BB" />
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx
index 2b4e380dffab891b57aeea5d18c3ae07ffd2e410..4d6669d2677d1d37e407a9d2d0de1550c7d5096a 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPIResult.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -121,8 +121,8 @@ namespace ROIB {
s << " " << roIVec()[i].getRoiOverflow();
if (longFormat) s << std::setw(12) << "\n RoI number:";
s << " " << roIVec()[i].getRoiNumber();
- if (longFormat) s << std::setw(12) << "\n IsHighestPt:";
- s << " " << roIVec()[i].getCandidateIsHighestPt();
+ //if (longFormat) s << std::setw(12) << "\n IsHighestPt:";
+ //s << " " << roIVec()[i].getCandidateIsHighestPt();
if (longFormat) s << std::setw(12) << "\n Overlap:";
s << " " << roIVec()[i].getOverlapBits();
s << "] ";
@@ -185,7 +185,7 @@ namespace ROIB {
log << MSG::DEBUG << "Sector overflow : " << it->getSectorOverflow() << endmsg;
log << MSG::DEBUG << "RoI overflow : " << it->getRoiOverflow() << endmsg;
log << MSG::DEBUG << "RoI number : " << it->getRoiNumber() << endmsg;
- log << MSG::DEBUG << "IsHighestPt : " << it->getCandidateIsHighestPt() << endmsg;
+ //log << MSG::DEBUG << "IsHighestPt : " << it->getCandidateIsHighestPt() << endmsg;
log << MSG::DEBUG << "Overlap : " << it->getOverlapBits() << endmsg;
}
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx
index 4a68f823a2b54b7cd3934c6b0cfbc7df49ba7f5b..2ccfb817977f54e8ebb954003a49497d648d774f 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPIRoI.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx
index 751d959aef58221f7a947df4c66576a509b77a46..a795fd3b5b619708d834d71cb2bfef47a0ce1ec5 100755
--- a/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx
+++ b/Trigger/TrigT1/TrigT1Result/src/MuCTPI_DataWord_Decoder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -150,6 +150,7 @@ uint16_t MuCTPI_DataWord_Decoder::getPt() const {
/**
* @return 3-bit BCID fragment saved with the candidate
*/
+
uint16_t MuCTPI_DataWord_Decoder::getBCID() const {
return ((m_dataWord >> MuCTPI_RDO::CAND_BCID_SHIFT) &
MuCTPI_RDO::CAND_BCID_MASK);
@@ -158,6 +159,7 @@ uint16_t MuCTPI_DataWord_Decoder::getBCID() const {
/**
* @return flag showing whether the candidate had the highest p<sub>T</sub> in its sector
*/
+
uint16_t MuCTPI_DataWord_Decoder::getCandidateIsHighestPt() const {
return ((m_dataWord >> MuCTPI_RDO::CAND_HIGHEST_PT_SHIFT) &
MuCTPI_RDO::CAND_HIGHEST_PT_MASK);
@@ -166,6 +168,7 @@ uint16_t MuCTPI_DataWord_Decoder::getCandidateIsHighestPt() const {
/**
* @return flag showing whether the candidate was sent to the RoIB
*/
+
uint16_t MuCTPI_DataWord_Decoder::getSentRoi() const {
return ((m_dataWord >> MuCTPI_RDO::CAND_SENT_ROI_SHIFT) &
MuCTPI_RDO::CAND_SENT_ROI_MASK);
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h
index e36fc2f90f069212e85d1685751839569ec31fa0..ac26c9bc229ad81cdba0d1d079d7ee3e2e4b08c2 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h
@@ -17,11 +17,27 @@
namespace LVL1TGCTrigger {
-class TGCRPhiCoincidenceMap {
-public:
- bool test(int octantId, int moduleId, int subsector,
- int type, int pt,
- int dr, int dphi) const;// for Run2
+/** Contents of Run-2 BW-CW LUT
+ * ===========================
+ * std::unordered_map<GLOBALADDR, PTVALUE>
+ * where
+ * GLOBALADDR | 27 bits | unsigned int | side, octant, type, phimod2, module, roi,
+ * | DR(0...0x1f for -15...15)<<4 & DPhi(0...0xf for -7...7)
+ * PTVALUE | 3 bits | unsigned char | pT value (0x0 and 0x7 is no cand.)
+ *
+ * for GLOBALADDR
+ * | 29 |28|27|26|25|24|23| 22 |21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
+ * |side| octant | 0|type |phimod2| module | RoI | 0| delta R | delta Phi |
+ * where side = 0x0 (A-side), 0x1 (C-side).
+ * octant = 0x(0...7)
+ * type = 0x0 (HH), 0x1 (HL), 0x2 (LH), 0x3 (LL): HL means 3-station-wire and 2-station-strip.
+ */
+
+class TGCRPhiCoincidenceMap
+{
+ public:
+ uint8_t test(int octantId, int moduleId, int subsector,
+ int type, int dr, int dphi) const;// for Run2
int test_Run3(int octantId, int moduleId, int subsector,
int type, int dr, int dphi) const; //for Run3
@@ -58,8 +74,6 @@ public:
bool checkVersion();
int PHIPOS(int iphi, int type) const;
int SUBSECTORADD(int ssid, int modid, int phimod2, int type) const;
- unsigned short getRoIAddr(const char type, const unsigned char phimod2,
- const unsigned short module, const unsigned short roi) const;
int getMODID(int addr) const;
int getSSID(int addr) const;
@@ -78,8 +92,8 @@ public:
{'a',-1},{'b',-2},{'c',-3},{'d',-4},{'e',-5},{'f',-6},{'g',-7},{'h',-8},{'i',-9},{'j',-10},{'k',-11},{'l',-12},{'m',-13},{'n',-14},{'o',-15} };
-private:
- std::map<int, std::map<int,int> > m_mapDB[N_PT_THRESH];//for Run2 [ptLevel]< RoI(&type),<RNumber,RWindow> >
+ private:
+ std::unordered_map<uint32_t, uint8_t> m_ptmap;
std::map<int, std::map<int, std::map<int, char> > > m_mapDB_Run3;//for Run3 <RoI(&type),<R,<Phi,pT(char)> > >
@@ -133,15 +147,16 @@ inline
m_fullCW = val;
}
-inline
- int TGCRPhiCoincidenceMap::getTYPE(int lDR, int hDR, int lDPhi, int hDPhi ) const
- {
- int type = -1;
- if ( (lDR==-15) && (hDR==15) && (lDPhi==-7) && (hDPhi==7)) type = TMap_HH;
- else if ( (lDR==-15) && (hDR==15) && (lDPhi==-3) && (hDPhi==3)) type = TMap_HL;
- else if ( (lDR==-7) && (hDR==7) && (lDPhi==-7) && (hDPhi==7)) type = TMap_LH;
- else if ( (lDR==-7) && (hDR==7) && (lDPhi==-3) && (hDPhi==3)) type = TMap_LL;
- return type;
+inline int TGCRPhiCoincidenceMap::getTYPE(int lDR, int hDR, int lDPhi, int hDPhi) const
+{
+ if((lDR == -TGCTriggerData::DR_HIGH_RANGE) && (hDR == TGCTriggerData::DR_HIGH_RANGE)) {
+ if ((lDPhi == -TGCTriggerData::DPHI_HIGH_RANGE) && (hDPhi == TGCTriggerData::DPHI_HIGH_RANGE)) return TGCTriggerData::COIN_HH;
+ else if((lDPhi == -TGCTriggerData::DPHI_LOW_RANGE) && (hDPhi == TGCTriggerData::DPHI_LOW_RANGE)) return TGCTriggerData::COIN_HL;
+ } else if((lDR == -TGCTriggerData::DR_LOW_RANGE) && (hDR == TGCTriggerData::DR_LOW_RANGE)) {
+ if ((lDPhi == -TGCTriggerData::DPHI_HIGH_RANGE) && (hDPhi == TGCTriggerData::DPHI_HIGH_RANGE)) return TGCTriggerData::COIN_LH;
+ else if((lDPhi == -TGCTriggerData::DPHI_LOW_RANGE) && (hDPhi == TGCTriggerData::DPHI_LOW_RANGE)) return TGCTriggerData::COIN_LL;
+ }
+ return -1;
}
inline
@@ -171,12 +186,6 @@ inline
int TGCRPhiCoincidenceMap::getTYPE(int addr) const
{ return ((addr>>16)&0x0003); }
-inline
- unsigned short TGCRPhiCoincidenceMap::getRoIAddr(const char type, const unsigned char phimod2,
- const unsigned short module, const unsigned short roi) const
-{
- return ((type & 0x3)<<13) + ((phimod2&0x1)<<12) + (module<<8) + roi;
-}
} //end of namespace bracket
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
index 628fda4087eb0469ea975f2d268285899526285d..71a19563d22194ca48f1ad1be3bae2223c42ba7b 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
@@ -24,54 +24,44 @@
namespace LVL1TGCTrigger {
-bool TGCRPhiCoincidenceMap::test(int octantId, int moduleId, int subsector,
- int type, int pt,
- int dr, int dphi) const
-{
- // check pt range
- if (pt<0 || pt>=N_PT_THRESH) return false;
- if (type<0 || type>=N_TMap ) return false;
+uint8_t TGCRPhiCoincidenceMap::test(int octantId, int moduleId, int subsector,
+ int type, int dr, int dphi) const
+{
+ if (type<0 || type>=N_TMap) return 0; // check the range of coincidence type
- int sector=(moduleId-2)/3+octantId*3;
- int phimod2 = (moduleId==2||moduleId==5||moduleId==8)&&(sector%2==1) ? 1 : 0;
+ uint16_t sector = (moduleId-2)/3 + octantId*3; // sector number in the forward region (0...23)
+ // calculate whether the front or back side of the forward chamber
+ uint8_t phimod2 = (moduleId==2||moduleId==5||moduleId==8)&&(sector%2==1) ? 1 : 0;
+
+ uint32_t addr = ((type & TGCTriggerData::TYPE_MASK)<<TGCTriggerData::TYPE_SHIFT) +
+ ((phimod2 & TGCTriggerData::PHIMOD2_MASK)<<TGCTriggerData::PHIMOD2_SHIFT) +
+ ((moduleId & TGCTriggerData::MODULE_MASK)<<TGCTriggerData::MODULE_SHIFT) +
+ ((subsector & TGCTriggerData::ROI_MASK)<<TGCTriggerData::ROI_SHIFT) +
+ (((dr-DR_offset) & TGCTriggerData::DR_MASK)<<TGCTriggerData::DR_SHIFT) +
+ (((dphi-DPhi_offset) & TGCTriggerData::DPHI_MASK)<<TGCTriggerData::DPHI_SHIFT);
+
+ uint8_t content = 0x0; // outside from defined window, i.e. pT=0
if(tgcArgs()->USE_CONDDB()) {
SG::ReadCondHandle<TGCTriggerData> readHandle{m_readCondKey};
const TGCTriggerData* readCdo{*readHandle};
- std::map<unsigned short, std::map<unsigned short, unsigned char>> roiMap = readCdo->getPtMapBw(m_side, m_octant);
-
- unsigned short addr = getRoIAddr((char)type, (unsigned char)phimod2, (unsigned short)moduleId, (unsigned short)subsector);
- std::map<unsigned short, std::map<unsigned short, unsigned char> >::const_iterator it = roiMap.find(addr);
- if(it == roiMap.end()) return false;
-
- std::map<unsigned short, unsigned char> ptMap = it->second;
- std::map<unsigned short, unsigned char>::const_iterator itWindow = ptMap.find( (((dr+15)&0x1f)<<4) + ((dphi+7)&0xf) );
-
- if (itWindow == ptMap.end()) return false;
-
- if ( (itWindow->second) == (pt+1) ) return true;
- else return false;
-
+ bool fullCW = (readCdo->getType(TGCTriggerData::CW_BW) == "full");
+ if(fullCW) addr += (m_side<<TGCTriggerData::SIDE_SHIFT) +
+ ((m_octant & TGCTriggerData::OCTANT_MASK)<<TGCTriggerData::OCTANT_SHIFT);
+ content = readCdo->getBigWheelPt(addr);
} else {
- int addr=SUBSECTORADD(subsector, moduleId, phimod2,type);
- std::map<int, std::map<int, int> > readMap = m_mapDB[pt];
-
- std::map<int, std::map<int, int> >::const_iterator it = readMap.find(addr);
- if (it==(readMap.end())) return false;
+ if(m_fullCW) addr += (m_side<<TGCTriggerData::SIDE_SHIFT) +
+ ((m_octant & TGCTriggerData::OCTANT_MASK)<<TGCTriggerData::OCTANT_SHIFT);
- std::map<int, int> aMap = it->second;
- std::map<int, int>::const_iterator itWindow= aMap.find( dr );
- if (itWindow==aMap.end()) return false;
-
- if ( (itWindow->second) & ( 1<<(PHIPOS(dphi,type)) ) ) return true;
- else return false;
+ std::unordered_map<uint32_t, uint8_t>::const_iterator it = m_ptmap.find(addr);
+ if(it != m_ptmap.end()) content = it->second;
}
+ return content;
}
-
int TGCRPhiCoincidenceMap::test_Run3(int octantId, int moduleId, int subsector,
int type, int dr, int dphi) const
{
@@ -112,15 +102,12 @@ int TGCRPhiCoincidenceMap::test_Run3(int octantId, int moduleId, int subsector,
-
-
TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap(TGCArguments* tgcargs,
const SG::ReadCondHandleKey<TGCTriggerData>& readCondKey,
const SG::ReadCondHandleKey<TGCTriggerLUTs>& readLUTsCondKey,
-
const std::string& version,
int sideId, int octantId)
- :m_numberOfDR(0), m_numberOfDPhi(0),
+ : m_numberOfDR(0), m_numberOfDPhi(0),
m_verName(version),
m_side(sideId),
m_octant(octantId),
@@ -132,13 +119,12 @@ TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap(TGCArguments* tgcargs,
if (!tgcArgs()->USE_CONDDB()) {
if(!tgcArgs()->useRun3Config()){
if (!checkVersion()){
- m_verName = "NA";
- return;
+ m_verName = "NA";
+ return;
}
this->readMap(); // read Coincidence Map for Run2 (6 thresholds)
- }
- else{
- this -> readMap_Run3();// read Coincidence Map for Run3 (15 thresholds)
+ } else {
+ this->readMap_Run3();// read Coincidence Map for Run3 (15 thresholds)
}
}
}
@@ -248,16 +234,11 @@ TGCRPhiCoincidenceMap& TGCRPhiCoincidenceMap::operator=(const TGCRPhiCoincidence
bool TGCRPhiCoincidenceMap::readMap()
{
- const int NumberOfModuleType=12;
- const int ModuleNumber[NumberOfModuleType] =
- { 0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 8 };
- const std::string ModuleName[NumberOfModuleType]=
- {"0","1","2a","2b","3","4","5a","5b","6","7","8a","8b"};
- const std::string SideName[NumberOfSide] = {"A","C"};
- const std::string OctantName[NumberOfOctant] =
- { "0", "1", "2", "3", "4", "5", "6", "7"};
+ const uint8_t kNMODULETYPE = 12;
+ const uint8_t modulenumber[kNMODULETYPE] = {0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 8};
+ const std::string modulename[kNMODULETYPE] = {"0","1","2a","2b","3","4","5a","5b","6","7","8a","8b"};
+ const std::string sidename[NumberOfSide] = {"A","C"};
-
IMessageSvc* msgSvc = 0;
ISvcLocator* svcLocator = Gaudi::svcLocator();
if (svcLocator->service("MessageSvc", msgSvc) == StatusCode::FAILURE) {
@@ -265,83 +246,82 @@ bool TGCRPhiCoincidenceMap::readMap()
}
MsgStream log(msgSvc, "TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap");
- // initialize
- enum{BufferSize=1024};
- char buf[BufferSize];
- std::string fn, fullName, tag;
- int ssId,ptLevel,bit,mod;
+ uint32_t octaddr = (m_side<<TGCTriggerData::SIDE_SHIFT) +
+ ((m_octant & TGCTriggerData::OCTANT_MASK)<<TGCTriggerData::OCTANT_SHIFT);
// loop over all files...
- for(int iModule=0; iModule<NumberOfModuleType; iModule+=1) {
- int phimod2=ModuleName[iModule].find("b")!=std::string::npos ? 1 : 0;
- std::ostringstream modName;
- std::string fn = "RPhiCoincidenceMap.mod"
- + ModuleName[iModule] + "." + m_verName +"._12.db";
- if (m_fullCW) {
- if ( (m_side>=0) && (m_side<NumberOfSide) &&
- (m_octant>=0) && (m_octant<NumberOfOctant)) {
- fn = "RPhiCoincidenceMap."
- + SideName[m_side] + OctantName[m_octant]
- + ".mod" + ModuleName[iModule]
- + "." + m_verName +"._12.db";
- }
+ for(int iModule=0; iModule<kNMODULETYPE; iModule+=1) {
+
+ std::ostringstream fn;
+ fn << "RPhiCoincidenceMap.";
+ if(m_fullCW) {
+ if( (m_side>=0) && (m_side<NumberOfSide) &&
+ (m_octant>=0) && (m_octant<NumberOfOctant)) {
+ fn << sidename[m_side] << m_octant << ".";
+ }
+ }
+ fn << "mod" << modulename[iModule] << "." << m_verName << "._12.db";
+
+ std::string fullname = PathResolver::find_file(fn.str().c_str(), "DATAPATH");
+ if( fullname.length() == 0 ) {
+ log << MSG::ERROR
+ << " Could not found "
+ << fn.str().c_str() << endmsg;
+ return false ;
}
- int type = -1;
- int lDR, hDR, lDPhi, hDPhi;
+ uint32_t phimod2 = (modulename[iModule].find("b") != std::string::npos) ? 1 : 0;
+ uint32_t modaddr = ((modulenumber[iModule] & TGCTriggerData::MODULE_MASK)<<TGCTriggerData::MODULE_SHIFT) +
+ ((phimod2 & TGCTriggerData::PHIMOD2_MASK)<<TGCTriggerData::PHIMOD2_SHIFT);
- fullName = PathResolver::find_file( fn.c_str(), "DATAPATH" );
- if( fullName.length() == 0 ) {
- log << MSG::ERROR
- << " Could not found "
- << fn.c_str() << endmsg;
- return false ;
- }
+ std::ifstream file(fullname.c_str(),std::ios::in);
+ enum{BufferSize=1024};
+ char buf[BufferSize];
+
+ while(file.getline(buf,BufferSize)) {
- std::ifstream file(fullName.c_str(),std::ios::in);
- while(file.getline(buf,BufferSize)){
std::istringstream header(buf);
+ std::string tag;
+
header>>tag;
- if(tag=="#"){ // read header part.
- header>>ptLevel>>ssId>>mod>>lDR>>hDR>>lDPhi>>hDPhi;
- type = getTYPE( lDR, hDR, lDPhi, hDPhi );
- // check moduleNumber and ptLevel
- if(mod!=ModuleNumber[iModule] || ptLevel>N_PT_THRESH || type<0 ) {
- log << MSG::WARNING
- << " illegal parameter in database header : "
- << header.str()
- << " in file " << fn
- << endmsg;
- break;
- }
+ if(tag=="#") { // read header part.
+
+ uint16_t ptLevel, roi, mod;
+ int16_t lDR, hDR, lDPhi, hDPhi;
+ header >> ptLevel >> roi >> mod >> lDR >> hDR >> lDPhi >> hDPhi;
+
+ int16_t type = getTYPE( lDR, hDR, lDPhi, hDPhi );
+
+ // check moduleNumber and ptLevel
+ if(mod != modulenumber[iModule] || ptLevel > N_PT_THRESH || type<0 ) {
+ log << MSG::WARNING
+ << " illegal parameter in database header : "
+ << header.str()
+ << " in file " << fn.str()
+ << endmsg;
+ break;
+ }
- // get window data
- file.getline(buf,BufferSize);
- std::istringstream cont(buf);
- std::map<int, int> aWindow;
- for(int ir=0; ir<=hDR-DR_offset; ir++) {
- cont>>bit;
- if (bit==0) continue; // none of window is opened in this dR
- aWindow[ir+DR_offset] = bit;
- }
- // Warning : no window
- if (aWindow.size()==0) {
- if (tgcArgs()->MSGLEVEL() <= MSG::DEBUG) {
- log << MSG::DEBUG
- << " No window is opened for (ptLevel,ssId,mod) = ("
- << ptLevel << ", " << ssId << ", " << mod << ")"
- <<endmsg;
- }
- }
- int addr = SUBSECTORADD(ssId,mod,phimod2,type);
- if (m_mapDB[ptLevel-1].find(addr)!=m_mapDB[ptLevel-1].end()) {
- if (tgcArgs()->MSGLEVEL() <= MSG::DEBUG) {
- log << MSG::DEBUG
- << "This subsector was already reserved."
- << endmsg;
- }
- } else {
- m_mapDB[ptLevel-1][addr]=aWindow;
+ uint32_t cwaddr = ((uint8_t(type) & TGCTriggerData::TYPE_MASK)<<TGCTriggerData::TYPE_SHIFT) +
+ ((roi & TGCTriggerData::ROI_MASK)<<TGCTriggerData::ROI_SHIFT);
+
+ // get window data
+ file.getline(buf,BufferSize);
+ std::istringstream cont(buf);
+
+ for(uint8_t ir=0; ir<=hDR-DR_offset; ir++) {
+ uint32_t draddr = (ir & TGCTriggerData::DR_MASK)<<TGCTriggerData::DR_SHIFT;
+
+ uint32_t bit;
+ cont >> bit;
+ if (bit == 0) continue; // none of window is opened in this dR
+
+ for(uint8_t iphi=0; iphi<hDPhi-DPhi_offset; iphi++) {
+ if(bit>>iphi & 0x1) {
+ uint32_t theaddr = octaddr + modaddr + cwaddr + draddr + iphi;
+ m_ptmap[theaddr] = (uint8_t)(ptLevel & TGCTriggerData::PT_MASK);
+ }
+ }
}
}
}
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
index b52714bd86b90db5cb60f6d59295fdf68ef9d258..419b91ffbf60ff2cad33b364c7588b9e3abb65b9 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
@@ -67,10 +67,9 @@ TGCRPhiCoincidenceOut* TGCRPhiCoincidenceMatrix::doCoincidence()
out->setIdSSC(m_SSCId);
int j0 = -1;
- int ptMax=-1;
+ int ptMax = 1;
for( int j=m_nPhiHit-1; j>=0; j-=1){ // left half-SSC has priority when both output same pT
int subsector;
- int ptOut = -99;
int chargeOut = 2;
int CoincidenceTypeOut=-1;
@@ -80,9 +79,10 @@ TGCRPhiCoincidenceOut* TGCRPhiCoincidenceMatrix::doCoincidence()
subsector = 4*(2*m_SSCId+m_r)+m_phi[j];
}
-
int type = m_map->getMapType(m_ptR, m_ptPhi[j]);
+
// calculate pT of muon candidate
+ uint8_t ptOut = 0; // 0 is no candidate.
if(tgcArgs()->useRun3Config()){
//Algorithm for Run3
int pt=m_map->test_Run3(m_sectorLogic->getOctantID(),m_sectorLogic->getModuleID(),
@@ -91,25 +91,22 @@ TGCRPhiCoincidenceOut* TGCRPhiCoincidenceMatrix::doCoincidence()
chargeOut = pt<0 ? 0:1;
CoincidenceTypeOut=(type==0);
- }
- else{
- for( int pt=NumberOfPtLevel-1; pt>=0; pt-=1){
- if(m_map->test(m_sectorLogic->getOctantID(),m_sectorLogic->getModuleID(),subsector,
- type, pt,
- m_dR,m_dPhi[j])) {
- ptOut = pt;
- break;
- }
- } // loop pt
+
+ } else { // for Run-2
+ ptOut = m_map->test(m_sectorLogic->getOctantID(),
+ m_sectorLogic->getModuleID(), subsector,
+ type, m_dR, m_dPhi[j]);
}
- // Trigger Out
- if( ptOut >= ptMax ){
+ // Trigger Out (only pT>0 candidate
+ if(ptOut >= ptMax) {
ptMax = ptOut;
out->clear();
out->setIdSSC(m_SSCId);
- if(!tgcArgs()->useRun3Config()){out->setHit(ptMax+1);}// for Run2 Algo
- else{out->setpT(ptMax);}// for Run3 Algo
+
+ if(!tgcArgs()->useRun3Config()) out->setHit(ptMax); // for Run2 Algo
+ else out->setpT(ptMax); // for Run3 Algo
+
out->setR(m_r);
out->setPhi(m_phi[j]);
out->setDR(m_dR);
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
index 4a87c9fe72e51f729f2fdfbc8946d87ea87a12ac..a66a496281f26f26b3c81367469a0cc7875df75b 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
@@ -1,242 +1,147 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
-# Setup of precision tracking
+# Setup of offline pattern recognition tracking for ID Trigger
+#Heavily inspired by the offline version:
+#https://gitlab.cern.ch/atlas/athena/blob/master/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
from __future__ import print_function
from AthenaCommon.Include import include
include.block("InDetTrigRecExample/EFInDetConfig.py")
include("InDetTrigRecExample/InDetTrigRec_jobOptions.py") # this is needed to get InDetTrigFlags
-#from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
from AthenaCommon.Logging import logging
log = logging.getLogger("EFIDTracking")
-#Start using already decided naming conventions
-#TODO: remap might not be needed in the end once this is consistent with FTF configuration
-#def remap_signature( signature ):
-# if signature == 'electron':
-# return 'Electron'
-# else:
-# return signature
-
-#def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks='TrigFastTrackFinder_Tracks', outputTrackPrefixName = "HLT_ID", rois = 'EMViewRoIs' ):
-# doTRTextension = False
-# ptAlgs = [] #List containing all the precision tracking algorithms hence every new added alg has to be appended to the list
-
-
- #-----------------------------------------------------------------------------
- # Naming conventions
-
-
-
-
-
- #-----------------------------------------------------------------------------
- # Verifying input data for the algorithms
-
- #If run in views need to check data dependancies!
- #NOTE: this seems necessary only when PT is called from a different view than FTF otherwise causes stalls
-# if verifier:
-# verifier.DataObjects += [ ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' ),
-# ( 'TrackCollection' , 'StoreGateSvc+' + inputFTFtracks ) ]
-
-
- #-----------------------------------------------------------------------------
- # Pattern recognition stage
-#def __init__(self, InputCollections = None, ResolvedTrackCollectionKey = None, SiSPSeededTrackCollectionKey = None , NewTrackingCuts = None, TrackCollectionKeys=[] , TrackCollectionTruthKeys=[]):
-
-#Start using already decided naming conventions
-#TODO: remap might not be needed in the end once this is consistent with FTF configuration
-#TODO unify with PT remap
-#def remap_signature( signature ):
-# if signature == 'electron':
-# return 'Electron'
-# else:
-# return signature
+#Create a view verifier for necessary data collections
+def get_idtrig_view_verifier(name):
+ import AthenaCommon.CfgMgr as CfgMgr
+ from AthenaCommon.GlobalFlags import globalflags
+ from .InDetTrigCollectionKeys import TrigPixelKeys, TrigSCTKeys
+ from InDetRecExample.InDetKeys import InDetKeys
+ from TrigInDetConfig.TrigInDetConfig import InDetCacheNames
+ viewDataVerifier = CfgMgr.AthViews__ViewDataVerifier( name )
+ viewDataVerifier.DataObjects = [
+ ( 'InDet::SCT_ClusterContainer', TrigSCTKeys.Clusters ),
+ ( 'InDet::PixelClusterContainer', TrigPixelKeys.Clusters ),
+ ( 'SpacePointContainer', TrigSCTKeys.SpacePoints ),
+ ( 'SpacePointContainer', TrigPixelKeys.SpacePoints ),
+ ( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
+ ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' )
+ ]
+
+ viewDataVerifier.DataObjects += [( 'InDet::PixelClusterContainerCache' , InDetCacheNames.Pixel_ClusterKey ),
+ ( 'PixelRDO_Cache' , InDetCacheNames.PixRDOCacheKey ),
+ ( 'InDet::SCT_ClusterContainerCache' , InDetCacheNames.SCT_ClusterKey ),
+ ( 'SCT_RDO_Cache' , InDetCacheNames.SCTRDOCacheKey ),
+ ( 'SpacePointCache' , InDetCacheNames.SpacePointCachePix ),
+ ( 'SpacePointCache' , InDetCacheNames.SpacePointCacheSCT ),
+ ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.PixBSErrCacheKey ),
+ ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTBSErrCacheKey ),
+ ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTFlaggedCondCacheKey ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs' ),
+ ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
+ ( 'TagInfo' , 'DetectorStore+ProcessingTags' )]
+
+ # Load RDOs if we aren't loading bytestream
+ from AthenaCommon.AlgSequence import AlgSequence
+ topSequence = AlgSequence()
+
+ topSequence.SGInputLoader.Load += [ ( 'TagInfo' , 'DetectorStore+ProcessingTags' ) ]
+
+ if not globalflags.InputFormat.is_bytestream():
+ viewDataVerifier.DataObjects += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
+ ( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
+ ( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
+ ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
+ ]
+ # topSequence.SGInputLoader.Load += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
+ # ( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
+ # ( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
+ # ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
+
+ return viewDataVerifier
+
+
+#Temporary fix before we port offline cuts to trigger code, we are using offline configuration
+def remapToOffline( name ):
+ if name == 'cosmics':
+ return 'Cosmic'
+ else:
+ return name
+
+def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ):
+ viewAlgs = [] #list of all algs running in this module
-def makeInDetPatternRecognition( whichSignature, rois = 'EMViewRoIs', InputCollections=None, NewTrackingCuts = None ):
- from InDetRecExample.InDetJobProperties import InDetFlags
- #Global keys/names for collections
- from InDetRecExample.InDetKeys import InDetKeys #FIXME: to be replaced with Trig keys?
- from .InDetTrigCollectionKeys import TrigPixelKeys, TrigSCTKeys
+ #Load necessary data
+ dataVerifier = None
+ #FIXME: Should not be necessary
+ if verifier:
+ dataVerifier = get_idtrig_view_verifier(verifier+config.name)
+ viewAlgs.append( dataVerifier )
- from AthenaCommon.DetFlags import DetFlags
- from AthenaCommon.AppMgr import ToolSvc
+ #FIXME: For now id setup but eventually port parameters into ConfigSetting in TrigInDetConfig pkg
+ from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
+ from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
+ offName = remapToOffline( config.name )
+ trackingCuts = ConfiguredNewTrackingCuts( offName ) #FIXME: replace cosmic
+ trackingCuts.__indetflags = InDetTrigFlags
- prefix = 'InDetTrigMT'
- suffix = '_%s'%whichSignature if whichSignature else ''
- #Final output track collection
- #SiSPSeededTrackCollectionKey = "SiSPSeededTracks_%s"%whichSignature
- outEFIDTracks = "HLT_IDTrkTrack_%s_%s" %( whichSignature, 'EFID')
- outEFIDTrackParticles = "HLT_IDTrack_%s_%s" %( whichSignature, 'EFID')
+ #TODO: to be taken from config info
+ #prefix = 'InDetTrigMT'
+ #suffix = '_%s'%whichSignature if whichSignature else ''
+ #outEFIDTracks = "HLT_IDTrkTrack_%s_%s" %( whichSignature, 'EFID')
+ #outEFIDTrackParticles = "HLT_IDTrack_%s_%s" %( whichSignature, 'EFID')
- viewAlgs = [] #list of all algs running in this module
- #
# --- decide if use the association tool
- #
#FIXME: Make the same decision as offline (based on the tracking cuts)?
- #if (len(InputCollections) > 0) and (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "Disappearing" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or NewTrackingCuts.mode() == "SLHCConversionFinding"):
-
- #Why not use association tool? what are the cases when not needed?
+ #Are all of these needed?
+ #if (len(InputCollections) > 0) and (trackingCuts.mode() == "LowPt" or trackingCuts.mode() == "VeryLowPt" or trackingCuts.mode() == "LargeD0" or trackingCuts.mode() == "LowPtLargeD0" or trackingCuts.mode() == "BeamGas" or trackingCuts.mode() == "ForwardTracks" or trackingCuts.mode() == "ForwardSLHCTracks" or trackingCuts.mode() == "Disappearing" or trackingCuts.mode() == "VeryForwardSLHCTracks" or trackingCuts.mode() == "SLHCConversionFinding"):
#usePrdAssociationTool = True
#else:
- usePrdAssociationTool = False
-
-
- import InDetRecExample.TrackingCommon as TrackingCommon
+ usePrdAssociationTool = False #Keep false for now
+ #Do we actually need it?
if usePrdAssociationTool:
+ from .InDetTrigCommon import prdAssociation_builder
print ('Running SiSPseedTrackFinder!')
- #FIXME: switch to naming based on tracking
+ InputCollections = None #Dummy atm
+ prdAssociation = prdAssociation_builder( InputCollections )
+ viewAlgs.append( prdAssociation )
- #FIXME: If so:
- # 1] Get a new association tool
- #associationTool = TrackingCommon.getInDetTrigPRDtoTrackMapToolGangedPixels(),
- # 2] Use the ganged pixel from here?
- #from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPrdAssociationTool
-
- # 3] Create the new one as in offline tracking:
- InDetTrigPrdAssociation = TrackingCommon.getInDetTrackPRD_Association(namePrefix = prefix,
- nameSuffix = suffix,
- TracksName = list(InputCollections))#This is readHandle #What input collection Thought there are no tracks at this point??!
- # 4] if so do I use normal or ganged?
- #from InDetAssociationTools.InDetAssociationToolsConf import InDet__InDetPRD_AssociationToolGangedPixels
- #InDetTrigPrdAssociationl = InDet__InDetPRD_AssociationToolGangedPixels(name = "%sPrdAssociationTool%s"%(prefix,suffix),
- # PixelClusterAmbiguitiesMapName = TrigPixelKeys.PRDtoTrackMap )
- viewAlgs.append( InDetTrigPrdAssociation )
+ #-----------------------------------------------------------------------------
+ # Track building stage
#FIXME? use trigger flags?
+ # What are the instances when we don't need this?
#if InDetFlags.doSiSPSeededTrackFinder():
- doSiSPSeededTrackFinder = True
+ doSiSPSeededTrackFinder = True #True by default to test this
if doSiSPSeededTrackFinder:
print ('Running SiSPseedTrackFinder!')
- #FIXME: Need to add different options based on the
- from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_ATLxk as SiSpacePointsSeedMaker
-
-
- InDetSiSpacePointsSeedMaker = SiSpacePointsSeedMaker ( name = "%sInDetSpSeedsMaker%s"%(prefix, suffix), #+NewTrackingCuts.extension(),
- pTmin = NewTrackingCuts.minPT(),
- maxdImpact = NewTrackingCuts.maxPrimaryImpact(),
- maxZ = NewTrackingCuts.maxZImpact(),
- minZ = -NewTrackingCuts.maxZImpact(),
- usePixel = NewTrackingCuts.usePixel(),
- SpacePointsPixelName = TrigPixelKeys.SpacePoints,
- # useSCT = NewTrackingCuts.useSCT(),
- useSCT = (NewTrackingCuts.useSCT() and NewTrackingCuts.useSCTSeeding()),
- SpacePointsSCTName = TrigSCTKeys.SpacePoints,
- # useOverlapSpCollection = NewTrackingCuts.useSCT(),
- useOverlapSpCollection = (NewTrackingCuts.useSCT() and NewTrackingCuts.useSCTSeeding()),
- SpacePointsOverlapName = InDetKeys.OverlapSpacePoints(),
- radMax = NewTrackingCuts.radMax(),
- RapidityCut = NewTrackingCuts.maxEta())
-
- ToolSvc += InDetSiSpacePointsSeedMaker
- #FIXME consider specific settings here
- #if NewTrackingCuts.mode() == "Offline" or InDetFlags.doHeavyIon() or NewTrackingCuts.mode() == "ForwardTracks":
- # InDetSiSpacePointsSeedMaker.maxdImpactPPS = NewTrackingCuts.maxdImpactPPSSeeds()
- # InDetSiSpacePointsSeedMaker.maxdImpactSSS = NewTrackingCuts.maxdImpactSSSSeeds()
-
- if usePrdAssociationTool:
- # # not all classes have that property !!!
- InDetSiSpacePointsSeedMaker.PRDtoTrackMap = TrigPixelKeys.PRDtoTrackMap #InDetTrigPrdAssociationTool
-
- #if not InDetFlags.doCosmics():
- # InDetSiSpacePointsSeedMaker.maxRadius1 = 0.75*NewTrackingCuts.radMax()
- # InDetSiSpacePointsSeedMaker.maxRadius2 = NewTrackingCuts.radMax()
- # InDetSiSpacePointsSeedMaker.maxRadius3 = NewTrackingCuts.radMax()
- #if NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or (NewTrackingCuts.mode() == "Pixel" and InDetFlags.doMinBias()):
- # try :
- # InDetSiSpacePointsSeedMaker.pTmax = NewTrackingCuts.maxPT()
- # except:
- # pass
- # InDetSiSpacePointsSeedMaker.mindRadius = 4.0
- #if NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "SLHCConversionFinding":
- # InDetSiSpacePointsSeedMaker.minRadius1 = 0
- # InDetSiSpacePointsSeedMaker.minRadius2 = 0
- # InDetSiSpacePointsSeedMaker.minRadius3 = 0
- # InDetSiSpacePointsSeedMaker.maxRadius1 =1000.*Units.mm
- # InDetSiSpacePointsSeedMaker.maxRadius2 =1000.*Units.mm
- # InDetSiSpacePointsSeedMaker.maxRadius3 =1000.*Units.mm
- #if NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks":
- # InDetSiSpacePointsSeedMaker.checkEta = True
- # InDetSiSpacePointsSeedMaker.etaMin = NewTrackingCuts.minEta()
- # InDetSiSpacePointsSeedMaker.etaMax = NewTrackingCuts.maxEta()
- # InDetSiSpacePointsSeedMaker.RapidityCut = NewTrackingCuts.maxEta()
- #if NewTrackingCuts.mode() == "DBM":
- # InDetSiSpacePointsSeedMaker.etaMin = NewTrackingCuts.minEta()
- # InDetSiSpacePointsSeedMaker.etaMax = NewTrackingCuts.maxEta()
- # InDetSiSpacePointsSeedMaker.useDBM = True
-
-
-
- #Z finder for the vtx
- #
- # --- Z-coordinates primary vertices finder (only for collisions)
- #
- if InDetFlags.useZvertexTool() and NewTrackingCuts.mode() != "DBM":
- from SiZvertexTool_xk.SiZvertexTool_xkConf import InDet__SiZvertexMaker_xk
- InDetZvertexMaker = InDet__SiZvertexMaker_xk(name = '%sInDetZvertexMaker%s'%(prefix,suffix),
- Zmax = NewTrackingCuts.maxZImpact(),
- Zmin = -NewTrackingCuts.maxZImpact(),
- minRatio = 0.17) # not default
- InDetZvertexMaker.SeedMakerTool = InDetSiSpacePointsSeedMaker
-
- if InDetFlags.doHeavyIon():
- InDetZvertexMaker.HistSize = 2000
- ###InDetZvertexMaker.minContent = 200
- InDetZvertexMaker.minContent = 30
-
- ToolSvc += InDetZvertexMaker
- #if (InDetFlags.doPrintConfigurables()):
- # printfunc (InDetZvertexMaker)
-
- else:
- InDetZvertexMaker = None
-
- #
- # # --- SCT and Pixel detector elements road builder
- # #
- #FIXME which propagator
- # 1]
- from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPropagator
-
- # 2] How about offline
-
- from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadMaker_xk
- InDetSiDetElementsRoadMaker = InDet__SiDetElementsRoadMaker_xk(name = '%sInDetSiRoadMaker%s'%(prefix,suffix),#+NewTrackingCuts.extension(),
- PropagatorTool = InDetTrigPropagator,#InDetPatternPropagator,
- usePixel = NewTrackingCuts.usePixel(),
- PixManagerLocation = InDetKeys.PixelManager(),
- useSCT = NewTrackingCuts.useSCT(),
- SCTManagerLocation = InDetKeys.SCT_Manager(), #FIXME change the name?
- RoadWidth = NewTrackingCuts.RoadWidth())
-
- ToolSvc += InDetSiDetElementsRoadMaker
- #if (InDetFlags.doPrintConfigurables()):
- # printfunc ( InDetSiDetElementsRoadMaker)
- # Condition algorithm for InDet__SiDetElementsRoadMaker_xk
+ from AthenaCommon.DetFlags import DetFlags
+ # --- Loading Pixel, SCT conditions
if DetFlags.haveRIO.pixel_on():
- #FIXME:
- #pixelOn = True
- #if pixelOn:
- # Condition algorithm for SiCombinatorialTrackFinder_xk
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, "InDetSiDetElementBoundaryLinksPixelCondAlg"):
- from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiDetElementBoundaryLinksCondAlg_xk
- condSeq += InDet__SiDetElementBoundaryLinksCondAlg_xk(name = "InDetSiDetElementBoundaryLinksPixelCondAlg",
- ReadKey = "PixelDetectorElementCollection",
- WriteKey = "PixelDetElementBoundaryLinks_xk",
- UsePixelDetectorManager = True)
+ from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiDetElementBoundaryLinksCondAlg_xk
+ condSeq += InDet__SiDetElementBoundaryLinksCondAlg_xk(name = "InDetSiDetElementBoundaryLinksPixelCondAlg",
+ ReadKey = "PixelDetectorElementCollection",
+ WriteKey = "PixelDetElementBoundaryLinks_xk",)
+
- if NewTrackingCuts.useSCT():
+
+ if trackingCuts.useSCT():
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, "InDet__SiDetElementsRoadCondAlg_xk"):
@@ -245,223 +150,88 @@ def makeInDetPatternRecognition( whichSignature, rois = 'EMViewRoIs', InputColle
if not hasattr(condSeq, "InDetSiDetElementBoundaryLinksSCTCondAlg"):
from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiDetElementBoundaryLinksCondAlg_xk
- condSeq += InDet__SiDetElementBoundaryLinksCondAlg_xk(name = "InDetSiDetElementBoundaryLinksSCTCondAlg",
- ReadKey = "SCT_DetectorElementCollection",
- WriteKey = "SCT_DetElementBoundaryLinks_xk")
-
-
- # #
- # # --- Local track finding using sdCaloSeededSSSpace point seed
- # #
- # # @TODO ensure that PRD association map is used if usePrdAssociationTool is set
- is_dbm = InDetFlags.doDBMstandalone() or NewTrackingCuts.extension()=='DBM'
- rot_creator_digital = TrackingCommon.getInDetRotCreatorDigital() if not is_dbm else TrackingCommon.getInDetRotCreatorDBM()
-
-
- from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool, InDetTrigPatternUpdator
-
- from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiCombinatorialTrackFinder_xk
- track_finder = InDet__SiCombinatorialTrackFinder_xk(name = '%sInDetSiComTrackFinder%s'%(prefix,suffix),#+NewTrackingCuts.extension(),
- PropagatorTool = InDetTrigPropagator,#InDetPatternPropagator,
- UpdatorTool = InDetTrigPatternUpdator,#InDetPatternUpdator,
- SctSummaryTool = InDetTrigSCTConditionsSummaryTool,
- RIOonTrackTool = rot_creator_digital,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on() if not is_dbm else False,
- PixelClusterContainer = TrigPixelKeys.Clusters,#InDetKeys.PixelClusters(),
- SCT_ClusterContainer = TrigSCTKeys.Clusters )#InDetKeys.SCT_Clusters())
-
- ToolSvc += track_finder
- if is_dbm :
- track_finder.MagneticFieldMode = "NoField"
- track_finder.TrackQualityCut = 9.3
-
-
- #track_finder.SctSummaryTool = InDetTrigSCTConditionsSummaryTool
- #if (DetFlags.haveRIO.SCT_on()):
- # track_finder.SctSummaryTool = InDetSCT_ConditionsSummaryTool
- #else:
- # track_finder.SctSummaryTool = None
-
- # ToolSvc += track_finder
-
- useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "DBM"
- from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk as SiTrackMaker
- InDetSiTrackMaker = SiTrackMaker(name = '%sInDetSiTrackMaker%s'%(prefix,suffix),#+NewTrackingCuts.extension(),
- useSCT = NewTrackingCuts.useSCT(),
- usePixel = NewTrackingCuts.usePixel(),
- RoadTool = InDetSiDetElementsRoadMaker,
- CombinatorialTrackFinder = track_finder,
- pTmin = NewTrackingCuts.minPT(),
- pTminBrem = NewTrackingCuts.minPTBrem(),
- pTminSSS = InDetFlags.pT_SSScut(),
- nClustersMin = NewTrackingCuts.minClusters(),
- nHolesMax = NewTrackingCuts.nHolesMax(),
- nHolesGapMax = NewTrackingCuts.nHolesGapMax(),
- SeedsFilterLevel = NewTrackingCuts.seedFilterLevel(),
- Xi2max = NewTrackingCuts.Xi2max(),
- Xi2maxNoAdd = NewTrackingCuts.Xi2maxNoAdd(),
- nWeightedClustersMin = NewTrackingCuts.nWeightedClustersMin(),
- CosmicTrack = InDetFlags.doCosmics(),
- Xi2maxMultiTracks = NewTrackingCuts.Xi2max(), # was 3.
- useSSSseedsFilter = InDetFlags.doSSSfilter(),
- doMultiTracksProd = True,
- useBremModel = InDetFlags.doBremRecovery() and useBremMode, # only for NewTracking the brem is debugged !!!
- doCaloSeededBrem = InDetFlags.doCaloSeededBrem(),
- doHadCaloSeedSSS = InDetFlags.doHadCaloSeededSSS(),
- phiWidth = NewTrackingCuts.phiWidthBrem(),
- etaWidth = NewTrackingCuts.etaWidthBrem(),
- InputClusterContainerName = InDetKeys.CaloClusterROIContainer(), # "InDetCaloClusterROIs"
- InputHadClusterContainerName = InDetKeys.HadCaloClusterROIContainer(), # "InDetCaloClusterROIs"
- UseAssociationTool = usePrdAssociationTool)
-
- ToolSvc += InDetSiTrackMaker
-
- #FIXME: do only cosmics for now, but change later
- # if NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" :
- # InDetSiTrackMaker.ITKGeometry = True
-
- # if NewTrackingCuts.mode() == "DBM":
- # InDetSiTrackMaker.MagneticFieldMode = "NoField"
- # InDetSiTrackMaker.useBremModel = False
- # InDetSiTrackMaker.doMultiTracksProd = False
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSPSeededFinder'
- # InDetSiTrackMaker.pTminSSS = -1
- # InDetSiTrackMaker.CosmicTrack = False
- # InDetSiTrackMaker.useSSSseedsFilter = False
- # InDetSiTrackMaker.doCaloSeededBrem = False
- # InDetSiTrackMaker.doHadCaloSeedSSS = False
-
- #elif InDetFlags.doCosmics():
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_Cosmic'
- InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_Cosmic'
+ condSeq += InDet__SiDetElementBoundaryLinksCondAlg_xk(name = "InDetSiDetElementBoundaryLinksSCTCondAlg",
+ ReadKey = "SCT_DetectorElementCollection",
+ WriteKey = "SCT_DetElementBoundaryLinks_xk")
+ #-------------------------------------------------------
+
+
+ from .InDetTrigCommon import siSPSeededTrackFinder_builder, get_full_name
+ siSPSeededTrackFinder = siSPSeededTrackFinder_builder( name = get_full_name( 'siSPSeededTrackFinder', config.name ),
+ outputTracks = config.PT.trkTracksPT(), # config.EFID.trkTracksEFID(), ##outEFIDTracks,
+ trackingCuts = trackingCuts,
+ usePrdAssociationTool = usePrdAssociationTool,
+ nameSuffix = config.name )
+
+ print(siSPSeededTrackFinder)
+ viewAlgs.append( siSPSeededTrackFinder )
+ #-----------------------------------------------------------------------------
+ # Track particle conversion algorithm (for pattern rec.)
+ # atm disabled but might be useful later for debugging
#
- # elif InDetFlags.doHeavyIon():
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_HeavyIon'
- #
- # elif NewTrackingCuts.mode() == "LowPt":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_LowMomentum'
-
- # elif NewTrackingCuts.mode() == "VeryLowPt" or (NewTrackingCuts.mode() == "Pixel" and InDetFlags.doMinBias()):
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_VeryLowMomentum'
-
- # elif NewTrackingCuts.mode() == "BeamGas":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_BeamGas'
-
- # elif NewTrackingCuts.mode() == "ForwardTracks":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_ForwardTracks'
-
- # elif NewTrackingCuts.mode() == "ForwardSLHCTracks":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_ForwardSLHCTracks'
-
- # elif NewTrackingCuts.mode() == "VeryForwardSLHCTracks":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_VeryForwardSLHCTracks'
-
- # elif NewTrackingCuts.mode() == "SLHCConversionFinding":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_SLHCConversionTracks'
-
- # elif NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0":
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_LargeD0'
- #
- # else:
- # InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSPSeededFinder'
- #
- if InDetFlags.doStoreTrackSeeds():
- from SeedToTrackConversionTool.SeedToTrackConversionToolConf import InDet__SeedToTrackConversionTool
- InDet_SeedToTrackConversion = InDet__SeedToTrackConversionTool(name = "%sInDet_SeedToTrackConversion%s"%(prefix, suffix),
- OutputName = InDetKeys.SiSPSeedSegments()+NewTrackingCuts.extension())
- InDetSiTrackMaker.SeedToTrackConversion = InDet_SeedToTrackConversion
- InDetSiTrackMaker.SeedSegmentsWrite = True
-
- # #InDetSiTrackMaker.OutputLevel = VERBOSE
- # ToolSvc += InDetSiTrackMaker
- # if (InDetFlags.doPrintConfigurables()):
- # printfunc (InDetSiTrackMaker)
- # #
- # # set output track collection name
- # #
- # self.__SiTrackCollection = SiSPSeededTrackCollectionKey
- # #
- # # --- Setup Track finder using space points seeds
- # #
-
- #FIXME: which summary tool to use??
- # trackSummaryTool = TrackingCommon.getInDetTrackSummaryToolNoHoleSearch()
- #ToolSvc += trackSummaryTool
- from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryTool
-
-
- from SiSPSeededTrackFinder.SiSPSeededTrackFinderConf import InDet__SiSPSeededTrackFinder
- InDetSiSPSeededTrackFinder = InDet__SiSPSeededTrackFinder(name = '%sInDetSiSpTrackFinder%s'%(prefix, suffix),# +NewTrackingCuts.extension(),
- TrackTool = InDetSiTrackMaker,
- PRDtoTrackMap = TrigPixelKeys.PRDtoTrackMap if usePrdAssociationTool else '',
- SpacePointsPixelName= TrigPixelKeys.SpacePoints,
- SpacePointsSCTName = TrigSCTKeys.SpacePoints,
- TrackSummaryTool = InDetTrigTrackSummaryTool,
- TracksLocation = outEFIDTracks,
- SeedsTool = InDetSiSpacePointsSeedMaker,
- useZvertexTool = InDetFlags.useZvertexTool(),
- ZvertexTool = InDetZvertexMaker )
-
- if NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks":
- InDetSiSPSeededTrackFinder.useNewStrategy = False
- InDetSiSPSeededTrackFinder.useMBTSTimeDiff = InDetFlags.useMBTSTimeDiff()
- InDetSiSPSeededTrackFinder.useZBoundFinding = False
- # if InDetFlags.doHeavyIon() :
- # InDetSiSPSeededTrackFinder.FreeClustersCut = 2 #Heavy Ion optimization from Igor
- else:
- InDetSiSPSeededTrackFinder.useZvertexTool = InDetFlags.useZvertexTool() and NewTrackingCuts.mode() != "DBM"
- InDetSiSPSeededTrackFinder.useNewStrategy = InDetFlags.useNewSiSPSeededTF() and NewTrackingCuts.mode() != "DBM"
- InDetSiSPSeededTrackFinder.useMBTSTimeDiff = InDetFlags.useMBTSTimeDiff()
- InDetSiSPSeededTrackFinder.useZBoundFinding = NewTrackingCuts.doZBoundary() and NewTrackingCuts.mode() != "DBM"
-
-
-
-
- viewAlgs.append( InDetSiSPSeededTrackFinder )
-
- #for alg in viewAlgs:
- # print alg
-
- # if InDetFlags.doHeavyIon() :
- # InDetSiSPSeededTrackFinder.FreeClustersCut = 2 #Heavy Ion optimization from Igor
-
- # #InDetSiSPSeededTrackFinder.OutputLevel =VERBOSE
- # topSequence += InDetSiSPSeededTrackFinder
- # if (InDetFlags.doPrintConfigurables()):
- # printfunc (InDetSiSPSeededTrackFinder)
-
- # if not InDetFlags.doSGDeletion():
- # if InDetFlags.doTruth():
- # #
- # # set up the truth info for this container
- # #
- # include ("InDetRecExample/ConfiguredInDetTrackTruth.py")
- # InDetTracksTruth = ConfiguredInDetTrackTruth(self.__SiTrackCollection,
- # self.__SiTrackCollection+"DetailedTruth",
- # self.__SiTrackCollection+"TruthCollection")
- # #
- # # add final output for statistics
- # #
- # TrackCollectionKeys += [ InDetTracksTruth.Tracks() ]
- # TrackCollectionTruthKeys += [ InDetTracksTruth.TracksTruth() ]
- # else:
- # TrackCollectionKeys += [ self.__SiTrackCollection ]
- #
-
-
- #Convert final track collection to xAOD track particles
- from .InDetTrigCommon import getTrackParticleCnv
- viewAlgs.append( getTrackParticleCnv( prefix, suffix + "_EFID", outEFIDTracks, outEFIDTrackParticles ) )
-
-
- #print viewAlgs
- #print 'VIEWS!', len(viewAlgs)
- #print(len(viewAlgs))
-
- return viewAlgs
-
- #-----------------------------------------------------------------------------
- # Ambiguity solving stage
- #TODO:
-
+ #from .InDetTrigCommon import trackParticleCnv_builder
+ #trackParticleCnvAlg = trackParticleCnv_builder(name = get_full_name( 'xAODParticleCreatorAlg',config.name + '_EFID' ),
+ # config = config,
+ # inTrackCollectionKey = config.PT.trkTracksPT(),#config.EFID.trkTracksEFID(),
+ # outTrackParticlesKey = config.EFID.tracksEFID( doRecord = config.isRecordable),
+ # )
+
+ #-----------------------------------------------------------------------------
+ # Precision algorithms
+
+ #Verifier should not be necessary when both patt. rec. and PT runs in the same view -> None
+ #Also provides particle cnv alg inside
+ precisionAlgs = makePrecisionInDetPatternRecognition(config = config,
+ inputTracks = config.PT.trkTracksPT(), #config.EFID.trkTracksEFID(),
+ verifier = None )
+
+
+ viewAlgs += precisionAlgs
+
+
+ return viewAlgs, dataVerifier
+
+
+#TODO: potentially unify with makeInDetPrecisionTracking in the InDetPT.py?
+#TODO better name?
+def makePrecisionInDetPatternRecognition( config, inputTracks,verifier = None ):
+ ptAlgs = [] #List containing all the precision tracking algorithms hence every new added alg has to be appended to the list
+
+ #-----------------------------------------------------------------------------
+ # Verifying input data for the algorithms
+ if verifier:
+ verifier.DataObjects += [ #( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+' + TrigPixelKeys.PixelClusterAmbiguitiesMap ),
+ ( 'TrackCollection' , 'StoreGateSvc+' + inputTracks )]
+
+
+ #-----------------------------------------------------------------------------
+ # Ambiguity solving stage
+ from .InDetTrigCommon import ambiguityScoreAlg_builder, ambiguitySolverAlg_builder, get_full_name, get_scoremap_name
+
+ ambiguityScoreAlg = ambiguityScoreAlg_builder( name = get_full_name( core = 'TrkAmbiguityScore', suffix = config.name ),
+ config = config,
+ inputTrackCollection = inputTracks,
+ outputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores
+ )
+ ptAlgs.append( ambiguityScoreAlg )
+
+ #FIXME: these alg internally don't expect EFID setting (but FTF), have to take into consideration
+ ambiguitySolverAlg = ambiguitySolverAlg_builder( name = get_full_name( core = 'TrkAmbiguitySolver', suffix = config.name ),
+ config = config,
+ inputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores,
+ outputTrackCollection = config.PT.trkTracksPT()+"_Amb" ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
+
+ ptAlgs.append( ambiguitySolverAlg )
+
+ #-----------------------------------------------------------------------------
+ # Track particle conversion algorithm
+ from .InDetTrigCommon import trackParticleCnv_builder
+ trackParticleCnvAlg = trackParticleCnv_builder(name = get_full_name( 'xAODParticleCreatorAlg',config.name + '_IDTrig' ),
+ config = config,
+ inTrackCollectionKey = config.PT.trkTracksPT()+"_Amb",
+ outTrackParticlesKey = config.PT.tracksPT( doRecord = config.isRecordable),
+ )
+
+ ptAlgs.append( trackParticleCnvAlg )
+
+ return ptAlgs
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index f5b47cfafcb5fbfad24c163b5f1b91427914aa78..8be9a444754c6556090b2de3dd72bafd17848a13 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -27,29 +27,24 @@ def makeInDetPrecisionTracking( config = None,
#-----------------------------------------------------------------------------
# Naming conventions
+ doTRT = config.PT.setting.doTRT
algNamePrefix = "InDetTrigMT"
#Add suffix to the algorithms
signature = "_{}".format( config.name )
-
- #Name settings for output Tracks/TrackParticles
- #This first part is for ambiguity solver tracks
- nameAmbiTrackCollection = config.PT.trkTracksAS()
-
- #Tracks from TRT extension
- nameExtTrackCollection = config.PT.trkTracksTE()
- outPTTracks = config.PT.trkTracksPT()
- outPTTrackParticles = config.PT.tracksPT( doRecord = config.isRecordable )
+
+ #Name settings for output Tracks/TrackParticles
+ outTrkTracks = config.PT.trkTracksPT() #Final output Track collection
+ outTrackParticles = config.PT.tracksPT( doRecord = config.isRecordable ) #Final output xAOD::TrackParticle collection
+ ambiTrackCollection = config.PT.trkTracksAS() #Ambiguity solver tracks
#Atm there are mainly two output track collections one from ambiguity solver stage and one from trt,
#we want to have the output name of the track collection the same whether TRT was run or not,
#Therefore, we have to adapt output names of the algorithm which produces last collection
#However, this condition should be handled internally in configuration of the algs once TRT is configured with builders as well
- if config.PT.setting.doTRT:
- nameExtTrackCollection = outPTTracks
- else:
- nameAmbiTrackCollection = outPTTracks
+ if not doTRT:
+ ambiTrackCollection = outTrkTracks
#-----------------------------------------------------------------------------
# Verifying input data for the algorithms
@@ -77,7 +72,7 @@ def makeInDetPrecisionTracking( config = None,
#Obsolete, will be eventually replaced
#Note: keep Parameter_config!
- if config.PT.setting.doTRT:
+ if doTRT:
if "electron" in config.name or "tau" in config.name:
trigTrackSummaryTool.TRT_ElectronPidTool = InDetTrigTRT_ElectronPidTool
@@ -91,21 +86,27 @@ def makeInDetPrecisionTracking( config = None,
#-----------------------------------------------------------------------------
# Ambiguity solving stage
- from .InDetTrigCommon import ambiguityScoreAlg_builder, ambiguitySolverAlg_builder, get_full_name
+ from .InDetTrigCommon import ambiguityScoreAlg_builder, ambiguitySolverAlg_builder, get_full_name, get_scoremap_name
ambSolvingStageAlgs = [
- ambiguityScoreAlg_builder( name = get_full_name( core = 'TrkAmbiguityScore', suffix = config.name ),
- config = config ),
-
- ambiguitySolverAlg_builder( name = get_full_name( core = 'TrkAmbiguitySolver', suffix = config.name ),
- config = config )
+ ambiguityScoreAlg_builder( name = get_full_name( core = 'TrkAmbiguityScore', suffix = config.name ),
+ config = config,
+ inputTrackCollection = config.FT.trkTracksFTF(),
+ outputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores
+ ),
+
+ ambiguitySolverAlg_builder( name = get_full_name( core = 'TrkAmbiguitySolver', suffix = config.name ),
+ config = config,
+ inputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores,
+ outputTrackCollection = ambiTrackCollection )
]
+
#Loading the alg to the sequence
ptAlgs.extend( ambSolvingStageAlgs )
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
#TODO:implement builders and getters for TRT (WIP)
- if config.PT.setting.doTRT:
+ if doTRT:
#-----------------------------------------------------------------------------
# TRT data preparation
@@ -228,7 +229,7 @@ def makeInDetPrecisionTracking( config = None,
from TRT_TrackExtensionAlg.TRT_TrackExtensionAlgConf import InDet__TRT_TrackExtensionAlg
InDetTrigTRTextensionAlg = InDet__TRT_TrackExtensionAlg( name = "%sTrackExtensionAlg%s"%(algNamePrefix, signature),
- InputTracksLocation = nameAmbiTrackCollection,
+ InputTracksLocation = ambiTrackCollection,
TrackExtensionTool = InDetTrigTRTExtensionTool,
ExtendedTracksLocation = 'ExtendedTrackMap'
)
@@ -265,10 +266,10 @@ def makeInDetPrecisionTracking( config = None,
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackFitter
from InDetExtensionProcessor.InDetExtensionProcessorConf import InDet__InDetExtensionProcessor
InDetTrigExtensionProcessor = InDet__InDetExtensionProcessor (name = "%sExtensionProcessor%s"%(algNamePrefix, signature),
- TrackName = nameAmbiTrackCollection,
+ TrackName = ambiTrackCollection,
#Cosmics = InDetFlags.doCosmics(),
ExtensionMap = 'ExtendedTrackMap',
- NewTrackName = nameExtTrackCollection,
+ NewTrackName = outTrkTracks,
TrackFitter = InDetTrigTrackFitter,
TrackSummaryTool = SummaryTool_config,
ScoringTool = InDetTrigExtScoringTool, #TODO do I provide the same tool as for ambiguity solver?
@@ -290,8 +291,8 @@ def makeInDetPrecisionTracking( config = None,
from .InDetTrigCommon import trackParticleCnv_builder
trackParticleCnvAlg = trackParticleCnv_builder(name = get_full_name( 'xAODParticleCreatorAlg',config.name + '_IDTrig' ), #IDTrig suffix signifies that this is for precision tracking
config = config,
- inTrackCollectionKey = outPTTracks,
- outTrackParticlesKey = outPTTrackParticles,
+ inTrackCollectionKey = outTrkTracks,
+ outTrackParticlesKey = outTrackParticles,
)
log.debug(trackParticleCnvAlg)
ptAlgs.append(trackParticleCnvAlg)
@@ -302,8 +303,8 @@ def makeInDetPrecisionTracking( config = None,
#Potentialy other algs with more collections?
#Might Drop the list in the end and keep just one output key
- nameTrackCollections =[ outPTTracks ]
- nameTrackParticles = [ outPTTrackParticles ]
+ nameTrackCollections =[ outTrkTracks ]
+ nameTrackParticles = [ outTrackParticles ]
#Return list of Track keys, TrackParticle keys, and PT algs
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
index 3bba5355014c5e658a4bfd9455537b5082c79e7d..4f4fe1ffa3c794ef1cbf547e5576800e6dc40a3d 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
@@ -34,7 +34,7 @@ def get_full_name( core, suffix ):
#Retrieve name of the score map
#Map of Tracks and floats (representing score of a given track)
-def get_scoredmap( suffix ):
+def get_scoremap_name( suffix ):
return "ScoredMap{}".format(suffix)
@@ -48,6 +48,10 @@ def trackSummaryTool_getter( doTRT ):
else:
return InDetTrigTrackSummaryTool
+def trigPropagator_getter():
+ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPropagator
+ return InDetTrigPropagator
+
#--------------------------------------------------------------------------------------
@@ -305,25 +309,15 @@ def ambiguityProcessorTool_builder( name, config):
from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguitySolver
-def ambiguitySolverAlg_builder(name, config):
-
- #Get correct name for the ouput TrkTrack collection
- def getTrackOutput():
- #If we are also applying TRT then this collection is just intermediate
- if config.PT.setting.doTRT:
- return config.PT.trkTracksAS() #"%s%sTrkTrack%s" %('HLT_ID', 'AmbSol', get_name_suffix( config.name() ))
- #Otherwise use final collection name
- else:
- return config.PT.trkTracksPT()
+def ambiguitySolverAlg_builder(name, config, inputTrackScoreMap, outputTrackCollection):
- #-----------------------
#Set/Get subtools
ambiguityProcessor = ambiguityProcessorTool_builder( name = get_full_name( 'AmbiguityProcessor', config.name),
config = config )
return Trk__TrkAmbiguitySolver( name = name,
- TrackInput = get_scoredmap( get_name_suffix(config.name )),
- TrackOutput = getTrackOutput(),
+ TrackInput = inputTrackScoreMap,
+ TrackOutput = outputTrackCollection,
AmbiguityProcessor = ambiguityProcessor
)
@@ -354,7 +348,7 @@ def ambiguityScoreProcessorTool_builder( name, config):
from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguityScore
-def ambiguityScoreAlg_builder(name, config):
+def ambiguityScoreAlg_builder(name, config, inputTrackCollection, outputTrackScoreMap ):
#Alg loops over provided tracks and calls subtool(TrkAmbigutyScoreProcessor) to assign scores for each one of them
#-----------------------
@@ -363,10 +357,369 @@ def ambiguityScoreAlg_builder(name, config):
# config = config )
return Trk__TrkAmbiguityScore( name = name,
- TrackInput = [ config.FT.trkTracksFTF() ],
- TrackOutput = get_scoredmap( get_name_suffix( config.name ) ),
+ TrackInput = [ inputTrackCollection ], #[ config.FT.trkTracksFTF() ],
+ TrackOutput = outputTrackScoreMap, #get_scoredmap( get_name_suffix( config.name ) ),
#Disable processor, see: https://gitlab.cern.ch/atlas/athena/-/merge_requests/36431
AmbiguityScoreProcessor = None, #ambiguityScoreProcessor,
- )
+ )
+
+#-------------------------------------------------------------------------------------------------
+# Alg/Tools for offline pattern recognition tracking
+
+@makePublicTool
+def siSpacePointsSeedMakerTool_builder(name, trackingCuts, usePrdAssociationTool ):
+ from InDetRecExample.InDetKeys import InDetKeys
+ from .InDetTrigCollectionKeys import TrigPixelKeys, TrigSCTKeys
+ from InDetRecExample.InDetJobProperties import InDetFlags
+
+ kwargs = {}
+ kwargs = setDefaults( kwargs,
+ pTmin = trackingCuts.minPT(),
+ maxdImpact = trackingCuts.maxPrimaryImpact(),
+ maxZ = trackingCuts.maxZImpact(),
+ minZ = -trackingCuts.maxZImpact(),
+ usePixel = trackingCuts.usePixel(),
+ SpacePointsPixelName = TrigPixelKeys.SpacePoints,
+ useSCT = (trackingCuts.useSCT() and trackingCuts.useSCTSeeding()),
+ SpacePointsSCTName = TrigSCTKeys.SpacePoints,
+ useOverlapSpCollection = (trackingCuts.useSCT() and trackingCuts.useSCTSeeding()),
+ SpacePointsOverlapName = InDetKeys.OverlapSpacePoints(), #Switch to trigger flags?
+ radMax = trackingCuts.radMax(),
+ RapidityCut = trackingCuts.maxEta())
+
+
+ #Change/add tracking parameters based on the different tracking mode
+ if trackingCuts.mode() == "Offline" or InDetFlags.doHeavyIon() or trackingCuts.mode() == "ForwardTracks":
+ kwargs = setDefaults( kwargs,
+ maxdImpactPPS = trackingCuts.maxdImpactPPSSeeds(),
+ maxdImpactSSS = trackingCuts.maxdImpactSSSSeeds())
+
+ if usePrdAssociationTool:
+ # not all classes have that property !!!
+ kwargs = setDefaults( kwargs,
+ PRDtoTrackMap = TrigPixelKeys.PRDtoTrackMap)
+
+ #FIXME: switch to TrigFlags?
+ if not InDetFlags.doCosmics():
+ kwargs = setDefaults( kwargs,
+ maxRadius1 = 0.75*trackingCuts.radMax(),
+ maxRadius2 = trackingCuts.radMax(),
+ maxRadius3 = trackingCuts.radMax())
+
+ #FIXME add later if needed
+ #if trackingCuts.mode() == "LowPt" or trackingCuts.mode() == "VeryLowPt" or (trackingCuts.mode() == "Pixel" and InDetFlags.doMinBias()):
+ # try :
+ # InDetSiSpacePointsSeedMaker.pTmax = trackingCuts.maxPT()
+ # except:
+ # pass
+ # InDetSiSpacePointsSeedMaker.mindRadius = 4.0
+ #
+ #if trackingCuts.mode() == "SLHC" or trackingCuts.mode() == "SLHCConversionFinding":
+ # InDetSiSpacePointsSeedMaker.minRadius1 = 0
+ # InDetSiSpacePointsSeedMaker.minRadius2 = 0
+ # InDetSiSpacePointsSeedMaker.minRadius3 = 0
+ # InDetSiSpacePointsSeedMaker.maxRadius1 =1000.*Units.mm
+ # InDetSiSpacePointsSeedMaker.maxRadius2 =1000.*Units.mm
+ # InDetSiSpacePointsSeedMaker.maxRadius3 =1000.*Units.mm
+ #
+ #if trackingCuts.mode() == "ForwardTracks" or trackingCuts.mode() == "ForwardSLHCTracks" or trackingCuts.mode() == "VeryForwardSLHCTracks":
+ # InDetSiSpacePointsSeedMaker.checkEta = True
+ # InDetSiSpacePointsSeedMaker.etaMin = trackingCuts.minEta()
+ # InDetSiSpacePointsSeedMaker.etaMax = trackingCuts.maxEta()
+ # InDetSiSpacePointsSeedMaker.RapidityCut = trackingCuts.maxEta()
+ #
+ #if trackingCuts.mode() == "DBM":
+ # InDetSiSpacePointsSeedMaker.etaMin = trackingCuts.minEta()
+ # InDetSiSpacePointsSeedMaker.etaMax = trackingCuts.maxEta()
+ # InDetSiSpacePointsSeedMaker.useDBM = True
+
+
+ from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_ATLxk as SiSpacePointsSeedMaker
+ return SiSpacePointsSeedMaker ( name = name,
+ **kwargs)
+
+
+
+
+@makePublicTool
+def zVertexMakerTool_builder(name, trackingCuts, seedMakerTool ):
+ from InDetRecExample.InDetJobProperties import InDetFlags
+
+ kwargs = {}
+
+ #Prepare default parameter settings for the tool
+ kwargs = setDefaults( kwargs,
+ Zmax = trackingCuts.maxZImpact(),
+ Zmin = -trackingCuts.maxZImpact(),
+ minRatio = 0.17,
+ SeedMakerTool = seedMakerTool )
+
+
+ if InDetFlags.doHeavyIon():
+ kwargs = setDefaults( kwargs,
+ HistSize = 2000,
+ minContent = 30)
+
+ from SiZvertexTool_xk.SiZvertexTool_xkConf import InDet__SiZvertexMaker_xk
+ return InDet__SiZvertexMaker_xk(name = name,
+ **kwargs)
+
+
+
+
+def prdAssociation_builder( InputCollections ):
+ import InDetRecExample.TrackingCommon as TrackingCommon
+ #FIXME: If so:
+ # 1] Get a new association tool
+ #associationTool = TrackingCommon.getInDetTrigPRDtoTrackMapToolGangedPixels(),
+
+ # 2] Use the ganged pixel from here?
+ #from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPrdAssociationTool
+
+ # 3] Create the new one as in offline tracking?:
+ prefix = 'TrigInDet'
+ suffix = ''#NewTrackingCuts.extension()
+ return TrackingCommon.getInDetTrackPRD_Association(namePrefix = prefix,
+ nameSuffix = suffix,
+ TracksName = list(InputCollections))#This is readHandle #What input collection Thought there are no tracks at this point??!
+ # 4] if so do I use normal or ganged?
+ #from InDetAssociationTools.InDetAssociationToolsConf import InDet__InDetPRD_AssociationToolGangedPixels
+ #InDetTrigPrdAssociationl = InDet__InDetPRD_AssociationToolGangedPixels(name = "%sPrdAssociationTool%s"%(prefix,suffix),
+ # PixelClusterAmbiguitiesMapName = TrigPixelKeys.PRDtoTrackMap )
+
+@makePublicTool
+def siDetectorElementRoadMakerTool_builder( name, trackingCuts ):
+ from InDetRecExample.InDetKeys import InDetKeys
+
+ #Are we happy with this propagator?
+ from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadMaker_xk
+ return InDet__SiDetElementsRoadMaker_xk(name = name,
+ PropagatorTool = trigPropagator_getter(),
+ usePixel = trackingCuts.usePixel(),
+ PixManagerLocation = InDetKeys.PixelManager(), #FIXME: InDetTrigKeys?
+ useSCT = trackingCuts.useSCT(),
+ SCTManagerLocation = InDetKeys.SCT_Manager(), #FIXME InDetTrigKeys?
+ RoadWidth = trackingCuts.RoadWidth())
+
+@makePublicTool
+def siCombinatorialTrackFinderTool_builder( name, trackingCuts ):
+ from .InDetTrigCollectionKeys import TrigPixelKeys, TrigSCTKeys
+ from AthenaCommon.DetFlags import DetFlags
+ from InDetRecExample.InDetJobProperties import InDetFlags
+ import InDetRecExample.TrackingCommon as TrackingCommon
+
+ #FIXME: quick hack to try running ID, remove later
+ DetFlags.ID_setOn()
+
+ #Are we happy with these settings?
+ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool, InDetTrigPatternUpdator
+ # @TODO ensure that PRD association map is used if usePrdAssociationTool is set
+
+ kwargs = {}
+ #Prepare default parameter settings for the tool
+ kwargs = setDefaults( kwargs,
+ PropagatorTool = trigPropagator_getter(),
+ UpdatorTool = InDetTrigPatternUpdator,
+ SctSummaryTool = InDetTrigSCTConditionsSummaryTool, #Any reason for this to be turned off? None,
+ RIOonTrackTool = TrackingCommon.getInDetRotCreatorDigital(),
+ usePixel = DetFlags.haveRIO.pixel_on(),
+ useSCT = DetFlags.haveRIO.SCT_on(),
+ PixelClusterContainer = TrigPixelKeys.Clusters,
+ SCT_ClusterContainer = TrigSCTKeys.Clusters)
+
+ #FIXME: Use TriggerFlags instead?
+ if InDetFlags.doDBMstandalone() or trackingCuts.extension() =='DBM':
+ kwargs = setDefaults( kwargs,
+ MagneticFieldMode = "NoField",
+ TrackQualityCut = 9.3,
+ useSCT = False,
+ RIOonTrackTool = TrackingCommon.getInDetRotCreatorDBM(),
+ )
+
+
+ #Add SCT condition summary if specified
+ #FIXME: Use TriggerFlags instead?
+ #if (DetFlags.haveRIO.SCT_on()):
+ # kwargs = setDefaults( kwargs,
+ # SctSummaryTool = InDetTrigSCTConditionsSummaryTool )
+
+ from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiCombinatorialTrackFinder_xk
+ return InDet__SiCombinatorialTrackFinder_xk(name = name,
+ **kwargs)
+
+
+@makePublicTool
+def siTrackMakerTool_builder( name, siDetElementsRoadMakerTool, trackFinderTool, trackingCuts, usePrdAssociationTool ):
+ from InDetRecExample.InDetJobProperties import InDetFlags
+ from InDetRecExample.InDetKeys import InDetKeys
+
+ trackPatternRecoInfo = 'SiSPSeededFinder'
+ if InDetFlags.doCosmics():
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_Cosmic'
+
+ elif InDetFlags.doHeavyIon():
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_HeavyIon'
+
+ elif trackingCuts.mode() == "LowPt":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_LowMomentum'
+
+ elif trackingCuts.mode() == "VeryLowPt" or (trackingCuts.mode() == "Pixel" and InDetFlags.doMinBias()):
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_VeryLowMomentum'
+
+ elif trackingCuts.mode() == "BeamGas":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_BeamGas'
+
+ elif trackingCuts.mode() == "ForwardTracks":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_ForwardTracks'
+
+ elif trackingCuts.mode() == "ForwardSLHCTracks":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_ForwardSLHCTracks'
+
+ elif trackingCuts.mode() == "VeryForwardSLHCTracks":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_VeryForwardSLHCTracks'
+
+ elif trackingCuts.mode() == "SLHCConversionFinding":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_SLHCConversionTracks'
+
+ elif trackingCuts.mode() == "LargeD0" or trackingCuts.mode() == "LowPtLargeD0":
+ trackPatternRecoInfo = 'SiSpacePointsSeedMaker_LargeD0'
+
+ useBremMode = trackingCuts.mode() == "Offline" or trackingCuts.mode() == "SLHC" or trackingCuts.mode() == "DBM"
+
+ kwargs = {}
+ #Prepare default parameter settings for the tool
+ kwargs = setDefaults( kwargs,
+ useSCT = trackingCuts.useSCT(),
+ usePixel = trackingCuts.usePixel(),
+ RoadTool = siDetElementsRoadMakerTool,
+ CombinatorialTrackFinder = trackFinderTool,
+ pTmin = trackingCuts.minPT(),
+ pTminBrem = trackingCuts.minPTBrem(),
+ pTminSSS = InDetFlags.pT_SSScut(),
+ nClustersMin = trackingCuts.minClusters(),
+ nHolesMax = trackingCuts.nHolesMax(),
+ nHolesGapMax = trackingCuts.nHolesGapMax(),
+ SeedsFilterLevel = trackingCuts.seedFilterLevel(),
+ Xi2max = trackingCuts.Xi2max(),
+ Xi2maxNoAdd = trackingCuts.Xi2maxNoAdd(),
+ nWeightedClustersMin = trackingCuts.nWeightedClustersMin(),
+ CosmicTrack = InDetFlags.doCosmics(),
+ Xi2maxMultiTracks = trackingCuts.Xi2max(), # was 3.
+ useSSSseedsFilter = InDetFlags.doSSSfilter(),
+ doMultiTracksProd = True,
+ useBremModel = InDetFlags.doBremRecovery() and useBremMode, # only for NewTracking the brem is debugged !!!
+ doCaloSeededBrem = InDetFlags.doCaloSeededBrem(),
+ doHadCaloSeedSSS = InDetFlags.doHadCaloSeededSSS(),
+ phiWidth = trackingCuts.phiWidthBrem(),
+ etaWidth = trackingCuts.etaWidthBrem(),
+ InputClusterContainerName = InDetKeys.CaloClusterROIContainer(),
+ InputHadClusterContainerName = InDetKeys.HadCaloClusterROIContainer(),
+ TrackPatternRecoInfo = trackPatternRecoInfo,
+ UseAssociationTool = usePrdAssociationTool)
+
+
+ #Change the parameters based on the tracking cuts
+ if trackingCuts.mode() == "SLHC" or trackingCuts.mode() == "ForwardSLHCTracks" or trackingCuts.mode() == "VeryForwardSLHCTracks" :
+ kwargs = setDefaults( kwargs,
+ ITKGeometry = True )
+
+ if trackingCuts.mode() == "DBM":
+ kwargs = setDefaults( kwargs,
+ MagneticFieldMode = "NoField",
+ useBremModel = False,
+ doMultiTracksProd = False,
+ pTminSSS = -1,
+ CosmicTrack = False,
+ useSSSseedsFilter = False,
+ doCaloSeededBrem = False,
+ doHadCaloSeedSSS = False)
+
+ if InDetFlags.doStoreTrackSeeds():
+ from SeedToTrackConversionTool.SeedToTrackConversionToolConf import InDet__SeedToTrackConversionTool
+ InDet_SeedToTrackConversion = InDet__SeedToTrackConversionTool(name = "InDet_SeedToTrackConversion"+trackingCuts.extension(),
+ OutputName = InDetKeys.SiSPSeedSegments()+trackingCuts.extension())
+ kwargs = setDefaults( kwargs,
+ SeedToTrackConversion = InDet_SeedToTrackConversion,
+ SeedSegmentsWrite = True )
+
+
+
+ from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk
+ return InDet__SiTrackMaker_xk(name = name,
+ **kwargs)
+
+
+
+def siSPSeededTrackFinder_builder( name, outputTracks, trackingCuts, usePrdAssociationTool, nameSuffix ):
+ from .InDetTrigCollectionKeys import TrigPixelKeys, TrigSCTKeys
+ from InDetRecExample.InDetJobProperties import InDetFlags
+
+
+
+ #Load subtools of the TrackFinder
+ siSpacePointsSeedMakerTool = siSpacePointsSeedMakerTool_builder(name = get_full_name( 'siSPSeedMaker', nameSuffix),
+ trackingCuts = trackingCuts,
+ usePrdAssociationTool = usePrdAssociationTool )
+
+ # --- Z-coordinates primary vertices finder (only for collisions)
+ zVertexMakerTool = None
+ #FIXME:Switch to trig flags?
+ if InDetFlags.useZvertexTool() and trackingCuts.mode() != "DBM":
+ print('Running z-vertex maker')
+ zVertexMakerTool = zVertexMakerTool_builder(name, trackingCuts, siSpacePointsSeedMakerTool )
+
+ # --- SCT and Pixel detector elements road builder
+ siDetectorElementRoadMaker = siDetectorElementRoadMakerTool_builder( name = get_full_name( 'SiDetectorElementRoadMaker', nameSuffix),
+ trackingCuts = trackingCuts )
+
+ # --- Local track finding using sdCaloSeededSSSpace point seed
+ siCombinatorialTrackFinderTool = siCombinatorialTrackFinderTool_builder( name = get_full_name( 'SiCombinatorialTrackFinder', nameSuffix),
+ trackingCuts = trackingCuts)
+
+
+ siTrackMakerTool = siTrackMakerTool_builder( name = get_full_name( 'siTrackMaker', nameSuffix),
+ siDetElementsRoadMakerTool = siDetectorElementRoadMaker,
+ trackFinderTool = siCombinatorialTrackFinderTool,
+ trackingCuts = trackingCuts,
+ usePrdAssociationTool = usePrdAssociationTool)
+
+ #-----------------------------------------------------
+ # Configure parameters
+
+ kwargs = {}
+ #Prepare default parameter settings for the tool
+ kwargs = setDefaults( kwargs,
+ TrackTool = siTrackMakerTool,
+ PRDtoTrackMap = TrigPixelKeys.PRDtoTrackMap if usePrdAssociationTool else '', #TODO: if prd is enabled this needs to be tested
+ SpacePointsPixelName= TrigPixelKeys.SpacePoints,
+ SpacePointsSCTName = TrigSCTKeys.SpacePoints,
+ TrackSummaryTool = trackSummaryTool_getter(doTRT=False), #TODO: x-check whether we need different config
+ TracksLocation = outputTracks, #outEFIDTracks,
+ SeedsTool = siSpacePointsSeedMakerTool,
+ ZvertexTool = zVertexMakerTool,
+ useZvertexTool = InDetFlags.useZvertexTool() and trackingCuts.mode() != "DBM",
+ useNewStrategy = InDetFlags.useNewSiSPSeededTF() and trackingCuts.mode() != "DBM",
+ useMBTSTimeDiff = InDetFlags.useMBTSTimeDiff(),
+ useZBoundFinding = trackingCuts.doZBoundary() and trackingCuts.mode() != "DBM" )
+
+
+ #Specific tracking settings
+ if trackingCuts.mode() == "ForwardSLHCTracks" or trackingCuts.mode() == "ForwardTracks":
+ kwargs = setDefaults( kwargs,
+ useNewStrategy = False,
+ useMBTSTimeDiff = InDetFlags.useMBTSTimeDiff(),
+ useZBoundFinding = False,
+ useZvertexTool = InDetFlags.useZvertexTool() )
+
+ if InDetFlags.doHeavyIon():
+ kwargs = setDefaults( kwargs, FreeClustersCut = 2) #Heavy Ion optimization from Igor
+
+ #-----------------------------------------------------
+
+
+ from SiSPSeededTrackFinder.SiSPSeededTrackFinderConf import InDet__SiSPSeededTrackFinder
+ return InDet__SiSPSeededTrackFinder(name = name,
+ **kwargs )
+
diff --git a/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx b/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx
index 7dde3d2c52ce5d078fb1ce10c18e601bb7dd99c1..8c637d224744d9ce31fdf7d291b8f610ff118550 100755
--- a/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx
+++ b/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx
@@ -1,10 +1,9 @@
// this is -*- c++ -*-
/*
- 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: TrigTimerSvc.cxx,v 1.12 2009-04-15 14:00:22 tbold Exp $
#include "TrigTimeAlgs/TrigTimerSvc.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -48,8 +47,6 @@ StatusCode TrigTimerSvc::queryInterface (const InterfaceID& riid, void** ppvInte
StatusCode TrigTimerSvc::initialize ( ) {
- ATH_CHECK( setProperties() );
-
// compile regexes
m_includeRegex = boost::regex(m_includeName);
m_excludeRegex = boost::regex(m_excludeName);
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 3d09ef19cbbe49620dbe4e2ff277e36c281d67cd..8f6556182bedf558ac142fb9a5c89037710bac4e 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -60,8 +60,8 @@ HLT_2e3_etcut_L12EM3:
stepFeatures:
0: 342
1: 976
- 2: 712
- 3: 270
+ 2: 708
+ 3: 268
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
stepCounts:
@@ -592,6 +592,48 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
6: 4
7: 4
8: 4
+HLT_e17_lhvloose_L1EM15VH:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 7
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_e17_lhvloose_L1EM15VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
+HLT_e17_lhvloose_gsf_L1EM15VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
HLT_e17_lhvloose_nod0_L1EM15VH:
eventCount: 5
stepCounts:
@@ -620,6 +662,20 @@ HLT_e17_lhvloose_nod0_L1EM15VHI:
2: 4
3: 4
4: 4
+HLT_e20_lhmedium_e15_idperf_Zee_L12EM3:
+ eventCount: 19
+ stepCounts:
+ 0: 20
+ 1: 20
+ 2: 20
+ 3: 19
+ 4: 19
+ stepFeatures:
+ 0: 176
+ 1: 715
+ 2: 331
+ 3: 159
+ 4: 115
HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
eventCount: 0
stepCounts:
@@ -652,6 +708,20 @@ HLT_e24_lhvloose_L1EM20VH:
2: 5
3: 5
4: 5
+HLT_e24_lhvloose_gsf_L1EM20VH:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 7
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e26_etcut_L1EM22VHI:
eventCount: 5
stepCounts:
@@ -664,6 +734,18 @@ HLT_e26_etcut_L1EM22VHI:
1: 30
2: 6
3: 6
+HLT_e26_idperf_L1EM24VHI:
+ eventCount: 6
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ stepFeatures:
+ 0: 7
+ 1: 7
+ 2: 14
+ 3: 7
HLT_e26_lhloose_L1EM15VH:
eventCount: 5
stepCounts:
@@ -780,6 +862,20 @@ HLT_e26_lhtight_gsf_L1EM22VHI:
2: 4
3: 4
4: 4
+HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
HLT_e26_lhtight_ivarloose_L1EM22VHI:
eventCount: 3
stepCounts:
@@ -850,6 +946,18 @@ HLT_e26_lhtight_nod0_L1EM24VHI:
2: 4
3: 4
4: 4
+HLT_e28_idperf_L1EM24VHI:
+ eventCount: 6
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ stepFeatures:
+ 0: 7
+ 1: 7
+ 2: 14
+ 3: 7
HLT_e300_etcut_L1EM22VHI:
eventCount: 0
HLT_e3_etcut1step_g5_etcut_L12EM3:
@@ -872,8 +980,8 @@ HLT_e3_etcut_L1EM3:
stepFeatures:
0: 171
1: 491
- 2: 360
- 3: 136
+ 2: 358
+ 3: 135
HLT_e5_etcut_L1EM3:
eventCount: 20
stepCounts:
@@ -883,9 +991,21 @@ HLT_e5_etcut_L1EM3:
3: 20
stepFeatures:
0: 137
- 1: 458
+ 1: 459
2: 173
3: 102
+HLT_e5_idperf_L1EM3:
+ eventCount: 20
+ stepCounts:
+ 0: 20
+ 1: 20
+ 2: 20
+ 3: 20
+ stepFeatures:
+ 0: 176
+ 1: 166
+ 2: 331
+ 3: 160
HLT_e5_lhloose_L1EM3:
eventCount: 6
stepCounts:
@@ -896,7 +1016,7 @@ HLT_e5_lhloose_L1EM3:
4: 6
stepFeatures:
0: 60
- 1: 145
+ 1: 146
2: 81
3: 46
4: 7
@@ -910,7 +1030,7 @@ HLT_e5_lhloose_noringer_L1EM3:
4: 6
stepFeatures:
0: 56
- 1: 128
+ 1: 130
2: 84
3: 46
4: 7
@@ -924,7 +1044,7 @@ HLT_e5_lhmedium_L1EM3:
4: 4
stepFeatures:
0: 58
- 1: 131
+ 1: 132
2: 76
3: 44
4: 5
@@ -938,11 +1058,25 @@ HLT_e5_lhmedium_noringer_L1EM3:
4: 4
stepFeatures:
0: 48
- 1: 97
+ 1: 99
2: 66
3: 38
4: 5
HLT_e5_lhtight_L1EM3:
+ eventCount: 4
+ stepCounts:
+ 0: 18
+ 1: 15
+ 2: 15
+ 3: 15
+ 4: 4
+ stepFeatures:
+ 0: 57
+ 1: 129
+ 2: 74
+ 3: 43
+ 4: 5
+HLT_e5_lhtight_gsf_L1EM3:
eventCount: 4
stepCounts:
0: 18
@@ -966,7 +1100,7 @@ HLT_e5_lhtight_nod0_L1EM3:
4: 4
stepFeatures:
0: 57
- 1: 128
+ 1: 129
2: 74
3: 43
4: 5
@@ -980,7 +1114,7 @@ HLT_e5_lhtight_noringer_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 92
+ 1: 94
2: 61
3: 36
4: 5
@@ -994,7 +1128,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
4: 4
stepFeatures:
0: 45
- 1: 92
+ 1: 94
2: 61
3: 36
4: 5
@@ -1035,7 +1169,7 @@ HLT_e7_etcut_L1EM3:
3: 20
stepFeatures:
0: 89
- 1: 361
+ 1: 362
2: 117
3: 73
HLT_e7_lhmedium_mu24_L1MU20:
@@ -1350,6 +1484,16 @@ HLT_g35_loose_mu18_L1EM24VHI:
7: 2
HLT_g35_medium_g25_medium_L12EM20VH:
eventCount: 0
+HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 5
+ 2: 5
+ stepFeatures:
+ 0: 10
+ 1: 10
+ 2: 11
HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
eventCount: 0
stepCounts:
@@ -1469,15 +1613,21 @@ HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20:
stepCounts:
0: 1
stepFeatures:
- 0: 50
+ 0: 5
+HLT_j0_fbdjshared_L1J20:
+ eventCount: 7
+ stepCounts:
+ 0: 7
+ stepFeatures:
+ 0: 179
HLT_j0_perf_L1J12_EMPTY:
eventCount: 0
HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20:
- eventCount: 15
+ eventCount: 7
stepCounts:
- 0: 15
+ 0: 7
stepFeatures:
- 0: 386
+ 0: 176
HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100:
eventCount: 0
stepCounts:
@@ -1554,6 +1704,12 @@ HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100:
0: 3
stepFeatures:
0: 3
+HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
+ eventCount: 19
+ stepCounts:
+ 0: 19
+ stepFeatures:
+ 0: 493
HLT_j420_L1J100:
eventCount: 0
HLT_j420_pf_subresjesgscIS_ftf_L1J100:
@@ -1663,11 +1819,11 @@ HLT_j45_pf_subjesgscIS_ftf_L1J15:
0: 20
1: 52
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
- eventCount: 13
+ eventCount: 14
stepCounts:
0: 19
1: 18
- 2: 13
+ 2: 14
stepFeatures:
0: 19
1: 49
@@ -1729,25 +1885,25 @@ HLT_j45_subjesgscIS_ftf_L1J15:
0: 20
1: 48
HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
- eventCount: 13
+ eventCount: 12
stepCounts:
0: 19
1: 19
- 2: 13
+ 2: 12
stepFeatures:
0: 19
1: 47
- 2: 24
+ 2: 23
HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
- eventCount: 14
+ eventCount: 15
stepCounts:
0: 19
1: 19
- 2: 14
+ 2: 15
stepFeatures:
0: 19
1: 47
- 2: 26
+ 2: 28
HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
eventCount: 19
stepCounts:
@@ -2483,17 +2639,17 @@ HLT_sct_noise_SCTPEB_L1RD0_EMPTY:
HLT_tau0_perf_ptonly_L1TAU100:
eventCount: 0
HLT_tau0_perf_ptonly_L1TAU12:
- eventCount: 15
+ eventCount: 16
stepCounts:
0: 18
- 1: 15
- 2: 15
- 3: 15
+ 1: 16
+ 2: 16
+ 3: 16
stepFeatures:
0: 42
- 1: 23
- 2: 23
- 3: 23
+ 1: 24
+ 2: 24
+ 3: 24
HLT_tau0_perf_ptonly_L1TAU60:
eventCount: 3
stepCounts:
@@ -2903,7 +3059,7 @@ HLT_unconvtrk120_isohpttrack_imedium_L1XE50:
stepCounts:
0: 6
stepFeatures:
- 0: 11
+ 0: 10
HLT_xe100_cvfpufit_L1XE50:
eventCount: 6
stepCounts:
@@ -2935,13 +3091,13 @@ HLT_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
0: 10
1: 5
HLT_xe100_pfopufit_L1XE50:
- eventCount: 5
+ eventCount: 4
stepCounts:
0: 10
- 1: 5
+ 1: 4
stepFeatures:
0: 10
- 1: 5
+ 1: 4
HLT_xe100_pfsum_L1XE50:
eventCount: 6
stepCounts:
@@ -2987,21 +3143,21 @@ HLT_xe110_pfsum_L1XE50:
0: 10
1: 5
HLT_xe110_pfsum_cssk_L1XE50:
- eventCount: 3
+ eventCount: 2
stepCounts:
0: 10
- 1: 3
+ 1: 2
stepFeatures:
0: 10
- 1: 3
+ 1: 2
HLT_xe110_pfsum_vssk_L1XE50:
- eventCount: 4
+ eventCount: 3
stepCounts:
0: 10
- 1: 4
+ 1: 3
stepFeatures:
0: 10
- 1: 4
+ 1: 3
HLT_xe110_tc_em_L1XE50:
eventCount: 5
stepCounts:
@@ -3119,7 +3275,7 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrloose_L1XE50:
stepCounts:
0: 3
stepFeatures:
- 0: 7
+ 0: 6
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrmedium_L1XE50:
eventCount: 2
stepCounts:
@@ -3131,13 +3287,13 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_imedium_L1XE50:
stepCounts:
0: 5
stepFeatures:
- 0: 15
+ 0: 14
HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50:
eventCount: 6
stepCounts:
0: 6
stepFeatures:
- 0: 20
+ 0: 19
HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50:
eventCount: 4
stepCounts:
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
index 33271117c613efa77605a0c8ae43b026dffad93c..cd706e30fbdf2c4b507b10a3cf0eb8b6d17da435 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
@@ -52,8 +52,8 @@ if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
#added for RTT-chainstore conmpatibility
if not ('RunningRTT' in dir()):
acf.FilesInput=fileList
- ConfigFlags.Input.Files = acf.FilesInput()
-#acf.FilesInput=fileList
+
+ConfigFlags.Input.Files = acf.FilesInput() or acf.PoolAODInput()
###############################
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
index 543a0f5d4964e4adb280c660a39f05b7e6afc181..6843a6bd7ce736a00e3f07060e91d16126086497 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
@@ -55,8 +55,8 @@ if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
#added for RTT-chainstore conmpatibility
if not ('RunningRTT' in dir()):
acf.FilesInput=fileList
- ConfigFlags.Input.Files = acf.FilesInput()
-#acf.FilesInput=fileList
+
+ConfigFlags.Input.Files = acf.FilesInput() or acf.PoolAODInput()
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
index 99ab925addcc2acd8e0d9f69151ba3243d003619..31f6dbf9cb143ddcf349eef16d0f703461075b8b 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
@@ -55,8 +55,8 @@ if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
#added for RTT-chainstore conmpatibility
if not ('RunningRTT' in dir()):
acf.FilesInput=fileList
- ConfigFlags.Input.Files = acf.FilesInput()
-#acf.FilesInput=fileList
+
+ConfigFlags.Input.Files = acf.FilesInput() or acf.PoolAODInput()
diff --git a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
index 0afca4f193c9344195a626696d1930bfaee20e19..bb8602ea3856257191dbf96f54f977ea51460590 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
@@ -17,5 +17,5 @@ atlas_install_scripts( scripts/TIDA*.py test/test*.py POST_BUILD_CMD ${ATLAS_FLA
# Unit test for python test scripts:
atlas_add_test( TrigValSteeringUT
SCRIPT trigvalsteering-unit-tester.py ${CMAKE_CURRENT_SOURCE_DIR}/test
- PROPERTIES TIMEOUT 300
+ PROPERTIES TIMEOUT 600
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index ac024978f5920afa136abeded50083e9e53ba1a9..ab13d80eba217a53c2345fe48beba688c1e830ca 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -35,6 +35,7 @@ class TrigInDetReco(ExecStep):
self.slices = []
self.preexec_trig = ' '
self.postinclude_trig = postinclude_file
+ self.release = 'latest'
self.preexec_reco = ';'.join([
'from RecExConfig.RecFlags import rec',
'rec.doForwardDet=False',
@@ -59,8 +60,9 @@ class TrigInDetReco(ExecStep):
])
self.postexec_trig = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.RDO_TRIG=100000000000']"
+
self.postexec_reco = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.ESD=100000000000']"
- self.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" --asetup "RAWtoESD:Athena,22.0.20" "ESDtoAOD:Athena,22.0.20" '
+ self.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG"'
def configure(self, test):
@@ -100,6 +102,25 @@ class TrigInDetReco(ExecStep):
chains += ']'
self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains
+ if (self.release == 'current'):
+ print( "Using current release for offline Reco steps " )
+ else:
+ # get the current atlas base release, and the previous base release
+ import os
+ DVERSION=os.getenv('Athena_VERSION')
+ if (self.release == 'latest'):
+ if ( DVERSION is None ) :
+ AVERSION = "22.0.20"
+ else:
+ BASE=DVERSION[:5]
+ SUB=int(DVERSION[5:])
+ SUB -= 1
+ AVERSION=BASE+str(SUB)
+ else:
+ AVERSION = self.release
+ self.args += ' --asetup "RAWtoESD:Athena,'+AVERSION+'" "ESDtoAOD:Athena,'+AVERSION+'" '
+ print( "remapping athena base release version for offline Reco steps: ", DVERSION, " -> ", AVERSION )
+
self.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};" "ESDtoAOD:{:s};"'.format(
self.preexec_trig, self.preexec_all, self.preexec_reco, self.preexec_aod)
@@ -126,31 +147,52 @@ class TrigInDetAna(AthenaCheckerStep):
# Additional post-processing steps
##################################################
-class TrigInDetdictStep(Step):
+class TrigInDetRdictStep(Step):
'''
Execute TIDArdict for TrkNtuple files.
'''
- def __init__(self, name='TrigInDetdict', reference='Truth' ):
- super(TrigInDetdictStep, self).__init__(name)
- self.args=' '
+ def __init__(self, name='TrigInDetdict', args=None, testbin='Test_bin.dat'):
+ super(TrigInDetRdictStep, self).__init__(name)
+ self.args=args + " -b " + testbin + " "
self.auto_report_result = True
self.required = True
- self.reference = reference
self.executable = 'TIDArdict'
def configure(self, test):
- os.system( 'get_files -data TIDAbeam.dat' )
- os.system( 'get_files -data Test_bin.dat' )
- os.system( 'get_files -data TIDAdata-chains-run3.dat' )
- os.system( 'get_files -data TIDAhisto-panel.dat' )
- os.system( 'get_files -data TIDAdata-run3.dat' )
- os.system( 'get_files -data TIDAdata_cuts.dat' )
- os.system( 'get_files -data TIDAdata-run3-offline.dat' )
- os.system( 'get_files -data TIDAdata_cuts-offline.dat' )
- os.system( 'get_files -jo TIDAml_extensions.py' )
- super(TrigInDetdictStep, self).configure(test)
-
-
+ os.system( 'get_files -data TIDAbeam.dat &> /dev/null' )
+ os.system( 'get_files -data Test_bin.dat &> /dev/null' )
+ os.system( 'get_files -data Test_bin_larged0.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-chains-run3.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAhisto-panel.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAhisto-panel-vtx.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAhistos-vtx.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3-larged0.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3-larged0-el.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata_cuts.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3-offline.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3-offline-larged0.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3-offline-larged0-el.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata-run3-offline-vtx.dat &> /dev/null' )
+ os.system( 'get_files -data TIDAdata_cuts-offline.dat &> /dev/null' )
+ os.system( 'get_files -jo TIDAml_extensions.py &> /dev/null' )
+ super(TrigInDetRdictStep, self).configure(test)
+
+
+def json_chains( slice ) :
+ json_file = 'TrigInDetValidation/comparitor.json'
+ json_fullpath = FindFile(json_file, os.environ['DATAPATH'].split(os.pathsep), os.R_OK)
+
+ if not json_fullpath:
+ print('Failed to determine full path for input JSON %s', json_file)
+ return None
+
+ with open(json_fullpath) as f:
+ data = json.load(f)
+
+ chainmap = data[slice]
+
+ return chainmap['chains']
@@ -158,76 +200,25 @@ class TrigInDetCompStep(RefComparisonStep):
'''
Execute TIDAcomparitor for data.root files.
'''
- def __init__( self, name='TrigInDetComp', level='', slice='', input_file='data-hists.root', type='truth', lowpt=False ):
+ def __init__( self, name='TrigInDetComp', slice=None, args=None, file=None, reference=None ):
super(TrigInDetCompStep, self).__init__(name)
-
- self.input_file = input_file
- # self.output_dir = 'HLT-plots'
- self.output_dir = ''
-
- if level == '' :
- raise Exception( 'no level specified' )
-
- if slice == '' :
- raise Exception( 'no slice specified' )
-
- self.level = level
- self.slice = slice
- self.lowpt = lowpt
- self.type = type
- self.chains = ' '
- self.args = ' --oldrms -c TIDAhisto-panel.dat '
- self.test = ' '
+ if reference is None :
+ self.reference = file # do we need this any more ???
+ self.args = args + " " + file + " " + file + " --noref --oldrms "
+ else:
+ self.reference = reference
+ self.args = args + " " + file + " " + reference + " --oldrms "
+ self.slice = slice
self.auto_report_result = True
self.required = True
+
self.executable = 'TIDAcomparitor'
def configure(self, test):
-
- json_file = 'TrigInDetValidation/comparitor.json'
- json_fullpath = FindFile(json_file, os.environ['DATAPATH'].split(os.pathsep), os.R_OK)
-
- if not json_fullpath:
- print('Failed to determine full path for input JSON %s', json_file)
- return None
-
- with open(json_fullpath) as f:
- data = json.load(f)
-
- self.output_dir = 'HLT'+self.level+'-plots'
-
- flag = self.level+self.slice
-
- if (self.lowpt):
- self.output_dir = self.output_dir+'-lowpt'
- flag = flag+'Lowpt'
-
- data_object = data[flag]
-
- self.chains = data_object['chains']
-
- # what is all this doing ? does it need to be so complicated ?
-
- if (self.test=='ttbar'):
- self.output_dir = self.output_dir+"-"+self.slice
-
- if (self.type == 'offline'):
- self.output_dir = self.output_dir+'-offline'
- self.input_file = 'data-hists-offline.root'
-
- self.args += self.input_file + ' '
-
- if (self.reference is None):
- # if no reference found, use input file as reference - athout it doesn't matter - could use --noref
- self.args += self.input_file + ' '
- else:
- self.args += self.ref_file + ' '
-
- self.args += self.chains + ' -d ' + self.output_dir
-
- print( "TIDAComparitor " + self.args )
-
+ self.chains = json_chains( self.slice )
+ self.args += " " + self.chains
+ print( "\033[0;32mTIDAcomparitor "+self.args+" \033[0m" )
super(TrigInDetCompStep, self).configure(test)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetOldArtSteps.py
similarity index 70%
rename from Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py
rename to Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetOldArtSteps.py
index 9be14b5c66a8980c05f5a861ae2cb02aca59ce53..ac024978f5920afa136abeded50083e9e53ba1a9 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetOldArtSteps.py
@@ -35,7 +35,6 @@ class TrigInDetReco(ExecStep):
self.slices = []
self.preexec_trig = ' '
self.postinclude_trig = postinclude_file
- self.release = 'latest'
self.preexec_reco = ';'.join([
'from RecExConfig.RecFlags import rec',
'rec.doForwardDet=False',
@@ -60,9 +59,8 @@ class TrigInDetReco(ExecStep):
])
self.postexec_trig = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.RDO_TRIG=100000000000']"
-
self.postexec_reco = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.ESD=100000000000']"
- self.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG"'
+ self.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" --asetup "RAWtoESD:Athena,22.0.20" "ESDtoAOD:Athena,22.0.20" '
def configure(self, test):
@@ -102,25 +100,6 @@ class TrigInDetReco(ExecStep):
chains += ']'
self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains
- if (self.release == 'current'):
- print( "Using current release for offline Reco steps " )
- else:
- # get the current atlas base release, and the previous base release
- import os
- DVERSION=os.getenv('Athena_VERSION')
- if (self.release == 'latest'):
- if ( DVERSION is None ) :
- AVERSION = "22.0.20"
- else:
- BASE=DVERSION[:5]
- SUB=int(DVERSION[5:])
- SUB -= 1
- AVERSION=BASE+str(SUB)
- else:
- AVERSION = self.release
- self.args += ' --asetup "RAWtoESD:Athena,'+AVERSION+'" "ESDtoAOD:Athena,'+AVERSION+'" '
- print( "remapping athena base release version for offline Reco steps: ", DVERSION, " -> ", AVERSION )
-
self.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};" "ESDtoAOD:{:s};"'.format(
self.preexec_trig, self.preexec_all, self.preexec_reco, self.preexec_aod)
@@ -147,47 +126,31 @@ class TrigInDetAna(AthenaCheckerStep):
# Additional post-processing steps
##################################################
-class TrigInDetRdictStep(Step):
+class TrigInDetdictStep(Step):
'''
Execute TIDArdict for TrkNtuple files.
'''
- def __init__(self, name='TrigInDetdict', args=None ):
- super(TrigInDetRdictStep, self).__init__(name)
- self.args=args + " -b Test_bin.dat "
+ def __init__(self, name='TrigInDetdict', reference='Truth' ):
+ super(TrigInDetdictStep, self).__init__(name)
+ self.args=' '
self.auto_report_result = True
self.required = True
+ self.reference = reference
self.executable = 'TIDArdict'
def configure(self, test):
- os.system( 'get_files -data TIDAbeam.dat &> /dev/null' )
- os.system( 'get_files -data Test_bin.dat &> /dev/null' )
- os.system( 'get_files -data TIDAdata-chains-run3.dat &> /dev/null' )
- os.system( 'get_files -data TIDAhisto-panel.dat &> /dev/null' )
- os.system( 'get_files -data TIDAhisto-panel-vtx.dat &> /dev/null' )
- os.system( 'get_files -data TIDAhistos-vtx.dat &> /dev/null' )
- os.system( 'get_files -data TIDAdata-run3.dat &> /dev/null' )
- os.system( 'get_files -data TIDAdata_cuts.dat &> /dev/null' )
- os.system( 'get_files -data TIDAdata-run3-offline.dat &> /dev/null' )
- os.system( 'get_files -data TIDAdata-run3-offline-vtx.dat &> /dev/null' )
- os.system( 'get_files -data TIDAdata_cuts-offline.dat &> /dev/null' )
- os.system( 'get_files -jo TIDAml_extensions.py &> /dev/null' )
- super(TrigInDetRdictStep, self).configure(test)
-
-
-def json_chains( slice ) :
- json_file = 'TrigInDetValidation/comparitor.json'
- json_fullpath = FindFile(json_file, os.environ['DATAPATH'].split(os.pathsep), os.R_OK)
-
- if not json_fullpath:
- print('Failed to determine full path for input JSON %s', json_file)
- return None
-
- with open(json_fullpath) as f:
- data = json.load(f)
-
- chainmap = data[slice]
-
- return chainmap['chains']
+ os.system( 'get_files -data TIDAbeam.dat' )
+ os.system( 'get_files -data Test_bin.dat' )
+ os.system( 'get_files -data TIDAdata-chains-run3.dat' )
+ os.system( 'get_files -data TIDAhisto-panel.dat' )
+ os.system( 'get_files -data TIDAdata-run3.dat' )
+ os.system( 'get_files -data TIDAdata_cuts.dat' )
+ os.system( 'get_files -data TIDAdata-run3-offline.dat' )
+ os.system( 'get_files -data TIDAdata_cuts-offline.dat' )
+ os.system( 'get_files -jo TIDAml_extensions.py' )
+ super(TrigInDetdictStep, self).configure(test)
+
+
@@ -195,25 +158,76 @@ class TrigInDetCompStep(RefComparisonStep):
'''
Execute TIDAcomparitor for data.root files.
'''
- def __init__( self, name='TrigInDetComp', slice=None, args=None, file=None, reference=None ):
+ def __init__( self, name='TrigInDetComp', level='', slice='', input_file='data-hists.root', type='truth', lowpt=False ):
super(TrigInDetCompStep, self).__init__(name)
- if reference is None :
- self.reference = file # do we need this any more ???
- self.args = args + " " + file + " " + file + " --noref --oldrms "
- else:
- self.reference = reference
- self.args = args + " " + file + " " + reference + " --oldrms "
- self.slice = slice
+
+ self.input_file = input_file
+ # self.output_dir = 'HLT-plots'
+ self.output_dir = ''
+
+ if level == '' :
+ raise Exception( 'no level specified' )
+
+ if slice == '' :
+ raise Exception( 'no slice specified' )
+
+ self.level = level
+ self.slice = slice
+ self.lowpt = lowpt
+ self.type = type
+ self.chains = ' '
+ self.args = ' --oldrms -c TIDAhisto-panel.dat '
+ self.test = ' '
self.auto_report_result = True
self.required = True
-
self.executable = 'TIDAcomparitor'
def configure(self, test):
- self.chains = json_chains( self.slice )
- self.args += " " + self.chains
- print( "\033[0;32mTIDAcomparitor "+self.args+" \033[0m" )
+
+ json_file = 'TrigInDetValidation/comparitor.json'
+ json_fullpath = FindFile(json_file, os.environ['DATAPATH'].split(os.pathsep), os.R_OK)
+
+ if not json_fullpath:
+ print('Failed to determine full path for input JSON %s', json_file)
+ return None
+
+ with open(json_fullpath) as f:
+ data = json.load(f)
+
+ self.output_dir = 'HLT'+self.level+'-plots'
+
+ flag = self.level+self.slice
+
+ if (self.lowpt):
+ self.output_dir = self.output_dir+'-lowpt'
+ flag = flag+'Lowpt'
+
+ data_object = data[flag]
+
+ self.chains = data_object['chains']
+
+ # what is all this doing ? does it need to be so complicated ?
+
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+"-"+self.slice
+
+ if (self.type == 'offline'):
+ self.output_dir = self.output_dir+'-offline'
+ self.input_file = 'data-hists-offline.root'
+
+ self.args += self.input_file + ' '
+
+ if (self.reference is None):
+ # if no reference found, use input file as reference - athout it doesn't matter - could use --noref
+ self.args += self.input_file + ' '
+ else:
+ self.args += self.ref_file + ' '
+
+ self.args += self.chains + ' -d ' + self.output_dir
+
+ print( "TIDAComparitor " + self.args )
+
super(TrigInDetCompStep, self).configure(test)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
old mode 100755
new mode 100644
index 77bc6865110a7a907a2730a67c13e909061114a9..41efe587db3d12154c6f6979b7281cc78658678f
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
@@ -1,9 +1,6 @@
### #!/usr/bin/env python
-
-
# Slices = ['fsjet']
-# RunEF = False
# Events = 10
# Threads = 1
# Slots = 1
@@ -13,13 +10,13 @@
import re
from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetRdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
import sys,getopt
try:
- opts, args = getopt.getopt(sys.argv[1:],"lcxpn:",["local","config"])
+ opts, args = getopt.getopt(sys.argv[1:],"lcxptn:",["local","config"])
except getopt.GetoptError:
print("Usage: ")
print("-l(--local) run locally with input file from art eos grid-input")
@@ -27,24 +24,20 @@ except getopt.GetoptError:
print("-p run post-processing, even if -x is set")
print("-n N run only on N events per job")
print("-c(--config) run with config_only and print to a pkl file")
+ print("-t test steering, dry run for all steps")
print("")
-
+ sys.exit(1)
Events_local = 0
local = False
exclude = False
postproc = False
testconfig = False
-lowpt_local = []
-
+dry_run = False
-try: GridFiles
-except NameError: GridFiles=False
-if GridFiles==True :
- use_gridfiles = True
-else:
- use_gridfiles = False
+if "Art_type" not in locals(): Art_type = 'grid'
+if "GridFiles" not in locals(): GridFiles=False
for opt,arg in opts:
if opt in ("-l", "--local"):
@@ -57,6 +50,8 @@ for opt,arg in opts:
Events_local=arg
if opt in ("-c", "--config"):
testconfig = True
+ if opt=="-t":
+ dry_run=True
if 'postinclude_file' in dir() :
@@ -70,19 +65,14 @@ rdo2aod.slices = Slices
rdo2aod.threads = Threads
rdo2aod.concurrent_events = Slots
rdo2aod.config_only = testconfig
-
-if "Lowpt" in locals() :
- if isinstance( Lowpt, list ) :
- lowpt_local = Lowpt
- else :
- lowpt_local = [ Lowpt ]
-else :
- lowpt_local = [ False ]
+if 'Release' in dir():
+ rdo2aod.release = Release
if "Args" not in locals() :
Args = " "
+
# allow command line to override programed number of events to process
if Events_local != 0 :
@@ -95,7 +85,7 @@ rdo2aod.perfmon = False
rdo2aod.timeout = 18*3600
rdo2aod.input = Input # defined in TrigValTools/share/TrigValInputs.json
-if use_gridfiles:
+if GridFiles:
if local:
# rdo2aod.input = 'Single_el_larged0' # defined in TrigValTools/share/TrigValInputs.json
rdo2aod.input = Input # should match definition in TrigValTools/share/TrigValInputs.json
@@ -108,7 +98,9 @@ if use_gridfiles:
# Run athena analysis to produce TrkNtuple
test = Test.Test()
-test.art_type = 'grid'
+test.art_type = Art_type
+if dry_run:
+ test.dry_run = True
if (not exclude):
test.exec_steps = [rdo2aod]
test.exec_steps.append(TrigInDetAna())
@@ -116,62 +108,20 @@ if (not exclude):
# Run TIDArdict
-# first make sure that we have a proper list ..
-if isinstance( TrackReference, str ):
- TrackReference = [ TrackReference ]
-
-for ref in TrackReference :
-
- hist_file = 'data-hists.root'
- ext = ''
-
- if ( ref == 'Truth' ) :
- args = 'TIDAdata-run3.dat -b Test_bin.dat -o ' + hist_file + Args
- elif ( ref == 'Offline' ) :
- # if more than one reefrence ...
- if len(TrackReference)>1 :
- hist_file = 'data-hists-offline.root'
- ext = 'offline'
- args = 'TIDAdata-run3-offline.dat -r Offline -b Test_bin.dat -o ' + hist_file
- else :
- # here actually we should allow functionality
- # to use different pdgid truth or offline as
- # a reference:
- # presumably we run offline muons etc as well
- # now in the transform
- raise Exception( 'unknown reference: ', ref )
-
- if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep( name=ref, reference=ref )
- rdict.args = args
- print( "\033[0;32m TIDArdict "+args+" \033[0m" )
+if ((not exclude) or postproc ):
+ for job in Jobs :
+ if len(job) >= 3:
+ rdict = TrigInDetRdictStep( name=job[0], args=job[1], testbin=job[2] )
+ else:
+ rdict = TrigInDetRdictStep( name=job[0], args=job[1] )
+ print( "\n\033[0;32m TIDArdict "+job[1]+" \033[0m" )
test.check_steps.append(rdict)
- # Now the comparitor steps
- # here, the compararitor must know the name of the root file to process
- # we set it in the comparitor job, using the "offline" extension
- # this isn't ideal, since we set the hist file in this code also
- # so really we should pass it in consistently, and the options
- # for the directory names should be unrelated
-
- for slice in Slices :
- for _lowpt in lowpt_local :
-
- stagetag = slice+ext
- if _lowpt :
- stagetag += "-lowpt"
-
- print( "stagetag "+stagetag )
-
- comp1=TrigInDetCompStep( 'Comp_L2'+stagetag, 'L2', slice, type=ext, lowpt=_lowpt )
- test.check_steps.append(comp1)
-
- if ( RunEF ) :
- comp2=TrigInDetCompStep( 'Comp_EF'+stagetag, 'EF', slice, type=ext, lowpt=_lowpt )
- test.check_steps.append(comp2)
-
-
+
+for _slice in Comp :
+ compstep = TrigInDetCompStep( name=_slice[0], slice=_slice[1], file=_slice[2], args=_slice[3] )
+ test.check_steps.append(compstep)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_OldBase.py
old mode 100755
new mode 100644
similarity index 53%
rename from Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py
rename to Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_OldBase.py
index d2de1c9dfbb707bef57e9bf83a1eac32a52970af..4353425c43af238e70463bbfc368a538adab3867
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_OldBase.py
@@ -1,5 +1,7 @@
### #!/usr/bin/env python
+
+
# Slices = ['fsjet']
# RunEF = False
# Events = 10
@@ -10,14 +12,8 @@
import re
-from TrigValTools.TrigValSteering import Test
-from TrigValTools.TrigValSteering import CheckSteps
-
-from TrigInDetValidation.TrigInDetNewArtSteps import TrigInDetReco
-from TrigInDetValidation.TrigInDetNewArtSteps import TrigInDetAna
-from TrigInDetValidation.TrigInDetNewArtSteps import TrigInDetRdictStep
-from TrigInDetValidation.TrigInDetNewArtSteps import TrigInDetCompStep
-from TrigInDetValidation.TrigInDetNewArtSteps import TrigInDetCpuCostStep
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetOldArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
import sys,getopt
@@ -32,13 +28,14 @@ except getopt.GetoptError:
print("-n N run only on N events per job")
print("-c(--config) run with config_only and print to a pkl file")
print("")
- sys.exit(1)
+
Events_local = 0
local = False
exclude = False
postproc = False
testconfig = False
+lowpt_local = []
try: GridFiles
@@ -73,14 +70,19 @@ rdo2aod.slices = Slices
rdo2aod.threads = Threads
rdo2aod.concurrent_events = Slots
rdo2aod.config_only = testconfig
-if 'Release' in dir():
- rdo2aod.release = Release
+
+if "Lowpt" in locals() :
+ if isinstance( Lowpt, list ) :
+ lowpt_local = Lowpt
+ else :
+ lowpt_local = [ Lowpt ]
+else :
+ lowpt_local = [ False ]
if "Args" not in locals() :
Args = " "
-
# allow command line to override programed number of events to process
if Events_local != 0 :
@@ -114,17 +116,62 @@ if (not exclude):
# Run TIDArdict
+# first make sure that we have a proper list ..
+if isinstance( TrackReference, str ):
+ TrackReference = [ TrackReference ]
+
+for ref in TrackReference :
+
+ hist_file = 'data-hists.root'
+ ext = ''
+
+ if ( ref == 'Truth' ) :
+ args = 'TIDAdata-run3.dat -b Test_bin.dat -o ' + hist_file + Args
+ elif ( ref == 'Offline' ) :
+ # if more than one reefrence ...
+ if len(TrackReference)>1 :
+ hist_file = 'data-hists-offline.root'
+ ext = 'offline'
+ args = 'TIDAdata-run3-offline.dat -r Offline -b Test_bin.dat -o ' + hist_file
+ else :
+ # here actually we should allow functionality
+ # to use different pdgid truth or offline as
+ # a reference:
+ # presumably we run offline muons etc as well
+ # now in the transform
+ raise Exception( 'unknown reference: ', ref )
+
+ if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep( name=ref, reference=ref )
+ rdict.args = args
+ print( "\033[0;32m TIDArdict "+args+" \033[0m" )
-if ((not exclude) or postproc ):
- for job in Jobs :
- rdict = TrigInDetRdictStep( name=job[0], args=job[1] )
- print( "\n\033[0;32m TIDArdict "+job[1]+" \033[0m" )
test.check_steps.append(rdict)
-
-for _slice in Comp :
- compstep = TrigInDetCompStep( name=_slice[0], slice=_slice[1], file=_slice[2], args=_slice[3] )
- test.check_steps.append(compstep)
+ # Now the comparitor steps
+ # here, the compararitor must know the name of the root file to process
+ # we set it in the comparitor job, using the "offline" extension
+ # this isn't ideal, since we set the hist file in this code also
+ # so really we should pass it in consistently, and the options
+ # for the directory names should be unrelated
+
+ for slice in Slices :
+ for _lowpt in lowpt_local :
+
+ stagetag = slice+ext
+ if _lowpt :
+ stagetag += "-lowpt"
+
+ print( "stagetag "+stagetag )
+
+ comp1=TrigInDetCompStep( 'Comp_L2'+stagetag, 'L2', slice, type=ext, lowpt=_lowpt )
+ test.check_steps.append(comp1)
+
+ if ( RunEF ) :
+ comp2=TrigInDetCompStep( 'Comp_EF'+stagetag, 'EF', slice, type=ext, lowpt=_lowpt )
+ test.check_steps.append(comp2)
+
+
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
index 8f92f4e743e5f5ce3685c29bac62d1937bdd9910..d924fee9e7f313267622fe8257784af5b7b53095 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
@@ -27,7 +27,7 @@
"chains" : "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF:HLT_Roi_TauCore HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso"
},
"EFtau":{
- "chains" : "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig:HLT_TauIso"
+ "chains" : "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig:HLT_Roi_TauIso"
},
"L2bjet":{
"chains" : "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF"
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py
index a426a5d7604693646bd0e6041239ca7406964c68..d15e4aa40811099f3f00afea99519ba5623109bb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py
@@ -25,16 +25,30 @@
# art-output: *.dat
-Slices = ['muon','electron','tau','bjet']
-RunEF = False
-Events = 4000
+Slices = ['muon','electron','tau','bjet','fsjet']
+Events = 4000
Threads = 8
Slots = 8
+Release = "current"
+
Input = 'ttbar_ID' # defined in TrigValTools/share/TrigValInputs.json
-TrackReference = [ 'Offline' ]
+Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
+Comp = [ ( "L2muon", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ),
+ ( "L2electron", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ),
+ ( "L2tau", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ),
+ ( "L2bjet", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ),
+ ( "EFmuon", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ),
+ ( "EFelectron", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ),
+ ( "EFtau", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ),
+ ( "EFbjet", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ]
+
from AthenaCommon.Include import include
include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py
deleted file mode 100755
index a510619a43950a9c541882e14d09734cfa890819..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: art job for all_ttbar_pu40_new
-# art-type: grid
-# art-include: master/Athena
-# art-athena-mt: 8
-# art-memory: 4096
-# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
-# art-output: *.txt
-# art-output: *.log
-# art-output: log.*
-# art-output: *.out
-# art-output: *.err
-# art-output: *.log.tar.gz
-# art-output: *.new
-# art-output: *.json
-# art-output: *.root
-# art-output: *.check*
-# art-output: HLT*
-# art-output: times*
-# art-output: cost-perCall
-# art-output: cost-perEvent
-# art-output: cost-perCall-chain
-# art-output: cost-perEvent-chain
-# art-output: *.dat
-
-
-Slices = ['muon','electron','tau','bjet','fsjet']
-RunEF = False
-Events = 4000
-Threads = 8
-Slots = 8
-Input = 'ttbar_ID' # defined in TrigValTools/share/TrigValInputs.json
-
-Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -o data-hists-offline.root" ),
- ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -o data-hists-offline-vtx.root" ) ]
-
-Comp = [ ( "L2muon", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ),
- ( "L2electron", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ),
- ( "L2tau", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ),
- ( "L2bjet", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ),
- ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ),
- ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
- ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ),
-
- ( "EFmuon", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ),
- ( "EFelectron", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ),
- ( "EFtau", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ),
- ( "EFbjet", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ]
-
-from AthenaCommon.Include import include
-include("TrigInDetValidation/TrigInDetValidation_NewBase.py")
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_old.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_old.py
index def488af358b44b6b6337202a578b6afe5961f46..c35d261d368d5b7c509f18d4ddef068536b624c7 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_old.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_old.py
@@ -27,7 +27,7 @@
from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+from TrigInDetValidation.TrigInDetOldArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
import sys,getopt
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
index bc4dd8c7eaa060da51f359939ff4f0cb7d3516ec..535cb0fea32e75d58703dcbd83d6ecf317337118 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
@@ -3,7 +3,6 @@
# art-description: art job for all_ttbar_pu80
# art-type: grid
# art-include: master/Athena
-# art-input-nfiles: 3
# art-athena-mt: 8
# art-memory: 4096
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
@@ -26,102 +25,28 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon','electron','tau','bjet','fsjet']
+Events = 4000
+Threads = 8
+Slots = 8
+Input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
+Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
-import sys,getopt
+Comp = [ ( "L2muon", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ),
+ ( "L2electron", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ),
+ ( "L2tau", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ),
+ ( "L2bjet", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ),
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+ ( "EFmuon", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ),
+ ( "EFelectron", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ),
+ ( "EFtau", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ),
+ ( "EFbjet", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ]
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon','electron','tau','bjet']
-rdo2aod.max_events = 4000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-rdo2aod.input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3-offline.dat -r Offline -f data-hists.root -b Test_bin.dat '
- test.check_steps.append(rdict)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-comp.test='ttbar'
-test.check_steps.append(comp)
-
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-comp2.test='ttbar'
-test.check_steps.append(comp2)
-
-
-comp3=TrigInDetCompStep('Comp_L2bjet','L2','bjet')
-comp3.test='ttbar'
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFbjet','EF','bjet')
-comp4.test='ttbar'
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2tau','L2','tau')
-comp5.test='ttbar'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFtau','EF','tau')
-comp6.test='ttbar'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2ele','L2','electron')
-comp7.test='ttbar'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFele','EF','electron')
-comp8.test='ttbar'
-test.check_steps.append(comp8)
-
-comp9=TrigInDetCompStep('Comp_L2FS','L2','FS')
-comp9.test='ttbar'
-test.check_steps.append(comp9)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_short.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_short.py
index d012c8797220469a3bf63250f3231b96cfa1875f..cb3f5d352056a6108e8238eba070fd81c3a34cb6 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_short.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_short.py
@@ -3,7 +3,6 @@
# art-description: art job for all_ttbar_pu80_short
# art-type: grid
# art-include: master/Athena
-# art-input-nfiles: 3
# art-athena-mt: 8
# art-memory: 4096
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
@@ -26,102 +25,28 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon','electron','tau','bjet','fsjet']
+Events = 1000
+Threads = 8
+Slots = 8
+Input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
+Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
-import sys,getopt
+Comp = [ ( "L2muon", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ),
+ ( "L2electron", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ),
+ ( "L2tau", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ),
+ ( "L2bjet", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ),
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+ ( "EFmuon", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ),
+ ( "EFelectron", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ),
+ ( "EFtau", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ),
+ ( "EFbjet", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ]
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon','electron','tau','bjet']
-rdo2aod.max_events = 1000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-rdo2aod.input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3-offline.dat -r Offline -f data-hists.root -b Test_bin.dat '
- test.check_steps.append(rdict)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-comp.test='ttbar'
-test.check_steps.append(comp)
-
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-comp2.test='ttbar'
-test.check_steps.append(comp2)
-
-
-comp3=TrigInDetCompStep('Comp_L2bjet','L2','bjet')
-comp3.test='ttbar'
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFbjet','EF','bjet')
-comp4.test='ttbar'
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2tau','L2','tau')
-comp5.test='ttbar'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFtau','EF','tau')
-comp6.test='ttbar'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2ele','L2','electron')
-comp7.test='ttbar'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFele','EF','electron')
-comp8.test='ttbar'
-test.check_steps.append(comp8)
-
-comp9=TrigInDetCompStep('Comp_L2FS','L2','FS')
-comp9.test='ttbar'
-test.check_steps.append(comp9)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_st.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_st.py
index b54945e9f25f086c44df10b04678bbfed66fd865..78e80ff19b355bbf0667651be771d350ea306c26 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_st.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_st.py
@@ -3,7 +3,6 @@
# art-description: art job for all_ttbar_pu80_st
# art-type: grid
# art-include: master/Athena
-# art-input-nfiles: 3
# art-athena-mt: 4
# art-memory: 4096
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
@@ -26,103 +25,28 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon','electron','tau','bjet','fsjet']
+Events = 1000
+Threads = 1
+Slots = 1
+Input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
+Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
-import sys,getopt
+Comp = [ ( "L2muon", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ),
+ ( "L2electron", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ),
+ ( "L2tau", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ),
+ ( "L2bjet", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ),
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+ ( "EFmuon", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ),
+ ( "EFelectron", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ),
+ ( "EFtau", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ),
+ ( "EFbjet", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ]
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon','electron','tau','bjet']
-rdo2aod.max_events = 1000
-rdo2aod.threads = 1
-rdo2aod.concurrent_events = 1
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-rdo2aod.input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3-offline.dat -r Offline -f data-hists.root -b Test_bin.dat '
- test.check_steps.append(rdict)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-comp.test='ttbar'
-test.check_steps.append(comp)
-
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-comp2.test='ttbar'
-test.check_steps.append(comp2)
-
-
-comp3=TrigInDetCompStep('Comp_L2bjet','L2','bjet')
-comp3.test='ttbar'
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFbjet','EF','bjet')
-comp4.test='ttbar'
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2tau','L2','tau')
-comp5.test='ttbar'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFtau','EF','tau')
-comp6.test='ttbar'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2ele','L2','electron')
-comp7.test='ttbar'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFele','EF','electron')
-comp8.test='ttbar'
-test.check_steps.append(comp8)
-
-comp9=TrigInDetCompStep('Comp_L2FS','L2','FS')
-comp9.test='ttbar'
-test.check_steps.append(comp9)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
index 850c9adf65f4b1f03c11fae83f36d99f618a2074..d881c3ff9b55b75f64c9146de4e855775ead92b9 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
@@ -30,14 +30,19 @@ os.system("echo 'ftf = findAlgorithm(topSequence, \"TrigFastTrackFinder__jet\")'
os.system("echo 'ftf.TripletDoPPS=False' >> dopps.py")
Slices = ['bjet']
-RunEF = True
Events = 4000
Threads = 8
Slots = 8
postinclude_file = 'dopps.py'
Input = 'ttbar_ID' # defined in TrigValTools/share/TrigValInputs.json
-TrackReference = [ 'Truth', 'Offline' ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2bjet", "L2bjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2bjetoffline", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "EFbjet", "EFbjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFbjetoffline", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
from AthenaCommon.Include import include
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py
index 3a9b964b4f7961912c0001bc930c87d0c1c6d985..a99b3d6d885fb0bbf87814b2fe8d73bd0f2bd796 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py
@@ -26,13 +26,18 @@
# art-output: *.dat
Slices = ['bjet']
-RunEF = True
Events = 4000
Threads = 8
Slots = 8
Input = 'ttbar_ID' # defined in TrigValTools/share/TrigValInputs.json
-TrackReference = [ 'Truth', 'Offline' ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2bjet", "L2bjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2bjetoffline", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "EFbjet", "EFbjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFbjetoffline", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
from AthenaCommon.Include import include
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
index bc85b4326011c966f4d375f95d762e963deee836..9c022553168e27827f28326e2d5d6ac2e2bccf94 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
@@ -5,7 +5,7 @@
# art-include: master/Athena
# art-input: mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042
# art-input-nfiles: 16
-# art-athena-mt: 8
+# art-athena-mt: 4
# art-memory: 4096
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
# art-output: *.txt
@@ -27,99 +27,25 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['electron']
+Events = 8000
+Threads = 8
+Slots = 8
+Input = 'Jpsiee_pu40' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
-import sys,getopt
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 11" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 8000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Jpsiee_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
index b29f913f599a92cdb29900eec42ad41a5b06d88b..7e39bc2265ad465b8d325e61ddb1196eb99aa796 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
@@ -27,99 +27,25 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Single_el' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 20000
+Threads = 8
+Slots = 8
+Input = 'Single_el' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 11" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
index c2483367915560813876b685133a75b851ff08f3..c6b34f1ae1a75fd8080ca0068889f38ba541b327 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
@@ -27,99 +27,25 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Single_el_larged0' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 20000
+Threads = 8
+Slots = 8
+Input = 'Single_el_larged0' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
+
+Jobs = [ ( "Truth", " TIDAdata-run3-larged0-el.dat -o data-hists.root -p 11", "Test_bin_larged0.dat" ),
+ ( "Offline", " TIDAdata-run3-offline-larged0-el.dat -r Offline -o data-hists-offline.root", "Test_bin_larged0.dat" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
index 3b730c992d56ebc10f9e139c1a9664cd1032768e..4d139d865c7ed90d75da06e7d52ca9eec5702ffe 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
@@ -27,99 +27,25 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Single_el_larged0_pu' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 20000
+Threads = 8
+Slots = 8
+Input = 'Single_el_larged0_pu' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
+
+Jobs = [ ( "Truth", " TIDAdata-run3-larged0-el.dat -o data-hists.root -p 11", "Test_bin_larged0.dat" ),
+ ( "Offline", " TIDAdata-run3-offline-larged0-el.dat -r Offline -o data-hists-offline.root", "Test_bin_larged0.dat" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
index 6cfc807a53d3c157ffea06d14a509fde84db4a94..8a942ade8f29e647bd599cd8d716f19ac9f1f2ca 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
@@ -27,99 +27,25 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 20000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Single_el_pu' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 20000
+Threads = 8
+Slots = 8
+Input = 'Single_el_pu' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 11" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
index 167ab6ca0a9e1c717278b46e134762544c20bf97..1dce5e61cef882bf5fd18cb60fa16a2a5a70b9b1 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
@@ -27,99 +27,26 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 16000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 16000
+Threads = 8
+Slots = 8
+Input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
+Release = "current"
+GridFiles = True
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 11" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_short.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_short.py
index 067583cddad61c3cc978c1b264f7d868402daa1d..a98d8cffc2fdb3a4a27c2d017f5e87073d949ee0 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_short.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_short.py
@@ -27,99 +27,25 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 8000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 8000
+Threads = 8
+Slots = 8
+Input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 11" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_st.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_st.py
index a219260c528338d94da8ffc239c59fd90c14d0d4..fc93fd30b0354043d4e7900279f2e0c2ba013551 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_st.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_st.py
@@ -27,99 +27,26 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['electron']
-rdo2aod.max_events = 8000
-rdo2aod.threads = 1 # TODO: change to 4
-rdo2aod.concurrent_events = 1 # TODO: change to 4
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2ele','L2','electron')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFele','EF','electron')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
+Slices = ['electron']
+Events = 8000
+Threads = 1
+Slots = 1
+Input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
+Release = "current"
+GridFiles = True
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 11" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2ele", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2ele-lowpt", "L2electronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2eleoffline", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2eleoffline-lowpt", "L2electronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFele", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFele-lowpt", "EFelectronLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFeleoffline", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFeleoffline-lowpt", "EFelectronLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
index f2f3774b7bdcb9a28de1e770f60bcd0e732c8f7c..49fd0d57815e437e96b62637e3c64a4fe2b0d1c7 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
@@ -27,7 +27,6 @@
Slices = ['fsjet']
-RunEF = False
Events = 2000
Threads = 1
Slots = 1 # what about the mt: 4 art directive ? nfiles: 3 ?
@@ -35,7 +34,14 @@ Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
postinclude_file = 'TIDAml_extensions.py'
-TrackReference = [ 'Truth', 'Offline' ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
+
+Comp = [ ( "FSjet", "L2fsjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ) ]
from AthenaCommon.Include import include
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
index bed747938cc0d3335e84282b97744c1c597d7c0c..239bfe93dbb4c564ece5aeedaeca2aeed25fbd61 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# art-description: art job for fsjet_pu40_new
+# art-description: art job for fsjet_nopps_pu40
# art-type: grid
# art-include: master/Athena
# art-input-nfiles: 3
@@ -30,16 +30,15 @@ os.system("echo 'ftf = findAlgorithm(topSequence, \"TrigFastTrackFinder__jet\")'
os.system("echo 'ftf.TripletDoPPS=False' >> dopps.py")
Slices = ['fsjet']
-RunEF = False
Events = 2000
Threads = 8
Slots = 8
postinclude_file = 'dopps.py'
Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
-Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
- ( "Offline", " TIDAdata-run3-offline.dat -o data-hists-offline.root" ),
- ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -o data-hists-offline-vtx.root" ) ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
Comp = [ ( "FSjet", "L2fsjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
@@ -49,7 +48,7 @@ Comp = [ ( "FSjet", "L2fsjet", "data-hists.root", " -c T
from AthenaCommon.Include import include
-include("TrigInDetValidation/TrigInDetValidation_NewBase.py")
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
index 7906c655c0246790e8025323e4dbc124b0f86cb0..c350cca4608f092e7ceb9f0fc950b19a9bec190c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
@@ -27,13 +27,20 @@
Slices = ['fsjet']
-RunEF = False
Events = 2000
Threads = 8
Slots = 8
Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
-TrackReference = [ 'Truth', 'Offline' ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
+
+
+Comp = [ ( "FSjet", "L2fsjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ) ]
from AthenaCommon.Include import include
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_new.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_new.py
deleted file mode 100755
index 0e0eb8d1d45902bddb07736bd0d1e2e71f1554ec..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_new.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: art job for fsjet_pu40_new
-# art-type: grid
-# art-include: master/Athena
-# art-input-nfiles: 3
-# art-athena-mt: 8
-# art-memory: 4096
-# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
-# art-output: *.txt
-# art-output: *.log
-# art-output: log.*
-# art-output: *.out
-# art-output: *.err
-# art-output: *.log.tar.gz
-# art-output: *.new
-# art-output: *.json
-# art-output: *.root
-# art-output: *.check*
-# art-output: HLT*
-# art-output: times*
-# art-output: cost-perCall
-# art-output: cost-perEvent
-# art-output: cost-perCall-chain
-# art-output: cost-perEvent-chain
-# art-output: *.dat
-
-
-Slices = ['fsjet']
-RunEF = False
-Events = 2000
-Threads = 8
-Slots = 8
-Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
-
-Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
- ( "Offline", " TIDAdata-run3-offline.dat -o data-hists-offline.root" ),
- ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -o data-hists-offline-vtx.root" ) ]
-
-
-Comp = [ ( "FSjet", "L2fsjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
- ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
- ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
- ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ) ]
-
-
-from AthenaCommon.Include import include
-include("TrigInDetValidation/TrigInDetValidation_NewBase.py")
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_st.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_st.py
index bded7eec2ff557b6cdae00b8bee641088f3efa15..9a0b6137f8c29cf8ebe097c6798e6214029eecbb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_st.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_st.py
@@ -27,13 +27,19 @@
Slices = ['fsjet']
-RunEF = False
Events = 2000
Threads = 1
Slots = 1 # what about the mt: 4 art directive ? nfiles: 3 ?
Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
-TrackReference = [ 'Truth', 'Offline' ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -r Offline -o data-hists-offline-vtx.root" ) ]
+
+Comp = [ ( "FSjet", "L2fsjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ),
+ ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ) ]
from AthenaCommon.Include import include
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
index 29c48f98f88916ef8b55528af8f1a58b1ad5d3c6..65289fc30f9556b66b2d9bc49ed2d76de4c91132 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
@@ -28,13 +28,16 @@
Slices = ['minbias']
-RunEF = False
Events = 8000
Threads = 8
Slots = 8
Input = 'minbias' # defined in TrigValTools/share/TrigValInputs.json
-TrackReference = [ 'Truth', 'Offline' ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2minbias", "L2minbias", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2minbiasoffline", "L2minbias", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ) ]
from AthenaCommon.Include import include
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
index c3fd1df819ee88629efd44352f13821f3f251d51..932606d97b49103de8481da3ad44b46a45c14a2c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
@@ -25,94 +25,27 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon']
+Events = 6000
+Threads = 8
+Slots = 8
+Input = 'Bphys_JpsiPhi' # defined in TrigValTools/share/TrigValInputs.json
-import sys,getopt
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 13" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2muon-lowpt", "L2muonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2muonoffline", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFmuon-lowpt", "EFmuonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFmuonoffline", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 6000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-rdo2aod.input = 'Bphys_JpsiPhi' # defined in TrigValTools/share/TrigValInputs.json
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
index 3fe507c6da70a90d0a0fd6ce5cdfcf08f42ed72d..79a90f3c27218818d508b2214689361e7d0dc5bc 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-# art-description: art job for mu_singlemu_larged0_pu
+# art-description: art job for mu_singlemu_larged0
# art-type: grid
# art-include: master/Athena
-# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772
+# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728
# art-input-nfiles: 10
# art-athena-mt: 8
# art-memory: 4096
@@ -27,99 +27,28 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon']
+Events = 20000
+Threads = 8
+Slots = 8
+Input = 'Single_mu_larged0' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
-import sys,getopt
+Jobs = [ ( "Truth", " TIDAdata-run3-larged0.dat -o data-hists.root -p 13", "Test_bin_larged0.dat" ),
+ ( "Offline", " TIDAdata-run3-offline-larged0.dat -r Offline -o data-hists-offline.root", "Test_bin_larged0.dat" ) ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2muon-lowpt", "L2muonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2muonoffline", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFmuon-lowpt", "EFmuonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFmuonoffline", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 20000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Single_mu_larged0_pu' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
index 1f955a0f5bbcb22b185a87fe940450fc16f7f173..da177d05348c94093be2dbf7ad252a74a7965316 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
@@ -3,7 +3,7 @@
# art-description: art job for mu_singlemu_larged0_pu
# art-type: grid
# art-include: master/Athena
-# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728
+# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772
# art-input-nfiles: 10
# art-athena-mt: 8
# art-memory: 4096
@@ -27,99 +27,28 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon']
+Events = 20000
+Threads = 8
+Slots = 8
+Input = 'Single_mu_larged0_pu' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
-import sys,getopt
+Jobs = [ ( "Truth", " TIDAdata-run3-larged0.dat -o data-hists.root -p 13", "Test_bin_larged0.dat" ),
+ ( "Offline", " TIDAdata-run3-offline-larged0.dat -r Offline -o data-hists-offline.root", "Test_bin_larged0.dat" ) ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2muon-lowpt", "L2muonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2muonoffline", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFmuon-lowpt", "EFmuonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFmuonoffline", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 20000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Single_mu_larged0' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offline'
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offline'
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
index 4e9c9c5a13d01fcf5304564b4447886386441297..a89bdac87da5e39eb16965a669ca159c182c6fce 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
@@ -28,16 +28,24 @@
Slices = ['muon']
-RunEF = True
Events = 8000
Threads = 8
Slots = 8
Input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
GridFiles=True
-Args = " -p 13 "
-TrackReference = [ 'Truth', 'Offline' ]
-Lowpt = [ False, True ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 13" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2muon-lowpt", "L2muonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2muonoffline", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFmuon-lowpt", "EFmuonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFmuonoffline", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
from AthenaCommon.Include import include
include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
index 93fb82a789b1682654d9f4a420d97b381796760b..1467d3d2f4e9d0fef355fb2756cf775dea0fa192 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
@@ -4,67 +4,22 @@
# art-type: build
# art-include: master/Athena
-import sys,getopt
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print ("-x don't run athena or post post-processing, only plotting")
- print ("-p run post-processing, even if -x is set")
+Slices = ['muon']
+Events = 100
+Threads = 1
+Slots = 1
+Input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
+Art_type= 'build'
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 13" ) ]
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ) ]
-
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 100 # TODO: 2000 events
-rdo2aod.threads = 1 # TODO: change to 4
-rdo2aod.concurrent_events = 1 # TODO: change to 4
-rdo2aod.perfmon = False
-rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-test = Test.Test()
-test.art_type = 'build'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
-
-# Now the comparitor steps
-comp=TrigInDetCompStep( 'Comp_L2muon', 'L2', 'muon' )
-comp.flag = 'L2muon'
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep( 'Comp_EFmuon', 'EF', 'muon' )
-comp2.flag = 'EFmuon'
-test.check_steps.append(comp2)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt-old.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt-old.py
deleted file mode 100755
index 59d3c9157039750270ecbd2419b3cf5ec9a73999..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt-old.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: art job for mu_Zmumu_pu40_mt-old
-# art-type: grid
-# art-include: master/Athena
-# art-input: mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143
-# art-input-nfiles: 4
-# art-athena-mt: 4
-# art-memory: 4096
-# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
-# art-output: *.txt
-# art-output: *.log
-# art-output: log.*
-# art-output: *.out
-# art-output: *.err
-# art-output: *.log.tar.gz
-# art-output: *.new
-# art-output: *.json
-# art-output: *.root
-# art-output: *.check*
-# art-output: HLT*
-# art-output: times*
-# art-output: cost-perCall
-# art-output: cost-perEvent
-# art-output: cost-perCall-chain
-# art-output: cost-perEvent-chain
-# art-output: *.dat
-
-
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
-
-import sys,getopt
-
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
-
-
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 8000
-rdo2aod.threads = 4
-rdo2aod.concurrent_events = 4
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep('TrigInDetDict')
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp3.type = 'offline'
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp4.type = 'offline'
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offline'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offline'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_short.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_short.py
index 296bd53e6e459b274d6e85435d5246918870f40e..6b61a0f3c1c8a3283870b9b8ee498dee3ecec8aa 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_short.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_short.py
@@ -28,16 +28,24 @@
Slices = ['muon']
-RunEF = True
Events = 2000
Threads = 8
Slots = 8
Input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
GridFiles=True
-Args = " -p 13 "
-TrackReference = [ 'Truth', 'Offline' ]
-Lowpt = [ False, True ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 13" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2muon-lowpt", "L2muonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2muonoffline", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFmuon-lowpt", "EFmuonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFmuonoffline", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
from AthenaCommon.Include import include
include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_st.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_st.py
index 6a5a726e71f453d0f5c1424090c995977e94583b..af19f978666e35df20fac553784112eb91878720 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_st.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_st.py
@@ -28,16 +28,24 @@
Slices = ['muon']
-RunEF = True
Events = 2000
Threads = 1
Slots = 1
Input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
GridFiles=True
-Args = " -p 13 "
-TrackReference = [ 'Truth', 'Offline' ]
-Lowpt = [ False, True ]
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root -p 13" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2muon-lowpt", "L2muonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt " ),
+ ( "L2muonoffline", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "L2muonoffline-lowpt", "L2muonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-lowpt-offline " ),
+ ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFmuon-lowpt", "EFmuonLowpt", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt " ),
+ ( "EFmuonoffline", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ),
+ ( "EFmuonoffline-lowpt", "EFmuonLowpt", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-lowpt-offline " ) ]
+
from AthenaCommon.Include import include
include("TrigInDetValidation/TrigInDetValidation_Base.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
index 8dbd12f05f003d319a5c3e1180ad4c747d3fe787..cc6b814541c1c3f4903e00cd62083fc7e049cec5 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# art-description: art job for mu_ztautau_pu46
+# art-description: art job for tau_ztautau_pu46
# art-type: grid
# art-include: master/Athena
# art-athena-mt: 8
@@ -25,70 +25,22 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['tau']
+Events = 6000
+Threads = 8
+Slots = 8
+Release = "current"
+Input = 'Ztautau_pu46' # defined in TrigValTools/share/TrigValInputs.json
-import sys,getopt
+Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ) ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+Comp = [ ( "L2tau", "L2tau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "EFtau", "EFtau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "L2tauOff", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "EFtauOff", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['tau']
-rdo2aod.max_events = 6000
-rdo2aod.threads = 8
-rdo2aod.concurrent_events = 8
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-rdo2aod.input = 'Ztautau_pu46' # defined in TrigValTools/share/TrigValInputs.json
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -b Test_bin.dat '
- test.check_steps.append(rdict)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2tau','L2','tau')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFtau','EF','tau')
-test.check_steps.append(comp2)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_new.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_new.py
deleted file mode 100755
index 8307c10bbeffd84e193c40bb394bab3693fa12d7..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_new.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: art job for tau_ztautau_pu46_new
-# art-type: grid
-# art-include: master/Athena
-# art-athena-mt: 8
-# art-memory: 4096
-# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
-# art-output: *.txt
-# art-output: *.log
-# art-output: log.*
-# art-output: *.out
-# art-output: *.err
-# art-output: *.log.tar.gz
-# art-output: *.new
-# art-output: *.json
-# art-output: *.root
-# art-output: *.check*
-# art-output: HLT*
-# art-output: times*
-# art-output: cost-perCall
-# art-output: cost-perEvent
-# art-output: cost-perCall-chain
-# art-output: cost-perEvent-chain
-# art-output: *.dat
-
-
-Slices = ['tau']
-Events = 6000
-Threads = 8
-Slots = 8
-Input = 'Ztautau_pu46' # defined in TrigValTools/share/TrigValInputs.json
-
-Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -o data-hists-offline.root" ),
- ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ) ]
-
-
-Comp = [ ( "L2tau", "L2tau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
- ( "EFtau", "EFtau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
- ( "L2tauOff", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
- ( "EFtauOff", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
-
-from AthenaCommon.Include import include
-include("TrigInDetValidation/TrigInDetValidation_NewBase.py")
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_st.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_st.py
index c89cacfa0b7bdcb9e6b58bacd508b0e55d13ada6..abd7eda34e4f69c1a019c406fac766bdb4f47726 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_st.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46_st.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# art-description: art job for mu_ztautau_pu46_st
+# art-description: art job for tau_ztautau_pu46_st
# art-type: grid
# art-include: master/Athena
# art-athena-mt: 4
@@ -25,70 +25,22 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['tau']
+Events = 6000
+Threads = 1
+Slots = 1
+Release = "current"
+Input = 'Ztautau_pu46' # defined in TrigValTools/share/TrigValInputs.json
-import sys,getopt
+Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ),
+ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ) ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+Comp = [ ( "L2tau", "L2tau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "EFtau", "EFtau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "L2tauOff", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "EFtauOff", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['tau']
-rdo2aod.max_events = 6000
-rdo2aod.threads = 1
-rdo2aod.concurrent_events = 1
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-rdo2aod.input = 'Ztautau_pu46' # defined in TrigValTools/share/TrigValInputs.json
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep()
- rdict.args='TIDAdata-run3.dat -f data-hists.root -b Test_bin.dat '
- test.check_steps.append(rdict)
-
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2tau','L2','tau')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFtau','EF','tau')
-test.check_steps.append(comp2)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index f65e1d943e70771a8b627bfdf123a22df8f5a4cb..1ebe02cdf9ac01b9ef36c13acdafcb773a658a40 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -107,7 +107,7 @@ class InputDependentStep(Step):
self.report_result()
return self.result, '# (internal) {} -> failed'.format(self.name)
- if not os.path.isfile(self.input_file):
+ if not dry_run and not os.path.isfile(self.input_file):
self.log.debug('Skipping %s because %s does not exist',
self.name, self.input_file)
self.result = 0
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 571575bba8b21bcd209ca1dee45c2257cb1f3f7f..0a890b8b9c5e8986cb283434ae2ccda877e384f0 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -318,22 +318,36 @@ HLT_cscmon_CSCPEB_L1All:
0: 20
HLT_e12_lhloose_2mu10_L12MU10:
eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 2
- 1: 5
HLT_e140_lhloose_L1EM22VHI:
eventCount: 0
HLT_e140_lhloose_nod0_L1EM22VHI:
eventCount: 0
HLT_e17_lhloose_mu14_L1EM15VH_MU10:
eventCount: 0
+HLT_e17_lhvloose_L1EM15VH:
+ eventCount: 0
+HLT_e17_lhvloose_L1EM15VHI:
+ eventCount: 0
+HLT_e17_lhvloose_gsf_L1EM15VHI:
+ eventCount: 0
HLT_e17_lhvloose_nod0_L1EM15VH:
eventCount: 0
HLT_e17_lhvloose_nod0_L1EM15VHI:
eventCount: 0
+HLT_e20_lhmedium_e15_idperf_Zee_L12EM3:
+ eventCount: 12
+ stepCounts:
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 12
+ 4: 12
+ stepFeatures:
+ 0: 47
+ 1: 106
+ 2: 74
+ 3: 37
+ 4: 37
HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
eventCount: 0
HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH:
@@ -344,6 +358,8 @@ HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH:
eventCount: 0
HLT_e24_lhvloose_L1EM20VH:
eventCount: 0
+HLT_e24_lhvloose_gsf_L1EM20VH:
+ eventCount: 0
HLT_e26_etcut_L1EM22VHI:
eventCount: 1
stepCounts:
@@ -356,6 +372,18 @@ HLT_e26_etcut_L1EM22VHI:
1: 1
2: 1
3: 1
+HLT_e26_idperf_L1EM24VHI:
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 4
+ 3: 1
HLT_e26_lhloose_L1EM15VH:
eventCount: 0
HLT_e26_lhloose_L1EM22VHI:
@@ -372,6 +400,8 @@ HLT_e26_lhtight_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_gsf_L1EM22VHI:
eventCount: 0
+HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI:
+ eventCount: 0
HLT_e26_lhtight_ivarloose_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarmedium_L1EM22VHI:
@@ -382,6 +412,18 @@ HLT_e26_lhtight_nod0_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_nod0_L1EM24VHI:
eventCount: 0
+HLT_e28_idperf_L1EM24VHI:
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 4
+ 3: 1
HLT_e300_etcut_L1EM22VHI:
eventCount: 0
HLT_e3_etcut1step_g5_etcut_L12EM3:
@@ -418,6 +460,18 @@ HLT_e5_etcut_L1EM3:
1: 54
2: 41
3: 27
+HLT_e5_idperf_L1EM3:
+ eventCount: 13
+ stepCounts:
+ 0: 15
+ 1: 13
+ 2: 13
+ 3: 13
+ stepFeatures:
+ 0: 49
+ 1: 40
+ 2: 74
+ 3: 38
HLT_e5_lhloose_L1EM3:
eventCount: 0
stepCounts:
@@ -478,6 +532,18 @@ HLT_e5_lhtight_L1EM3:
1: 17
2: 11
3: 8
+HLT_e5_lhtight_gsf_L1EM3:
+ eventCount: 0
+ stepCounts:
+ 0: 9
+ 1: 7
+ 2: 6
+ 3: 6
+ stepFeatures:
+ 0: 17
+ 1: 17
+ 2: 11
+ 3: 8
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 0
stepCounts:
@@ -614,6 +680,8 @@ HLT_g35_loose_mu18_L1EM24VHI:
eventCount: 0
HLT_g35_medium_g25_medium_L12EM20VH:
eventCount: 0
+HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI:
+ eventCount: 0
HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
eventCount: 0
HLT_g3_loose_LArPEB_L1EM3:
@@ -686,6 +754,12 @@ HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20:
eventCount: 0
HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20:
eventCount: 0
+HLT_j0_fbdjshared_L1J20:
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 9
HLT_j0_perf_L1J12_EMPTY:
eventCount: 8
stepCounts:
@@ -693,11 +767,11 @@ HLT_j0_perf_L1J12_EMPTY:
stepFeatures:
0: 127
HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 1
stepFeatures:
- 0: 17
+ 0: 9
HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100:
eventCount: 0
HLT_j260_320eta490_L1J20:
@@ -726,6 +800,12 @@ HLT_j360_subjesgscIS_ftf_bdl1r77_split_L1J100:
eventCount: 0
HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100:
eventCount: 0
+HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
+ eventCount: 7
+ stepCounts:
+ 0: 7
+ stepFeatures:
+ 0: 103
HLT_j420_L1J100:
eventCount: 0
HLT_j420_pf_subresjesgscIS_ftf_L1J100:
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py
index 49fc8d4055ec35bfb6203266f31868754b6d6041..06dcff8641de9916792fc06ae2d46b4ffcbb6cf7 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun2.py
@@ -137,7 +137,7 @@ RemoveEgammaIsoVariables = ".-"+identifier.join(UnusedEgammaIsoVariables)
# Add Dynamic Var
identifierAdd = "."
-l2saVariableToAdd = ['mdtHitId','cscHitResolution']
+l2saVariableToAdd = []
addL2saVars = "." + identifierAdd.join(l2saVariableToAdd)
# temporary functionality to discover version of EDM
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 2b2c6f4cb2d3f994443a7c30bcd88eb6f2132bd4..c2a0d7f5437dd1ce957cfdd950caa17c1918bb9c 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -510,8 +510,8 @@ TriggerHLTListRun3 = [
# MinBias
- ('xAOD::TrackParticleContainer#HLT_IDTrack_MinBias_FTF', 'BS ESD AODFULL', 'MinBias', 'inViews:TrkView'),
- ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_MinBias_FTFAux.', 'BS ESD AODFULL', 'MinBias'),
+ ('xAOD::TrackParticleContainer#HLT_IDTrack_MinBias_IDTrig', 'BS ESD AODFULL', 'MinBias', 'inViews:TrkView'),
+ ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_MinBias_IDTrigAux.', 'BS ESD AODFULL', 'MinBias'),
# Cosmic
@@ -526,7 +526,7 @@ TriggerHLTListRun3 = [
('ROIB::RoIBResult#*', 'ESD', 'Misc'),
- ('xAOD::TrigCompositeContainer#HLT_SpacePointCounts', 'BS ESD AODFULL AODSLIM', 'MinBias'),
+ ('xAOD::TrigCompositeContainer#HLT_SpacePointCounts', 'BS ESD AODFULL AODSLIM', 'MinBias', 'inViews:SPView'),
('xAOD::TrigCompositeAuxContainer#HLT_SpacePointCountsAux.totNumPixSP.totNumPixCL_1.totNumPixCL_2.totNumPixCLmin3.pixClBarrel.pixClEndcapA.pixClEndcapC.totNumSctSP.SctSpBarrel.SctSpEndcapA.SctSpEndcapC', 'BS ESD AODFULL AODSLIM', 'MinBias'),
('xAOD::TrigCompositeContainer#HLT_TrackCount', 'BS ESD AODFULL AODSLIM', 'MinBias'),
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
index 3ff97c437a6bd13b55c14dc39e40014d84da6094..991c6be2ca25afe411ad08c987b98612d9849b8c 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
@@ -195,10 +195,14 @@ class HLTSimulationGetter(Configured):
if hasattr(TrigSteer_HLT.LvlTopoConverter, 'MuonInputProvider'):
try: # this is temporary until TrigT1Muctpi-00-06-29 is in the release
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1Tool as l1MuctpiTool
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool as l1MuctpiTool
from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += L1MuctpiTool()
- TrigSteer_HLT.LvlTopoConverter.MuonInputProvider.MuctpiSimTool = L1MuctpiTool()
+ ToolSvc += l1MuctpiTool()
+ TrigSteer_HLT.LvlTopoConverter.MuonInputProvider.MuctpiSimTool = l1MuctpiTool()
except ImportError:
pass
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index 614fc8765886daebb1911338a490094ce956fff1..7c79021290520ef90caf61d6528f29b400e2644d 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -130,6 +130,16 @@ def Lvl1SimulationSequence( flags = None ):
ToolSvc += L1MuctpiPhase1Tool("MUCTPI_AthTool")
ToolSvc.MUCTPI_AthTool.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
+ #Add the RecRoiTools
+ from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool
+ from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3TGCRecRoiTool
+ ToolSvc += getRun3RPCRecRoiTool("RPCRecRoiTool")
+ ToolSvc += getRun3TGCRecRoiTool("TGCRecRoiTool")
+
+ ToolSvc.MUCTPI_AthTool.RPCRecRoiTool = ToolSvc.RPCRecRoiTool
+ ToolSvc.MUCTPI_AthTool.TGCRecRoiTool = ToolSvc.TGCRecRoiTool
+
+ #Add the LVL1 config service to the MUCTPI algorithm
muctpi = L1MuctpiPhase1()
muctpi.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
@@ -148,7 +158,7 @@ def Lvl1SimulationSequence( flags = None ):
from MuonRecExample import MuonAlignConfig # noqa: F401
l1MuonSim = seqAND("l1MuonSim", [
-
+
MuonRdoToMuonDigit( "MuonRdoToMuonDigit",
MuonRdoToMuonDigitTool = ToolSvc.MuonRdoToMuonDigitTool),
@@ -158,7 +168,7 @@ def Lvl1SimulationSequence( flags = None ):
RPCbytestream = False,
RPCbytestreamFile = "",
RPCDigitContainer = "RPC_DIGITS_L1"),
-
+
# based on Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
# interesting is that this JO sets inexisting properties, commented out below
LVL1TGCTrigger__LVL1TGCTrigger("LVL1TGCTrigger",
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py
index 5f5e2a9bf8840593430fe94584bc842ab3bb7dbf..217100317d657342b219a1cffd03c18f583ab686 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py
@@ -100,8 +100,13 @@ class Lvl1SimulationGetter (Configured):
import TrigT1TGCRecRoiSvc.TrigT1TGCRecRoiConfig # noqa: F401
import TrigT1RPCsteering.TrigT1RPCsteeringConfig # noqa: F401
import TrigT1TGC.TrigT1TGCConfig # noqa: F401
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
- topSequence += L1Muctpi()
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1
+ topSequence += L1MuctpiPhase1()
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
+ topSequence += L1Muctpi()
if TriggerFlags.doBcm():
from TrigT1BCM.TrigT1BCMConf import LVL1__TrigT1BCM
@@ -167,10 +172,14 @@ class Lvl1SimulationGetter (Configured):
topSequence += L1TopoSimulation()
try: # this is temporary until TrigT1Muctpi-00-06-29 is in the release
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1Tool as l1MuctpiTool
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool as l1MuctpiTool
from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += L1MuctpiTool()
- topSequence.L1TopoSimulation.MuonInputProvider.MuctpiSimTool = L1MuctpiTool()
+ ToolSvc += l1MuctpiTool()
+ topSequence.L1TopoSimulation.MuonInputProvider.MuctpiSimTool = l1MuctpiTool()
except ImportError:
pass
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py
index 5727d0bb3bcd639846526fb557579cdfdf1a0148..9c3462731bdba6c9c21e3ca1801c839b79a2f268 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py
@@ -494,33 +494,8 @@ class optimizeChainOrder(_modifier):
topSequence.TrigSteer_HLT.ExecutionOrderStrategy.order=[ 'name:.+beamspot.+',
'name:.+j.+',
'name:.+2tau.+',
- 'name:.+tau.+' ]
-
-class disablePixels(_modifier):
- """
- Turns off pixels in region selector
- """
- def postSetup(self):
- svcMgr.RegSelSvc.enablePixel=False
-
-class disableSCTBarrel(_modifier):
- """
- Turns off SCT Barrel in region selector and badly mapped ROB
- """
- def postSetup(self):
- svcMgr.RegSelSvc.DeleteSiRobList=range(0x210000,0x21000a+1)+range(0x210100,0x21010a+1)+range(0x220000,0x22000a+1)+range(0x220100,0x22010a+1)+[0x240005]
-
-class disableIBL(_modifier):
- """
- Turn off IBL from readout
- """
-
- def postSetup(self):
- import TrigInDetValidation.InDetModules as IDM
- pixel_barrel_layer1_hashes = IDM.getHashes(IDM.getLayer(IDM.getBarrel(IDM.Pixel),0))
- svcMgr.RegSelSvc.DeletePixelHashList=pixel_barrel_layer1_hashes
- svcMgr.ROBDataProviderSvc.ignoreROB=[1310848, 1310849, 1310850, 1310851, 1310899, 1310944, 1310913, 1310946, 1310929, 1310912, 1310914, 1310736, 1310737, 1310738, 1310739, 1310752, 1310753, 1310754, 1310755, 1310883, 1310897, 1310930, 1310896, 1310898, 1310768, 1310769, 1310770, 1310771, 1310784, 1310785, 1310786, 1310787, 1310867, 1310931, 1310881, 1310880, 1310882, 1310800, 1310801, 1310802, 1310803, 1310816, 1310817, 1310818, 1310819, 1310915, 1310865, 1310864, 1310945, 1310928, 1310866, 1310832, 1310833, 1310834, 1310835, 1310947]
+ 'name:.+tau.+' ]
class disableIBLInTracking(_modifier):
"""
Turn off IBL in tracking algorithms (data still available for PEB etc)
@@ -658,7 +633,11 @@ class rerunLVL1(_modifier):
#rederive MuCTPI inputs to CTP from muon RDO
#writes this to the usual MuCTPICTP storegate location
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_RDO
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1_on_RDO as L1Muctpi_on_RDO
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_RDO
topSequence += L1Muctpi_on_RDO()
topSequence.L1Muctpi_on_RDO.CTPOutputLocID = "L1MuCTPItoCTPLocation"
topSequence.L1Muctpi_on_RDO.RoIOutputLocID = "L1MuCTPItoRoIBLocation"
@@ -670,7 +649,10 @@ class rerunLVL1(_modifier):
topSequence += L1TopoSimulation()
log.info( "adding L1TopoSimulation() to topSequence" )
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1Tool as L1MuctpiTool
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
from AthenaCommon.AppMgr import ToolSvc
ToolSvc += L1MuctpiTool()
topSequence.L1TopoSimulation.MuonInputProvider.MuctpiSimTool = L1MuctpiTool()
@@ -754,7 +736,11 @@ class rerunDMLVL1(_modifier):
#Run MuCTPI simulation (before or after importing DeriveSim??)
#rederive MuCTPI inputs to CTP from muon RDO
#writes this to the usual MuCTPICTP storegate location
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi_on_RDO
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ if ConfigFlags.Trigger.enableL1Phase1:
+ from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import L1MuctpiPhase1_on_RDO as L1Muctpi_on_RDO
+ else:
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiPhase1_on_RDO as L1Muctpi_on_RDO
topSequence += L1Muctpi_on_RDO()
topSequence.L1Muctpi_on_RDO.CTPOutputLocID = "L1MuCTPItoCTPLocation"
topSequence.L1Muctpi_on_RDO.RoIOutputLocID = "L1MuCTPItoRoIBLocation"
@@ -1384,21 +1370,6 @@ class LumiFromSqlite(_modifier):
folders += [f]
svcMgr.IOVDbSvc.Folders = folders
-class LumiRegionZmax168(_modifier):
- """
- decrease the size (equivalent of 3*sigma_z) of luminous region for ID tracking to 168 mm
- """
- def preSetup(self):
- from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import L2IDTrackingCuts
- from AthenaCommon.SystemOfUnits import mm
- L2IDTrackingCuts.setRegSelZmax(168* mm)
-
- def postSetup(self):
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- RegSelSvc=topSequence.allConfigurables.get("RegSelSvcDefault")
- from AthenaCommon.SystemOfUnits import mm
- RegSelSvc.DeltaZ = 168* mm
class useDynamicAlignFolders(_modifier):
"""
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 40450fa9998b3def017ca34a8cc045f310cb818d..43ec20c30fb5ffa9e840dd82a8b584ad1f46a390 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -206,6 +206,10 @@ def createTriggerFlags():
# name of the trigger menu
flags.addFlag('Trigger.triggerMenuSetup', 'LS2_v1')
+ # modify the slection of chains that are run (default run all), see more in GenerateMenuMT_newJO
+
+ flags.addFlag('Trigger.triggerMenuModifier', ['all'])
+
# name of the trigger menu
flags.addFlag('Trigger.generateMenuDiagnostics', False)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerTransBSConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerTransBSConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..2e932fa4a03c7ff108777f7f516420c0635432cc
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerTransBSConfig.py
@@ -0,0 +1,100 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+'''
+ComponentAccumulator configuration for producing transient ByteStream,
+which is required when running HLT selection algorithms on MC RDO inputs
+'''
+
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from ByteStreamCnvSvc.ByteStreamConfig import TransientByteStreamCfg
+
+def triggerTransBSCfg(flags, seqName="AthAlgSeq"):
+ acc = ComponentAccumulator(seqName)
+
+ itemList = [] # Objects to be written to transient BS
+ typeNames = [] # Objects to be read from transient BS
+ extraInputs = [] # Objects to be produced before writing transient BS (scheduler dependency)
+
+ # --------------------------------------------------
+ # Level-1 Trigger
+ # --------------------------------------------------
+ from TrigT1ResultByteStream.TrigT1ResultByteStreamConfig import L1TriggerByteStreamEncoderCfg
+ acc.merge(L1TriggerByteStreamEncoderCfg(flags))
+
+ if flags.Trigger.enableL1CaloLegacy or not flags.Trigger.enableL1Phase1:
+ itemList += ["ROIB::RoIBResult#RoIBResult"]
+ typeNames += ["MuCTPI_RDO/MUCTPI_RDO"]
+ extraInputs += [('ROIB::RoIBResult', 'StoreGateSvc+RoIBResult')]
+
+ if flags.Trigger.enableL1Phase1:
+ itemList += ["xAOD::TrigCompositeContainer#L1TriggerResult",
+ "xAOD::TrigCompositeAuxContainer#L1TriggerResultAux."]
+ extraInputs += [('xAOD::TrigCompositeContainer', 'StoreGateSvc+L1TriggerResult')]
+
+ # --------------------------------------------------
+ # ID
+ # --------------------------------------------------
+ if flags.Trigger.doID:
+ # Pixel
+ itemList += ["PixelRDO_Container#*"]
+ typeNames += ["InDet::PixelClusterContainer/PixelOnlineClusters"]
+ extraInputs += [('PixelHitDiscCnfgData','ConditionStore+PixelHitDiscCnfgData')]
+ extraInputs += [('PixelCablingCondData','ConditionStore+PixelCablingCondData')]
+ # SCT
+ itemList += ["SCT_RDO_Container#*"]
+ typeNames += ["InDet::SCT_ClusterContainer/SCT_OnlineClusters"]
+ extraInputs += [('SCT_CablingData','ConditionStore+SCT_CablingData')]
+ # TRT
+ itemList += ["TRT_RDO_Container#*"]
+ typeNames += ["InDet::TRT_DriftCircleContainer/TRT_DriftCircle"]
+
+ # --------------------------------------------------
+ # Calo
+ # --------------------------------------------------
+ if flags.Trigger.doCalo:
+ # LAr
+ from LArByteStream.LArByteStreamConfig import LArRawDataContByteStreamToolConfig
+ lar_tool = LArRawDataContByteStreamToolConfig(InitializeForWriting=True)
+ acc.addPublicTool(lar_tool)
+ itemList += ["LArRawChannelContainer#*"]
+ extraInputs += [('CaloNoise', 'ConditionStore+totalNoise'),
+ ('LArOnOffIdMapping', 'ConditionStore+LArOnOffIdMap'),
+ ('LArFebRodMapping', 'ConditionStore+LArFebRodMap')]
+ # Tile
+ itemList += ["TileRawChannelContainer#*"]
+ typeNames += ["TileCellIDC/TileCellIDC"]
+ extraInputs += [('TileBadChannels','ConditionStore+TileBadChannels')]
+
+ # --------------------------------------------------
+ # Muon
+ # --------------------------------------------------
+ if flags.Trigger.doMuon:
+ # MDT
+ itemList += ["MdtCsmContainer#*"]
+ typeNames += ["MdtDigitContainer/MDT_DIGITS",
+ "MdtCsmContainer/MDTCSM"]
+ extraInputs += [('MuonMDT_CablingMap','ConditionStore+MuonMDT_CablingMap')]
+ # RPC
+ itemList += ["RpcPadContainer#*"]
+ typeNames += ["RpcDigitContainer/RPC_DIGITS",
+ "RpcPadContainer/RPCPAD"]
+ # TGC
+ itemList += ["TgcRdoContainer#*"]
+ typeNames += ["TgcDigitContainer/TGC_DIGITS",
+ "TgcRdoContainer/TGCRDO"]
+ # CSC
+ itemList += ["CscRawDataContainer#*"]
+ typeNames += ["CscDigitContainer/CSC_DIGITS",
+ "CscRawDataContainer/CSCRDO"]
+
+ # --------------------------------------------------
+ # Final configuration
+ # --------------------------------------------------
+ transBSCfg = TransientByteStreamCfg(
+ flags,
+ item_list=itemList,
+ type_names=typeNames,
+ extra_inputs=extraInputs)
+ acc.merge(transBSCfg, sequenceName=seqName)
+
+ return acc
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 3ea6726e9574e337e36ffe3e2db53ac1eb777cb3..a4c83476b215aea8ed869386404470a00cae023e 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -390,11 +390,6 @@ if ConfigFlags.Input.Format == 'POOL':
import AthenaPoolCnvSvc.ReadAthenaPool # noqa
svcMgr.AthenaPoolCnvSvc.PoolAttributes = [ "DEFAULT_BUFFERSIZE = '2048'" ]
svcMgr.PoolSvc.AttemptCatalogPatch=True
- # enable transient BS
- if ConfigFlags.Trigger.doTransientByteStream:
- log.info("setting up transient BS")
- include( "TriggerJobOpts/jobOfragment_TransBS_standalone.py" )
-
# ----------------------------------------------------------------
# ByteStream input
@@ -469,6 +464,13 @@ if opt.doL1Sim:
from TriggerJobOpts.Lvl1SimulationConfig import Lvl1SimulationSequence
hltBeginSeq += Lvl1SimulationSequence(ConfigFlags)
+# ---------------------------------------------------------------
+# Transient ByteStream
+# ---------------------------------------------------------------
+if ConfigFlags.Trigger.doTransientByteStream:
+ log.info("Configuring transient ByteStream")
+ from TriggerJobOpts.TriggerTransBSConfig import triggerTransBSCfg
+ CAtoGlobalWrapper(triggerTransBSCfg, ConfigFlags, seqName="HLTBeginSeq")
# ---------------------------------------------------------------
# HLT generation
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
index b524cd9622b49b5fa48baa5602963cb029ac25c1..30d9e06a9dc23637fb55a9b431076cc345c068b9 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
from AthenaConfiguration.ComponentAccumulator import CompFactory
@@ -7,29 +7,29 @@ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaCommon.Configurable import Configurable
-Configurable.configurableRun3Behavior=1
+Configurable.configurableRun3Behavior = 1
flags.Detector.GeometryPixel = True
-flags.Detector.GeometrySCT = True
-flags.Detector.GeometryTRT = True
-flags.Detector.GeometryID = True
+flags.Detector.GeometrySCT = True
+flags.Detector.GeometryTRT = True
+flags.Detector.GeometryID = True
flags.Detector.GeometryBpipe = True
flags.Detector.GeometryCavern = False
flags.Detector.GeometryPixel = True
-flags.Detector.GeometrySCT = True
-flags.Detector.GeometryTRT = True
+flags.Detector.GeometrySCT = True
+flags.Detector.GeometryTRT = True
-flags.Detector.GeometryLAr = True
-flags.Detector.GeometryTile = True
-flags.Detector.GeometryMDT = True
-flags.Detector.GeometryTGC = True
-flags.Detector.GeometryCSC = True
-flags.Detector.GeometryRPC = True
+flags.Detector.GeometryLAr = True
+flags.Detector.GeometryTile = True
+flags.Detector.GeometryMDT = True
+flags.Detector.GeometryTGC = True
+flags.Detector.GeometryCSC = True
+flags.Detector.GeometryRPC = True
flags.Detector.RecoPixel = True
-flags.Detector.RecoSCT = True
+flags.Detector.RecoSCT = True
# Output configuration - currently testing offline workflow
@@ -44,17 +44,17 @@ flags.Scheduler.ShowDataFlow = True
flags.Scheduler.ShowControlFlow = True
flags.Scheduler.EnableVerboseViews = True
-flags.Exec.MaxEvents=50
+flags.Exec.MaxEvents = 50
flags.Input.isMC = False
-flags.Common.isOnline=True
-flags.IOVDb.GlobalTag="CONDBR2-HLTP-2018-01"
+flags.Common.isOnline = True
+flags.IOVDb.GlobalTag = "CONDBR2-HLTP-2018-01"
-flags.Concurrency.NumThreads=1
-flags.Concurrency.NumConcurrentEvents=1
+flags.Concurrency.NumThreads = 1
+flags.Concurrency.NumConcurrentEvents = 1
-flags.InDet.useSctDCS=False
-flags.InDet.usePixelDCS=False
+flags.InDet.useSctDCS = False
+flags.InDet.usePixelDCS = False
# command line handling
# options that are defined in: AthConfigFlags are handled here
@@ -65,37 +65,36 @@ flags.fillFromArgs(parser=parser)
flags.lock()
-from AthenaCommon.Constants import INFO,DEBUG,WARNING
-acc = MainServicesCfg( flags )
+from AthenaCommon.Constants import INFO, DEBUG, WARNING
+acc = MainServicesCfg(flags)
acc.getService('AvalancheSchedulerSvc').VerboseSubSlots = True
# this delcares to the scheduer that EventInfo object is produced
-acc.addEventAlgo( CompFactory.SGInputLoader( Load = [( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' )] ),
- "AthAlgSeq" )
+acc.addEventAlgo(CompFactory.SGInputLoader(Load=[('xAOD::EventInfo', 'StoreGateSvc+EventInfo')]), "AthAlgSeq")
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
-acc.merge(ByteStreamReadCfg( flags ))
+acc.merge(ByteStreamReadCfg(flags))
from TriggerJobOpts.TriggerHistSvcConfig import TriggerHistSvcConfig
-acc.merge(TriggerHistSvcConfig( flags ))
+acc.merge(TriggerHistSvcConfig(flags))
from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT_newJO import generateMenu as generateHLTMenu
from TriggerJobOpts.TriggerConfig import triggerRunCfg
-acc.merge( triggerRunCfg( flags, seqName = "AthMasterSeq", menu=generateHLTMenu ) )
+acc.merge(triggerRunCfg(flags, seqName="AthMasterSeq", menu=generateHLTMenu))
from RegionSelector.RegSelConfig import regSelCfg
-acc.merge( regSelCfg( flags ) )
+acc.merge(regSelCfg(flags))
# The L1 presacles do not get created in the avoce menu setup
from TrigConfigSvc.TrigConfigSvcCfg import createL1PrescalesFileFromMenu
createL1PrescalesFileFromMenu(flags)
-acc.getEventAlgo( "TrigSignatureMoniMT" ).OutputLevel=DEBUG
-acc.getEventAlgo( "L1Decoder" ).ctpUnpacker.UseTBPBits=True # test setup
+acc.getEventAlgo("TrigSignatureMoniMT").OutputLevel = DEBUG
+acc.getEventAlgo("L1Decoder").ctpUnpacker.UseTBPBits = True # test setup
@@ -116,10 +115,10 @@ acc.foreach_component("*HLTTop/*GenericMonitoringTool*").OutputLevel = WARNING #
acc.printConfig(withDetails=False, summariseProps=True, printDefaults=True)
-fname = "runHLT_standalone_newJO.pkl"
-print( "Storing config in the file {}".format( fname ) )
-with open(fname, "wb") as p:
- acc.store( p )
+fName = "runHLT_standalone_newJO.pkl"
+print("Storing config in the file {}".format(fName))
+with open(fName, "wb") as p:
+ acc.store(p)
p.close()
status = acc.run()
if status.isFailure():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 7441ed68d8381fe498722cd67bbf68c90d27f715..803be3e5d70539255144d71625cf4a1344368f09 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -24,7 +24,10 @@ def electronFastCaloCfg( flags ):
return fastCaloMenuSequence("Electron", doRinger=True)
def fastElectronSequenceCfg( flags ):
- return fastElectronMenuSequence()
+ return fastElectronMenuSequence(do_idperf=False)
+
+def fastElectronSequenceCfg_idperf( flags ):
+ return fastElectronMenuSequence(do_idperf=True)
def precisionCaloSequenceCfg( flags ):
return precisionCaloMenuSequence('Electron')
@@ -73,6 +76,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
stepDictionary = {
'etcut1step': ['getFastCalo'],
+ 'idperf' : ['getFastCalo', 'getFastElectron_idperf', 'getPrecisionCaloElectron', 'getPrecisionTracking'],
'etcut' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking'],
'lhloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionElectron'],
'lhvloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionElectron'],
@@ -97,15 +101,15 @@ class ElectronChainConfiguration(ChainConfigurationBase):
'lhvloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
'lhmediumgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
'lhtightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhloosegsfivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhloosegsfivarmedium' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhloosegsfivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhmediumgsfivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhmediumgsfivarmedium': ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhmediumgsfivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhtightgsfivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhtightgsfivarmedium' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhtightgsfivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhlooseivarloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhlooseivarmediumgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhlooseivartightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhmediumivarloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhmediumivarmediumgsf': ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhmediumivartightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhtightivarloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhtightivarmediumgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhtightivartightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
}
@@ -143,6 +147,10 @@ class ElectronChainConfiguration(ChainConfigurationBase):
def getFastElectron(self):
stepName = "fast_electron"
return self.getStep(2,stepName,[ fastElectronSequenceCfg])
+
+ def getFastElectron_idperf(self):
+ stepName = "fast_electron_idperf"
+ return self.getStep(2,stepName,[ fastElectronSequenceCfg_idperf])
def getPrecisionCaloElectron(self):
stepName = "precisionCalo_electron"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index 8b0c0fc42cc2de9b0b2a3a929eda2c76a3a7f696..e73acabad95c99ad9b157459a4dbc70197b93c26 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -1,6 +1,7 @@
#
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
+
from AthenaConfiguration.AllConfigFlags import ConfigFlags
# menu components
@@ -36,7 +37,8 @@ def fastElectronSequence(ConfigFlags):
theElectronFex.TrigEMClusterName = CaloMenuDefs.L2CaloClusters
theElectronFex.TrackParticlesName = TrackParticlesName
theElectronFex.ElectronsName=recordable("HLT_FastElectrons")
-
+ theElectronFex.DummyElectronsName= "HLT_FastDummyElectrons"
+
# EVCreator:
l2ElectronViewsMaker = EventViewCreatorAlgorithm("IMl2Electron")
l2ElectronViewsMaker.RoIsLink = "initialRoI" # Merge inputs based on their initial L1 ROI
@@ -57,18 +59,21 @@ def fastElectronSequence(ConfigFlags):
l2ElectronViewsMaker.ViewNodeName = "electronInViewAlgs"
electronAthSequence = seqAND("electronAthSequence", [l2ElectronViewsMaker, electronInViewAlgs ] )
- return (electronAthSequence, l2ElectronViewsMaker, theElectronFex.ElectronsName)
-
-
-def fastElectronMenuSequence():
+ return (electronAthSequence, l2ElectronViewsMaker)
+
+def fastElectronMenuSequence(do_idperf):
""" Creates 2nd step Electron MENU sequence"""
# retrievee the reco seuqence+IM
- (electronAthSequence, l2ElectronViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(fastElectronSequence, ConfigFlags)
+ (electronAthSequence, l2ElectronViewsMaker) = RecoFragmentsPool.retrieve(fastElectronSequence, ConfigFlags)
# make the Hypo
from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaFastElectronHypoAlgMT
- theElectronHypo = TrigEgammaFastElectronHypoAlgMT()
- theElectronHypo.Electrons = sequenceOut
+ if do_idperf is True:
+ theElectronHypo = TrigEgammaFastElectronHypoAlgMT("TrigEgammaFastElectronHypoAlgMT_idperf")
+ theElectronHypo.Electrons = "HLT_FastDummyElectrons"
+ else:
+ theElectronHypo = TrigEgammaFastElectronHypoAlgMT("TrigEgammaFastElectronHypoAlgMT")
+ theElectronHypo.Electrons = "HLT_FastElectrons"
theElectronHypo.RunInView=True
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
index 6c4a49f123ef6ae1440a745938efb5a6485c3b67..7b8eaec2ec0f1ccdd49ffb54572696d92f7ecdc9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -6,6 +6,7 @@ log = logging.getLogger( __name__ )
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, EmptyMenuSequence, RecoFragmentsPool
from TriggerMenuMT.HLTMenuConfig.Menu.MenuAlignmentTools import get_alignment_group_ordering as getAlignmentGroupOrdering
+from DecisionHandling.DecisionHandlingConfig import ComboHypoCfg
from collections import OrderedDict
from copy import deepcopy
import re
@@ -17,7 +18,7 @@ def mergeChainDefs(listOfChainDefs, chainDict):
strategy = chainDict["mergingStrategy"]
offset = chainDict["mergingOffset"]
- log.info("%s: Combine by using %s merging", chainDict['chainName'], strategy)
+ log.info("[mergeChainDefs] %s: Combine by using %s merging", chainDict['chainName'], strategy)
if strategy=="parallel":
return mergeParallel(listOfChainDefs, offset)
@@ -30,7 +31,7 @@ def mergeChainDefs(listOfChainDefs, chainDict):
for ich,cConfig in enumerate(listOfChainDefs):
chain_ag = cConfig.alignmentGroups[0]
if chain_ag not in ordering:
- log.error("Alignment group %s can't be auto-merged because it's not in the grouping list!",chain_ag)
+ log.error("[mergeChainDefs] Alignment group %s can't be auto-merged because it's not in the grouping list!",chain_ag)
if chain_ag in merging_dict:
merging_dict[chain_ag] += [ich]
else:
@@ -53,7 +54,7 @@ def mergeChainDefs(listOfChainDefs, chainDict):
else:
- log.error("Merging failed for %s. Merging strategy '%s' not known.", (listOfChainDefs, strategy))
+ log.error("[mergeChainDefs] Merging failed for %s. Merging strategy '%s' not known.", (listOfChainDefs, strategy))
return -1
@@ -61,8 +62,9 @@ def mergeChainDefs(listOfChainDefs, chainDict):
def mergeParallel(chainDefList, offset):
if offset != -1:
- log.error("Offset for parallel merging not implemented.")
-
+ log.error("[mergeParallel] Offset for parallel merging not implemented.")
+ raise Exception("[mergeParallel] Cannot merge this chain, exiting.")
+
allSteps = []
nSteps = []
chainName = ''
@@ -73,17 +75,18 @@ def mergeParallel(chainDefList, offset):
if chainName == '':
chainName = cConfig.name
elif chainName != cConfig.name:
- log.error("Something is wrong with the combined chain name: cConfig.name = %s while chainName = %s", cConfig.name, chainName)
-
+ log.error("[mergeParallel] Something is wrong with the combined chain name: cConfig.name = %s while chainName = %s", cConfig.name, chainName)
+ raise Exception("[mergeParallel] Cannot merge this chain, exiting.")
allSteps.append(cConfig.steps)
nSteps.append(len(cConfig.steps))
l1Thresholds.extend(cConfig.vseeds)
if len(cConfig.alignmentGroups) > 1:
- log.error("Merging an already merged chain? This is odd! %s",cConfig.alignmentGroups)
+ log.error("[mergeParallel] Parallel merging an already merged chain? This is odd! %s",cConfig.alignmentGroups)
+ raise Exception("[mergeParallel] Complicated situation currently unimplemented. exiting.")
elif len(cConfig.alignmentGroups) == 1:
alignmentGroups.append(cConfig.alignmentGroups[0])
else:
- log.info("Alignment groups are empty for this combined chain - if this is not _newJO, this is not ok!")
+ log.info("[mergeParallel] Alignment groups are empty for this combined chain - if this is not _newJO, this is not ok!")
import itertools
if 'zip_longest' in dir(itertools):
from itertools import zip_longest
@@ -93,17 +96,20 @@ def mergeParallel(chainDefList, offset):
orderedSteps = list(zip_longest(*allSteps))
combChainSteps =[]
- log.debug("len(orderedSteps): %d", len(orderedSteps))
+ log.debug("[mergeParallel] len(orderedSteps): %d", len(orderedSteps))
+ for chain_index in range(len(chainDefList)):
+ log.debug('[mergeParallel] Chain object to merge (i.e. chainDef) %s', chainDefList[chain_index])
+
for step_index, steps in enumerate(orderedSteps):
mySteps = list(steps)
- log.debug("Merging step counter %d", step_index+1)
- combStep = makeCombinedStep(mySteps, step_index+1, chainDefList)
+ log.debug("[mergeParallel] Merging step counter %d", step_index+1)
+ combStep = makeCombinedStep(mySteps, step_index+1, chainDefList, orderedSteps, combChainSteps)
combChainSteps.append(combStep)
combinedChainDef = Chain(chainName, ChainSteps=combChainSteps, L1Thresholds=l1Thresholds,
nSteps = nSteps, alignmentGroups = alignmentGroups)
- log.debug("Parallel merged chain %s with these steps:", chainName)
+ log.debug("[mergeParallel] Parallel merged chain %s with these steps:", chainName)
for step in combinedChainDef.steps:
log.debug('\n %s', step)
@@ -114,65 +120,180 @@ def getEmptySeqName(stepName, chain_index, step_number, alignGroup):
if re.search('^Step[0-9]_',stepName):
stepName = stepName[6:]
- seqName = 'Empty'+ alignGroup +'Seq'+str(step_number)+ '_'+ stepName + '_leg' + str(chain_index)
+ seqName = 'Empty'+ alignGroup +'Seq'+str(step_number)+ '_'+ stepName
return seqName
-def getEmptyMenuSequence(flags, name):
- return EmptyMenuSequence(name)
+def getEmptyMenuSequence(flags, name, mergeUsingFeature = False):
+ return EmptyMenuSequence(name, mergeUsingFeature = mergeUsingFeature)
+def getMultiplicityPerLeg(multiplicities):
+ mult_per_leg = []
+ for mult in multiplicities:
+ if mult == 1:
+ mult_per_leg += ['1']
+ elif mult > 1:
+ mult_per_leg += ['N']
+ else:
+ raise Exception("[serial_zip] multiplicity not an expected value: %s",mult)
+ return mult_per_leg
+
+def isFullScanRoI(inputL1Nav):
+ fsRoIList = ['HLTNav_L1FSNOSEED','HLTNav_L1MET','HLTNav_L1J']
+ if inputL1Nav in fsRoIList:
+ return True
+ else:
+ return False
+
+def noPrecedingStepsPreMerge(newsteps,chain_index,ileg):
+ for step in newsteps:
+ seq = step[chain_index].sequences[ileg]
+ if type(seq).__name__ == 'EmptyMenuSequence':
+ continue
+ else:
+ #if there's a non-empty sequence in a step before, there is clearly a
+ #preceding step in this chain.
+ return False
+ return True
+
+def noPrecedingStepsPostMerge(newsteps, ileg):
+ for step in newsteps:
+ seq = step.sequences[ileg]
+ if type(seq).__name__ == 'EmptyMenuSequence':
+ continue
+ else:
+ #if there's a non-empty sequence in a step before, there is clearly a
+ #preceding step in this chain.
+ return False
+ return True
+
def serial_zip(allSteps, chainName, chainDefList):
- n_chains = len(allSteps)
+
+ legs_per_part = [len(cd.steps[0].multiplicity) for cd in chainDefList]
+ n_parts = len(allSteps)
+ log.debug('[serial_zip] configuring chain with %d parts with multiplicities %s', n_parts, legs_per_part)
newsteps = []
- for chain_index, chainsteps in enumerate(allSteps):
- for step_index, step in enumerate(chainsteps):
- log.debug('chain_index: %s step_index: %s', chain_index, step_index)
- # create list of correct length
- stepList = [None]*n_chains
-
+
+ doBonusDebug = False
+
+ for chain_index, chainSteps in enumerate(allSteps): #per-part (horizontal) iteration
+ for step_index, step in enumerate(chainSteps): #serial step iteration
+ log.debug('[serial_zip] chain_index: %s step_index: %s', chain_index, step_index)
+ # create list of correct length (chainSteps in parallel)
+ stepList = [None]*n_parts
+
# put the step from the current sub-chain into the right place
stepList[chain_index] = step
- log.debug('Put step: %s', step.name)
+ log.debug('[serial_zip] Put step: %s', step.name)
- # all other steps should contain an empty sequence
- for step_index2, emptyStep in enumerate(stepList):
+ # all other chain parts' steps should contain an empty sequence
+ for chain_index2, (emptyStep, nLegs) in enumerate(zip(stepList,legs_per_part)): #more per-leg iteration
if emptyStep is None:
- seqName = getEmptySeqName(step.name, chain_index, step_index+1, chainDefList[0].alignmentGroups[0])
- emptySeq = RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName)
- stepList[step_index2] = ChainStep( seqName, Sequences=[emptySeq], chainDicts=step.stepDicts)
-
+ mult_per_leg = getMultiplicityPerLeg(chainDefList[chain_index2].steps[0].multiplicity)
+
+ #this WILL NOT work for jets!
+ step_mult = []
+ emptyChainDicts = []
+ if chain_index2 < chain_index:
+ emptyChainDicts = allSteps[chain_index2][-1].stepDicts
+ else:
+ emptyChainDicts = allSteps[chain_index2][0].stepDicts
+
+ sigNames = []
+ for emptyChainDict in emptyChainDicts:
+ if isFullScanRoI(chainDefList[chain_index2].L1decisions[0]):
+ sigNames +=[emptyChainDict['chainParts'][0]['signature']+'FS']
+ else:
+ sigNames +=[emptyChainDict['chainParts'][0]['signature']]
+
+ seqMultName = '_'.join([mult+sigName for mult, sigName in zip(mult_per_leg,sigNames)])
+ seqStepName = 'Empty' + chainDefList[chain_index].alignmentGroups[0]+'Align'+str(step_index+1)+'_'+seqMultName
+
+ seqNames = [getEmptySeqName(emptyChainDicts[iSeq]['signature'], chain_index, step_index+1, chainDefList[chain_index].alignmentGroups[0]) for iSeq in range(nLegs)]
+ if doBonusDebug:
+ log.debug("[serial_zip] step name for this leg: %s", seqStepName)
+ log.debug("[serial_zip] created empty sequence(s): %s", seqNames)
+ log.debug("[serial_zip] L1decisions %s ", chainDefList[chain_index2].L1decisions)
+
+ emptySequences = []
+ for ileg in range(nLegs):
+ if isFullScanRoI(chainDefList[chain_index2].L1decisions[0]) and noPrecedingStepsPreMerge(newsteps,chain_index2, ileg):
+ log.debug("[serial_zip] adding FS empty sequence with mergeUsingFeature = False ")
+ emptySequences += [RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqNames[ileg]+"FS", mergeUsingFeature = False)]
+ elif isFullScanRoI(chainDefList[chain_index2].L1decisions[0]):
+ log.debug("[serial_zip] adding FS empty sequence with mergeUsingFeature = True ")
+ emptySequences += [RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqNames[ileg]+"FS", mergeUsingFeature = True)]
+ else:
+ log.debug("[serial_zip] adding non-FS empty sequence")
+ emptySequences += [RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqNames[ileg])]
+
+ #this WILL NOT work for jets!
+ step_mult = []
+ emptyChainDicts = []
+ if chain_index2 < chain_index:
+ emptyChainDicts = allSteps[chain_index2][-1].stepDicts
+ else:
+ emptyChainDicts = allSteps[chain_index2][0].stepDicts
+
+ if doBonusDebug:
+ log.debug("[serial_zip] emptyChainDicts %s",emptyChainDicts)
+
+ if len(emptySequences) != len(emptyChainDicts):
+ log.error("[serial_zip] different number of empty sequences/legs %d to stepDicts %d", len(emptySequences), len(emptyChainDicts))
+ raise Exception("[serial_zip] Cannot create this chain step, exiting.")
+
+ for sd in emptyChainDicts:
+ if len(sd['chainParts']) != 1:
+ log.error("[serial_zip] stepDict chainParts has length != 1 within a leg! %s",sd)
+ raise Exception("[serial_zip] Cannot create this chain step, exiting.")
+ step_mult += [int(sd['chainParts'][0]['multiplicity'])]
+
+ if len(emptySequences) != len(step_mult):
+ log.error("[serial_zip] different number of empty sequences/legs %d to multiplicities %d", len(emptySequences), len(step_mult))
+ raise Exception("[serial_zip] Cannot create this chain step, exiting.")
+
+ if doBonusDebug:
+ log.debug('[serial_zip] step multiplicity %s',step_mult)
+
+ stepList[chain_index2] = ChainStep( seqStepName, Sequences=emptySequences,
+ multiplicity = step_mult, chainDicts=emptyChainDicts,
+ isEmpty = True)
+
newsteps.append(stepList)
log.debug('After serial_zip')
for s in newsteps:
log.debug( ', '.join(map(str, [step.name for step in s]) ) )
return newsteps
+
def mergeSerial(chainDefList):
allSteps = []
nSteps = []
chainName = ''
l1Thresholds = []
alignmentGroups = []
- log.debug('Merge chainDefList:')
+ log.debug('[mergeSerial] Merge chainDefList:')
log.debug(chainDefList)
for cConfig in chainDefList:
+
if chainName == '':
chainName = cConfig.name
elif chainName != cConfig.name:
- log.error("Something is wrong with the combined chain name: cConfig.name = %s while chainName = %s", cConfig.name, chainName)
-
+ log.error("[mergeSerial] Something is wrong with the combined chain name: cConfig.name = %s while chainName = %s", cConfig.name, chainName)
+ raise Exception("[mergeSerial] Cannot merge this chain, exiting.")
+
allSteps.append(cConfig.steps)
nSteps.append(len(cConfig.steps))
l1Thresholds.extend(cConfig.vseeds)
- if len(cConfig.alignmentGroups) > 1:
- log.error("Merging an already merged chain? This is odd! %s",cConfig.alignmentGroups)
- alignmentGroups.append(cConfig.alignmentGroups[0])
+ alignmentGroups.extend(cConfig.alignmentGroups)
- serialSteps = serial_zip(allSteps, chainName,chainDefList)
+ serialSteps = serial_zip(allSteps, chainName, chainDefList)
mySerialSteps = deepcopy(serialSteps)
combChainSteps =[]
+ for chain_index in range(len(chainDefList)):
+ log.debug('[mergeSerial] Chain object to merge (i.e. chainDef) %s', chainDefList[chain_index])
for step_index, steps in enumerate(mySerialSteps):
mySteps = list(steps)
combStep = makeCombinedStep(mySteps, step_index+1, chainDefList)
@@ -181,78 +302,165 @@ def mergeSerial(chainDefList):
# check if all chain parts have the same number of steps
sameNSteps = all(x==nSteps[0] for x in nSteps)
if sameNSteps is True:
- log.info("All chain parts have the same number of steps")
+ log.info("[mergeSerial] All chain parts have the same number of steps")
else:
- log.info("Have to deal with uneven number of chain steps, there might be none's appearing in sequence list => to be fixed")
+ log.info("[mergeSerial] Have to deal with uneven number of chain steps, there might be none's appearing in sequence list => to be fixed")
combinedChainDef = Chain(chainName, ChainSteps=combChainSteps, L1Thresholds=l1Thresholds,
nSteps = nSteps, alignmentGroups = alignmentGroups)
- log.debug("Serial merged chain %s with these steps:", chainName)
+ log.debug("[mergeSerial] Serial merged chain %s with these steps:", chainName)
for step in combinedChainDef.steps:
log.debug(' %s', step)
return combinedChainDef
+def checkStepContent(parallel_steps):
+
+ for step in parallel_steps:
+ if step is None:
+ continue
+ for seq in step.sequences:
+ if type(seq).__name__ != 'EmptyMenuSequence':
+ return True
+ return False
-def makeCombinedStep(steps, stepNumber, chainDefList):
+def makeCombinedStep(parallel_steps, stepNumber, chainDefList, allSteps = [], currentChainSteps = []):
from TrigCompositeUtils.TrigCompositeUtils import legName
stepName = 'merged' #we will renumber all steps after chains are aligned #Step' + str(stepNumber)
stepSeq = []
stepMult = []
- log.verbose(" steps %s ", steps)
+ log.verbose("[makeCombinedStep] steps %s ", parallel_steps)
stepDicts = []
comboHypoTools = []
comboHypo = None
# this function only makes sense if we are merging steps corresponding to the chains in the chainDefList
- assert len(chainDefList)==len(steps), "makeCombinedStep: Length of chain defs %d does not match length of steps to merge %d" % (len(chainDefList), len(steps))
+ assert len(chainDefList)==len(parallel_steps), "[makeCombinedStep] makeCombinedStep: Length of chain defs %d does not match length of steps to merge %d" % (len(chainDefList), len(allSteps))
- for chain_index, step in enumerate(steps):
- if step is None:
+ leg_counter = 0
+ currentStepName = ''
+ # if *all* the steps we're trying to merge are either empty sequences or empty steps
+ # we need to create a single empty step instead.
+ hasNonEmptyStep = checkStepContent(parallel_steps)
+
+ if not hasNonEmptyStep:
+ for chain_index, step in enumerate(parallel_steps):
+ # every step is empty but some might have empty sequences and some might not
+ if len(step.sequences) == 0:
+ new_stepDict = deepcopy(chainDefList[chain_index].steps[-1].stepDicts[-1])
+ currentStepName = 'Empty' + chainDefList[chain_index].alignmentGroups[0]+'Align'+str(stepNumber)+'_'+new_stepDict['chainParts'][0]['multiplicity']+new_stepDict['signature']
+
+ # we need a chain dict here, use the one corresponding to this leg of the chain
+ oldLegName = new_stepDict['chainName']
+ if re.search('^leg[0-9]{3}_',oldLegName):
+ oldLegName = oldLegName[7:]
+ new_stepDict['chainName'] = legName(oldLegName,leg_counter)
+ stepDicts.append(new_stepDict)
+ leg_counter += 1
+ else:
+ # Standard step with empty sequence(s)
+ currentStepName = step.name
+ #remove redundant instances of StepN_ and merged_ (happens when merging already merged chains)
+ if re.search('^Step[0-9]_',currentStepName):
+ currentStepName = currentStepName[6:]
+ if re.search('^merged_',currentStepName):
+ currentStepName = currentStepName[7:]
+
+ # update the chain dict list for the combined step with the chain dict from this step
+ log.debug('[makeCombinedStep] adding step dictionaries %s',step.stepDicts)
+
+ for new_stepDict in deepcopy(step.stepDicts):
+ oldLegName = new_stepDict['chainName']
+ if re.search('^leg[0-9]{3}_',oldLegName):
+ oldLegName = oldLegName[7:]
+ new_stepDict['chainName'] = legName(oldLegName,leg_counter)
+ log.debug("[makeCombinedStep] stepDict naming old: %s, new: %s", oldLegName, new_stepDict['chainName'])
+ stepDicts.append(new_stepDict)
+ leg_counter += 1
+
+ stepName += '_' + currentStepName
+
+ theChainStep = ChainStep(stepName, Sequences=[], multiplicity=[], chainDicts=stepDicts, comboHypoCfg=ComboHypoCfg)
+ log.info("[makeCombinedStep] Merged empty step: \n %s", theChainStep)
+ return theChainStep
+
+ for chain_index, step in enumerate(parallel_steps): #this is a horizontal merge!
+
+ if step is None or (hasNonEmptyStep and len(step.sequences) == 0):
# this happens for merging chains with different numbers of steps, we need to "pad" out with empty sequences to propogate the decisions
- currentStepName = "Step" + str(stepNumber) + "_Empty" + str(chain_index)
- seqName = getEmptySeqName(currentStepName, chain_index, stepNumber, chainDefList[0].alignmentGroups[0])
- log.debug(" step %s, empty sequence %s", currentStepName, seqName)
- emptySeq = RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName)
+ # all other chain parts' steps should contain an empty sequence
+
+ new_stepDict = deepcopy(chainDefList[chain_index].steps[-1].stepDicts[-1])
+ seqName = getEmptySeqName(new_stepDict['signature'], chain_index, stepNumber, chainDefList[0].alignmentGroups[0])
- stepSeq.append(emptySeq)
- stepMult.append(1)
+ if isFullScanRoI(chainDefList[chain_index].L1decisions[0]):
+ if noPrecedingStepsPostMerge(currentChainSteps, chain_index):
+ stepSeq.append(RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName+"FS", mergeUsingFeature = False))
+ else:
+ stepSeq.append(RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName+'FS', mergeUsingFeature = True))
+ currentStepName = 'Empty' + chainDefList[chain_index].alignmentGroups[0]+'Align'+str(stepNumber)+'_'+new_stepDict['chainParts'][0]['multiplicity']+new_stepDict['signature']+'FS'
+ else:
+ stepSeq.append(RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName))
+ currentStepName = 'Empty' + chainDefList[chain_index].alignmentGroups[0]+'Align'+str(stepNumber)+'_'+new_stepDict['chainParts'][0]['multiplicity']+new_stepDict['signature']
+
+ log.debug("[makeCombinedStep] step %s, empty sequence %s", currentStepName, seqName)
+
+ #stepNumber is indexed from 1, need the previous step indexed from 0, so do - 2
+ prev_step_mult = int(currentChainSteps[stepNumber-2].multiplicity[chain_index])
+ stepMult.append(prev_step_mult)
# we need a chain dict here, use the one corresponding to this leg of the chain
- stepDicts.append(deepcopy(chainDefList[chain_index].steps[-1].stepDicts[-1]))
+ oldLegName = new_stepDict['chainName']
+ if re.search('^leg[0-9]{3}_',oldLegName):
+ oldLegName = oldLegName[7:]
+ new_stepDict['chainName'] = legName(oldLegName,leg_counter)
+ stepDicts.append(new_stepDict)
+ leg_counter += 1
else:
# Standard step, append it to the combined step
- log.debug(" step %s, multiplicity = %s", step.name, str(step.multiplicity))
+ log.debug("[makeCombinedStep] step %s, multiplicity = %s", step.name, str(step.multiplicity))
if len(step.sequences):
- log.debug(" with sequences = %s", ' '.join(map(str, [seq.name for seq in step.sequences])))
+ log.debug("[makeCombinedStep] with sequences = %s", ' '.join(map(str, [seq.name for seq in step.sequences])))
# this function only works if the input chains are single-object chains (one menu seuqnce)
if len(step.sequences) > 1:
- log.error("More than one menu sequence found in combined chain!!")
+ log.debug("[makeCombinedStep] combining in an already combined chain")
+
comboHypo = step.comboHypoCfg
currentStepName = step.name
- #remove redundant instances of StepN_
+ #remove redundant instances of StepN_ and merged_ (happens when merging already merged chains)
if re.search('^Step[0-9]_',currentStepName):
currentStepName = currentStepName[6:]
-
- if len(step.sequences):
- seq = step.sequences[0]
- stepSeq.append(seq)
+ if re.search('^merged_',currentStepName):
+ currentStepName = currentStepName[7:]
+ stepSeq.extend(step.sequences)
# set the multiplicity of all the legs
- stepMult.append(sum(step.multiplicity))
+ if len(step.multiplicity) == 0:
+ stepMult.append(0)
+ else:
+ stepMult.extend(step.multiplicity)
comboHypoTools.extend(step.comboToolConfs)
# update the chain dict list for the combined step with the chain dict from this step
- stepDicts += deepcopy(step.stepDicts)
+ log.debug('[makeCombinedStep] adding step dictionaries %s',step.stepDicts)
+
+ for new_stepDict in deepcopy(step.stepDicts):
+ oldLegName = new_stepDict['chainName']
+ if re.search('^leg[0-9]{3}_',oldLegName):
+ oldLegName = oldLegName[7:]
+ new_stepDict['chainName'] = legName(oldLegName,leg_counter)
+ log.debug("[makeCombinedStep] stepDict naming old: %s, new: %s", oldLegName, new_stepDict['chainName'])
+ stepDicts.append(new_stepDict)
+ leg_counter += 1
# the step naming for combined chains needs to be revisted!!
stepName += '_' + currentStepName
+ log.debug('[makeCombinedStep] current step name %s',stepName)
# for merged steps, we need to update the name to add the leg name
- stepDicts[-1]['chainName'] = legName(stepDicts[-1]['chainName'], chain_index)
-
+
comboHypoTools = list(set(comboHypoTools))
theChainStep = ChainStep(stepName, Sequences=stepSeq, multiplicity=stepMult, chainDicts=stepDicts, comboHypoCfg=comboHypo, comboToolConfs=comboHypoTools)
- log.info("Merged step: \n %s", theChainStep)
+ log.info("[makeCombinedStep] Merged step: \n %s", theChainStep)
return theChainStep
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index b4674557188ccdb593075f10ee510797d10c6bd1..deb952c1f7cf58c7827d1d8dade4e0a1acc55821 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -307,7 +307,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
alignedChainConfig = menuAlignment.single_align(chainDict, chainConfig)
TriggerConfigHLT.registerChain( chainDict, alignedChainConfig )
- elif len(alignmentGroups) == 2:
+ elif len(alignmentGroups) >= 2:
alignedChainConfig = menuAlignment.multi_align(chainDict, chainConfig, lengthOfChainConfigs)
TriggerConfigHLT.registerChain( chainDict, alignedChainConfig )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
index 1ce863f74f56e8347093529a4d0ed8473d65ed26..d9622d9f6758f88d5dadf371cce7a3670b4474dc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
@@ -35,11 +35,28 @@ def obtainChainsOfMenu(flags):
return setupMenuModule.setupMenu(flags)
+def acceptChain(chainDict, whichSignatures):
+ """
+ Helper to accept chains to be part of the menu depending on their name or which signatures they belong to.
+ If the keyword "all" is present all chains that are in the menu are accepted.
+ If the keyword "emptyMenu" is present other keywords are checked.
+ They can be name of signature: e.g. Muon or name of chain(s) HLT_j50_L1J30
+ Leaving the "emptyMenu" keyword only results in no chains that are configured. As a consequence would cause an issue somewhere downstream.
+ """
+ if "all" in whichSignatures:
+ return True
+ if "emptyMenu" in whichSignatures:
+ if chainDict["chainName"] in whichSignatures: #explicit list of chains specified
+ return True
+ if all( [ sig in whichSignatures for sig in chainDict['signatures'] ]): # all signatures for the chain are mentioned
+ return True
+ return False
def generateMenu(flags):
"""
Using flags generate appropriate Control Flow Graph wiht all HLT algorithms
+
"""
# convert to chainDefs
@@ -75,7 +92,8 @@ def generateMenu(flags):
for chain in chains:
# TODO topo threshold
mainChainDict = dictFromChainName( chain )
-
+ if not acceptChain( mainChainDict, flags.Trigger.triggerMenuModifier ):
+ continue
counter += 1
mainChainDict['chainCounter'] = counter
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 1821f9279060881a01c797833c7af6d69d52d729..f8dd16c5923cbc687f1c55df535f852237a2060e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -99,17 +99,23 @@ def setupMenu():
ChainProp(name='HLT_e5_lhmedium_noringer_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_noringer_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_noringer_nod0_L1EM3', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e5_idperf_L1EM3', groups=SingleElectronGroup), #idperf chains
# low et threshold chains using Ringer
ChainProp(name='HLT_e5_lhloose_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhmedium_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_L1EM3', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_gsf_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_nod0_L1EM3', groups=SingleElectronGroup),
# Primary
ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e17_lhvloose_L1EM15VH', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e17_lhvloose_L1EM15VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e17_lhvloose_gsf_L1EM15VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e24_lhvloose_L1EM20VH', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e24_lhvloose_gsf_L1EM20VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhloose_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhmedium_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_L1EM15VH', groups=SingleElectronGroup),
@@ -118,10 +124,13 @@ def setupMenu():
ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_gsf_L1EM22VHI', groups=SingleElectronGroup), #Placeholder for GSF chain
ChainProp(name='HLT_e26_lhtight_ivarloose_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivarmedium_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivartight_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_nod0_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_nod0_L1EM24VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_idperf_L1EM24VHI', groups=SingleElectronGroup), #idperf chains
+ ChainProp(name='HLT_e28_idperf_L1EM24VHI', groups=SingleElectronGroup), #idperf chains
ChainProp(name='HLT_e60_lhmedium_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e60_lhmedium_nod0_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e140_lhloose_L1EM22VHI', groups=SingleElectronGroup),
@@ -134,8 +143,10 @@ def setupMenu():
ChainProp(name='HLT_2e24_lhvloose_L12EM20VH', stream=[PhysicsStream], groups=MultiElectronGroup),
ChainProp(name='HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH', stream=[PhysicsStream], groups=MultiElectronGroup),
+
# TnP triggers
- ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup),
+ ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup),
+ ChainProp(name='HLT_e20_lhmedium_e15_idperf_Zee_L12EM3', groups=MultiElectronGroup), #idperf leg
# for moving to PhysicsP1, ATR-21242
# ChainProp(name='HLT_2e17_etcut_L12EM15VHI', stream=[PhysicsStream], groups=MultiElectronGroup),
@@ -269,10 +280,14 @@ def setupMenu():
ChainProp(name='HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup),
ChainProp(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j0_fbdjshared_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20',
+ l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
+
# ATR-20624
ChainProp(name='HLT_j0_perf_L1J12_EMPTY', stream=['Main'], groups=['Online',SingleJetGroup]),
@@ -425,7 +440,7 @@ def setupMenu():
# ChainProp(name='HLT_e9_lhvloose_mu20_mu8noL1_L1MU20', l1SeedThresholds=['EM3','MU20','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup),
# ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup),
ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup),
- # ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup),
+ ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup),
]
TriggerFlags.HeavyIonSlice.signatures = TriggerFlags.HeavyIonSlice.signatures() + []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 023c5dcc0011f223216a66b2f2da763cb4965a92..95c607bf26690336021fccfffd89a60765f08ab1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -355,10 +355,11 @@ class EmptyMenuSequence(object):
""" Class to emulate reco sequences with no Hypo"""
""" By construction it has no Hypo;"""
- def __init__(self, the_name):
+ def __init__(self, the_name, mergeUsingFeature = False):
self._name = the_name
Maker = CompFactory.InputMakerForRoI("IM"+the_name)
Maker.RoITool = CompFactory.ViewCreatorInitialROITool()
+ Maker.mergeUsingFeature = mergeUsingFeature
self._maker = InputMakerNode( Alg = Maker )
self._seed=''
self._sequence = Node( Alg = seqAND(the_name, [Maker]))
@@ -740,6 +741,9 @@ class CFSequence(object):
the filter is connected only once (to avoid multiple DH links)
"""
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))
+ log.debug(" --- sequences: ")
+ for seq in self.step.sequences:
+ log.debug(seq)
if len(connections) == 0:
log.error("ERROR, no filter outputs are set!")
@@ -789,19 +793,24 @@ class StepComponent(object):
# next: can we remove multiplicity array, if it can be retrieved from the ChainDict?
class ChainStep(object):
"""Class to describe one step of a chain; if multiplicity is greater than 1, the step is combo/combined. Set one multiplicity value per sequence"""
- def __init__(self, name, Sequences=[], multiplicity=[1], chainDicts=[], comboHypoCfg=ComboHypoCfg, comboToolConfs=[]):
+ def __init__(self, name, Sequences=[], multiplicity=[1], chainDicts=[], comboHypoCfg=ComboHypoCfg, comboToolConfs=[], isEmpty = False):
# include cases of emtpy steps with multiplicity = [] or multiplicity=[0,0,0///]
if sum(multiplicity)==0:
multiplicity=[]
else:
# sanity check on inputs, excluding empty steps
+ if len(chainDicts) != len(multiplicity):
+ log.error("[ChainStep] Sequences: %s",Sequences)
+ log.error("[ChainStep] chainDicts: %s",chainDicts)
+ log.error("[ChainStep] multiplicity: %s",multiplicity)
+ raise RuntimeError("[ChainStep] Tried to configure a ChainStep %s with %i multiplicity and %i dictionaries. These lists must have the same size" % (name, len(multiplicity), len(chainDicts)) )
+
if len(Sequences) != len(multiplicity):
+ log.error("[ChainStep] Sequences: %s",Sequences)
+ log.error("[ChainStep] multiplicities: %s",multiplicity)
raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i multiplicities. These lists must have the same size" % (name, len(Sequences), len(multiplicity)) )
-
- if len(Sequences) != len(chainDicts):
- raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i dictionaries. These lists must have the same size" % (name, len(Sequences), len(chainDicts)) )
-
+
self.name = name
self.sequences=Sequences
self.multiplicity = multiplicity
@@ -809,7 +818,7 @@ class ChainStep(object):
self.comboToolConfs=comboToolConfs
self.stepDicts = chainDicts # one dict per leg
self.isCombo=sum(multiplicity)>1
- self.isEmpty=sum(multiplicity)==0
+ self.isEmpty=(sum(multiplicity)==0 or isEmpty)
self.combo=None
if self.isCombo:
self.makeCombo()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 7d176fb0b6ef75e627953e6d3ba528048f2e2a55..ad097da08b9975ab722ee1c1f2bda5fbe4b3f4dd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -133,12 +133,15 @@ JetChainParts = {
# from the hypoScenario specification, and all other hypo entries are ignored.
'hypoScenario' : ['simple', # Independent selections on individual jets, multiplicity+threshold cuts
'vbenf', # Test VBF-like chain
+ 'fbdjshared', # Test VBF-like chain with dijet-fworward/backward sharing
'vbenfSEP30etSEP34mass35SEP50fbet', # Test VBF-like chain with more info
'dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass', # Test dijet mass sel
# 'agg' category is for single variable computed by aggregation over single jets
'aggSEP1000htSEP30etSEP0eta320', # HT selection with explicit jet et/eta cuts
'aggSEP500htSEP30etSEP0eta320',
- 'aggSEP100htSEP10etSEP0eta320',],
+ 'aggSEP100htSEP10etSEP0eta320',
+ 'aggSEP50htSEP10etSEP0eta320',
+ ],
# Simple hypo configuration. Single property cuts defined as MINvarMAX
'etaRange' :
['0eta320', '320eta490', '0eta240', '0eta290'],
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
index 1f3adb4398edb76e73b19ffae563340c750bfc4b..de19773da588783308b0c735e9ec0fc6fb8f9a9c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
@@ -5,166 +5,122 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
from AthenaCommon.CFElements import parOR
from AthenaCommon.CFElements import seqAND
from TrigInDetConfig.InDetSetup import makeInDetAlgs
+from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition
from TrigEDMConfig.TriggerEDMRun3 import recordable
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
-from AthenaCommon.GlobalFlags import globalflags
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
########
# to move into TrigMinBiasHypoConfigMT?
-def SPCountHypoToolGen(chainDict):
+def SPCountHypoToolGen(chainDict):
from TrigT2MinBias.TrigT2MinBiasConf import SPCountHypoTool
hypo = SPCountHypoTool(chainDict["chainName"])
if "hmt" in chainDict["chainName"]:
- hypo.totNumSctSP = int( chainDict["chainParts"][0]["hypoL2Info"].strip("sp") )
+ hypo.totNumSctSP = int(chainDict["chainParts"][0]["hypoL2Info"].strip("sp"))
if "mb_sptrk" in chainDict["chainName"]:
- hypo.totNumPixSP = 2
- hypo.totNumSctSP = 3
+ hypo.totNumPixSP = 2
+ hypo.totNumSctSP = 3
# will set here thresholds
return hypo
def TrackCountHypoToolGen(chainDict):
- from TrigMinBias.TrigMinBiasConf import TrackCountHypoTool
+ from TrigMinBias.TrigMinBiasConf import TrackCountHypoTool
hypo = TrackCountHypoTool(chainDict["chainName"])
if "hmt" in chainDict["chainName"]:
- hypo.required_ntrks = int( chainDict["chainParts"][0]["hypoEFInfo"].strip("trk") )
+ hypo.minNtrks = int(chainDict["chainParts"][0]["hypoEFInfo"].strip("trk"))
if "mb_sptrk" in chainDict["chainName"]:
- hypo.min_pt = 0.2
- hypo.max_z0 = 401
+ hypo.minPt = 0.2
+ hypo.maxZ0 = 401
# will set here cuts
return hypo
### Now the sequences
-# These are obsoletee and can probably be deleted. Leeft here commented as need feedback fomr experts
-
-## def minbiasSpacePointMenuSequence():
-## # menu components
-## # retrieve the reco seuqnece
-## from TriggerMenuMT.HLTMenuConfig.MinBias.MinBiasSPRecoSequences import minbiasSpacePointAthSequence
-## ( minbiasSpacePointSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(minbiasSpacePointAthSequence,ConfigFlags)
-
-## #hypo
-## mbHypoAlg = MbCountHypoAlgMT("MinBiasHypoAlg_sp")
-## mbHypoAlg.MinBiasContainerKey=sequenceOut
+def MinBiasSPSequence():
+ spAlgsList = []
+ from TrigT2MinBias.TrigT2MinBiasConf import TrigCountSpacePointsMT, SPCountHypoAlgMT
-## return MenuSequence( Sequence = minbiasSpacePointSequence,
-## Maker = InputMakerAlg,
-## Hypo = mbHypoAlg,
-## HypoToolGen = TrigMinBiasHypoToolFromDict )
+ spInputMakerAlg = EventViewCreatorAlgorithm("IM_SPEventViewCreator")
+ spInputMakerAlg.ViewFallThrough = True
+ spInputMakerAlg.RoITool = ViewCreatorInitialROITool()
+ spInputMakerAlg.InViewRoIs = "InputRoI"
+ spInputMakerAlg.Views = "SPView"
+
+ idTrigConfig = getInDetTrigConfig('minBias')
+ idAlgs, verifier = makeInDetAlgs(config=idTrigConfig,
+ rois=spInputMakerAlg.InViewRoIs,
+ viewVerifier='SPViewDataVerifier',
+ doFTF=False)
+ verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
+ ('SCT_ID', 'DetectorStore+SCT_ID'),
+ ('PixelID', 'DetectorStore+PixelID'),
+ ('TagInfo', 'DetectorStore+ProcessingTags')]
+ # Make sure required objects are still available at whole-event level
+ from AthenaCommon.AlgSequence import AlgSequence
+ topSequence = AlgSequence()
+ topSequence.SGInputLoader.Load += [('SCT_ID', 'DetectorStore+SCT_ID'),
+ ('PixelID', 'DetectorStore+PixelID'),
+ ('TagInfo', 'DetectorStore+ProcessingTags')]
-## #obsolete?
-## def minbiasTrackMenuSequence():
-## # menu components
-## # retrieve the reco seuqnece
-## from TriggerMenuMT.HLTMenuConfig.MinBias.MinBiasTrkRecoSequences import minbiasTrackAthSequence
-## (minbiasTrackSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(minbiasTrackAthSequence,ConfigFlags)
+# spAlgsList = idAlgs[:-2]
+ spAlgsList = idAlgs
-## #hypo
-## mbHypoAlg = MbCountHypoAlgMT("MinBiasHypoAlg_trk")
-## mbHypoAlg.MinBiasContainerKey=sequenceOut
-## return MenuSequence( Sequence = minbiasTrackSequence,
-## Maker = InputMakerAlg,
-## Hypo = mbHypoAlg,
-## HypoToolGen = TrigMinBiasHypoToolFromDict )
+ spCount = TrigCountSpacePointsMT()
+ spCount.SpacePointsKey = recordable("HLT_SpacePointCounts")
+ from TrigT2MinBias.TrigT2MinBiasMonitoringMT import SpCountMonitoring
+ spCount.MonTool = SpCountMonitoring()
-# NEW:
-def MinBiasSPSequence():
- SpList = []
- from TrigT2MinBias.TrigT2MinBiasConf import TrigCountSpacePointsMT, SPCountHypoAlgMT
+ spRecoSeq = parOR("spRecoSeq", spAlgsList + [spCount])
+ spSequence = seqAND("spSequence", [spInputMakerAlg, spRecoSeq])
+ spInputMakerAlg.ViewNodeName = spRecoSeq.name()
- SPInputMakerAlg = EventViewCreatorAlgorithm("IM_SPEventViewCreator")
- SPInputMakerAlg.ViewFallThrough = True
- SPInputMakerAlg.RoITool = ViewCreatorInitialROITool()
- SPInputMakerAlg.InViewRoIs = "InputRoI"
- SPInputMakerAlg.Views = "SPView"
- IDTrigConfig = getInDetTrigConfig( 'minBias' )
- idAlgs, verifier = makeInDetAlgs( config = IDTrigConfig, rois=SPInputMakerAlg.InViewRoIs, viewVerifier='SPViewDataVerifier' )
- verifier.DataObjects += [( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+InputRoI' ),
- ( 'SCT_ID' , 'DetectorStore+SCT_ID' ),
- ( 'PixelID' , 'DetectorStore+PixelID' ),
- ( 'TagInfo' , 'DetectorStore+ProcessingTags' )]
+ spCountHypo =SPCountHypoAlgMT()
+ spCountHypo.SpacePointsKey=recordable("HLT_SpacePointCounts")
- # Make sure required objects are still available at whole-event level
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'SCT_ID' , 'DetectorStore+SCT_ID' ),
- ( 'PixelID' , 'DetectorStore+PixelID' ),
- ( 'TagInfo' , 'DetectorStore+ProcessingTags' )]
-
- SpList = idAlgs[:-2]
-
- SpCount=TrigCountSpacePointsMT()
- SpCount.SpacePointsKey=recordable("HLT_SpacePointCounts")
-
- from TrigT2MinBias.TrigT2MinBiasMonitoringMT import SpCountMonitoring
- SpCount.MonTool = SpCountMonitoring()
-
- SPrecoSeq = parOR("SPrecoSeq", SpList + [ SpCount ])
- SPSequence = seqAND("SPSequence", [SPInputMakerAlg, SPrecoSeq])
- SPInputMakerAlg.ViewNodeName = SPrecoSeq.name()
-
-
- SpCountHypo =SPCountHypoAlgMT()
- SpCountHypo.SpacePointsKey=recordable("HLT_SpacePointCounts")
-
- return MenuSequence( Sequence = SPSequence,
- Maker = SPInputMakerAlg,
- Hypo = SpCountHypo,
+ return MenuSequence(Sequence = spSequence,
+ Maker = spInputMakerAlg,
+ Hypo = spCountHypo,
HypoToolGen = SPCountHypoToolGen )
def MinBiasTrkSequence():
from TrigMinBias.TrigMinBiasConf import TrackCountHypoAlgMT
- TrkInputMakerAlg = EventViewCreatorAlgorithm("IM_TrkEventViewCreator")
- TrkInputMakerAlg.ViewFallThrough = True
- TrkInputMakerAlg.RoITool = ViewCreatorInitialROITool()
- TrkInputMakerAlg.InViewRoIs = "InputRoI" # contract with the consumer
- TrkInputMakerAlg.Views = "TrkView"
- TrkInputMakerAlg.RequireParentView = True
- TrkInputMakerAlg.ViewNodeName = "TrkCountHypoAlgMTNode"
-
- # prepare algorithms to run in views, first, inform scheduler that input data is available in parent view (has to be done by hand)
- IDTrigConfig = getInDetTrigConfig( 'minBias' )
- idAlgs, verifier = makeInDetAlgs( config = IDTrigConfig, rois=TrkInputMakerAlg.InViewRoIs, viewVerifier='TrkrecoSeqDataVerifier')
- verifier.DataObjects += [( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+InputRoI' ),
- ( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
- ( 'InDet::SCT_ClusterContainer' , 'StoreGateSvc+SCT_TrigClusters' ),
- ( 'SpacePointContainer' , 'StoreGateSvc+SCT_TrigSpacePoints' ),
- ( 'InDet::PixelClusterContainer' , 'StoreGateSvc+PixelTrigClusters' ),
- ( 'SpacePointContainer' , 'StoreGateSvc+PixelTrigSpacePoints' )]
-
- if globalflags.InputFormat.is_bytestream():
- verifier.DataObjects += [( 'IDCInDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ),
- ( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )]
-
-
- TrkList = idAlgs[-2:] # FTF and Track to xAOD::TrackParticle conversion alg
- TrackCountHypo=TrackCountHypoAlgMT()
- TrackCountHypo.trackCountKey=recordable("HLT_TrackCount")
- TrackCountHypo.tracksKey=recordable("HLT_IDTrack_MinBias_FTF")
+ trkInputMakerAlg = EventViewCreatorAlgorithm("IM_TrkEventViewCreator")
+ trkInputMakerAlg.ViewFallThrough = True
+ trkInputMakerAlg.RoITool = ViewCreatorInitialROITool()
+ trkInputMakerAlg.InViewRoIs = "InputRoI" # contract with the consumer
+ trkInputMakerAlg.Views = "TrkView"
+ trkInputMakerAlg.RequireParentView = True
+ trkInputMakerAlg.ViewNodeName = "TrkCountHypoAlgMTNode"
- from TrigMinBias.TrackCountMonitoringMT import TrackCountMonitoring
- TrackCountHypo.MonTool = TrackCountMonitoring()
+ # prepare algorithms to run in views, first,
+ # inform scheduler that input data is available in parent view (has to be done by hand)
+ idTrigConfig = getInDetTrigConfig('minBias')
- TrkrecoSeq = parOR("TrkrecoSeq", [verifier]+TrkList)
- TrkSequence = seqAND("TrkSequence", [TrkInputMakerAlg, TrkrecoSeq])
- TrkInputMakerAlg.ViewNodeName = TrkrecoSeq.name()
+ algs,_ = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking')
+ trackCountHypo = TrackCountHypoAlgMT()
+ trackCountHypo.trackCountKey = recordable("HLT_TrackCount")
+ trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_IDTrig")
- return MenuSequence( Sequence = TrkSequence,
- Maker = TrkInputMakerAlg,
- Hypo = TrackCountHypo,
- HypoToolGen = TrackCountHypoToolGen )
+ from TrigMinBias.TrackCountMonitoringMT import TrackCountMonitoring
+ trackCountHypo.MonTool = TrackCountMonitoring()
+ trkRecoSeq = parOR("TrkrecoSeq", algs)
+ trkSequence = seqAND("TrkSequence", [trkInputMakerAlg, trkRecoSeq])
+ trkInputMakerAlg.ViewNodeName = trkRecoSeq.name()
+ return MenuSequence(Sequence = trkSequence,
+ Maker = trkInputMakerAlg,
+ Hypo = trackCountHypo,
+ HypoToolGen = TrackCountHypoToolGen)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index ffae34767d601c331c72332500fb8cd75456c139..bfffeaf4b4e5a4c5ceb21736da6681281642be36 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -613,7 +613,7 @@ def muEFSARecoSequence( RoIs, name ):
Cleaner.PullCutPhi = 3
SegmentFinder.TrackCleaner = Cleaner
- theSegmentFinderAlg = CfgMgr.MuonSegmentFinderAlg( "TrigMuonSegmentMaker_"+name,SegmentCollectionName="MuonSegments",
+ theSegmentFinderAlg = CfgMgr.MuonSegmentFinderAlg( "TrigMuonSegmentMaker_"+name,
MuonPatternCalibration = CfgGetter.getPublicTool("MuonPatternCalibration"),
MuonPatternSegmentMaker = CfgGetter.getPublicTool("MuonPatternSegmentMaker"),
MuonTruthSummaryTool = None)
@@ -630,7 +630,7 @@ def muEFSARecoSequence( RoIs, name ):
theSegmentFinderAlg = MooSegmentFinderAlg("TrigMuonSegmentMaker_"+name)
from MuonSegmentTrackMaker.MuonTrackMakerAlgsMonitoring import MuPatTrackBuilderMonitoring
- TrackBuilder = CfgMgr.MuPatTrackBuilder("TrigMuPatTrackBuilder_"+name ,MuonSegmentCollection = "MuonSegments",
+ TrackBuilder = CfgMgr.MuPatTrackBuilder("TrigMuPatTrackBuilder_"+name ,MuonSegmentCollection = "TrackMuonSegments",
TrackSteering=CfgGetter.getPublicToolClone("TrigMuonTrackSteering", "MuonTrackSteering"),
MonTool = MuPatTrackBuilderMonitoring("MuPatTrackBuilderMonitoringSA_"+name))
xAODTrackParticleCnvAlg = MuonStandaloneTrackParticleCnvAlg("TrigMuonStandaloneTrackParticleCnvAlg_"+name)
@@ -785,7 +785,7 @@ def muEFCBRecoSequence( RoIs, name ):
cbMuonName = muNamesFS.EFCBName
themuoncbcreatoralg = MuonCreatorAlg("TrigMuonCreatorAlgCB_"+name, MuonCandidateLocation=candidatesName, TagMaps=["muidcoTagMap"], InDetCandidateLocation="InDetCandidates_"+name,
- MuonContainerLocation = cbMuonName, SegmentContainerName = "CBSegments", ExtrapolatedLocation = "CBExtrapolatedMuons",
+ MuonContainerLocation = cbMuonName, SegmentContainerName = "xaodCBSegments", TrackSegmentContainerName = "TrkCBSegments", ExtrapolatedLocation = "CBExtrapolatedMuons",
MSOnlyExtrapolatedLocation = "CBMSonlyExtrapolatedMuons", CombinedLocation = "HLT_CBCombinedMuon_"+name,
MonTool = MuonCreatorAlgMonitoring("MuonCreatorAlgCB_"+name))
@@ -846,7 +846,7 @@ def muEFInsideOutRecoSequence(RoIs, name):
Cleaner.PullCutPhi = 3
SegmentFinder.TrackCleaner = Cleaner
- theSegmentFinderAlg = CfgMgr.MuonSegmentFinderAlg( "TrigMuonSegmentMaker_"+name,SegmentCollectionName="MuonSegments",
+ theSegmentFinderAlg = CfgMgr.MuonSegmentFinderAlg( "TrigMuonSegmentMaker_"+name,
MuonPatternCalibration = CfgGetter.getPublicTool("MuonPatternCalibration"),
MuonPatternSegmentMaker = CfgGetter.getPublicTool("MuonPatternSegmentMaker"),
MuonTruthSummaryTool = None)
@@ -921,7 +921,7 @@ def muEFInsideOutRecoSequence(RoIs, name):
else:
theInsideOutRecoAlg = MuonInsideOutRecoAlg("TrigMuonInsideOutRecoAlg_"+name,InDetCandidateLocation="InDetCandidates_"+name)
insideoutcreatoralg = MuonCreatorAlg("TrigMuonCreatorAlgInsideOut_"+name, TagMaps=["muGirlTagMap"],InDetCandidateLocation="InDetCandidates_"+name,
- MuonContainerLocation = cbMuonName, SegmentContainerName = "InsideOutCBSegments", ExtrapolatedLocation = "InsideOutCBExtrapolatedMuons",
+ MuonContainerLocation = cbMuonName, SegmentContainerName = "xaodInsideOutCBSegments", TrackSegmentContainerName = "TrkInsideOutCBSegments", ExtrapolatedLocation = "InsideOutCBExtrapolatedMuons",
MSOnlyExtrapolatedLocation = "InsideOutCBMSOnlyExtrapolatedMuons", CombinedLocation = "InsideOutCBCombinedMuon", MonTool = MuonCreatorAlgMonitoring("MuonCreatorAlgInsideOut_"+name))
efAlgs.append(theInsideOutRecoAlg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index cce859909024bc5102ff9787458ebe59bbb5ebe6..bf9e816007d7a6f382fd8c9a086dc0d8f700e919 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -132,10 +132,24 @@ def MuonTrackParticleCnvCfg(flags, name = "MuonTrackParticleCnvAlg",**kwargs):
def decodeCfg(flags, RoIs):
acc = ComponentAccumulator()
+
+ from RegionSelector.RegSelToolConfig import regSelTool_RPC_Cfg
+ RegSelTool_RPC = acc.popToolsAndMerge(regSelTool_RPC_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_TGC_Cfg
+ RegSelTool_TGC = acc.popToolsAndMerge(regSelTool_TGC_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_MDT_Cfg
+ RegSelTool_MDT = acc.popToolsAndMerge(regSelTool_MDT_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_CSC_Cfg
+ RegSelTool_CSC = acc.popToolsAndMerge(regSelTool_CSC_Cfg(flags))
+
# Get RPC BS decoder
from MuonConfig.MuonBytestreamDecodeConfig import RpcBytestreamDecodeCfg
rpcAcc = RpcBytestreamDecodeCfg( flags, name = "RpcRawDataProvider_"+RoIs )
rpcAcc.getEventAlgo("RpcRawDataProvider_"+RoIs).RoIs = RoIs
+ rpcAcc.getEventAlgo("RpcRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_RPC
acc.merge( rpcAcc )
# Get RPC BS->RDO convertor
@@ -148,6 +162,7 @@ def decodeCfg(flags, RoIs):
from MuonConfig.MuonBytestreamDecodeConfig import TgcBytestreamDecodeCfg
tgcAcc = TgcBytestreamDecodeCfg( flags, name="TgcRawDataProvider_"+RoIs )
tgcAcc.getEventAlgo("TgcRawDataProvider_"+RoIs).RoIs = RoIs
+ tgcAcc.getEventAlgo("TgcRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_TGC
acc.merge( tgcAcc )
# Get TGC BS->RDO convertor
@@ -160,6 +175,7 @@ def decodeCfg(flags, RoIs):
from MuonConfig.MuonBytestreamDecodeConfig import MdtBytestreamDecodeCfg
mdtAcc = MdtBytestreamDecodeCfg( flags, name="MdtRawDataProvider_"+RoIs )
mdtAcc.getEventAlgo("MdtRawDataProvider_"+RoIs).RoIs = RoIs
+ mdtAcc.getEventAlgo("MdtRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_MDT
acc.merge( mdtAcc )
# Get MDT BS->RDO convertor
@@ -172,6 +188,7 @@ def decodeCfg(flags, RoIs):
from MuonConfig.MuonBytestreamDecodeConfig import CscBytestreamDecodeCfg
cscAcc = CscBytestreamDecodeCfg( flags, name="CscRawDataProvider_"+RoIs )
cscAcc.getEventAlgo("CscRawDataProvider_"+RoIs).RoIs = RoIs
+ cscAcc.getEventAlgo("CscRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_CSC
acc.merge( cscAcc )
# Get CSC BS->RDO convertor
@@ -377,7 +394,7 @@ def generateChains( flags, chainDict ):
recoCB.mergeReco(muonCombCfg)
muonCreatorCBCfg = MuonCreatorAlgCfg(muonflags, name="TrigMuonCreatorAlgCB_RoI", MuonCandidateLocation="MuonCandidates", TagMaps=["muidcoTagMap"],
- InDetCandidateLocation="InDetCandidates_RoI", MuonContainerLocation = "MuonsCB", SegmentContainerName = "CBSegments",
+ InDetCandidateLocation="InDetCandidates_RoI", MuonContainerLocation = "MuonsCB", SegmentContainerName = "xaodCBSegments", TrackSegmentContainerName = "TrkCBSegments",
ExtrapolatedLocation = "CBExtrapolatedMuons", MSOnlyExtrapolatedLocation = "CBMSonlyExtrapolatedMuons", CombinedLocation = "HLT_CBCombinedMuon_RoI")
recoCB.mergeReco(muonCreatorCBCfg)