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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (modified) (17 diffs)

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -52 +52 @@
 #include "MTime.h"
 #include "MAstro.h"
+#include "MAstroSky2Local.h"
 #include "MObservatory.h"
 
@@ -59 +60 @@
 using namespace std;
 
+class MRotation : public TRotation
+{
+public:
+    MRotation(Double_t gmst, const MObservatory &obs) : TRotation(1, 0, 0, 0, -1, 0, 0, 0, 1)
+    {
+        RotateZ(gmst + obs.GetElong());
+        RotateY(obs.GetPhi()-TMath::Pi()/2);
+        RotateZ(TMath::Pi());
+    }
+    MRotation(const MTime &t, const MObservatory &obs) : TRotation(1, 0, 0, 0, -1, 0, 0, 0, 1)
+    {
+        RotateZ(t.GetGmst() + obs.GetElong());
+        RotateY(obs.GetPhi()-TMath::Pi()/2);
+        RotateZ(TMath::Pi());
+    }
+};
+
+/*
 MVector3 MVector3::GetZdAz(const MObservatory &obs, Double_t gmst) const
 {
@@ -64 +83 @@
         return MVector3();
 
-    const Double_t alpha = gmst + obs.GetElong();
-
-    MVector3 zdaz;
-    zdaz.SetZdAz(Theta(), alpha-Phi(), Mag());
-    zdaz.RotateY(obs.GetPhi()-TMath::Pi()/2);
-
-    return zdaz;
-
-    /*
+    MVector3 v(*this);
+    v *= MAstroSky2Local(gmst, obs);
+
+    return v;
+
+     // ------ Using vectors -------
+     // v(1) = -v(1);                     //  phi -->      -phi
+     // v.RotateZ(gmst + obs.GetElong()); // -phi --> alpha-phi
+     // v.RotateY(obs.GetPhi()-TMath::Pi()/2);
+     // v.RotateZ(TMath::Pi());
+
      // ------ The same using slalib, tested in the drive system -------
-     const Double_t alpha = slaGmst(mjd) + obs.GetElong();
-     Double_t el;
-     slaDe2h(fAlpha-ra, dec, obs.GetPhi(), &az, &el);
-     zd = TMath::Pi()/2-el;
-     return;
-     */
+     // const Double_t alpha = slaGmst(mjd) + obs.GetElong();
+     // Double_t el;
+     // slaDe2h(fAlpha-ra, dec, obs.GetPhi(), &az, &el);
+     // zd = TMath::Pi()/2-el;
 }
 
@@ -92 +111 @@
         return MVector3();
 
-    const Double_t alpha = gmst + obs.GetElong();
-
     MVector3 v(*this);
-    v.RotateY(TMath::Pi()/2-obs.GetPhi());
-
-    MVector3 rd;
-    rd.SetRaDec(alpha-v.Phi(), TMath::Pi()/2-v.Theta(), Mag());
-    return rd;
-
-    /*
+    v *= MAstroSky2Local(gmst, obs).Inverse();
+
+    return v;
+
+     // ------ Using vectors -------
+     // v.RotateZ(-TMath::Pi());
+     // v.RotateY(TMath::Pi()/2-obs.GetPhi());
+     // v.RotateZ(-gmst - obs.GetElong()); // alpha-phi --> -phi
+     // v(1) = -v(1);                      //      -phi -->  phi
+
      // ------ The same using slalib, tested in the drive system -------
-     const Double_t alpha = slaGmst(mjd) + obs.GetElong();
-     Double_t el;
-     slaDe2h(fAlpha-ra, dec, obs.GetPhi(), &az, &el);
-     zd = TMath::Pi()/2-el;
-     return;
-     */
+     // const Double_t alpha = slaGmst(mjd) + obs.GetElong();
+     // Double_t el;
+     // slaDe2h(fAlpha-ra, dec, obs.GetPhi(), &az, &el);
+     // zd = TMath::Pi()/2-el;
 }
 
@@ -115 +133 @@
     return GetRaDec(obs, time.GetGmst());
 }
-
+*/
 MAstroCatalog::MAstroCatalog() : fLimMag(99), fRadiusFOV(99), fToolTip(0), fObservatory(0), fTime(0)
 {
@@ -386 +404 @@
 }
 
