athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-08-27T03:06:05+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46023Remove Run-1 L1Calo monitoring2021-08-27T03:06:05+02:00Stewart Martin-HaughRemove Run-1 L1Calo monitoringRemove Run-1 monitoring, as discussed with @watsona and @thompsonRemove Run-1 monitoring, as discussed with @watsona and @thompsonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46022Draft: introduce EL::JobPythonConfig2021-11-24T13:40:08+01:00Nils Erik KrumnackDraft: introduce EL::JobPythonConfigThat allows to load the common CP algorithm configuration from C++,
which was requested at the last AMG meeting. There is still some
issue with detecting and handling errors, but otherwise this seems to
work.
Not sure if people are hap...That allows to load the common CP algorithm configuration from C++,
which was requested at the last AMG meeting. There is still some
issue with detecting and handling errors, but otherwise this seems to
work.
Not sure if people are happy with this way of doing things, but unless somebody speaks up I'll remove the draft status in a day or two.
cc @lheinric @vimartin @tdadohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46021[TrigSteer+TrigEvent] Fix uninitialised variables2021-08-25T03:03:53+02:00Rafal Bielskirafal.bielski@cern.ch[TrigSteer+TrigEvent] Fix uninitialised variablesFix some uninitialised variables.
Most weren't accessed in the uninitialised state, which is bug-prone but not a bug yet.
Some already had a possibility to be accessed uninitialised, which is a bug.Fix some uninitialised variables.
Most weren't accessed in the uninitialised state, which is bug-prone but not a bug yet.
Some already had a possibility to be accessed uninitialised, which is a bug.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46020Track extension tool2022-02-27T21:42:33+01:00Alexander LeopoldTrack extension toolThis tool implements the track extension as done for the HGTD TDR results, but utilising the new infrastructures available in 21.9.
I have iterated with @ncalace to get the selection of surfaces etc set up (thanks!). There is a lot of m...This tool implements the track extension as done for the HGTD TDR results, but utilising the new infrastructures available in 21.9.
I have iterated with @ncalace to get the selection of surfaces etc set up (thanks!). There is a lot of manual selection happening currently as I explained in the [software integration meeting](https://indico.cern.ch/event/1067431/), this can be improved in the future.
Tagging @cohm @dshope @vraskina @sch @wyswys for info as well as @tstreble @asalzbur @npetters @nstyles for possible additional feedback!Alexander LeopoldAlexander Leopoldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46019GeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 version2021-08-25T03:03:40+02:00Ewelina Maria LobodzinskaGeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 versionGeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 versionGeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 versionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46018Modifications to ensure RandomRunNumber does not get written in DAOD_PHYS whe...2021-08-25T03:05:37+02:00James CatmoreModifications to ensure RandomRunNumber does not get written in DAOD_PHYS when...Modifications to ensure RandomRunNumber does not get written in DAOD_PHYS when run in a train with PHYSLITE
It is necessary to be able to run DAOD_PHYS and PHYSLITE together in a train. The latter runs pile-up re-weighting and thus prod...Modifications to ensure RandomRunNumber does not get written in DAOD_PHYS when run in a train with PHYSLITE
It is necessary to be able to run DAOD_PHYS and PHYSLITE together in a train. The latter runs pile-up re-weighting and thus produces a transient RandomRunNumber. Due to the smart slimming option in PHYS being set to AllVariables, this led to the RandomRunNumber being written also in PHYS, which is fatal for running onward production from PHYS where pile-up re-weighting is needed.
The changes are:
- switch PHYS to use the smart slimming for EventInfo (plus some extra variables)
- remove RandomRunNumber from the EventInfo smart slimming, which was there erroneously
- Add RandomRunNumber to PHYSLITE, where it is needed for analysis-level pile-up reweightinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/4601722.0-cppcheck-InDetIncSecVxFinderTool2021-08-24T03:05:14+02:00Shaun Roe22.0-cppcheck-InDetIncSecVxFinderToolsolve cppcheck warningssolve cppcheck warningshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46016Sort muon segments for the low-pT MVA working point2021-08-27T03:05:41+02:00Magnar Kopangen BuggeSort muon segments for the low-pT MVA working pointThis MR implements a sorting of the muon segments for the low-pT MVA working point. This working point uses the chamber index of the first two segments, where "first two" was in rel. 21 simply defined as mu.muonSegment(0) and mu.muonSegm...This MR implements a sorting of the muon segments for the low-pT MVA working point. This working point uses the chamber index of the first two segments, where "first two" was in rel. 21 simply defined as mu.muonSegment(0) and mu.muonSegment(1). This would give generally the innermost segments, which is no longer the case in rel. 22. The order of the muon segments in rel. 22 appears to be "random", and thus some sorting is needed to reproduce the rel. 21 results, or in general for a notion such as "the first two segments" to be meaningful.
What I did for now was to match the ordering scheme to what I empirically deduced from a rel. 21 test sample. This is in the end not a strict innermost-to-outermost ordering, but when applying the rel. 21 training of the BDT, I guess we should stick to the rel. 21 ordering. However, for a rel. 22 retuning of the low-pT MVA working point, one could certainly consider changing this order. This can be very easily done with the current implementation.
I considered a few different ways to implement the sorting technically. I think what I ended up with is both readable and efficient, in addition to having the possibility to easily change the order if desired/needed. But I am open to suggestions if there is room for improvement.
Some slides that demonstrate the need for sorting are found [here](https://indico.cern.ch/event/994081/sessions/380601/attachments/2174186/3894683/LowPtMVAcheck.pdf).
tagging @mvanadia, @gartoni, @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46015Externals Update, master branch (2021.08.23.)2021-08-25T10:05:31+02:00Attila KrasznahorkayExternals Update, master branch (2021.08.23.)Upgraded all projects to [atlasexternals-2.0.113](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.113). The updates wrt. [atlasexternals-2.0.112](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.112) are the following (https...Upgraded all projects to [atlasexternals-2.0.113](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.113). The updates wrt. [atlasexternals-2.0.112](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.112) are the following (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/2.0.112...2.0.113):
- Introduced the `ATLAS_ALWAYS_CHECK_WILDCARDS` cache variable in [AtlasCMake](https://gitlab.cern.ch/atlas/atlasexternals/-/tree/master/Build/AtlasCMake) (ATEAM-769);
- Prevented [AtlasLCG](https://gitlab.cern.ch/atlas/atlasexternals/-/tree/master/Build/AtlasLCG) from unnecessarily adding duplicates to the `CMAKE_PREFIX_PATH` environment variable;
- Fixed the dictionary handling with Ninja with CMake >=3.20 (ATLINFR-4186);
- Upgraded GDB to version 10.2 (thanks to @ssnyder);
- Added the build of CORAL and COOL to projects not using tdaq-common, in case these are not available from the configured LCG release (ATDBOPS-116).
The last update is meant to make non-TDAQ-dependent projects functional with the latest LCG nightlies, as discussed in ATDBOPS-116. It should however not change where COOL/CORAL is picked up from in our main ~master builds.
Finally, I've set `ATLAS_ALWAYS_CHECK_WILDCARDS` to `TRUE` by default in the [WorkDir](Projects/WorkDir) project. Hopefully making the lives of code developers a tiny bit easier. :wink:https://gitlab.cern.ch/atlas/athena/-/merge_requests/4601422.0-cppcheck-PixelRawDataByteStreamCnv2021-08-24T03:04:06+02:00Shaun Roe22.0-cppcheck-PixelRawDataByteStreamCnvfix cppcheck warnings, tidy includesfix cppcheck warnings, tidy includeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46013TrigConfigSvc: remove legacy configuration support and deprecate service2021-09-28T21:44:19+02:00Frank WinklmeierTrigConfigSvc: remove legacy configuration support and deprecate serviceRemove the legacy trigger menu configuration support (`UseNewConfig==False`) and
deprecate all interface methods. No client should be using this service
instance anymore. In a second step we can remove the `ITrigConfigSvc`
inheritance an...Remove the legacy trigger menu configuration support (`UseNewConfig==False`) and
deprecate all interface methods. No client should be using this service
instance anymore. In a second step we can remove the `ITrigConfigSvc`
inheritance and possibly completely delete this service in favor of
instantiating `LVL1/HLTConfigSvc` directly where needed.
Also fix the `TrigDecisionTool` setup in `T0TriggerGetter` to use the official configuration methods.
Relates to ATR-23102, ATR-24199.https://gitlab.cern.ch/atlas/athena/-/merge_requests/4601222.0-cppcheck-InDetGlobalMonitoring2021-08-25T03:02:24+02:00Shaun Roe22.0-cppcheck-InDetGlobalMonitoringFix cppcheck warningsFix cppcheck warningshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46011Replace ttbar MC sample for trigger ART and CI to latest one (ATR-23703)2021-08-26T17:10:37+02:00Yasuyuki OkumuraReplace ttbar MC sample for trigger ART and CI to latest one (ATR-23703)Dear all,
This MR is in order to replace ttbar MC sample for trigger ART and CI tests.
The new RDO files have been prepared with 22.0.41, using the latest conditions tag and pileup configuration. Also, the LAr SuperCell reconstruction ...Dear all,
This MR is in order to replace ttbar MC sample for trigger ART and CI tests.
The new RDO files have been prepared with 22.0.41, using the latest conditions tag and pileup configuration. Also, the LAr SuperCell reconstruction is available so that they can be used in the Run3 L1 Calo simulation tests in the future as discussed in ATR-23703.
This is changing the default ttbar MC sample and is expected to change the trigger counts for MC-based ART and CI tests.
Given that this MR conflicts with any other MR labelled changs-trigger-counts, once the CI tests pass successfully, could you please merge it as soon as possible before the other trigger MRs?
Thanks a lot and best regards,
Yasu and Victoria
tagging: @rbielski and @tbuaneshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/4601022.0-cppcheck-InDetPerformanceMonitoring2021-08-25T03:02:59+02:00Shaun Roe22.0-cppcheck-InDetPerformanceMonitoringfix cppcheck warningsfix cppcheck warningshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46009Rec[Em|Jet|Energy]RoI + L1TopoTOB: Avoid unnecessary narrowing casts between ...2021-08-25T03:05:15+02:00Rafal Bielskirafal.bielski@cern.chRec[Em|Jet|Energy]RoI + L1TopoTOB: Avoid unnecessary narrowing casts between signed and unsigned integersFix interfaces of `Rec[Em|Jet|Energy]RoI` (the `passed*Threshold` methods) and `L1TopoTOB` (constructor) which expected a signed integer argument only to compare / assign it to an unsigned integer. Most clients already passed unsigned in...Fix interfaces of `Rec[Em|Jet|Energy]RoI` (the `passed*Threshold` methods) and `L1TopoTOB` (constructor) which expected a signed integer argument only to compare / assign it to an unsigned integer. Most clients already passed unsigned integers, so we had a conversion unsigned -> signed -> unsigned. Such conversions may change the value (i.e. they are narrowing) and this behaviour depends on the architecture and compiler. Better to avoid it where it's not necessary.
Also make sure the clients pass the right type explicitly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46008TrigConf: remove remaining uses of "UseNewConfig"2021-08-25T03:06:16+02:00Frank WinklmeierTrigConf: remove remaining uses of "UseNewConfig"Remove remaining settings of `UseNewConfig` which has been the default
since quite some time.
Relates to ATR-21865 and ATR-23102.Remove remaining settings of `UseNewConfig` which has been the default
since quite some time.
Relates to ATR-21865 and ATR-23102.https://gitlab.cern.ch/atlas/athena/-/merge_requests/4600722.0-cppcheck-InDetJiveXML2021-08-24T03:04:15+02:00Shaun Roe22.0-cppcheck-InDetJiveXMLFix cppcheck warningsFix cppcheck warningshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46006Build Script Fixes, master branch (2021.08.23.)2021-08-25T09:53:34+02:00Attila KrasznahorkayBuild Script Fixes, master branch (2021.08.23.)When updating the scripts to perform the build through `cmake` and not using `make`/`ninja` directly (!39481), the passing of user-provided flags was not updated correctly in the code. Or at least it does not work now, with modern CMake ...When updating the scripts to perform the build through `cmake` and not using `make`/`ninja` directly (!39481), the passing of user-provided flags was not updated correctly in the code. Or at least it does not work now, with modern CMake versions anymore...
The "trick" was just to add `--` to the CMake build commands, to clearly signal which flag(s) is/are going to the underlying build tool.https://gitlab.cern.ch/atlas/athena/-/merge_requests/4600522.0-cppcheck-InDetRecStatistics2021-08-24T03:04:17+02:00Shaun Roe22.0-cppcheck-InDetRecStatisticsSolve cppcheck warnings in InDetRecStatisticsSolve cppcheck warnings in InDetRecStatisticshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46004TrigEFMissingET: fix duplicate property name2021-08-25T03:04:09+02:00Frank WinklmeierTrigEFMissingET: fix duplicate property nameThe "TrackExtrapolationQuarticTerm" property was defined twice. Rename the wrong one to "Linear".The "TrackExtrapolationQuarticTerm" property was defined twice. Rename the wrong one to "Linear".