Merge 21.0.88 into 21.3 branch
This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.87](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.87) and [release/21.0.88](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.88) tags into the ~"21.3" branch. It reverts two ~"frozen-tier0-violating" changes from [release/21.0.87](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.87) that introduced large changes to egamma objects in HI mode: !15622 and !15632. The release [release/21.0.88](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.88) was built from the tag [nightly/21.0/2018-11-08T0120](https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2018-11-08T0120) This is the list of merge requests that were included since the previous release [release/21.0.87](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.87): * !15716 : Revert "Merge branch '2-10-18' into '21.0'" * !15659 : Pixel DQ hancool protections * !15695 : important fix to un-disable 12EM in PbPb2018 * !15717 : Revert "Merge branch 'HIEU-3-10-2018' into '21.0'" * !15674 : Updated Pixel cosmics_run.config * !15671 : fix directory structure of JetMon configuration * !15664 : Merge branch 'WriteSimOverflowBits' into '21.0' * !15655 : 21.0-ISF_FastCaloSim: Created TFCSCenterPositionCalculation class * !15645 : Flags for HI jet reconstruction (ATLHI-233) * !15611 : fix for ERROR in FTK_DataProviderSvc ATR-18972 and fix to FTK_RawTrack to correctly return InvPt * !15536 : PhysicsAnalysis/TauID/: Use TauAnalysisTools truth-matching and selection in Tau Physics Validation * !14863 : Adding with DigiTruth info for PFlow * !15669 : Update version.txt Link to the full diff between [release/21.0.88](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.88) and [release/21.0.87](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.87) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.87...release/21.0.88 Former-commit-id: e366e146e24fb31dbfff1bbb589a83ee854a2d14
Showing
- DataQuality/DataQualityConfigurations/config/HLT/HLTjet/heavyions_run.config 15 additions, 11 deletions...lityConfigurations/config/HLT/HLTjet/heavyions_run.config
- DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config 6040 additions, 4758 deletions...DataQualityConfigurations/config/Pixel/cosmics_run.config
- DataQuality/DataQualityUtils/python/pix_defect.py 23 additions, 6 deletionsDataQuality/DataQualityUtils/python/pix_defect.py
- Event/xAOD/xAODPFlow/Root/PFO_v1.cxx 90 additions, 0 deletionsEvent/xAOD/xAODPFlow/Root/PFO_v1.cxx
- Event/xAOD/xAODPFlow/xAODPFlow/PFODefs.h 20 additions, 1 deletionEvent/xAOD/xAODPFlow/xAODPFlow/PFODefs.h
- Event/xAOD/xAODPFlow/xAODPFlow/versions/PFOAttributesAccessor_v1.h 16 additions, 0 deletions...D/xAODPFlow/xAODPFlow/versions/PFOAttributesAccessor_v1.h
- ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx 2 additions, 2 deletionsForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
- HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigL1TopoWriteValData.cxx 27 additions, 2 deletions...nitoring/TrigOnlineMonitor/src/TrigL1TopoWriteValData.cxx
- HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigL1TopoWriteValData.h 1 addition, 0 deletions...Monitoring/TrigOnlineMonitor/src/TrigL1TopoWriteValData.h
- PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HITowerWeightTool.cxx 4 additions, 15 deletions...ysis/HeavyIonPhys/HIEventUtils/Root/HITowerWeightTool.cxx
- PhysicsAnalysis/HeavyIonPhys/HIEventUtils/share/cluster.geo.LArHole.root 0 additions, 0 deletions.../HeavyIonPhys/HIEventUtils/share/cluster.geo.LArHole.root
- PhysicsAnalysis/HeavyIonPhys/HIEventUtils/share/cluster.geo.root 0 additions, 0 deletions...Analysis/HeavyIonPhys/HIEventUtils/share/cluster.geo.root
- PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt 1 addition, 1 deletionPhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
- PhysicsAnalysis/TauID/TauDQA/share/PhysValTau.h 11 additions, 39 deletionsPhysicsAnalysis/TauID/TauDQA/share/PhysValTau.h
- PhysicsAnalysis/TauID/TauDQA/share/TauValidationPlots.h 29 additions, 0 deletionsPhysicsAnalysis/TauID/TauDQA/share/TauValidationPlots.h
- PhysicsAnalysis/TauID/TauDQA/share/TruthHandler.h 0 additions, 179 deletionsPhysicsAnalysis/TauID/TauDQA/share/TruthHandler.h
- PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.cxx 158 additions, 181 deletionsPhysicsAnalysis/TauID/TauDQA/src/PhysValTau.cxx
- PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.cxx 55 additions, 25 deletionsPhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.cxx
- PhysicsAnalysis/TauID/TauDQA/src/TruthHandler.cxx 0 additions, 596 deletionsPhysicsAnalysis/TauID/TauDQA/src/TruthHandler.cxx
- PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Migration.h 6 additions, 5 deletionsPhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Migration.h
Loading
Please register or sign in to comment