Changeset 4545 for trunk/MagicSoft/Mars/mtemp/MStarLocalPos.h

Timestamp:

08/09/04 15:48:03 (20 years ago)

Author:

wittek

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/MStarLocalPos.h (modified) (6 diffs)

trunk/MagicSoft/Mars/mtemp/MStarLocalPos.h

@@ -11 +11 @@
 
     //Expected position on camera
-    
     Float_t fMagExp;
     Float_t fXExp;    //[mm]
@@ -17 +16 @@
 
     //Info from calculation
-
     Float_t fMagCalc;
     Float_t fMaxCalc;            //[uA]
@@ -25 +23 @@
     Float_t fSigmaMajorAxisCalc; //[mm]
 
-    //Info from fit
-
+    //Info from uncorrelated Gauss fit
     Float_t fMagFit;
     Float_t fMaxFit;             //[uA]
@@ -33 +30 @@
     Float_t fSigmaMinorAxisFit;  //[mm]
     Float_t fSigmaMajorAxisFit;  //[mm]
-    Float_t fChiSquare;
-    Float_t fXXErr;              //minuit error matrix elements
+    Float_t fXXErr;          
     Float_t fXYErr;
     Float_t fYYErr;
+
+    Float_t fChiSquare;
     Int_t   fNdof;
+
+    //Info from correlated Gauss fit
+    Float_t fMagCGFit;
+    Float_t fMaxCGFit;             //[uA]
+    Float_t fMeanXCGFit;           //[mm]
+    Float_t fMeanYCGFit;           //[mm]
+    Float_t fSigmaXCGFit;          //[mm]
+    Float_t fSigmaYCGFit;          //[mm]
+    Float_t fCorrXYCGFit;          // correlation coefficient
+    Float_t fXXErrCGFit;           // error matrix of (fMeanXCGFit,fMeanYCGFit)
+    Float_t fXYErrCGFit;
+    Float_t fYYErrCGFit;
+
+    Float_t fChiSquareCGFit;
+    Int_t   fNdofCGFit;
+
 
 public:
@@ -70 +84 @@
     Float_t GetSigmaMajorAxis() {return fSigmaMajorAxisFit!=0?fSigmaMajorAxisFit:fSigmaMajorAxisCalc;}
     
-    Float_t GetXXErr() {return fXXErr;}
-    Float_t GetXYErr() {return fXYErr;}
-    Float_t GetYYErr() {return fYYErr;}
+    // getters for the correlated Gauss fit
+    Float_t GetMagCGFit()           {return fMagCGFit;}
+    Float_t GetMaxCGFit()           {return fMaxCGFit;}
+    Float_t GetMeanXCGFit()         {return fMeanXCGFit;}
+    Float_t GetMeanYCGFit()         {return fMeanYCGFit;}
+    Float_t GetSigmaXCGFit()        {return fSigmaXCGFit;}
+    Float_t GetSigmaYCGFit()        {return fSigmaYCGFit;}
+    Float_t GetCorrXYCGFit()        {return fCorrXYCGFit;}
+    Float_t GetXXErrCGFit()         {return fXXErrCGFit;}
+    Float_t GetXYErrCGFit()         {return fXYErrCGFit;}
+    Float_t GetYYErrCGFit()         {return fYYErrCGFit;}
+    Float_t GetChiSquareCGFit()     {return fChiSquareCGFit;}
+    UInt_t GetNdofCGFit()           {return fNdofCGFit;}
+    Float_t GetChiSquareNdofCGFit() {return fChiSquareCGFit/fNdofCGFit;}
+
 
     void Reset();
 
     void SetExpValues(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);
-    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 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 sigmaX, Float_t sigmaY, 
+                      Float_t chi, Int_t ndof, 
+                      Float_t xx, Float_t xy, Float_t yy);
+
+    void SetCGFitValues(Float_t mag, Float_t max, Float_t x, Float_t y, 
+                        Float_t sigmaX, Float_t sigmaY, Float_t correlation, 
+                        Float_t xx, Float_t xy, Float_t yy,
+                        Float_t chi, Int_t ndof);
 
     void Paint(Option_t *opt=NULL);
@@ -88 +128 @@
 
 #endif
+
+