athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-01-17T13:39:09+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68169AFT-698: Add AntiKt4UFOCSSKJets to FTAG12024-01-17T13:39:09+01:00Ligang XiaAFT-698: Add AntiKt4UFOCSSKJets to FTAG1- Add AntiKt4UFOCSSKJets to FTAG1 (AFT-698)
- note: event size increase by 3% (252.0kb->259.8kb) from a ttbar sample
tag @bdong and @dguest- Add AntiKt4UFOCSSKJets to FTAG1 (AFT-698)
- note: event size increase by 3% (252.0kb->259.8kb) from a ttbar sample
tag @bdong and @dguesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67845FTAG: Python config cleanup2024-01-23T13:20:36+01:00Samuel Van StroudFTAG: Python config cleanup- Removing some old taggers (IP2D, old versions of DIPs and DL1)
- Remove the `BTaggingHighLevelRun3Aux` (haromise taggers between Standard and Expert outputs)
- Move some stuff in `FtagBaseContent.py` to `BTaggingContent.py`
cc @dguest...- Removing some old taggers (IP2D, old versions of DIPs and DL1)
- Remove the `BTaggingHighLevelRun3Aux` (haromise taggers between Standard and Expert outputs)
- Move some stuff in `FtagBaseContent.py` to `BTaggingContent.py`
cc @dguest @bdong @liganghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67628Make Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as ...2024-01-08T15:56:19+01:00Tadej Novaktadej.novak@cern.chMake Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as they are used as listMake `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC chann...Make `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC channel number handling in some derivation code as it was used incorrectly.
/cc @jchapman @nstyles @jcatmore @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65729Add dataYear to xAOD::FileMetaData2023-10-06T16:36:40+02:00Tadej Novaktadej.novak@cern.chAdd dataYear to xAOD::FileMetaDataAdd `dataYear` to `xAOD::FileMetaData` as a dynamic variable for data only as this would be useful for analyses. I also had to add support for a new type (`uint32_t`). Fixes ATEAM-920.
Note that we may want to cleanup `xAOD::FileMetaDat...Add `dataYear` to `xAOD::FileMetaData` as a dynamic variable for data only as this would be useful for analyses. I also had to add support for a new type (`uint32_t`). Fixes ATEAM-920.
Note that we may want to cleanup `xAOD::FileMetaData` at some point, ideally between data taking years.
This I will not put to ~"23.0" to keep AOD metadata consistent for the whole year (FYI @jmaurer @wlampl).
/cc @akraszna @maszyman @amete @gwatts @hrussell @ekourlithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61958[FTAG] add flipped GNN taggers to output and fix flipping logic2023-04-01T20:51:48+02:00Philipp Gadow[FTAG] add flipped GNN taggers to output and fix flipping logicThis MR modifies the flipped tagger logic for all GNN flavour tagging algorithms. It further adds the flipped GN1 and GN2 scores to the output in derivations, so that studies of the flipped taggers become possible.
This MR is taking the...This MR modifies the flipped tagger logic for all GNN flavour tagging algorithms. It further adds the flipped GN1 and GN2 scores to the output in derivations, so that studies of the flipped taggers become possible.
This MR is taking the changes which @yinmiao introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/61905 and targets `23.0` (and not master). We decided to open a new MR to have it cleaner.https://gitlab.cern.ch/atlas/athena/-/merge_requests/54403add GN1 to b-tagging config2022-07-05T14:29:19+02:00Samuel Van Stroudadd GN1 to b-tagging configSchedule baseline GN1 network for b-tagging.
Update CI test exclusion lists.
@dguest @nkakatiSchedule baseline GN1 network for b-tagging.
Update CI test exclusion lists.
@dguest @nkakatihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36184Teach MuonAnalysisSequence all available isolation WPs2020-09-09T17:56:16+02:00Martin Errenstmartin.errenst@cern.chTeach MuonAnalysisSequence all available isolation WPsThis is a small fix to a bug that @pagessin raised yesterday.
Apparently the current `Iso` option for muons does not configure a meaningful isolation WP.
This is solved by checking for all available MuonWPs in the `IsolationSelectionToo...This is a small fix to a bug that @pagessin raised yesterday.
Apparently the current `Iso` option for muons does not configure a meaningful isolation WP.
This is solved by checking for all available MuonWPs in the `IsolationSelectionTool` and requiring the user to name it explicitly. (e.g. `FCLoose`)
The MuonWP are defined here:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx#L175
`NonIso` is still an option to skip isolation all together.
I am torn if it isn't more elegant to omit the isoWP check on the python-side completely.
The `IsolationSelectionTool` checks for the WP by name anyway, so we duplicate that mechanism here.
I've added the `alsoTargeting:master` label -- the MuonAnalysisSequence should stay the same in both branches.
A couple of references to the MuonAnalysisSequence in the tutorials at atlassoftwaredocs will become outdated with this.
There is a listing of the corresponding python code and the former `Iso` option might be used in a couple examples.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69249Clean up legacy configs in JetTagging2024-02-28T07:26:38+01:00Thomas StreblerClean up legacy configs in JetTaggingSelf-explanatorySelf-explanatoryhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68640Update b-tagging variables in PHYSLITE2024-03-21T15:46:43+01:00Dan GuestUpdate b-tagging variables in PHYSLITEPHYSLITE was saving the wrong flavor tagging information:
- VR track jets: should not exist[^1]
- PFlow jets: should not save GN2v00, should save GN2v01
[^1]: Actually they don't seem to exist here, it looks like we were saving links t...PHYSLITE was saving the wrong flavor tagging information:
- VR track jets: should not exist[^1]
- PFlow jets: should not save GN2v00, should save GN2v01
[^1]: Actually they don't seem to exist here, it looks like we were saving links to a non-existent jet collection and also saving the associated b-tagging objects. Maybe I missed it but I don't see how anyone could have used this.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68443Precision GN2 in HLT2024-02-05T09:36:30+01:00Lucas BezioPrecision GN2 in HLTAddition of a new preicision b-tagger GN220240122 in the HLT code.
Tagging @sfranche @cantel @lshi @lbeemsteAddition of a new preicision b-tagger GN220240122 in the HLT code.
Tagging @sfranche @cantel @lshi @lbeemstehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68328TauAnalysisTools: Use data handles in BuildTruthTaus2024-03-13T16:16:30+01:00Bertrand Martin Dit LatourTauAnalysisTools: Use data handles in BuildTruthTausHello,
The main goal of this MR is to replace direct access from evtStore with read/write handles, to allow derivations to run in MT (ATLASG-2528). This is located in `BuildTruthTaus`. I dropped a few deprecated functionalities, in part...Hello,
The main goal of this MR is to replace direct access from evtStore with read/write handles, to allow derivations to run in MT (ATLASG-2528). This is located in `BuildTruthTaus`. I dropped a few deprecated functionalities, in particular `WriteTruthTaus=0` which was building truth taus and keeping them in memory without registering them to SG. I also changed the behaviour of truth tau building. Before, if `TruthTaus` were not present in the input file, `BuildTruthTaus` would trigger truth tau building from `TruthParticles`. Now, `BuildTruthTaus` will always run truth tau building, unless it is put in "truth matching mode" by the TauTruthMatchingTool, in which case it will read the existing `TruthTaus` and apply truth matching to reconstructed TauJets.
This is a first step, the BuildTruthTaus+TauTruthMatchingTool design is still somewhat unfriendly and should be further improved.
The MR was tested on 1000 TRUTH3 events and 500 PHYS events, it doesn't change the output.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68025BTagging clean up2024-01-08T19:30:47+01:00Thomas StreblerBTagging clean upClean up of `BTagging` package:
- removing unused configurable properties
- remove unnecessary includesClean up of `BTagging` package:
- removing unused configurable properties
- remove unnecessary includeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65516Updated V0 config to fix IDTR22023-09-04T13:33:39+02:00Thomas StreblerUpdated V0 config to fix IDTR2This MR aims at providing a more central implementation of the `Reco_V0Finder` configuration, to fix in particular the IDTR2 configuration
https://bigpanda.cern.ch//media/filebrowser/64f458c1-b68f-4b86-b850-4138c9568ecf/group.art/tarbal...This MR aims at providing a more central implementation of the `Reco_V0Finder` configuration, to fix in particular the IDTR2 configuration
https://bigpanda.cern.ch//media/filebrowser/64f458c1-b68f-4b86-b850-4138c9568ecf/group.art/tarball_PandaJob_5949219132_INFN-FRASCATI/workDir/log.Derivation
The IDTR2 configuration was not setting in particular the `V0Tools` property of the `V0MainDecorator`. To make maintenance easier, the configuration of the relevant tools is provided centrally and used in BPHY10, BPHY24, FTAG1 and IDTR2 configs. This was checked to leave unchanged the outputs and to fix the IDTR2 derivation.
FYI @abarton @jburzyns @gfrattarhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65073Fix typo in FTAG1 config (fix AFT-660)2023-08-17T08:54:21+02:00Thomas StreblerFix typo in FTAG1 config (fix AFT-660)Fix `SlimmingHelper` configuration issue introduced with !58812. Triggered AFT-660 following https://gitlab.cern.ch/atlas/athena/-/merge_requests/64494
FYI @ligang @bdongFix `SlimmingHelper` configuration issue introduced with !58812. Triggered AFT-660 following https://gitlab.cern.ch/atlas/athena/-/merge_requests/64494
FYI @ligang @bdonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64175Add GN2Xv01 tagger to PHYS2023-07-08T12:17:16+02:00Jackson BarrAdd GN2Xv01 tagger to PHYSAdding GN2Xv01 to PHYS (and FTAG) derivations @coccaro @arelycgAdding GN2Xv01 to PHYS (and FTAG) derivations @coccaro @arelycghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63796btagging configuration for HI data/MC in rel232023-06-21T21:16:56+02:00Sebastian Tapia Arayabtagging configuration for HI data/MC in rel23Adding HI flags and list of training maps for Antikt4HI collection ( same maps as Antikt4EMPFlow )
modifications at:
BTagConfig.py to include HImodes and to HIFlags in order to turn-on btagging reco and saving at --preInclude.
Taggi...Adding HI flags and list of training maps for Antikt4HI collection ( same maps as Antikt4EMPFlow )
modifications at:
BTagConfig.py to include HImodes and to HIFlags in order to turn-on btagging reco and saving at --preInclude.
Tagging, @derendar @bdong @liganghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62740Fix CutFlow in IDTIDE2023-04-29T08:36:42+02:00Tadej Novaktadej.novak@cern.chFix CutFlow in IDTIDEHotfix CutFlow in `IDTIDE`:
- add missing `CutFlowSvc` configuration
- prevent CBKs appearing in ESD and AOD (note that all special formats running in one job will still have them).
This will be properly fixed once !61980 will get merge...Hotfix CutFlow in `IDTIDE`:
- add missing `CutFlowSvc` configuration
- prevent CBKs appearing in ESD and AOD (note that all special formats running in one job will still have them).
This will be properly fixed once !61980 will get merged to avoid too many conflicts.
Related to ATLPHYSVAL-939.
/cc @nstyles @maszymanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61368Restructuring the CA MetaData Configuration2023-09-19T15:02:09+02:00Alaettin Serhan MeteRestructuring the CA MetaData ConfigurationThe goal of this MR is to remove all (with some exceptions) of the MetaData related configuration bits out of the main `OutputStreamConfig`. Then, each job/skeleton can configure whatever MetaData that particular workflow wants to write ...The goal of this MR is to remove all (with some exceptions) of the MetaData related configuration bits out of the main `OutputStreamConfig`. Then, each job/skeleton can configure whatever MetaData that particular workflow wants to write out independently. So, after this MR is accepted:
- Merely configuring `OutputStreamConfig` will not magically add any MetaData to the output file,
- Each job/workflow needs to add `InfileMetaDataCfg` in the dedicated steering/skeleton.
Once we have this in, we can start about making things more modular (i.e. split `InfileMetaDataCfg` into dedicated bits etc.), configuring items/components more "elegantly" (perhaps through flags and/or other means).
cc: @gemmeren @maszyman @mnowakhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60944Add particle barcode, child info to flavor tagging truth label2023-03-08T18:21:25+01:00Dan GuestAdd particle barcode, child info to flavor tagging truth labelThis adds:
- The barcode of the truth particle that sets the truth label for the flavor tagging labeling. **This will appear in `DAOD_PHYS`.**
- Some information on the charm child of the same truth particle. **This will only appear in f...This adds:
- The barcode of the truth particle that sets the truth label for the flavor tagging labeling. **This will appear in `DAOD_PHYS`.**
- Some information on the charm child of the same truth particle. **This will only appear in flavor tagging derivations.**
**No previously existing outputs should change.**
While the barcode has no direct use, it should be more reliable than element links when we want to establish whether a given b-jet came from a given truth particle. This is especially true in "Truth3" collections where the particles are copied around to multiple places and links are liable to break.
While I was editing the flavor tagging derivation code I made a few more changes:
- Removed a few files that don't seem to be used anywhere
- Cleaned up the code that adds aux variable lists: it had some weird syntax which (arguably) might be responsible for some past bugs
- Made some changes to make the truth labeling configuration code in `ParticleJetTools` work in `AthAnalysis`
- Added `AntiKt4EMPFlowJets` and `AntiKtVR30Rmax4Rmin02PV0TrackJets` to `AllVariables` in `FTAG1`.
As I said this shouldn't change any previously existing outputs, but I'm tagging @bdong, @ligang, @duperrin so they are aware.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60064BTagging: properly use config flags in fitters (and in config in general)2023-01-26T15:42:14+01:00Tadej Novaktadej.novak@cern.chBTagging: properly use config flags in fitters (and in config in general)BTagging: properly use config flags in fitters (and in config in general).
/cc @jcatmore @calpigia @dguest @duperrin @bdongBTagging: properly use config flags in fitters (and in config in general).
/cc @jcatmore @calpigia @dguest @duperrin @bdong