athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-04-30T11:35:48+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/39471Disable tests that should not run in AthAnalysis2021-04-30T11:35:48+02:00Tadej Novaktadej.novak@cern.chDisable tests that should not run in AthAnalysisDisable tests that should not run in `AthAnalysis`. They are all referencing either reco or bytestream.
/cc @akraszna @lheinricDisable tests that should not run in `AthAnalysis`. They are all referencing either reco or bytestream.
/cc @akraszna @lheinrichttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36719Externals and Analysis Updates, master branch (2020.09.25.)2021-04-30T11:35:48+02:00Attila KrasznahorkayExternals and Analysis Updates, master branch (2020.09.25.)This is a pretty loaded merge request...
It updates all projects to [atlasexternals-2.0.79](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.79). The list of changes wrt. [atlasexternals-2.0.78](https://gitlab.cern.ch/atlas/atlase...This is a pretty loaded merge request...
It updates all projects to [atlasexternals-2.0.79](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.79). The list of changes wrt. [atlasexternals-2.0.78](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.78) are the following (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/2.0.78...2.0.79):
- Updated `FindSYCL.cmake` for better compatibility with the latest [oneAPI](https://software.intel.com/oneAPI) versions;
- Updated `FindUUID.cmake` to set up a correct RPM dependency in case the LCG release provides this package (which it has **not** done for a while now);
* Updated the build of `yampl` to pick up `libuuid` from the LCG release, if it is provided by the LCG release (should not affect the build in ~master);
- Updated the build of [HDF5](https://www.hdfgroup.org/solutions/hdf5/) to work correctly using [Xcode 12.0](https://developer.apple.com/xcode/) on [macOS Catalina](https://www.apple.com/macos/catalina/);
- Updated the build of [ROOT](https://root.cern/) to be more robust in using the Python version built as part of the same project as it is (should not affect the `x86_64-centos7-gcc8-opt` builds).
On top of these I also decided to make a few updates in this repository:
- After the failed attempt in !36360, I'm trying to clean up the build configuration of [Control/RootUtils](Control/RootUtils) once more. Let's see what the CI will have to say about it. (The update is necessary to be able to build `AnalysisBase` on Ubuntu and macOS platforms.)
- After the discussion in !36641, I decided to fix the test in [PhotonVertexSelection](PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection) myself. Fixing ATLASG-1553.
* I also added the package to the [Athena](Projects/Athena) project after fixing its test for that project as well.
- Fixed the standalone tests of [TriggerAnalysisAlgorithms](PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms). Which were tweaked, but not actually fixed, in !36646.
The small change in [AthenaPoolCnvSvc](Database/AthenaPOOL/AthenaPoolCnvSvc) was needed to make the test in [PhotonVertexSelection](PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection) work. But since that was an actual shortcoming in that package, I decided to just fix it outright instead of working around it in the test.
Pinging @kpachal, @krumnack.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42664Offline DQ CSC Histogram bug fixes2021-04-30T09:37:01+02:00Chara KitsakiOffline DQ CSC Histogram bug fixesCSC offline histograms have been validated compared to the old algorithms output.CSC offline histograms have been validated compared to the old algorithms output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43062Save SLHC track candidates with doStoreTrackCandidates2021-04-30T03:06:24+02:00Thomas StreblerSave SLHC track candidates with doStoreTrackCandidatesThis MR updates the InDetxAODCreator to retrieve the proper SLHC track collection to be converted into TrackParticle when the SLHC configuration is used.
FYI @ncalace @nstyles @lunedicThis MR updates the InDetxAODCreator to retrieve the proper SLHC track collection to be converted into TrackParticle when the SLHC configuration is used.
FYI @ncalace @nstyles @lunedichttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43022JetFitter fix for ITk2021-04-30T03:06:22+02:00Thomas StreblerJetFitter fix for ITkThe JetFitter configuration includes a strip hit requirement not adapted for the ITk geometry in the forward region. As for SV1, this requirement is relaxed when a Run4 configuration is run with this MR.
FYI @khanov @duperrinThe JetFitter configuration includes a strip hit requirement not adapted for the ITk geometry in the forward region. As for SV1, this requirement is relaxed when a Run4 configuration is run with this MR.
FYI @khanov @duperrinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43092Add Package Dependencies for SuperChic2021-04-30T03:06:16+02:00William Patrick MccormackAdd Package Dependencies for SuperChicAdding the package dependency on Apfel and LHApdf back into the Superchic_i cmake. Tagging @spagan @ewelinaAdding the package dependency on Apfel and LHApdf back into the Superchic_i cmake. Tagging @spagan @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43093MG 2.7.3p3.atlas62021-04-30T03:06:14+02:00Ewelina Maria LobodzinskaMG 2.7.3p3.atlas6MG 2.7.3p3.atlas6MG 2.7.3p3.atlas6https://gitlab.cern.ch/atlas/athena/-/merge_requests/43037CaloInterface: Remove ICaloMBAverageTool.2021-04-30T03:05:24+02:00Scott SnyderCaloInterface: Remove ICaloMBAverageTool.Remove unused ICaloMBAverageTool.Remove unused ICaloMBAverageTool.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42920updating tau-trigger han config file for R22 data reprocessing (ATR-23005)2021-04-30T03:05:15+02:00Antonio De Mariaupdating tau-trigger han config file for R22 data reprocessing (ATR-23005)Removing Run2 chains used for commissioning/tests:
* tracktwoEFmvaTES
* medium1NoPt
* perf
* looseRNN
* FTK
Added in the han-config missing chains from :
* https://gitlab.cern.ch/atlas/athena/-/merge_requests/42909
* https://gitlab.c...Removing Run2 chains used for commissioning/tests:
* tracktwoEFmvaTES
* medium1NoPt
* perf
* looseRNN
* FTK
Added in the han-config missing chains from :
* https://gitlab.cern.ch/atlas/athena/-/merge_requests/42909
* https://gitlab.cern.ch/atlas/athena/-/merge_requests/42946
2015
```
tau80_medium1_tracktwo
tau125_medium1_tracktwo
tau160_medium1_tracktwo
tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
tau35_medium1_tracktwo_L1TAU20_xe70_L1XE45
```
2016
```
tau35_medium1_tracktwo_tau25_medium1_tracktwo
tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12
tau35_medium1_tracktwo_xe70_L1XE45
```
2017
```
tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
tau35_medium1_tracktwo_tau25_medium1_tracktwo_xe50
```
2018
```
tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dR30_L1DR-TAU20ITAU12I-J25
tau35_medium1_tracktwoEF_xe70_L1XE45
```
HLT_tau25 single leg histograms are also added
pinging @ebergeas, @iriu and @carquin
-----------------------------------------------------------------
here is attached the output of the han-config-check.sh script
```
han-config-check.sh: collisions_run.config: Checking for syntax errors ...
OK
han-config-check.sh: collisions_run.config: Checking for redefined objects that are not "output" blocks (having any is an error)...
OK
han-config-check.sh: collisions_run.config: Checking for objects that are referenced but not defined (having any is an error)...
reference CentrallyManagedReferences_Trigger
reference CentrallyManagedReferences_TriggerMain
not OK
han-config-check.sh: collisions_run.config: Checking for objects that are defined but not used (these are safe but clutter files)...
output HLT/Run3
output HLT/Run3/TRTAU
output HLT/Run3/TRTAU/Expert
output HLT/Run3/TRTAU/Shifter
reference HLT_TauTrigger_ExpressReference
reference HLT_TauTrigger_MainReference
done
```
@ebergeas, can you please confirm that "CentrallyManagedReferences_Trigger" and "CentrallyManagedReferences_TriggerMain" are something we should use for references?
I saw they are also used in many other han-config fileshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43056TrigInDetValidation - add chain algorithms to cost monitoring in ART tests2021-04-30T03:05:13+02:00Julie KirkTrigInDetValidation - add chain algorithms to cost monitoring in ART testsAdd options --monitorChainAlgorithm to the cost monitoring in TrigInDetValidation ART testsAdd options --monitorChainAlgorithm to the cost monitoring in TrigInDetValidation ART testshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43051Support SQLite DB input in the IdDictDetDescrCnv2021-04-30T03:05:11+02:00Vakhtang TsulaiaSupport SQLite DB input in the IdDictDetDescrCnvFixed `IdDictDetDescrCnv` so that it can get ID dictionary file names when `GeoModel`
is built from the SQLite DB. Also switched `IdDictDetDescrCnv` from `IGeoModelSvc`
to `IGeoDbTagSvc`.
Finally, enabled `LArHVManager` building in `LAr...Fixed `IdDictDetDescrCnv` so that it can get ID dictionary file names when `GeoModel`
is built from the SQLite DB. Also switched `IdDictDetDescrCnv` from `IGeoModelSvc`
to `IGeoDbTagSvc`.
Finally, enabled `LArHVManager` building in `LArDetectorTool` when `GeoModel` is built
from the SQLite DB.
This commit is yet another intermediate step towards building the entire LAr
`GeoModel` description from SQLite DB.
CC @boudreau @dellacqu @rbianchihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43033LArRecUtils: Remove LArOFCTool.2021-04-30T03:05:09+02:00Scott SnyderLArRecUtils: Remove LArOFCTool.Remove obsolete/unused tool LArOFCTool.Remove obsolete/unused tool LArOFCTool.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43034StorageSvc+PersistencySvc+RootStorageSvc: Enable thread-safety checking for S...2021-04-30T03:05:05+02:00Scott SnyderStorageSvc+PersistencySvc+RootStorageSvc: Enable thread-safety checking for StorageSvc.Enable the thread-safety checker for StorageSvc.
Rework to fix all warnings.Enable the thread-safety checker for StorageSvc.
Rework to fix all warnings.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43041Fix issue with JMS calibration2021-04-30T03:04:56+02:00Chris Malena DelitzschFix issue with JMS calibrationThis MR fixes a bug that was introduced in !42190 when migrating the large-R JMS in situ calibration to master. The issue was reported in the AMG meeting. I simply declared the same TLorentzVector twice, once within an if statement such ...This MR fixes a bug that was introduced in !42190 when migrating the large-R JMS in situ calibration to master. The issue was reported in the AMG meeting. I simply declared the same TLorentzVector twice, once within an if statement such that the TLV wasn't filled properly outside that criteria anymore. Code has been tested locally and runs fine now and the output looks as expected.
Tagging @wbalunas @sawyer @mswiatlohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/4305222.0 small cleanup : use cmath constants2021-04-30T03:04:50+02:00Shaun Roe22.0 small cleanup : use cmath constantsExtremely minor cleanup using cmath constants.Extremely minor cleanup using cmath constants.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43049split KalmanParameterUpdator inline methods to separate .icc .2021-04-30T03:04:48+02:00Christos Anastopouloschristos.anastopoulos@cern.chsplit KalmanParameterUpdator inline methods to separate .icc .split KalmanParameterUpdator inline methods to separate .icc . Move some of the methods inside the anonymous namespacesplit KalmanParameterUpdator inline methods to separate .icc . Move some of the methods inside the anonymous namespacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43009add new tests to test transform from HIT to AOD (ATR-23287)2021-04-30T03:04:46+02:00Yasuyuki Okumuraadd new tests to test transform from HIT to AOD (ATR-23287)Dear all,
This MR is in order to add new tests to test transform from HIT to AOD in ART tests per request from L1Calo experts.
Adding the following two executable python scripts and no effect is expected out of the tests.
`Trigger/T...Dear all,
This MR is in order to add new tests to test transform from HIT to AOD in ART tests per request from L1Calo experts.
Adding the following two executable python scripts and no effect is expected out of the tests.
`Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_v1Dev_build.py`
`Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_v1Dev_phase1_build.py`
Best regards,
Yasu Okumurahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43046Remove un-needed folder, the same content and actual tests exist under TrkGau...2021-04-30T03:04:29+02:00Christos Anastopouloschristos.anastopoulos@cern.chRemove un-needed folder, the same content and actual tests exist under TrkGaussianSumFilterUtils nowRemove un-needed folder, the same content and actual tests exist under TrkGaussianSumFilterUtils nowRemove un-needed folder, the same content and actual tests exist under TrkGaussianSumFilterUtils nowhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43048TEG Forward: Create precise calo and electron hypos2021-04-30T03:04:25+02:00Joao Victor Da Fonseca PintoTEG Forward: Create precise calo and electron hyposThis MR created the skeleton (only) for the precise electron and calo steps. This will
be filled by experts soon.
ping: @cjmeyer, @fernando , @dbakshig , @mschefer, @mverissi , @eegidiop
Ticket: ATR-18968This MR created the skeleton (only) for the precise electron and calo steps. This will
be filled by experts soon.
ping: @cjmeyer, @fernando , @dbakshig , @mschefer, @mverissi , @eegidiop
Ticket: ATR-18968Joao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42989PyUtils: Force load certain dictionaries in diff-root to workaround the probl...2021-04-30T03:04:24+02:00Alaettin Serhan MetePyUtils: Force load certain dictionaries in diff-root to workaround the problem reported in ATLASRECTS-6261This should workaround the problem discussed in ATLASRECTS-6261 (confirmed locally).This should workaround the problem discussed in ATLASRECTS-6261 (confirmed locally).