From 15376772d8e09d34741acdb1b98915eb3dba086a Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 17 Apr 2019 15:36:52 +0200
Subject: [PATCH] TrigT1Monitoring: Fix use of HVScale conditions object.
The data in the HVScale conditions object is different from that gotten
from the old tool in that the scales in the conditions object have been
divided by the online scale values. L1CaloHVScalesMon was using the
unnormalized scales, so convert back.
---
Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx | 4 +++-
Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
index cea82c5372f..a2cbc1aeb39 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
@@ -124,6 +124,7 @@ StatusCode L1CaloHVScalesMon:: initialize()
}
ATH_CHECK( m_scaleCorrKey.initialize() );
+ ATH_CHECK( m_onlineScaleCorrKey.initialize() );
ATH_CHECK( m_cablingKey.initialize() );
return StatusCode::SUCCESS;
@@ -369,6 +370,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
const EventContext& ctx = Gaudi::Hive::currentContext();
SG::ReadCondHandle<ILArHVScaleCorr> scaleCorr (m_scaleCorrKey, ctx);
+ SG::ReadCondHandle<ILArHVScaleCorr> onlineScaleCorr (m_onlineScaleCorrKey, ctx);
SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
CaloCellContainer::const_iterator CaloCellIterator = caloCellContainer->begin();
@@ -395,7 +397,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
const int layer = m_lvl1Helper->sampling(ttId1);
const Identifier cellId(caloCell->ID());
HWIdentifier hwid = cabling->createSignalChannelID(cellId);
- const double scale = scaleCorr->HVScaleCorr(hwid);
+ const double scale = scaleCorr->HVScaleCorr(hwid) * onlineScaleCorr->HVScaleCorr(hwid);
if (debug && scale < 1.) {
msg(MSG::DEBUG) << " Current Mean Scale " << scale << " for sampling " << sampling
<< " eta/phi " << eta << "/" << phi << endmsg;
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h
index 6240b1649ee..25d79b7e992 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.h
@@ -166,6 +166,8 @@ private:
/// Current CaloCell HV corrections
SG::ReadCondHandleKey<ILArHVScaleCorr> m_scaleCorrKey
{ this, "LArHVScaleCorr", "LArHVScaleCorrRecomputed", "" };
+ SG::ReadCondHandleKey<ILArHVScaleCorr> m_onlineScaleCorrKey
+ { this, "OnlineLArHVScaleCorr", "LArHVScaleCorr", "" };
/// LVL1 ID helper1
const CaloLVL1_ID* m_lvl1Helper;
/// L1Calo conditions service
--
GitLab