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

Timestamp:

05/12/04 20:22:24 (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

@@ -90 +90 @@
 
 #include "../mhist/MHCamera.h" // FIXME: This dependancy is very bad!
-                               // HOW TO GET RID OF IT? Move MHCamera to mgeom?
+                      // HOW TO GET RID OF IT? Move MHCamera to mgeom?
 
 //#include "MStarLocalPos.h"
@@ -292 +292 @@
 //  'c' Use the underlaying MHCamera as histogram
 //  '0' Draw the reflection on a virtual perfect mirror
+//  '=' Draw '0' or '*' propotional to the star magnitude
 //
 // If the Pad contains an object MHCamera of type MHCamera it is used.
@@ -312 +313 @@
     const Bool_t hasdot  = o.Contains(".", TString::kIgnoreCase);
     const Bool_t usecam  = o.Contains("c", TString::kIgnoreCase);
+    const Bool_t resize  = o.Contains("=", TString::kIgnoreCase);
 
     // Get camera
@@ -389 +391 @@
                 m->SetMarkerColor(kMagenta);
                 m->SetMarkerStyle(kDot);
-                AddMap(m);
+                fMapG.Add(m);
             }
             if (h)
@@ -402 +404 @@
         // transform meters into millimeters (camera display works with mm)
         mean *= 1./num;
-        DrawStar(mean(0), mean(1), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)));
+        DrawStar(mean(0), mean(1), *radec, hasmean?kBlack:-1, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize);
 
         if (hasnull)
@@ -409 +411 @@
             star *= rot;
             const TVector3 spot = fMirror0->GetReflection(star, fGeom->GetCameraDist())*1000;
-            DrawStar(spot(0), spot(1), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)));
+            DrawStar(spot(0), spot(1), *radec, hasmean?kBlack:-1, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize);
+            // This can be used to get the abberation...
             //cout << TMath::Hypot(spot(0), spot(1)) << " " << TMath::Hypot(mean(0)-spot(0), mean(1)-spot(1)) << endl;
         }
@@ -481 +484 @@
 // x [mm]: x coordinate in the camera plane (assuming a perfect mirror)
 // y [mm]: y coordinate in the camera plane (assuming a perfect mirror)
+//
+// We assume (0, 0) to be the center of the FOV
 //
 // dzd [deg]: Delta Zd