Skip to content

Possibility to define AlignParam as Local Delta #14287

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
shahor02 merged 1 commit into from
May 17, 2025
Merged

Possibility to define AlignParam as Local Delta #14287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/AlignParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ class AlignParam
AlignParam(const char* symname, int algID, // volume symbolic name and its alignable ID
double x, double y, double z, // delta translation
double psi, double theta, double phi, // delta rotation
bool global = true); // global (preferable) or local delta definition
bool global = true, // global (preferable) or local delta definition
bool convertLocalToGlobal = true); // if local is provided, convert it to global

AlignParam(const char* symname, int algID, TGeoMatrix& m, bool global = true);
AlignParam(const char* symname, int algID, TGeoMatrix& m,
bool global = true, // global (preferable) or local delta definition
bool convertLocalToGlobal = true); // if local is provided, convert it to global

/// return symbolic name of the volume
const std::string& getSymName() const { return mSymName; }
Expand Down Expand Up @@ -70,6 +73,9 @@ class AlignParam
void setAlignableID(int id) { mAlignableID = id; }
/// ================ methods for direct setting of delta params

/// set parameters
void setParams(double x, double y, double z, double psi, double theta, double phi);

/// set parameters of global delta
void setGlobalParams(double x, double y, double z, double psi, double theta, double phi);

Expand Down Expand Up @@ -114,6 +120,9 @@ class AlignParam

int rectify(double zero = 1e-13);

bool isGlobal() const { return mIsGlobal; }
void setIsGlobal(bool v) { mIsGlobal = v; }

protected:
bool matrixToAngles(const double* rot, double& psi, double& theta, double& phi) const;
void anglesToMatrix(double psi, double theta, double phi, double* rot) const;
Expand All @@ -123,8 +132,8 @@ class AlignParam
private:
std::string mSymName{};

bool mIsGlobal = true; /// is this global delta?
int mAlignableID = -1; /// alignable ID (set for sensors only)

double mX = 0.; ///< X translation of global delta
double mY = 0.; ///< Y translation of global delta
double mZ = 0.; ///< Z translation of global delta
Expand All @@ -133,7 +142,7 @@ class AlignParam
double mTheta = 0.; ///< "roll" : Euler angle of rotation around Y axis after 1st rotation (radians)
double mPhi = 0.; ///< "yaw" : Euler angle of rotation around Z axis (radians)

ClassDefNV(AlignParam, 1);
ClassDefNV(AlignParam, 2);
};

} // namespace detectors
Expand Down
46 changes: 27 additions & 19 deletions DataFormats/Detectors/Common/src/AlignParam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,32 @@ using namespace o2::detectors;
AlignParam::AlignParam(const char* symname, int algID, // volume symbolic name and its alignable ID
double x, double y, double z, // delta translation
double psi, double theta, double phi, // delta rotation
bool global) // global (preferable) or local delta definition
: mSymName(symname), mAlignableID(algID)
bool global, // global (preferable) or local delta definition
bool convertLocalToGlobal) // if local is provided, convert it to global
: mSymName(symname), mIsGlobal(global || convertLocalToGlobal), mAlignableID(algID)
{
/// standard constructor with 3 translation + 3 rotation parameters
/// If the user explicitly sets the global variable to false then the
/// parameters are interpreted as giving the local transformation.
/// This requires to have a gGeoMenager active instance, otherwise the
/// constructor will fail (no object created)

if (global) {
setGlobalParams(x, y, z, psi, theta, phi);
} else {
setParams(x, y, z, psi, theta, phi);
if (!global && convertLocalToGlobal) {
setLocalParams(x, y, z, psi, theta, phi);
}
}

//___________________________________________________
AlignParam::AlignParam(const char* symname, int algID, TGeoMatrix& m, bool global)
: mSymName(symname), mAlignableID(algID)
AlignParam::AlignParam(const char* symname, int algID, TGeoMatrix& m, bool global, bool convertLocalToGlobal)
: mSymName(symname), mIsGlobal(global || convertLocalToGlobal), mAlignableID(algID)
{
setTranslation(m);
if (!setRotation(m)) {
const double* rot = m.GetRotationMatrix();
throw std::runtime_error(fmt::format("Failed to extract roll-pitch-yall angles from [[{},{},{}], [{},{},{}], [{},{},{}] for {}", rot[0], rot[1], rot[2], rot[3], rot[4], rot[5], rot[6], rot[7], rot[8], symname));
}
if (!global && !setLocalParams(mX, mY, mZ, mPsi, mTheta, mPhi)) {
if (!global && convertLocalToGlobal && !setLocalParams(mX, mY, mZ, mPsi, mTheta, mPhi)) {
throw std::runtime_error(fmt::format("Alignment creation for {} failed: geomManager is absent", symname));
}
}
Expand Down Expand Up @@ -223,6 +223,10 @@ bool AlignParam::createLocalMatrix(TGeoHMatrix& m) const
// In case that the TGeo was not initialized or not closed,
// returns false and the object parameters are not set.
//
m = createMatrix();
if (!mIsGlobal) {
return true;
}
if (!gGeoManager || !gGeoManager->IsClosed()) {
LOG(error) << "Can't get the local alignment object parameters! gGeoManager doesn't exist or it is still open!";
return false;
Expand All @@ -247,7 +251,6 @@ bool AlignParam::createLocalMatrix(TGeoHMatrix& m) const
LOG(error) << "Volume name or path " << symname << " is not valid!";
return false;
}
m = createMatrix();
TGeoHMatrix gprime, gprimeinv;
gprime = *node->GetMatrix();
gprimeinv = gprime.Inverse();
Expand Down Expand Up @@ -302,18 +305,15 @@ bool AlignParam::applyToGeometry() const
}

// double threshold = 0.001;

TGeoHMatrix gprime = *node->GetMatrix();
TGeoHMatrix align = createMatrix();
gprime.MultiplyLeft(&align);
TGeoHMatrix* ginv = new TGeoHMatrix; // TGeoPhysicalNode takes and manages raw pointer, need naked new!
TGeoHMatrix* g = node->GetMatrix(node->GetLevel() - 1);
*ginv = g->Inverse();
*ginv *= gprime;

TGeoHMatrix* align = new TGeoHMatrix(createMatrix());
if (mIsGlobal) {
align->Multiply(node->GetMatrix());
TGeoHMatrix* g = node->GetMatrix(node->GetLevel() - 1);
align->MultiplyLeft(node->GetMatrix(node->GetLevel() - 1)->Inverse());
}
LOG(debug) << "Aligning volume " << symname;

node->Align(ginv);
node->Align(align);

return true;
}
Expand Down Expand Up @@ -359,6 +359,14 @@ void AlignParam::setGlobalParams(double x, double y, double z, double psi, doubl
setRotation(psi, theta, phi);
}

//_____________________________________________________________________________
void AlignParam::setParams(double x, double y, double z, double psi, double theta, double phi)
{
/// set parameters of global delta
setTranslation(x, y, z);
setRotation(psi, theta, phi);
}

//_____________________________________________________________________________
void AlignParam::setRotation(double psi, double theta, double phi)
{
Expand Down