Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloFillRectangularCluster.h

@@ -195,13 +195,6 @@ private:
   SG::ReadHandleKey<CaloCellContainer> m_cellsName;
   
   
-  SG::ReadCondHandleKey<CaloDetDescrManager> m_caloDetDescrMgrKey {
-    this,
-    "CaloDetDescrManager",
-    "CaloDetDescrManager",
-    "SG Key for CaloDetDescrManager in the Condition Store"
-  };
-
 };
 
 #endif // not CALOCLUSTERCORRECTION_CALOFILLRECTANGULARCLUSTER_H

Calorimeter/CaloClusterCorrection/src/CaloFillRectangularCluster.cxx

@@ -806,7 +806,7 @@ StatusCode CaloFillRectangularCluster::initialize()
     CHECK( m_cellsName.initialize() );
   }
 
-  ATH_CHECK(m_caloDetDescrMgrKey.initialize());
+  ATH_CHECK(m_caloMgrKey.initialize());
   return StatusCode::SUCCESS;
 }
 
@@ -1078,7 +1078,7 @@ void CaloFillRectangularCluster::makeCorrection (const Context& myctx,
   ATH_MSG_DEBUG( "Executing CaloFillRectangularCluster" << endmsg) ;
  
    // retrieve CaloDetDescr
-  SG::ReadCondHandle<CaloDetDescrManager> caloDetDescrMgrHandle { m_caloDetDescrMgrKey, myctx.ctx()};
+  SG::ReadCondHandle<CaloDetDescrManager> caloDetDescrMgrHandle { m_caloMgrKey, myctx.ctx()};
   if(!caloDetDescrMgrHandle.isValid()){
     ATH_MSG_ERROR ("Failed to retrieve CaloDetDescrManager : CaloMgr");
   }

Control/AthToolSupport/AsgTools/Root/ToolStore.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
 */
 
 // System include(s):
@@ -57,6 +57,7 @@ namespace asg {
    IAsgTool* ToolStore::get( const std::string& name, bool silent ) {
       using namespace msgToolStore;
 
+      std::lock_guard<std::mutex> lock (s_toolMutex);
       ToolMap_t::const_iterator itool = s_tools.find( name );
       if( itool != s_tools.end() )
         return itool->second;

Control/PerformanceMonitoring/PerfMonAna/bin/perfmonmt-plotter.py

@@ -193,6 +193,10 @@ def plotComponentLevel(componentLevelData, compCountPerPlot):
       if vmem < 0 or malloc < 0:
         continue
 
+      # Truncate unwieldy component names
+      if len(comp) > 50:
+        comp = f"{comp[:20]}[...]{comp[-20:]}"
+
       compNames.append(comp + " [" + str(count) + "]")
       vmemVals.append(vmem)
       cpuTimeVals.append(cpuTime)

DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt

@@ -12,4 +12,4 @@ atlas_add_library( GeoAdaptors
                    PUBLIC_HEADERS GeoAdaptors
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib MuonIdHelpersLib )
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent GeoPrimitives HGTD_Identifier HGTD_ReadoutGeometry Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib MuonIdHelpersLib )

DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.h

@@ -19,10 +19,12 @@
 class SiHit;
 class PixelID;
 class SCT_ID;
+class HGTD_ID;
 namespace InDetDD {
   class SCT_DetectorManager;
   class PixelDetectorManager;
 }
+class HGTD_DetectorManager;
 
 class GeoSiHit {
 
@@ -45,14 +47,18 @@ class GeoSiHit {
   static const InDetDD::PixelDetectorManager* initPixMgr();
   static const InDetDD::PixelDetectorManager* initPlrMgr();
   static const InDetDD::SCT_DetectorManager*  initSctMgr();
+  static const HGTD_DetectorManager*          initHgtdMgr();
   static const PixelID*                       initPixID();
   static const SCT_ID*                        initSctID();
+  static const HGTD_ID*                       initHgtdID();
 
   const InDetDD::PixelDetectorManager* pixMgr() const;
   const InDetDD::PixelDetectorManager* plrMgr() const;
   const InDetDD::SCT_DetectorManager*  sctMgr() const;
+  const HGTD_DetectorManager*          hgtdMgr() const;
   const PixelID*                       pixID()  const;
   const SCT_ID*                        sctID()  const;
+  const HGTD_ID*                       hgtdID() const;
 
   const SiHit                                     *m_hit;
 };

DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.icc

@@ -2,52 +2,58 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "InDetSimEvent/SiHit.h"
-#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
-#include "PixelReadoutGeometry/PixelDetectorManager.h"
+#include "GeoPrimitives/CLHEPtoEigenConverter.h"
+#include "HGTD_Identifier/HGTD_ID.h"
+#include "HGTD_ReadoutGeometry/HGTD_DetectorManager.h"
 #include "InDetIdentifier/PixelID.h"
 #include "InDetIdentifier/SCT_ID.h"
-#include "GeoPrimitives/CLHEPtoEigenConverter.h"
+#include "InDetReadoutGeometry/SiDetectorElement.h"
+#include "InDetSimEvent/SiHit.h"
+#include "PixelReadoutGeometry/PixelDetectorManager.h"
+#include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
 
 
 inline GeoSiHit::GeoSiHit (const SiHit & h) {
   m_hit = &h;
 }
 
+
 inline HepGeom::Point3D<double> GeoSiHit::getGlobalPosition() const {
 
   int Barrel = m_hit->getBarrelEndcap();
   if (Barrel== 1) Barrel = -2;
   Identifier id;
-  const InDetDD::SiDetectorElement *geoelement=NULL;
-  if (m_hit->isPixel()) {
-    
+  const InDetDD::SolidStateDetectorElementBase *geoelement{};
+  if (m_hit->isPixel() || m_hit->isPLR()) {
+
     id = pixID()->wafer_id(Barrel,
-			m_hit->getLayerDisk(), 
-			m_hit->getPhiModule(), 
+			m_hit->getLayerDisk(),
+			m_hit->getPhiModule(),
 			m_hit->getEtaModule());
 
     if (m_hit->isPLR()) {
-      geoelement = plrMgr()->getDetectorElement(id);      
+      geoelement = plrMgr()->getDetectorElement(id);
     } else {
       geoelement = pixMgr()->getDetectorElement(id);
     }
-  }
-  else {
+  } else if (m_hit->isSCT()) {
     id = sctID()->wafer_id(Barrel,
-			m_hit->getLayerDisk(), 
-			m_hit->getPhiModule(), 
-			m_hit->getEtaModule(), 
+			m_hit->getLayerDisk(),
+			m_hit->getPhiModule(),
+			m_hit->getEtaModule(),
 			m_hit->getSide() );
-    geoelement = sctMgr()->getDetectorElement(id);      
+    geoelement = sctMgr()->getDetectorElement(id);
+  } else if (m_hit->isHGTD()) {
+    id = hgtdID()->wafer_id(Barrel,
+			m_hit->getLayerDisk(),
+			m_hit->getPhiModule(),
+			m_hit->getEtaModule());
+    geoelement = hgtdMgr()->getDetectorElement(id);
   }
-  
-  
-  if (geoelement) {
 
+  if (geoelement) {
     const HepGeom::Point3D<double> globalStartPos = Amg::EigenTransformToCLHEP(geoelement->transformHit()) * HepGeom::Point3D<double>(m_hit->localStartPosition());
-    
+
     double x=globalStartPos.x();
     double y=globalStartPos.y();
     double z=globalStartPos.z();
@@ -56,4 +62,3 @@ inline HepGeom::Point3D<double> GeoSiHit::getGlobalPosition() const {
 
   return HepGeom::Point3D<double>(0.0,0.0,0.0);
 }
-

DetectorDescription/GeoModel/GeoAdaptors/src/GeoSiHit.cxx

@@ -15,7 +15,7 @@ const InDetDD::PixelDetectorManager* GeoSiHit::initPixMgr()
   if (!detStore->contains<InDetDD::PixelDetectorManager>("Pixel") || detStore->retrieve(pix,"Pixel").isFailure())
   {
     // if Pixel retrieval fails, try ITkPixel
-    if (!detStore->contains<InDetDD::PixelDetectorManager>("ITkPixel") || detStore->retrieve(pix,"ITkPixel").isFailure()) 
+    if (!detStore->contains<InDetDD::PixelDetectorManager>("ITkPixel") || detStore->retrieve(pix,"ITkPixel").isFailure())
     {
       std::abort();
     }
@@ -49,6 +49,15 @@ const InDetDD::PixelDetectorManager* GeoSiHit::initPlrMgr()
 }
 
 
+const HGTD_DetectorManager* GeoSiHit::initHgtdMgr()
+{
+  ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+  const HGTD_DetectorManager* hgtd = nullptr;
+  detStore->retrieve(hgtd,"HGTD").isFailure();
+  return hgtd;
+}
+
+
 const PixelID* GeoSiHit::initPixID()
 {
   ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
@@ -71,6 +80,17 @@ const SCT_ID* GeoSiHit::initSctID()
 }
 
 
+const HGTD_ID* GeoSiHit::initHgtdID()
+{
+  ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+  const HGTD_ID* hgtd = nullptr;
+  if(detStore->retrieve(hgtd,"HGTD_ID").isFailure()) {
+    std::abort();
+  }
+  return hgtd;
+}
+
+
 const InDetDD::PixelDetectorManager* GeoSiHit::pixMgr() const
 {
   const InDetDD::PixelDetectorManager* const mgr = initPixMgr();
@@ -92,16 +112,29 @@ const InDetDD::PixelDetectorManager* GeoSiHit::plrMgr() const
 }
 
 
-const PixelID*                       GeoSiHit::pixID()  const
+const HGTD_DetectorManager* GeoSiHit::hgtdMgr() const
+{
+  const HGTD_DetectorManager* const mgr = initHgtdMgr();
+  return mgr;
+}
+
+
+const PixelID* GeoSiHit::pixID() const
 {
   const PixelID* const id = initPixID();
   return id;
 }
 
 
-const SCT_ID*                        GeoSiHit::sctID()  const
+const SCT_ID* GeoSiHit::sctID() const
 {
   const SCT_ID* const id = initSctID();
   return id;
 }
 
+
+const HGTD_ID* GeoSiHit::hgtdID() const
+{
+  const HGTD_ID* const id = initHgtdID();
+  return id;
+}

Event/xAOD/xAODHIEvent/xAODHIEvent/ATLAS_CHECK_THREAD_SAFETY

+Event/xAOD/xAODHIEvent

Event/xAOD/xAODTrigL1Calo/Root/CPMTobRoI_v1.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
 */
 
 // $Id: CPMTobRoI_v1.cxx 687286 2015-08-04 11:20:22Z amazurov $
@@ -21,7 +21,7 @@ namespace xAOD{
   
   void CPMTobRoI_v1::initialize(int crate, int cpm, int chip, int location,
       						  int type, int energy, int isol) {
-  	  uint32_t roiWord  =  s_wordIdVal           << s_wordIdBit;
+          uint32_t roiWord  =  static_cast<uint32_t>(s_wordIdVal) << s_wordIdBit;
 	  roiWord |= (type       & s_typeMask)       << s_wordIdBit;
 	  roiWord |= (crate      & s_crateMask)      << s_crateBit;
 	  roiWord |= (cpm        & s_cpmMask)        << s_cpmBit;

Event/xAOD/xAODTrigL1Calo/xAODTrigL1Calo/versions/JGTower_v1.h

@@ -115,9 +115,9 @@ namespace xAOD
     /// @brief The type of the object as a simple enumeration, remains pure virtual in e/gamma.
     virtual Type::ObjectType type() const final;
 
-    virtual void initialize(const int Id, const float Et, const float Eta, const float Phi);
+    virtual void initialize(const int Id, const float Eta, const float Phi, const float Et);
     virtual void initialize(const int Id, const float Eta, const float Phi);
   }; // class JGTower_v1
 } // namespace xAOD
 
-#endif // XAODTRIGL1CALO_VERSIONS_JGTOWER_V1_H
\ No newline at end of file
+#endif // XAODTRIGL1CALO_VERSIONS_JGTOWER_V1_H

Generators/GeneratorObjects/GeneratorObjects/McEventCollection.h

@@ -64,7 +64,16 @@ inline McEventCollection& McEventCollection::operator=(const McEventCollection&
   //
   for (const HepMC::GenEvent* ev : in)
   {
-    DataVector<HepMC::GenEvent>::push_back(new HepMC::GenEvent(*ev));
+    HepMC::GenEvent* nev = new HepMC::GenEvent(*ev);
+#ifdef HEPMC3
+    auto ri = ev->run_info();
+    if (ri) {
+      std::shared_ptr<HepMC3::GenRunInfo> nri =  std::make_shared<HepMC3::GenRunInfo>(*(ri.get()));
+      nev->set_run_info(nri);
+    }
+#endif
+    DataVector<HepMC::GenEvent>::push_back(nev);
+    
   }
 
   return *this;

Generators/PowhegControl/cmake/PowhegEnvironmentConfig.cmake.in

@@ -7,7 +7,7 @@
 # Set the environment variable(s):
 
 set( POWHEGENVIRONMENT_ENVIRONMENT
-    FORCESET POWHEGPATH "/cvmfs/atlas.cern.ch/repo/sw/Generators/powheg/ATLASOTF-05-00" )
+    FORCESET POWHEGPATH "/cvmfs/atlas.cern.ch/repo/sw/Generators/powheg/ATLASOTF-05-01" )
 #   FORCESET POWHEGPATH \${@CMAKE_PROJECT_NAME@_DIR}/PG-BOX )
 
 # Silently declare the module found.

Generators/Rivet_i/src/Rivet_i.cxx

@@ -25,7 +25,6 @@
 #include "Rivet/Tools/RivetYODA.hh"
 
 
-
 #include <cstdlib>
 #include <memory>
 #include <regex>
@@ -92,7 +91,7 @@ StatusCode Rivet_i::initialize() {
     const std::string cmtconfig = getenv_str("CMTCONFIG");
     if (cmtconfig.empty()) {
       ATH_MSG_WARNING("$CMTCONFIG variable not set: finding the main analysis plugin directory will be difficult...");
-    } 
+    }
     else {
       const std::string libpath = "/InstallArea/" + cmtconfig + "/lib";
       for (const std::string& p : cmtpaths) {
@@ -208,7 +207,7 @@ StatusCode Rivet_i::finalize() {
 
   // Setting cross-section in Rivet
   // If no user-specified cross-section available,
-  // set AMI cross-section at plotting time 
+  // set AMI cross-section at plotting time
   double custom_xs = m_crossSection != 0 ? m_crossSection : 1.0;
   m_analysisHandler->setCrossSection({custom_xs, m_crossSection_uncert});
 
@@ -247,7 +246,6 @@ const HepMC::GenEvent* Rivet_i::checkEvent(const HepMC::GenEvent* event) {
   // overwrite the HEPMC dummy event number with the proper ATLAS event number
   const DataHandle<EventInfo> eventInfo;
   if (StatusCode::SUCCESS == evtStore()->retrieve(eventInfo)) {
-    //int run=eventInfo->event_ID()->run_number();
     uint64_t eventNumber = eventInfo->event_ID()->event_number();
     modEvent->set_event_number((int)eventNumber);
   }
@@ -256,14 +254,14 @@ const HepMC::GenEvent* Rivet_i::checkEvent(const HepMC::GenEvent* event) {
 #ifdef HEPMC3
   std::shared_ptr<HepMC3::GenRunInfo> modRunInfo;
   if (event->run_info()) {
-	  modRunInfo = std::make_shared<HepMC3::GenRunInfo>(*(event->run_info().get())); 
-  } 
+    modRunInfo = std::make_shared<HepMC3::GenRunInfo>(*(event->run_info().get()));
+  }
   else {
-	  ATH_MSG_ERROR("No run info, event weights size is " << event->weights().size() );
-	  modRunInfo = std::make_shared<HepMC3::GenRunInfo>();
+    ATH_MSG_DEBUG("No run info, event weights size is " << event->weights().size() );
+    modRunInfo = std::make_shared<HepMC3::GenRunInfo>();
     std::vector<std::string> w_names;
-	  for (size_t i = 0; i < event->weights().size(); i++) { w_names.push_back(std::string("badweight")+std::to_string(i)); }
-	  modRunInfo->set_weight_names(w_names);	
+    for (size_t i = 0; i < event->weights().size(); i++) { w_names.push_back(std::string("badweight") + std::to_string(i)); }
+    modRunInfo->set_weight_names(w_names);
   }
   modEvent->set_run_info(modRunInfo);
   std::vector<std::string>  w_names = modEvent->weight_names();
@@ -337,8 +335,6 @@ const HepMC::GenEvent* Rivet_i::checkEvent(const HepMC::GenEvent* event) {
 #endif
 
 #ifdef HEPMC3
-  //ATH_MSG_ALWAYS("BEAM ENERGY = " << beams[0]->momentum().e());
-  //ATH_MSG_ALWAYS("UNITS == MEV = " << std::boolalpha << (modEvent->momentum_unit() == HepMC::Units::MEV));
   modEvent->set_units(HepMC3::Units::GEV, HepMC3::Units::MM);
   return modEvent;
 #else

Generators/TruthIO/src/HepMCReadFromFile.cxx

@@ -62,7 +62,7 @@ StatusCode HepMCReadFromFile::execute() {
   HepMC3::GenEvent* evt = new HepMC3::GenEvent();
   m_hepmcio->read_event(*evt);
   if (m_hepmcio) {
-	if (!evt->run_info()) evt->set_run_info(m_hepmcio->run_info());
+    if (!evt->run_info()) evt->set_run_info(m_hepmcio->run_info());
     ++m_event_number;
     evt->set_event_number(m_event_number);
     evt->set_units(HepMC3::Units::MEV, HepMC3::Units::MM);

HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx

@@ -1084,14 +1084,12 @@ InDetDD::HGTD_ModuleDesign* HGTD_DetectorFactory::createHgtdDesign( double thick
     int diodeRowsPerCircuit = cellRowsPerCircuit;
 
     std::shared_ptr<const PixelDiodeMatrix> normalCell = InDetDD::PixelDiodeMatrix::construct(phiPitch, etaPitch);
-    std::shared_ptr<const PixelDiodeMatrix> singleRow  = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::etaDir, 0,
+    std::shared_ptr<const PixelDiodeMatrix> singleRow  = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::phiDir, 0,
                                                                                               normalCell, diodeColumnsPerCircuit, 0);
-    std::shared_ptr<const PixelDiodeMatrix> fullMatrix = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::phiDir, 0,
+    std::shared_ptr<const PixelDiodeMatrix> fullMatrix = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::etaDir, 0,
                                                                                               singleRow, 2*diodeRowsPerCircuit, 0); // note 30 = 2*15 rows adopted
 
-    DetectorDesign::Axis yDirection = InDetDD::DetectorDesign::xAxis;
-    if (m_geomVersion == 0 )
-      yDirection = InDetDD::DetectorDesign::yAxis;
+    DetectorDesign::Axis yDirection = InDetDD::DetectorDesign::yAxis;
 
     InDetDD::HGTD_ModuleDesign* design = new InDetDD::HGTD_ModuleDesign(thickness,
                                                                         circuitsPerColumn, circuitsPerRow,

HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_ModuleDesign.cxx

@@ -23,7 +23,7 @@ HGTD_ModuleDesign::HGTD_ModuleDesign(const double thickness,
                                      DetectorDesign::Axis yDirection,
                                      DetectorDesign::Axis depthDirection):
     DetectorDesign(thickness, 
-                   true, true, true, // phi,eta,depth axes symmetric
+                   false, false, true, // phi,eta,depth axes symmetric
                    carrierType,
                    readoutSide,
                    yDirection,

HighGranularityTimingDetector/HGTD_G4/HGTD_G4_SD/src/HGTDSensorSD.cxx

@@ -142,13 +142,13 @@ G4bool HGTDSensorSD::ProcessHits(G4Step* aStep, G4TouchableHistory* /*ROhist*/)
     }
 
     HepGeom::Point3D<double> lP1,lP2;
-    lP1[SiHit::xEta] = localPosition1[2]*CLHEP::mm;
-    lP1[SiHit::xPhi] = localPosition1[1]*CLHEP::mm;
-    lP1[SiHit::xDep] = localPosition1[0]*CLHEP::mm;
-  
-    lP2[SiHit::xEta] = localPosition2[2]*CLHEP::mm;
-    lP2[SiHit::xPhi] = localPosition2[1]*CLHEP::mm;
-    lP2[SiHit::xDep] = localPosition2[0]*CLHEP::mm;
+    lP1[SiHit::xEta] = localPosition1[1]*CLHEP::mm; //long edge of the module
+    lP1[SiHit::xPhi] = localPosition1[0]*CLHEP::mm; //short edge of the module
+    lP1[SiHit::xDep] = localPosition1[2]*CLHEP::mm; //depth (z)
+
+    lP2[SiHit::xEta] = localPosition2[1]*CLHEP::mm;
+    lP2[SiHit::xPhi] = localPosition2[0]*CLHEP::mm;
+    lP2[SiHit::xDep] = localPosition2[2]*CLHEP::mm;
 
     std::string module_indices = myTouch->GetVolume(1)->GetLogicalVolume()->GetName();
     std::size_t found = module_indices.find_last_of("_");

InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt

@@ -12,7 +12,7 @@ atlas_add_library( PixelCalibAlgsLib
    PixelCalibAlgs/*.h src/*.cxx
    PUBLIC_HEADERS PixelCalibAlgs
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel InDetConditionsSummaryService
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel InDetConditionsSummaryService 
    InDetPrepRawData InDetReadoutGeometry PixelReadoutGeometryLib PixelConditionsData StoreGateLib
    PRIVATE_LINK_LIBRARIES AthenaPoolUtilities EventInfo InDetIdentifier InDetRawData PixelGeoModelLib )
 
@@ -25,4 +25,4 @@ atlas_add_executable( makeInactiveModuleList
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
    LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
 
-atlas_install_runtime ( share/HashVSdcsID.dat share/table_Run2.txt share/PixelMapping_Run2.dat )
+atlas_install_runtime ( share/HashVSdcsID.dat share/table_Run2.txt share/PixelMapping_Run2.dat share/PixelModuleFeMask_create_db.py)

InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/HitMapBuilder.h

+/*
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef PIXELCONDITIONSALGS_HITMAPBUILDER_H
+#define PIXELCONDITIONSALGS_HITMAPBUILDER_H
+
+#include "AthenaBaseComps/AthAlgorithm.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
+
+#include <string>
+#include <sstream>
+#include <vector>
+#include <fstream>
+#include <utility> // pair
+
+//yosuke class IInDetConditionsSvc;
+//yosuke class IPixelByteStreamErrorsSvc;
+class ITHistSvc;
+class PixelID;
+class TH2F;
+class TH1F;
+class TH1;
+//yosuke class ISpecialPixelMapSvc;
+
+namespace InDetDD{
+  class PixelDetectorManager;
+}
+
+/**
+ *
+ * HitMapBuilder.h
+ *
+ * Creates hit maps and maps of noisy pixels for every module
+ * of the pixel detector. The maps are stored in a root file.
+ * They can be written to the conditions database using the
+ * algorithm NoiseMapDBWriter.
+ *
+ * ruwiedel@physik.uni-bonn.de
+ *
+ */
+
+class HitMapBuilder: public AthAlgorithm {
+
+ public:
+  HitMapBuilder(const std::string& name, ISvcLocator* pSvcLocator);
+  ~HitMapBuilder();
+
+  StatusCode initialize();
+  StatusCode execute();
+  StatusCode finalize();
+
+ private:
+  std::string getDCSIDFromPosition(int bec, int layer, int modPhi, int modEta);
+  std::vector<std::string> &splitter(const std::string &str, char delim, std::vector<std::string> &elems);
+  std::vector<std::string> splitter(const std::string &str, char delim);
+  StatusCode registerHistograms();
+  const std::string histoSuffix(const int bec, const int layer);
+
+ private:
+  ServiceHandle <ITHistSvc> m_tHistSvc;
+  const InDetDD::PixelDetectorManager *m_pixman;
+  const PixelID *m_pixelID;
+
+  // vector of modulename and vector(barrel/endcap, layer, phi, eta)
+  std::vector< std::pair< std::string, std::vector<int> > > m_pixelMapping;
+
+  std::string m_pixelRDOKey;
+
+  double m_nEvents;
+  std::vector<double> m_nEventsLB; // Events per LB
+  std::vector<double> m_nEventsLBCategory; // Events per certain LB for LB category
+
+  std::unique_ptr<TH1F> m_nEventsHist;
+  std::unique_ptr<TH1F> m_nEventsLBHist;
+  std::vector<std::unique_ptr<TH2F>> m_occupancyMaps;
+  std::vector<std::unique_ptr<TH2F>> m_occupancyMapsIBL2dLB;
+  std::vector<std::unique_ptr<TH1F>> m_TOTdistributions;
+  std::vector<std::unique_ptr<TH1F>> m_TOTdistributionsIBL2dLB;
+  std::vector<std::unique_ptr<TH1F>> m_occupancyLB;
+
+  int m_hist_lbMax;   // max number of LB
+
+  bool m_occupancyPerBC;
+
+  unsigned int m_nBCReadout;
+
+  int m_evt_lbMin; // lower limit for LB to be taken into account
+  int m_evt_lbMax; // upper limit for LB to be taken into account
+
+  int m_LBrange_max = -9999;
+
+  const unsigned int m_nIblFes = 14 * (4 + 6*2) * 2; // 14 stave * (4 3Ds + 6 2Ds * 2 Fes) * 2 sides = 448
+  const int m_perLB_min=0, m_perLB_max=3000, m_perLB_step=100; // For plots per certain LBs
+  const int m_perLB_n = (m_perLB_max-m_perLB_min)/m_perLB_step; // For plots per certain LBs
+
+  const int m_fei4bPixels = 26880; // 80 * 336
+  const int m_pixModPixels = 46080; // 144 * 320;
+};
+
+
+#endif // PIXELCONDITIONSALGS_HITMAPBUILDER_H