athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-05-06T18:51:43+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/23211Do not raise an exception if running PowhegControl ttbb with only one paralle...2019-05-06T18:51:43+02:00Stefan RichterDo not raise an exception if running PowhegControl ttbb with only one parallel processEvent generation needs the integration grids, which doesn't seem to work with Powheg in multicore mode. Therefore raising an exception is only useful in the integration case. It has now been replaced with an info message to the user.
Po...Event generation needs the integration grids, which doesn't seem to work with Powheg in multicore mode. Therefore raising an exception is only useful in the integration case. It has now been replaced with an info message to the user.
Pointed out by @tpelzer in [AGENE-1670](https://its.cern.ch/jira/browse/AGENE-1670), thanks!Ewelina Maria LobodzinskaEwelina Maria Lobodzinskahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23176Remove ByteStreamAddressL1R and clean up BS configuration from RoIBResult2019-05-08T13:23:07+02:00Rafal Bielskirafal.bielski@cern.chRemove ByteStreamAddressL1R and clean up BS configuration from RoIBResultThis is a continuation of !22200. I now finally remove the ByteStreamAddressL1R class which is obsolete after the previous MR was merged. In addition, it is no longer required (and even no longer correct) to ask `ByteStreamAddressProvide...This is a continuation of !22200. I now finally remove the ByteStreamAddressL1R class which is obsolete after the previous MR was merged. In addition, it is no longer required (and even no longer correct) to ask `ByteStreamAddressProviderSvc` to create an address for RoIBResult at every event. The current workflow should be:
* `RoIBResultByteStreamDecoderAlg` is scheduled (already true in standard trigger and reco jobs)
* in every event, the alg takes the configured L1 result ROBs from ROBDataProviderSvc, creates RoIBResult object from them and records it in StoreGate via a WriteHandle
* no Gaudi `Converter` is involved in this, so no need for a proxy with BS address of the persistent object
This MR fixes the following warning seen e.g. in [q431](https://atlas-art-data.web.cern.ch/atlas-art-data/grid-output/master/Athena/x86_64-centos7-gcc8-opt/2019-05-04T2136/Tier0ChainTests/test_q431/tarball_logs/log.RAWtoESD):
```
07:08:41 StoreGateSvc_Impl WARNING record_impl: you are recording an object with key RoIBResult, type ROIB::RoIBResult (CLID 6000)
07:08:41 There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.
```
In this MR, I remove the RoIBResult from the list of BS addresses to create by `ByteStreamAddressProviderSvc` in all job options fragments I could find in the repository. I'm fairly sure in most of them this was just a copy-paste from RecExCommon or TriggerJobOpts. What I do **not** do in this MR is to make sure the `RoIBResultByteStreamDecoderAlg` is scheduled in all jobs you can imagine. It is done if you use the standard trigger configuration JO fragments, which you should probably anyway do if you are reading the L1 result. If there is any job I should test except the standard trigger tests and q-tests, please let me know.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23177Fix const_cast for Run-I EMConvert2019-05-08T03:02:05+02:00Christos Anastopouloschristos.anastopoulos@cern.chFix const_cast for Run-I EMConvertMoving from 17.2 :
https://acode-browser2.usatlas.bnl.gov/lxr/source/r17/atlas/Reconstruction/egamma/egammaEvent/src/EMConvert.cxx?v=release_17_2_10#0967
to the, at time new Run-2 tracking conventions, a const_cast was introduced ....Moving from 17.2 :
https://acode-browser2.usatlas.bnl.gov/lxr/source/r17/atlas/Reconstruction/egamma/egammaEvent/src/EMConvert.cxx?v=release_17_2_10#0967
to the, at time new Run-2 tracking conventions, a const_cast was introduced ...
Anyhow, not sure how much the old EDM is really used these days
but since it appears as a mutable to be fixed in the Reco Integration summary , here is a way to avoid it.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2310921.3 hlt integration of new L1Calo output2019-05-15T14:45:22+02:00Joerg Stelzer21.3 hlt integration of new L1Calo outputhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23065Migrate MuidCaloEnergyMeas and MuonCaloEnergyTool to CaloNoise CDO2019-05-08T03:02:06+02:00Walter LamplMigrate MuidCaloEnergyMeas and MuonCaloEnergyTool to CaloNoise CDOMigrate more clients from legacy CaloNoiseTool to CaloNoise conditions data object. Along the way I started to tidy up MuidCaloEnergyMeas but quickly realised that this is hopeless. This tool needs a rewrite!
Note: This MR includes als...Migrate more clients from legacy CaloNoiseTool to CaloNoise conditions data object. Along the way I started to tidy up MuidCaloEnergyMeas but quickly realised that this is hopeless. This tool needs a rewrite!
Note: This MR includes also !23044https://gitlab.cern.ch/atlas/athena/-/merge_requests/23180Fix MM digitization tool for pileup services2019-05-14T22:37:18+02:00Chav Chhiv ChauFix MM digitization tool for pileup servicesFix wrong MM tool name (MmRange->MMRange in PileUpMergeSvcConfig.py) that is needed for merging HITS with background HITS.Fix wrong MM tool name (MmRange->MMRange in PileUpMergeSvcConfig.py) that is needed for merging HITS with background HITS.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23182Sweeping !23144 from 21.0 to 21.3.
Fixing RHadron Hadronic Interactions and S...2019-05-15T14:46:03+02:00Atlas NightlybuildSweeping !23144 from 21.0 to 21.3.
Fixing RHadron Hadronic Interactions and Stop/SbottomsFixing RHadron Hadronic Interactions and Stop/Sbottoms
See merge request atlas/athena!23144Fixing RHadron Hadronic Interactions and Stop/Sbottoms
See merge request atlas/athena!23144https://gitlab.cern.ch/atlas/athena/-/merge_requests/23197Fix a bug. Store event number to cache. (SCT_ByteStreamErrorsTool)2019-05-08T03:02:34+02:00Susumu OdaFix a bug. Store event number to cache. (SCT_ByteStreamErrorsTool)Fix a bug. Store event number to cache. (SCT_ByteStreamErrorsTool)
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/15c435cefb0adaed020e720d76e2742e/RunTier0Tests.log)Fix a bug. Store event number to cache. (SCT_ByteStreamErrorsTool)
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/15c435cefb0adaed020e720d76e2742e/RunTier0Tests.log)https://gitlab.cern.ch/atlas/athena/-/merge_requests/23200Jet config : Schedule TruthAssociation moment calculation only if truth jets ...2019-05-08T03:02:53+02:00Pierre Antoine DelsartJet config : Schedule TruthAssociation moment calculation only if truth jets are scheduledWe fix a warning reported in
https://its.cern.ch/jira/browse/ATLASRECTS-4934
The warning is caused by the attempt to calculate quantities using truth jets.
However in this jobs truth jets are not build.
We change the config so that if ...We fix a warning reported in
https://its.cern.ch/jira/browse/ATLASRECTS-4934
The warning is caused by the attempt to calculate quantities using truth jets.
However in this jobs truth jets are not build.
We change the config so that if the truth jets are not build, the calculation is not scheduled.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23201remove spurious DEBUG output in Btagging configuration2019-05-08T03:02:30+02:00Walter Lamplremove spurious DEBUG output in Btagging configurationThe tool "btagging_antikt4emtopo.TrackAssociation" floods the log-files with suprious debug messages like:
btagging_antikt4emtopo.TrackAssociation DEBUG retrieve track particle container with key InDetTrackParticles
btaggin...The tool "btagging_antikt4emtopo.TrackAssociation" floods the log-files with suprious debug messages like:
btagging_antikt4emtopo.TrackAssociation DEBUG retrieve track particle container with key InDetTrackParticles
btagging_antikt4emtopo.TrackAssociation DEBUG retrieve muon container with key Muons
btagging_antikt4emtopo.TrackAssociation DEBUG #BTAG# Number of Muons in event: 0
This MR fixes the hardcoded output level on this tool.
Aside: The btagging configuration is scattered with code to set the output level of individual components. Explicitly setting the output level of individual components in the configuration is not recommended because it makes it impossible to change the output level globally.
- Walterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23199Avoid timeout of SCT_ConditionsAlgorithms_TestTdaqEnabled_ctest2019-05-08T03:02:35+02:00Susumu OdaAvoid timeout of SCT_ConditionsAlgorithms_TestTdaqEnabled_ctestTo avoid timeout, the number of evens is reduced from 20 to 6 and timeout was increased from 600 to 720.
http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/MASTERWebArea/nicos_web_areamaster_Athena_x86_64cento...To avoid timeout, the number of evens is reduced from 20 to 6 and timeout was increased from 600 to 720.
http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/MASTERWebArea/nicos_web_areamaster_Athena_x86_64centos7gcc8opt64BC7G8AthenaOpt/NICOS_TestLog_2019-05-04T2136/InnerDetector_InDetConditions_SCT_ConditionsAlgorithms___SCT_ConditionsAlgorithmsConf__SCT_ConditionsAlgorithmsTest__m.htmlhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23221CaloTools: Fix compilation with gcc9.2019-05-08T03:02:55+02:00Scott SnyderCaloTools: Fix compilation with gcc9.isnan is in the std:: namespace.isnan is in the std:: namespace.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23081Add bottom quarks in TRUTH32019-05-08T03:03:13+02:00Alexander MannAdd bottom quarks in TRUTH3Add bottom quarks ("TruthBottom" container) to TRUTH3 format as discussed in ATLASG-1481.Add bottom quarks ("TruthBottom" container) to TRUTH3 format as discussed in ATLASG-1481.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23217change pow(x,0.25) to sqrt(sqrt(x))2019-05-09T12:22:40+02:00Christos Anastopouloschristos.anastopoulos@cern.chchange pow(x,0.25) to sqrt(sqrt(x))It seems that we were calling quite often
``pow(x,0.25)``
``sqrt(sqrt(x))``
could potentially be better in this case.
Mentioning @amete as would be serious to see the effect in the SPOT timingIt seems that we were calling quite often
``pow(x,0.25)``
``sqrt(sqrt(x))``
could potentially be better in this case.
Mentioning @amete as would be serious to see the effect in the SPOT timinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23216IDC: Satisfy some thread warnings2019-05-08T03:02:02+02:00Adam Edward BartonIDC: Satisfy some thread warningsSuppressing some potential warnings on thought out mutables.Suppressing some potential warnings on thought out mutables.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23226Sweeping !23157 from 21.0 to master.
Merge branch 'data-overlay' into '21.3'2019-05-08T03:02:50+02:00Atlas NightlybuildSweeping !23157 from 21.0 to master.
Merge branch 'data-overlay' into '21.3'Merge branch 'data-overlay' into '21.3'
See merge request atlas/athena!23157Merge branch 'data-overlay' into '21.3'
See merge request atlas/athena!23157https://gitlab.cern.ch/atlas/athena/-/merge_requests/22545fill histograms with weights2019-05-08T03:02:56+02:00Charles Burtonfill histograms with weightsThis is an MR to add the feature requested in ATLASDQ-701.
@ponyisi @tbold @pisarnaThis is an MR to add the feature requested in ATLASDQ-701.
@ponyisi @tbold @pisarnahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23186Code cleanup of SiSpacePointsSeedTool_xk package (ATLASRECTS-3037)2019-05-17T01:03:55+02:00Susumu OdaCode cleanup of SiSpacePointsSeedTool_xk package (ATLASRECTS-3037)Code cleanup of SiSpacePointsSeedTool_xk package
* Use ATH_MSG macros.
* Use static_cast.
* Use range based for loop.
* Add space after if, for and while.
* Change if-else style.
* Change indentation.
* Remove space after `;`
*...Code cleanup of SiSpacePointsSeedTool_xk package
* Use ATH_MSG macros.
* Use static_cast.
* Use range based for loop.
* Add space after if, for and while.
* Change if-else style.
* Change indentation.
* Remove space after `;`
* Add `virtual` to inherit methods.
* Fix array size 593 -> 583.
* Move long inline methods to the cxx files.
* Change `protected` to `private`.
* Replace std::endl by endmsg.
* Use constexpr.
* Use forward declaration.
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/0ffbecaf974b5dc3fc1bb54607aac7b6/RunTier0Tests.log)https://gitlab.cern.ch/atlas/athena/-/merge_requests/23218Restore use of CaloLumiBCIDTool.2019-05-08T03:02:33+02:00Scott SnyderRestore use of CaloLumiBCIDTool.Restore the use of the obsolete tool CaloLumiBCIDTool in trigger code,
as per Denis.
We really want to remove it soon, so this code should still be migrated
to use the conditions algorithm as soon as possible.Restore the use of the obsolete tool CaloLumiBCIDTool in trigger code,
as per Denis.
We really want to remove it soon, so this code should still be migrated
to use the conditions algorithm as soon as possible.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23222LArElecCalib+LArRecUtils: Remove ILArHVCorrTool.2019-05-08T03:02:11+02:00Scott SnyderLArElecCalib+LArRecUtils: Remove ILArHVCorrTool.Remove obsolete interface ILArHVCorrTool.Remove obsolete interface ILArHVCorrTool.