LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h

@@ -19,7 +19,6 @@
 #include "Identifier/Range.h" 
 #include "Identifier/IdentifierHash.h"
 #include "LArRecConditions/LArBadChannelCont.h"
-#include "CaloInterface/ICalorimeterNoiseTool.h"
 #include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
 #include "LArCabling/LArOnOffIdMapping.h"
 #include "LArIdentifier/LArOnlineID.h"

LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx

@@ -9,7 +9,6 @@
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloIdentifier/LArID_Exception.h"
-#include "CaloInterface/ICalorimeterNoiseTool.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "xAODEventInfo/EventInfo.h"
 #include "Identifier/HWIdentifier.h"

MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx

@@ -118,9 +118,6 @@ StatusCode MuonMDT_CablingAlg::execute(){
   }
     
   // access to Map Schema Table to obtained the Map
-  
-  bool BMGchamberadded = false;
-  
   CondAttrListCollection::const_iterator itrMap;
   for (itrMap = readCdoMap->begin(); itrMap != readCdoMap->end(); ++itrMap) {
     const coral::AttributeList& atr=itrMap->second;
@@ -152,7 +149,6 @@ StatusCode MuonMDT_CablingAlg::execute(){
     if (stationNameString == "BOE") {
       stationNameString = "BOL";
     }
-    if (stationNameString == "BMG") BMGchamberadded = true;    
     int stationIndex = m_idHelperSvc->mdtIdHelper().stationNameIndex(stationNameString);
     ATH_MSG_VERBOSE( "station name: " << stationNameString << " index: " << stationIndex  );
     // convert the subdetector id to integer
@@ -210,75 +206,6 @@ StatusCode MuonMDT_CablingAlg::execute(){
     } // end of info_map loop
 
   } // end of CondAttrListCollection loop
-
-  if(m_idHelperSvc->mdtIdHelper().stationNameIndex("BMG") != -1 && !BMGchamberadded) {
-    ATH_MSG_WARNING( "Running a layout including BMG chambers, but missing them in cabling from conditions --> hard-coding BMG cabling."  );
-    int stationIndex = m_idHelperSvc->mdtIdHelper().stationNameIndex("BMG");
-
-    // BMG1A12 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,   1,   6,          1,     4,(i*6)+1,            97,   50,   0, 16-2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,   1,   6,          2,     4,(i*6)+1,            97,   50,   0,   16-2*i,         0);
-    // BMG2A12 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,   2,   6,          1,     4,(i*6)+1,            97,   50,   1, 16-2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,   2,   6,          2,     4,(i*6)+1,            97,   50,   1,   16-2*i,         0);
-    // BMG3A12 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,   3,   6,          1,     4,(i*6)+1,            97,   50,   2, 16-2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,   3,   6,          2,     4,(i*6)+1,            97,   50,   2,   16-2*i,         0);
-
-    // BMG1C12 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,  -1,   6,          1,     4,(i*6)+6,            98,   50,   0,    2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,  -1,   6,          2,     4,(i*6)+6,            98,   50,   0,      2*i,         0);
-    // BMG2C12 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,  -2,   6,          1,     4,(i*6)+6,            98,   50,   1,    2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,  -2,   6,          2,     4,(i*6)+6,            98,   50,   1,      2*i,         0);
-    // BMG3C12 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,  -3,   6,          1,     4,(i*6)+6,            98,   50,   2,    2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,  -3,   6,          2,     4,(i*6)+6,            98,   50,   2,      2*i,         0);
-
-    // BMG1A14 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,   1,   7,          1,     4,(i*6)+6,            97,   51,   0,    2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,   1,   7,          2,     4,(i*6)+6,            97,   51,   0,      2*i,         0);
-    // BMG2A14 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,   2,   7,          1,     4,(i*6)+6,            97,   51,   1,    2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,   2,   7,          2,     4,(i*6)+6,            97,   51,   1,      2*i,         0);
-    // BMG3A14 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,   3,   7,          1,     4,(i*6)+6,            97,   51,   2,    2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,   3,   7,          2,     4,(i*6)+6,            97,   51,   2,      2*i,         0);
-
-    // BMG1C14 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,  -1,   7,          1,     4,(i*6)+1,            98,   51,   0, 16-2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,  -1,   7,          2,     4,(i*6)+1,            98,   51,   0,   16-2*i,         0);
-    // BMG2C14 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,  -2,   7,          1,     4,(i*6)+1,            98,   51,   1, 16-2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,  -2,   7,          2,     4,(i*6)+1,            98,   51,   1,   16-2*i,         0);
-    // BMG3C14 ---------------- mezzanine_type, stationIndex, eta, phi, multilayer, layer,   tube, subdetectorId, mrod, csm, tdcId, channelId
-    for(int i=0; i<9; i++) // ML1
-       writeCdo->addMezzanine(         60, stationIndex,  -3,   7,          1,     4,(i*6)+1,            98,   51,   2, 16-2*i+1,         0);
-    for(int i=0; i<9; i++) // ML2
-       writeCdo->addMezzanine(         60, stationIndex,  -3,   7,          2,     4,(i*6)+1,            98,   51,   2,   16-2*i,         0);
-  }
     
   ATH_MSG_VERBOSE( "Collection CondAttrListCollection CLID "
 		   << readCdoMap->clID()  );

MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/MuonByteStreamCnvTest/MdtDigitToMdtRDO.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MDTDIGITTOMDTRDO_H
@@ -12,7 +12,7 @@
 #include "MuonCablingData/MuonMDT_CablingMap.h"
 #include "StoreGate/ReadCondHandleKey.h"
 #include "MuonIdHelpers/IMuonIdHelperSvc.h"
-
+#include "MuonCondData/MdtCondDbData.h"
 /////////////////////////////////////////////////////////////////////////////
 
 class MdtDigitToMdtRDO : public AthReentrantAlgorithm {
@@ -34,13 +34,25 @@ class MdtDigitToMdtRDO : public AthReentrantAlgorithm {
   StatusCode fillTagInfo() const;
 
  protected:
-
-  bool m_BMEpresent{false};
-  ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
-  SG::WriteHandleKey<MdtCsmContainer> m_csmContainerKey{this,"OutputObjectName","MDTCSM","WriteHandleKey for Output MdtCsmContainer"};
-  SG::ReadHandleKey<MdtDigitContainer> m_digitContainerKey{this,"InputObjectName","MDT_DIGITS","ReadHandleKey for Input MdtDigitContainer"};
-  SG::ReadCondHandleKey<MuonMDT_CablingMap> m_readKey{this, "ReadKey", "MuonMDT_CablingMap", "Key of MuonMDT_CablingMap"};
-
+      bool m_BMEpresent{false};
+      int  m_BME_station_name{-1};
+      ///
+      bool m_BMGpresent{false};
+      int m_BMG_station_name{-1};
+      
+      ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+      SG::WriteHandleKey<MdtCsmContainer> m_csmContainerKey{this,"OutputObjectName","MDTCSM","WriteHandleKey for Output MdtCsmContainer"};
+      SG::ReadHandleKey<MdtDigitContainer> m_digitContainerKey{this,"InputObjectName","MDT_DIGITS","ReadHandleKey for Input MdtDigitContainer"};
+      SG::ReadCondHandleKey<MuonMDT_CablingMap> m_cablingKey{this, "CablingKey", "MuonMDT_CablingMap", "Key of MuonMDT_CablingMap"};
+      SG::ReadCondHandleKey<MdtCondDbData> m_condKey{this, "ConditionsKey",  "MdtCondDbData", "Key of MDT condition data"};
+
+     /// Create from the module_id a MdtCsmContainer
+     /// -- cabling_ptr: Pointer to the cached cabling map from the conditions
+     /// -- Identifier:  Identifier of the current chamber
+     /// -- moduleHash: 
+     /// -- need_second: Create the second CSM needed for BME and BIS78 (Run-III)
+     std::unique_ptr<MdtCsm> make_csm(const MuonMDT_CablingMap* cabling_ptr, const Identifier module_id, IdentifierHash module_hash, bool need_second) const;
+     
 };
 
 #endif

MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MdtDigitToMdtRDO.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonDigitContainer/MdtDigitContainer.h"
@@ -20,6 +20,22 @@
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
+namespace {
+   // elevator chambers are read out by 2 CSMs
+   // they are split in the middle (for both multilayers)
+   // the first tube read out by the 2nd CSM is (offline!) tube 43
+   constexpr int BME_1st_tube_2nd_CSM = 43;
+   
+   
+   /// Print one-time warnings about the missing BIS78 cabling
+   std::atomic<bool> bisWarningPrinted = false;
+   /// Print one-time warings about cases where the BMGs are part of the
+   /// geometry but not implemented in the cabling. That should only happen in
+   /// mc16a like setups.
+   std::atomic<bool> bmgWarningPrinted = false;
+   
+}
+
 
 MdtDigitToMdtRDO::MdtDigitToMdtRDO(const std::string& name, ISvcLocator* pSvcLocator) :
   AthReentrantAlgorithm(name, pSvcLocator)
@@ -36,16 +52,24 @@ StatusCode MdtDigitToMdtRDO::initialize()
   ATH_CHECK( m_digitContainerKey.initialize() );
   ATH_MSG_VERBOSE("Initialized ReadHandleKey: " << m_digitContainerKey );
   ATH_CHECK( m_idHelperSvc.retrieve() );
-  ATH_CHECK( m_readKey.initialize() );
+  ATH_CHECK( m_cablingKey.initialize() );
+  ATH_CHECK( m_condKey.initialize() );
 
   if ( fillTagInfo().isFailure() ) {
     ATH_MSG_WARNING( "Could not fill the tagInfo for MDT cabling"  );
   }
 
   // check if the layout includes elevator chambers
-  m_BMEpresent = m_idHelperSvc->mdtIdHelper().stationNameIndex("BME") != -1;
-  if ( m_BMEpresent )
-    ATH_MSG_INFO( "Processing configuration for layouts with BME chambers."  );
+  m_BME_station_name = m_idHelperSvc->mdtIdHelper().stationNameIndex("BME");
+  m_BMEpresent = m_BME_station_name != -1;
+  if ( m_BMEpresent ){
+    ATH_MSG_INFO( "Processing configuration for layouts with BME chambers (stationID: "<<m_BME_station_name<<")."  );
+  }
+  m_BMG_station_name =  m_idHelperSvc->mdtIdHelper().stationNameIndex("BMG");
+  m_BMGpresent =  m_BMG_station_name != -1;
+  if ( m_BMGpresent ){
+    ATH_MSG_INFO( "Processing configuration for layouts with BME chambers (stationID: "<<m_BMG_station_name<<")."  );
+  }
   
   return StatusCode::SUCCESS;
 }
@@ -64,7 +88,27 @@ StatusCode MdtDigitToMdtRDO::execute(const EventContext& ctx) const {
 
   return StatusCode::SUCCESS;
 }
-
+ std::unique_ptr<MdtCsm> MdtDigitToMdtRDO::make_csm(const MuonMDT_CablingMap* cabling_ptr, const Identifier module_id, IdentifierHash module_hash, bool need_second) const{
+      const int name    = m_idHelperSvc->mdtIdHelper().stationName(module_id);
+      const int eta     = m_idHelperSvc->mdtIdHelper().stationEta(module_id);
+      const int phi     = m_idHelperSvc->mdtIdHelper().stationPhi(module_id);
+      uint8_t subsystem{0}, mrod{0}, link{0}, tdc{0}, channel{0};
+       
+      int tube_to_use = 1;
+      if (m_BMEpresent && name == m_BME_station_name && need_second){
+          tube_to_use = BME_1st_tube_2nd_CSM;
+      }
+      
+      if(!cabling_ptr->getOnlineId(name, eta, phi, 1, 1, tube_to_use,
+                                  subsystem, mrod, link, tdc, channel)){
+        ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
+        ATH_MSG_ERROR( name << " "
+                            << eta << " " << phi << " "
+                            << "and dummy multilayer=1, layer=1, tube="<<tube_to_use<<" ."  );
+        return nullptr;
+    }
+    return std::make_unique<MdtCsm>(module_id, module_hash, subsystem, mrod, link);
+}
 
 StatusCode MdtDigitToMdtRDO::fill_MDTdata(const EventContext& ctx) const {
 
@@ -74,8 +118,6 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata(const EventContext& ctx) const {
   ATH_CHECK(csmContainer.record(std::make_unique<MdtCsmContainer>()));
   ATH_MSG_DEBUG("Recorded MdtCsmContainer called " << csmContainer.name() << " in store " << csmContainer.store());
 
-  IdContext mdtContext = m_idHelperSvc->mdtIdHelper().module_context();
-
   SG::ReadHandle<MdtDigitContainer> container (m_digitContainerKey, ctx);
   if (!container.isValid()) {
     ATH_MSG_ERROR("Could not find MdtDigitContainer called " << container.name() << " in store " << container.store());
@@ -83,190 +125,148 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata(const EventContext& ctx) const {
   }
   ATH_MSG_DEBUG("Found MdtDigitContainer called " << container.name() << " in store " << container.store());
 
-  typedef MdtDigitContainer::const_iterator collection_iterator;
-  typedef MdtDigitCollection::const_iterator digit_iterator;
-
+  
   MdtCsmIdHash hashF;
+  
+  SG::ReadCondHandle<MuonMDT_CablingMap> readHandle_Cabling{m_cablingKey, ctx};
+  const MuonMDT_CablingMap* cabling_ptr{*readHandle_Cabling};
+  if(!cabling_ptr){
+    ATH_MSG_ERROR("Null pointer to the read conditions object");
+    return StatusCode::FAILURE;
+  }
 
-  SG::ReadCondHandle<MuonMDT_CablingMap> readHandle{m_readKey, ctx};
-  const MuonMDT_CablingMap* readCdo{*readHandle};
-  if(readCdo==0){
+  SG::ReadCondHandle<MdtCondDbData> readHandle_Conditions{m_condKey, ctx};
+  const MdtCondDbData* condtionsPtr{*readHandle_Conditions};
+  if(!condtionsPtr){
     ATH_MSG_ERROR("Null pointer to the read conditions object");
     return StatusCode::FAILURE;
   }
 
   // Iterate on the collections
-  collection_iterator it_coll = container->begin();
-  for ( ; it_coll != container->end(); ++it_coll) 
-    {
-      const MdtDigitCollection* mdtCollection = *it_coll;
+  for ( const MdtDigitCollection* mdtCollection : *container) {
       IdentifierHash moduleHash = mdtCollection->identifierHash();
-      Identifier moduleId;
-      m_idHelperSvc->mdtIdHelper().get_id(moduleHash, moduleId, &mdtContext); 
-      int name    = m_idHelperSvc->mdtIdHelper().stationName(moduleId);
-      int eta     = m_idHelperSvc->mdtIdHelper().stationEta(moduleId);
-      int phi     = m_idHelperSvc->mdtIdHelper().stationPhi(moduleId);
+      Identifier moduleId = mdtCollection->identify();
+      
+      const int name    = m_idHelperSvc->mdtIdHelper().stationName(moduleId);
+      const int eta     = m_idHelperSvc->mdtIdHelper().stationEta(moduleId);
+      const int phi     = m_idHelperSvc->mdtIdHelper().stationPhi(moduleId);
  
       // Get the online ID of the MDT module
-      uint8_t subsystem;
-      uint8_t mrod;
-      uint8_t link;
-      uint8_t tdc;
-      uint8_t channel;
-      
-      bool cabling = readCdo->getOnlineId(name, eta, phi, 
-					  1, 1, 1,
-					  subsystem, mrod, link, 
-					  tdc, channel);
-
-      if (!cabling) {
-	ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
-	ATH_MSG_ERROR( name << " "
-                       << eta << " " << phi << " "
-                       << "and dummy multilayer=1, layer=1, tube=1 ."  );
-        return StatusCode::FAILURE;
-      } 
-
       Identifier chid1, chid2;
       if ( m_BMEpresent ){
-	// 1st ML channel get_id
-	chid1 = m_idHelperSvc->mdtIdHelper().channelID(m_idHelperSvc->mdtIdHelper().stationName(moduleId),
-					 m_idHelperSvc->mdtIdHelper().stationEta(moduleId),
-					 m_idHelperSvc->mdtIdHelper().stationPhi(moduleId),
-					 1, 1, 1 );
-	// 2nd ML channel id
-	if ( name == 53 ) {
-	  chid2 = m_idHelperSvc->mdtIdHelper().channelID(m_idHelperSvc->mdtIdHelper().stationName(moduleId),
-					   m_idHelperSvc->mdtIdHelper().stationEta(moduleId),
-					   m_idHelperSvc->mdtIdHelper().stationPhi(moduleId),
-					   2, 1, 1 );
-        
-        }
-      }
-
-      unsigned int elementHash = 0, elementHash_2nd = 0;
-      MdtCsm* mdtCsm = 0;
-      MdtCsm* mdtCsm_2nd = 0;
-
-      // elevator chambers are read out by 2 CSMs
-      // they are split in the middle (for both multilayers)
-      // the first tube read out by the 2nd CSM is (offline!) tube 43
-
-      if ( !m_BMEpresent ) {
-	elementHash = hashF( moduleId );
-	mdtCsm = new MdtCsm(moduleId, moduleHash, subsystem, mrod, link);
-
-      } else {
-
-	elementHash = hashF( chid1 ); 
-	elementHash_2nd = hashF( chid2 );
-	mdtCsm = new MdtCsm(chid1, moduleHash, subsystem, mrod, link);
-
-        if ( name == 53 ) {
-	  uint8_t subsystem_2ndcsm, mrod_2ndcsm, link_2ndcsm, tdc_2ndcsm, channel_2ndcsm;
-
-	  cabling = readCdo->getOnlineId(name, eta, phi, 1, 1, 43,
-					 subsystem_2ndcsm, mrod_2ndcsm,
-					 link_2ndcsm, tdc_2ndcsm, channel_2ndcsm);
-	  
-	  if (!cabling) {
-	    ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
-	    ATH_MSG_ERROR( name << " "
-                           << eta << " " << phi << " "
-                           << " and dummy multilayer=1, layer=1, tube=1 ."  );
-            return StatusCode::FAILURE;
-	  } 
-
-	  mdtCsm_2nd = new MdtCsm(chid2, elementHash_2nd, subsystem_2ndcsm, mrod_2ndcsm, link_2ndcsm);
-
-	}
+            /// 1st ML channel get_id
+            chid1 = m_idHelperSvc->mdtIdHelper().channelID(name,
+                                                           eta,
+                                                           phi,
+                                                           1, 1, 1 );
+            /// 2nd ML channel id
+            if ( name == m_BME_station_name ) {
+                chid2 = m_idHelperSvc->mdtIdHelper().channelID(name,
+                                                               eta,
+                                                               phi,
+                                                               2, 1, 1 );        
+            }
+      } else{
+          chid1 = moduleId;
       }
+      /// Remove dead tubes from the container
+      if (!condtionsPtr->isGood(chid1)) continue;
 
-      // Iterate on the digits of the collection
-      digit_iterator it_dig = mdtCollection->begin();
-      static std::atomic<bool> bisWarningPrinted = false;
-      for ( ; it_dig != mdtCollection->end() ; ++it_dig) {
-	  const MdtDigit* mdtDigit = *it_dig;
-	  Identifier channelId = mdtDigit->identify();
+      std::unique_ptr<MdtCsm> mdtCsm {nullptr}, mdtCsm_2nd{nullptr};
+      
+      mdtCsm = make_csm(cabling_ptr, chid1, moduleHash, false);
+      if (name == m_BME_station_name) mdtCsm_2nd =  make_csm(cabling_ptr, chid2, hashF(chid2), true);
+      /// Iterate on the digits of the collection
+      for (const MdtDigit* mdtDigit: *mdtCollection) {
+        Identifier channelId = mdtDigit->identify();
 	    
-	  if (m_idHelperSvc->mdtIdHelper().valid(channelId)) 
-	    {
-	      int multilayer = m_idHelperSvc->mdtIdHelper().multilayer(channelId);
-	      int layer      = m_idHelperSvc->mdtIdHelper().tubeLayer(channelId);
-	      int tube       = m_idHelperSvc->mdtIdHelper().tube(channelId);
-	            
-	      // Get the online Id of the channel
-	      cabling = readCdo->getOnlineId(name, eta, phi, 
-					     multilayer, layer, tube,
-					     subsystem, mrod, link, 
-					     tdc, channel);
+        if (!m_idHelperSvc->mdtIdHelper().valid(channelId)) {
+            ATH_MSG_DEBUG("Found invalid mdt identifier "<<channelId);
+            continue;
+        }
+       
+   
+        const int multilayer = m_idHelperSvc->mdtIdHelper().multilayer(channelId);
+        const int layer      = m_idHelperSvc->mdtIdHelper().tubeLayer(channelId);
+        const int tube       = m_idHelperSvc->mdtIdHelper().tube(channelId);
+        uint8_t subsystem{0}, mrod{0},link{0},tdc{0}, channel{0};
+               
+        /// Get the online Id of the channel
+        bool cabling = cabling_ptr->getOnlineId(name, eta, phi, 
+                                               multilayer, layer, tube,
+                                               subsystem, mrod, link, 
+                                               tdc, channel);
 	            
-        if (!cabling) {
+       if (!cabling) {
+          if (name == m_BMG_station_name) {
+                if (!bmgWarningPrinted){
+                    ATH_MSG_WARNING("Apparently BMG chambers are disconnected to the cabling. "<<
+                                    "This has been checked to only appear in mc16a-like setups as the chambers were installed in the end-of-the-year shutdown 2016. "<<
+                                    "In any other case, be despaired in facing the villian and check what has gone wrong");
+                    bmgWarningPrinted.store(true, std::memory_order_relaxed);                    
+                }
+                continue;
+          }
           // as long as there is no BIS sMDT cabling, to avoid a hard crash, replace the tubeNumber
           // of tubes not covered in the cabling by 1
-          if (m_idHelperSvc->mdtIdHelper().stationName(channelId)==1
-             && m_idHelperSvc->issMdt(channelId)) {
-             unsigned int theLayer = (layer==4) ? 3 : layer;
-             if (!bisWarningPrinted) {
-               ATH_MSG_WARNING("Found BIS sMDT with tubeLayer="<<layer<<" and tubeNumber="<<tube<<". Setting to "<<theLayer<<",1 until a proper cabling is implemented, cf. ATLASRECTS-5804");
-               bisWarningPrinted.store(true, std::memory_order_relaxed);
-             }
-             cabling = readCdo->getOnlineId(name, eta, phi, multilayer, theLayer, 1,subsystem, mrod, link, tdc, channel);
+          if (m_idHelperSvc->mdtIdHelper().stationName(channelId)==1 && m_idHelperSvc->issMdt(channelId)) {
+                unsigned int theLayer = (layer==4) ? 3 : layer;
+                 if (!bisWarningPrinted) {
+                    ATH_MSG_WARNING("Found BIS sMDT with tubeLayer="<<layer<<" and tubeNumber="<<tube<<". Setting to "<<theLayer<<",1 until a proper cabling is implemented, cf. ATLASRECTS-5804");
+                    bisWarningPrinted.store(true, std::memory_order_relaxed);
+                 }
+               cabling = cabling_ptr->getOnlineId(name, eta, phi, multilayer, theLayer, 1,subsystem, mrod, link, tdc, channel);
           }
           if (!cabling) {
-            ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
-            ATH_MSG_ERROR( name << " " << eta << " " << phi << " " << multilayer << " " << layer << " " << tube  );
-            return StatusCode::FAILURE;
+                ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : "  );
+                ATH_MSG_ERROR( name << " " << eta << " " << phi << " " << multilayer << " " << layer << " " << tube  );
+                return StatusCode::FAILURE;
           }
-        } 
+       } 
 
-	      bool masked = mdtDigit->is_masked();
-	      // Create the new AMT hit
-	      MdtAmtHit* amtHit = new MdtAmtHit(tdc, channel, masked);
+        bool masked = mdtDigit->is_masked();
+        // Create the new AMT hit
+        std::unique_ptr<MdtAmtHit> amtHit = std::make_unique<MdtAmtHit>(tdc, channel, masked);
 	            
-	      // Get coarse time and fine time
-	      int tdc_counts = mdtDigit->tdc();
+	    // Get coarse time and fine time
+	    int tdc_counts = mdtDigit->tdc();
 
-	      uint16_t coarse = (tdc_counts>>5) & 0xfff;
-	      uint16_t fine = tdc_counts & 0x1f;
-	      uint16_t width = mdtDigit->adc();
+	    uint16_t coarse = (tdc_counts>>5) & 0xfff;
+	    uint16_t fine = tdc_counts & 0x1f;
+	    uint16_t width = mdtDigit->adc();
 	            
-	      amtHit->setValues(coarse, fine, width);
+	    amtHit->setValues(coarse, fine, width);
 	            
-	      ATH_MSG_DEBUG( "Adding a new AmtHit"  );
-	      ATH_MSG_DEBUG( "Subdet : " << (int) subsystem 
+	    ATH_MSG_DEBUG( "Adding a new AmtHit"  );
+	    ATH_MSG_DEBUG( "Subdet : " << (int) subsystem 
                              << " mrod : " << (int) mrod 
                              << " link : " << (int) link  );
-	      ATH_MSG_DEBUG( " Tdc : " << (int) tdc
+	    ATH_MSG_DEBUG( " Tdc : " << (int) tdc
                              << " Channel : " << (int) channel 
                              << " Coarse time : " << coarse 
                              << " Fine time : " << fine 
                              << " Width : " << width  );
 
-	      // Add the digit to the CSM
-	      if( name != 53 ) mdtCsm->push_back(amtHit);
-	      else {
-		if( link == mdtCsm->CsmId() ) mdtCsm->push_back(amtHit);
-		else if( link == mdtCsm_2nd->CsmId() ) mdtCsm_2nd->push_back(amtHit);
-		else {
-		  delete amtHit; amtHit = NULL;
-		  ATH_MSG_ERROR( "There's a BME digit that doesn't match a CSM"  );
-		}
-	      }
-	            
-	    }
-	    
+        if (!mdtCsm) mdtCsm = make_csm(cabling_ptr, chid1, moduleHash, false);
+          
+        // Add the digit to the CSM
+	    if( name != m_BME_station_name || link == mdtCsm->CsmId()) mdtCsm->push_back(amtHit.release());
+	    else if (name == m_BME_station_name){
+            if (!mdtCsm_2nd) mdtCsm_2nd = make_csm(cabling_ptr, chid2, hashF(chid2), true);
+            if (link == mdtCsm_2nd->CsmId()) mdtCsm_2nd->push_back(amtHit.release());
+            else {
+               ATH_MSG_ERROR( "There's a BME digit that doesn't match a CSM"  );               
+            }
+        }
 	}
 
-      // Add the CSM to the CsmContainer
-      if (csmContainer->addCollection(mdtCsm, elementHash).isFailure())
-	ATH_MSG_WARNING( "Unable to record MDT CSM in IDC"  );
-        //delete mdtCsm;
-      if ( name == 53 && m_BMEpresent) {
-	if (csmContainer->addCollection(mdtCsm_2nd, elementHash_2nd).isFailure())
+    /// Add the CSM to the CsmContainer
+    if (mdtCsm && csmContainer->addCollection(mdtCsm.release(), hashF(chid1)).isFailure())
+            ATH_MSG_WARNING( "Unable to record MDT CSM in IDC"  );
+    if (mdtCsm_2nd && csmContainer->addCollection(mdtCsm_2nd.release(), hashF(chid2)).isFailure())
 	  ATH_MSG_WARNING( "Unable to record MDT CSM in IDC 2nd"  );
-      }
-    }
+      
+  }
   return StatusCode::SUCCESS;
 
 }

MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Configuration of tools shared between Segment Finding and Track Building
 
@@ -203,6 +203,10 @@ def MuonTrackCleanerCfg(flags, name="MuonTrackCleaner", **kwargs):
     # kwargs.setdefault("MagFieldSvc", mag_field_svc) Default for moment
     kwargs.setdefault("Printer", MuonEDMPrinterTool(flags) )
 
+    if flags.Muon.MuonTrigger:
+        kwargs.setdefault("Iterate", False)
+        kwargs.setdefault("RecoverOutliers", False)
+
     # FIXME - do remaining tools
 
     

MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegSelCondAlg.cxx

@@ -43,6 +43,7 @@ MDT_RegSelCondAlg::MDT_RegSelCondAlg(const std::string& name, ISvcLocator* pSvcL
 StatusCode MDT_RegSelCondAlg::initialize() {
   ATH_CHECK(MuonRegSelCondAlg::initialize());
   ATH_CHECK(m_cablingKey.initialize());
+  ATH_CHECK(m_condKey.initialize(!m_condKey.empty()));
   return StatusCode::SUCCESS;
 }
 
@@ -57,7 +58,17 @@ std::unique_ptr<RegSelSiLUT> MDT_RegSelCondAlg::createTable( const EventContext&
     ATH_MSG_ERROR("Failed to retrieve validity range for " << cabling.key());
     return std::unique_ptr<RegSelSiLUT>(nullptr);
   }   
-
+    
+   const MdtCondDbData* conditions_ptr = nullptr;
+   
+   if (!m_condKey.empty()){
+       SG::ReadCondHandle<MdtCondDbData> conditions(m_condKey, ctx);
+       if( !conditions.range( id_range ) ) {
+            ATH_MSG_ERROR("Failed to retrieve validity range for " << conditions.key());
+            return std::unique_ptr<RegSelSiLUT>(nullptr);
+       }
+       conditions_ptr = conditions.cptr();
+  }
   /// create the new lookup table
 
   const MuonGM::MuonDetectorManager* manager = nullptr; // again 0 would do as well here 
@@ -93,7 +104,10 @@ std::unique_ptr<RegSelSiLUT> MDT_RegSelCondAlg::createTable( const EventContext&
       ATH_MSG_DEBUG("Failed retrieving ExpandedIdentifier for PRD Identifier = " << Id.getString() << ". Skipping to the next PRD.");
       continue;
     }
-      
+    if (conditions_ptr && !conditions_ptr->isGood(Id)) {
+        ATH_MSG_DEBUG("Channel is marked as dead");
+        continue;
+    }
     int detid   = ( exp_id[2]<0 ? -1 : 1 );
     int layerid = exp_id[1]+1;
          

MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegSelCondAlg.h

@@ -12,7 +12,7 @@
 #define MDT_RegSelCondAlg_h
 
 #include "MuonRegSelCondAlg.h"
-
+#include "MuonCondData/MdtCondDbData.h"
 
 class MDT_RegSelCondAlg : public MuonRegSelCondAlg { 
 
@@ -27,6 +27,8 @@ public:
   SG::ReadCondHandleKey<MuonMDT_CablingMap> m_cablingKey
     { this, "Cabling", "MuonMDT_CablingMap", "Key of output MDT cabling map" };
 
+  SG::ReadCondHandleKey<MdtCondDbData> m_condKey{this, "Conditions", 
+                                                       "MdtCondDbData", "Key of the MDT conditions to reject dead tubes"};
 };
 
 #endif // MDT_RegSelCondAlg_h

MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """Configuration of tools for Moore muon reconstruction"""
 
@@ -32,6 +32,7 @@ from .MuonRecUtils import ConfiguredBase,ExtraFlags
 from .MuonRecFlags import muonRecFlags
 from .MuonStandaloneFlags import muonStandaloneFlags
 from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+from TriggerJobOpts.TriggerFlags import TriggerFlags
 #==============================================================
 
 # call  setDefaults to update flags
@@ -376,6 +377,9 @@ def MuonTrackCleaner(name,extraFlags=None,**kwargs):
   kwargs.setdefault("Fitter",        getPrivateTool('MCTBFitterMaterialFromTrack') )
   kwargs.setdefault("SLFitter",      getPrivateTool('MCTBSLFitterMaterialFromTrack'))
   kwargs.setdefault("MdtRotCreator", getPrivateTool('MdtDriftCircleOnTrackCreator'))
+  if TriggerFlags.MuonSlice.doTrigMuonConfig:
+      kwargs.setdefault("Iterate", False)
+      kwargs.setdefault("RecoverOutliers", False)
   # kwargs.setdefault("CompRotCreator", getPrivateTool('TriggerChamberClusterOnTrackCreator')) Not in DB
   
   return CfgMgr.Muon__MuonTrackCleaner(name,**kwargs)

PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/OverlapAnalysisSequence.py

@@ -10,6 +10,7 @@ def makeOverlapAnalysisSequence( dataType,
                                  doEleEleOR = False, doElectrons = True,
                                  doMuons = True, doJets = True, doTaus = True,
                                  doPhotons = True, doFatJets = False,
+                                 enableUserPriority = False,
                                  bJetLabel = '',
                                  boostedLeptons = False,
                                  postfix = '',
@@ -68,6 +69,10 @@ def makeOverlapAnalysisSequence( dataType,
       doXXXX     -- these flags enable/disable object types to
                     configure tools for: doElectrons, doMuons,
                     doJets, doTaus, doPhotons, doFatJets.
+      enableUserPriority -- If enabled, the Ele-, Mu-, Tau- and PhoJetOR tools
+                            will respect the user priority in the inputLabel.
+                            E.g. SUSYTools assigns all signal objects the
+                            priority 2 and pre-selected jets the priority 1.
       bJetLabel -- Flag to select b-jets with. If left empty, no b-jets are used
                    in the overlap removal.
       boostedLeptons -- Set to True to enable boosted lepton overlap removal
@@ -101,6 +106,7 @@ def makeOverlapAnalysisSequence( dataType,
                        'ORUtils::MuPFJetOverlapTool' )
        alg.overlapTool.MuPFJetORT.InputLabel = inputLabel
        alg.overlapTool.MuPFJetORT.OutputLabel = outputLabel
+       alg.overlapTool.MuPFJetORT.BJetLabel = bJetLabel
        alg.overlapTool.MuPFJetORT.LinkOverlapObjects = linkOverlapObjects
        alg.overlapTool.MuPFJetORT.OutputPassValue = True
        pass
@@ -134,6 +140,7 @@ def makeOverlapAnalysisSequence( dataType,
         alg.overlapTool.EleJetORT.LinkOverlapObjects = linkOverlapObjects
         alg.overlapTool.EleJetORT.BJetLabel = bJetLabel
         alg.overlapTool.EleJetORT.UseSlidingDR = boostedLeptons
+        alg.overlapTool.EleJetORT.EnableUserPriority = enableUserPriority
         alg.overlapTool.EleJetORT.OutputPassValue = True
         pass
 
@@ -146,6 +153,7 @@ def makeOverlapAnalysisSequence( dataType,
         alg.overlapTool.MuJetORT.LinkOverlapObjects = linkOverlapObjects
         alg.overlapTool.MuJetORT.BJetLabel = bJetLabel
         alg.overlapTool.MuJetORT.UseSlidingDR = boostedLeptons
+        alg.overlapTool.MuJetORT.EnableUserPriority = enableUserPriority
         alg.overlapTool.MuJetORT.OutputPassValue = True
         pass
 
@@ -179,6 +187,7 @@ def makeOverlapAnalysisSequence( dataType,
         alg.overlapTool.TauJetORT.OutputLabel = outputLabel
         alg.overlapTool.TauJetORT.LinkOverlapObjects = linkOverlapObjects
         alg.overlapTool.TauJetORT.DR = 0.2
+        alg.overlapTool.TauJetORT.EnableUserPriority = enableUserPriority
         alg.overlapTool.TauJetORT.OutputPassValue = True
         pass
 
@@ -209,6 +218,7 @@ def makeOverlapAnalysisSequence( dataType,
         alg.overlapTool.PhoJetORT.InputLabel = inputLabel
         alg.overlapTool.PhoJetORT.OutputLabel = outputLabel
         alg.overlapTool.PhoJetORT.LinkOverlapObjects = linkOverlapObjects
+        alg.overlapTool.PhoJetORT.EnableUserPriority = enableUserPriority
         alg.overlapTool.PhoJetORT.OutputPassValue = True
         pass
 

PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/CaloInfoFillerTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -25,7 +25,6 @@ class LArHEC_ID;
 class LArFCAL_ID; 
 class TileID; 
 class LArOnlineID;
-class ICaloNoiseTool;
 
 namespace D3PD {
 

PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/LArSCHitFillerTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -30,7 +30,6 @@ class LArEM_ID;
 class LArFCAL_ID;
 class LArHEC_ID;
 class TileID;
-class ICaloNoiseTool;
 class LArOnlineID;
 class CaloDetDescrManager ; 
 class Identifier;

PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -31,7 +31,6 @@ class LArEM_ID;
 class LArFCAL_ID;
 class LArHEC_ID;
 class TileID;
-class ICaloNoiseTool;
 class LArOnlineID;
 class Identifier;
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/VertexCaloIsolation.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -36,7 +36,6 @@
 #include "RecoToolInterfaces/ICaloTopoClusterIsolationTool.h"
 
 //#include "TrackToCalo/CaloCellCollector.h"
-//#include "CaloInterface/ICaloNoiseTool.h"
 #include "xAODBPhys/BPhysHelper.h"
 //#include "xAODPrimitives/IsolationType.h" //
 
@@ -72,9 +71,6 @@ namespace DerivationFramework {
       std::vector<std::string> m_passFlags;
 
 
-    //  ToolHandle <ICaloNoiseTool>                   m_caloNoiseTool;  //Removed to reduce requirements
-      //Rec::CaloCellCollector   m_cellCollector;		//Seems to be a plain class, so no need for handles
-
       /// Number of sigma for calo cell noise cut
       float m_sigmaCaloNoiseCut;
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/VertexCaloIsolation.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // VertexCaloIsolation.cxx by Matteo Bedognetti
@@ -43,7 +43,6 @@
 //#include "InDetTrackSelectionTool/InDetTrackSelectionTool.h"
 #include "CaloEvent/CaloCell.h"	//Is used (though shown as auto)
 //#include "TrkParameters/TrackParameters.h"
-#include "CaloInterface/ICaloNoiseTool.h"
 #include "TrkCaloExtension/CaloExtension.h"
 //#include "CaloUtils/CaloClusterStoreHelper.h"
 //#include "CaloUtils/CaloCellList.h"
@@ -67,19 +66,9 @@ namespace DerivationFramework {
     m_caloClusterContainerName("CaloCalTopoClusters"),
     m_muonContainerName("Muons"),
     m_caloExtTool("Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool"),
-    //m_caloNoiseTool(""),
     m_cones(),
     m_sigmaCaloNoiseCut(3.4),
     m_vertexType(7)
-
-
-   // m_cellCollector("")
-
-
-//  m_caloExtTool
-//  m_caloNoiseTool, m_applyCaloNoiseCut, m_sigmaCaloNoiseCut
-//  m_cellCollector
-
   {
         ATH_MSG_DEBUG("in constructor");
     declareInterface<DerivationFramework::IAugmentationTool>(this);
@@ -124,11 +113,6 @@ namespace DerivationFramework {
 	    m_cones.push_back(xAOD::Iso::etcone20);
     }
 
-    //if(m_applyCaloNoiseCut){
-            //ATH_MSG_ERROR("No handle to a caloNoiseTool is kept in this tool, ");
-            //return StatusCode::FAILURE;
-    //}
-
     return StatusCode::SUCCESS;
     
   }
@@ -393,7 +377,7 @@ namespace DerivationFramework {
 						if(cl.size() != 0){	//Maybe two muons have a full cluster overlap??
 							ATH_MSG_DEBUG("Cells in this cluster: "<< cl.size());
                                                          
-							cellCollector.collectEtCore( cl, etcore, nullptr, m_sigmaCaloNoiseCut );  //Note an empty handle to ICaloNoiseTool is passed
+							cellCollector.collectEtCore( cl, etcore, nullptr, m_sigmaCaloNoiseCut );
 							coreCorr += etcore[Rec::CaloCellCollector::ET_Core];
 							ATH_MSG_DEBUG("Their core-energy: "<< etcore[Rec::CaloCellCollector::ET_Core]);
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py

@@ -21,23 +21,14 @@ JetStandardAux = \
     ]
 
 BTaggingStandardAux = \
-    [ "MV2c10_discriminant"
-    , "MV2rmu_discriminant"
-    , "MV2r_discriminant"
-    , "MV2c100_discriminant"
-    , "MV2cl100_discriminant"
-    , "DL1_pu"
+    [ "DL1_pu"
     , "DL1_pc"
     , "DL1_pb"
     , "DL1r_pu"
     , "DL1r_pc"
     , "DL1r_pb"
-    , "DL1rmu_pu"
-    , "DL1rmu_pc"
-    , "DL1rmu_pb"
-    , "DL1mu_pu"
-    , "DL1mu_pc"
-    , "DL1mu_pb"
+    , "SV1_NGTinSvx"
+    , "SV1_masssvx"
     ]
 
 # These are the inputs to DL1rmu + SMT

PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/util/top-xaod.cxx

@@ -658,6 +658,13 @@ int main(int argc, char** argv) {
           << "       YOU MANY NOT BE USING THE LATEST BTAGGING RECOMMENDATIONS         \n"
           << "*************************************************************************\n\n");
     }
+    if (topConfig->printEgammaCalibModelWarning()) {
+      ATH_MSG_WARNING(
+              "\n*************************************************************************\n"
+                      << "          YOU HAVE CHANGED DEFAULT EGAMMA CALIBRATION MODEL             \n"
+                      << " TO USE DEFAULT MODEL, REMOVE 'EGammaCalibrationModel' FROM CONFIG FILE \n"
+                      << "*************************************************************************\n\n");
+    }
 
     const unsigned int entries = xaodEvent.getEntries();
     totalEventsInFiles += entries;

PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx

@@ -27,6 +27,7 @@
 namespace top {
   EgammaCPTools::EgammaCPTools(const std::string& name) :
     asg::AsgTool(name),
+    m_egammaCalibrationModel("es2018_R21_v0"),
     m_electronEffTriggerFile("SetMe"),
     m_electronEffTriggerLooseFile("SetMe"),
     m_electronEffSFTriggerFile("SetMe"),
@@ -87,6 +88,10 @@ namespace top {
 
     if (m_config->usePhotons() || m_config->useElectrons() || m_config->useFwdElectrons()) {
       if (m_config->makeAllCPTools()) {// skiping calibrations on mini-xAODs
+        if(m_config->egammaCalibration() != m_egammaCalibrationModel){
+          m_config->setPrintEgammaCalibModelWarning(true);
+          m_egammaCalibrationModel = m_config->egammaCalibration();
+        }
         top::check(setupCalibration(), "Failed to setup Egamma calibration tools");
       }
       if (m_config->useFwdElectrons() && m_config->makeAllCPTools()) {
@@ -138,7 +143,7 @@ namespace top {
     } else {
       IEgammaCalibTool* egammaCalibrationAndSmearingTool = new CP::EgammaCalibrationAndSmearingTool(egamma_calib_name);
       top::check(asg::setProperty(egammaCalibrationAndSmearingTool,
-                                  "ESModel", "es2018_R21_v0"),
+                                  "ESModel", m_egammaCalibrationModel),
                  "Failed to set ESModel for " + egamma_calib_name);
       top::check(asg::setProperty(egammaCalibrationAndSmearingTool,
                                   "decorrelationModel",

PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h

@@ -38,6 +38,7 @@ namespace top {
   private:
     std::shared_ptr<top::TopConfig> m_config;
 
+    std::string m_egammaCalibrationModel;
     std::string m_electronEffTriggerFile;
     std::string m_electronEffTriggerLooseFile;
     std::string m_electronEffSFTriggerFile;

PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx

@@ -419,7 +419,7 @@ namespace top {
     registerParameter("ApplyElectronInJetSubtraction",
                       "Subtract electrons close to jets for boosted analysis : True or False(top default)", "False");
     registerParameter("TopPartonHistory", "Topology to be assumed when reconstructing parton-level history.", "False",
-                      {"ttbar", "tb", "Wtb", "ttz", "ttgamma", "tHq", "False"});
+                      {"ttbar", "ttbarlight", "tb", "Wtb", "tchannel", "ttz", "ttgamma", "tHq", "tZq", "False"});
     registerParameter("TopPartonLevel", "Perform parton level analysis (stored in truth tree)? True or False", "True");
     
     registerParameter("TopParticleLevel", "Perform particle level selection (stored in particleLevel tree)? True or False", "False");
@@ -544,6 +544,8 @@ namespace top {
                       " Default 'default'",
                       "default");
 
+    registerParameter("EGammaCalibrationModel", "To override default EGammaCalibration model, Default 'es2018_R21_v0'", "es2018_R21_v0");
+
     registerParameter("PRWConfigFiles",
                       "List of PU config files, seperated by spaces (nothing by default) - Not compatible with FS/AF options",
                       " ");