diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/SCT_Monitoring/CMakeLists.txt index eaab33a9fc63244500891f345447efca7198a7aa..65014e9bb110ef37bda65e920ef88919d97f9928 100644 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/CMakeLists.txt +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/CMakeLists.txt @@ -25,6 +25,7 @@ atlas_depends_on_subdirs( PUBLIC Control/DataModel DetectorDescription/Identifier Event/EventInfo + Event/xAOD/xAODEventInfo InnerDetector/InDetDetDescr/InDetIdentifier InnerDetector/InDetRawEvent/InDetRawData InnerDetector/InDetRecEvent/InDetRIO_OnTrack diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/cmt/requirements b/InnerDetector/InDetMonitoring/SCT_Monitoring/cmt/requirements index ccf41c2e0c5d16592960db1c9b7373388d10aba0..273b6bee9cbffe9bf93dff6dbc740d2b60f87fd6 100755 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/cmt/requirements +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/cmt/requirements @@ -5,6 +5,7 @@ author Shaun Roe <shaun.roe@cern.ch> private # General use EventInfo EventInfo-* Event +use xAODEventInfo xAODEventInfo-* Event/xAOD use DataModel DataModel-* Control use AthenaKernel AthenaKernel-* Control @@ -45,7 +46,7 @@ use AtlasROOT AtlasROOT-* External use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr -use AtlasBoost AtlasBoost-* External +#use AtlasBoost AtlasBoost-* External use GaudiInterface GaudiInterface-* External use AthenaMonitoring AthenaMonitoring-* Control diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx index 91c0a5378acf72cc4e6098ae2feace40223fe098..36027a2962a332a177b1252b799e66ca9580aca1 100755 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx @@ -38,8 +38,7 @@ #include "Identifier/Identifier.h" #include "InDetIdentifier/SCT_ID.h" #include "InDetReadoutGeometry/SCT_DetectorManager.h" -#include "EventInfo/EventID.h" -#include "EventInfo/EventInfo.h" +#include "xAODEventInfo/EventInfo.h" #include "cArrayUtilities.h" #include <vector> #include <set> @@ -225,12 +224,12 @@ SCTErrMonTool::SCTErrMonTool(const std::string & type,const std::string & name,c m_LinksWithBadErrorsVsLBLayer{}, m_LinksWithLnkErrorsVsLBLayer{}, m_LinksWithRODErrorsVsLBLayer{}, + m_NumberOfSCTFlagErrorsVsLB{}, + m_NumberOfEventsVsLB{}, m_ConfEffOnline{}, m_ConfNoiseOnline{}, m_ConfNoiseOnlineRecent{}, m_DetailedConfiguration{}, - m_NumberOfSCTFlagErrorsVsLB{}, - m_NumberOfEventsVsLB{}, m_thistSvc("THistSvc",name), m_byteStreamErrSvc("SCT_ByteStreamErrorsSvc",name), m_checkBadModules(true), @@ -378,17 +377,17 @@ StatusCode SCTErrMonTool::bookHistograms() //==================================================================================================== StatusCode SCTErrMonTool::fillHistograms(){ typedef SCT_RDORawData SCTRawDataType; - const EventInfo* pEvent(0); + const xAOD::EventInfo* pEvent(0); if( evtStore()->retrieve(pEvent).isFailure() ) { ATH_MSG_WARNING( "Could not retrieve event info!" ); return StatusCode::RECOVERABLE; } - m_current_lb = pEvent->event_ID()->lumi_block(); + m_current_lb = pEvent->lumiBlock(); if (fillByteStreamErrors().isFailure() ) { ATH_MSG_ERROR("Could not fill ByteStreamErrors "); return StatusCode::FAILURE; } - if(pEvent->errorState(EventInfo::SCT)==EventInfo::Error){ + if(pEvent->errorState(xAOD::EventInfo::SCT)==xAOD::EventInfo::Error){ //ATH_MSG_WARNING("SCT_Flag==FALSE:: LVL1ID Errors >500 "); m_NumberOfSCTFlagErrorsVsLB->Fill(m_current_lb); return StatusCode::SUCCESS; @@ -710,12 +709,12 @@ void SCTErrMonTool::numByteStreamErrors(const std::set<IdentifierHash>* errors, StatusCode SCTErrMonTool::fillByteStreamErrors() { // Masked and ROB Fragment vs. lb - const EventInfo* pEvent(0); + const xAOD::EventInfo* pEvent(0); if( evtStore()->retrieve(pEvent).isFailure() ) { if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not retrieve event info!" <<endreq; return StatusCode::FAILURE; } - unsigned int current_lb = pEvent->event_ID()->lumi_block(); + unsigned int current_lb = pEvent->lumiBlock(); int bytestream_errs[N_ERRTYPES][NREGIONS_INC_GENERAL]; int tot_mod_bytestream_errs[N_ERRTYPES][NREGIONS_INC_GENERAL];