Merge branch 'DoxygenFixes' into 'master'

Resolve Ambiguities in doxygen file declarations

See merge request !4921

Former-commit-id: bdb90882

AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/PassNoneFilter.cxx

@@ -3,7 +3,7 @@
 */
 
 /**
- * @file PassNoneFilter.cxx
+ * @file AthenaPoolMultiTest/src/PassNoneFilter.cxx
  * @brief Implementation of class PassNoneFilter
  */
  

AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/PassNoneFilter.h

@@ -7,7 +7,7 @@
 #ifndef ATHENAPOOLMULTITEST_PASSNONEFILTER_H
 #define ATHENAPOOLMULTITEST_PASSNONEFILTER_H
 /**
- * @file PassNoneFilter.h
+ * @file AthenaPoolMultiTest/src/PassNoneFilter.h
  * @brief class definition for PassNoneFilter
  */
  

Calorimeter/CaloConditions/CaloConditions/Array.h

@@ -6,7 +6,7 @@
 
 // $Id: Array.h,v 1.2 2009-04-07 04:30:07 ssnyder Exp $
 /**
- * @file  Array.h
+ * @file  CaloConditions/Array.h
  * @author scott snyder <snyder@bnl.gov>
  * @date June, 2004
  * @brief Simple multidimensional arrays.

Calorimeter/CaloDetDescr/CaloDetDescr/CaloDetDescrElement.h

@@ -3,7 +3,7 @@
 */
 
 /**
- * @file CaloDetDescrElement.h
+ * @file CaloDetDescr/CaloDetDescrElement.h
  *
  * @brief Definition of CaloDetDescrElement
  *

Calorimeter/CaloGeoHelpers/CaloGeoHelpers/CaloPhiRange.h

@@ -3,7 +3,7 @@
 */
 
 /**
- * @file CaloPhiRange.h
+ * @file CaloGeoHelpers/CaloPhiRange.h
  *
  * @brief CaloPhiRange class declaration
  *

Control/AthLinks/AthLinks/DataLink.h

@@ -6,7 +6,7 @@
 
 // $Id: DataLink.h 783590 2016-11-11 00:38:09Z ssnyder $
 /**
- * @file DataLink.h
+ * @file AthLinks/DataLink.h
  * @author scott snyder <snyder@bnl.gov>
  * @date Nov, 2013
  * @brief Object reference supporting deferred reading from StoreGate.

Control/AthLinksSA/AthLinks/DataLink.h

@@ -25,7 +25,7 @@ class DataLink;
 EXIT_ROOT_SELECTION_NS
 
 /// @short DataLink implementation for ROOT usage
-///
+/// @file AthLinksSA/AthLinks/DataLink.h
 /// This is an implementation of DataLink<T> for vanilla ROOT.
 /// The code is quite simple, leaving most of the work for the
 /// xAOD::TEvent class.

Control/AthLinksSA/AthLinks/DataLinkBase.h

@@ -11,6 +11,7 @@ extern "C" {
 }
 
 /**
+ *  @file AthLinksSA/AthLinks/DataLinkBase.h
  *  @short A base class holding the object independent part of DataLink
  *
  *         To implement efficient ROOT I/O for DataLink<T> classes, they all

Control/AthenaKernel/AthenaKernel/CLASS_DEF.h

@@ -4,7 +4,7 @@
 
 #ifndef ATHENAKERNEL_CLASS_DEF_H
 #define ATHENAKERNEL_CLASS_DEF_H
-/** @file CLASS_DEF.h
+/** @file AthenaKernel/CLASS_DEF.h
  *  @brief macros to associate a CLID to a type
  *
  *  @author Paolo Calafiura <pcalafiura@lbl.gov>

Control/AthenaKernel/AthenaKernel/CLIDRegistry.h

@@ -4,7 +4,7 @@
 
 #ifndef ATHENAKERNEL_CLIDREGISTRY_H
 # define ATHENAKERNEL_CLIDREGISTRY_H
-/** @file CLIDRegistry.h
+/** @file AthenaKernel/CLIDRegistry.h
  * @brief  a static registry of CLID->typeName entries. NOT for general use.
  * Use ClassIDSvc instead.
  *

Control/AthenaKernel/AthenaKernel/ClassID_traits.h

@@ -4,7 +4,7 @@
 
 #ifndef ATHENAKERNEL_CLASSID_TRAITS_H
 #define ATHENAKERNEL_CLASSID_TRAITS_H
-/** @file ClassID_traits.h
+/** @file AthenaKernel/ClassID_traits.h
  * @brief  a traits class that associates a CLID to a type T
  * It also detects whether T inherits from Gaudi DataObject
  *

Control/AthenaKernel/AthenaKernel/errorcheck.h

@@ -6,7 +6,7 @@
 
 // $Id: errorcheck.h,v 1.6 2009-04-09 15:11:16 ssnyder Exp $
 /**
- * @file  errorcheck.h
+ * @file  AthenaKernel/errorcheck.h
  * @author scott snyder <snyder@bnl.gov>
  * @date Jan, 2006
  * @brief Helpers for checking error return status codes and reporting errors.

Control/AthenaMP/src/memory-monitor/rapidjson/error/error.h

@@ -21,7 +21,7 @@
 #ifndef RAPIDJSON_ERROR_ERROR_H__
 #define RAPIDJSON_ERROR_ERROR_H__
 
-/*! \file error.h */
+/*! \file AthenaMP/src/memory-monitor/rapidjson/error/error.h */
 
 /*! \defgroup RAPIDJSON_ERRORS RapidJSON error handling */
 

