Changeset 7788 for trunk/MagicSoft/Cosy/gui

Timestamp:

07/12/06 03:00:16 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGAccuracy.cc (modified) (3 diffs)
• MGStarg.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/gui/MGAccuracy.cc

@@ -20 +20 @@
 #include "coord.h"
 #include "MTime.h"
+#include "MAstro.h"
 
 ClassImp(MGAccuracy);
@@ -238 +239 @@
 void MGAccuracy::Update(Float_t pzd, Float_t azd, Float_t aaz)
 {
-    const Float_t d2r = TMath::Pi()/180.;
-
-    pzd *= d2r;
-    azd *= d2r;
-    aaz *= d2r;
-
-    const double el = TMath::Pi()/2-pzd;
-
-    const double dphi2 = aaz/2.;
-    const double cos2  = cos(dphi2)*cos(dphi2);
-    const double sin2  = sin(dphi2)*sin(dphi2);
-    const double d     = cos(azd)*cos2 - cos(2*el)*sin2;
-
-    //
-    // Original:
-    //   cos(Zd1)*cos(Zd2)+sin(Zd1)*sin(Zd2)*cos(dAz)
-    //
-    // Correct:
-    //   const double d = cos(azd)*cos2 - cos(el1+el2)*sin2;
-    //
-    // Estimated:
-    //   const double d = cos(azd)*cos2 - cos(2*el)*sin2;
-    //
-
-    double dist = acos(d)*TMath::RadToDeg();
+    const double dist = MAstro::GetDevAbs(pzd, azd, aaz);
 
     UpdateText(dist);
@@ -303 +280 @@
 }
 
-void MGAccuracy::Update(ZdAz &pos, ZdAz &acc)
-{
-    UpdateCross(acc.Az()*3600., acc.Zd()*3600.);
-    Update(pos.Zd(), acc.Zd(), acc.Az());
+void MGAccuracy::Update(ZdAz &pos, ZdAz &dev)
+{
+    // Estimate the distance in az direction on the camera plane
+    const double daz = MAstro::GetDevAbs(pos.Zd(), 0, dev.Az())*3600.;
+
+    //cout << "--> T: " << dev.Az()*60 << " " << dev.Zd()*60. << endl;
+
+    UpdateCross(TMath::Sign(daz, dev.Az()), dev.Zd()*3600.);
+    Update(pos.Zd(), dev.Zd(), dev.Az());
 
     UpdateCanvas();

trunk/MagicSoft/Cosy/gui/MGStarg.cc

@@ -16 +16 @@
 #include "coord.h"
 #include "MTime.h"
+#include "MAstro.h"
 
 ClassImp(MGStarg);
@@ -36 +37 @@
     text.SetTextAlign(11);  // left, bottom (s.TAttText)
     text.SetTextColor(3);
-    text.DrawText(160, -220, "0.0125 deg");
+    text.DrawText(220, -220, "0.75'");
 
     text.SetTextColor(5);
-    text.DrawText(160, -250, "0.025 deg");
+    text.DrawText(220, -250, "1.50'");
 
     text.SetTextColor(2);
-    text.DrawText(160, -280, "0.05 deg");
+    text.DrawText(220, -280, "3.00'");
 
 
@@ -218 +219 @@
 void MGStarg::Update(Float_t pzd, Float_t azd, Float_t aaz)
 {
-    const Float_t d2r = TMath::Pi()/180.;
-
-    pzd *= d2r;
-    azd *= d2r;
-    aaz *= d2r;
-
-    const double el = TMath::Pi()/2-pzd;
-
-    const double dphi2 = aaz/2.;
-    const double cos2  = cos(dphi2)*cos(dphi2);
-    const double sin2  = sin(dphi2)*sin(dphi2);
-    const double d     = cos(azd)*cos2 - cos(2*el)*sin2;
-
-    double dist = acos(d)*TMath::RadToDeg();
+    const double dist = MAstro::GetDevAbs(pzd, azd, aaz);
 
     UpdateText(dist);
@@ -269 +257 @@
 }
 
-void MGStarg::Update(ZdAz &pos, ZdAz &acc)
-{
-
-    UpdateCross(acc.Az()*3600., acc.Zd()*3600.);
-    Update(pos.Zd(), acc.Zd(), acc.Az());
+void MGStarg::Update(ZdAz &pos, ZdAz &dev)
+{
+    // Estimate the distance in az direction on the camera plane
+    const double daz = MAstro::GetDevAbs(pos.Zd(), 0, dev.Az())*3600.;
+
+    //cout << "--> S: " << dev.Az()*60 << " " << dev.Zd()*60. << endl;
+
+    UpdateCross(TMath::Sign(daz, dev.Az()), dev.Zd()*3600.);
+    Update(pos.Zd(), dev.Zd(), dev.Az());
 
     UpdateCanvas();
 }
-
-
-
-
-
-
-
-
-
-