Skip to content

[ITS3] Fix Y position of ITS3 clusters and hits #14483

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

Merged
fgrosa merged 4 commits into from
Jul 8, 2025
Merged

[ITS3] Fix Y position of ITS3 clusters and hits #14483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fe4a21
Fix Y position of ITS3 clusters and hits
fgrosa Jul 4, 2025
cf52b0e
Please consider the following formatting changes
alibuild Jul 4, 2025
23b11a6
Merge pull request #23 from alibuild/alibot-cleanup-14483
fgrosa Jul 4, 2025
b89669a
Fix namespace
fgrosa Jul 7, 2025
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
3 changes: 1 addition & 2 deletions Detectors/Upgrades/ITS3/base/include/ITS3Base/SpecsV2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ namespace apts
{
constexpr double pitchX{15.0 * mu};
constexpr double pitchZ{15.0 * mu};
constexpr double responseUpperLimit{10 * mu};
constexpr double responseYShift{responseUpperLimit - silicon::thicknessOut};
constexpr double responseYShift{15.5 * mu};
} // namespace apts
namespace moss
{
Expand Down
45 changes: 25 additions & 20 deletions Detectors/Upgrades/ITS3/macros/test/CheckClustersITS3.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,28 +225,33 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
locH = gman->getMatrixL2G(chipID) ^ (hit.GetPos()); // inverse conversion from global to local
locHsta = gman->getMatrixL2G(chipID) ^ (hit.GetPosStart());

float x0 = locHsta.X(), dltx = locH.X() - x0;
float y0 = locHsta.Y(), dlty = locH.Y() - y0;
float z0 = locHsta.Z(), dltz = locH.Z() - z0;
auto r = (0.5 * (Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff) - y0) / dlty;

if (!isIB) {
locH.SetXYZ(x0 + r * dltx, y0 + r * dlty, z0 + r * dltz);
float x0, y0, z0, dltx, dlty, dltz, r;
if (isIB) {
float xFlat{0.}, yFlat{0.};
mMosaixSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlat, yFlat);
locC.SetCoordinates(xFlat, yFlat, locC.Z());
mMosaixSegmentations[layer].curvedToFlat(locH.X(), locH.Y(), xFlat, yFlat);
locH.SetCoordinates(xFlat, yFlat, locH.Z());
mMosaixSegmentations[layer].curvedToFlat(locHsta.X(), locHsta.Y(), xFlat, yFlat);
locHsta.SetCoordinates(xFlat, yFlat, locHsta.Z());
x0 = locHsta.X();
dltx = locH.X() - x0;
y0 = locHsta.Y();
dlty = locH.Y() - y0;
z0 = locHsta.Z();
dltz = locH.Z() - z0;
r = (o2::its3::constants::pixelarray::pixels::apts::responseYShift - y0) / dlty;
} else {
// compare in local flat coordinates
float xFlatEnd{0.}, yFlatEnd{0.};
mMosaixSegmentations[layer].curvedToFlat(locH.X(), locH.Y(), xFlatEnd, yFlatEnd);
locH.SetXYZ(xFlatEnd, yFlatEnd, locH.Z());
float xFlatSta{0.}, yFlatSta{0.};
mMosaixSegmentations[layer].curvedToFlat(locHsta.X(), locHsta.Y(), xFlatSta, yFlatSta);
locHsta.SetXYZ(xFlatSta, yFlatSta, locHsta.Z());

// not really precise, but okish
locH.SetXYZ(0.5f * (locH.X() + locHsta.X()), 0.5f * (locH.Y() + locHsta.Y()), 0.5f * (locH.Z() + locHsta.Z()));

mMosaixSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlatSta, yFlatSta);
locC.SetXYZ(xFlatSta, yFlatSta, locC.Z());
x0 = locHsta.X();
dltx = locH.X() - x0;
y0 = locHsta.Y();
dlty = locH.Y() - y0;
z0 = locHsta.Z();
dltz = locH.Z() - z0;
r = (0.5 * (Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff) - y0) / dlty;
}
locH.SetXYZ(x0 + r * dltx, y0 + r * dlty, z0 + r * dltz);

float theta = std::acos(gloC.Z() / gloC.Rho());
float eta = -std::log(std::tan(theta / 2));

