- Oct 20, 2017
-
-
Tim Martin authored
-
- Oct 19, 2017
-
-
Veronique Boisvert authored
Update TrigMC to 21.1.17 See merge request !5532
-
Veronique Boisvert authored
Extend build log files in AthSimulation, AthDerivation, AthenaP1, Athena projects / 21.0-TrigMC (ATLINFR-1816) See merge request !5543
-
- Oct 18, 2017
-
-
Atlas-Software Librarian authored
Extend build log files in AthSimulation, AthDerivation, AthenaP1, Athena projects / 21.0-TrigMC (ATLINFR-1816)
-
Veronique Boisvert authored
Merge branch 'master-copy_rpm_eos-update' See merge request !5515
-
Emil Obreshkov authored
Added protection for EOS false positive error. See merge request !5397
-
- Oct 17, 2017
-
-
Tim Martin authored
For the following conflicts, most were a case of THIERS=T=21.1.17 or OURS=O=21.0.39 Conflicts: T DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/cosmics_run.config T Event/xAOD/xAODForward/Root/dict/ContainerProxies.cxx T Event/xAOD/xAODForward/xAODForward/selection.xml T Event/xAOD/xAODForward/xAODForward/xAODForwardDict.h T ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/CMakeLists.txt T ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/AFPSiClusterTool.cxx T ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/AFPSiClusterTool.h T ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/AFPSiRowColToLocalCSTool.cxx O Projects/Athena/externals.txt T Projects/AthenaP1/externals.txt O Reconstruction/HeavyIonRec/HIRecExample/share/HIRec_jobOptions.py O Tools/ART/python/ART/art_base.py O Tools/ART/python/ART/art_build.py O Tools/ART/python/ART/art_grid.py O Tools/ART/python/ART/art_header.py O Tools/ART/python/ART/art_misc.py O Tools/ART/scripts/art-task-build.sh O Tools/ART/scripts/art-task-grid.sh O Tools/ART/scripts/art.py O Tools/ART/share/localSetupART.sh
-
Veronique Boisvert authored
Update TrigMC to 21.0.39 See merge request !5489
-
Tim Martin authored
Not sure why PixelMonitoring conflicted. Taken all changes from 21.0.39 Conflicts: InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/HolderTemplate.h InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx Projects/Athena/version.txt Projects/AthenaP1/externals.txt
-
- Oct 10, 2017
-
-
Nicolas Berger authored
Degrade ERROR msg when navigation is requested in Events without navigation… See merge request !5317
-
Nicolas Berger authored
Protect DEBUG/VERBOSE messages, move to AthenaBaseComps macros (ATR-17108) See merge request !5287
-
Nicolas Berger authored
Revert "Merge branch 'BJetHypoRedesignFor21.1' into '21.1'" See merge request !5307
-
Lukas Alexander Heinrich authored
Degrade ERROR msg when navigation is requested in Events without navigation information (relates to ATR-17043) if no navigation is present trigger bits can be unpacked from the event header. In the job others might still request navigation information (e.g. features). We will now only warn people instead of throwing an ERROR.
-
Tim Martin authored
This reverts merge request !4724
-
- Oct 09, 2017
-
-
Olga Igonkina authored
AFP track reconstruction refactor See merge request !5267
-
Stewart Martin-Haugh authored
-
Olga Igonkina authored
ATR-17161 update log messages See merge request !5269
-
Olga Igonkina authored
Update of DQ Alignment monitoring track selection cuts. See merge request !5186
-
Olga Igonkina authored
MsgStream Macros See merge request !5043
-
Veronique Boisvert authored
Merge branch 'master-ftk-overlap-phifix4' into 'master' See merge request !5216
-
- Oct 08, 2017
-
-
Olga Igonkina authored
Changes in the pp_v7 towards the Xe run (ATR-17052) See merge request !5268
-
Marcus Matthias Morgenstern authored
-
Martin Rybar authored
Changes in the pp_v7 towards the Xe run (ATR-17052). Adding chains to the MB overlay stream seeded of L1_MBTS_1_VTE70, and new chains needed for ID calibration and beam spot with seeds optimized for the Xe run. More details can be found in ATR-17052.
-
Grzegorz Gach authored
Removed commented code and updated documentation.
-
Grzegorz Gach authored
-
Grzegorz Gach authored
Moved initialisation and definition of static const class members to source files, becuase anyway the variables would have to be defined in source files if they are ever bound to a reference. Lack of definition can cause link failures, but often only in debug builds. See <https://stackoverflow.com/questions/5391973/undefined-reference-to-static-const-int>
-
Grzegorz Gach authored
-
Grzegorz Gach authored
The code for AFP track reconstruction is refactored and adjusted to ATLAS standards. A use of pixel cluster xAOD objects is introduced.
-
Grzegorz Gach authored
Adding package that clusters AFP tracking hits and transfroms them to station local coordinate system. Before all this was done in the track reconstruction algorithm.
-
- Oct 07, 2017
-
-
Stewart Martin-Haugh authored
-
Olga Igonkina authored
Added triggers for NCB: ATR-17056 See merge request !5233
-
- Oct 06, 2017
-
-
Javier Montejo authored
-
Per Daniel Conny Johansson authored
Updated the Alignment monitoring python file since I made a mistake in previous version, should now correctly run with new the cuts
-
Olga Igonkina authored
Merge branch 'master-ftk-overlap-phifix4' into 'master' See merge request !5215
-
Olga Igonkina authored
alternative-prefetching-for-pix-and-sct See merge request !5149
-
Olga Igonkina authored
Cleanup L1 items (SUSY, exotics, tau, VBF): ATR-16963 See merge request !5178
-
Stewart Martin-Haugh authored
-
Olga Igonkina authored
Updates for ROB prefetching in Steering and ROBDataProviderSvc (ATR-16622) See merge request !5209
-
Olga Igonkina authored
Avoid call to abort chain for ROB prefetching in Fex algorithm when number of… See merge request !5207
-
Olga Igonkina authored
Moved egamma chains from CombinedSlice to EgammaSlice in Physics_pp_v7 (ATR-17153) See merge request !5185
-