Changeset 4433 for trunk/MagicSoft/Mars/mtemp

Timestamp:

07/30/04 12:19:16 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp

Files:

• MStarLocalPos.cc (modified) (8 diffs)
• MStarLocalPos.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/MStarLocalPos.cc

@@ -11 +11 @@
 ! * provided that the above copyright notice appear in all copies and
 ! * that both that copyright notice and this permission notice appear
-! * in supporting documentation. It is provided "as is" without express
+! * in supporting documentation. It is provided "as is" without expressed
 ! * or implied warranty.
 ! *
@@ -17 +17 @@
 !
 !   Author(s): Javier López , 4/2004 <mailto:jlopez@ifae.es>
+!   Author(s): Robert Wagner, 7/2004 <mailto:rwagner@mppmu.mpg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -25 +26 @@
 
 #include <TEllipse.h>
+#include <TMarker.h>
 
 #include "MLog.h"
@@ -101 +103 @@
 }
 
+void MStarLocalPos::SetFitValues(Float_t mag, Float_t max, Float_t x, Float_t y, Float_t sigmaMinorAxis, Float_t sigmaMajorAxis, Float_t chiSquare, Int_t ndof, Float_t xx, Float_t xy, Float_t yy)
+{
+  SetFitValues(mag, max, x, y, sigmaMinorAxis, sigmaMajorAxis, chiSquare, ndof);
+  fXXErr = xx;
+  fYYErr = yy;
+  fXYErr = xy;
+}
+
+
 // --------------------------------------------------------------------------
 //
@@ -108 +119 @@
 {
   //Print a cross in the expected position
+  
+  TMarker mexp(fXExp, fYExp, 29);
+  mexp.SetMarkerSize(3);
+  mexp.SetMarkerColor(94);
+  mexp.Paint(); 
 
   if (fSigmaMinorAxisCalc>0. && fSigmaMajorAxisCalc>0.)
     {
       TEllipse ecalc(fMeanXCalc, fMeanYCalc, fSigmaMinorAxisCalc, fSigmaMajorAxisCalc, 0, 360, 0);
-      ecalc.SetLineWidth(2);
+      ecalc.SetLineWidth(3);
       ecalc.SetLineColor(kRed);
       ecalc.Paint();
@@ -120 +136 @@
     {
       TEllipse efit(fMeanXFit, fMeanYFit, fSigmaMinorAxisFit, fSigmaMajorAxisFit, 0, 360, 0);
-      efit.SetLineWidth(2);
+      efit.SetLineWidth(3);
       efit.SetLineColor(kBlack);
       efit.Paint();
@@ -129 +145 @@
 {
   TString o = opt;
+
+  if (o.Contains("name", TString::kIgnoreCase) || opt == NULL)
+    {
+      *fLog << inf << "Star Name: \"" << this->GetName() << "\"" << endl;
+    }
+    
   
   if (o.Contains("mag", TString::kIgnoreCase) || opt == NULL)
     {
+  
       *fLog << inf << "Star maginitude:" << endl;
       *fLog << inf << " Expected \t" << setw(4) << fMagExp << endl;
@@ -165 +188 @@
       *fLog << inf << " ChiSquare/Ndof \t " << setw(3) << fChiSquare << "/" << fNdof << endl;
     }
+
+  if (o.Contains("err", TString::kIgnoreCase) || opt == NULL)
+    {
+      *fLog << inf << "Minuit Error Matrix:" << endl;
+      *fLog << inf << " xx,xy,yy \t " << setw(3) << fXXErr << ", " << fXYErr << ", " << fYYErr << endl;
+    }
+
+
 }

trunk/MagicSoft/Mars/mtemp/MStarLocalPos.h

@@ -34 +34 @@
     Float_t fSigmaMajorAxisFit;  //[mm]
     Float_t fChiSquare;
+    Float_t fXXErr;              //minuit error matrix elements
+    Float_t fXYErr;
+    Float_t fYYErr;
     Int_t   fNdof;
 
@@ -66 +69 @@
     Float_t GetSigmaMinorAxis() {return fSigmaMinorAxisFit!=0?fSigmaMinorAxisFit:fSigmaMinorAxisCalc;}
     Float_t GetSigmaMajorAxis() {return fSigmaMajorAxisFit!=0?fSigmaMajorAxisFit:fSigmaMajorAxisCalc;}
+    
+    Float_t GetXXErr() {return fXXErr;}
+    Float_t GetXYErr() {return fXYErr;}
+    Float_t GetYYErr() {return fYYErr;}
 
     void Reset();
@@ -72 +79 @@
     void SetCalcValues(Float_t mag, Float_t max, Float_t x, Float_t y, Float_t sigmaMinorAxis, Float_t sigmaMajorAxis);
     void SetFitValues(Float_t mag, Float_t max, Float_t x, Float_t y, Float_t sigmaMinorAxis, Float_t sigmaMajorAxis, Float_t chi, Int_t ndof);
+    void SetFitValues(Float_t mag, Float_t max, Float_t x, Float_t y, Float_t sigmaMinorAxis, Float_t sigmaMajorAxis, Float_t chi, Int_t ndof, Float_t xx, Float_t xy, Float_t yy);
 
     void Paint(Option_t *opt=NULL);