Merge branch 'SC_masking_MC_r18' into '24.0'

LAr SC masking  in MC

See merge request atlas/athena!77680

LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py

@@ -23,7 +23,8 @@ def LArBadChannelCfg(configFlags, tag=None, isSC=False):
         # TODO: move this in a better location
         result.merge(addFolders(configFlags, "/LAR/BadChannels/BadChannels", "LAR_OFL", className="CondAttrListCollection", tag="LARBadChannelsBadChannels-HECAQ3Missing", db="OFLP200"))
     elif configFlags.Input.isMC:
-        result.merge(addFolders(configFlags,"/LAR/BadChannels/BadChannels","LAR_OFL",tag=tag,
+       folder = "/LAR/BadChannels/BadChannelsSC" if isSC else "/LAR/BadChannels/BadChannels"
+       result.merge(addFolders(configFlags,folder,"LAR_OFL",tag=tag,
                                 className="CondAttrListCollection"))
     else:
        if not isSC:

LArCalorimeter/LArROD/python/LArSuperCellBuilderConfig.py

@@ -11,6 +11,9 @@ def LArSuperCellBuilderAlgCfg(flags, **kwargs):
     acc.merge(LArOnOffIdMappingSCCfg(flags))
     kwargs.setdefault("CablingKey", 'LArOnOffIdMapSC')
 
+    from LArBadChannelTool.LArBadChannelConfig import  LArBadChannelCfg
+    acc.merge(LArBadChannelCfg(flags, isSC=True))
+
     from LArRecUtils.LArADC2MeVSCCondAlgConfig import LArADC2MeVSCCondAlgCfg
     acc.merge(LArADC2MeVSCCondAlgCfg(flags))
     kwargs.setdefault("ADC2MeVKey", 'LArADC2MeVSC')

LArCalorimeter/LArROD/src/LArRawChannelBuilderSCAlg.cxx

@@ -21,6 +21,7 @@ StatusCode LArRawChannelBuilderSCAlg::initialize() {
   ATH_CHECK(m_ofcKey.initialize());	 
   ATH_CHECK(m_shapeKey.initialize());
   ATH_CHECK(m_cablingKey.initialize() );
+  ATH_CHECK( m_bcContKey.initialize(SG::AllowEmpty) );
  
   ATH_CHECK(detStore()->retrieve(m_onlineId,"LArOnline_SuperCellID"));
   ATH_CHECK(m_caloSuperCellMgrKey.initialize());  
@@ -66,6 +67,12 @@ StatusCode LArRawChannelBuilderSCAlg::execute(const EventContext& ctx) const {
   SG::ReadCondHandle<CaloSuperCellDetDescrManager> caloSuperCellMgrHandle{m_caloSuperCellMgrKey,ctx};
   const CaloSuperCellDetDescrManager* caloMgr = *caloSuperCellMgrHandle;
 
+  const LArBadChannelCont* badchannel(nullptr);
+  if( !m_bcContKey.empty() ){
+     SG::ReadCondHandle<LArBadChannelCont> larBadChan{ m_bcContKey, ctx };
+     badchannel = *larBadChan;
+  }
+
   //Loop over digits:
   for (const LArDigit* digit : *inputContainer) {
 
@@ -213,6 +220,14 @@ StatusCode LArRawChannelBuilderSCAlg::execute(const EventContext& ctx) const {
     if(et>10e3 && tau>-8 && tau<16) prov |= LArProv::SCTIMEPASS; //0x200;
     else if(et<=10e3 && std::fabs(tau)<8) prov |= LArProv::SCTIMEPASS; //0x200; 
     if ( passBCIDmax ) prov |= LArProv::SCPASSBCIDMAX; //0x40;
+    // set some provenance to indicate bad channel
+    if(badchannel) {
+       LArBadChannel bc = badchannel->offlineStatus(offId);
+       if ( !bc.good() && bc.statusBad(LArBadChannel::LArBadChannelSCEnum::maskedOSUMBit) ){
+         prov |= 0x80;
+       }
+    }
+
     ss->setProvenance(prov);
     
     ss->setQuality(iquaShort);

LArCalorimeter/LArROD/src/LArRawChannelBuilderSCAlg.h

@@ -19,6 +19,7 @@
 #include "LArElecCalib/ILArShape.h" 
 #include "LArCabling/LArOnOffIdMapping.h"
 #include "AthenaPoolUtilities/AthenaAttributeList.h"
+#include "LArRecConditions/LArBadChannelCont.h"
 
 #include "CaloDetDescr/CaloDetDescrManager.h"
 //Event classes
@@ -53,6 +54,9 @@ class LArRawChannelBuilderSCAlg : public AthReentrantAlgorithm {
 
 
   SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMapSC","SG Key of LArOnOffIdMapping object"};
+
+  /// Bad Channel masking for Super-Cells
+  SG::ReadCondHandleKey<LArBadChannelCont> m_bcContKey{this, "LArBadChannelKey", "LArBadChannelSC", "Key of the LArBadChannelCont SC" };
   
   //Other jobOptions:
   Gaudi::Property<float> m_eCutFortQ{this,"ECutFortQ",256.0,"Time and Quality will be computed only for channels with E above this value"};