Changeset 3537 for trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

Timestamp:

03/17/04 17:17:14 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -49 +49 @@
 
 #include "MTime.h"
+#include "MAstroSky2Local.h"
 #include "../mhist/MHCamera.h"
 #include "MObservatory.h"
@@ -97 +98 @@
 }
 
-Int_t MAstroCamera::Convert(const TRotation &rot, TVector2 &v, Int_t type)
-{
-    MVector3 w;
-
-    switch (type)
-    {
-    case 1:
-        w.SetRaDec(v.X(), v.Y(), 1);
-        w = w.GetZdAz(*fTime, *fObservatory);
-        break;
-    case 2:
-        w.SetZdAz(v.Y(), v.X(), 1);
-        break;
-    default:
-        return kFALSE;
-    }
-
-    w *= rot;
-
+Int_t MAstroCamera::ConvertToPad(const TVector3 &w, TVector2 &v)
+{
     const TVector3 spot = fMirror0->GetReflection(w, fGeom->GetCameraDist())*1000;
 
@@ -129 +113 @@
         */
 
+
     v.Set(spot(0), spot(1));
 
@@ -135 +120 @@
 }
 
-void MAstroCamera::DrawNet(const TRotation &rot)
-{
-    TVector2 radec(fRaDec.Phi(), TMath::Pi()/2-fRaDec.Theta());
-    MAstroCatalog::DrawNet(radec, rot, 1);
-
-    const TVector3 zdaz0 = fRaDec.GetZdAz(*fTime, *fObservatory);
+void MAstroCamera::DrawNet(const TRotation &trans)
+{
+    const TRotation rot(MAstroSky2Local(*fTime, *fObservatory));
+
+    TVector2 radec(fRaDec.Phi(), fRaDec.Theta());
+    MAstroCatalog::DrawNet(radec, trans*rot, 2);
+
+    const TVector3 zdaz0 = MAstroSky2Local(*fTime, *fObservatory)*fRaDec;
     TVector2 zdaz(zdaz0.Phi(), zdaz0.Theta());
-    MAstroCatalog::DrawNet(zdaz, rot, 2);
+    MAstroCatalog::DrawNet(zdaz, trans, 1);
 }
 
@@ -185 +172 @@
     const Bool_t usecam  = opt.Contains("c", TString::kIgnoreCase);
 
-    const Float_t rho = fObservatory->RotationAngle(fRaDec.Phi(), TMath::Pi()/2-fRaDec.Theta(), *fTime);
+    MAstroSky2Local rot(*fTime, *fObservatory);
+
+    const Float_t rho = rot.RotationAngle(fRaDec.Phi(), TMath::Pi()/2-fRaDec.Theta());
 
     TString str = fTime->GetSqlDateTime();
@@ -232 +221 @@
     }
 
-    const TVector3 zdaz0 = fRaDec.GetZdAz(*fTime, *fObservatory);
-
-    TRotation rot;
-    rot.RotateZ(-zdaz0.Phi());
-    rot.RotateY(-zdaz0.Theta());
-    rot.RotateZ(-TMath::Pi()/2); // align coordinate system
-
-    DrawNet(rot);
+    TVector3 zdaz0 = fRaDec;
+    zdaz0 *= rot;
+
+    cout << zdaz0.Phi()*TMath::RadToDeg() << " " << zdaz0.Theta()*TMath::RadToDeg() << endl;
+
+    TVector3 test = zdaz0;
+    test *= rot.Inverse();
+
+    cout << test.Phi()*TMath::RadToDeg()/15 << " " << test.Theta()*TMath::RadToDeg() << endl;
+
+    TRotation rot2;
+    rot2.RotateZ(-zdaz0.Phi());
+    rot2.RotateY(-zdaz0.Theta());
+    rot2.RotateZ(-TMath::Pi()/2); // align coordinate system
+
+    DrawNet(rot2);
 
     MVector3 *radec;
@@ -248 +245 @@
         const Double_t mag = radec->Magnitude();
 
-        TVector3 star = radec->GetZdAz(*fTime, *fObservatory);
-
+        TVector3 star(*radec);
+
+        // Calculate local coordinates
+        star *= rot;
         // Rotate Star into telescope system
-        star *= rot;
+        star *= rot2;
 
         TVector3 mean;