Merge branch 'master-AFP-DQM-Nikola' of...

Merge branch 'master-AFP-DQM-Nikola' of https://gitlab.cern.ch:8443/ndikic/athena into master-AFP-DQM-Nikola

ForwardDetectors/AFP/Run3AFPMonitoring/CMakeLists.txt

@@ -16,6 +16,7 @@ atlas_depends_on_subdirs(
         Control/AthenaMonitoringKernel
         GaudiKernel
 	Event/xAOD/xAODForward
+	xAODForward/AFPSiHit
         LumiBlock/LumiBlockComps
         LumiBlock/LumiBlockData
         Trigger/TrigEvent/TrigDecisionInterface
@@ -80,7 +81,8 @@ atlas_add_component(
         AthenaMonitoringKernelLib
         LumiBlockData
         LWHists
-	xAODForward
+	AFPSiHit
+        xAODForward
         SGAudCore
         TrigDecisionToolLib
 )
@@ -89,5 +91,6 @@ atlas_add_component(
 #atlas_install_python_modules( python/*.py 
 #                              POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py )
 #atlas_install_scripts( share/Run3DQTestingDriver.py share/hist_file_dump.py share/hist_diff.sh )
 

ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPSiLayerAlgorithm.h

@@ -8,8 +8,8 @@
 #include "AthenaMonitoring/AthMonitorAlgorithm.h"
 #include "AthenaMonitoringKernel/Monitored.h"
 #include "StoreGate/ReadHandleKey.h"
-#include <xAODForward/AFPSiHitContainer.h>
-//##include <xAODForward/AFPSiHit.h>
+#include "xAODForward/AFPSiHitContainer.h"
+#include "xAODForward/AFPSiHit.h"
 
 #include "TRandom3.h"
 

ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx

@@ -144,7 +144,7 @@ StatusCode AFPSiLayerAlgorithm::fillHistograms( const EventContext& ctx ) const
 
     //ATH_CHECK( afpHitContainerKey.initialize() );
 
-    for(const auto& hitsItr: *afpHitContainer)
+    for(const xAOD::AFPSiHit *hitsItr: *afpHitContainer)
     {
 
 	switch(hitsItr->stationID())