From 2001c4881037f3bdb217ba7f79f1de5d946854aa Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Thu, 6 Dec 2018 17:48:01 +0100
Subject: [PATCH] debugging hooks
Former-commit-id: dc9573228e1c587bb61450c8732d826fd0d9645b
---
Control/AthViews/AthViews/ViewHelper.h | 11 +++++++++++
.../TrigUpgradeTest/share/egamma.withViews.py | 4 +++-
.../TrigUpgradeTest/test/test_egamma_run_data.sh | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Control/AthViews/AthViews/ViewHelper.h b/Control/AthViews/AthViews/ViewHelper.h
index 0db05af03d4..c931b3340cc 100644
--- a/Control/AthViews/AthViews/ViewHelper.h
+++ b/Control/AthViews/AthViews/ViewHelper.h
@@ -178,6 +178,8 @@ namespace ViewHelper
//Make accessor for bookkeeping
SG::AuxElement::Accessor< int > viewBookkeeper( "viewIndex" );
+ SG::AuxElement::ConstAccessor< float > seeAux( "eta" );
+
//Loop over all views
unsigned int offset = 0;
for ( unsigned int viewIndex = 0; viewIndex < ViewVector.size(); ++viewIndex )
@@ -210,7 +212,16 @@ namespace ViewHelper
//Add aux data for bookkeeping
viewBookkeeper( *outputObject ) = viewIndex;
+ if ( seeAux.isAvailable( *inputObject ) )
+ m_msg << MSG::DEBUG << "JU input " << seeAux( *inputObject ) << endmsg;
+
+ if ( seeAux.isAvailable( *outputObject ) )
+ m_msg << MSG::DEBUG << "JU output " << seeAux( *outputObject ) << endmsg;
}
+ // junk to testing xAOD
+
+
+ // eof junk
m_msg << MSG::DEBUG << "Copied " << queryHandle->size() << " objects from collection in view " << inputView->name() << endmsg;
//Declare remapping
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 817c7cb8b50..93abab10fc0 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -58,7 +58,7 @@ clustersKey = "HLT_xAOD__TrigEMClusterContainer_L2CaloClusters" #"L2CaloClusters
def createFastCaloSequence(rerun=False):
__prefix = "Rerurn_" if rerun else ""
- __l1RoIDecisions = "RerunEMRoIDecisions" if rerun else "EMRoIDecisions"
+ __l1RoIDecisions = "RerunL1EM" if rerun else "L1EM"
__forViewDecsions = "RerunEMRoIDecisions" if rerun else "Filtered"+__l1RoIDecisions
from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_FastAlgo
@@ -350,6 +350,8 @@ serialiser = TriggerEDMSerialiserTool(name="Serialiser", OutputLevel=VERBOSE)
serialiser.CollectionsToSerialize = [ "xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions",
"xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux.",
+ "xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters",
+ "xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux.eta",
"xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex",
"xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot" ]
#"xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux." ]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
index 44ab78d69ad..c1feeb64e49 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
@@ -2,6 +2,6 @@
# art-type: build
# art-include: master/Athena
-athena --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py &&
+athena --threads=1 --skipEvents=10 --evtMax=5 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py &&
checkxAOD.py myESD.pool.root &&
athena TrigUpgradeTest/checkESD.py
--
GitLab