Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(gx2f): early exit for the Actor #3566

Merged
merged 7 commits into from
Aug 28, 2024
Merged

refactor(gx2f): early exit for the Actor #3566

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc5689c
shift
AJPfleger Aug 27, 2024
9f23b75
Merge branch 'main' into gx2f-actor-shift-more
AJPfleger Aug 27, 2024
7ea918b
Merge branch 'main' into gx2f-actor-shift-more
kodiakhq[bot] Aug 27, 2024
9772a8e
Merge branch 'main' into gx2f-actor-shift-more
AJPfleger Aug 28, 2024
aae480a
Merge branch 'main' into gx2f-actor-shift-more
asalzburger Aug 28, 2024
ab3fd51
Merge branch 'main' into gx2f-actor-shift-more
AJPfleger Aug 28, 2024
aab8ebd
Merge branch 'main' into gx2f-actor-shift-more
kodiakhq[bot] Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
325 changes: 168 additions & 157 deletions Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,179 +464,190 @@ class Gx2Fitter {
}
result.startVolume = state.navigation.startVolume;

// Update:
// - Waiting for a current surface
// We are only interested in surfaces. If we are not on a surface, we
// continue the navigation
auto surface = navigator.currentSurface(state.navigation);
if (surface != nullptr) {
++result.surfaceCount;
const GeometryIdentifier geoId = surface->geometryId();
ACTS_DEBUG("Surface " << geoId << " detected.");
const bool surfaceIsSensitive =
(surface->associatedDetectorElement() != nullptr);
const bool surfaceHasMaterial = (surface->surfaceMaterial() != nullptr);
const bool doMaterial = multipleScattering && surfaceHasMaterial;

// Found material
if (doMaterial) {
ACTS_DEBUG(" The surface contains material, ...");
}
if (surface == nullptr) {
return;
}

++result.surfaceCount;
const GeometryIdentifier geoId = surface->geometryId();
ACTS_DEBUG("Surface " << geoId << " detected.");
const bool surfaceIsSensitive =
(surface->associatedDetectorElement() != nullptr);
const bool surfaceHasMaterial = (surface->surfaceMaterial() != nullptr);
const bool doMaterial = multipleScattering && surfaceHasMaterial;

// Found material
if (doMaterial) {
ACTS_DEBUG(" The surface contains material, ...");
}

// Check if we have a measurement surface
if (auto sourcelink_it = inputMeasurements->find(geoId);
sourcelink_it != inputMeasurements->end()) {
ACTS_DEBUG(" The surface contains a measurement.");

// Transport the covariance to the surface
stepper.transportCovarianceToBound(state.stepping, *surface,
freeToBoundCorrection);

// TODO generalize the update of the currentTrackIndex
auto& fittedStates = *result.fittedStates;

// Add a <trackStateMask> TrackState entry multi trajectory. This
// allocates storage for all components, which we will set later.
typename traj_t::TrackStateProxy trackStateProxy =
fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
result.lastTrackIndex);
const std::size_t currentTrackIndex = trackStateProxy.index();

// Set the trackStateProxy components with the state from the ongoing
// propagation
{
trackStateProxy.setReferenceSurface(surface->getSharedPtr());
// Bind the transported state to the current surface
auto res = stepper.boundState(state.stepping, *surface, false,
freeToBoundCorrection);
if (!res.ok()) {
result.result = res.error();
return;
}
const auto& [boundParams, jacobian, pathLength] = *res;

// Fill the track state
trackStateProxy.predicted() = boundParams.parameters();
trackStateProxy.predictedCovariance() = state.stepping.cov;

trackStateProxy.jacobian() = jacobian;
trackStateProxy.pathLength() = pathLength;
// Here we handle all measurements
if (auto sourcelink_it = inputMeasurements->find(geoId);
sourcelink_it != inputMeasurements->end()) {
ACTS_DEBUG(" The surface contains a measurement.");

// Transport the covariance to the surface
stepper.transportCovarianceToBound(state.stepping, *surface,
freeToBoundCorrection);

// TODO generalize the update of the currentTrackIndex
auto& fittedStates = *result.fittedStates;

// Add a <trackStateMask> TrackState entry multi trajectory. This
// allocates storage for all components, which we will set later.
typename traj_t::TrackStateProxy trackStateProxy =
fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
result.lastTrackIndex);
const std::size_t currentTrackIndex = trackStateProxy.index();

// Set the trackStateProxy components with the state from the ongoing
// propagation
{
trackStateProxy.setReferenceSurface(surface->getSharedPtr());
// Bind the transported state to the current surface
auto res = stepper.boundState(state.stepping, *surface, false,
freeToBoundCorrection);
if (!res.ok()) {
result.result = res.error();
return;
}
const auto& [boundParams, jacobian, pathLength] = *res;

// We have predicted parameters, so calibrate the uncalibrated input
// measurement
extensions.calibrator(state.geoContext, *calibrationContext,
sourcelink_it->second, trackStateProxy);
// Fill the track state
trackStateProxy.predicted() = boundParams.parameters();
trackStateProxy.predictedCovariance() = state.stepping.cov;

// Get and set the type flags
auto typeFlags = trackStateProxy.typeFlags();
typeFlags.set(TrackStateFlag::ParameterFlag);
if (surfaceHasMaterial) {
typeFlags.set(TrackStateFlag::MaterialFlag);
}
trackStateProxy.jacobian() = jacobian;
trackStateProxy.pathLength() = pathLength;
}

// We have predicted parameters, so calibrate the uncalibrated input
// measurement
extensions.calibrator(state.geoContext, *calibrationContext,
sourcelink_it->second, trackStateProxy);

// Get and set the type flags
auto typeFlags = trackStateProxy.typeFlags();
typeFlags.set(TrackStateFlag::ParameterFlag);
if (surfaceHasMaterial) {
typeFlags.set(TrackStateFlag::MaterialFlag);
}

// Set the measurement type flag
typeFlags.set(TrackStateFlag::MeasurementFlag);
// We count the processed measurement
++result.processedMeasurements;

result.lastMeasurementIndex = currentTrackIndex;
result.lastTrackIndex = currentTrackIndex;

// TODO check for outlier first
// We count the state with measurement
++result.measurementStates;

// We count the processed state
++result.processedStates;

// Update the number of holes count only when encountering a
// measurement
result.measurementHoles = result.missedActiveSurfaces.size();

return;
}

// Here we handle material for multipleScattering. If holes exist, we also
// handle them already. We create a full trackstate (unlike for simple
// holes), since we need to evaluate the material later
if (doMaterial) {
// TODO add material handling
ACTS_DEBUG(
" The surface contains no measurement, but material and maybe "
"a hole.");

return;
}

// Set the measurement type flag
typeFlags.set(TrackStateFlag::MeasurementFlag);
// We count the processed measurement
++result.processedMeasurements;

result.lastMeasurementIndex = currentTrackIndex;
result.lastTrackIndex = currentTrackIndex;

// TODO check for outlier first
// We count the state with measurement
++result.measurementStates;

// We count the processed state
++result.processedStates;

// Update the number of holes count only when encountering a
// measurement
result.measurementHoles = result.missedActiveSurfaces.size();
} else if (doMaterial) {
// Here we handle material for multipleScattering. If holes exist, we
// also handle them already. We create a full trackstate (unlike for
// simple holes), since we need to evaluate the material later
// TODO add material handling
// Here we handle holes. If material hasn't been handled before (because
// multipleScattering is turned off), we will also handle it here
if (surfaceIsSensitive || surfaceHasMaterial) {
if (multipleScattering) {
ACTS_DEBUG(
" The surface contains no measurement, but material and maybe "
"a hole.");
} else if (surfaceIsSensitive || surfaceHasMaterial) {
// Here we handle holes. If material hasn't been handled before
// (because multipleScattering is turned off), we will also handle it
// here
if (multipleScattering) {
ACTS_DEBUG(
" The surface contains no measurement, but maybe a hole.");
} else {
ACTS_DEBUG(
" The surface contains no measurement, but maybe a hole "
"and/or material.");
}
" The surface contains no measurement, but maybe a hole.");
} else {
ACTS_DEBUG(
" The surface contains no measurement, but maybe a hole "
"and/or material.");
}

// We only create track states here if there is already a measurement
// detected (no holes before the first measurement) or if we encounter
// material
const bool precedingMeasurementExists =
(result.measurementStates > 0);
if (!precedingMeasurementExists && !surfaceHasMaterial) {
ACTS_DEBUG(
" Ignoring hole, because there are no preceding "
"measurements.");
return;
}
// We only create track states here if there is already a measurement
// detected (no holes before the first measurement) or if we encounter
// material
const bool precedingMeasurementExists = (result.measurementStates > 0);
if (!precedingMeasurementExists && !surfaceHasMaterial) {
ACTS_DEBUG(
" Ignoring hole, because there are no preceding "
"measurements.");
return;
}

auto& fittedStates = *result.fittedStates;

// Add a <trackStateMask> TrackState entry multi trajectory. This
// allocates storage for all components, which we will set later.
typename traj_t::TrackStateProxy trackStateProxy =
fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
result.lastTrackIndex);
const std::size_t currentTrackIndex = trackStateProxy.index();

