athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-12-19T11:10:28+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/67455HF Classifier Package.2023-12-19T11:10:28+01:00Adrian Berrocal GuardiaHF Classifier Package.A package with the tools to compute and add the HF classifier has been
created. The package is used in a new derivation format called TESTHF
which is like the PHYS format with the addition of the classifier.
However, the classifier does ...A package with the tools to compute and add the HF classifier has been
created. The package is used in a new derivation format called TESTHF
which is like the PHYS format with the addition of the classifier.
However, the classifier does not seem to be added properly.
Linking to ATLASG-2374.Zach MarshallJames CatmoreZach Marshallhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67452Updated InDetTrackSelectionToolWrapper config for derivations2023-11-29T20:09:30+01:00Thomas StreblerUpdated InDetTrackSelectionToolWrapper config for derivationsFollow up to !67314 as it turns out several derivation configs are actually configuring the cut level of the `InDetTrackSelectionToolWrapper` behind its back.
Introduces `CutLevel` property in the config to make this explicit (and drop ...Follow up to !67314 as it turns out several derivation configs are actually configuring the cut level of the `InDetTrackSelectionToolWrapper` behind its back.
Introduces `CutLevel` property in the config to make this explicit (and drop `ContainerName` since its default value is `InDetTrackParticles` anyway).
Also sets centrally `maxAbsEta` property, to increase it to eta=4 for Run 4 configs.
Fixes ART failures in JETM derivations in particular
https://bigpanda.cern.ch//media/filebrowser/2b72f15b-d119-4cff-933f-32d20cd76c99/group.art/tarball_PandaJob_6035138162_UKI-LT2-RHUL_VP/log.Derivation
```
03:01:51 File "/srv/workDir/runargs.Derivation.py", line 40, in <module>
03:01:51 fromRunArgs(runArgs)
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/DerivationFrameworkConfiguration/DerivationSkeleton.py", line 120, in fromRunArgs
03:01:51 cfg.merge(derivationConfig(flags))
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/DerivationFrameworkJetEtMiss/JETM10.py", line 55, in JETM10Cfg
03:01:51 acc.merge(JETM10KernelCfg(ConfigFlags, name="JETM10Kernel", StreamName = 'StreamDAOD_JETM10', TriggerListsHelper = JETM10TriggerListsHelper))
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/DerivationFrameworkJetEtMiss/JETM10.py", line 38, in JETM10KernelCfg
03:01:51 acc.merge(LooseMETTriggerDerivationKernelCfg(ConfigFlags, name="JETM10Kernel", skimmingTools = [skimmingTool], StreamName = 'StreamDAOD_JETM10'))
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 924, in merge
03:01:51 self.addPublicTool(pt) #Profit from deduplicaton here
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 634, in addPublicTool
03:01:51 deduplicate(newTool,self._publicTools)
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/Deduplication.py", line 31, in deduplicate
03:01:51 raiseWithCurrentContext(exception)
03:01:51 File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2023-11-27T2101/Athena/24.0.17/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/DebuggingContext.py", line 48, in raiseWithCurrentContext
03:01:51 raise type(exception)(str(exception) + '\nWith the context:\n{}'.format(Context.complete()) )
03:01:51 ValueError: conflicting settings for property CutLevel of InDetTrackSelectionTool_TightPrimary: cannot merge values 'Loose' and 'TightPrimary'
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/67451Remove Electron ECIDS config from BPHY182023-11-29T19:28:28+01:00Thomas StreblerRemove Electron ECIDS config from BPHY18Follow up to !67344 which enabled ECIDS in central EGamma config.
Fixes BPHY18 ART test
https://bigpanda.cern.ch//media/filebrowser/055aebd9-4a60-4a7d-9495-8469b1f334c0/group.art/tarball_PandaJob_6033478469_INFN-CNAF/log.Derivation
```...Follow up to !67344 which enabled ECIDS in central EGamma config.
Fixes BPHY18 ART test
https://bigpanda.cern.ch//media/filebrowser/055aebd9-4a60-4a7d-9495-8469b1f334c0/group.art/tarball_PandaJob_6033478469_INFN-CNAF/log.Derivation
```
22:55:05 BPHY18Kernel ERROR SG::ExcStoreLocked: Attempted to modify auxiliary data in a locked store: `::DFCommonElectronsECIDS' (911)
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/67447Muon 1 : New features & misc clean-up2023-12-13T09:42:47+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuon 1 : New features & misc clean-up* Add `PflowIsolationDecorationAlg`: Decorate the pflow isolation onto selected ID & ME tracks.
* Move the `MuonTruthIsolationTool` to an `MuonTruthIsolationDecorAlg`
* Restructure the `DiMuonTaggingAlg`
- Instead of using the MuonTyp...* Add `PflowIsolationDecorationAlg`: Decorate the pflow isolation onto selected ID & ME tracks.
* Move the `MuonTruthIsolationTool` to an `MuonTruthIsolationDecorAlg`
* Restructure the `DiMuonTaggingAlg`
- Instead of using the MuonType --> use the MuonSelectionTool
- Triggers are reinterpreted. `OR` triggers: One of the muons needs to be matched to, `AND` triggers: Both muons need to be matched to
- Removal of the isolation cuts. They were never used anyway
* Add IDTrack & ME track isolation variables to MUON1
* Change the `MuonTPExtrapolationTool` to the `MuonTPExtrapolationAlg`. The algorithm performs the extrpolation of ID tracks & Muon tracks to a representative cylinder in the MS
* Save the Muon1 JPsi vertex link.
* Remove depreciated files
Tagging @vaustrup, @mvanadia, @sangelidhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67446Updated IDTIDE config for ITk (ATLITKSW-237)2023-12-14T18:39:19+01:00Thomas StreblerUpdated IDTIDE config for ITk (ATLITKSW-237)Reorganised IDTIDE configs and adapted them for ITk
Checked to leave unchanged Run 3 IDTIDE outputs
FYI @avallier @nstyles @kbehr @mvgonzalReorganised IDTIDE configs and adapted them for ITk
Checked to leave unchanged Run 3 IDTIDE outputs
FYI @avallier @nstyles @kbehr @mvgonzalhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67405DerivationFrameworkTileCal: Fix invalid Tile Cell online hashes in TCAL1 (ATL...2023-11-28T20:18:45+01:00Siarhei HarkushaDerivationFrameworkTileCal: Fix invalid Tile Cell online hashes in TCAL1 (ATLASDPD-1994)TCAL1 derivation configuration has been updated in configure Tile cabling service.
Tile Cells Decorator tool has been updated to add protection against invalid
Tile Cell online hashes and initialize Tile cabling service in order to
set ...TCAL1 derivation configuration has been updated in configure Tile cabling service.
Tile Cells Decorator tool has been updated to add protection against invalid
Tile Cell online hashes and initialize Tile cabling service in order to
set up correct online hashes, otherwise they will be invalid.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67401DerivationFrameworkMCTruth: adding DSIDs to the list for heavy flavour origin...2023-11-28T17:43:43+01:00Roman LysakDerivationFrameworkMCTruth: adding DSIDs to the list for heavy flavour origin classifierThe ttH(bb) legacy analysis would like to try out some dedicated ttbar FSR variation samples to remedy pulls.
The four DSIDs need to be added to the heavy flavour classification tool in the R21.
For more details, see https://its.cern.c...The ttH(bb) legacy analysis would like to try out some dedicated ttbar FSR variation samples to remedy pulls.
The four DSIDs need to be added to the heavy flavour classification tool in the R21.
For more details, see https://its.cern.ch/jira/browse/ANALYSISTO-1365
This MR adds these 4 DSIDs.
tagging: @boeriuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67394DerivationFrameworkHiggs: Add new HWW ggH samples to HiggsMCSamples config2023-11-28T18:29:23+01:00Robin HayesDerivationFrameworkHiggs: Add new HWW ggH samples to HiggsMCSamples configAdds the DSID of two new alternate ggH FxFx samples used by HWW analyses to the HiggsMCSamples config, since STXS labels are required for these.Adds the DSID of two new alternate ggH FxFx samples used by HWW analyses to the HiggsMCSamples config, since STXS labels are required for these.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67386Add pileup truth info for MC derivations to JETM7 scheme2023-11-28T18:33:09+01:00Carlos Moreno MartinezAdd pileup truth info for MC derivations to JETM7 schemeAdding a few missing containers needed for MC studies with this derivation scheme.Adding a few missing containers needed for MC studies with this derivation scheme.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67379rm egammaFactories : Move one active test using them to CA2023-11-28T20:48:31+01:00Christos Anastopouloschristos.anastopoulos@cern.chrm egammaFactories : Move one active test using them to CArm egammaFactories : Move one active test using them to CArm egammaFactories : Move one active test using them to CAhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67367Additional tau variables to DAOD PHYS and cleanup of R21 jo2023-12-05T21:17:18+01:00Luca FioriniAdditional tau variables to DAOD PHYS and cleanup of R21 joThis merge request is about changes in the `PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau` package.
* Twenty Tau variables are added to the Tau contents of the DAOD_PHYS (No changes to DAOD_PHYSLITE).
* This was discusse...This merge request is about changes in the `PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau` package.
* Twenty Tau variables are added to the Tau contents of the DAOD_PHYS (No changes to DAOD_PHYSLITE).
* This was discussed and approved in the following AMG meeting:
* Agenda: https://indico.cern.ch/event/1342042/#9-tau-content-in-daod_phys
* Unused JobOptions from R21 have been removed. The corresponding Jira ticket is at this [link](https://its.cern.ch/jira/browse/ATLASG-2599).
Tagging @emmat , @gwatts, @jcatmore and @ekourlit
Best Regards,
Luca Fiorinihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67356Wrap usage of truth barcode as a unique ID - part 1 (ATLASSIM-6978)2023-11-29T20:17:03+01:00John Derek ChapmanWrap usage of truth barcode as a unique ID - part 1 (ATLASSIM-6978)In code where the truth particle/vertex `barcode` is only used in checks that it is identical to another barcode value, then the barcode calls can be wrapped using the HepMC::uniqueID(const T& p) templated helper function.
The idea here...In code where the truth particle/vertex `barcode` is only used in checks that it is identical to another barcode value, then the barcode calls can be wrapped using the HepMC::uniqueID(const T& p) templated helper function.
The idea here is to separate out the different conceptual usages of barcode ahead of its removal/replacement with id and the revised status scheme. See ATLASSIM-6906 for more details.
Tagging @pclark @averbytshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67349ElectronPhotonSelector cleanup legacy2023-11-24T13:55:17+01:00Christos Anastopouloschristos.anastopoulos@cern.chElectronPhotonSelector cleanup legacyElectronPhotonSelector cleanup legacyElectronPhotonSelector cleanup legacyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67344egamma reenable ECIDS in derivations in main2023-11-28T21:43:40+01:00Giovanni Marchioriegamma reenable ECIDS in derivations in mainas per [https://its.cern.ch/jira/browse/ATLASEG-345](https://its.cern.ch/jira/browse/ATLASEG-345#add-comment)as per [https://its.cern.ch/jira/browse/ATLASEG-345](https://its.cern.ch/jira/browse/ATLASEG-345#add-comment)https://gitlab.cern.ch/atlas/athena/-/merge_requests/67342adding in changes to accept electrons and photons close to muons for PhysLite2023-11-28T20:54:25+01:00R D Schafferadding in changes to accept electrons and photons close to muons for PhysLiteIn addition to the standard electron and photon selections in PhysLite (LooseLH and IsEMLoose, resp.) extra els/phs are added to allow FSR corrections to muons. The was discussed in an [AMG meeting](https://indico.cern.ch/event/1335687/...In addition to the standard electron and photon selections in PhysLite (LooseLH and IsEMLoose, resp.) extra els/phs are added to allow FSR corrections to muons. The was discussed in an [AMG meeting](https://indico.cern.ch/event/1335687/) in October. I have tested that this reproduces the FSR correction in mc H4l events.R D SchafferR D Schafferhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67330Adding DAOD_NCB1 for cosmic ray studies in NCB group2023-12-15T19:38:21+01:00Cristiano AlpigianiAdding DAOD_NCB1 for cosmic ray studies in NCB groupAs in the title, this MR is to add the new format to run on AOD from **cosmic ray runs**. This is needed for the analysis we are starting in the NCB group. The discussion is in https://its.cern.ch/jira/browse/ATLASNCB-29.
A few points:
...As in the title, this MR is to add the new format to run on AOD from **cosmic ray runs**. This is needed for the analysis we are starting in the NCB group. The discussion is in https://its.cern.ch/jira/browse/ATLASNCB-29.
A few points:
* This format is currently meant to be used to process **only cosmic ray runs**. It will not run on collisions!
* There is **no selection** applied since we want to get an unbiased sample to play with and build a selection to define a "good" cosmic muon for the analysis purposes.
* The current size is **5kb/evt**, and we will need to process <span dir="">\~</span>2.5B of events, given a total disk size of \~**12 TB**.
* I have **added the ART** running on 2k events from a cosmic ray run taken last summer and processed at T0. The file is uploaded in the usual folder in cvmfs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67315Update BPHY24 with JpsiV0VertexFitCfg2023-11-23T12:16:35+01:00Thomas StreblerUpdate BPHY24 with JpsiV0VertexFitCfgUse central `JpsiV0VertexFitCfg`, with equivalent configurationUse central `JpsiV0VertexFitCfg`, with equivalent configurationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67314Use central InDetTrackSelectionTool configs in derivation2023-11-28T22:23:58+01:00Thomas StreblerUse central InDetTrackSelectionTool configs in derivationSelf-explanatory. Useful in particular for Run 4 configs since the central configs have in addition
https://gitlab.cern.ch/atlas/athena/-/blob/main/InnerDetector/InDetConfig/python/InDetTrackSelectionToolConfig.py#L30
```
kwargs.set...Self-explanatory. Useful in particular for Run 4 configs since the central configs have in addition
https://gitlab.cern.ch/atlas/athena/-/blob/main/InnerDetector/InDetConfig/python/InDetTrackSelectionToolConfig.py#L30
```
kwargs.setdefault("maxAbsEta", 2.5 if flags.GeoModel.Run <= LHCPeriod.Run3 else 4.0)
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/67272Add jet fold hash2024-03-26T11:52:53+01:00Dan GuestAdd jet fold hashThis just adds a variable to flavor tagging. Nothing else should change.
We found that our flavor tagging networks were a bit overtrained on the ttbar dataset we normally use. We're considering working around this by adding a per-jet ha...This just adds a variable to flavor tagging. Nothing else should change.
We found that our flavor tagging networks were a bit overtrained on the ttbar dataset we normally use. We're considering working around this by adding a per-jet hash and training several networks, so we can avoid ever applying the tagger to a jet we trained on.
This is adding the first part: the hash. It mixes some hit and constituent info with the event number to get something pretty random.
Tagging @svanstro, @hartman, @bdong, @liganghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67260Inclusion of functions to produce clusters containers related to Ringer2023-11-23T12:34:42+01:00Denis Oliveira DamazioInclusion of functions to produce clusters containers related to RingerInclusion of functions to produce clusters containers related to Ringer. These functions can be called from Pre/Post Exec in a transform.Inclusion of functions to produce clusters containers related to Ringer. These functions can be called from Pre/Post Exec in a transform.