From b760e26f201b8090cd12e9c5366b7597c0ddd62a Mon Sep 17 00:00:00 2001
From: Maximilian Emanuel Goblirsch-Kolb <maximilian.goblirsch-kolb@cern.ch>
Date: Fri, 29 Mar 2024 17:49:54 +0100
Subject: [PATCH] refine Phase-2 eta hough transform
refine Phase-2 eta hough transform
---
.../src/MuonHoughTransformAlg.cxx | 37 ++++++++++++-------
.../src/MuonHoughTransformAlg.h | 6 +++
.../src/MdtEtaTransformTester.cxx | 4 +-
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.cxx b/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.cxx
index 1829f6fe806e..fbfa5184c25e 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.cxx
+++ b/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.cxx
@@ -78,9 +78,15 @@ StatusCode MuonHoughTransformAlg::execute(const EventContext& ctx) const {
for (const MuonR4::MuonSpacePointBucket* sp : spacePoints){
std::vector<HoughSpaceInBucket>& buckets = data.houghSpaces[sp->front()->muonChamber()];
buckets.push_back(
- HoughSpaceInBucket{sp,}
+ HoughSpaceInBucket{sp}
);
- /// TODO: Update search window to fine-tune tanTheta
+ HoughSpaceInBucket& hs = buckets.back();
+ Amg::Vector3D leftSide = hs.bucket->muonChamber()->globalToLocalTrans(data.gctx).translation() - (hs.bucket->coveredMin() * Amg::Vector3D::UnitY());
+ Amg::Vector3D rightSide = hs.bucket->muonChamber()->globalToLocalTrans(data.gctx).translation() - (hs.bucket->coveredMax() * Amg::Vector3D::UnitY());
+ const double tanThetaLeft = leftSide.y() / leftSide.z() ;
+ const double tanThetaRight = rightSide.y() / rightSide.z();
+ hs.seachWindowTanTheta = {tanThetaLeft, tanThetaRight};
+ hs.searchWindowZ= {hs.bucket->coveredMin() , hs.bucket->coveredMax()};
}
return StatusCode::SUCCESS;
}
@@ -88,8 +94,8 @@ StatusCode MuonHoughTransformAlg::execute(const EventContext& ctx) const {
StatusCode MuonHoughTransformAlg::prepareHoughPlane(MuonHoughEventData & data) const{
HoughPlaneConfig cfg;
- cfg.nBinsX = 100;
- cfg.nBinsY = 100;
+ cfg.nBinsX = m_nBinsTanTheta;
+ cfg.nBinsY = m_nBinsZ0;
ActsPeakFinderForMuonCfg peakFinderCfg;
peakFinderCfg.fractionCutoff = 0.7;
peakFinderCfg.threshold = 3;
@@ -109,19 +115,24 @@ StatusCode MuonHoughTransformAlg::prepareStation(MuonHoughEventData & data, cons
HoughSpaceInBucket& bucket) const{
/// tune the search space
- double chamberCenter = 0.5 * (bucket.bucket->coveredMin() + bucket.bucket->coveredMax());
- // TODO: This will become a configurable property
- double targetReso = 10.; // 1 cm target resolution in y0
+ double chamberCenter = 0.5 * (bucket.searchWindowZ.first +bucket.searchWindowZ.second);
// build a symmetric window around the (geometric) chamber center so that the bin width is equivalent
// to our target resolution
- // TODO: Properly pass binning instead of hardcoding nBins...
- double searchStart = chamberCenter - 0.5 * 100 * targetReso;
- double searchEnd = chamberCenter + 0.5 * 100 * targetReso;
+ double searchStart = chamberCenter - 0.5 * data.houghPlane->nBinsY() * m_targetResoZ0;
+ double searchEnd = chamberCenter + 0.5 * data.houghPlane->nBinsY() * m_targetResoZ0;
// Protection for very wide buckets - if the search space does not cover all of the bucket, widen the bin size
// so that we cover everything
- searchStart = std::min(searchStart, bucket.bucket->coveredMin() - 5. * targetReso);
- searchEnd = std::max(searchEnd, bucket.bucket->coveredMax() + 5. * targetReso);
- data.currAxisRanges = Acts::HoughTransformUtils::HoughAxisRanges{-2, 2,
+ searchStart = std::min(searchStart, bucket.searchWindowZ.first- 2. * m_targetResoZ0);
+ searchEnd = std::max(searchEnd, bucket.searchWindowZ.second + 2. * m_targetResoZ0);
+ // also treat tan(theta)
+ double tanThetaMean = 0.5 * (bucket.seachWindowTanTheta.first + bucket.seachWindowTanTheta.second);
+ double searchStartTanTheta = tanThetaMean - 0.5 * data.houghPlane->nBinsX() * m_targetResoTanTheta;
+ double searchEndTanTheta = tanThetaMean + 0.5* data.houghPlane->nBinsX() * m_targetResoTanTheta;
+ searchStartTanTheta = std::min(searchStartTanTheta, bucket.seachWindowTanTheta.first- 2. * m_targetResoTanTheta);
+ searchEndTanTheta = std::max(searchEndTanTheta, bucket.seachWindowTanTheta.second + 2. * m_targetResoTanTheta);
+
+
+ data.currAxisRanges = Acts::HoughTransformUtils::HoughAxisRanges{searchStartTanTheta, searchEndTanTheta,
searchStart, searchEnd
};
data.houghPlane->reset();
diff --git a/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.h b/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.h
index 4052eb698d92..a7d4e65ea461 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.h
+++ b/MuonSpectrometer/MuonPhaseII/MuonPatternRecognition/MuonPatternRecognitionAlgs/src/MuonHoughTransformAlg.h
@@ -18,6 +18,7 @@
#include <MuonSpacePoint/MuonSpacePointContainer.h>
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "MuonHoughEventData.h"
+#include "Gaudi/Property.h"
// muon includes
@@ -54,6 +55,11 @@ namespace MuonR4{
void fillFromSpacePoint(MuonHoughEventData & data,
const MuonR4::HoughHitType & SP) const;
+ DoubleProperty m_targetResoTanTheta{this, "ResolutionTargetTanTheta", 0.02};
+ DoubleProperty m_targetResoZ0{this, "ResolutionTargetZ0", 10.};
+ IntegerProperty m_nBinsTanTheta{this, "nBinsTanTheta", 10};
+ IntegerProperty m_nBinsZ0{this, "nBinsZ0", 100};
+
SG::ReadHandleKey<MuonR4::MuonSpacePointContainer> m_spacePointKey{this, "SpacePointContainer", "MuonSpacePoints"};
// TODO: Other technologies to join once their EDM exists
diff --git a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/src/MdtEtaTransformTester.cxx b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/src/MdtEtaTransformTester.cxx
index 5ad96137caac..32f13ba6511f 100644
--- a/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/src/MdtEtaTransformTester.cxx
+++ b/MuonSpectrometer/MuonPhaseII/MuonValidation/MuonPatternRecognitionTest/src/MdtEtaTransformTester.cxx
@@ -5,6 +5,7 @@
#include "MdtEtaTransformTester.h"
#include "MuonReadoutGeometryR4/MuonChamber.h"
#include "StoreGate/ReadCondHandle.h"
+#include "GeoModelHelpers/throwExcept.h"
#include "TCanvas.h"
#include "TLine.h"
#include "TArrow.h"
@@ -57,7 +58,6 @@ namespace MuonValR4 {
SG::ReadCondHandle<ActsGeometryContext> gctxHandle{m_geoCtxKey, context};
ATH_CHECK(gctxHandle.isValid());
const ActsGeometryContext& gctx{**gctxHandle};
-
// retrieve the two input collections
auto simHitCollections = m_inSimHitKeys.makeHandles(context);
@@ -329,7 +329,7 @@ namespace MuonValR4 {
mrk->SetMarkerColor(kOrange-3);
mrk->Draw();
primitives.emplace_back(std::move(mrk));
- auto trajectory = std::make_unique<TArrow>( foundMax->getY(), 0., foundMax->getY() + 0.3 * frameWidth * m_out_max_tantheta.getVariable(), 0.3 * frameWidth);
+ auto trajectory = std::make_unique<TArrow>( foundMax->getY(), 0., foundMax->getY() + 0.3 * frameWidth * foundMax->getX(), 0.3 * frameWidth);
trajectory->SetLineColor(kOrange-3);
trajectory->Draw();
primitives.push_back(std::move(trajectory));
--
GitLab