Control/AthenaMP/src/memory-monitor/rapidjson/reader.h

@@ -21,7 +21,7 @@
 #ifndef RAPIDJSON_READER_H_
 #define RAPIDJSON_READER_H_
 
-/*! \file reader.h */
+/*! \file AthenaMP/src/memory-monitor/rapidjson/reader.h */
 
 #include "rapidjson.h"
 #include "encodings.h"

Control/AthenaServices/python/__init__.py

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-## @file __init__.py
+## @file AthenaServices/python/__init__.py
 ## Hook for the AthenaServices py-module
 
 __version__ = '1.0.0'

Database/APR/CollectionUtilities/CollectionUtilities/UtilityFuncs.h

@@ -3,7 +3,7 @@
 */
 
 /**
- * @file UtilityFuncs.h
+ * @file CollectionUtilities/UtilityFuncs.h
  * @brief prototypes for utility POOL collection funcs
  * @author Jack.Cranshaw@cern.ch
  * $Id: UtilityFuncs.h 495625 2012-04-13 13:54:17Z mnowak $ 

Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/PassNoneFilter.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-/** @file PassNoneFilter.cxx
+/** @file AthenaPoolExampleAlgorithms/src/PassNoneFilter.cxx
  *  @brief This file contains the implementation for the PassNoneFilter class.
  *  $Id: PassNoneFilter.cxx,v 1.2 2008-12-10 21:28:11 gemmeren Exp $
  **/

Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-/** @file ReadData.cxx
+/** @file AthenaPoolExampleAlgorithms/src/ReadData.cxx
  *  @brief This file contains the implementation for the ReadData class.
  *  @author Peter van Gemmeren <gemmeren@anl.gov>
  *  $Id: ReadData.cxx,v 1.26 2009-03-14 22:05:57 gemmeren Exp $

Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h

@@ -5,7 +5,7 @@
 #ifndef ATHENAPOOLEXAMPLEALGORITHMS_READDATA_H
 #define ATHENAPOOLEXAMPLEALGORITHMS_READDATA_H
 
-/** @file ReadData.h
+/** @file AthenaPoolExampleAlgorithms/src/ReadData.h
  *  @brief This file contains the class definition for the ReadData class.
  *  @author Peter van Gemmeren <gemmeren@anl.gov>
  *  $Id: ReadData.h,v 1.2 2009-03-11 20:08:50 gemmeren Exp $

Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-/** @file WriteData.cxx
+/** @file AthenaPoolExampleAlgorithms/src/WriteData.cxx
  *  @brief This file contains the implementation for the WriteData class.
  *  @author Peter van Gemmeren <gemmeren@anl.gov>
  *  $Id: WriteData.cxx,v 1.25 2008-12-10 21:28:11 gemmeren Exp $