-Int_t MAstroCatalog::Convert(const TRotation &rot, TVector2 &v, Int_t type)
-{
-    MVector3 w;
-
-    switch (type)
-    {
-    case 1:
-        w.SetRaDec(v.X()-fRaDec.Phi(), v.Y(), 1);
-        break;
-
-    case 2:
-        if (!fTime || !fObservatory)
-            return kFALSE;
-        w.SetZdAz(v.Y(), v.X(), 1);
-        w = w.GetRaDec(*fTime, *fObservatory);
-        w.RotateZ(-fRaDec.Phi());
-        break;
-
-    default:
-        return kFALSE;
-    }
-
-    w *= rot;
+void MAstroCatalog::Paint(Option_t *o)
+{
+//    if (!gPad->IsBatch())
+//        gVirtualX->ClearWindow();
+
+    if (TestBit(kHasChanged))
+        DrawPrimitives(o);
+}
+
+void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent, const char *txt)
+{
+    const Double_t ra  = v.Phi()*TMath::RadToDeg()/15;
+    const Double_t dec = (TMath::Pi()/2-v.Theta())*TMath::RadToDeg();
+
+    TString str = v.GetName();
+    str += Form(":  Ra=%.2fh", ra);
+    str += Form("  Dec=%.1fd", dec);
+    str += Form("  Mag=%.1f", -2.5*log10(v.Mag()));
+    if (txt)
+        str += Form("  (%s)", txt);
+
+    // draw star on the camera display
+    TMarker *tip=new TMarker(x, y, transparent ? kDot : kFullDotLarge);;
+    tip->SetMarkerColor(kBlack);
+    tip->SetBit(kCanDelete);
+    tip->SetBit(kCannotPick);
+    AddMap(tip, new TString(str));
+}
+
+void MAstroCatalog::Update()
+{
+    if (gPad && TestBit(kMustCleanup))
+    {
+        SetBit(kHasChanged);
+        gPad->Modified();
+    }
+}
+
+void MAstroCatalog::SetTime(const MTime &time)
+{
+    if (fTime)
+        delete fTime;
+    fTime=(MTime*)time.Clone();
+}
+
+void MAstroCatalog::SetObservatory(const MObservatory &obs)
+{
+    if (fObservatory)
+        delete fObservatory;
+    fObservatory=(MObservatory*)obs.Clone();
+}
+
+Int_t MAstroCatalog::ConvertToPad(const TVector3 &w0, TVector2 &v)
+{
+    TVector3 w(w0);
 
     // Stretch such, that the X-component is alwas the same. Now
@@ -427 +477 @@
 }
 
+Int_t MAstroCatalog::Convert(const TRotation &rot, TVector2 &v)
+{
+    MVector3 w;
+    w.SetMagThetaPhi(1, v.Y(), v.X());
+    w *= rot;
+
+    return ConvertToPad(w, v);
+}
+
 Bool_t MAstroCatalog::DrawLine(const TVector2 &v, Double_t dx, Double_t dy, const TRotation &rot, Int_t type)
 {
@@ -434 +493 @@
     TVector2 v1 = v+add;
 
-    const Int_t rc0 = Convert(rot, v0, type);
-    const Int_t rc1 = Convert(rot, v1, type);
+    const Int_t rc0 = Convert(rot, v0);
+    const Int_t rc1 = Convert(rot, v1);
+
     // Both are kFALSE or both are kERROR
     if ((rc0|rc1)==kFALSE || (rc0&rc1)==kERROR)
@@ -449 +509 @@
     const TVector2 deg = v*TMath::RadToDeg();
     TString txt = type==1 ?
-        Form("Ra=%.1fh  Dec=%.1fd", fmod(deg.X()/15+48, 24),  fmod(deg.Y()+270,180)-90) :
+        Form("Ra=%.1fh  Dec=%.1fd", fmod(deg.X()/15+48, 24),  fmod(90-deg.Y()+270,180)-90) :
         Form("Zd=%.1fd  Az=%.1fd",  fmod(deg.Y()+270,180)-90, fmod(deg.X()+720, 360));
 
@@ -461 +521 @@
 }
 
+
 void MAstroCatalog::Draw(const TVector2 &v0, const TRotation &rot, TArrayI &dx, TArrayI &dy, Int_t stepx, Int_t stepy, Int_t type)
 {
     const TVector2 v1 = v0 + TVector2(dx[0]*TMath::DegToRad(), dy[0]*TMath::DegToRad());
-
-    //    if (TMath::Abs(v1.Y())>TMath::Pi()/2)
-    //        return;
-
-    //    const Int_t v0x = (int)(v0.X()*TMath::RadToDeg());
-    //    const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg());
 
     Int_t idx[] = {1, 1, 1, 1};
@@ -501 +556 @@
         {
             // Calculate new position
-            //dx[0] = (d[0]+dirs[i][0]+540-v0x)%360-180+v0x;
-            //dy[0] = (d[1]+dirs[i][1]+270-v0y)%180- 90+v0y;
             dx[0] = d[0]+dirs[i][0];
             dy[0] = d[1]+dirs[i][1];
+
+            //cout << dx[0] << " " << dy[0] << endl;
 
             // Draw corresponding line and iterate through grid
@@ -510 +565 @@
                 Draw(v0, rot, dx, dy, stepx, stepy, type);
 
-            dx[0]=d[0]; dy[0]=d[1];
+            dx[0]=d[0];
+            dy[0]=d[1];
         }
 }
