DaVinci merge requestshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests2022-11-25T07:14:34+01:00https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/792Add Position closest to beam to all functors test2022-11-25T07:14:34+01:00Patrick KoppenburgAdd Position closest to beam to all functors testAdded position of state closest to beam as per discussion https://mattermost.web.cern.ch/lhcb/pl/fka4kzeqj3y7tfkohq3aqwwbgr involving @graven @mstahl
Requires https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3885 (for completeness; th...Added position of state closest to beam as per discussion https://mattermost.web.cern.ch/lhcb/pl/fka4kzeqj3y7tfkohq3aqwwbgr involving @graven @mstahl
Requires https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3885 (for completeness; this is already merged).
I am not sure it's very useful as it does the same as REFERENCEPOINT, but it's an example of something that should work. Hence good as a test, not necessarily as an example.
Superseded by !793 .Patrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/788Update list of functors that can be used in FunTuple2022-11-24T09:49:23+01:00Patrick KoppenburgUpdate list of functors that can be used in FunTupleSome more functors have been added, mostly related to bremsstrahlungSome more functors have been added, mostly related to bremsstrahlungPatrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/784Tuple run and event number by default (Follow up from https://gitlab.cern.ch...2023-01-27T21:24:31+01:00Abhijit MathadTuple run and event number by default (Follow up from https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/929)Tuple run and event number by default in root file.
Closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/47
Test with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/929
Wait for Rec!3115 to avoid conflicts.Tuple run and event number by default in root file.
Closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/47
Test with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/929
Wait for Rec!3115 to avoid conflicts.Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/781Follows https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3124 (Example for FI...2022-12-19T19:30:04+01:00Tommaso Fulghesutommaso.fulghesu@cern.chFollows https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3124 (Example for FIND_MCDECAY functor)Following [this comment](https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3124#note_6063788), it was thought to be convenient to open a DaVinci MR to properly test the functionalities of `FIND_DECAY/FIND_MCDECAY` functor.
TODO:
- [x] Up...Following [this comment](https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3124#note_6063788), it was thought to be convenient to open a DaVinci MR to properly test the functionalities of `FIND_DECAY/FIND_MCDECAY` functor.
TODO:
- [x] Update qmt and ref files
Needs https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3124Tommaso Fulghesutommaso.fulghesu@cern.chTommaso Fulghesutommaso.fulghesu@cern.chhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/771Tests for new functor to access Hlt1 TIS/TOS information2023-02-03T23:31:22+01:00Ozlem OzcelikTests for new functor to access Hlt1 TIS/TOS informationExample options file that stores the TIS/TOS information.
TODO:
- [x] Add `functorcollection` helper in `Analysis` to store the TIS/TOS information.
To be tested with: https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3845 https://gi...Example options file that stores the TIS/TOS information.
TODO:
- [x] Add `functorcollection` helper in `Analysis` to store the TIS/TOS information.
To be tested with: https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3845 https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3115 https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/935
FYI @sstahlOzlem OzcelikOzlem Ozcelikhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/763Add BPVCORRMERR2022-12-19T19:30:04+01:00Mark SmithAdd BPVCORRMERRRequires lhcb/Rec!3111
Adds the corrected mass error functor.Requires lhcb/Rec!3111
Adds the corrected mass error functor.Eduardo RodriguesPatrick KoppenburgEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/758DaVinciExamples example of EventInfo made to use all collection arguments2022-10-10T11:43:29+02:00Eduardo RodriguesDaVinciExamples example of EventInfo made to use all collection argumentsThere are a couple of example jobs that make use of `EventInfo` and this little update ensures all its arguments are exemplified (better test coverage).
FYI @amathad.There are a couple of example jobs that make use of `EventInfo` and this little update ensures all its arguments are exemplified (better test coverage).
FYI @amathad.Eduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/756New PID Substitution DaVinci Tool2022-11-24T09:49:22+01:00Jiahui ZhuoNew PID Substitution DaVinci ToolAdding the example and the test for https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3128
This MR depends on https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3128
FYI: @amathad @pkoppenb @erodrigu @fevolleAdding the example and the test for https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3128
This MR depends on https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3128
FYI: @amathad @pkoppenb @erodrigu @fevolleJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/746Follow-up MR from https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/916 ...2022-09-19T13:24:57+02:00Abhijit MathadFollow-up MR from https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/916 adding to exclusionsWith the introduction of new run3 decay finder, all of the tests pass except these three:
- DaVinciExamples.tupling.test_davinci_tupling_array_taggers (Failed)
- DaVinciExamples.tupling.test_example-tupling-basic-run-mc (Failed)
- DaV...With the introduction of new run3 decay finder, all of the tests pass except these three:
- DaVinciExamples.tupling.test_davinci_tupling_array_taggers (Failed)
- DaVinciExamples.tupling.test_example-tupling-basic-run-mc (Failed)
- DaVinciTests.davinci.test_davinci_funtuple_array (Failed)
The `ROOT` files are made correctly but the validator is now catching a new warning that is being thrown. The new warnings are:
```
WARNING: found factory loki_functor_3493811357, but of wrong type: instead of LoKi::Functor<LHCb::ProtoParticle const*, bool>* (*)(LoKi::Context&&)
WARNING: found factory loki_functor_3361120277, but of wrong type: instead of LoKi::Functor<LHCb::Event::v1::Track const*, bool>* (*)(LoKi::Context&&)
```
These warnings are just out of the blue since I am not even using `LoKi`. I am not really sure of their source. I have seen them sometimes building Moore, perhaps they are harmless?
This MR includes these warnings in DV exclusions.
To tested with: https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3091 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/916Abhijit MathadSacha BarreAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/729Store information from RecSummary (nTracks, nPVs)2022-10-10T11:46:15+02:00Abhijit MathadStore information from RecSummary (nTracks, nPVs)Test for functor reading `RecSummary`. Closes https://gitlab.cern.ch/lhcb/Rec/-/issues/366
To be tested with: https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3033Test for functor reading `RecSummary`. Closes https://gitlab.cern.ch/lhcb/Rec/-/issues/366
To be tested with: https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3033Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/721Follows Rec!29592022-07-13T18:01:34+02:00Tommaso Fulghesutommaso.fulghesu@cern.chFollows Rec!2959Follows changes on MAP_INPUT and MAP_INPUT_ARRAY from https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2959Follows changes on MAP_INPUT and MAP_INPUT_ARRAY from https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2959Tommaso Fulghesutommaso.fulghesu@cern.chTommaso Fulghesutommaso.fulghesu@cern.chhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/720Invalid value handling in nTuples2022-07-25T12:04:45+02:00Abhijit MathadInvalid value handling in nTuplesCloses https://gitlab.cern.ch/lhcb/DaVinci/-/issues/58.
The MR makes changes to option files so that invalid value for integer functors are passed by the user when there is no entry in the relations table. For floating point number a `...Closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/58.
The MR makes changes to option files so that invalid value for integer functors are passed by the user when there is no entry in the relations table. For floating point number a `nan` is tupled.
To be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/902, https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2992
FYI: @chasseAbhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/716Thor functors for MCTrackInfo2022-09-19T13:24:58+02:00Jiahui ZhuoThor functors for MCTrackInfoThis MR continues from https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/707, which is accidentally merged and reverted.
Description: In this MR will create a helper for the usage of new functors created in https://gitlab.cern.ch/lhc...This MR continues from https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/707, which is accidentally merged and reverted.
Description: In this MR will create a helper for the usage of new functors created in https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2979, and add an example to DaVinci.
TO-DO List:
- [x] Create the helper for MCP2MCTrackInfo, which will get the MCTrackInfo to each MC Particle
- [x] Create the helper for MCP2Track, which will associate each MC Particle to a reconstructed track.
- [x] Add examples
- [x] Add test to examples
- [x] Fix the comments from https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/707
- [x] Change the example for new MCP2Track Algorithm.
FYI: @amathad @ldufour @pkoppenb @sstahl @chasse @erodrigu
This MR require: https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1759 https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2979, https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/898Abhijit MathadPatrick KoppenburgJiahui ZhuoAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/707Thor functors for MCTrackInfo2022-06-23T18:17:42+02:00Jiahui ZhuoThor functors for MCTrackInfo~~Helper for new MCTrackInfo Algorithm and new related thor functors~~
From https://gitlab.cern.ch/lhcb/Rec/-/issues/283
Helpers for MCTrack and MCTrackInfo via Thor functor.
Add an example of use for the user.
Add more interfaces to...~~Helper for new MCTrackInfo Algorithm and new related thor functors~~
From https://gitlab.cern.ch/lhcb/Rec/-/issues/283
Helpers for MCTrack and MCTrackInfo via Thor functor.
Add an example of use for the user.
Add more interfaces to the truth matching helper in order to adapt to the algorithm changes.
FYI: @amathad @ldufour @pkoppenb
This MR requires https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2932 and https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3640Jiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/703Adding examples for ALLPV{X,Y,Z} and BPV{X,Y,Z} functors2022-05-30T22:18:34+02:00Patrick KoppenburgAdding examples for ALLPV{X,Y,Z} and BPV{X,Y,Z} functorsRedo https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/659 by @lcalefic on top of https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/688Redo https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/659 by @lcalefic on top of https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/688Patrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/702Set correct "TES_ROOT" for "Turbo" process and make process an explicit param...2022-06-01T12:23:04+02:00Abhijit MathadSet correct "TES_ROOT" for "Turbo" process and make process an explicit parameterThe MR:
- Correctly sets the `TES_ROOT` for the `Turbo` sample. If this is not done, we run into errors when calling `make_pv_v2()` discussed [here](https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/682#note_5611888). (FYI: @dfazzini...The MR:
- Correctly sets the `TES_ROOT` for the `Turbo` sample. If this is not done, we run into errors when calling `make_pv_v2()` discussed [here](https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/682#note_5611888). (FYI: @dfazzini )
- From [mattermost](https://mattermost.web.cern.ch/lhcb/pl/4kpkk1gkridrdjarapiggi6n7o), make `process` an explicit argument for `make_*` functions. (FYI: @erodrigu).
To be tested with: https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/682Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/695Test of FunTuple with v2 Composites and ChargedBasic2022-06-07T18:26:02+02:00Abhijit MathadTest of FunTuple with v2 Composites and ChargedBasicExample of tupling with v2 composites and charged basics. Produces custom `ChargedBasics` and uses `ThOrCombiners` to make `Composites`. Note that the functionality of decay descriptor parsing for v2 is not there yet, so ATM we run of al...Example of tupling with v2 composites and charged basics. Produces custom `ChargedBasics` and uses `ThOrCombiners` to make `Composites`. Note that the functionality of decay descriptor parsing for v2 is not there yet, so ATM we run of all composites in the TES.
Tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/888Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/694Adding test for funtuple array with user-defined length2022-05-31T09:09:07+02:00Davide FazziniAdding test for funtuple array with user-defined lengthAdding a test for checking issue reported in https://gitlab.cern.ch/lhcb/Analysis/-/issues/24.
Need Analysis!887.Adding a test for checking issue reported in https://gitlab.cern.ch/lhcb/Analysis/-/issues/24.
Need Analysis!887.Davide FazziniDavide Fazzinihttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/691Functionality added to access HLT1 decisions using FunTuple and example optio...2022-08-08T15:04:52+02:00Jonathan DaviesFunctionality added to access HLT1 decisions using FunTuple and example options files includedHLT1 decisions can now be accessed by FunTuple and included in an ntuple
Needs LHCb!3562, https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1580
Phys/DaVinci/python/DaVinci/algorithms.py- added block to get_hlt_reports such that HLT1 ...HLT1 decisions can now be accessed by FunTuple and included in an ntuple
Needs LHCb!3562, https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1580
Phys/DaVinci/python/DaVinci/algorithms.py- added block to get_hlt_reports such that HLT1 DecReports can be read in
Phys/DaVinci/options/DaVinciDB-Example.yaml- Example dst used for testing added to options
Example options used for testing:
DaVinciExamples/python/DaVinciExamples/tupling/option_trigger_decisions.py
DaVinciExamples/python/DaVinciExamples/tupling/option_trigger_decisions.yaml
To do
- [x] Set up unit test to check HLT1 branches specifically (dst and json files exist already)Nicole SkidmoreJonathan DaviesNicole Skidmorehttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/682Introduce DaVinci tutorials2022-06-03T13:57:30+02:00Abhijit MathadIntroduce DaVinci tutorialsMove the `staterkit` tutorials folder into master. Note that each example has objectives and showcases certain features (see `README.md`). Work towards DPA grand task https://gitlab.cern.ch/lhcb-dpa/project/-/issues/102. @mamartin : Coul...Move the `staterkit` tutorials folder into master. Note that each example has objectives and showcases certain features (see `README.md`). Work towards DPA grand task https://gitlab.cern.ch/lhcb-dpa/project/-/issues/102. @mamartin : Could be helpful/linked to documentation.
To be tested with: https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/705 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/892Abhijit MathadPatrick KoppenburgAbhijit Mathad