Skip to content

Pseudomerge TrigEgammaAnalysisTools from 21.0-TrigMC to master

Hi @jodafons

OK, this just applies your changes. I did

git checkout -b TrigEgammaAnalysisToolsToMaster upstream/master
git rm  Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaNavNtuple.h Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaNavTPNtuple.h
cd Trigger/TrigAnalysis/TrigEgammaAnalysisTools
cp -r -v /afs/cern.ch/user/j/jodafons/public/toTim/TrigEgammaAnalysisTools/* .
git add *
git commit -m "Pseudomerge TrigEgammaAnalysisTools from 21.0-TrigMC to master"
git push origin TrigEgammaAnalysisToolsToMaster

This will have to go through standard code review. As it's a pseudomerge, hopefully it was all reviewed at least once, and we can just check that it's OK still for master which is stricter on code standards than 21 was.

I will add you as a developer to my fork so that we can both push changes.

Tagging @thrynova and @fernando

This MR fixed the problem related in ATR-19448

See the discussion about the pseudo merge here: ATR-19005

Edited by Joao Victor Da Fonseca Pinto

Merge request reports