From 9fae1b467d6c70af6f4cee13df9b4d8096ed7e1b Mon Sep 17 00:00:00 2001
From: Hass AbouZeid <hass.abouzeid@cern.ch>
Date: Wed, 21 Jun 2017 18:43:07 +0000
Subject: [PATCH] Merge branch '21.0-add-MNB-FEB' into '21.0'
Adding FEB EMBC FT/SL 08/14 for MNB and fixing duplication of saturated histograms
See merge request !2827
Former-commit-id: 2934f140365fe97ff5a92a5afc2b0b75f07e0ea2
---
LArCalorimeter/LArCellRec/python/LArNoisyROFlags.py | 3 ++-
LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx | 4 ++--
LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx | 9 +++++----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/LArCalorimeter/LArCellRec/python/LArNoisyROFlags.py b/LArCalorimeter/LArCellRec/python/LArNoisyROFlags.py
index cf8d30e6462..a0ff42f9200 100644
--- a/LArCalorimeter/LArCellRec/python/LArNoisyROFlags.py
+++ b/LArCalorimeter/LArCellRec/python/LArNoisyROFlags.py
@@ -36,7 +36,8 @@ class KnownMNBFEBs(JobProperty):
961839104, # EMBA FT 10 Slot 10
961970176, # EMBA FT 10 Slot 14
972980224, # EMBA FT 31 Slot 14
- 961445888 # EMBA FT 9 Slot 14
+ 961445888, # EMBA FT 9 Slot 14
+ 944144384 # EMBC FT 8 Slot 14 - added June 20 2017
]
pass
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
index 62465ab46f1..71da39914f6 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
@@ -63,8 +63,8 @@ LArNoisyROTool::LArNoisyROTool( const std::string& type,
972980224 // EMBA FT 31 Slot 14
});
- declareProperty( "MNBLooseCut",m_MNBLooseCut=9,"Number of cells above CellQualityCut");
- declareProperty( "MNBTightCut",m_MNBTightCut=33,"Number of cells above CellQualityCut");
+ declareProperty( "MNBLooseCut",m_MNBLooseCut=5,"Number of cells above CellQualityCut");
+ declareProperty( "MNBTightCut",m_MNBTightCut=17,"Number of cells above CellQualityCut");
declareProperty( "OutputKey", m_outputKey="LArNoisyROSummary");
diff --git a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
index cced9f487a3..df4271fe61b 100644
--- a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
@@ -667,26 +667,27 @@ StatusCode LArNoisyROMon::fillHistograms()
}
// event flagged by # of saturated quality cells
+ uint8_t SatTightPartitions = noisyRO->SatTightFlaggedPartitions();
if ( eventInfo->isEventFlagBitSet(xAOD::EventInfo::LAr,LArEventBitInfo::TIGHTSATURATEDQ) )
{
m_h_SaturatedTight->Fill(LBN);
if ( !burstveto ) m_h_SaturatedTightTimeVeto->Fill(LBN);
- if ( (LArNoisyROSummary::EMECAMask) != 0 )
+ if ( (SatTightPartitions & LArNoisyROSummary::EMECAMask) != 0 )
{
m_EMECA.h_SaturatedNoisyEvent->Fill(LBN);
if ( ! burstveto ) m_EMECA.h_SaturatedNoisyEventTimeVeto->Fill(LBN);
}
- if ( (LArNoisyROSummary::EMBAMask) != 0 )
+ if ( (SatTightPartitions & LArNoisyROSummary::EMBAMask) != 0 )
{
m_BarrelA.h_SaturatedNoisyEvent->Fill(LBN);
if ( ! burstveto ) m_BarrelA.h_SaturatedNoisyEventTimeVeto->Fill(LBN);
}
- if ( (LArNoisyROSummary::EMBCMask) != 0 )
+ if ( (SatTightPartitions & LArNoisyROSummary::EMBCMask) != 0 )
{
m_BarrelC.h_SaturatedNoisyEvent->Fill(LBN);
if ( ! burstveto ) m_BarrelC.h_SaturatedNoisyEventTimeVeto->Fill(LBN);
}
- if ( (LArNoisyROSummary::EMECCMask) != 0 )
+ if ( (SatTightPartitions & LArNoisyROSummary::EMECCMask) != 0 )
{
m_EMECC.h_SaturatedNoisyEvent->Fill(LBN);
if ( ! burstveto ) m_EMECC.h_SaturatedNoisyEventTimeVeto->Fill(LBN);
--
GitLab