From cd907c0f8a3fe881db49cab25bdd7bb05bc4a357 Mon Sep 17 00:00:00 2001 From: sutt Date: Wed, 22 May 2019 10:39:16 +0200 Subject: [PATCH] Code complieance changes from 21.3 which did not sweep to master This is a large set of code complience changes that for some reason did not get swept into master. This should bring the monitoring pakages in to line with 21.3 --- .../Readcards/src/IReadCards.cxx | 18 ++++---- .../Readcards/src/IReadCards.h | 26 ++++++----- .../Readcards/src/ReadCards.cxx | 32 +++++++------- .../Readcards/src/ReadCards.h | 26 ++++++----- .../Readcards/src/Value.cxx | 18 ++++---- .../Readcards/src/Value.h | 26 ++++++----- .../Readcards/src/main.cxx | 11 +++-- .../Readcards/src/utils.cxx | 18 ++++---- .../Readcards/src/utils.h | 26 ++++++----- .../Resplot/src/BasicRandom.h | 43 +++++++++---------- .../Resplot/src/Directory.h | 26 ++++++----- .../Resplot/src/Random.h | 31 ++++++------- .../Resplot/src/Resplot.cxx | 18 ++++---- .../Resplot/src/Resplot.h | 26 ++++++----- .../Resplot/src/StatVal.h | 30 ++++++------- .../Resplot/src/generate.cxx | 12 ++++-- .../Resplot/src/generate.h | 13 ++++-- .../Resplot/src/main.cxx | 12 ++++-- .../Resplot/src/rmsFrac.cxx | 12 ++++-- .../Resplot/src/rmsFrac.h | 12 ++++-- .../Resplot/src/tagname.h | 26 ++++++----- 21 files changed, 235 insertions(+), 227 deletions(-) diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx index 638f7904cdf..4d1aef6dcb4 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx @@ -1,23 +1,21 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/** ** - ** File: IReadCards.cxx + ** @file IReadCards.cxx ** - ** Description: fortran callable interface routines to the + ** fortran callable interface routines to the ** ReadCards parameter file ** ** - ** Author: M.Sutton + ** @author M.Sutton ** - ** Created: Fri Aug 12 17:40:22 CEST 2005 - ** Modified: + ** @date Fri Aug 12 17:40:22 CEST 2005 + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h index 11ee7b26593..a6b6a4a8582 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h @@ -1,27 +1,25 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: IReadCards.h + ** @file IReadCards.h ** - ** Description: fortran callable interface routines to the + ** fortran callable interface routines to the ** ReadCards parameter file ** ** - ** Author: M.Sutton + ** @author M.Sutton ** - ** Created: Fri Aug 12 17:40:56 CEST 2005 - ** Modified: + ** @date Fri Aug 12 17:40:56 CEST 2005 + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __IREADCARDS_H -#define __IREADCARDS_H +#ifndef READCARDS_IREADCARDS_H +#define READCARDS_IREADCARDS_H #ifdef __cplusplus @@ -44,7 +42,7 @@ extern "C" { -#endif /* __IREADCARDS_H */ +#endif /* READCARDS_IREADCARDS_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx index 7ba420b771e..025276b4723 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx @@ -1,21 +1,21 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/** ** - ** File: ReadCards.cxx + ** @file ReadCards.cxx ** - ** Description: This is a *good* parser. It now seems to parse + ** This is a *good* parser. It now seems to parse ** quite well, and is quite neatly coded. ** - ** Author: M.Sutton + ** @author M.Sutton ** - ** Created: Tue Apr 26 13:44:42 CEST 2005 - ** Modified: Sat Mar 18 10:09:14 GMT 2006 + ** @date Tue Apr 26 13:44:42 CEST 2005 + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ + + #include #include @@ -34,12 +34,12 @@ std::vector ReadCards::mPath; /** set up the search path for the config files **/ -#ifdef _DIR_ +#ifdef RESPLOTDIR_TMP #define SREPLACE(s) REPLACE(s) #define REPLACE(s) #s -#define __DIR__ SREPLACE(_DIR_) +#define RESPLOTDIR SREPLACE(RESPLOTDIR_TMP) #else -#define __DIR__ "" +#define RESPLOTDIR "" #endif void ReadCards::CreatePath() { @@ -51,12 +51,12 @@ void ReadCards::CreatePath() { } } mPath.push_back(""); - mPath.push_back(std::string(__DIR__)+"/"); + mPath.push_back(std::string( RESPLOTDIR )+"/"); // for ( int i=0 ; i>CreatePath() mPath[" << i << "]=" << mPath[i] << endl; } -/** check for file in cwd or if not, check in the __DIR__, then read the file +/** check for file in cwd or if not, check in the RESPLOTDIR, then read the file **/ void ReadCards::Construct(const std::string& filename) { @@ -78,7 +78,7 @@ void ReadCards::Construct(const std::string& filename) { int pid = getpid(); - char tfile[256]; + char tfile[512]; if ( mFileName.find("/")==std::string::npos ) std::sprintf( tfile, ".readcards-%s-%d", mFileName.c_str(), pid ); else std::sprintf( tfile, ".readcards-%d", pid ); diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h index 5497002ecb0..07a17e77284 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h @@ -1,27 +1,25 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: ReadCards.h + ** @file ReadCards.h ** - ** Description: + ** ** ** ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Tue Apr 26 13:44:30 CEST 2005 ** - ** Created: Tue Apr 26 13:44:30 CEST 2005 - ** Modified: + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __READCARDS_H -#define __READCARDS_H +#ifndef READCARDS_READCARDS_H +#define READCARDS_READCARDS_H #include #include @@ -252,7 +250,7 @@ private: }; -#endif /* __READCARDS_H */ +#endif /* READCARDS_READCARDS_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx index e1ffbc2f5bb..726cd141507 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx @@ -1,23 +1,21 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/** ** - ** File: Value.cxx + ** @file Value.cxx ** - ** Description: + ** ** ** ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Fri May 11 17:29:29 BST 2007 ** - ** Created: Fri May 11 17:29:29 BST 2007 - ** Modified: + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ #include "Value.h" diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h index 1e34d423052..b67e9d75129 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h @@ -1,27 +1,25 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: Value.h + ** @file Value.h ** - ** Description: + ** ** ** ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Wed May 4 11:14:42 BST 2005 ** - ** Created: Wed May 4 11:14:42 BST 2005 - ** Modified: + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __VALUE_H -#define __VALUE_H +#ifndef READCARDS_VALUE_H +#define READCARDS_VALUE_H #include @@ -63,7 +61,7 @@ private: std::ostream& operator<<(std::ostream& s, const Value& v); -#endif /* __VALUE_H */ +#endif /* READCARDS_VALUE_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx index b16a7d79481..97f490b59bd 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx @@ -1,6 +1,11 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ +/** + ** @file main.cxx + ** + ** @author mark sutton + ** @date Fri 11 Jan 2019 07:41:26 CET + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ #include diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx index d014f435162..6a11cdb79a7 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx @@ -1,23 +1,21 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/** ** - ** File: utils.cxx + ** @file utils.cxx ** - ** Description: + ** ** ** ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Thu Jun 23 01:11:43 BST 2005 ** - ** Created: Thu Jun 23 01:11:43 BST 2005 - ** Modified: + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h index 27a15df7118..01652fed106 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h @@ -1,27 +1,25 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: utils.h + ** @file utils.h ** - ** Description: + ** ** ** ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Thu Jun 23 01:53:36 BST 2005 ** - ** Created: Thu Jun 23 01:53:36 BST 2005 - ** Modified: + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __UTILS_H -#define __UTILS_H +#ifndef READCARDS_UTILS_H +#define READCARDS_UTILS_H #include #include @@ -74,7 +72,7 @@ std::string number(const double& d, const std::string& s="%lf"); -#endif /* __UTILS_H */ +#endif /* READCARDS_UTILS_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h index 8f3f7845518..9ff059cddfc 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h @@ -1,25 +1,24 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -// -// @file BasicRandom.h -// a Randomnumber generator with a data member TRandom3 -// so that we can either use a shared generator -// or a dediceted one. -// NB: there will be seperate instances of this class -// but in the case of a shared generator, they will -// all use the same TRandom3 -// -// uses the root TRandom3 Mersenne Twistor generator, -// 623-diminsionally equidistributed uniform generator. -// from ACM Trans. Mod. Comp. Sim. Vol 8-1 (1998) 3. -// -// This wrapper is to avoid global variables cluttering -// up the place - root is bad enough as it is. -// -// -// $Id: BasicRandom.h, v0.0 Fri 27 Jan 2012 11:39:47 GMT sutt $ +/* emacs: this is -*- c++ -*- */ +/** + ** @file BasicRandom.h + ** + ** a Randomnumber generator with a data member TRandom3 + ** so that we can either use a shared generator + ** or a dediceted one. + ** NB: there will be seperate instances of this class + ** but in the case of a shared generator, they will + ** all use the same TRandom3 + ** uses the root TRandom3 Mersenne Twistor generator, + ** 623-diminsionally equidistributed uniform generator. + ** from ACM Trans. Mod. Comp. Sim. Vol 8-1 (1998) 3. + ** This wrapper is to avoid global variables cluttering + ** up the place - root is bad enough as it is. + ** + ** @author mark sutton + ** @date Fri 27 Jan 2012 11:39:47 GMT + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ #ifndef BASICRANDOM_H diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h index 9c1b0528c37..3a58d118656 100755 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h @@ -1,27 +1,25 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: Directory.h + ** @file Directory.h ** - ** Description: class to keep a directory for each object + ** class to keep a directory for each object ** in a root sort of way, but needed to keep ** the root objects out of the actual code. ** - ** Author: M.Sutton + ** @author M.Sutton ** - ** Created: Wed May 4 17:54:25 BST 2005 - ** Modified: + ** @date Wed May 4 17:54:25 BST 2005 + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __DIRECTORY_H -#define __DIRECTORY_H +#ifndef RESPLOT_DIRECTORY_H +#define RESPLOT_DIRECTORY_H #include "TDirectory.h" #include "TH1.h" @@ -62,7 +60,7 @@ class Directory { -#endif /* __DIRECTORY_H */ +#endif /* RESPLOT_DIRECTORY_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h index 86367d45ab5..6b69ffff306 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h @@ -1,18 +1,19 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -// -// @file Random.h -// singleton random number generator wrapper, for the -// root TRandom3 Mersenne Twistor generator, -// 623-diminsionally equidistributed uniform generator. -// from ACM Trans. Mod. Comp. Sim. Vol 8-1 (1998) 3. -// This wrapper is to avoid global variables cluttering -// up the place - root is bad enough as it is. -// -// -// $Id: Random.h, v0.0 Fri 27 Jan 2012 11:39:47 GMT sutt $ +/* emacs: this is -*- c++ -*- */ +/** + ** @file Random.h + ** + ** singleton random number generator wrapper, for the + ** root TRandom3 Mersenne Twistor generator, + ** 623-diminsionally equidistributed uniform generator. + ** from ACM Trans. Mod. Comp. Sim. Vol 8-1 (1998) 3. + ** This wrapper is to avoid global variables cluttering + ** up the place - root is bad enough as it is. + ** + ** @author mark sutton + ** @date Fri 27 Jan 2012 11:39:47 GMT + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ #ifndef RANDOM_H diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx index 1b4d110bc03..44078bff6fb 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx @@ -1,23 +1,21 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/** ** - ** File: Resplot.cxx + ** @file Resplot.cxx ** - ** Description: + ** ** ** ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Mon Jun 21 18:35:22 BST 2004 ** - ** Created: Mon Jun 21 18:35:22 BST 2004 - ** Modified: + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ #include #include diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h index 5a666e2ac12..3224c975a4f 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h @@ -1,29 +1,27 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: Resplot.h + ** @file Resplot.h ** - ** Description: A class to do useful book keeping and efficiency + ** A class to do useful book keeping and efficiency ** stuff. Like a TH1D in root, only it keeps a series ** of histograms with a value, very useful for making ** resolutions and so on. ** ** - ** Author: M.Sutton + ** @author M.Sutton ** - ** Created: Mon Jun 21 18:35:22 BST 2004 - ** Modified: + ** @date Mon Jun 21 18:35:22 BST 2004 + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __RESPLOT_H -#define __RESPLOT_H +#ifndef RESPLOT_RESPLOT_H +#define RESPLOT_RESPLOT_H #include @@ -690,5 +688,5 @@ private: inline Resplot operator*(double d, Resplot r) { return (r*=d); } -#endif /* __RESPLOT_H */ +#endif /* RESPLOT_RESPLOT_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h index b1028517013..d3b84a30a96 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h @@ -1,26 +1,20 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** - ** - ** File: StatVal.h - ** - ** Description: simple class containing the value and stat error +/* emacs: this is -*- c++ -*- */ +/** + ** @file StatVal.h ** + ** simple class containing the value and stat error ** - ** Author: M.Sutton + ** @author M.Sutton + ** + ** @date Mon Jun 21 18:35:22 BST 2004 ** - ** Created: Mon Jun 21 18:35:22 BST 2004 - ** Modified: - ** - ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** - **************************************************************************/ + **/ -#ifndef __STATVAL_H -#define __STATVAL_H +#ifndef RESPLOT_STATVAL_H +#define RESPLOT_STATVAL_H #include #include @@ -64,5 +58,5 @@ inline std::ostream& operator<<(std::ostream& s, const StatVal& sv) { -#endif /* __STATVAL_H */ +#endif /* RESPLOT_STATVAL_H */ diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx index c4a3ae3d910..9d36001ab4d 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx @@ -1,6 +1,12 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ +/** + ** @file generate.cxx + ** + ** @author mark sutton + ** @date Fri 11 Jan 2019 07:41:26 CET + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ + #include #include diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h index cd5fcf6763e..5596494adbe 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h @@ -1,6 +1,13 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ +/* emacs: this is -*- c++ -*- */ +/** + ** @file generate.h + ** + ** @author mark sutton + ** @date Fri 11 Jan 2019 07:06:39 CET + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ + #ifndef GENERATE_H #define GENERATE_H diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx index 427ff9fbfa8..b11853f65b8 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx @@ -1,6 +1,12 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ +/** + ** @file main.cxx + ** + ** @author mark sutton + ** @date Fri 11 Jan 2019 07:41:27 CET + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ + #include #include diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx index da30e167c82..9a7c877b3d4 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx @@ -1,6 +1,12 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ +/** + ** @file rmsFrac.cxx + ** + ** @author mark sutton + ** @date Fri 11 Jan 2019 07:41:27 CET + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ + #include diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h index 69843018eb8..9cc085c251d 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h @@ -1,6 +1,12 @@ -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ +/* emacs: this is -*- c++ -*- */ +/** + ** @file rmsFrac.h + ** + ** @author mark sutton + ** @date Fri 11 Jan 2019 07:06:39 CET + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + **/ #ifndef RMSFRAC_H diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h index 074dbbf6ada..82cf9d25ab5 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h @@ -1,27 +1,25 @@ -// emacs: this is -*- c++ -*- -/* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration -*/ -/************************************************************************** +/* emacs: this is -*- c++ -*- */ +/** ** - ** File: tagname.h + ** @file tagname.h ** - ** Description: noddy struct to add integer tokens to a tag + ** noddy struct to add integer tokens to a tag ** ** ** - ** Author: M.Sutton + ** @author M.Sutton ** - ** Created: Wed Jun 9 19:44:29 BST 2004 - ** Modified: + ** @date Wed Jun 9 19:44:29 BST 2004 + ** + ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ** ** ** - **************************************************************************/ + **/ -#ifndef __TAGNAME_H -#define __TAGNAME_H +#ifndef RESPLOT_TAGNAME_H +#define RESPLOT_TAGNAME_H #include @@ -74,7 +72,7 @@ private: }; -#endif /* __TAGNAME_H */ +#endif /* RESPLOT_TAGNAME_H */ -- GitLab