From dba81d10ff339a6aa881f11ebd06fecf3f1579f4 Mon Sep 17 00:00:00 2001
From: Tobias Boeckh <tobias.boeckh@cern.ch>
Date: Fri, 13 May 2022 21:53:03 +0200
Subject: [PATCH] cleanup
---
.../FaserActsKalmanFilter/CKF2.h | 6 +-
.../CombinatorialKalmanFilterAlg.h | 3 -
.../FaserActsKalmanFilter/KalmanFitterTool.h | 1 +
.../python/CKF2Config.py | 51 ++---
.../python/CombinatorialKalmanFilterConfig.py | 5 +-
.../Acts/FaserActsKalmanFilter/src/CKF2.cxx | 184 ++----------------
.../src/CombinatorialKalmanFilterAlg.cxx | 9 +-
.../src/KalmanFitterTool.cxx | 20 +-
.../src/PerformanceWriterTool.cxx | 14 +-
.../src/RootTrajectoryStatesWriterTool.cxx | 12 +-
.../src/RootTrajectorySummaryWriterTool.cxx | 8 +-
.../Acts/FaserActsKalmanFilter/test/CKF2.py | 7 +-
.../test/CombinatorialKalmanFilterAlg.py | 2 +-
Tracking/Acts/README.md | 10 +
14 files changed, 94 insertions(+), 238 deletions(-)
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
index 98d6139d..7e3b0e76 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
@@ -7,9 +7,6 @@
#include "TrackerSpacePoint/FaserSCT_SpacePointContainer.h"
#include "TrackerPrepRawData/FaserSCT_ClusterContainer.h"
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
-#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
#include "Acts/TrackFitting/KalmanFitter.hpp"
#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
#include "Acts/TrackFinding/MeasurementSelector.hpp"
@@ -21,7 +18,6 @@
#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/TrackSeedWriterTool.h"
#include "FaserActsKalmanFilter/KalmanFitterTool.h"
#include <boost/dynamic_bitset.hpp>
using ConstTrackStateProxy = Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
@@ -127,6 +123,7 @@ private:
Gaudi::Property<bool> m_backwardPropagation {this, "BackwardPropagation", false};
Gaudi::Property<bool> m_performanceWriter {this, "PerformanceWriter", true};
Gaudi::Property<bool> m_summaryWriter {this, "SummaryWriter", true};
+ Gaudi::Property<bool> m_noDiagnostics {this, "noDiagnostics", true, "Set ACTS logging level to INFO and do not run performance writer, states writer or summary writer"};
Gaudi::Property<bool> m_statesWriter {this, "StatesWriter", false};
Gaudi::Property<bool> m_resolvePassive {this, "resolvePassive", false};
Gaudi::Property<bool> m_resolveMaterial {this, "resolveMaterial", true};
@@ -141,7 +138,6 @@ private:
ToolHandle<PerformanceWriterTool> m_performanceWriterTool {this, "PerformanceWriterTool", "PerformanceWriterTool"};
ToolHandle<RootTrajectoryStatesWriterTool> m_trajectoryStatesWriterTool {this, "RootTrajectoryStatesWriterTool", "RootTrajectoryStatesWriterTool"};
ToolHandle<RootTrajectorySummaryWriterTool> m_trajectorySummaryWriterTool {this, "RootTrajectorySummaryWriterTool", "RootTrajectorySummaryWriterTool"};
- ToolHandle<TrackSeedWriterTool> m_trackSeedWriterTool {this, "TrackSeedWriterTool", "TrackSeedWriterTool"};
ToolHandle<KalmanFitterTool> m_kalmanFitterTool1 {this, "KalmanFitterTool1", "KalmanFitterTool"};
ToolHandle<KalmanFitterTool> m_kalmanFitterTool2 {this, "KalmanFitterTool2", "KalmanFitterTool"};
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
index 05cd0db8..ba983f24 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
@@ -6,7 +6,6 @@
#include "TrackerSpacePoint/FaserSCT_SpacePointContainer.h"
#include "TrackerPrepRawData/FaserSCT_ClusterContainer.h"
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
-#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
//#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
//#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
@@ -19,7 +18,6 @@
#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/TrackSeedWriterTool.h"
#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
#include <boost/dynamic_bitset.hpp>
using ConstTrackStateProxy = Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
@@ -123,7 +121,6 @@ public:
ToolHandle<PerformanceWriterTool> m_performanceWriterTool {this, "PerformanceWriterTool", "PerformanceWriterTool"};
ToolHandle<RootTrajectoryStatesWriterTool> m_trajectoryStatesWriterTool {this, "RootTrajectoryStatesWriterTool", "RootTrajectoryStatesWriterTool"};
ToolHandle<RootTrajectorySummaryWriterTool> m_trajectorySummaryWriterTool {this, "RootTrajectorySummaryWriterTool", "RootTrajectorySummaryWriterTool"};
- ToolHandle<TrackSeedWriterTool> m_trackSeedWriterTool {this, "TrackSeedWriterTool", "TrackSeedWriterTool"};
std::unique_ptr<Trk::Track> makeTrack(Acts::GeometryContext& tgContext, TrackFitterResult& fitResult) const;
std::unique_ptr<Trk::Track> makeTrack(const Acts::GeometryContext &geoCtx, const FaserActsRecMultiTrajectory &traj) const;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
index 1e7c0e33..9c26faeb 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
@@ -58,6 +58,7 @@ private:
Gaudi::Property<bool> m_isMC {this, "isMC", false};
Gaudi::Property<bool> m_summaryWriter {this, "SummaryWriter", false};
Gaudi::Property<bool> m_statesWriter {this, "StatesWriter", false};
+ Gaudi::Property<bool> m_noDiagnostics {this, "noDiagnostics", true, "Set ACTS logging level to INFO and do not run performance writer, states writer or summary writer"};
SG::ReadCondHandleKey<FaserFieldCacheCondObj> m_fieldCondObjInputKey {this, "FaserFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
ToolHandle<IFaserActsTrackingGeometryTool> m_trackingGeometryTool {this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
diff --git a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py
index a912f035..728cc83e 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py
@@ -55,52 +55,59 @@ def CKF2Cfg(flags, **kwargs):
track_seed_tool.std_cluster = 0.0231
track_seed_tool.origin = 0
- track_seed_writer_tool = CompFactory.TrackSeedWriterTool()
- track_seed_writer_tool.FilePath = "TrackSeeds.root"
-
- # trajectory_states_writer_tool = CompFactory.RootTrajectoryStatesWriterTool()
- # trajectory_states_writer_tool1 = CompFactory.RootTrajectoryStatesWriterTool()
- # trajectory_states_writer_tool1.FilePath = "track_states_ckf1.root"
- # trajectory_states_writer_tool2 = CompFactory.RootTrajectoryStatesWriterTool()
- # trajectory_states_writer_tool2.FilePath = "track_states_ckf2.root"
+ trajectory_states_writer_tool = CompFactory.RootTrajectoryStatesWriterTool()
+ trajectory_states_writer_tool.noDiagnostics = kwargs["noDiagnostics"]
+ trajectory_states_writer_tool1 = CompFactory.RootTrajectoryStatesWriterTool()
+ trajectory_states_writer_tool1.noDiagnostics = kwargs["noDiagnostics"]
+ trajectory_states_writer_tool1.FilePath = "track_states_ckf1.root"
+ trajectory_states_writer_tool2 = CompFactory.RootTrajectoryStatesWriterTool()
+ trajectory_states_writer_tool2.FilePath = "track_states_ckf2.root"
+ trajectory_states_writer_tool2.noDiagnostics = kwargs["noDiagnostics"]
+ trajectory_summary_writer_tool = CompFactory.RootTrajectorySummaryWriterTool(**kwargs)
+ trajectory_summary_writer_tool.noDiagnostics = kwargs["noDiagnostics"]
+ trajectory_summary_writer_tool1 = CompFactory.RootTrajectorySummaryWriterTool()
+ trajectory_summary_writer_tool1.FilePath = "track_summary_ckf1.root"
+ trajectory_summary_writer_tool1.noDiagnostics = kwargs["noDiagnostics"]
+ trajectory_summary_writer_tool2 = CompFactory.RootTrajectorySummaryWriterTool(**kwargs)
+ trajectory_summary_writer_tool2.FilePath = "track_summary_ckf2.root"
+ trajectory_summary_writer_tool2.noDiagnostics = kwargs["noDiagnostics"]
actsExtrapolationTool = CompFactory.FaserActsExtrapolationTool("FaserActsExtrapolationTool")
actsExtrapolationTool.MaxSteps = 1000
actsExtrapolationTool.TrackingGeometryTool = CompFactory.FaserActsTrackingGeometryTool("TrackingGeometryTool")
- performance_writer_tool = CompFactory.PerformanceWriterTool("PerformanceWriterTool")
- performance_writer_tool.ExtrapolationTool = actsExtrapolationTool
+
+ trajectory_performance_writer_tool = CompFactory.PerformanceWriterTool("PerformanceWriterTool", **kwargs)
+ trajectory_performance_writer_tool.ExtrapolationTool = actsExtrapolationTool
+ trajectory_performance_writer_tool.noDiagnostics = kwargs["noDiagnostics"]
+
ckf = CompFactory.CKF2(**kwargs)
kalman_fitter1 = CompFactory.KalmanFitterTool(name="fitterTool1", **kwargs)
+ kalman_fitter1.noDiagnostics = kwargs["noDiagnostics"]
kalman_fitter1.ActsLogging = "INFO"
kalman_fitter1.SummaryWriter = True
- # kalman_fitter1.StatesWriter = True
+ kalman_fitter1.StatesWriter = True
kalman_fitter1.SeedCovarianceScale = 10
- # kalman_fitter1.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool1
- trajectory_summary_writer_tool1 = CompFactory.RootTrajectorySummaryWriterTool()
- trajectory_summary_writer_tool1.FilePath = "track_summary_ckf1.root"
+ kalman_fitter1.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool1
kalman_fitter1.RootTrajectorySummaryWriterTool = trajectory_summary_writer_tool1
ckf.KalmanFitterTool1 = kalman_fitter1
kalman_fitter2 = CompFactory.KalmanFitterTool(name="fitterTool2", **kwargs)
+ kalman_fitter2.noDiagnostics = kwargs["noDiagnostics"]
kalman_fitter2.ActsLogging = "INFO"
kalman_fitter2.SummaryWriter = True
- # kalman_fitter2.StatesWriter = True
+ kalman_fitter2.StatesWriter = True
kalman_fitter2.SeedCovarianceScale = 1
- # kalman_fitter2.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool2
- trajectory_summary_writer_tool2 = CompFactory.RootTrajectorySummaryWriterTool(**kwargs)
- trajectory_summary_writer_tool2.FilePath = "track_summary_ckf2.root"
+ kalman_fitter2.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool2
kalman_fitter2.RootTrajectorySummaryWriterTool = trajectory_summary_writer_tool2
ckf.KalmanFitterTool2 = kalman_fitter2
ckf.TrackSeed = track_seed_tool
ckf.ActsLogging = "INFO"
- # ckf.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool
- trajectory_summary_writer_tool = CompFactory.RootTrajectorySummaryWriterTool(**kwargs)
+ ckf.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool
ckf.RootTrajectorySummaryWriterTool = trajectory_summary_writer_tool
- ckf.PerformanceWriterTool = performance_writer_tool
- ckf.nTrajectories = 1
+ ckf.PerformanceWriter = trajectory_performance_writer_tool
ckf.nMax = 10
ckf.chi2Max = 25
diff --git a/Tracking/Acts/FaserActsKalmanFilter/python/CombinatorialKalmanFilterConfig.py b/Tracking/Acts/FaserActsKalmanFilter/python/CombinatorialKalmanFilterConfig.py
index b3aa4a82..fac9e7ec 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/python/CombinatorialKalmanFilterConfig.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/python/CombinatorialKalmanFilterConfig.py
@@ -54,15 +54,12 @@ def CombinatorialKalmanFilterCfg(flags, **kwargs):
track_seed_tool.std_cluster = 0.023
track_seed_tool.origin = 0
- track_seed_writer_tool = CompFactory.TrackSeedWriterTool()
- track_seed_writer_tool.FilePath = "TrackSeeds.root"
-
trajectory_states_writer_tool = CompFactory.RootTrajectoryStatesWriterTool()
trajectory_states_writer_tool.noDiagnostics = kwargs["noDiagnostics"]
trajectory_states_writer_tool.MC = True
trajectory_summary_writer_tool = CompFactory.RootTrajectorySummaryWriterTool()
- trajectory_summary_writer_tool .noDiagnostics = kwargs["noDiagnostics"]
+ trajectory_summary_writer_tool.noDiagnostics = kwargs["noDiagnostics"]
actsExtrapolationTool = CompFactory.FaserActsExtrapolationTool("FaserActsExtrapolationTool")
actsExtrapolationTool.MaxSteps = 1000
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
index b6ece79b..355e4a93 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
@@ -45,27 +45,22 @@ CKF2::CKF2(
StatusCode CKF2::initialize() {
- ATH_CHECK(m_fieldCondObjInputKey.initialize());
- ATH_CHECK(m_trackingGeometryTool.retrieve());
- ATH_CHECK(m_trackSeedTool.retrieve());
- ATH_CHECK(m_trackSeedWriterTool.retrieve());
- std::cout << "?? retrieve m_kalmanFitterTool1.\n";
- ATH_CHECK(m_kalmanFitterTool1.retrieve());
- std::cout << "done.\n";
- std::cout << "?? retrieve m_kalmanFitterTool2.\n";
- ATH_CHECK(m_kalmanFitterTool2.retrieve());
- std::cout << "done.\n";
+ ATH_CHECK(m_fieldCondObjInputKey.initialize());
+ ATH_CHECK(m_trackingGeometryTool.retrieve());
+ ATH_CHECK(m_trackSeedTool.retrieve());
+ ATH_CHECK(m_kalmanFitterTool1.retrieve());
+ ATH_CHECK(m_kalmanFitterTool2.retrieve());
// ATH_CHECK(m_trackCollection.initialize());
- if (m_performanceWriter) {
- ATH_CHECK(m_performanceWriterTool.retrieve());
+ if (m_performanceWriter && !m_noDiagnostics) {
+ ATH_CHECK(m_performanceWriterTool.retrieve());
}
- if (m_statesWriter) {
- ATH_CHECK(m_trajectoryStatesWriterTool.retrieve());
+ if (m_statesWriter && !m_noDiagnostics) {
+ ATH_CHECK(m_trajectoryStatesWriterTool.retrieve());
}
- if (m_summaryWriter) {
- ATH_CHECK(m_trajectorySummaryWriterTool.retrieve());
+ if (m_summaryWriter && !m_noDiagnostics) {
+ ATH_CHECK(m_trajectorySummaryWriterTool.retrieve());
}
- ATH_CHECK(detStore()->retrieve(m_idHelper,"FaserSCT_ID"));
+ ATH_CHECK(detStore()->retrieve(m_idHelper,"FaserSCT_ID"));
m_fit = makeTrackFinderFunction(m_trackingGeometryTool->trackingGeometry(),
m_resolvePassive, m_resolveMaterial, m_resolveSensitive);
m_kf = makeTrackFitterFunction(m_trackingGeometryTool->trackingGeometry());
@@ -82,9 +77,6 @@ StatusCode CKF2::initialize() {
StatusCode CKF2::execute() {
- ATH_MSG_DEBUG(m_kalmanFitterTool1.name() << " " << m_kalmanFitterTool1.type() << " " << m_kalmanFitterTool1.propertyName() << " " << m_kalmanFitterTool1.messageName());
- ATH_MSG_DEBUG(m_kalmanFitterTool2.name() << " " << m_kalmanFitterTool2.type() << " " << m_kalmanFitterTool2.propertyName() << " " << m_kalmanFitterTool2.messageName());
-
const EventContext& ctx = Gaudi::Hive::currentContext();
ATH_CHECK(m_trackCollection.initialize());
@@ -118,8 +110,6 @@ StatusCode CKF2::execute() {
TrajectoryInfo::nClusters = sourceLinks->size();
- m_trackSeedWriterTool->writeout(geoctx, initialParameters);
-
TrajectoriesContainer trajectories;
trajectories.reserve(initialParameters->size());
@@ -152,7 +142,6 @@ StatusCode CKF2::execute() {
tmp.emplace_hint(tmp.end(), sl);
}
- ATH_MSG_DEBUG("?? initial parameters: ");
for (const auto& init : *initialParameters) {
ATH_MSG_DEBUG(" position: " << init.position(geoctx).transpose());
ATH_MSG_DEBUG(" momentum: " << init.momentum().transpose());
@@ -300,150 +289,15 @@ StatusCode CKF2::execute() {
}
}
-
- /*
- // create Trk::Tracks from the trajectories
- for (const FaserActsRecMultiTrajectory &traj : selectedTrajectories) {
-
- const auto params = traj.trackParameters(traj.tips().front());
- ATH_MSG_DEBUG("Fitted parameters");
- ATH_MSG_DEBUG(" params: " << params.parameters().transpose());
- ATH_MSG_DEBUG(" position: " << params.position(geoctx).transpose());
- ATH_MSG_DEBUG(" momentum: " << params.momentum().transpose());
- ATH_MSG_DEBUG(" charge: " << params.charge());
-
- std::unique_ptr<Trk::Track> track = makeTrack(geoctx, traj);
- if (track) {
- std::vector<const Tracker::FaserSCT_SpacePoint*> trajSpacePoints {};
- std::map<int, std::vector<Amg::Vector3D>> stationMap {};
- using ConstTrackStateProxy =
- Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
- traj.multiTrajectory().visitBackwards(traj.tips().front(), [&](const ConstTrackStateProxy& state) {
- if (state.referenceSurface().associatedDetectorElement() != nullptr && state.hasUncalibrated()) {
- uint32_t index = state.uncalibrated().index();
- const Tracker::FaserSCT_SpacePoint *sp = spacePoints->at(index);
- // FIXME check that there is only a single spacepoint per layer
- if (sp != nullptr && std::find(trajSpacePoints.begin(), trajSpacePoints.end(), sp) == trajSpacePoints.end()) {
- trajSpacePoints.push_back(sp);
- Identifier id = sp->cluster1()->identify();
- int station = m_idHelper->station(id);
- stationMap[station].push_back(sp->globalPosition());
- }
- }
- return;
- });
-
- if (stationMap.size() < 2) {
- break;
- }
- std::vector<Amg::Vector3D> hits {};
- int count = 0;
- for (const auto& i : stationMap) {
- Amg::Vector3D mean {0, 0, 0};
- for (const auto &hit : i.second) {
- mean += hit;
- }
- mean /= i.second.size();
- hits.push_back(mean);
- count++;
- if (count == 2) break;
- }
-
-
- Amg::Vector3D dir = hits[1] - hits[0];
- Acts::Vector3 mom {dir.x(), dir.y(), dir.z()};
-
- Amg::Vector3D initPos = hits[0] - (hits[0].z() - 0)/dir.z() * dir;
-
- CircleData circleData(trajSpacePoints);
- Circle circle = CircleFit(circleData);
- double momentum = circle.r * 0.001 * 0.3 * 0.55;
- double charge = circle.cy > 0 ? 1 : -1;
-
- Acts::BoundVector params;
- auto theta = Acts::VectorHelpers::theta(mom.normalized());
- auto phi = Acts::VectorHelpers::phi(mom.normalized());
-
- params(0.0) = initPos.y();
- params(1.0) = initPos.x();
- params(2.0) = phi;
- params(3.0) = theta;
- params(4.0) = charge / momentum;
- params(5.0) = 0.;
-
- std::cout << "??momentum: " << charge << " " << momentum << std::endl;
- std::cout << params(0.0) << " " << params(1.0) << " " << params(2.0) << " " << params(3.0) << " " << params(4.0) << std::endl;
-
- std::unique_ptr<Trk::Track> track2 = m_kalmanFitterTool1->fit(ctx, *track, params, trajectories, traj.trackParameters(traj.tips().front()).charge());
- if (track2) {
- outputTracks->push_back(std::move(track2));
- }
- }
- }
- */
-
- /*
-
- // Loop over the track finding results for all initial parameters
- for (std::size_t iseed = 0; iseed < selectedResults.size(); ++iseed) {
- // The result for this seed
- auto& result = selectedResults[iseed];
- if (result.ok()) {
- // Get the track finding output object
- const auto& trackFindingOutput = result.value();
- double charge = 1;
- if (!trackFindingOutput.fittedParameters.empty()) {
- const std::unordered_map<size_t, Acts::BoundTrackParameters>& params = trackFindingOutput.fittedParameters;
- for (const auto& surface_params : params) {
- ATH_MSG_VERBOSE("Fitted parameters for track " << iseed << ", surface " << surface_params.first);
- ATH_MSG_VERBOSE(" params: " << surface_params.second.parameters().transpose());
- ATH_MSG_VERBOSE(" position: " << surface_params.second.position(geoctx).transpose());
- ATH_MSG_VERBOSE(" momentum: " << surface_params.second.momentum().transpose());
- ATH_MSG_VERBOSE(" charge: " << surface_params.second.charge());
- charge = surface_params.second.charge();
- }
- } else {
- ATH_MSG_DEBUG("No fitted parameters for track " << iseed);
- }
- ATH_MSG_DEBUG("?? add to trajectories");
- trajectories.emplace_back(trackFindingOutput.fittedStates,
- trackFindingOutput.lastMeasurementIndices,
- trackFindingOutput.fittedParameters);
-
- std::unique_ptr<Trk::Track> track = makeTrack(geoctx, result);
- // refit the track using the Kalman Filter
- std::unique_ptr<Trk::Track> track2 = m_kalmanFitterTool1->fit(ctx, *track, trajectories, charge);
-
-// std::unique_ptr<Trk::Track> track3 = m_kalmanFitterTool2->fit(ctx, *track2, trajectories, charge);
-//
-// if (track3) {
-// outputTracks->push_back(std::move(track3));
-// } else if (track2) {
- if (track2) {
- outputTracks->push_back(std::move(track2));
- } else if (track) {
- outputTracks->push_back(std::move(track));
- } else {
- ATH_MSG_WARNING("Could not create Track");
- }
- } else {
- ATH_MSG_WARNING("Track finding failed for seed " << iseed << " with error" << result.error());
- // Track finding failed. Add an empty result so the output container has
- // the same number of entries as the input.
- trajectories.push_back(FaserActsRecMultiTrajectory());
- }
- }
- */
-
- if (m_statesWriter) {
- ATH_CHECK(m_trajectoryStatesWriterTool->write(geoctx, selectedTrajectories));
+ // run the performance writer
+ if (m_statesWriter && !m_noDiagnostics) {
+ ATH_CHECK(m_trajectoryStatesWriterTool->write(geoctx, selectedTrajectories));
}
- if (m_summaryWriter) {
- ATH_MSG_DEBUG("?? write trajectories");
- ATH_CHECK(m_trajectorySummaryWriterTool->write(geoctx, selectedTrajectories));
+ if (m_summaryWriter && !m_noDiagnostics) {
+ ATH_CHECK(m_trajectorySummaryWriterTool->write(geoctx, selectedTrajectories));
}
- if (m_performanceWriter) {
- ATH_CHECK(m_performanceWriterTool->write(geoctx, selectedTrajectories));
+ if (m_performanceWriter && !m_noDiagnostics) {
+ ATH_CHECK(m_performanceWriterTool->write(geoctx, selectedTrajectories));
}
ATH_CHECK(trackContainer.record(std::move(outputTracks)));
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
index 2cacbeda..2ee66e27 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
@@ -37,15 +37,14 @@ StatusCode CombinatorialKalmanFilterAlg::initialize() {
ATH_CHECK(m_fieldCondObjInputKey.initialize());
ATH_CHECK(m_trackingGeometryTool.retrieve());
ATH_CHECK(m_trackSeedTool.retrieve());
- ATH_CHECK(m_trackSeedWriterTool.retrieve());
// ATH_CHECK(m_trackCollection.initialize());
- if (m_performanceWriter) {
+ if (m_performanceWriter && !m_noDiagnostics) {
ATH_CHECK(m_performanceWriterTool.retrieve());
}
- if (m_statesWriter) {
+ if (m_statesWriter && !m_noDiagnostics) {
ATH_CHECK(m_trajectoryStatesWriterTool.retrieve());
}
- if (m_summaryWriter) {
+ if (m_summaryWriter && !m_noDiagnostics) {
ATH_CHECK(m_trajectorySummaryWriterTool.retrieve());
}
ATH_CHECK(detStore()->retrieve(m_idHelper,"FaserSCT_ID"));
@@ -93,8 +92,6 @@ StatusCode CombinatorialKalmanFilterAlg::execute() {
TrajectoryInfo::nClusters = sourceLinks->size();
- m_trackSeedWriterTool->writeout(geoctx, initialParameters);
-
TrajectoriesContainer trajectories;
trajectories.reserve(initialParameters->size());
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
index b461d989..686047ae 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
@@ -17,15 +17,15 @@ KalmanFitterTool::KalmanFitterTool(const std::string& type, const std::string& n
StatusCode KalmanFitterTool::initialize() {
- ATH_CHECK(m_fieldCondObjInputKey.initialize());
- ATH_CHECK(m_trackingGeometryTool.retrieve());
- ATH_CHECK(m_trajectoryStatesWriterTool.retrieve());
- ATH_CHECK(m_trajectorySummaryWriterTool.retrieve());
- ATH_CHECK(detStore()->retrieve(m_idHelper,"FaserSCT_ID"));
+ ATH_CHECK(m_fieldCondObjInputKey.initialize());
+ ATH_CHECK(m_trackingGeometryTool.retrieve());
+ ATH_CHECK(detStore()->retrieve(m_idHelper,"FaserSCT_ID"));
+ if (m_statesWriter && !m_noDiagnostics) ATH_CHECK(m_trajectoryStatesWriterTool.retrieve());
+ if (m_summaryWriter && !m_noDiagnostics) ATH_CHECK(m_trajectorySummaryWriterTool.retrieve());
m_fit = makeTrackFitterFunction(m_trackingGeometryTool->trackingGeometry());
- if (m_actsLogging == "VERBOSE") {
+ if (m_actsLogging == "VERBOSE" && !m_noDiagnostics) {
m_logger = Acts::getDefaultLogger("KalmanFitter", Acts::Logging::VERBOSE);
- } else if (m_actsLogging == "DEBUG") {
+ } else if (m_actsLogging == "DEBUG" && !m_noDiagnostics) {
m_logger = Acts::getDefaultLogger("KalmanFitter", Acts::Logging::DEBUG);
} else {
m_logger = Acts::getDefaultLogger("KalmanFitter", Acts::Logging::INFO);
@@ -107,12 +107,10 @@ KalmanFitterTool::fit(const EventContext &ctx, const Trk::Track &inputTrack,
newTrack = makeTrack(gctx, result);
}
- ATH_MSG_DEBUG("?? running states writer " << m_trajectoryStatesWriterTool.name() << " " << m_trajectoryStatesWriterTool.propertyName());
- if (m_statesWriter) {
+ if (m_statesWriter && !m_noDiagnostics) {
StatusCode statusStatesWriterTool = m_trajectoryStatesWriterTool->write(gctx, myTrajectories);
}
- if (m_summaryWriter) {
- std::cout << "?? summary Writer KalmanFitterTool\n";
+ if (m_summaryWriter && !m_noDiagnostics) {
StatusCode statusSummaryWriterTool = m_trajectorySummaryWriterTool->write(gctx, myTrajectories);
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
index b01d58ed..c545c551 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
@@ -11,23 +11,23 @@ PerformanceWriterTool::PerformanceWriterTool(
StatusCode PerformanceWriterTool::initialize() {
- if (!m_noDiagnostics) {
ATH_CHECK(m_extrapolationTool.retrieve());
ATH_CHECK(m_mcEventCollectionKey.initialize());
ATH_CHECK(m_simDataCollectionKey.initialize());
- std::string filePath = m_filePath;
- m_outputFile = TFile::Open(filePath.c_str(), "RECREATE");
- if (m_outputFile == nullptr) {
- ATH_MSG_WARNING("Unable to open output file at " << m_filePath);
- return StatusCode::RECOVERABLE;
+ if (!m_noDiagnostics) {
+ std::string filePath = m_filePath;
+ m_outputFile = TFile::Open(filePath.c_str(), "RECREATE");
+ if (m_outputFile == nullptr) {
+ ATH_MSG_WARNING("Unable to open output file at " << m_filePath);
+ return StatusCode::RECOVERABLE;
+ }
}
// initialize the residual and efficiency plots tool
m_resPlotTool.book(m_resPlotCache);
m_effPlotTool.book(m_effPlotCache);
m_summaryPlotTool.book(m_summaryPlotCache);
- }
return StatusCode::SUCCESS;
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
index b857ce47..634e356a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
@@ -23,13 +23,13 @@ RootTrajectoryStatesWriterTool::RootTrajectoryStatesWriterTool(
: AthAlgTool(type, name, parent) {}
StatusCode RootTrajectoryStatesWriterTool::initialize() {
- if (!m_noDiagnostics) {
- ATH_CHECK(m_mcEventCollectionKey.initialize());
- ATH_CHECK(m_simDataCollectionKey.initialize());
- ATH_CHECK(m_faserSiHitKey.initialize());
- ATH_CHECK(detStore()->retrieve(m_idHelper, "FaserSCT_ID"));
- ATH_CHECK(detStore()->retrieve(m_detMgr, "SCT"));
+ ATH_CHECK(m_mcEventCollectionKey.initialize());
+ ATH_CHECK(m_simDataCollectionKey.initialize());
+ ATH_CHECK(m_faserSiHitKey.initialize());
+ ATH_CHECK(detStore()->retrieve(m_idHelper, "FaserSCT_ID"));
+ ATH_CHECK(detStore()->retrieve(m_detMgr, "SCT"));
+ if (!m_noDiagnostics) {
std::string filePath = m_filePath;
std::string treeName = m_treeName;
m_outputFile = TFile::Open(filePath.c_str(), "RECREATE");
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
index 2d8765e3..bb916b9b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
@@ -32,11 +32,11 @@ RootTrajectorySummaryWriterTool::RootTrajectorySummaryWriterTool(
StatusCode RootTrajectorySummaryWriterTool::initialize() {
- if (!m_noDiagnostics) {
- ATH_CHECK(m_simDataCollectionKey.initialize());
- ATH_CHECK(m_mcEventCollectionKey.initialize());
- ATH_CHECK(detStore()->retrieve(m_idHelper, "FaserSCT_ID"));
+ ATH_CHECK(m_simDataCollectionKey.initialize());
+ ATH_CHECK(m_mcEventCollectionKey.initialize());
+ ATH_CHECK(detStore()->retrieve(m_idHelper, "FaserSCT_ID"));
+ if (!m_noDiagnostics) {
std::string filePath = m_filePath;
std::string treeName = m_treeName;
m_outputFile = TFile::Open(filePath.c_str(), "RECREATE");
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
index cc7dc341..5d41a03a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
@@ -22,7 +22,7 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
ConfigFlags.GeoModel.FaserVersion = "FASER-01"
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
-# ConfigFlags.TrackingGeometry.MaterialSource = "Input"
+ConfigFlags.TrackingGeometry.MaterialSource = "Input"
ConfigFlags.lock()
acc = MainServicesCfg(ConfigFlags)
@@ -32,8 +32,7 @@ acc.merge(PoolReadCfg(ConfigFlags))
acc.merge(FaserSCT_ClusterizationCfg(ConfigFlags))
acc.merge(TrackerSpacePointFinderCfg(ConfigFlags))
acc.merge(SegmentFitAlgCfg(ConfigFlags, SharedHitFraction=0.51, MinClustersPerFit=5, TanThetaCut=0.25))
-acc.merge(CKF2Cfg(ConfigFlags))
-acc.getEventAlgo("CKF2").OutputLevel = VERBOSE
+acc.merge(CKF2Cfg(ConfigFlags, noDiagnostics=True))
# logging.getLogger('forcomps').setLevel(VERBOSE)
# acc.foreach_component("*").OutputLevel = VERBOSE
@@ -43,5 +42,5 @@ acc.getEventAlgo("CKF2").OutputLevel = VERBOSE
# acc.printConfig(withDetails=True)
# ConfigFlags.dump()
-sc = acc.run(maxEvents=200)
+sc = acc.run(maxEvents=-1)
sys.exit(not sc.isSuccess())
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
index 102eb3b3..308d6f1c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
@@ -32,7 +32,7 @@ acc.merge(PoolReadCfg(ConfigFlags))
acc.merge(FaserSCT_ClusterizationCfg(ConfigFlags))
acc.merge(TrackerSpacePointFinderCfg(ConfigFlags))
acc.merge(SegmentFitAlgCfg(ConfigFlags, SharedHitFraction=0.51, MinClustersPerFit=5, TanThetaCut=0.25))
-acc.merge(CombinatorialKalmanFilterCfg(ConfigFlags))
+acc.merge(CombinatorialKalmanFilterCfg(ConfigFlags, noDiagnostics=True))
acc.getEventAlgo("CombinatorialKalmanFilterAlg").OutputLevel = VERBOSE
# logging.getLogger('forcomps').setLevel(INFO)
diff --git a/Tracking/Acts/README.md b/Tracking/Acts/README.md
index 2a0874fc..5b4c2435 100644
--- a/Tracking/Acts/README.md
+++ b/Tracking/Acts/README.md
@@ -6,3 +6,13 @@
3) To write the tracking geometry, type the command: FaserActsWriteTrackingGeometry.py
4) To run the extrapolator, type the command: FaserActsExtrapolationAlg.py
+
+5) The track finding requires a json file with the correct material in the directory in which you run it. A copy can be found on lxplus: /afs/cern.ch/user/t/tboeckh/public/material/material-maps.json
+ If you do not want to use the material you have to comment out this line: ConfigFlags.TrackingGeometry.MaterialSource = "Input"
+
+6) To enable additional output set the noDiagnostics flag to False
+
+7) To do the track finding, type the command: CombinatorialKalmanFilterAlg.py
+
+8) To do the track finding and re-fit the best tracks, type the command: CKF2.py
+ (this is the recommended approach)
--
GitLab