MuonHoughPatternTool - Minor tidy up
Hi,
the actual changes introduced in this MR can be found in the second commit. The first one is just an unleashing of the clang-formater. The filling of
std::vector<double> radius;
std::vector<double> errradius;
std::vector<double> weights;
std::vector<double> prob; // artificial probability that hit belongs to true muon
std::vector<int> multilayer;
std::vector<int> tubelayer;
std::vector<int> tubes;
std::vector<int> onsegment; // non-zero if on segment, int indicates how many hits in same
// layer are on segment (used in weighting)
std::vector<double> psi;
std::vector<double> weight_trigger;
std::vector<int> tr_confirmation; // 1 if confirmation from trigger hits else 0
std::vector<Identifier> ids;
std::vector<int> layers;
std::vector<const Muon::MdtPrepData*> prd;
is abandoned in favour of filling a vector of the so-called SegmentData struct. That should simplify the memory layout here. The second change is caching the translation of station names (e.g. BMS->BML, etc. into a map of integers).
Merge request reports
Activity
This merge request affects 1 package:
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools
This merge request affects 2 files:
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/MuonHoughPatternTools/MuonHoughPatternFinderTool.h
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonHoughPatternFinderTool.cxx
Adding @goetz ,@rosati ,@wleight ,@stavrop ,@jojungge ,@egodden as watchers
added MuonSpectrometer master labels
added 16 commits
-
666b23f7...857b733d - 14 commits from branch
atlas:master
- ae6c5b5d - Clang-format
- d82a3e0e - Abandon simultaenous filling of seperate vectors. Use a single struct vector instead
-
666b23f7...857b733d - 14 commits from branch
This merge request affects 1 package:
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools
This merge request affects 4 files:
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/MuonHoughPatternTools/MuonHoughPatternFinderTool.h
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonHoughPatternFinderTool.cxx
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonHoughPatternTool.cxx
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
Adding @goetz ,@rosati ,@wleight ,@stavrop ,@jojungge ,@egodden as watchers
added review-pending-level-1 label
CI Result SUCCESS (hash d716e541)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon externals cmake make required tests optional tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
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 49348] CI Result SUCCESS (hash d82a3e0e)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon externals cmake make required tests optional tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
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 49353]added review-approved label and removed review-pending-level-1 label
mentioned in commit ccfd5b42
added sweep:ignore label