Skip to content
Snippets Groups Projects
Commit 18fa9921 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'roibtoado' into 'master' 

AnalysisTriggerAlgs: migrate RoIBResultToAOD to muon RoI tools

See merge request !41591
parents 2ac275d8 44a67070
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!41591AnalysisTriggerAlgs: migrate RoIBResultToAOD to muon RoI tools
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 182 deletions
PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/share/AOD_Builder_jobOptions.py
+ 0
− 4
View file @ 18fa9921
......@@ -28,10 +28,6 @@ if AODFlags.FastSimulation:
if jobproperties.FastSimulation.doAtlfastICorrection == True:
include ( "AtlfastCorrectionAlgs/AtlfastCDivide.py" )
# run Fake HLT for streaming
if AODFlags.Streaming:
protectedInclude( "AnalysisTriggerAlgs/FakeHLT_jobOptions.py" )
from CaloRec.CaloCellFlags import jobproperties
if jobproperties.CaloCellFlags.doFastCaloSim.statusOn:
protectedInclude ("AtlfastAlgs/Atlfast_FastCaloSim_MuonFragment.py")
......
PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/share/TriggerStuff_jobOptions.py deleted 100755 → 0
+ 0
− 12
View file @ 2ac275d8
# Pool Converter
include("TrigT1EventAthenaPool/TrigT1EventAthenaPool_joboptions.py")
# LVL1 config
include("TrigT1Config/TrigT1ConfigJobOptions.py")
#L1Config = Service( "L1Config" )
#L1Config.triggerMenuFileLocation = "LVL1triggermenuDC2.xml"
#L1Config.thresholdListFileLocation = "LVL1triggerthresholdsDC2.xml"
# for RecMuonRoI svc
include ( "TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvcJobOptions.py" )
include ( "TrigT1RPCRecRoiSvc/TrigT1RPCRecRoiSvcJobOptions.py" )
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
+ 2
− 8
View file @ 18fa9921
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisTriggerAlgs )
# External dependencies:
find_package( CLHEP )
# Component(s) in the package:
atlas_add_component( AnalysisTriggerAlgs
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib
LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib
EventInfo xAODTrigL1Calo xAODTrigger GaudiKernel AnalysisTriggerEvent
TrigConfData TrigConfL1Data TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Interfaces
TrigT1Result TrigConfInterfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/MuCTPI_RDOToRoIBResult.h
+ 2
− 3
View file @ 18fa9921
// Dear emacs, this is -*- c++ -*-
/*
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: MuCTPI_RDOToRoIBResult.h 275499 2010-01-27 18:25:00Z krasznaa $
#ifndef ANALYSISTRIGGERALGS_MUCTPI_RDOTOROIBRESULT_H
#define ANALYSISTRIGGERALGS_MUCTPI_RDOTOROIBRESULT_H
......@@ -32,7 +31,7 @@ public:
MuCTPI_RDOToRoIBResult( const std::string& name, ISvcLocator* pSvcLocator );
/// Regular algorithm execure function
virtual StatusCode execute();
virtual StatusCode execute() override;
private:
/// Extract the BCID stored in the multiplicity word
......
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToAOD.cxx
+ 22
− 35
View file @ 18fa9921
/*
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: RoIBResultToAOD.cxx 784984 2016-11-18 05:53:57Z ssnyder $
// STL include(s):
#include <algorithm>
#include <cmath>
// Gaudi/Athena include(s):
#include "GaudiKernel/SystemOfUnits.h"
#include "AthenaKernel/errorcheck.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "EventInfo/EventType.h"
......@@ -19,7 +18,6 @@
// LVL1 trigger include(s):
#include "TrigT1Interfaces/TriggerTypeWord.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
#include "TrigT1Interfaces/RecMuonRoiSvc.h"
#include "TrigT1Interfaces/RecEmTauRoI.h"
#include "TrigT1Interfaces/RecJetRoI.h"
#include "TrigT1Interfaces/RecEnergyRoI.h"
......@@ -27,8 +25,6 @@
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Result/CTPResult.h"
#include "TrigT1CaloToolInterfaces/IL1EmTauTools.h"
#include "TrigT1CaloToolInterfaces/IL1JetTools.h"
#include "TrigT1CaloEvent/TriggerTowerCollection.h"
#include "TrigT1CaloEvent/JetElementCollection.h"
#include "TrigT1CaloEvent/CPMTower.h"
......@@ -56,17 +52,18 @@ using namespace TrigConf;
RoIBResultToAOD::RoIBResultToAOD( const std::string& name, ISvcLocator* pSvcLocator )
: AthAlgorithm( name, pSvcLocator ),
m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name ),
m_recRPCRoiSvc( LVL1::ID_RecRpcRoiSvc, name ),
m_recTGCRoiSvc( LVL1::ID_RecTgcRoiSvc, name ),
m_recRPCRoiTool( "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool", name ),
m_recTGCRoiTool( "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool", name ),
m_EmTauTool( "LVL1::L1EmTauTools/L1EmTauTools" ),
m_JetTool( "LVL1::L1JetTools/L1JetTools" ) {
// services
declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
declareProperty( "RecRpcRoiSvc", m_recRPCRoiSvc, "RPC Rec Roi Service");
declareProperty( "RecTgcRoiSvc", m_recTGCRoiSvc, "TGC Rec Roi Service");
// tools
declareProperty( "RecRpcRoiTool", m_recRPCRoiTool, "RPC Rec Roi Tool");
declareProperty( "RecTgcRoiTool", m_recTGCRoiTool, "TGC Rec Roi Tool");
declareProperty( "L1EmTauTools", m_EmTauTool,
"Tool for calculation of EmTau trigger sums per RoI");
declareProperty( "L1JetTools", m_JetTool,
......@@ -106,8 +103,7 @@ RoIBResultToAOD::RoIBResultToAOD( const std::string& name, ISvcLocator* pSvcLoca
// Initialize
StatusCode RoIBResultToAOD::initialize() {
ATH_MSG_INFO( "initializing " << name()
<< " - package version " << PACKAGE_VERSION );
ATH_MSG_INFO( "initializing " << name() );
// Print system info
if( m_doCalo == false ) {
......@@ -123,13 +119,13 @@ StatusCode RoIBResultToAOD::initialize() {
if( m_doMuon ) {
// Get the RPC RecRoI service
CHECK( m_recRPCRoiSvc.retrieve() );
ATH_MSG_DEBUG( "Connected to " << m_recRPCRoiSvc.typeAndName() );
// Get the RPC RecRoI tool
CHECK( m_recRPCRoiTool.retrieve() );
ATH_MSG_DEBUG( "Connected to " << m_recRPCRoiTool.typeAndName() );
// Get the TGC RecRoI service
CHECK( m_recTGCRoiSvc.retrieve() );
ATH_MSG_DEBUG( "Connected to " << m_recTGCRoiSvc.typeAndName() );
// Get the TGC RecRoI tool
CHECK( m_recTGCRoiTool.retrieve() );
ATH_MSG_DEBUG( "Connected to " << m_recTGCRoiTool.typeAndName() );
} // if (m_doMuon)
......@@ -149,15 +145,6 @@ StatusCode RoIBResultToAOD::initialize() {
return StatusCode::SUCCESS;
}
// finalize
StatusCode RoIBResultToAOD::finalize() {
ATH_MSG_INFO( "Finalizing " << name()
<< " - package version " << PACKAGE_VERSION );
return StatusCode::SUCCESS;
}
// execute
StatusCode RoIBResultToAOD::execute() {
......@@ -360,7 +347,7 @@ void RoIBResultToAOD::addEmTauRoI( const ROIB::RoIBResult* result, LVL1_ROI* lvl
if( result == 0 ) return;
// Digit scale for calorimeter trigger
float caloTrigScale = m_configSvc->thresholdConfig()->caloInfo().globalScale() * CLHEP::GeV;
float caloTrigScale = m_configSvc->thresholdConfig()->caloInfo().globalScale() * Gaudi::Units::GeV;
ATH_MSG_DEBUG( "caloTrigScale = " << caloTrigScale );
/** Get EmTau Thresholds from configSvc. Also fill a map of threshold names while
......@@ -423,7 +410,7 @@ void RoIBResultToAOD::addEmTauRoI( const ROIB::RoIBResult* result, LVL1_ROI* lvl
std::vector< unsigned int >::const_iterator itTh = thrV->begin();
std::vector< unsigned int >::const_iterator itThE = thrV->end();
for( ; itTh != itThE; ++itTh ) {
double thrValue = recRoI.triggerThreshold(*itTh)* CLHEP::GeV;
double thrValue = recRoI.triggerThreshold(*itTh)* Gaudi::Units::GeV;
std::string thrName = "NameNotFound";
if ( thresholdNames.find( *itTh - 1 ) != thresholdNames.end() ) {
thrName = thresholdNames[ *itTh - 1 ];
......@@ -466,7 +453,7 @@ void RoIBResultToAOD::addJetEnergyRoI( const ROIB::RoIBResult* result, LVL1_ROI*
if( result == 0 ) return;
// Digit scale for calorimeter trigger
float caloTrigScale = m_configSvc->thresholdConfig()->caloInfo().globalScale() * CLHEP::GeV;
float caloTrigScale = m_configSvc->thresholdConfig()->caloInfo().globalScale() * Gaudi::Units::GeV;
ATH_MSG_DEBUG( "caloTrigScale = " << caloTrigScale );
/** Get Jet/Energy Thresholds from configSvc. Also fill maps of threshold names while
......@@ -567,7 +554,7 @@ void RoIBResultToAOD::addJetEnergyRoI( const ROIB::RoIBResult* result, LVL1_ROI*
// fired Jet thresholds
for( const unsigned int thrMapping : recRoI.thresholdsPassed()) {
double thrValue = recRoI.triggerThreshold(thrMapping) * CLHEP::GeV;
double thrValue = recRoI.triggerThreshold(thrMapping) * Gaudi::Units::GeV;
std::string thrName = "NameNotFound";
if (!recRoI.isForwardJet()) {
if (jetNames.find(thrMapping-1) != jetNames.end()) thrName = jetNames[thrMapping-1];
......@@ -725,15 +712,15 @@ void RoIBResultToAOD::addMuonRoI( const ROIB::RoIBResult* result, LVL1_ROI* lvl1
ATH_MSG_DEBUG( MSG::hex << std::setw( 8 ) << roIWord );
if( ( m_recRPCRoiSvc == false ) || ( m_recTGCRoiSvc == false ) ) {
if( ( m_recRPCRoiTool == false ) || ( m_recTGCRoiTool == false ) ) {
continue;
}
// RecRoI
LVL1::RecMuonRoI recRoI( roIWord, m_recRPCRoiSvc.operator->(),
m_recTGCRoiSvc.operator->(), &muonThresholds );
LVL1::RecMuonRoI recRoI( roIWord, m_recRPCRoiTool.get(),
m_recTGCRoiTool.get(), &muonThresholds );
double thrValue = recRoI.getThresholdValue() * CLHEP::GeV;
double thrValue = recRoI.getThresholdValue() * Gaudi::Units::GeV;
int index = recRoI.getThresholdNumber() - 1;
std::string thrName = "NameNotFound";
if( thresholdNames.find(index) != thresholdNames.end() ) {
......
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToAOD.h
+ 7
− 9
View file @ 18fa9921
// 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: RoIBResultToAOD.h 452138 2011-08-04 11:10:41Z krasznaa $
#ifndef ANALYSISTRIGGERALGS_ROIBRESULTTOAOD_H
#define ANALYSISTRIGGERALGS_ROIBRESULTTOAOD_H
......@@ -13,7 +12,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
#include "TrigT1Interfaces/RecMuonRoiSvc.h"
#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "TrigT1CaloToolInterfaces/IL1JetTools.h"
#include "TrigT1CaloToolInterfaces/IL1EmTauTools.h"
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
......@@ -49,9 +48,8 @@ class RoIBResultToAOD : public AthAlgorithm {
public:
RoIBResultToAOD( const std::string& name, ISvcLocator* pSvcLocator );
StatusCode initialize();
StatusCode finalize();
StatusCode execute();
virtual StatusCode initialize() override;
virtual StatusCode execute() override;
private:
/// build CTP_Decision from CTPResult stored in ROIB::RoIBResult
......@@ -66,10 +64,10 @@ private:
// services
ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
ServiceHandle<LVL1::RecMuonRoiSvc> m_recRPCRoiSvc; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
ServiceHandle<LVL1::RecMuonRoiSvc> m_recTGCRoiSvc; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
// tools
ServiceHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRPCRoiTool; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
ServiceHandle<LVL1::ITrigT1MuonRecRoiTool> m_recTGCRoiTool; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
ToolHandle<LVL1::IL1EmTauTools> m_EmTauTool; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
ToolHandle<LVL1::IL1JetTools> m_JetTool; //!< property, see @link RoIBResultToAOD::RoIBResultToAOD @endlink
bool m_retrievedEmTauTool;
......
Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.h
+ 0
− 1
View file @ 18fa9921
......@@ -16,7 +16,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
#include "TrigT1Interfaces/RecMuonRoiSvc.h"
#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "RoIsUnpackingToolBase.h"
......
Trigger/TrigT1/TrigT1EventAthenaPool/share/jobOptions_WriteLVL1_Pool.py deleted 100755 → 0
+ 0
− 110
View file @ 2ac275d8
#=============================================================
#
# jopOptions file for writing BS from ZEBRA DC1 input.
#
#==============================================================
#--------------------------------------------------------------
# Read in Zebra MC event
#--------------------------------------------------------------
theApp.setup( ZEBRA )
# specify input file
theApp.EvtSel = "EventSelector"
# Number of events to be processed (default is 10)
theApp.EvtMax = 10
#--------------------------------------------------------------
# write out Transient Event Store content in POOL
#--------------------------------------------------------------
include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" )
# Define the output Db parameters (the default value are shown)
Stream1.OutputFile = "LVL1Pool.root"
# Converters:
include( "EventAthenaPool/EventAthenaPool_joboptions.py" )
include( "TrigT1EventAthenaPool/TrigT1EventAthenaPool_joboptions.py" )
#--------------------------------------------------------------
# Event parameters
#--------------------------------------------------------------
# For runs: provide a first/last range or a list
EventSelector.runs = [1, 30000]
# Switch of detectors not needed
EventSelector.muons=FALSE
EventSelector.indet=FALSE
EventSelector.pixel=FALSE
EventSelector.sct=FALSE
EventSelector.trt=FALSE
EventSelector.calos=FALSE
EventSelector.tile=FALSE
EventSelector.hec=FALSE
EventSelector.fcal=FALSE
#--------------------------------------------------------------
# Use auditors
#--------------------------------------------------------------
theApp.Dlls += [ "GaudiAud" ]
# write out a summary of the time spent
theAuditorSvc = AuditorSvc()
theAuditorSvc.Auditors += [ "ChronoAuditor"]
# write out s summary of the memory usage
theAuditorSvc.Auditors += [ "MemStatAuditor" ]
MemStatAuditor = theAuditorSvc.auditor( "MemStatAuditor" )
MemStatAuditor.OutputLevel = 4
#--------------------------------------------------------------
# Output levels
#--------------------------------------------------------------
# Set output level threshold
# (0=NIL 1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
MessageSvc.OutputLevel = 2
# switch down Svc output level
StoreGateSvc = Service( "StoreGateSvc" )
StoreGateSvc.OutputLevel = 2
ClassIDSvc = Service( "ClassIDSvc" )
ClassIDSvc.OutputLevel = 4
DllClassManager = Algorithm( "DllClassManager" )
DllClassManager.OutputLevel = 4
MuonDetMgrDetDescrCnv = Service( "MuonDetMgrDetDescrCnv" )
MuonDetMgrDetDescrCnv.OutputLevel = 4
# list of output objects key
# EventInfo
Stream1 = Algorithm( "Stream1" )
Stream1.ItemList+=["2101#*"]
# MuCTPI
Stream1.ItemList+=["6270#*"]
# RoIB
Stream1.ItemList+=["6000#*"]
# run LVL1
##include "TrigT1RPCRecRoiSvc/TrigT1RPCRecRoiSvcJobOptions.txt"
##include "TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvcJobOptions.txt"
include( "TrigT1Config/TrigT1ConfigJobOptions.py" )
include( "TrigT1Muctpi/TrigT1Muctpi_jobOptions.py" )
include( "TrigT1CTP/TrigT1CTPJobOptions.py" )
include( "TrigT1RoIB/TrigT1RoIBJobOptions.py" )
L1Muctpi = Algorithm( "L1Muctpi" )
L1Muctpi.OutputLevel = 2
#---------------------------------------------------------------
# Ntuple service output
#---------------------------------------------------------------
# Algs
theApp.Dlls += [ "CBNT_Athena", "CBNT_Utils" ]
theApp.TopAlg += [ "CBNT_Athena/CBNT_LVL1" ]
CBNT_LVL1 = Algorithm( "CBNT_LVL1" )
CBNT_LVL1.members = [
"ReadMuCTPI_RDO",
"ReadRoIBResult"
]
ReadMuCTPI_RDO = Algorithm( "ReadMuCTPI_RDO" )
ReadMuCTPI_RDO.NtupleLocID = "/FILE1/MUCTPI/200"
ReadReadRoIBResult = Algorithm( "ReadReadRoIBResult" )
ReadReadRoIBResult.NtupleLocID = "/FILE1/ROIB/201"
theApp.Dlls += [ "RootHistCnv" ]
theApp.HistogramPersistency = "ROOT"
NTupleSvc = Service( "NTupleSvc" )
NTupleSvc.Output = [ "FILE1 DATAFILE='lvl1POOL_W.root' OPT='NEW'" ]
# Histogram output, if any.
HistogramPersistencySvc = Service( "HistogramPersistencySvc" )
HistogramPersistencySvc.OutputFile = "histo.hbook"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment