A few methods implemented in version 2 of Run2ToRun3 code

New (version 2): associateChainsToProxies and extractTECtoChainMapping implemented Old version: optional code selector for various approach.
Test unit: temporarliy disabled (commented out).

requested review from @tbold

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 7 files:

• Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

added Trigger master review-pending-level-1 labels

CI Result FAILURE (hash 5dd96a4f)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39895]

added 1 commit

• 74ff5621 - test unit temporarily disabled

Compare with previous version

changed the description

There were multiple CI triggers for this MR and commit. The system ignored duplicates. However the GitLab pipelines status may be shown incorrectly.

Jenkins please retry a build

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 9 files:

• Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_electron_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_chains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

There were multiple CI triggers for this MR and commit. The system ignored duplicates. However the GitLab pipelines status may be shown incorrectly.

Suggested few improvements (rather minor). Since we are a bit in a rush with this development I suggest closing those and addressing them in the next MR. Unless there will be a need for another CI cycle. They would then be worth addressing.

Side observation. This MR has 106 commits that span several months. Most are irrelevant by now. They will be all squashed when joining with the master but I really suggest following ATLAS guide and make a separate branch for each MR.

CI Result SUCCESS (hash 74ff5621)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39908]

ok, CI looks ok. I'll resolve comments so this MR can move ahead with the understanding of the fixes to be done in the next MR.

resolved all threads

Hi @tbold, few minor comments. I see however that the ref files in the share folder are now empty. Is this intended or are they supposed to be deleted?

-- L1

added review-user-action-required label and removed review-pending-level-1 label

added 1 commit

• 9cc49dc6 - Comments removed, minor recommended fixes implemented

Compare with previous version

resolved all threads

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 9 files:

• Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_electron_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_chains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

added review-pending-level-1 label and removed review-user-action-required label

CI Result SUCCESS (hash 9cc49dc6)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 39931]

added review-approved label and removed review-pending-level-1 label

GitLab is not able to squash that many commits. Please do it manually and then force push the branch (git push -f ...).

added review-user-action-required label

removed review-approved label

Instead of squash I have created a new branch runConverter, is there a neat way to connect it to this MR or I need to close it first and do MR again?

added 87 commits

• 9cc49dc6...72a2795e - 86 commits from branch atlas:master
• 7232491c - continuation from exploreRelease branch

Compare with previous version

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 9 files:

• Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_electron_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_chains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

added review-pending-level-1 label and removed review-user-action-required label

Is GitLab unaware of what happened? There is 108 commits now.

added review-user-action-required label

removed review-pending-level-1 label

added 17 commits

• 7232491c...06d46c83 - 16 commits from branch atlas:master
• 7c271f73 - overcoming squashing and cheery-picking

Compare with previous version

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 6 files:

• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

added review-pending-level-1 label and removed review-user-action-required label

I have no idea what to do now. It is more than surprising that pushing my commit a lot of not my stuff is pushed as well ("16 commits from master").

CI Result FAILURE (hash 7c271f73)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 40000]

Jenkins please retry a build

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 6 files:

• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

CI Result FAILURE (hash 7c271f73)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 40031]

Hi,

there is a unit test failure now in TrigNavTools_NavConverter_electron_multichains_test_ctest

ERROR: ../share/NavConverter_electron_multichains_test.ref and NavConverter_electron_multichains_test.log

Can you please take a look?

Thanks, Volker (L1)

added review-user-action-required label and removed review-pending-level-1 label

added 1 commit

• 8c466da9 - Removing Test unit and reference files

Compare with previous version

This merge request affects 1 package:

• Trigger/TrigEvent/TrigNavTools

This merge request affects 10 files:

• Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_electron_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_chains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/NavConverter_muon_multichains_test.ref
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversion.py
• Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.h
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
• Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h

added review-pending-level-1 label and removed review-user-action-required label

CI Result SUCCESS (hash 8c466da9)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 40127]

resolved all threads

added review-approved label and removed review-pending-level-1 label

mentioned in commit 8a742abd

merged

added sweep:ignore label