// Set the trackStateProxy components with the state from the
// ongoing propagation
{
trackStateProxy.setReferenceSurface(surface->getSharedPtr());
// Bind the transported state to the current surface
auto res = stepper.boundState(state.stepping, *surface, false,
freeToBoundCorrection);
if (!res.ok()) {
result.result = res.error();
return;
}
const auto& [boundParams, jacobian, pathLength] = *res;

// Fill the track state
trackStateProxy.predicted() = boundParams.parameters();
trackStateProxy.predictedCovariance() = state.stepping.cov;

trackStateProxy.jacobian() = jacobian;
trackStateProxy.pathLength() = pathLength;
auto& fittedStates = *result.fittedStates;

// Add a <trackStateMask> TrackState entry multi trajectory. This
// allocates storage for all components, which we will set later.
typename traj_t::TrackStateProxy trackStateProxy =
fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
result.lastTrackIndex);
const std::size_t currentTrackIndex = trackStateProxy.index();

// Set the trackStateProxy components with the state from the
// ongoing propagation
{
trackStateProxy.setReferenceSurface(surface->getSharedPtr());
// Bind the transported state to the current surface
auto res = stepper.boundState(state.stepping, *surface, false,
freeToBoundCorrection);
if (!res.ok()) {
result.result = res.error();
return;
}
const auto& [boundParams, jacobian, pathLength] = *res;

// Get and set the type flags
auto typeFlags = trackStateProxy.typeFlags();
typeFlags.set(TrackStateFlag::ParameterFlag);
if (surfaceHasMaterial) {
ACTS_DEBUG(" It is material.");
typeFlags.set(TrackStateFlag::MaterialFlag);
}
// Fill the track state
trackStateProxy.predicted() = boundParams.parameters();
trackStateProxy.predictedCovariance() = state.stepping.cov;

// Set hole only, if we are on a sensitive surface
if (surfaceIsSensitive && precedingMeasurementExists) {
ACTS_DEBUG(" It is a hole.");
typeFlags.set(TrackStateFlag::HoleFlag);
// Count the missed surface
result.missedActiveSurfaces.push_back(surface);
}
trackStateProxy.jacobian() = jacobian;
trackStateProxy.pathLength() = pathLength;
}

result.lastTrackIndex = currentTrackIndex;
// Get and set the type flags
auto typeFlags = trackStateProxy.typeFlags();
typeFlags.set(TrackStateFlag::ParameterFlag);
if (surfaceHasMaterial) {
ACTS_DEBUG(" It is material.");
typeFlags.set(TrackStateFlag::MaterialFlag);
}

++result.processedStates;
} else {
ACTS_DEBUG(" The surface contains no measurement/material/hole.");
// Set hole only, if we are on a sensitive surface
if (surfaceIsSensitive && precedingMeasurementExists) {
ACTS_DEBUG(" It is a hole.");
typeFlags.set(TrackStateFlag::HoleFlag);
// Count the missed surface
result.missedActiveSurfaces.push_back(surface);
}

result.lastTrackIndex = currentTrackIndex;

++result.processedStates;

return;
}

ACTS_DEBUG(" The surface contains no measurement/material/hole.");
return;
}
};

Expand Down
Loading