Changeset 4966 for trunk/MagicSoft/Mars/mpointing/MPointing.h

Timestamp:

09/13/04 08:57:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpointing/MPointing.h (modified) (7 diffs)

trunk/MagicSoft/Mars/mpointing/MPointing.h

@@ -4 +4 @@
 #ifndef ROOT_TArrayD
 #include <TArrayD.h>
+#endif
+
+#ifndef ROOT_TVector3
+#include <TVector3.h>
 #endif
 
@@ -24 +28 @@
     Double_t Alt() const { return fX; }
     Double_t Az() const  { return fY; }
+    ClassDef(AltAz, 1)
 };
 
@@ -34 +39 @@
     Double_t Zd() const { return fX; }
     Double_t Az() const { return fY; }
+    ClassDef(ZdAz, 1)
 };
 #endif
@@ -95 +101 @@
     void Reset();
 
-    ZdAz  Correct(const ZdAz &zdaz) const;
-    AltAz Correct(const AltAz &aaz) const;
-
-    ZdAz  CorrectBack(const ZdAz &zdaz) const;
-    AltAz CorrectBack(const AltAz &aaz) const;
-
-    ZdAz operator()(const ZdAz &zdaz) const { return Correct(zdaz); }
-    AltAz operator()(const AltAz &aaz) const { return Correct(aaz); }
+    ZdAz     Correct(const ZdAz &zdaz) const;
+    AltAz    Correct(const AltAz &aaz) const;
+    TVector3 Correct(const TVector3 &v) const;
+
+    ZdAz     CorrectBack(const ZdAz &zdaz) const;
+    AltAz    CorrectBack(const AltAz &aaz) const;
+    TVector3 CorrectBack(const TVector3 &v) const;
+
+    ZdAz     operator()(const ZdAz &zdaz)  const { return Correct(zdaz); }
+    AltAz    operator()(const AltAz &aaz)  const { return Correct(aaz); }
+    TVector3 operator()(const TVector3 &v) const { return Correct(v); }
 
     ZdAz operator()(const ZdAz &zdaz, void (*fcn)(ZdAz &zdaz, Double_t *par)) const
@@ -122 +131 @@
     }
 
+    TVector3 operator()(const TVector3 &aaz, void (*fcn)(TVector3 &aaz, Double_t *par)) const
+    {
+        Double_t par[fNumPar];
+        GetParameters(par);
+        TVector3 v = aaz;
+        fcn(v, par);
+        return v;
+    }
+
     AltAz  AddOffsets(const AltAz &aa) const;
     ZdAz   AddOffsets(const ZdAz &zdaz) const
@@ -129 +147 @@
         return ZdAz(TMath::Pi()/2-c.Alt(), c.Az());
     }
+    TVector3 AddOffsets(const TVector3 &v) const
+    {
+        AltAz p(TMath::Pi()/2-v.Theta(), v.Phi());
+        AltAz c = AddOffsets(p);
+        TVector3 rc;
+        rc.SetMagThetaPhi(1, TMath::Pi()/2-c.Alt(), c.Az());
+        return rc;
+    }
 
     AltAz  SubtractOffsets(const AltAz &aa) const;
@@ -136 +162 @@
         AltAz c = SubtractOffsets(p);
         return ZdAz(TMath::Pi()/2-c.Alt(), c.Az());
+    }
+    TVector3 SubtractOffsets(const TVector3 &v) const
+    {
+        AltAz p(TMath::Pi()/2-v.Theta(), v.Phi());
+        AltAz c = SubtractOffsets(p);
+        TVector3 rc;
+        rc.SetMagThetaPhi(1, TMath::Pi()/2-c.Alt(), c.Az());
+        return rc;
     }