Changeset 4625 for trunk/MagicSoft/Mars/mtemp

Timestamp:

08/16/04 12:28:05 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp

Files:

• Changelog (modified) (1 diff)
• MStarLocalPos.cc (modified) (2 diffs)
• MStarLocalPos.h (modified) (3 diffs)
• mmpi/MAstroCamera.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/08/16: Robert Wagner
+   * mtemp/MStarLocalPos.[h,cc]
+     - added member variables, setters and getters for ideal position,
+       i.e. position without aberration effects
+
+   * mtemp/mmpi/MAstroCamera.cc
+     - Ideal position of star is filled in MLocalStarPos container  
+
+
 
  2004/08/09: Robert Wagner

trunk/MagicSoft/Mars/mtemp/MStarLocalPos.cc

@@ -96 +96 @@
 }
 
+void MStarLocalPos::SetIdealValues(Float_t mag, Float_t x, Float_t y)
+{
+     fMagIdeal = mag;
+     fXIdeal = x;
+     fYIdeal = y;
+}
+
 void MStarLocalPos::SetCalcValues(Float_t mag, Float_t max, 
         Float_t x, Float_t y, Float_t sigmaMinorAxis, Float_t sigmaMajorAxis)
@@ -225 +232 @@
       *fLog << inf << "Star Name: \"" << this->GetName() << "\"" << endl;
     }
-    
+      
+  if (o.Contains("mag", TString::kIgnoreCase) || opt == NULL)
+    {
   
-  if (o.Contains("mag", TString::kIgnoreCase) || opt == NULL)
-    {
-  
-      *fLog << inf << "Star maginitude:" << endl;
+      *fLog << inf << "Star magnitude:" << endl;
       *fLog << inf << " Expected \t" << setw(4) << fMagExp << endl;
       *fLog << inf << " Calcultated \t " << setw(4) << fMagCalc << endl;

trunk/MagicSoft/Mars/mtemp/MStarLocalPos.h

@@ -14 +14 @@
     Float_t fXExp;    //[mm]
     Float_t fYExp;    //[mm]
+
+    //Ideal position on camera
+    Float_t fMagIdeal;
+    Float_t fXIdeal;    //[mm]
+    Float_t fYIdeal;    //[mm]
 
     //Info from calculation
@@ -62 +67 @@
     Float_t GetYExp() {return fYExp;}
 
+    Float_t GetMagIdeal() {return fMagIdeal;}
+    Float_t GetXIdeal() {return fXIdeal;}
+    Float_t GetYIdeal() {return fYIdeal;}
+
     Float_t GetMagCalc() {return fMagCalc;}
     Float_t GetMaxCalc() {return fMaxCalc;}
@@ -104 +113 @@
     void SetExpValues(Float_t mag, Float_t x, Float_t y);
 
+    void SetIdealValues(Float_t mag, Float_t x, Float_t y);
+
     void SetCalcValues(Float_t mag, Float_t max, Float_t x, Float_t y, 
                        Float_t sigmaMinorAxis, Float_t sigmaMajorAxis);

trunk/MagicSoft/Mars/mtemp/mmpi/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
@@ -390 +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 +466 @@
       MStarLocalPos *starpos = new MStarLocalPos;
       starpos->SetExpValues(mag,mean(0),mean(1));
+
+      const TVector3 spot = fMirror0->GetReflection(star, fGeom->GetCameraDist())*1000;
+      starpos->SetIdealValues(mag,spot(0),spot(1));
       
       TString name = radec->GetName();