diff --git a/geom/inc/TGeoMatrix.h b/geom/inc/TGeoMatrix.h
index 5f48f419d0785379e92ed2ca8c3a42e1dfdfdd61..88d7e5526f45047fdaa2ca1a5e87883bad3e2781 100644
--- a/geom/inc/TGeoMatrix.h
+++ b/geom/inc/TGeoMatrix.h
@@ -1,4 +1,4 @@
-// @(#)root/geom:$Name: $:$Id: TGeoMatrix.h,v 1.11 2004/01/18 12:31:54 brun Exp $
+// @(#)root/geom:$Name: $:$Id: TGeoMatrix.h,v 1.12 2004/01/20 15:44:32 brun Exp $
// Author: Andrei Gheata 25/10/01
/*************************************************************************
@@ -73,6 +73,7 @@ public :
virtual const Double_t *GetTranslation() const = 0;
virtual const Double_t *GetRotationMatrix() const = 0;
virtual const Double_t *GetScale() const = 0;
+ virtual TGeoMatrix& Inverse() const = 0;
virtual void LocalToMaster(const Double_t *local, Double_t *master) const;
virtual void LocalToMasterVect(const Double_t *local, Double_t *master) const;
virtual void LocalToMasterBomb(const Double_t *local, Double_t *master) const;
@@ -110,6 +111,7 @@ public :
virtual ~TGeoTranslation() {}
void Add(const TGeoTranslation *other);
+ virtual TGeoMatrix& Inverse() const;
virtual void LocalToMaster(const Double_t *local, Double_t *master) const;
virtual void LocalToMasterVect(const Double_t *local, Double_t *master) const;
virtual void MasterToLocal(const Double_t *master, Double_t *local) const;
@@ -153,6 +155,7 @@ public :
Bool_t IsReflection() const {return TestBit(kGeoReflection);}
Bool_t IsValid() const;
+ virtual TGeoMatrix& Inverse() const;
void Clear(Option_t *option ="");
Double_t Determinant() const;
void FastRotZ(Double_t *sincos);
@@ -205,6 +208,7 @@ public :
TGeoScale(const char *name, Double_t sx, Double_t sy, Double_t sz);
virtual ~TGeoScale();
+ virtual TGeoMatrix& Inverse() const;
void SetScale(Double_t sx, Double_t sy, Double_t sz);
Bool_t Normalize();
@@ -236,6 +240,7 @@ public :
virtual ~TGeoCombiTrans();
+ virtual TGeoMatrix& Inverse() const;
virtual void RegisterYourself();
virtual void RotateX(Double_t angle);
virtual void RotateY(Double_t angle);
@@ -275,6 +280,7 @@ public :
virtual ~TGeoGenTrans();
void Clear(Option_t *option ="");
+ virtual TGeoMatrix& Inverse() const;
void SetScale(Double_t sx, Double_t sy, Double_t sz);
void SetScale(Double_t *scale)
{memcpy(&fScale[0], scale, 3*sizeof(Double_t));}
@@ -301,6 +307,7 @@ public :
TGeoIdentity(const char *name);
virtual ~TGeoIdentity() {}
+ virtual TGeoMatrix& Inverse() const;
virtual void LocalToMaster(const Double_t *local, Double_t *master) const
{memcpy(master, local, 3*sizeof(Double_t));}
virtual void LocalToMasterVect(const Double_t *local, Double_t *master) const
@@ -348,6 +355,7 @@ public :
TGeoHMatrix& operator*=(const TGeoMatrix &matrix) {Multiply(&matrix);return(*this);}
void Clear(Option_t *option ="");
+ virtual TGeoMatrix& Inverse() const;
void Multiply(const TGeoMatrix *right);
void MultiplyLeft(const TGeoMatrix *left);
@@ -369,7 +377,7 @@ public :
virtual Double_t *GetTranslation() {return &fTranslation[0];}
virtual Double_t *GetRotationMatrix() {return &fRotationMatrix[0];}
virtual Double_t *GetScale() {return &fScale[0];}
- ClassDef(TGeoHMatrix, 0) // global matrix class
+ ClassDef(TGeoHMatrix, 1) // global matrix class
};
diff --git a/geom/src/TGeoManager.cxx b/geom/src/TGeoManager.cxx
index 10614e3a67a0aa7c408e3911474155ff996db6df..a0a7289719086e7a5fa27e5567862213683d17a9 100644
--- a/geom/src/TGeoManager.cxx
+++ b/geom/src/TGeoManager.cxx
@@ -1,4 +1,4 @@
-// @(#)root/geom:$Name: $:$Id: TGeoManager.cxx,v 1.70 2004/01/19 13:40:51 brun Exp $
+// @(#)root/geom:$Name: $:$Id: TGeoManager.cxx,v 1.71 2004/01/20 15:44:32 brun Exp $
// Author: Andrei Gheata 25/10/01
/*************************************************************************
@@ -2905,6 +2905,7 @@ Bool_t TGeoManager::IsSameLocation(Double_t x, Double_t y, Double_t z, Bool_t ch
// Checks if point (x,y,z) is still in the current node.
// check if this is an overlapping node
if (fCurrentOverlapping) {
+// TGeoNode *current = fCurrentNode;
Int_t cid = GetCurrentNodeId();
if (!change) PushPoint();
gGeoManager->FindNode(x,y,z);
diff --git a/geom/src/TGeoMatrix.cxx b/geom/src/TGeoMatrix.cxx
index 885e244b3db2bde455ebb116a30f39eb6d14b6c4..e4d2753091998588c418777bfd7d4afa8c7e620e 100644
--- a/geom/src/TGeoMatrix.cxx
+++ b/geom/src/TGeoMatrix.cxx
@@ -1,4 +1,4 @@
-// @(#)root/geom:$Name: $:$Id: TGeoMatrix.cxx,v 1.16 2004/01/18 12:31:55 brun Exp $
+// @(#)root/geom:$Name: $:$Id: TGeoMatrix.cxx,v 1.18 2004/01/18 16:30:22 brun Exp $
// Author: Andrei Gheata 25/10/01
/*************************************************************************
@@ -378,14 +378,14 @@ void TGeoMatrix::Print(Option_t *) const
const Double_t *rot = GetRotationMatrix();
const Double_t *tr = GetTranslation();
const Double_t *sc = GetScale();
- printf("matrix %s - translation : %i rotation : %i scale : %i/n", GetName(),(Int_t)IsTranslation(),
+ printf("matrix %s - translation : %i rotation : %i scale : %i\n", GetName(),(Int_t)IsTranslation(),
(Int_t)IsRotation(), (Int_t)IsScale());
- printf(" %g %g %g %g/n", rot[0], rot[1], rot[2], (Double_t)0);
- printf(" %g %g %g %g/n", rot[3], rot[4], rot[5], (Double_t)0);
- printf(" %g %g %g %g/n", rot[6], rot[7], rot[8], (Double_t)0);
+ printf(" %g %g %g %g\n", rot[0], rot[1], rot[2], (Double_t)0);
+ printf(" %g %g %g %g\n", rot[3], rot[4], rot[5], (Double_t)0);
+ printf(" %g %g %g %g\n", rot[6], rot[7], rot[8], (Double_t)0);
- printf(" %g %g %g %g/n", tr[0], tr[1], tr[2], (Double_t)1);
- if (IsScale()) printf("Scale : %g %g %g/n", sc[0], sc[1], sc[2]);
+ printf(" %g %g %g %g\n", tr[0], tr[1], tr[2], (Double_t)1);
+ if (IsScale()) printf("Scale : %g %g %g\n", sc[0], sc[1], sc[2]);
}
//-----------------------------------------------------------------------------
@@ -466,6 +466,20 @@ TGeoTranslation::TGeoTranslation(const char *name, Double_t dx, Double_t dy, Dou
SetBit(kGeoTranslation);
SetTranslation(dx, dy, dz);
}
+//-----------------------------------------------------------------------------
+TGeoMatrix& TGeoTranslation::Inverse() const
+{
+// Return a temporary inverse of this.
+ static TGeoHMatrix h;
+ h = *this;
+ Double_t tr[3];
+ tr[0] = -fTranslation[0];
+ tr[1] = -fTranslation[1];
+ tr[2] = -fTranslation[2];
+ h.SetTranslation(tr);
+ return h;
+}
+
//-----------------------------------------------------------------------------
void TGeoTranslation::Add(const TGeoTranslation *other)
{
@@ -600,6 +614,25 @@ TGeoRotation::TGeoRotation(const char *name, Double_t theta1, Double_t phi1, Dou
SetDefaultName();
}
//-----------------------------------------------------------------------------
+TGeoMatrix& TGeoRotation::Inverse() const
+{
+// Return a temporary inverse of this.
+ static TGeoHMatrix h;
+ h = *this;
+ Double_t newrot[9];
+ newrot[0] = fRotationMatrix[0];
+ newrot[1] = fRotationMatrix[3];
+ newrot[2] = fRotationMatrix[6];
+ newrot[3] = fRotationMatrix[1];
+ newrot[4] = fRotationMatrix[4];
+ newrot[5] = fRotationMatrix[7];
+ newrot[6] = fRotationMatrix[2];
+ newrot[7] = fRotationMatrix[5];
+ newrot[8] = fRotationMatrix[8];
+ h.SetRotation(newrot);
+ return h;
+}
+//-----------------------------------------------------------------------------
Bool_t TGeoRotation::IsValid() const
{
// Perform orthogonality test for rotation.
@@ -735,15 +768,16 @@ void TGeoRotation::SetAngles(Double_t phi, Double_t theta, Double_t psi)
Double_t sinpsi = TMath::Sin(degrad*psi);
Double_t cospsi = TMath::Cos(degrad*psi);
- fRotationMatrix[0] = cospsi*costhe*cosphi - sinpsi*sinphi;
- fRotationMatrix[1] = -sinpsi*costhe*cosphi - cospsi*sinphi;
- fRotationMatrix[2] = sinthe*cosphi;
- fRotationMatrix[3] = cospsi*costhe*sinphi + sinpsi*cosphi;
- fRotationMatrix[4] = -sinpsi*costhe*sinphi + cospsi*cosphi;
- fRotationMatrix[5] = sinthe*sinphi;
- fRotationMatrix[6] = -cospsi*sinthe;
- fRotationMatrix[7] = sinpsi*sinthe;
+ fRotationMatrix[0] = cospsi*cosphi - costhe*sinphi*sinpsi;
+ fRotationMatrix[1] = -sinpsi*cosphi - costhe*sinphi*cospsi;
+ fRotationMatrix[2] = sinthe*sinphi;
+ fRotationMatrix[3] = cospsi*sinphi + costhe*cosphi*sinpsi;
+ fRotationMatrix[4] = -sinpsi*sinphi + costhe*cosphi*cospsi;
+ fRotationMatrix[5] = -sinthe*cosphi;
+ fRotationMatrix[6] = sinpsi*sinthe;
+ fRotationMatrix[7] = cospsi*sinthe;
fRotationMatrix[8] = costhe;
+
if (!IsValid()) Error("SetAngles", "invalid rotation (Euler angles : phi=%f theta=%f psi=%f)",phi,theta,psi);
}
//-----------------------------------------------------------------------------
@@ -789,7 +823,6 @@ void TGeoRotation::GetAngles(Double_t &theta1, Double_t &phi1, Double_t &theta2,
if (TMath::Abs(fRotationMatrix[2])<1E-6 && TMath::Abs(fRotationMatrix[5])<1E-6) phi3=0.;
else phi3 = raddeg*TMath::ATan2(fRotationMatrix[5],fRotationMatrix[2]);
if (phi3<0) phi3+=360.;
- printf("th1=%f phi1=%f th2=%f phi2=%f th3=%f phi3=%f/n", theta1,phi1,theta2,phi2,theta3,phi3);
}
//-----------------------------------------------------------------------------
@@ -890,6 +923,19 @@ TGeoScale::~TGeoScale()
// destructor
}
//-----------------------------------------------------------------------------
+TGeoMatrix& TGeoScale::Inverse() const
+{
+// Return a temporary inverse of this.
+ static TGeoHMatrix h;
+ h = *this;
+ Double_t scale[3];
+ scale[0] = 1./fScale[0];
+ scale[1] = 1./fScale[1];
+ scale[2] = 1./fScale[2];
+ h.SetScale(scale);
+ return h;
+}
+//-----------------------------------------------------------------------------
void TGeoScale::SetScale(Double_t sx, Double_t sy, Double_t sz)
{
// scale setter
@@ -979,6 +1025,31 @@ TGeoCombiTrans::~TGeoCombiTrans()
if (fRotation) delete fRotation;
}
//-----------------------------------------------------------------------------
+TGeoMatrix& TGeoCombiTrans::Inverse() const
+{
+// Return a temporary inverse of this.
+ static TGeoHMatrix h;
+ h = *this;
+ Double_t tr[3];
+ Double_t newrot[9];
+ const Double_t *rot = GetRotationMatrix();
+ tr[0] = -fTranslation[0];
+ tr[1] = -fTranslation[1];
+ tr[2] = -fTranslation[2];
+ h.SetTranslation(tr);
+ newrot[0] = rot[0];
+ newrot[1] = rot[3];
+ newrot[2] = rot[6];
+ newrot[3] = rot[1];
+ newrot[4] = rot[4];
+ newrot[5] = rot[7];
+ newrot[6] = rot[2];
+ newrot[7] = rot[5];
+ newrot[8] = rot[8];
+ h.SetRotation(newrot);
+ return h;
+}
+//-----------------------------------------------------------------------------
void TGeoCombiTrans::RegisterYourself()
{
if (!IsRegistered() && gGeoManager) {
@@ -1165,6 +1236,15 @@ void TGeoGenTrans::SetScale(Double_t sx, Double_t sy, Double_t sz)
}
}
//-----------------------------------------------------------------------------
+TGeoMatrix& TGeoGenTrans::Inverse() const
+{
+// Return a temporary inverse of this.
+ Error("Inverse", "not implemented");
+ static TGeoHMatrix h;
+ h = *this;
+ return h;
+}
+//-----------------------------------------------------------------------------
Bool_t TGeoGenTrans::Normalize()
{
// A scale transformation should be normalized by sx*sy*sz factor
@@ -1190,7 +1270,13 @@ TGeoIdentity::TGeoIdentity(const char *name)
if (!gGeoIdentity) gGeoIdentity = this;
RegisterYourself();
}
-
+//-----------------------------------------------------------------------------
+TGeoMatrix &TGeoIdentity::Inverse() const
+{
+// Return a temporary inverse of this.
+ return *gGeoIdentity;
+}
+
/*************************************************************************
* TGeoHMatrix - Matrix class used for computing global transformations *
* Should NOT be used for node definition. An instance of this class *
@@ -1311,6 +1397,42 @@ void TGeoHMatrix::Clear(Option_t *)
memcpy(fScale,kUnitScale,kN3);
}
}
+//-----------------------------------------------------------------------------
+TGeoMatrix& TGeoHMatrix::Inverse() const
+{
+// Return a temporary inverse of this.
+ static TGeoHMatrix h;
+ h = *this;
+ if (IsTranslation()) {
+ Double_t tr[3];
+ tr[0] = -fTranslation[0];
+ tr[1] = -fTranslation[1];
+ tr[2] = -fTranslation[2];
+ h.SetTranslation(tr);
+ }
+ if (IsRotation()) {
+ Double_t newrot[9];
+ newrot[0] = fRotationMatrix[0];
+ newrot[1] = fRotationMatrix[3];
+ newrot[2] = fRotationMatrix[6];
+ newrot[3] = fRotationMatrix[1];
+ newrot[4] = fRotationMatrix[4];
+ newrot[5] = fRotationMatrix[7];
+ newrot[6] = fRotationMatrix[2];
+ newrot[7] = fRotationMatrix[5];
+ newrot[8] = fRotationMatrix[8];
+ h.SetRotation(newrot);
+ }
+ if (IsScale()) {
+ Double_t sc[3];
+ sc[0] = 1./fScale[0];
+ sc[1] = 1./fScale[1];
+ sc[2] = 1./fScale[2];
+ h.SetScale(sc);
+ }
+ return h;
+}
+
//-----------------------------------------------------------------------------
void TGeoHMatrix::Multiply(const TGeoMatrix *right)
{