DaVinci merge requestshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests2017-05-29T11:33:36+02:00https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/61Port Turbo MC fixes for Stripping 282017-05-29T11:33:36+02:00Alex PearcePort Turbo MC fixes for Stripping 28This ports MRs !51, !58, and !59 to the `2016-patches` branch so that they can be picked up by Stripping 28 MC productions. This will require a corresponding DaVinci release, v41r4p2.
The interesting changes are here, omitting package a...This ports MRs !51, !58, and !59 to the `2016-patches` branch so that they can be picked up by Stripping 28 MC productions. This will require a corresponding DaVinci release, v41r4p2.
The interesting changes are here, omitting package additions: [`bc126bca...apearce-turbo-mc-s28`](https://gitlab.cern.ch/lhcb/DaVinci/compare/bc126bca...apearce-turbo-mc-s28).
@erodrigu I couldn't see a `DVStrip28` branch, so this MR targets `2016-patches`. Is that OK?https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/62DaVinci:2017-05-17T13:00:44+02:00Vanya BelyaevDaVinci:- allow to add selections directly to the list of UserAlgorithms
No need in the explicit appearence of *SelectionSequence*:
```
my_selection = ...
dv = DaVinci()
dv.UserAlgorithms += [ my_selection ]
```
The corresponding *SelectionSe...- allow to add selections directly to the list of UserAlgorithms
No need in the explicit appearence of *SelectionSequence*:
```
my_selection = ...
dv = DaVinci()
dv.UserAlgorithms += [ my_selection ]
```
The corresponding *SelectionSequence* is created on-flight
As a result the final code is more compact and *Selection* behaves as *Configurable..*.https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/63DaVinciTests:2017-05-17T13:01:56+02:00Vanya BelyaevDaVinciTests:- add new test for MC-uDST
Assume that MR !62 for DaVinci and MR !119 for Analysis are in place
@apearce
@jonrob- add new test for MC-uDST
Assume that MR !62 for DaVinci and MR !119 for Analysis are in place
@apearce
@jonrobhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/64DaVinciTests:2017-05-18T10:17:51+02:00Vanya BelyaevDaVinciTests:- add missing options file for new test- add missing options file for new testhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/65Check for quarks and anti-quarks.2017-05-25T21:28:56+02:00Alex PearceCheck for quarks and anti-quarks.I patched the background category tool to ignore quarks in 59103931, but neglected anti-quarks :cry:
This MR just changes the `pid` comparison to an `abspid` comparison.I patched the background category tool to ignore quarks in 59103931, but neglected anti-quarks :cry:
This MR just changes the `pid` comparison to an `abspid` comparison.https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/66Configuration of Tesla with selective persistence2017-06-12T10:05:25+02:00Rosen MatevConfiguration of Tesla with selective persistenceRosen MatevRosen Matevhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/67Selective saving of Hlt2SelReports in Tesla2017-06-12T11:17:13+02:00Rosen MatevSelective saving of Hlt2SelReports in TeslaAn extra property `InputHlt2RepsToKeep` is added to Tesla, which if set together with `KillInputHlt2Reps = True`, allows to keep some of the Hlt2SelReports.
Closes LBHLT-75An extra property `InputHlt2RepsToKeep` is added to Tesla, which if set together with `KillInputHlt2Reps = True`, allows to keep some of the Hlt2SelReports.
Closes LBHLT-75Eduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/68Adding StrippingCache for S292017-06-12T20:39:05+02:00Michael Thomas AlexanderAdding StrippingCache for S29https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/69Temporaily add Velo/VeloDAQ to DaVinci for a patch release: fixes Velo decode...2017-06-07T15:17:56+02:00David HutchcroftTemporaily add Velo/VeloDAQ to DaVinci for a patch release: fixes Velo decoder crash on missing bankThis is a patch request for DaVinci, so that the fix for crashes with an empty VELO bank are available.This is a patch request for DaVinci, so that the fix for crashes with an empty VELO bank are available.https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/70added GaudiConf from LHCb (LHCb/2017-patches)2017-06-14T15:46:15+02:00Rosen Matevadded GaudiConf from LHCb (LHCb/2017-patches)We need to patch GaudiConf from LHCb for this release of DaVinci.We need to patch GaudiConf from LHCb for this release of DaVinci.Eduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/71Update version no. in StrippingCache.2017-06-13T09:03:02+02:00Michael Thomas AlexanderUpdate version no. in StrippingCache.https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/72Revert "Merge branch 'patch-gaudiconf' into 'master'"2017-06-14T15:53:29+02:00Eduardo RodriguesRevert "Merge branch 'patch-gaudiconf' into 'master'"This reverts merge request !70This reverts merge request !70https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/73Tesla configuration house-keeping2017-07-06T15:30:38+02:00Alex PearceTesla configuration house-keeping- Update RawFormatVersion to the latest 0.4
- Support offline mode with TurboSP (for TURCAL)
- Always save Turbo/pRec
- Juggle raw event to mimic Brunel behaviour
- Fix killing of Hlt2SelReports
- Fix writing of stripped SelReports
...- Update RawFormatVersion to the latest 0.4
- Support offline mode with TurboSP (for TURCAL)
- Always save Turbo/pRec
- Juggle raw event to mimic Brunel behaviour
- Fix killing of Hlt2SelReports
- Fix writing of stripped SelReports
- Other small improvements and fixeshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/74Removed versions from packages (in CMakeLists.txt).2017-06-24T14:55:51+02:00Eduardo RodriguesRemoved versions from packages (in CMakeLists.txt).Eduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/75Prepare v42r5 release2017-07-06T15:51:56+02:00Rosen MatevPrepare v42r5 releaseEduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/76Fixes for v42r5 release2017-07-07T09:12:11+02:00Rosen MatevFixes for v42r5 release- Set Tesla.SplitRawEventInput to format of the original raw event (0.3)
- Fix functor cache for Tesla
- Silence warnings from Boost in KaliCalo- Set Tesla.SplitRawEventInput to format of the original raw event (0.3)
- Fix functor cache for Tesla
- Silence warnings from Boost in KaliCaloRosen MatevRosen Matevhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/77Use MergedConfDB as dependency in the Turbo cache2017-07-07T13:02:50+02:00Rosen MatevUse MergedConfDB as dependency in the Turbo cacheIdeally, this would already be done in the main cmake file in LHCb.Ideally, this would already be done in the main cmake file in LHCb.Rosen MatevRosen Matevhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/78Handle missing Hlt2 SelReports in Tesla2017-07-19T18:53:16+02:00Rosen MatevHandle missing Hlt2 SelReports in TeslaOccasionally, HLT2 did not write `Hlt2/SelReports` for very busy
events. Previously, the `TeslaReportAlgo` was skipping such events
happily.
Here we restore this behaviour, such that if
`Hlt2/SelReports` cannot be decoded, no event...Occasionally, HLT2 did not write `Hlt2/SelReports` for very busy
events. Previously, the `TeslaReportAlgo` was skipping such events
happily.
Here we restore this behaviour, such that if
`Hlt2/SelReports` cannot be decoded, no event is written out.
This was spotted in the validation productions, see https://lblogbook.cern.ch/Operations/27130Sascha StahlSascha Stahlhttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/79Place Moore RecSummary in a stream-dependent location2017-07-20T10:20:02+02:00Alex PearcePlace Moore RecSummary in a stream-dependent locationTesla currently writes the `RecSummary` at `/Event/Rec/Summary`, but this is a problem for TurCal productions because the input files to Tesla already have a `Rec/Summary` from Brunel. This MR configures stream-specific `RecSummary` writ...Tesla currently writes the `RecSummary` at `/Event/Rec/Summary`, but this is a problem for TurCal productions because the input files to Tesla already have a `Rec/Summary` from Brunel. This MR configures stream-specific `RecSummary` writers to place the summary in `/Event/<stream>/Turbo/Rec/Summary`.
The problem is that there is [already logic for linking the summary from `/Event` to `/Event/<stream>`](https://gitlab.cern.ch/lhcb/Phys/blob/c241f05d85a521db3a763f1a8a1d657b2505e21b/Phys/PhysConf/python/PhysConf/MicroDST.py#L152-154), but for this MR to be transparent to the user we might need a link going the other way.
/cc @rmatev @sstahlEduardo RodriguesEduardo Rodrigueshttps://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/80Propagate MR !78 from master to v42r5-release2017-07-19T18:53:16+02:00Rosen MatevPropagate MR !78 from master to v42r5-releaseHandle missing Hlt2 SelReports in Tesla
See merge request !78Handle missing Hlt2 SelReports in Tesla
See merge request !78Eduardo RodriguesEduardo Rodrigues