dataType -> constitType and constitMod
calib    -> clusterCalib

Add a few explicit `str` conversions for DataHandles.

Teng Jian Khoo authored 4 years ago and Edward Moyse committed 4 years ago

Deprecate jetMenuHelper, as it's only used in tests and is an annoying alternative to the standard jet reco config

Teng Jian Khoo authored 4 years ago and Edward Moyse committed 4 years ago

also nojcalib LCTopo to help comparing

NOTE: Not working (some restructuring is needed)

Mark Andrew Owen authored 5 years ago and Frank Winklmeier committed 5 years ago

What I changed:
- JetChainConfiguration now represents the configuration of all the jet parts of the chain (e.g. j80_j60) rather than just a single leg.
- Because of this GenerateJetChainDefs no longer splits the chain defs.
- Similarly, in GenerateBjetChainDefs, the jet part of the chain is created from the unsplit chain def.
- The extractRecoDict function in JetRecoConfiguration now handles a vector of chain parts and checks the settings are consistent in the different parts.

Francesca Pastore authored 5 years ago and Walter Lampl committed 5 years ago

* use the same HypoAlg for all chains that use the same sequence
* define legs and build one HypoTool per leg for that HypoAlg
* let the Filter pass the leg IDs

Teng Jian Khoo authored 5 years ago and Vakhtang Tsulaia committed 5 years ago

This reverts commit 5a46ec0c.

Teng Jian Khoo authored 5 years ago and Walter Lampl committed 5 years ago

* Renamed some sequences in TUT/full_menu.py to reflect Run 2 names
* Made calibration configs more consistent with offline model
* Fixed nesting of prerequisite sequences to avoid alg dupe clashes
* Renamed placeholder code in TriggerMenuMT to be more transparent
* Implemented large-R ungroomed and reclustered triggers in TMMT
* Clean up helper functions to minimise duplication

Catrin Bernius authored 5 years ago and Adam Edward Barton committed 5 years ago

Merge remote-tracking branch 'upstream/master' into fromScratch

duplicated Hypos to merge electron and photon in the fullmenu test; factorized the calocluster code to be used in the jets

Former-commit-id: 5fabf72f

Former-commit-id: 2a21893a

Catrin Bernius authored 6 years ago and Walter Lampl committed 6 years ago

Former-commit-id: 06adfab7