Update packages:TrigEgammaEmulationTool TrigEgammaMatchingTool…
Update packages:TrigEgammaEmulationTool TrigEgammaMatchingTool TrigEgammaMonitoring from upstream/21.0 to upstream/master via pseudo-merge
Following in ATR-19005.
The result of the test_physics_pp_v7_primaries_build.sh are available in /afs/cern.ch/user/f/fernando/public/ATR-19005/pseudomerge_fernando_31_Dec_TrigEgammaEmulationTool_to_master/.
There are arrors unrelated to these packages.
TrigEgammaAnalysisTools pseudomerge fialed. So not included in this merge
Most of the conflicts resolved in favor of 21.0-TrigMC. Except those related to changes in interfaces or in messaging, that were updated in master and not in 21.0-TrigMC. Many conflicts resolved on many files. If doubts, please opend discussion or follow up in ATR-19005.
Merge request reports
Activity
added review-pending-level-1 label
Athena AthSimulation externals 
cmake make 
required tests optional tests 
Full details available at NICOS MR-20146-2019-01-01-00-34
For experts only: Jenkins output [CI-MERGE-REQUEST 31899] (for remote access see the FAQ for MR reviewers)added review-approved label and removed review-pending-level-1 label
added review-pending-level-1 label and removed review-approved label
added review-user-action-required label and removed review-pending-level-1 label
added review-pending-level-1 label and removed review-user-action-required label
-
Athena AthSimulation externals cmake make required tests optional tests Full details available at NICOS MR-20146-2019-01-02-17-42
For experts only: Jenkins output [CI-MERGE-REQUEST 31901] (for remote access see the FAQ for MR reviewers) added Squash commits label
-
Hi @fernando, I'm aware this is a pseudo-merge, so maybe some of my comments can be followed-up later. What really needs to be fixed are the copyright headers. If you manage to also remove some of the commented-out code, that would be great, as we would like to avoid it as much as possible.
I would also like one of the trigger experts to have a look as the changes are quite extensive and we probably want to avoid reverting something that was already updated in master (tagging @rbielski, @hartj).
Tadej (L1)
added review-user-action-required label and removed review-pending-level-1 label
added review-pending-level-1 label and removed review-user-action-required label
Thans @tadej for following up. I updated copyright on all files. And commented out just one of the lines. We will ned to go through the code at some point in the near future. But now the priority is the pseudomerge. In principle I din't revert any of the interface changes and code update in master. I tried to follow up by git log on every file before I modying to resolve conflicts.
Cheers! Fernando
-
Athena AthSimulation externals cmake make required tests optional tests Full details available at NICOS MR-20146-2019-01-03-21-14
For experts only: Jenkins output [CI-MERGE-REQUEST 31918] (for remote access see the FAQ for MR reviewers) added review-user-action-required label and removed review-pending-level-1 label
added 1 commit
- dcdc90ad - Fixed Copyright text in TrigEgammaEmulation source code
added review-pending-level-1 label and removed review-user-action-required label
-
Athena AthSimulation externals cmake make required tests optional tests Full details available at NICOS MR-20146-2019-01-04-21-45
For experts only: Jenkins output [CI-MERGE-REQUEST 31932] (for remote access see the FAQ for MR reviewers) 
-
Hi @fernando,
the CI failure looks unrelated to this MR, but I have a comment onTrigEgammaEmulationTool/CMakeLists.txt- see the discussion above.Thanks,
Rafal