athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-10-29T15:44:46+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46879MuonCombinedAlg reevaluate preselection2021-10-29T15:44:46+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonCombinedAlg reevaluate preselectionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47745Cleanup SCT and ITkStrip conditions tools config2021-10-29T21:58:59+02:00Tadej Novaktadej.novak@cern.chCleanup SCT and ITkStrip conditions tools configCleanup SCT and ITkStrip conditions tools CA-base configuration. The main change is to collect all under their respective package, not scattered around the repository. Also did some general cleanup.
/cc @jchapman @emoyse @rlangenb @cseb...Cleanup SCT and ITkStrip conditions tools CA-base configuration. The main change is to collect all under their respective package, not scattered around the repository. Also did some general cleanup.
/cc @jchapman @emoyse @rlangenb @csebasti @tstreble @nstyleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47752Adding radiation damage fluence map for RUN3 (ATLASSIM-5471)2021-10-29T15:49:43+02:00Soshi TsunoAdding radiation damage fluence map for RUN3 (ATLASSIM-5471)Add the fluence map for radiation damage digitizer with IOV=330000. (RUN3 2022 conditions)
In addition, very minor cleanup/bug-fix.
- ComTime Tool is removed
- Fix job option in the IBL noise shapeAdd the fluence map for radiation damage digitizer with IOV=330000. (RUN3 2022 conditions)
In addition, very minor cleanup/bug-fix.
- ComTime Tool is removed
- Fix job option in the IBL noise shapehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47686Trigger Navigation conversion - fix recursive seed2021-10-29T15:48:55+02:00Tomasz BoldTrigger Navigation conversion - fix recursive seedThis MR protects merging of nodes that are in parent child relation. Mering those results in recursive seed.
Tagging @tamartin @wprzygodThis MR protects merging of nodes that are in parent child relation. Mering those results in recursive seed.
Tagging @tamartin @wprzygodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47723Navigator new config use Tracking Geometry from Cond. Step II2021-10-29T15:42:13+02:00Christos Anastopouloschristos.anastopoulos@cern.chNavigator new config use Tracking Geometry from Cond. Step IIThis is the next step following
https://gitlab.cern.ch/atlas/athena/-/merge_requests/47638
Trying to set by default a TrackGeometryKey in Navigation. So the default would be this if nothing
gets configured to go to Tracking Geometry svc...This is the next step following
https://gitlab.cern.ch/atlas/athena/-/merge_requests/47638
Trying to set by default a TrackGeometryKey in Navigation. So the default would be this if nothing
gets configured to go to Tracking Geometry svc.
I want to see if this one more step is still fine with the ISF etc tests so ping @jchapman.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47756BCM_BackgroundAlgs: package cleanup2021-10-29T15:42:20+02:00Frank WinklmeierBCM_BackgroundAlgs: package cleanup- delete obsolete job options referencing outdated trigger configuration
- move private header file to `src/`- delete obsolete job options referencing outdated trigger configuration
- move private header file to `src/`https://gitlab.cern.ch/atlas/athena/-/merge_requests/47725Overlay: cleanup trigger configuration2021-11-03T01:24:10+01:00Frank WinklmeierOverlay: cleanup trigger configurationRemove obsolete trigger configuration in overlay transforms:
- remove code to run trigger during digi (see also the equivalent change done for regular simulation in !47611)
- remove the (clearly copy&pasted) code to configure the L1 trig...Remove obsolete trigger configuration in overlay transforms:
- remove code to run trigger during digi (see also the equivalent change done for regular simulation in !47611)
- remove the (clearly copy&pasted) code to configure the L1 trigger as this feature is not used
cc @jchapman @tadej @tkharlamhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47687New ITkStripClusterOnTrackTool2021-11-01T10:50:58+01:00Thomas StreblerNew ITkStripClusterOnTrackToolThis MR adds a new implementation for the ITkStripClusterOnTrackTool, inspired by the SCT_ClusterOnTrackTool, with additional support of the new Annulus design. Corrections inherited from the SCT are applied by default, for consistency w...This MR adds a new implementation for the ITkStripClusterOnTrackTool, inspired by the SCT_ClusterOnTrackTool, with additional support of the new Annulus design. Corrections inherited from the SCT are applied by default, for consistency with 21.9, and might be reoptimised in the future.
The support of the Annulus design solves the issue observed in ATLIDTRKCP-385 with the Brem recovery track reconstruction, which is consequently enabled by default.
FYI @pagessin @lgagnon @nstyles @lpascualhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47740Sweeping !47721 from 21.2 to master.
AnalysisTop: Add tau energy to the output2021-10-29T15:43:49+02:00Atlas NightlybuildSweeping !47721 from 21.2 to master.
AnalysisTop: Add tau energy to the outputAnalysisTop: Add tau energy to the output
See merge request atlas/athena!47721AnalysisTop: Add tau energy to the output
See merge request atlas/athena!47721https://gitlab.cern.ch/atlas/athena/-/merge_requests/47651Separate logic of fixing the HepMC event from the logic of particle removal2021-10-29T15:44:03+02:00Andrii VerbytskyiSeparate logic of fixing the HepMC event from the logic of particle removalSeparate logic of fixing the HepMC event from the logic of particle removal
Tag @ewelinaSeparate logic of fixing the HepMC event from the logic of particle removal
Tag @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47760TauAnalysisTools: drop deprecated properties for TauSmearingTool2021-11-01T14:17:51+01:00Bertrand Martin Dit LatourTauAnalysisTools: drop deprecated properties for TauSmearingToolHello,
This MR is fixing an oversight from !47706 : two properties have disappeared from CommonSmearingTool and this needs to be propagated upstream to TauSmearingTool.
The `ApplyMVATESQualityCheck` default value is also harmonised and ...Hello,
This MR is fixing an oversight from !47706 : two properties have disappeared from CommonSmearingTool and this needs to be propagated upstream to TauSmearingTool.
The `ApplyMVATESQualityCheck` default value is also harmonised and changed to false.
Adding the urgent flag as !47706 might cause trouble if people try to run TauSmearingTool.
Tagging @ghamity .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47718LVL1ConfigSvc: drop support of legacy menus2021-10-29T15:48:51+02:00Frank WinklmeierLVL1ConfigSvc: drop support of legacy menusFollowing the `HLTConfigSvc` in !47678, drop the support of legacy menus in the
`LVL1ConfigSvc` and remove the inheritance from `ILVL1ConfigSvc`.Cleanup now unused helper and base classes.
Also apply a few more cleanups in `HLTConfigSvc...Following the `HLTConfigSvc` in !47678, drop the support of legacy menus in the
`LVL1ConfigSvc` and remove the inheritance from `ILVL1ConfigSvc`.Cleanup now unused helper and base classes.
Also apply a few more cleanups in `HLTConfigSvc` to having matching printouts.
Relates to ATR-23102.
cc @mark @tamartin @stelzerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47757Enabling jJetMultiplicity in L1Topo simulation2021-10-29T15:49:21+02:00Carlos Moreno MartinezEnabling jJetMultiplicity in L1Topo simulationEnabling jJetMultiplicity algorithm in L1Topo simulation to run as configured in the menu.
Adding @paulama @asonay @orlando @dzanzi
Closing !47452 and migrating the changes here.Enabling jJetMultiplicity algorithm in L1Topo simulation to run as configured in the menu.
Adding @paulama @asonay @orlando @dzanzi
Closing !47452 and migrating the changes here.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47761commit changes to have access of the CaloDetDescrManager2021-10-29T21:43:25+02:00Denis Oliveira Damaziocommit changes to have access of the CaloDetDescrManagerAs requested by @tsulaia, to move to new conditions, but avoiding a lot of unnecessary dependencies (we only need the keys declared in python, no infrastructure).As requested by @tsulaia, to move to new conditions, but avoiding a lot of unnecessary dependencies (we only need the keys declared in python, no infrastructure).https://gitlab.cern.ch/atlas/athena/-/merge_requests/47763RecExCommon : fix wrapping for InDet and Muons2021-10-29T21:44:50+02:00Edward MoyseRecExCommon : fix wrapping for InDet and MuonsSince !47186 the (Combined)Muon and InDet wrapping didn't work. This should fix it.
Tested locally with:
```
runArgs.preExec = ['jobproperties.MuonRec.useNewConfig=True']
runArgs.preExec=['muonCombinedRecFlags.useNewConfig=True']
runArg...Since !47186 the (Combined)Muon and InDet wrapping didn't work. This should fix it.
Tested locally with:
```
runArgs.preExec = ['jobproperties.MuonRec.useNewConfig=True']
runArgs.preExec=['muonCombinedRecFlags.useNewConfig=True']
runArgs.preExec=['jobproperties.InDetJobProperties.useNewConfig=True']
```
cc @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47759MuonConfig: Add support for running from RDOs2021-10-29T21:45:33+02:00Edward MoyseMuonConfig: Add support for running from RDOsCurrently the RDOtoPRD convertors are only scheduled if input is BS. This should fix this (though if I'm honest, I'm not sure if this is the best way to check if the input is an RDO file, so if anyone disagrees with this approach please ...Currently the RDOtoPRD convertors are only scheduled if input is BS. This should fix this (though if I'm honest, I'm not sure if this is the best way to check if the input is an RDO file, so if anyone disagrees with this approach please let me know).
I tested this locally by running on an RDO file, with `python -m MuonConfig.MuonSegmentFindingConfig --run`
I've not made a new unit test, since this still doesn't work with RDOs because of an unrelated (I believe) issue:
```
S:0 E:0 VarHandle(StoreGateSvc+EventInfo[45903698]) WARNING StoreGate/src/VarHandleBase.cxx:848 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key EventInfo
S:0 E:0 RpcRdoToRpcPrepData FATAL Standard std::exception is caught
```
I think this should be addressed in a different MR (the first thing I want to check is if `RpcRdoToRpcPrepData` really needs an EventInfo)
Pinging @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46163Add support for independent skipping of secondary events in DoubleEventSelector2021-10-29T21:42:56+02:00Tadej Novaktadej.novak@cern.chAdd support for independent skipping of secondary events in DoubleEventSelectorIn bulk production tests we realised that independent skipping of secondary events in overlay might be beneficial for production when HS hits are large (e.g. 10k events/file) but RDOs are smaller. At the moment only the whole HITS file c...In bulk production tests we realised that independent skipping of secondary events in overlay might be beneficial for production when HS hits are large (e.g. 10k events/file) but RDOs are smaller. At the moment only the whole HITS file can be processed at once.
A separate `--skipSecondaryEvents` argument is added which works in the following way:
- no flag -> same skipping as HS
- skipSecondaryEvents=0 -> disable skipping of RDOs
- skipSecondaryEvents=N -> independently skip N events in the first RDO file
Counters are independent for each selector (not really used anywhere at the moment). Helper tools skip both events at once (also not used for overlay).
Open questions:
- Should `skipSecondaryEvents` be global argument/flag but just not used in other workflows? For now it's overlay specific.
- Logging is a bit misleading as HITS are actually using the secondary selector but using the primary `skipEvents` argument.
- Seeking still needs to be updated but will probably come in a separate MR.
Fixes ATLASSIM-5376.
/cc @mnowak @gemmeren @jchapman @mduehrsshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47765DerivationFrameworkTau and DerivationFrameworkPhys: update tau content2021-10-29T21:43:13+02:00Bertrand Martin Dit LatourDerivationFrameworkTau and DerivationFrameworkPhys: update tau contentHello,
This MR is updating the tau smart slimming list to reflect the final R22 AOD content.
Removed:
* AntiKt4LCTopoJets no longer in AODs (therefore jetLink is useless)
* ptFinalCalib and etaFinalCalib are identical to pt and phi, bu...Hello,
This MR is updating the tau smart slimming list to reflect the final R22 AOD content.
Removed:
* AntiKt4LCTopoJets no longer in AODs (therefore jetLink is useless)
* ptFinalCalib and etaFinalCalib are identical to pt and phi, but used by TauAnalysisTools, so to be on the safe side we keep them for now, but drop phiFinalCalib and mFinalCalib
* ptCombined.etaCombined.phiCombined.mCombined is not needed for analysis
* seedJetWidth.seedJetJvt.seedTrackWidthPt1000.seedTrackWidthPt500 (LCTopo seed jet properties) are not decorated onto the tau in R22, we'll have to revise the strategy for fake tau estimate
Added:
* tau neutral PFOs (neutralPFOLinks.pi0PFOLinks, TauNeutralParticleFlowObjectsAux.pt.eta.phi.m): needed by analyses exploiting tau polarisation
* NNDecayMode is the NN version of PanTau_DecayMode
* ptTauEnergyScale.etaTauEnergyScale possibly used to compute compatibility between calo pt and MVA pt in TauCombinedTES::getUseCaloPtFlag
Minor update to DAOD_PHYS: variables now in the smart slimming list were removed from ExtraVariables. Charged PFOs are no longer in AODs, one has to use TauTracks which are identical physics objects.
Update to PHYSLITE: updated list of variables for AnalysisTauJets, and introduction of TauTracks.
In case TauTracks would be found to be too large, one could put back a loose "SelectionString").
A bug was found in the TauTrackParticleThinning code (when no SelectionString is passed, no TauTrack passes the thinning). This will be fixed in a follow-up MR.
Adding the 'urgent' flag as this MR is needed for the imminent production of DAOD_PHYS for the R22 Run2 reprocessing.
Tagging @jcatmore , @calpigia , @lheinric , @vimartin , @egramsta , @qbuat , @dta , @soerdek , @schaarsc , @lfiorini , @cgrefe , @ghamity for information.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47766DerivationFrameworkInDet: fix TauTrackParticleThinning when selection string ...2021-10-29T21:44:03+02:00Bertrand Martin Dit LatourDerivationFrameworkInDet: fix TauTrackParticleThinning when selection string is emptyHello,
This MR fixes a problem with the thinning of tau tracks when no selectrion string is passed.
In that case, the ID tracks are thinned properly, but the block that thins the tau tracks was not getting any taus to work with (empty `...Hello,
This MR fixes a problem with the thinning of tau tracks when no selectrion string is passed.
In that case, the ID tracks are thinned properly, but the block that thins the tau tracks was not getting any taus to work with (empty `tauToCheck` vector).
Adding the 'urgent' flag as this MR is needed for the imminent DAOD_PHYS production for the R22 Run2 reprocessing.
Related to !47765 and !47722 .
Tagging @jcatmore , @calpigia , @qbuat , @dta for information.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47658Update atlasexternals to 2.0.117 and Analysis release to LCG_101_ATLAS_22021-10-30T18:35:14+02:00Johannes ElmsheuserUpdate atlasexternals to 2.0.117 and Analysis release to LCG_101_ATLAS_2This MR will update:
* AthAnalysis to LCG_101_ATLAS_2
* AnalysisBase to LCG_101_ATLAS_2 equivalent externals
* Update atlasexternals to 2.0.117 - there has been no MR for 2.0.116, so this includes the updates from tag https://gitlab.cern...This MR will update:
* AthAnalysis to LCG_101_ATLAS_2
* AnalysisBase to LCG_101_ATLAS_2 equivalent externals
* Update atlasexternals to 2.0.117 - there has been no MR for 2.0.116, so this includes the updates from tag https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.116 as well
Here is the corresponding atlasexternals MR for 2.0.117: https://gitlab.cern.ch/atlas/atlasexternals/-/merge_requests/881 - keeping the MR here in draft status until this MR is merged and tagged.
Tagging @emoyse, @akraszna, @krumnack, @lheinric, @vimartin for info.