Merge branch 'cherry-pick-0adbfb69 [formerly 7e72dfdf75]-master' into 'master'

Merge branch '21.0-add-MNB-FEB' into '21.0'

See merge request !2848

Former-commit-id: c351a273

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
 

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");

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);