DaVinci merge requestshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests2024-01-22T12:41:27+01:00https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/986Add an extra check for []CC in the decay descriptor of FunTuple2024-01-22T12:41:27+01:00Jiahui ZhuoAdd an extra check for []CC in the decay descriptor of FunTupleAddressing the issue https://gitlab.cern.ch/lhcb/Analysis/-/issues/47#note_7219259
This MR adds a DaVinci test for https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/1018
To be tested with: https://gitlab.cern.ch/lhcb/Rec/-/merge_re...Addressing the issue https://gitlab.cern.ch/lhcb/Analysis/-/issues/47#note_7219259
This MR adds a DaVinci test for https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/1018
To be tested with: https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3637 https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/1018
Solve the issue: https://gitlab.cern.ch/lhcb/Analysis/-/issues/47#note_7219259
FYI: @pkoppenb @erodrigu @amathadJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/970Add `[]CC` support to SubstitutePID tool2023-12-07T10:49:00+01:00Jiahui ZhuoAdd `[]CC` support to SubstitutePID toolhttps://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3581 Added the `[]CC` support to SubstitutePID tool, so we adapt the DaVinci tests for it.
Need to be tested with: https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/4286 https://gitlab.ce...https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3581 Added the `[]CC` support to SubstitutePID tool, so we adapt the DaVinci tests for it.
Need to be tested with: https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/4286 https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3581
FIY: @pkoppenb @amathad @erodriguJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/876Example to store hlt2 tistos2023-10-13T11:29:14+02:00Sascha StahlExample to store hlt2 tistosDV example to store tistos information
To be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/997 and https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3363DV example to store tistos information
To be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/997 and https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3363Rosen MatevPatrick KoppenburgRosen Matevhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/665Adding example for track isolation variables2023-06-22T13:06:52+02:00Tommaso Fulghesutommaso.fulghesu@cern.chAdding example for track isolation variablesThe following MR adds examples for testing the WeightedRelationAlg and the functors for the evaluation of track isolation, f.e. SUMCONE, MAXCONE, MINCONE, ASYM.
Needs: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/906
FYI: @ama...The following MR adds examples for testing the WeightedRelationAlg and the functors for the evaluation of track isolation, f.e. SUMCONE, MAXCONE, MINCONE, ASYM.
Needs: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/906
FYI: @amathad, @pkoppenb, @erodriguhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/863Update the Run3 DTF: Add extra output and v2 PVs support2023-05-30T16:39:26+02:00Jiahui ZhuoUpdate the Run3 DTF: Add extra output and v2 PVs supportAdd test and examples for https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3349 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/966
This should be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/966 https://...Add test and examples for https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3349 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/966
This should be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/966 https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/4007 https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3349
FYI: @pkoppenb @erodrigu @amathadJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/907Follow https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/9802023-05-23T12:10:37+02:00Abhijit MathadFollow https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/980Test for `totCandidates` and `nCandidate`.
Test with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/980Test for `totCandidates` and `nCandidate`.
Test with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/980Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/815Add MCPrimaries and more MC functors2023-04-17T08:10:35+02:00Jiahui ZhuoAdd MCPrimaries and more MC functorsFollowing the discussion in https://gitlab.cern.ch/lhcb/Rec/-/issues/409
This MR creates the necessary tools to replace the MCTupleToolPrimaries in Funtuple, and also adds some useful MC functors.
## What is done?
- Read all MC PVs fr...Following the discussion in https://gitlab.cern.ch/lhcb/Rec/-/issues/409
This MR creates the necessary tools to replace the MCTupleToolPrimaries in Funtuple, and also adds some useful MC functors.
## What is done?
- Read all MC PVs from `MC_Header` FYI: @amathad
- Refactor MC functors like: `MOTHER` and `ORIGINVERTEX`
- New MC functors are included like `MC_LIFETIME`, `MC_VTX_TYPE`..
- New functional functor `TARGET` to get the pointer from `LHCb::SmartRef` (Needed to get objects from MC_Header)
## FAQs:
### How does `get_mc_header()` work?
as @ldufour discussed in https://gitlab.cern.ch/lhcb/Rec/-/issues/409#note_6241665, the `get_mc_header()` will require first the `MCVertices` are unpacked, since the `MCVertices` are unpacked automatically using `get_mc_particles()`, the dependency here is to require `mc_particles` as inputs to chain the dependency automatically.
### Why do we refactor `F.MOTHER` and `F.ORIGINVERTEX`?
before `ORIGIN_VX`, `ORIGIN_VY`, and `ORIGIN_VZ` are three different functors which don't make sense, not it's defined as a composition of more basic functors like:
```
ORIGIN_VX = X_COORDINATE @ POSITION @ MC_ORIGINVERTEX
ORIGIN_VY = Y_COORDINATE @ POSITION @ MC_ORIGINVERTEX
ORIGIN_VZ = Z_COORDINATE @ POSITION @ MC_ORIGINVERTEX
```
which is more elegant and cleaner in the code.
### Why do we need `F.TARGET`?
The `LHCb::SmartRef` will only fetch the object when the object is called, the `Sel::Utils::deref_if_ptr` can't handle this smart pointer correctly, so the `F.TARGET` is called to convert this `LHCb::SmartRef` to the classic pointer.
This should be tested with https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/946 https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3279/edit https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3935
FYI: @pkoppenb @erodrigu @amathad @ldufourJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/657Add more functors to all test2023-03-08T17:57:31+01:00Patrick KoppenburgAdd more functors to all testUpdate with more functors.
Also addresses https://gitlab.cern.ch/lhcb/DaVinci/-/issues/37
Depends on https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/870Update with more functors.
Also addresses https://gitlab.cern.ch/lhcb/DaVinci/-/issues/37
Depends on https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/870Patrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/656Add additional functors to example-tupling-AllFunctors.py2023-03-08T17:57:31+01:00Gerhard RavenAdd additional functors to example-tupling-AllFunctors.pywith Rec!2709, various functors now work -- so added them to example-tupling-AllFunctors.py
must be merged _after_ (or together with) Rec!2709with Rec!2709, various functors now work -- so added them to example-tupling-AllFunctors.py
must be merged _after_ (or together with) Rec!2709Patrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/836Add more functors to access neutral CALO information2023-02-25T22:03:29+01:00Jiahui ZhuoAdd more functors to access neutral CALO informationAdd test for https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/952 and https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3292
This should be tested with https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/2094 https://gitlab.cern.ch/l...Add test for https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/952 and https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3292
This should be tested with https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/2094 https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/952 and https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3292
FYI: @amathad @pkoppenb @erodrigu @yihou @msaurJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/842DaVinciTutorials tests - add ntuple content checks2023-02-20T15:25:35+01:00Eduardo RodriguesDaVinciTutorials tests - add ntuple content checksHello @amathad, @pkoppenb, first stab at this work we talked about, first for the DaVinciTutorials package.
Most ntuple content checks here are trivial, but this kind of check should hopefully prevent in the future issues such as those ...Hello @amathad, @pkoppenb, first stab at this work we talked about, first for the DaVinciTutorials package.
Most ntuple content checks here are trivial, but this kind of check should hopefully prevent in the future issues such as those reported at https://gitlab.cern.ch/lhcb/DaVinci/-/issues/97 and https://gitlab.cern.ch/lhcb/DaVinci/-/issues/100. We now have examples on which to take inspiration for checks of any ntuple produced in any DaVinci test.Eduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/838Test for FunTupleEvent2023-02-17T15:19:50+01:00Abhijit MathadTest for FunTupleEventAdds a test for FunTupleEvent.
To be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/955Adds a test for FunTupleEvent.
To be tested with: https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/955Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/822DaVinciTutorials and DaVinciExamples - checks on NaNs in produced ntuples2023-02-15T15:21:12+01:00Patrick KoppenburgDaVinciTutorials and DaVinciExamples - checks on NaNs in produced ntuplesAs in comment https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/820#note_6376184.
Added new helpers in DaVinciTests/QMTest/check_helpers.py - e.g. say in which leaves there are NaNs.
Partially address https://gitlab.cern.ch/lhcb/DaV...As in comment https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/820#note_6376184.
Added new helpers in DaVinciTests/QMTest/check_helpers.py - e.g. say in which leaves there are NaNs.
Partially address https://gitlab.cern.ch/lhcb/DaVinci/-/issues/94.Eduardo RodriguesEduardo Rodrigueshttps://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/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/817Add array input support for the thor functor grammar2023-01-27T21:24:30+01:00Jiahui ZhuoAdd array input support for the thor functor grammarEnable more tests to the `MCReconstructed` tool
From the https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3283/diffs#95429ee4f0327a365079b3f0710cfec207dc94d0, I realized that `MCReconstructed.Chi2` and `MCReconstructed.Chi2DOF` were not...Enable more tests to the `MCReconstructed` tool
From the https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3283/diffs#95429ee4f0327a365079b3f0710cfec207dc94d0, I realized that `MCReconstructed.Chi2` and `MCReconstructed.Chi2DOF` were not working properly, I was surprised their tests were actually disabled in DaVinci, I fixed these bugs in https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/948 but it would be great if we enable their tests in DaVinci.
This MR can be merged independently.
FYI: @amathad @erodrigu @pkoppenbJiahui ZhuoJiahui Zhuohttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/823Update of test of all functors2023-01-27T21:24:29+01:00Patrick KoppenburgUpdate of test of all functorsNow using functor collections. This way it will show which functors are not included in a functor collection.
Requires https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/950Now using functor collections. This way it will show which functors are not included in a functor collection.
Requires https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/950Patrick KoppenburgPatrick Koppenburghttps://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/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/800Functor to replace MCTupleToolPrompt2022-12-19T19:30:04+01:00Jiahui ZhuoFunctor to replace MCTupleToolPromptAdd the test for https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/937
This MR also modernizes the test `DaVinciExamples.tupling.test_davinci_tupling_from_collections` by adding a more general checker to replace the simple length ch...Add the test for https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/937
This MR also modernizes the test `DaVinciExamples.tupling.test_davinci_tupling_from_collections` by adding a more general checker to replace the simple length checker.Jiahui ZhuoJiahui Zhuo