athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-10-28T17:00:55+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/47702DetCommon: remove legacy configuration packages2021-10-28T17:00:55+02:00Frank WinklmeierDetCommon: remove legacy configuration packagesRemove the legacy trigger configuration packages from the `DetCommon` project that were needed to
support Run-1&2 menus, i.e.:
- TrigConfStorage
- TrigConfHLTData
- TrigConfHLTUtils
- TrigConfJobOptData
- TrigConfL1Data
The packages wil...Remove the legacy trigger configuration packages from the `DetCommon` project that were needed to
support Run-1&2 menus, i.e.:
- TrigConfStorage
- TrigConfHLTData
- TrigConfHLTUtils
- TrigConfJobOptData
- TrigConfL1Data
The packages will still be available in the full Athena release to support reconstruction of old data.
This will be deployed at P1 as part of the next release against tdaq-09-04-00. L1Calo and CTP need to check that none of their applications is building against any of these libraries. If they are still needed we need to figure out why.
cc @landon @amarzin @stelzer @markhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47648RecExCommon: some cleanup of RecExCommon_topOptions2021-10-28T15:43:03+02:00Frank WinklmeierRecExCommon: some cleanup of RecExCommon_topOptionsSome minimal cleanup of `RecExCommon_topOptions.py` to be able to make
maintenance at least slightly easier:
- remove dead configuration code (CBNT, MuonBoy, Atlfast)
- delete commented code
- apply flake8 fixes
- remove backwards compa...Some minimal cleanup of `RecExCommon_topOptions.py` to be able to make
maintenance at least slightly easier:
- remove dead configuration code (CBNT, MuonBoy, Atlfast)
- delete commented code
- apply flake8 fixes
- remove backwards compatible `try...except` code
- remove Python2 compatibility code (`printfunc`)
- remove the `disableRPC` global flag
- remove code for includes that no longer existhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47698Autoconfigure and load PLR from the geometry database2021-10-28T15:42:33+02:00Tadej Novaktadej.novak@cern.chAutoconfigure and load PLR from the geometry databaseAutoconfigure and load PLR from the geometry database. Preparation also done for BCMPrime.
/cc @nstyles @dfellers @janovakAutoconfigure and load PLR from the geometry database. Preparation also done for BCMPrime.
/cc @nstyles @dfellers @janovakhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47708athenaHLT: use single-threaded Oracle client library2021-10-28T15:42:38+02:00Frank WinklmeierathenaHLT: use single-threaded Oracle client libraryFix the issue of extra Oracle threads during forking that are spawned
when reading from COOL during the python configuration stage.
Requires Oracle 19.11 and setting `$CORAL_ORA_NO_OCI_THREADED`.
Closes ATR-21890.Fix the issue of extra Oracle threads during forking that are spawned
when reading from COOL during the python configuration stage.
Requires Oracle 19.11 and setting `$CORAL_ORA_NO_OCI_THREADED`.
Closes ATR-21890.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47706TauAnalysisTools: drop deprecated energy calibration from tau smearing tool2021-10-30T19:05:51+02:00Bertrand Martin Dit LatourTauAnalysisTools: drop deprecated energy calibration from tau smearing toolHello,
This MR is dropping a number of outdated and deprecated functionalities of the tau smearing tool inherited from R21.
In R22, the MVA tau energy calibration is applied by default in the tau reconstruction, so we should not try to...Hello,
This MR is dropping a number of outdated and deprecated functionalities of the tau smearing tool inherited from R21.
In R22, the MVA tau energy calibration is applied by default in the tau reconstruction, so we should not try to apply MVA TES in TauAnalysisTools (while in R21, MVA TES was not applied by default, so we had to apply it at analysis level).
Similarly for the intermediate "combined TES" calibration, there is no need to run this at analysis level.
There is another functionality to enforce calo-only pt when the calo-only pt differs from MVA pt by a large amount.
Comments have been added to the code to explain the motivation, but it has not been validated in R22, so it should not be applied by default.
Anyway, we should consider a different approach for vetoing muons faking taus in R22, forcing tau pt is very ad-hoc... We should rather move this to a selection tool, or develop a dedicated tool (RNN?) to reject muons.
A small change was made in the combined TES tool: when we can't evaluate the compatibility between calo pt and MVA pt (because the parametrisation is not available), we should not force calo pt.
For completeness, I also updated the final R22 Run2 combined TES calibration file for the MET significance calculation, but this is still not the appropriate thing to do: the MET significance currently uses calo pt resolution.
We need to derive the MVA pt resolution and provide a new calibration file so that it can be used for the MET significance.
Tagging @ghamity , @qbuat , @dta .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47712OutputConditionsAlgConfig.py: Set properties TopLevelContainerName and...2021-10-28T21:44:59+02:00Walter LamplOutputConditionsAlgConfig.py: Set properties TopLevelContainerName and...OutputConditionsAlgConfig.py: Set properties TopLevelContainerName and SubLevelBranchName appropriate for conditions POOL files
Without this settings, the output POOL files look vaguely correct, but when reading back we are getting wron...OutputConditionsAlgConfig.py: Set properties TopLevelContainerName and SubLevelBranchName appropriate for conditions POOL files
Without this settings, the output POOL files look vaguely correct, but when reading back we are getting wrong results. Many thanks to @mnowak for helping me with this issue!https://gitlab.cern.ch/atlas/athena/-/merge_requests/46768Decoupling config option to run radiation damage simulation for planar and 3D...2021-10-28T21:45:29+02:00Tomas DadoDecoupling config option to run radiation damage simulation for planar and 3D sensors for pixelCurrently, setting `doRadiationDamage` flag to True in the digitization jobs tells the code to run the radiation damage simulation for both Planar and 3D pixel sensors. However, 3D sensors are outside of the tracking acceptance but they ...Currently, setting `doRadiationDamage` flag to True in the digitization jobs tells the code to run the radiation damage simulation for both Planar and 3D pixel sensors. However, 3D sensors are outside of the tracking acceptance but they take a significant portion of the computing time.
This MR allows to set the flag separately for Planar and 3D sensors that allows to run the radiation damage simulation for the Planar sensors for all physics analyses (and save time by not running the 3D radiation damage simulation) while having the option to run the 3D sensor radiation damage simulation for relevant pixel internal studies.
Both flags are set to `False` by default to be comaptible with the previous settings.
I also took the opportunity to change the rather vague `doRadiationDamage` flag to more concrete `doPixelPlanarRadiationDamage` (and `doPixel3DRadiationDamage`) flag.
To reproduce the behaviour of the previous JO configuration, once these changes are merged, one would need to change
```
digitizationFlags.doRadiationDamage.set_Value_and_Lock(True);
```
To
```
digitizationFlags.doPixelPlanarRadiationDamage.set_Value_and_Lock(True); digitizationFlags.doPixel3DRadiationDamage.set_Value_and_Lock(True);
```
Tagging @tadej @mbomben @stsuno @mkocian @battagl @mociduki @zmarshal
Keeping as draft to let the experts comment on the changeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47688Sweeping !47656 from master to 21.2.
AsgServices: Use std::nullptr_t for gcc112021-10-28T21:48:28+02:00Atlas NightlybuildSweeping !47656 from master to 21.2.
AsgServices: Use std::nullptr_t for gcc11AsgServices: Use std::nullptr_t for gcc11
See merge request atlas/athena!47656AsgServices: Use std::nullptr_t for gcc11
See merge request atlas/athena!47656https://gitlab.cern.ch/atlas/athena/-/merge_requests/47721AnalysisTop: Add tau energy to the output2021-10-29T14:40:16+02:00Tomas DadoAnalysisTop: Add tau energy to the outputSurprisingly, the energy of the (visible) tau was never stored before. Adding it now.
cc @wgeorgeSurprisingly, the energy of the (visible) tau was never stored before. Adding it now.
cc @wgeorgehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47733Fix old MC15 Digitization ART jobs after !476092021-10-28T21:42:04+02:00John Derek ChapmanFix old MC15 Digitization ART jobs after !47609MC15 HITS lack the information in the `/Simulation/Parameters` metadata to set `digitizationFlags.TRTRangeCut` correctly, so now that the default value of this flag has changed (to match the MC16/MC20/MC21 default) then it has to be set ...MC15 HITS lack the information in the `/Simulation/Parameters` metadata to set `digitizationFlags.TRTRangeCut` correctly, so now that the default value of this flag has changed (to match the MC16/MC20/MC21 default) then it has to be set manually for these legacy configurations.
FYI @abarton could you possibly merge this one for tonight please? - as the CI will not check anything for these ART scripts.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47726Small but urgent bugfix for DQ hancool2021-10-28T21:45:18+02:00Peter OnyisiSmall but urgent bugfix for DQ hancoolFix Py3 incompatibility that caused Tier-0 DQ jobs to failFix Py3 incompatibility that caused Tier-0 DQ jobs to failhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47707Add truth visible neutral tau decay vector2021-10-29T09:47:06+02:00Christian GrefeAdd truth visible neutral tau decay vectorMake output consistent when running on truth-only to the version running on reconstruction xAOD. Already fixed in r22.Make output consistent when running on truth-only to the version running on reconstruction xAOD. Already fixed in r22.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47732patch fake error messaves for Hj_MiNNLO2021-11-03T01:36:54+01:00Jan Kretzschmarpatch fake error messaves for Hj_MiNNLOAs described in AGENE-2016, this patch fixes Hj MiNNLO log file messages being erroneously classified as ERROR
Procedure follows an earlier patch done for Zj and Wj MiNNLOAs described in AGENE-2016, this patch fixes Hj MiNNLO log file messages being erroneously classified as ERROR
Procedure follows an earlier patch done for Zj and Wj MiNNLOhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47637fix for a bug in the efex em isolation variables - ATR-242042021-10-29T15:43:41+02:00Alison Elliotfix for a bug in the efex em isolation variables - ATR-24204This is a change to fix a bug in the eFEX EM isolation variables, causing it to give counts that are too low with L/M/T applied, as observed in ATR-24204.
There is a large-scale validation underway, with further bug fixes expected for ...This is a change to fix a bug in the eFEX EM isolation variables, causing it to give counts that are too low with L/M/T applied, as observed in ATR-24204.
There is a large-scale validation underway, with further bug fixes expected for the eFEX. However, as this is the most major, and a blocker for egamma studies, it is being merged while the rest are being investigated and closely examined.
Additionally, when the TOB et value is > 60 GeV, all isolation criteria are set to passing tight.
Tagging @dzanzi , @amendesj , @tqiu , @hillier
Please note, this changes the counts, but I've had a lot of difficulty not picking up other MRs today. I think there might be an issue here, but I am interested to see what the CI tests say.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47737LArMonitoring: Fix duplicate Gaudi property.2021-10-29T15:42:35+02:00Scott SnyderLArMonitoring: Fix duplicate Gaudi property.Fix duplicate Gaudi property warning.
Actually, the properties are not used at all, so just delete them.Fix duplicate Gaudi property warning.
Actually, the properties are not used at all, so just delete them.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47734CxxUtils: Another ubsan suppression.2021-10-29T15:49:25+02:00Scott SnyderCxxUtils: Another ubsan suppression.We can now properly suppress the ubsan warnings about
_Sp_counted_base.We can now properly suppress the ubsan warnings about
_Sp_counted_base.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47739LArDigitization: Enable thread-safety checking.2021-10-29T15:45:17+02:00Scott SnyderLArDigitization: Enable thread-safety checking.Enable thread-safety checking.Enable thread-safety checking.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47724Remove reference to DPDMaker2021-10-29T15:43:54+02:00Adam Edward BartonRemove reference to DPDMakerI'm pretty sure this tool is never actually used and causes an unnecessary dependency.I'm pretty sure this tool is never actually used and causes an unnecessary dependency.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47741AthenaConfiguration: Fix typo.2021-10-29T15:43:19+02:00Scott SnyderAthenaConfiguration: Fix typo.Fix typo.Fix typo.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47743TBRec: Remove reference to IAtRndmGenSvc.2021-10-29T15:45:03+02:00Scott SnyderTBRec: Remove reference to IAtRndmGenSvc.Migrate from IAtRndmGenSvc to IAthRNGSvc.
The code here is still flagrantly thread-unsafe, but not trying to fix
that now.Migrate from IAtRndmGenSvc to IAthRNGSvc.
The code here is still flagrantly thread-unsafe, but not trying to fix
that now.