@@ -516 +572 @@
 void MAstroCatalog::DrawNet(const TVector2 &v0, const TRotation &rot, Int_t type)
 {
-    //const Double_t step = TMath::DegToRad();
-
     TArrayI dx(1);
     TArrayI dy(1);
@@ -527 +581 @@
     // calculate stepsizes based on visible FOV
     Int_t stepx=1;
-    if (fabs(v.Y())>90-fRadiusFOV || fabs(v.Y())<fRadiusFOV)
+
+    if (fabs(90-v.Y())>90-fRadiusFOV || fabs(90-v.Y())<fRadiusFOV)
         stepx = 180/10;
     else
@@ -534 +589 @@
         const Float_t m = log(fRadiusFOV/180.)/log(90./fRadiusFOV-1);
         const Float_t t = log(180.)-m*log(fRadiusFOV);
-        const Int_t n = (Int_t)(exp(m*log(90-fabs(v.Y()))+t)+0.5);
-        stepx = n<4 ? 1 : n/4;
+        const Int_t n = (Int_t)(exp(m*log(90-fabs(90-v.Y()))+t)+0.5);
+        stepx = n<6 ? 1 : n/6;
     }
 
@@ -556 +611 @@
     // draw...
     v *= TMath::DegToRad();
+
     Draw(v, rot, dx, dy, stepx, stepy, type);
 }
 
-void MAstroCatalog::Paint(Option_t *o)
-{
-//    if (!gPad->IsBatch())
-//        gVirtualX->ClearWindow();
-
-    if (TestBit(kHasChanged))
-        DrawPrimitives(o);
-}
-
-void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent, const char *txt)
-{
-    const Double_t ra  = v.Phi()*TMath::RadToDeg()/15;
-    const Double_t dec = (TMath::Pi()/2-v.Theta())*TMath::RadToDeg();
-
-    TString str = v.GetName();
-    str += Form(":  Ra=%.1fh", ra);
-    str += Form("  Dec=%.1fd", dec);
-    str += Form("  Mag=%.1f", -2.5*log10(v.Mag()));
-    if (txt)
-        str += Form("  (%s)", txt);
-
-    // draw star on the camera display
-    TMarker *tip=new TMarker(x, y, transparent ? kDot : kFullDotLarge);;
-    tip->SetMarkerColor(kBlack);
-    tip->SetBit(kCanDelete);
-    tip->SetBit(kCannotPick);
-    AddMap(tip, new TString(str));
-}
-
-void MAstroCatalog::Update()
-{
-    if (gPad && TestBit(kMustCleanup))
-    {
-        SetBit(kHasChanged);
-        gPad->Modified();
-    }
-}
-
-void MAstroCatalog::SetTime(const MTime &time)
-{
-    if (fTime)
-        delete fTime;
-    fTime=(MTime*)time.Clone();
-}
-
-void MAstroCatalog::SetObservatory(const MObservatory &obs)
-{
-    if (fObservatory)
-        delete fObservatory;
-    fObservatory=(MObservatory*)obs.Clone();
-}
-
 void MAstroCatalog::AddPrimitives(Option_t *o)
 {
-    const Double_t ra  = fRaDec.Phi();
-    const Double_t dec = TMath::Pi()/2-fRaDec.Theta();
-
     // Precalc Sin/Cos...
     TRotation trans;
-    trans.Rotate(dec, TVector3(0, 1, 0));
-
-    const TVector3 zdaz0 = fRaDec.GetZdAz(*fTime, *fObservatory);
-    TVector2 zdaz(zdaz0.Phi(), zdaz0.Theta());
-    MAstroCatalog::DrawNet(zdaz, trans, 2);
-
-    TVector2 radec(ra, dec);
-    MAstroCatalog::DrawNet(radec, trans, 1);
+    trans.RotateZ(-fRaDec.Phi());
+    trans.Rotate(TMath::Pi()/2-fRaDec.Theta(), TVector3(0, 1, 0));
+
+    if (fTime && fObservatory)
+    {
+        const TRotation rot(MAstroSky2Local(*fTime, *fObservatory));
+        const TVector3 zdaz0 = rot*fRaDec;
+        const TVector2 zdaz(zdaz0.Phi(), zdaz0.Theta());
+        DrawNet(zdaz, trans*rot.Inverse(), 2);
+    }
+
+    const TVector2 radec(fRaDec.Phi(), fRaDec.Theta());
+    DrawNet(radec, trans, 1);
 
     TIter Next(&fList);
@@ -632 +638 @@
     {
         // FIXME: Check Magnitude!
-        TVector2 s(v->Phi(), TMath::Pi()/2-v->Theta());
-        if (Convert(trans, s, 1)==kTRUE)
-            DrawStar(s.X(), s.Y(), *v, kFALSE);
+        TVector2 s(v->Phi(), v->Theta());
+        if (Convert(trans, s)==kTRUE)
+            DrawStar(s.X(), TMath::Pi()/2-s.Y(), *v, kFALSE);
     }
 }