Merge branch 'cherry-pick-03573c45b5-master' into 'master' (a1e91a4c) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

a1e91a4c

Commit a1e91a4c authored 7 years ago by Vakhtang Tsulaia

Downloads
- Plain Diff

Merge branch 'cherry-pick-03573c45b5-master' into 'master'

Merge branch '21.0-use-pathresolver' into '21.0'

See merge request !2732

parents b00c6994 0127a0bf

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py 1 addition, 1 deletion

...nDetExample/InDetRecExample/share/InDetMonitoringPixel.py
InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt 2 additions, 3 deletions

InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h 11 additions, 8 deletions

...Monitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
InnerDetector/InDetMonitoring/PixelMonitoring/share/coolingPipeMap.csv 0 additions, 14 deletions

.../InDetMonitoring/PixelMonitoring/share/coolingPipeMap.csv
InnerDetector/InDetMonitoring/PixelMonitoring/share/lvMap.csv 0 additions, 280 deletions

...rDetector/InDetMonitoring/PixelMonitoring/share/lvMap.csv
InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx 46 additions, 40 deletions

...Detector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx 2 additions, 2 deletions

...r/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx 8 additions, 10 deletions

InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx 27 additions, 80 deletions

...ctor/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx

with 97 additions and 438 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment