Changeset 8915

Timestamp:

06/02/08 16:23:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MPointing.cc (modified) (4 diffs)
• MPointing.h (modified) (4 diffs)
• MPointingPos.cc (modified) (1 diff)
• MPointingPos.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mpointing/MPointing.cc

@@ -101 +101 @@
 #define DEBUG(txt)
 
+void ZdAz::Round()
+{
+    fX = TMath::Nint(fX);
+    fY = TMath::Nint(fY);
+}
+
+void ZdAz::Abs()
+{
+    fX = TMath::Abs(fX);
+    fY = TMath::Abs(fY);
+}
+
 void MPointing::Init(const char *name, const char *title)
 {
@@ -357 +369 @@
 }
 
+ZdAz MPointing::AddOffsets(const ZdAz &zdaz) const
+{
+    AltAz p(TMath::Pi()/2-zdaz.Zd(), zdaz.Az());
+
+    AltAz c = AddOffsets(p);
+
+    return ZdAz(TMath::Pi()/2-c.Alt(), c.Az());
+}
+
+TVector3 MPointing::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 MPointing::SubtractOffsets(const AltAz &aa) const
 {
@@ -367 +398 @@
 
     return p;
+}
+
+ZdAz MPointing::SubtractOffsets(const ZdAz &zdaz) const
+{
+    AltAz p(TMath::Pi()/2-zdaz.Zd(), zdaz.Az());
+
+    AltAz c = SubtractOffsets(p);
+
+    return ZdAz(TMath::Pi()/2-c.Alt(), c.Az());
+}
+
+TVector3 MPointing::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;
 }
 
@@ -707 +757 @@
 }
 
+void MPointing::GetError(TArrayD &par) const
+{
+    par = fError;
+    for (int i=0; i<kNumPar; i++)
+        par[i] *= TMath::RadToDeg();
+}
+
+TVector2 MPointing::GetDxy() const
+{
+    return TVector2(fDx, fDy)*TMath::RadToDeg();
+}
+
+Double_t MPointing::GetPx() const
+{
+    return fPx*TMath::RadToDeg();
+}
+
+Double_t MPointing::GetPy() const
+{
+    return fPy*TMath::RadToDeg();
+}
+
 void MPointing::SetMinuitParameters(TMinuit &m, Int_t n) const
 {

trunk/MagicSoft/Mars/mpointing/MPointing.h

@@ -91 +91 @@
     // MSlewing only?!?
     double Ratio() const { return fX/fY; }
-    void Round()         { fX=(int)(floor(fX+.5)); fY=(int)(floor(fY+.5)); }
-    void Abs()           { fX=fabs(fX); fY=fabs(fY); }
+    void Round();
+    void Abs();
 
     ClassDef(ZdAz, 0)
@@ -250 +250 @@
     }
 
-    AltAz  AddOffsets(const AltAz &aa) const;
-    ZdAz   AddOffsets(const ZdAz &zdaz) const
-    {
-        AltAz p(TMath::Pi()/2-zdaz.Zd(), zdaz.Az());
-        AltAz c = AddOffsets(p);
-        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;
-    ZdAz   SubtractOffsets(const ZdAz &zdaz) const
-    {
-        AltAz p(TMath::Pi()/2-zdaz.Zd(), zdaz.Az());
-        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;
-    }
+    AltAz    AddOffsets(const AltAz &aa) const;
+    ZdAz     AddOffsets(const ZdAz &zdaz) const;
+    TVector3 AddOffsets(const TVector3 &v) const;
+
+    AltAz    SubtractOffsets(const AltAz &aa) const;
+    ZdAz     SubtractOffsets(const ZdAz &zdaz) const;
+    TVector3 SubtractOffsets(const TVector3 &v) const;
 
     void SetParameters(const Double_t *par, Int_t n=kNumPar);
@@ -294 +270 @@
         GetParameters(par.GetArray());
     }
-    void GetError(TArrayD &par) const
-    {
-        par = fError;
-        for (int i=0; i<kNumPar; i++)
-            par[i] *= TMath::RadToDeg();
-    }
+    void GetError(TArrayD &par) const;
 
     Double_t &operator[](UInt_t i) { return *fCoeff[i]; }
@@ -327 +298 @@
      */
 
-    TVector2 GetDxy() const { return TVector2(fDx, fDy)*TMath::RadToDeg(); }
-
-    Double_t GetPx() const { return fPx*TMath::RadToDeg(); }
-    Double_t GetPy() const { return fPy*TMath::RadToDeg(); }
+    TVector2 GetDxy() const;// { return TVector2(fDx, fDy)*TMath::RadToDeg(); }
+
+    Double_t GetPx() const;// { return fPx*TMath::RadToDeg(); }
+    Double_t GetPy() const;// { return fPy*TMath::RadToDeg(); }
 
     Bool_t IsPxValid() const { return fError[kPX]>0; }

trunk/MagicSoft/Mars/mpointing/MPointingPos.cc

@@ -57 +57 @@
 const TString MPointingPos::gsDefName  = "MPointingPos";
 const TString MPointingPos::gsDefTitle = "Container storing the (corrected) telescope pointing position";
+
+Double_t MPointingPos::GetZdRad() const
+{
+    return fZd*TMath::DegToRad();
+}
+
+Double_t MPointingPos::GetAzRad() const
+{
+    return fAz*TMath::DegToRad();
+}
+
+Double_t MPointingPos::GetRaRad() const
+{
+    return fRa*TMath::DegToRad()*15;
+}
+
+Double_t MPointingPos::GetDecRad() const
+{
+    return fDec*TMath::DegToRad();
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mpointing/MPointingPos.h

@@ -51 +51 @@
     Double_t GetAz() const  { return fAz; }
 
-    Double_t GetZdRad() const  { return fZd*TMath::DegToRad(); }
-    Double_t GetAzRad() const  { return fAz*TMath::DegToRad(); }
+    Double_t GetZdRad() const;//  { return fZd*TMath::DegToRad(); }
+    Double_t GetAzRad() const;//  { return fAz*TMath::DegToRad(); }
 
     ZdAz GetZdAz() const { return ZdAz(fZd, fAz); }
@@ -60 +60 @@
     Double_t GetDec() const { return fDec; }
 
-    Double_t GetRaRad() const  { return fRa*TMath::DegToRad()*15; }
-    Double_t GetDecRad() const { return fDec*TMath::DegToRad(); }
+    Double_t GetRaRad() const;//  { return fRa*TMath::DegToRad()*15; }
+    Double_t GetDecRad() const;// { return fDec*TMath::DegToRad(); }
 
     Double_t RotationAngle(const MObservatory &o) const;