Merge branch 'master-larg4-calodd' into 'master'

LArG4: minor code cleanup

See merge request atlas/athena!50024

LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 // This class contains the geometry calculations needed to calculate
@@ -7,8 +7,8 @@
 
 // Aug-2008: M.Fincke
 
-#ifndef MiniFCALAssignIdentifier_H
-#define MiniFCALAssignIdentifier_H
+#ifndef LARG4MINIFCAL_MINIFCALASSIGNIDENTIFIER_H
+#define LARG4MINIFCAL_MINIFCALASSIGNIDENTIFIER_H
 
 #include "StoreGate/StoreGateSvc.h"
 #include "StoreGate/DataHandle.h"
@@ -33,8 +33,6 @@ class LArG4Identifier;
 class G4Step;
 class MsgStream;
 
-class CaloDetDescrManager ;
-
 namespace LArG4 {
 
   namespace MiniFCAL {

LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SingleTrackValidation.h"
@@ -26,7 +26,6 @@
 #include "GeoXPEngine.h"
 
 // To interpret LAr Geometry information:
-#include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "LArSimEvent/LArHitContainer.h"
 #include "CaloIdentifier/CaloCell_ID.h"