Changeset 4651 for trunk/MagicSoft/Mars

Timestamp:

08/17/04 14:09:30 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile (modified) (1 diff)
• mastro/MAstroCamera.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Makefile

@@ -65 +65 @@
           mhistmc \
           mjobs \
-          mtools
+          mtools \
+          mstarcam
 
 #LIBRARIES = $(SUBDIRS:%=lib/lib%.a)

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 3/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Robert Wagner, 7/2004 <mailto:rwagner@mppmu.mpg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -92 +93 @@
                       // HOW TO GET RID OF IT? Move MHCamera to mgeom?
 
-// FIXME: remove comments as soon as MStarLocalPos official part of MARS
-//#include "MStarLocalPos.h"
-// FIXME: remove comments as soon as MStarLocalPos official part of MARS
+#include "MStarPos.h"
 
 ClassImp(MAstroCamera);
@@ -382 +381 @@
         while ((mirror=(MGeomMirror*)NextM()))
         {
-            const TVector3 spot = mirror->GetReflection(star, fGeom->GetCameraDist())*1000;
-
+            const TVector3 spot = mirror->GetReflection(star, fGeom->GetCameraDist())*1000;
+            
             // calculate mean of all 'stars' hitting the camera plane
             // by taking the sum of the intersection points between
@@ -392 +391 @@
             {
                 TMarker *m=new TMarker(spot(0), spot(1), 1);
-                m->SetMarkerColor(kMagenta);
+                TVector3 pos=mirror->GetMirrorCenter();
+                Float_t r=pos.Mag();
+
+                m->SetMarkerColor((Int_t)(6*r)+51);
                 m->SetMarkerStyle(kDot);
                 fMapG.Add(m);
@@ -462 +464 @@
       }
       mean *= 1./num;
-// FIXME: remove comments as soon as MStarLocalPos official part of MARS
-//      MStarLocalPos *starpos = new MStarLocalPos;
-//      starpos->SetExpValues(mag,mean(0),mean(1));
-      
-//      TString name = radec->GetName();
-//      if (name.Length()==0) {
-//      starpos->SetName("unknown"); 
-//      } else {
-//      starpos->SetName(radec->GetName());
-//      }        
-//      list->Add(starpos);   
-// FIXME: remove comments as soon as MStarLocalPos official part of MARS
+      MStarPos *starpos = new MStarPos;
+      starpos->SetExpValues(mag,mean(0),mean(1));
+
+      const TVector3 spot = fMirror0->GetReflection(star, fGeom->GetCameraDist())*1000;
+      starpos->SetIdealValues(mag,spot(0),spot(1));
     }
 }