Expand Down
35 changes: 30 additions & 5 deletions Detectors/Upgrades/ITS3/macros/test/CreateDictionariesITS3.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define ENABLE_UPGRADES
#include "DetectorsCommonDataFormats/DetID.h"
#include "ITSBase/GeometryTGeo.h"
#include "ITS3Base/SpecsV2.h"
#include "ITSMFTBase/SegmentationAlpide.h"
#include "ITS3Base/SegmentationMosaix.h"
#include "DataFormatsITSMFT/CompCluster.h"
Expand Down Expand Up @@ -94,7 +95,7 @@ void CreateDictionariesITS3(bool saveDeltas = true,
TNtuple* nt = nullptr;
if (saveDeltas) {
fout = TFile::Open("CreateDictionaries.root", "recreate");
nt = new TNtuple("nt", "hashes ntuple", "hash:layer:chipID:xhf:zhf:xcf:zcf:dx:dz:outlimDx:outlimDz");
nt = new TNtuple("nt", "hashes ntuple", "hash:layer:chipID:xhf:zhf:xcf:zcf:dx:dz:outlimDx:outlimDz:clusterSize:eta");
}

const o2::steer::DigitizationContext* digContext = nullptr;
Expand Down Expand Up @@ -270,16 +271,34 @@ void CreateDictionariesITS3(bool saveDeltas = true,
auto xyzLocE = gman->getMatrixL2G(chipID) ^ (hit.GetPos()); // inverse conversion from global to local
auto xyzLocS = gman->getMatrixL2G(chipID) ^ (hit.GetPosStart());
o2::math_utils::Vector3D<float> xyzLocM;
xyzLocM.SetCoordinates(0.5f * (xyzLocE.X() + xyzLocS.X()), 0.5f * (xyzLocE.Y() + xyzLocS.Y()), 0.5f * (xyzLocE.Z() + xyzLocS.Z()));
auto locC = o2::its3::TopologyDictionary::getClusterCoordinates(cluster, pattern, false);
int layer = gman->getLayer(chipID);
float x0, y0, z0, dltx, dlty, dltz, r;
if (ib) {
float xFlat{0.}, yFlat{0.};
mMosaixSegmentations[layer].curvedToFlat(xyzLocM.X(), xyzLocM.Y(), xFlat, yFlat);
xyzLocM.SetCoordinates(xFlat, yFlat, xyzLocM.Z());
mMosaixSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlat, yFlat);
locC.SetCoordinates(xFlat, yFlat, locC.Z());
mMosaixSegmentations[layer].curvedToFlat(xyzLocE.X(), xyzLocE.Y(), xFlat, yFlat);
xyzLocE.SetCoordinates(xFlat, yFlat, xyzLocE.Z());
mMosaixSegmentations[layer].curvedToFlat(xyzLocS.X(), xyzLocS.Y(), xFlat, yFlat);
xyzLocS.SetCoordinates(xFlat, yFlat, xyzLocS.Z());
x0 = xyzLocS.X();
dltx = xyzLocE.X() - x0;
y0 = xyzLocS.Y();
dlty = xyzLocE.Y() - y0;
z0 = xyzLocS.Z();
dltz = xyzLocE.Z() - z0;
r = (o2::its3::constants::pixelarray::pixels::apts::responseYShift - y0) / dlty;
} else {
x0 = xyzLocS.X();
dltx = xyzLocE.X() - x0;
y0 = xyzLocS.Y();
dlty = xyzLocE.Y() - y0;
z0 = xyzLocS.Z();
dltz = xyzLocE.Z() - z0;
r = (0.5 * (Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff) - y0) / dlty;
}
xyzLocM.SetXYZ(x0 + r * dltx, y0 + r * dlty, z0 + r * dltz);

auto pitchX = (ib) ? o2::its3::SegmentationMosaix::PitchRow : o2::itsmft::SegmentationAlpide::PitchRow;
auto pitchZ = (ib) ? o2::its3::SegmentationMosaix::PitchCol : o2::itsmft::SegmentationAlpide::PitchCol;
Expand All @@ -302,7 +321,13 @@ void CreateDictionariesITS3(bool saveDeltas = true,
}
}
if (saveDeltas) {
nt->Fill(topology.getHash(), layer, chipID, xyzLocM.X(), xyzLocM.Z(), locC.X(), locC.Z(), dX, dZ, outLimitDx, outLimitDz);
auto vectDiff = xyzLocE - xyzLocS;
auto theta = std::acos(vectDiff.Z() / std::hypot(vectDiff.X(), vectDiff.Y(), vectDiff.Z()));
auto eta = -std::log(std::tan(theta / 2));
if (ib) {
LOGP(info, "Yhit flat start: {}, end: {}, middle: {}", xyzLocS.Y(), xyzLocE.Y(), xyzLocM.Y());
}
nt->Fill(topology.getHash(), layer, chipID, xyzLocM.X(), xyzLocM.Z(), locC.X(), locC.Z(), dX, dZ, outLimitDx, outLimitDz, pattern.getNPixels(), eta);
}
}
} else {
Expand Down
2 changes: 2 additions & 0 deletions Detectors/Upgrades/ITS3/reconstruction/src/TopologyDictionary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "ITS3Reconstruction/TopologyDictionary.h"
#include "ITS3Base/SegmentationMosaix.h"
#include "ITS3Base/SpecsV2.h"
#include "ITSMFTBase/SegmentationAlpide.h"
#include "CommonUtils/StringUtils.h"
#include <TFile.h>
Expand Down Expand Up @@ -202,6 +203,7 @@ math_utils::Point3D<T> TopologyDictionary::getClusterCoordinates(const itsmft::C
auto layer = its3::constants::detID::getDetID2Layer(cl.getSensorID());
mIBSegmentations[layer].detectorToLocalUnchecked(cl.getRow(), cl.getCol(), locCl);
locCl.SetX(locCl.X() + this->getXCOG(cl.getPatternID(), true) * its3::SegmentationMosaix::PitchRow);
locCl.SetY(its3::constants::pixelarray::pixels::apts::responseYShift);
locCl.SetZ(locCl.Z() + this->getZCOG(cl.getPatternID(), true) * its3::SegmentationMosaix::PitchCol);
float xCurved{0.f}, yCurved{0.f};
mIBSegmentations[layer].flatToCurved(locCl.X(), locCl.Y(), xCurved, yCurved);
Expand Down