athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-06-01T03:02:20+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/43969fixing wrong import statements2021-06-01T03:02:20+02:00Sanya Solodkovfixing wrong import statementsfixing minor bug in import statements, which were not updated after migration to python3fixing minor bug in import statements, which were not updated after migration to python3https://gitlab.cern.ch/atlas/athena/-/merge_requests/43968CombinedMuonTrackBuilder::addIDMSerrors try to write it in a way that is clea...2021-06-03T03:03:43+02:00Christos Anastopouloschristos.anastopoulos@cern.chCombinedMuonTrackBuilder::addIDMSerrors try to write it in a way that is clear we do not alias between unique pointers.CombinedMuonTrackBuilder::addIDMSerrors try to write it in a way that
1. Is obvious we do not modify the input,
2. and we get a new track or nullptr in case of failure.
3. In case of nullptr we do not update anything, in case of non nu...CombinedMuonTrackBuilder::addIDMSerrors try to write it in a way that
1. Is obvious we do not modify the input,
2. and we get a new track or nullptr in case of failure.
3. In case of nullptr we do not update anything, in case of non nullptr we might want to eventually update the combined Track.
@sroe, @jojungge , @emoyse please take a look.
I am somehow convinced that the previous kind of worked but it was expressed in a bit round about way.
It allowed 2 unique_ptr to alias (Which is principle we do not want).
And then was checking if they do alias as a way to determine if the newTrack makes sense otherwise was taking some cleanup action.
Seems simpler
A. to pass the input by ``const`` (stays untouched so why use non-const)
B. return ``nullptr``as failure rather than a newTrack that alias the input in case of "error" (nothing happened).
As this also should be easier to check.
As a side note we should look at the alignment tools and see if can pass get const ref rather than const ptr.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43967MuIdCaloEnergyTools - Fix faulty ownership assumption2021-05-31T03:04:49+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuIdCaloEnergyTools - Fix faulty ownership assumptionHi @emoyse, @elmsheus, @christos, @pberta
first of all apologies for the troubles in breaking the release again.
![image](https://data.whicdn.com/images/204513142/original.jpg)
I investigated my last few merge requests and finally fo...Hi @emoyse, @elmsheus, @christos, @pberta
first of all apologies for the troubles in breaking the release again.
![image](https://data.whicdn.com/images/204513142/original.jpg)
I investigated my last few merge requests and finally found this [spurious line](https://gitlab.cern.ch/atlas/athena/-/blob/master/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/MuidCaloTrackStateOnSurface.cxx#L129). It's troublesome as the tool assumes to take over ownership, but I cleaned up the ownership policy to use smart pointers instead.
Closes ATLASRECTS-6381
Adding @goblrisc, @npetters, @sroe to revive the philosopher of the day:
![image](/uploads/07711aa2d567873b8a6409192f49886a/image.png)https://gitlab.cern.ch/atlas/athena/-/merge_requests/43966Adding LAr CNF monitoring2021-06-04T03:03:57+02:00Pavol StrizenecAdding LAr CNF monitoringThis should add coherent noise monitoring for LAr.
Not yet included in general monitoring configuration.This should add coherent noise monitoring for LAr.
Not yet included in general monitoring configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43965fix for FsrUtils initialization of IsolationCorrectionTool in rel 222021-06-01T03:04:11+02:00R D Schafferfix for FsrUtils initialization of IsolationCorrectionTool in rel 22FsrUtils was modified for r22 and checked in rel 21.2, however, the initialization of IsolationCorrectionTool changed in r22, and so this is an update to allow for that - just need to pass in isMC and isAFII.FsrUtils was modified for r22 and checked in rel 21.2, however, the initialization of IsolationCorrectionTool changed in r22, and so this is an update to allow for that - just need to pass in isMC and isAFII.R D SchafferR D Schafferhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43964Include in DAOD_PHYS btagging of VR track jets for analysis groups to look at...2021-06-12T15:45:08+02:00Arnaud DuperrinInclude in DAOD_PHYS btagging of VR track jets for analysis groups to look at them in context of 2nd round of CP samples productionThis MR includes in DAOD_PHYS VR track jets b-tagging variables for analysis groups to look at them in context of 2nd round of CP samples production
The b-tagging container name is BTagging_AntiKtVR30Rmax4Rmin02Track.
The actual build...This MR includes in DAOD_PHYS VR track jets b-tagging variables for analysis groups to look at them in context of 2nd round of CP samples production
The b-tagging container name is BTagging_AntiKtVR30Rmax4Rmin02Track.
The actual building of these VR jets and their ghost-association to large-R jets is done in the Jet/Met configuration (AntiKtVR30Rmax4Rmin02PV0TrackJets Jet container).
Related FTAG ticket: AFT-544 / Tagging few people: @cschiavi @vdao @mguth @fdibello @dguest @sanmayhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43963More fix in jet config for trigger2021-05-30T03:04:54+02:00Pierre Antoine DelsartMore fix in jet config for triggerThis MR fixes issues introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/43749 and which could not be fix by
https://gitlab.cern.ch/atlas/athena/-/merge_requests/43939
tagging @khoo and @jburrThis MR fixes issues introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/43749 and which could not be fix by
https://gitlab.cern.ch/atlas/athena/-/merge_requests/43939
tagging @khoo and @jburrPierre Antoine DelsartPierre Antoine Delsarthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43962New FTAG release 22 b-taggers/training in DAOD_PHYS for analysis groups to lo...2021-06-01T03:05:27+02:00Arnaud DuperrinNew FTAG release 22 b-taggers/training in DAOD_PHYS for analysis groups to look at them in context of 2nd round of CP samples productionThis MR includes in DAOD_PHYS 4 new FTAG b-taggers/training for analysis groups to look at them in context of 2nd round of CP samples production:
- 2 DIPS (dips,dipsLoose): dips20210517_pb,_pc,_pu and dipsLoose20210517_pb,_pc,_pu
- DL1r ...This MR includes in DAOD_PHYS 4 new FTAG b-taggers/training for analysis groups to look at them in context of 2nd round of CP samples production:
- 2 DIPS (dips,dipsLoose): dips20210517_pb,_pc,_pu and dipsLoose20210517_pb,_pc,_pu
- DL1r with rel22 training: DL1r20210519r22_pb,_pc,_pu
- DL1d with stdDIPS: DL1d20210528r22_pb,_pc,_pu
Tagging few people: @cschiavi @vdao @mguth @fdibello @dguest @sanmayhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43961Fix release setting script2021-05-30T03:03:05+02:00Mark SuttonFix release setting scriptRather than allow the release identification script to set up the atlas asetup.sh script itself, just use the one that is already setup plus error handling for when this does not workRather than allow the release identification script to set up the atlas asetup.sh script itself, just use the one that is already setup plus error handling for when this does not workhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43958Improve TrigEgamma Matching tool and monitoring2021-06-01T03:04:38+02:00Joao Victor Da Fonseca PintoImprove TrigEgamma Matching tool and monitoring- change access keys;
- include ring access into the matching tool;
- clean up some duplicated piece of codes into the monitoring;
- rename match to isPassed method into the monitoring;
- fix wrong names access into the setAccept for LRT...- change access keys;
- include ring access into the matching tool;
- clean up some duplicated piece of codes into the monitoring;
- rename match to isPassed method into the monitoring;
- fix wrong names access into the setAccept for LRT and GSF chains
Ping: @cjmeyer, @eegidiop , @Fernando and @dbakshigJoao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43957Tracking : clang-tidy related fixes. Methods that do not uses 'this'2021-06-01T03:02:47+02:00Christos Anastopouloschristos.anastopoulos@cern.chTracking : clang-tidy related fixes. Methods that do not uses 'this'Tracking : clang-tidy related fixes. The main ones here relate to methods that do not uses `this`.
These can be made static or be moved to the implementation file (.cxx) inside an anonymous namespace .
Callers do not need to create an ...Tracking : clang-tidy related fixes. The main ones here relate to methods that do not uses `this`.
These can be made static or be moved to the implementation file (.cxx) inside an anonymous namespace .
Callers do not need to create an instance of the object to use themhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43956GlobalChi2Fitter.cxx cppcheck [postfixOperator]2021-05-31T03:04:28+02:00Christos Anastopouloschristos.anastopoulos@cern.chGlobalChi2Fitter.cxx cppcheck [postfixOperator]GlobalChi2Fitter.cxx cppcheck [postfixOperator] and clang-tidy readability-convert-member-functions-to-static
Mentiong @sroe and @ssnyder (to avoid overlaps)GlobalChi2Fitter.cxx cppcheck [postfixOperator] and clang-tidy readability-convert-member-functions-to-static
Mentiong @sroe and @ssnyder (to avoid overlaps)https://gitlab.cern.ch/atlas/athena/-/merge_requests/43955SGTools: Remove locking from DataProxy::name().2021-05-31T03:02:57+02:00Scott SnyderSGTools: Remove locking from DataProxy::name().Change TransientAddress::m_name to a CachedValue so that we can eliminate
the need to acquire a lock when accessing it.
Also adjust the layout of DataProxy so that we don't have members
crossing cache line boundaries.Change TransientAddress::m_name to a CachedValue so that we can eliminate
the need to acquire a lock when accessing it.
Also adjust the layout of DataProxy so that we don't have members
crossing cache line boundaries.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43954ATLASRECTS-6374: GSFExtrapolator remove redundant check on nextLayer (cppcheck)2021-05-31T03:04:02+02:00Christos Anastopouloschristos.anastopoulos@cern.chATLASRECTS-6374: GSFExtrapolator remove redundant check on nextLayer (cppcheck)ATLASRECTS-6374: remove redundant check on nextLayer, which happens just above in the while (nextLayer && ). As this seems to make cppcheck complain
Mentioning @sroe and @amorleyATLASRECTS-6374: remove redundant check on nextLayer, which happens just above in the while (nextLayer && ). As this seems to make cppcheck complain
Mentioning @sroe and @amorleyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43953CaloCondPhysAlgs: Fix cppcheck warnings.2021-05-31T03:03:02+02:00Scott SnyderCaloCondPhysAlgs: Fix cppcheck warnings.Avoid postincrement of iterator classes.Avoid postincrement of iterator classes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43952CaloMonitoring: Fix cppcheck warnings.2021-06-01T03:03:09+02:00Scott SnyderCaloMonitoring: Fix cppcheck warnings.Members of derived classes should have names distinct from those
of base classes.Members of derived classes should have names distinct from those
of base classes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43951OverlayConfiguration: Recognize --debug.2021-06-01T17:55:43+02:00Scott SnyderOverlayConfiguration: Recognize --debug.Handle --debug flag for new configuration jobs.Handle --debug flag for new configuration jobs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43950xAODEventInfoCnv: Add --debug to test script.2021-06-01T03:02:59+02:00Scott SnyderxAODEventInfoCnv: Add --debug to test script.Let EventInfoCnv_test.py handle a --debug switch.Let EventInfoCnv_test.py handle a --debug switch.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43949Rename TrigEgammaMonitoringMT sub directories to the TrigEgamma name convention2021-06-01T03:04:27+02:00Edmar Egidio Purcino De SouzaRename TrigEgammaMonitoringMT sub directories to the TrigEgamma name conventionThis MR is for updating the names of the TrigEgammaMonitoringMT subdirectories, for the TrigEgamma naming convention. This implementation is being discussed in ATR-23159 .
ping: @jodafons , @cjmeyer , @fernando and @safarzadThis MR is for updating the names of the TrigEgammaMonitoringMT subdirectories, for the TrigEgamma naming convention. This implementation is being discussed in ATR-23159 .
ping: @jodafons , @cjmeyer , @fernando and @safarzadEdmar Egidio Purcino De SouzaEdmar Egidio Purcino De Souzahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43948AthenaKernel+StoreGate: Add key argument to IProxyDict::sourceID.2021-05-31T03:03:42+02:00Scott SnyderAthenaKernel+StoreGate: Add key argument to IProxyDict::sourceID.Add an argument to IProxyDict::sourceID to specify a non-default key
for the DataHeader. To be used to clean up DoubleEventSelectorAthenaPool.Add an argument to IProxyDict::sourceID to specify a non-default key
for the DataHeader. To be used to clean up DoubleEventSelectorAthenaPool.