athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-01-31T13:45:14+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/67185Adding Large-R jets to Physics Validation (AFT-688)2024-01-31T13:45:14+01:00Jacob Edwin CrosbyAdding Large-R jets to Physics Validation (AFT-688)I've removed the VR jet container and have replaced it with the Large-R jet container.
I've also updated the PhysVal scripts to output proper merged files and GN2Xv01 ROCs.I've removed the VR jet container and have replaced it with the Large-R jet container.
I've also updated the PhysVal scripts to output proper merged files and GN2Xv01 ROCs.Jacob Edwin CrosbyJacob Edwin Crosbyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67163AFT-692 Remove GN1 from PHYS(LITE)2023-12-14T19:45:29+01:00Binbin DongAFT-692 Remove GN1 from PHYS(LITE)Since there is no use of GN1 in analysis, removing GN1 b-tagger from PHYS(LITE) to avoid confusion.
cc @dguest, @fdibello, and @ligangSince there is no use of GN1 in analysis, removing GN1 b-tagger from PHYS(LITE) to avoid confusion.
cc @dguest, @fdibello, and @liganghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67161Protect EGElectronAmbiguityTool.cxx from null VertexContainer pointer.2023-11-16T15:31:51+01:00Jonathan LongProtect EGElectronAmbiguityTool.cxx from null VertexContainer pointer.Check if pointer is null before using it.Check if pointer is null before using it.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67153Set default ConfigFile in central ElectronPhotonVariableCorrectionToolCfg2023-11-21T15:43:15+01:00Thomas StreblerSet default ConfigFile in central ElectronPhotonVariableCorrectionToolCfgFollow up to !67061
Fixes LLP1 failure https://bigpanda.cern.ch//media/filebrowser/413b46ec-1a7c-49b2-a1a8-5e922b904ed6/group.art/tarball_PandaJob_6021817939_IN2P3-LAPP/log.Derivation
```
05:02:49 Traceback (most recent call last):
05:...Follow up to !67061
Fixes LLP1 failure https://bigpanda.cern.ch//media/filebrowser/413b46ec-1a7c-49b2-a1a8-5e922b904ed6/group.art/tarball_PandaJob_6021817939_IN2P3-LAPP/log.Derivation
```
05:02:49 Traceback (most recent call last):
05:02:49 File "/srv/workDir/runargs.Derivation.py", line 39, in <module>
05:02:49 fromRunArgs(runArgs)
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkConfiguration/DerivationSkeleton.py", line 120, in fromRunArgs
05:02:49 cfg.merge(derivationConfig(flags))
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkLLP/LLP1.py", line 425, in LLP1Cfg
05:02:49 acc.merge(LLP1KernelCfg(flags, name="LLP1Kernel", StreamName = 'StreamDAOD_LLP1', TriggerListsHelper = LLP1TriggerListsHelper))
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkLLP/LLP1.py", line 115, in LLP1KernelCfg
05:02:49 acc.merge(PhotonIsEMSelectorsCfg(flags))
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 923, in merge
05:02:49 self.addPublicTool(pt) #Profit from deduplicaton here
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 634, in addPublicTool
05:02:49 deduplicate(newTool,self._publicTools)
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/Deduplication.py", line 31, in deduplicate
05:02:49 raiseWithCurrentContext(exception)
05:02:49 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/DebuggingContext.py", line 48, in raiseWithCurrentContext
05:02:49 raise type(exception)(str(exception) + '\nWith the context:\n{}'.format(Context.complete()) )
05:02:49 ValueError: conflicting settings for property ConfigFile of EGVariableCorrectionTool: cannot merge values 'EGammaVariableCorrection/TUNE23/ElPhVariableNominalCorrection.conf' and 'EGammaVariableCorrection/TUNE26/ElPhVariableNominalCorrection.conf'
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/67152Remove extra dot after VertexedClusters2023-11-16T13:29:36+01:00Thomas StreblerRemove extra dot after VertexedClustersTrying to stop the contagion to avoid running into ATLASRECTS-7807 againTrying to stop the contagion to avoid running into ATLASRECTS-7807 againhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67151Clean up extra dot in CommonJETMXContent2023-11-16T10:06:39+01:00Thomas StreblerClean up extra dot in CommonJETMXContentFix JETM2 failure in ART tests, as a follow up to https://gitlab.cern.ch/atlas/athena/-/merge_requests/66904
https://bigpanda.cern.ch//media/filebrowser/baa51c9e-16c2-4e71-b015-f97c4989aa45/group.art/tarball_PandaJob_6021818450_IL-TAU/l...Fix JETM2 failure in ART tests, as a follow up to https://gitlab.cern.ch/atlas/athena/-/merge_requests/66904
https://bigpanda.cern.ch//media/filebrowser/baa51c9e-16c2-4e71-b015-f97c4989aa45/group.art/tarball_PandaJob_6021818450_IL-TAU/log.Derivation
```
05:59:17 Traceback (most recent call last):
05:59:17 File "/srv/workDir/runargs.Derivation.py", line 39, in <module>
05:59:17 fromRunArgs(runArgs)
05:59:17 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkConfiguration/DerivationSkeleton.py", line 120, in fromRunArgs
05:59:17 cfg.merge(derivationConfig(flags))
05:59:17 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkJetEtMiss/JETM2.py", line 222, in JETM2Cfg
05:59:17 acc.merge(SetupMetaDataForStreamCfg(ConfigFlags, "DAOD_JETM2", AcceptAlgs=["JETM2Kernel"], createMetadata=[MetadataCategory.CutFlowMetaData]))
05:59:17 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 893, in merge
05:59:17 mergeSequences(ourSeq, otherSeq)
05:59:17 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 862, in mergeSequences
05:59:17 deduplicateOne(self._algorithms[c.name], c)
05:59:17 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/Deduplication.py", line 56, in deduplicateOne
05:59:17 raiseWithCurrentContext(exception)
05:59:17 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/DebuggingContext.py", line 48, in raiseWithCurrentContext
05:59:17 raise type(exception)(str(exception) + '\nWith the context:\n{}'.format(Context.complete()) )
05:59:17 ValueError: conflicting settings for property ItemList of OutputStreamDAOD_JETM2: ItemList AuxAttribute selection syntax error - extra dot in 'truthMatchProbability..numberOfPixelOutliers.expectInnermostPixelLayerHit.vx.ftagTruthBarcode.truthType.numberOfNextToInnermostPixelLayerHits.numberOfInnermostPixelLayerHits.btagIp_invalidIp.numberOfSCTOutliers.numberOfPixelSharedHits.ftagTruthVertexIndex.numberOfPrecisionHoleLayers.btagIp_trackDisplacement.vertexLink.numberOfSCTDoubleHoles.ftagTruthOriginLabel.numberDoF.numberOfPrecisionLayers.particleHypothesis.phi.numberOfNextToInnermostPixelLayerSharedHits.trackFitter.numberOfInnermostPixelLayerOutliers.numberOfSCTHoles.btagIp_z0SinThetaUncertainty.numberOfSCTDeadSensors.d0.numberOfInnermostPixelLayerSplitHits.numberOfNextToInnermostPixelLayerSplitHits.definingParametersCovMatrixDiag.ftagTruthTypeLabel.vy.chiSquared.truthParticleLink.numberOfPhiLayers.numberOfTRTOutliers.ftagTruthParentBarcode.numberOfInnermostPixelLayerSharedHits.numberOfSCTHits.AssoClustersUFO.btagIp_z0SinTheta.theta.vz.btagIp_d0Uncertainty.numberOfTRTHits.numberOfNextToInnermostPixelLayerOutliers.numberOfPixelSplitHits.numberOfSCTSpoiltHits.numberOfPhiHoleLayers.trackLink.btagIp_trackMomentum.numberOfPixelHits.numberOfPixelHoles.z0.truthOrigin.qOverP.definingParametersCovMatrixOffDiag.numberOfSCTSharedHits.numberOfPixelSpoiltHits.leptonID.trackProperties.numberOfPixelDeadSensors'
05:59:17 With the context:
```
FYI @cdelitzshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67150Align HLT_IDVertex_FSAux variables fro TrackingTrigger and JetTrigger Slimmin...2023-11-16T14:04:56+01:00Thomas StreblerAlign HLT_IDVertex_FSAux variables fro TrackingTrigger and JetTrigger SlimmingHelperFix Run3 PHYSVAL failure in ART test
https://bigpanda.cern.ch/art/jobs/?package=DerivationFrameworkPhysicsValidationART&branch=main/Athena/x86_64-centos7-gcc11-opt&ntag_full=2023-11-14T2101
```
23:23:29 Traceback (most recent call last...Fix Run3 PHYSVAL failure in ART test
https://bigpanda.cern.ch/art/jobs/?package=DerivationFrameworkPhysicsValidationART&branch=main/Athena/x86_64-centos7-gcc11-opt&ntag_full=2023-11-14T2101
```
23:23:29 Traceback (most recent call last):
23:23:29 File "/srv/workDir/runargs.Derivation.py", line 39, in <module>
23:23:29 fromRunArgs(runArgs)
23:23:29 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkConfiguration/DerivationSkeleton.py", line 120, in fromRunArgs
23:23:29 cfg.merge(derivationConfig(flags))
23:23:29 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/DerivationFrameworkPhysicsValidation/PHYSVAL.py", line 298, in PHYSVALCfg
23:23:29 acc.merge(SetupMetaDataForStreamCfg(ConfigFlags, "DAOD_PHYSVAL", AcceptAlgs=["PHYSVALKernel"], createMetadata=[MetadataCategory.CutFlowMetaData]))
23:23:29 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 893, in merge
23:23:29 mergeSequences(ourSeq, otherSeq)
23:23:29 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 862, in mergeSequences
23:23:29 deduplicateOne(self._algorithms[c.name], c)
23:23:29 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/Deduplication.py", line 56, in deduplicateOne
23:23:29 raiseWithCurrentContext(exception)
23:23:29 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-centos7-gcc11-opt/2023-11-14T2101/Athena/24.0.16/InstallArea/x86_64-centos7-gcc11-opt/python/AthenaConfiguration/DebuggingContext.py", line 48, in raiseWithCurrentContext
23:23:29 raise type(exception)(str(exception) + '\nWith the context:\n{}'.format(Context.complete()) )
23:23:29 ValueError: conflicting settings for property ItemList of OutputStreamDAOD_PHYSVAL: Mixing up negative and positive Aux selections is not supported: xAOD::AuxContainerBase!#HLT_IDVertex_FSAux. : {'vertexType.y.z.-.x'}
```
Aligning with https://gitlab.cern.ch/atlas/athena/-/blob/main/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/TrackingTriggerContent.py?ref_type=heads#L5
FYI @khoo @mmontellhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67110DerivationBPHY: Add warnings for excess candidates2023-11-20T16:07:17+01:00Adam Edward BartonDerivationBPHY: Add warnings for excess candidatesSometimes combinatoric explosions crash the shared writer. Adding warnings for easier debugging.
cc @wwalko @kfungSometimes combinatoric explosions crash the shared writer. Adding warnings for easier debugging.
cc @wwalko @kfunghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67090Protection when running over data2023-11-14T15:36:28+01:00Chris Malena DelitzschProtection when running over dataJETM2 should not be run over data due to its size (MC only derivation) but adding a protection for the configuration of truth jets in any case for good practice :smile:
Reported in ATLJETMET-1676JETM2 should not be run over data due to its size (MC only derivation) but adding a protection for the configuration of truth jets in any case for good practice :smile:
Reported in ATLJETMET-1676https://gitlab.cern.ch/atlas/athena/-/merge_requests/67089Add read dependencies to TruthCollectionMaker2023-11-15T15:23:26+01:00Stylianos AngelidakisAdd read dependencies to TruthCollectionMakerConverting some hard-coded decorations into ReadDecorHandleKeys to handle the dependence of TruthCollectionMaker on TruthClassificationDecorator.Converting some hard-coded decorations into ReadDecorHandleKeys to handle the dependence of TruthCollectionMaker on TruthClassificationDecorator.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67085Add check for data events with no PV in PhotonSelectionWrapper2023-11-14T14:06:34+01:00Thomas StreblerAdd check for data events with no PV in PhotonSelectionWrapperFix HIGG1D1 derivation to cover data events where no PV is reconstructed. In that case the sumPt2 `DecorHandle` is considered as not available (even if it is for previous events) and the current implementation leads to
```
PhotonVertexS...Fix HIGG1D1 derivation to cover data events where no PV is reconstructed. In that case the sumPt2 `DecorHandle` is considered as not available (even if it is for previous events) and the current implementation leads to
```
PhotonVertexSel... ERROR SG::ExcStoreLocked: Attempted to modify auxiliary data in a locked store: `::sumPt2' (1237)
```
Should be the last occurence of ATEAM-939https://gitlab.cern.ch/atlas/athena/-/merge_requests/67082Drop conflicting VertexAuxContainer output in BPH4 derivations2023-11-14T13:53:43+01:00Thomas StreblerDrop conflicting VertexAuxContainer output in BPH4 derivationsFollow up to !66916
Fix BPH4 ART test failure https://bigpanda.cern.ch/art/jobs/?package=DerivationFrameworkBPhysART&branch=main/Athena/x86_64-centos7-gcc11-opt&ntag_full=2023-11-12T2101Follow up to !66916
Fix BPH4 ART test failure https://bigpanda.cern.ch/art/jobs/?package=DerivationFrameworkBPhysART&branch=main/Athena/x86_64-centos7-gcc11-opt&ntag_full=2023-11-12T2101https://gitlab.cern.ch/atlas/athena/-/merge_requests/67062EXOT21 update: add triggers for mixed channels and track vertex info2023-11-15T18:38:21+01:00Cristiano SebastianiEXOT21 update: add triggers for mixed channels and track vertex infoAs per title, we include in EXOT21 the e-mu trigger chains for the mixed channel of the prompt LJ search (EXOT-2018-55) and track vertex info.
This modification increases the EXOT21 size of about 0.5% (tested on the data18 ART test file...As per title, we include in EXOT21 the e-mu trigger chains for the mixed channel of the prompt LJ search (EXOT-2018-55) and track vertex info.
This modification increases the EXOT21 size of about 0.5% (tested on the data18 ART test file)
old EXOT21 reduction: 0.0250798349
new EXOT21 reduction: 0.02520287359
tag: @ilongari @emmathttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67061implement fudge factors for electrons in derivations in main2023-11-15T23:40:33+01:00Giovanni Marchioriimplement fudge factors for electrons in derivations in mainUse TUNE26 e/gamma corrections for R22 to benefit from electron FFs.
Propagate these also to DNN selectors (not only LH).
SeeĀ [https://its.cern.ch/jira/browse/ATLASG-2627](https://its.cern.ch/jira/browse/ATLASG-2627 "Follow link")Use TUNE26 e/gamma corrections for R22 to benefit from electron FFs.
Propagate these also to DNN selectors (not only LH).
SeeĀ [https://its.cern.ch/jira/browse/ATLASG-2627](https://its.cern.ch/jira/browse/ATLASG-2627 "Follow link")https://gitlab.cern.ch/atlas/athena/-/merge_requests/67036Check solenoid current only in data2023-11-13T11:58:43+01:00Chris Malena DelitzschCheck solenoid current only in dataThe conditions DB should be only used to extract the solenoid current in data, not MC (currently causing a crash).The conditions DB should be only used to extract the solenoid current in data, not MC (currently causing a crash).https://gitlab.cern.ch/atlas/athena/-/merge_requests/66987xAODBTaggingEfficiency+FTagAnalysisInterfaces: Fix cppcheck warnings.2023-11-10T11:10:17+01:00Scott SnyderxAODBTaggingEfficiency+FTagAnalysisInterfaces: Fix cppcheck warnings.Pass strings/containers by const reference, not by value.
Prefer to initialize class members in an initialization list.
Redundant map lookup.Pass strings/containers by const reference, not by value.
Prefer to initialize class members in an initialization list.
Redundant map lookup.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66966ElectronPhotonSelectorTools: Update Electron LLH config for LLPs to latest EG...2023-11-08T17:44:53+01:00Eleanor Luise WoodwardElectronPhotonSelectorTools: Update Electron LLH config for LLPs to latest EGamma recommendationsUpdates the previous commit for Run 3 LLP Electron working points (https://gitlab.cern.ch/atlas/athena/-/merge_requests/64308). Updates the paths for the electron ID config files for LLPs to point to the current EGamma recommendation for...Updates the previous commit for Run 3 LLP Electron working points (https://gitlab.cern.ch/atlas/athena/-/merge_requests/64308). Updates the paths for the electron ID config files for LLPs to point to the current EGamma recommendation for Run 3 offline analysis in both the Component Accumulator and legacy.
I tested this change by producing 1000 events of LLP MC and confirmed the resulting changes are as expected. Tagging @longjonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66958MUON5 derivation add photon slimming, remove obsolete muon content, add...2024-02-16T20:47:29+01:00Philipp GadowMUON5 derivation add photon slimming, remove obsolete muon content, add...This MR adds the `IsoCloseByAlgsCfg` to the algorithm and populates the previously empty variables in the common muon derivation content.
It also schedules the thinning tool for photons which were earlier missing their calo clusters.
Fur...This MR adds the `IsoCloseByAlgsCfg` to the algorithm and populates the previously empty variables in the common muon derivation content.
It also schedules the thinning tool for photons which were earlier missing their calo clusters.
Further, it removes the `topoetconecoreConeSCEnergyCorrection` variable from expected output, as it is not available in the aux store when running.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66955Update EXOT3ContentList.py2023-11-08T15:11:04+01:00Antonio GianniniUpdate EXOT3ContentList.pyUpdating EXOT3 format to include jet truth labelling information for UFO jets as done in JETM8 format:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJ...Updating EXOT3 format to include jet truth labelling information for UFO jets as done in JETM8 format:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py?ref_type=heads
this is needed to include all the jets uncertainties.
tagging @sschrammhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66947DerivationFrameworkHiggs: Fix cppcheck warning.2023-11-07T18:47:50+01:00Scott SnyderDerivationFrameworkHiggs: Fix cppcheck warning.Potentially uninitialized variable.Potentially uninitialized variable.