Changeset 3487 for trunk/MagicSoft/Mars/mastro

Timestamp:

03/12/04 16:07:58 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstroCamera.cc (modified) (1 diff)
• MAstroCatalog.cc (modified) (3 diffs)
• MAstroCatalog.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -286 +286 @@
         mean *= 1./num;
 
-        DrawStar(mean(1), mean(0), *radec, !hasmean);
+        DrawStar(mean(1), mean(0), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(1), mean(0)));
     }
 }

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -468 +468 @@
     //        return;
 
-    const Int_t v0x = (int)(v0.X()*TMath::RadToDeg());
-    const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg());
+    //    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};
@@ -568 +568 @@
 }
 
-void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent)
+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;
@@ -577 +577 @@
     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

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -87 +87 @@
     Float_t atof(const TString &s);
 
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03)
     Bool_t fPlainScreen;  //! Just a dummy!!!! ([Set,Is]Freezed)
+//#endif
 
 protected:
@@ -110 +112 @@
     void  Draw(const TVector2 &v0, const TRotation &rot, TArrayI &dx, TArrayI &dy, Int_t stepx, Int_t stepy, Int_t type);
     void  DrawNet(const TVector2 &v0, const TRotation &rot, Int_t type);
-    void  DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t);
+    void  DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t, const char *txt=0);
     void  Paint(Option_t *o="");
     Int_t DistancetoPrimitive(Int_t px, Int_t py);
@@ -173 +175 @@
     void SetGuiActive(Bool_t b=kTRUE)        { b ? SetBit(kGuiActive) : ResetBit(kGuiActive); }
 
-    void   SetPlainScreen(Bool_t b=kTRUE)    { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE*
+    void   SetPlainScreen(Bool_t b=kTRUE)    { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE* *GETTER=IsPlainScreen
     Bool_t IsPlainScreen() const             { return TestBit(kPlainScreen); }