Merge branch 'mr-2017-06' into '21.0' (11d2a2f3) · Commits · susy-hackers / athena

Commit 11d2a2f3 authored 7 years ago by Tamara Vazquez Schroeder

Merge branch 'mr-2017-06' into '21.0'

PixelMonitoring: code formatting and ATLAS naming conventions

See merge request !4837

Former-commit-id: 372423744177e4ace5d35f29d1514e6f48cf877d

parents 7668d598 61a8cab2

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/Components.h 2 additions, 2 deletions

...etMonitoring/PixelMonitoring/PixelMonitoring/Components.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/HolderTemplate.h 3 additions, 3 deletions

...nitoring/PixelMonitoring/PixelMonitoring/HolderTemplate.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h 668 additions, 730 deletions

...Monitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h 1 addition, 1 deletion

...ring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h 1 addition, 1 deletion

.../PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h 2 additions, 2 deletions

...toring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h 5 additions, 5 deletions

...ng/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h 71 additions, 70 deletions

...itoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h
InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx 612 additions, 632 deletions

...Detector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/Components.cxx 31 additions, 34 deletions

...tector/InDetMonitoring/PixelMonitoring/src/Components.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx 770 additions, 734 deletions

InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx 363 additions, 451 deletions

...r/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx 728 additions, 742 deletions

InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx 903 additions, 1045 deletions

...ector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx 764 additions, 844 deletions

...ctor/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx 144 additions, 146 deletions

...nDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx 147 additions, 149 deletions

...Monitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx 183 additions, 181 deletions

.../InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx 215 additions, 216 deletions

...etMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx 353 additions, 330 deletions

...r/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx

with 5966 additions and 6318 deletions

Please register or to comment