DaVinci merge requestshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests2022-08-08T15:04:52+02:00https://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/647DaVinci documentation - set-up of webpages with Sphinx2022-09-27T10:19:25+02:00Maurizio MartinelliDaVinci documentation - set-up of webpages with SphinxCreated a first example of DaVinci documentation similarly to what was done in Moore.
The intent of this MR is to discuss the topics that need to be covered and define a Table Of Contents.
An example of the resulting website can be foun...Created a first example of DaVinci documentation similarly to what was done in Moore.
The intent of this MR is to discuss the topics that need to be covered and define a Table Of Contents.
An example of the resulting website can be found here: https://davincidocs.web.cern.ch/index.html
Work towards DPA task https://gitlab.cern.ch/lhcb-dpa/project/-/issues/102.Maurizio MartinelliMaurizio Martinellihttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/1059required binds to use standard_particles2024-03-26T13:27:10+01:00Sevda Esenrequired binds to use standard_particlesFollows LHCb!4494 Add necessary binds to be able to use standard_particles.Follows LHCb!4494 Add necessary binds to be able to use standard_particles.Abhijit MathadDavide FazziniAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/1039Add Functor Collection with Charged Calo Information2024-03-08T16:23:51+01:00Albert Lopez HuertasAdd Functor Collection with Charged Calo InformationThis Functor Collection contains all the variables related to Charged Calo Information, including also PID variables from Calo, used in electron analyses.
FYI: @cmarinbe @lcalefic @pvidrier @palaguarThis Functor Collection contains all the variables related to Charged Calo Information, including also PID variables from Calo, used in electron analyses.
FYI: @cmarinbe @lcalefic @pvidrier @palaguarAlbert Lopez HuertasAlbert Lopez Huertashttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/1000OriginFlag functor for FT2024-01-29T11:44:03+01:00Sara CelaniOriginFlag functor for FTUpdated the DaVinci options for Flavour Tagging variables to check that the new OriginFlag functor (which should give the true origin of the tagging particles) works.
To be tested with: [lhcb/Rec!3651](https://gitlab.cern.ch/lhcb/Rec/-...Updated the DaVinci options for Flavour Tagging variables to check that the new OriginFlag functor (which should give the true origin of the tagging particles) works.
To be tested with: [lhcb/Rec!3651](https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/3651) and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/1043Abhijit MathadPeilian LiAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/996fix the nightly build2023-11-15T11:44:47+01:00Sevda Esenfix the nightly buildFix the name of the hlt2 tistos test in DaVinciExamples cmakefile following DaVinci!988Fix the name of the hlt2 tistos test in DaVinciExamples cmakefile following DaVinci!988Abhijit MathadDavide FazziniAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/928Remake DaVinci input files2023-07-26T16:03:27+02:00Nicole SkidmoreRemake DaVinci input filesRemake DaVinci input files following Moore!2418
Needs lhcb/LHCb!4158 Moore!2418
cc @pkoppenb this is why DV tests are red currently as I pre-swapped the files in the dpa eos :disappointed:
cc @erodriguRemake DaVinci input files following Moore!2418
Needs lhcb/LHCb!4158 Moore!2418
cc @pkoppenb this is why DV tests are red currently as I pre-swapped the files in the dpa eos :disappointed:
cc @erodriguNicole SkidmoreNicole Skidmorehttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/826Documentation of DaVinciTutorials and DaVinciExamples2023-04-03T12:29:19+02:00Maurizio MartinelliDocumentation of DaVinciTutorials and DaVinciExamplesDaVinciTutorials and DaVinciExamples need to be documented inline to allow the automatic documentation to be created.
In the following the scripts that needs updating are listed.
**DaVinciExamples:**
- [x] ../DaVinciExamples/python/DaVi...DaVinciTutorials and DaVinciExamples need to be documented inline to allow the automatic documentation to be created.
In the following the scripts that needs updating are listed.
**DaVinciExamples:**
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_trigger_decisions.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/DTF_filtered.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_raw_data.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/advanced_run_mc.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_spruce.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_array_taggers.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/basic.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/basic_run_mc.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/DTF_run_mc.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_configFuntuple.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_tistos.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_xgen.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_unreconstructed_info.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_collections.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_spruce_mc.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_passthrough.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_FunTupleEvent.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_relation_isovariables.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-mc-reconstructible-reconstructed.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py
- [x] ../DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_data.py
**DaVinciTutorials:**
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial1_functors_specialfield.py
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial2_LoKi.py
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial4_trigger_eventinfo.py
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial5_MCTruth.py
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial3_ThOrfunctors.py
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial7_multiple_sel_lines.py
- [x] ../DaVinciTutorials/python/DaVinciTutorials//tutorial6_DecayTreeFit.pyMaurizio MartinelliAbhijit MathadMaurizio Martinellihttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/820Helper module to check for NaN values in produced ntuples2023-01-27T15:07:21+01:00Eduardo RodriguesHelper module to check for NaN values in produced ntuplesAs per our chats at https://gitlab.cern.ch/lhcb/DaVinci/-/issues/94, @amathad, @jzhuo and @pkoppenb.
We can already use this new module to test some ntuples in DaVinciExamples, DaVinciTests, etc. And we can expand with functions to retu...As per our chats at https://gitlab.cern.ch/lhcb/DaVinci/-/issues/94, @amathad, @jzhuo and @pkoppenb.
We can already use this new module to test some ntuples in DaVinciExamples, DaVinciTests, etc. And we can expand with functions to return a list of branche names containing NaNs, for example. Ideas welcome.Eduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/819Fix DV version in tutorial documentation2023-01-27T21:24:30+01:00Abhijit MathadFix DV version in tutorial documentationCloses #93Closes #93Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/814Automatic documentation of DaVinciExamples and DaVinciTutorials2023-02-23T18:38:50+01:00Maurizio MartinelliAutomatic documentation of DaVinciExamples and DaVinciTutorialsA script is added to the `doc` directory to automatically create the documentation pages for the scripts in `DaVinciExamples` and `DaVinciTutorials` and show them in the section `Examples and Tutorials` of the [DaVinci documentation site...A script is added to the `doc` directory to automatically create the documentation pages for the scripts in `DaVinciExamples` and `DaVinciTutorials` and show them in the section `Examples and Tutorials` of the [DaVinci documentation site](https://lhcb-davinci.docs.cern.ch).
The script so far creates the documentation pages based on information added on top of the original python files.
The information is formatted in the form of a comment
```
"""
<minimal description of the python script>
rst_title: <documentation page title>
rst_description: <documentation page description>
rst_running: <script to run the example/tutorial>
rst_yaml: <address of the yaml file relative to the 'doc' folder in DaVinci>
"""
```
Further sections can be added if needed.
The information above is decoded in the function `GetPageInfo` of `make_auto_docs.py` and used in the functions `WritePage` to create the page.
The index for DaVinciExamples or DaVinciTutorials and their respective sub-folders is written by the function `WriteIndex` that is called recursively when a sub-folder is found.
For this mr to be completed there are a few issues to resolve:
1. [x] Determine whether the information to build the page is enough and its format is clear enough
2. [x] Add a check for the examples/tutorials that are missing information such that any new file will be written with the specified format
3. [x] Add the script to the Makefile to run automatically
4. [x] ~~Add a check in the Makefile to commit all new files created by the script (and remove those that changed? i.e.: file changing name)~~ Removed
For 1 I would like feedback from other people (@erodrigu).
Item 2 was suggested by @pkoppenb during the DPA-WP3 meeting of 18/1/2023.
Item 3 should be easy, since the relevant code is just commented in the Makefile.
~~For the last point (4) I am planning to write a script that runs a diff after the execution of the script to check all the differences in the `doc` folder (excluding `doc/_build`) and apply the relevant commit in the Makefile.
In the example from the Functors documentation, only one file needs to be committed, while here there may be many and they may change over time.~~ Decided to remove point (4) since it introduces an unnecessary complication.
Work towards DPA task https://gitlab.cern.ch/lhcb-dpa/project/-/issues/204.Maurizio MartinelliMaurizio Martinellihttps://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/731Make "process" a required input and configure pyconf functions globally once ...2022-11-24T09:49:22+01:00Abhijit MathadMake "process" a required input and configure pyconf functions globally once with user inputCloses https://gitlab.cern.ch/lhcb/DaVinci/-/issues/59 and closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/74.
- [x] Make process a required input.
- [x] Make "options.process" as the default input to algorithms (e.g. truth matching...Closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/59 and closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/74.
- [x] Make process a required input.
- [x] Make "options.process" as the default input to algorithms (e.g. truth matching).
- [x] Make process a required input to truth-matching algorithm (related to issue: https://gitlab.cern.ch/lhcb/DaVinci/-/issues/62) and also set correct root-in-tes for `Turbo` process.
To be tested with: https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3806, https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1812 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/914Chris BurrAbhijit MathadDavide FazziniChris Burrhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/711DaVinci to depend on Moore2022-10-10T11:44:53+02:00Patrick KoppenburgDaVinci to depend on MooreTrying to see what happens if DaVinci depends on Moore, following a BBQ discussion with @dfazzini . Implements https://gitlab.cern.ch/lhcb/Rec/-/issues/353 option 2.
The follow-up MR removing duplications between DaVinci and Moore is !700.Trying to see what happens if DaVinci depends on Moore, following a BBQ discussion with @dfazzini . Implements https://gitlab.cern.ch/lhcb/Rec/-/issues/353 option 2.
The follow-up MR removing duplications between DaVinci and Moore is !700.Patrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/670Add feature for getting particles from TES matching a decay descriptor2022-03-30T09:25:01+02:00Davide FazziniAdd feature for getting particles from TES matching a decay descriptorImplement a function for adding FilterDecays, FilterDesktop and similar algorithms in a DaVinci job.
To be merged with Rec!2799.\
Close https://gitlab.cern.ch/lhcb-dpa/project/-/issues/186Implement a function for adding FilterDecays, FilterDesktop and similar algorithms in a DaVinci job.
To be merged with Rec!2799.\
Close https://gitlab.cern.ch/lhcb-dpa/project/-/issues/186Davide FazziniDavide Fazzinihttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/637Update tests and examples following fix to pyConf for data dependencies2022-02-05T12:40:13+01:00Abhijit MathadUpdate tests and examples following fix to pyConf for data dependenciesUpdate to tests and examples following the fix to issue https://gitlab.cern.ch/lhcb/Analysis/-/issues/26.
Also closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/33
Tested together with https://gitlab.cern.ch/lhcb/LHCb/-/merge_reques...Update to tests and examples following the fix to issue https://gitlab.cern.ch/lhcb/Analysis/-/issues/26.
Also closes https://gitlab.cern.ch/lhcb/DaVinci/-/issues/33
Tested together with https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/3391 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/863Abhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/626Update .gitlab-ci.yml2022-01-31T13:48:20+01:00Eduardo RodriguesUpdate .gitlab-ci.ymlAs per your suggestion at https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/621#note_5149985, @hasse.As per your suggestion at https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/621#note_5149985, @hasse.Eduardo RodriguesPatrick KoppenburgEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/621Update test with MC association and background category2022-01-31T13:48:20+01:00Abhijit MathadUpdate test with MC association and background categoryThis MR updates the HLT2 tupling test to showcase MC association and background category tupling.
Depends on https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2677, https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/851 and https://g...This MR updates the HLT2 tupling test to showcase MC association and background category tupling.
Depends on https://gitlab.cern.ch/lhcb/Rec/-/merge_requests/2677, https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/851 and https://gitlab.cern.ch/lhcb/Analysis/-/merge_requests/855.
Related to issue: https://gitlab.cern.ch/lhcb-dpa/project/-/issues/145
FYI: @gunther , @mferrill , @powenAbhijit MathadAbhijit Mathadhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/594Test of all functors2021-12-14T11:25:50+01:00Patrick KoppenburgTest of all functorsTest of all Thor functors that work (or not) in FunTuple.
Those that do not work are listed in https://gitlab.cern.ch/lhcb/Rec/-/issues/245Test of all Thor functors that work (or not) in FunTuple.
Those that do not work are listed in https://gitlab.cern.ch/lhcb/Rec/-/issues/245Patrick KoppenburgPatrick Koppenburghttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/166Add tests for Turbo MC processing2018-04-13T21:51:39+02:00Alex PearceAdd tests for Turbo MC processingThis is a start in fixing LHCBPS-1771. It runs DaVinci over 2015 and 2016 DST MC and 2016 microDST MC.
What I'd also like to test is that the truth-level branches of the ntuple are filled correctly, i.e. that the truth-matching is worki...This is a start in fixing LHCBPS-1771. It runs DaVinci over 2015 and 2016 DST MC and 2016 microDST MC.
What I'd also like to test is that the truth-level branches of the ntuple are filled correctly, i.e. that the truth-matching is working. I'm not sure if it's best to try and integrate this into the tests already in this MR, or add separate tests that check the output files.