Changeset 4709

Timestamp:

08/23/04 14:01:25 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mstarcam/MStarPos.cc (modified) (11 diffs)
• mstarcam/MStarPos.h (modified) (3 diffs)
• mtemp/MSourceDirections.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mstarcam/MStarPos.cc

@@ -50 +50 @@
     //Expected position on camera
      fMagExp = 0.;
-     fXExp = 0.;
-     fYExp = 0.;
+     fXExp   = 0.;
+     fYExp   = 0.;
+
+    //Ideal position on camera
+     fMagIdeal = 0.;
+     fXIdeal   = 0.;
+     fYIdeal   = 0.;
 
     //Info from calculation
-     fMagCalc = 0.;
-     fMaxCalc = 0.;
-     fMeanXCalc = 0.;
-     fMeanYCalc = 0.;
-     fSigmaMinorAxisCalc = 0.;
-     fSigmaMajorAxisCalc = 0.;
-
-    //Info from uncorrelated Gauss fit
-     fMagFit = 0.;
-     fMaxFit = 0.;
-     fMeanXFit = 0.;
-     fMeanYFit = 0.;
-     fSigmaMinorAxisFit = 0.;
-     fSigmaMajorAxisFit = 0.;
-
-     fChiSquare = 0.;
-     fNdof = 1;
-
-    //Info from correlated Gauss fit
-     fMagCGFit    = 0.;
-     fMaxCGFit    = 0.;
-     fMeanXCGFit  = 0.;
-     fMeanYCGFit  = 0.;
-     fSigmaXCGFit = 0.;
-     fSigmaYCGFit = 0.;
-     fCorrXYCGFit = 0.;
-     fXXErrCGFit  = 0.;
-     fXYErrCGFit  = 0.;
-     fYYErrCGFit  = 0.;
-
-     fChiSquareCGFit = 0.;
-     fNdofCGFit      = 1;
+     fMagCalc    = 0.;
+     fMaxCalc    = 0.;
+     fMeanXCalc  = 0.;
+     fMeanYCalc  = 0.;
+     fSigmaXCalc = 0.;
+     fSigmaYCalc = 0.;
+     fCorrXYCalc = 0.;
+     fXXErrCalc  = 0.;
+     fXYErrCalc  = 0.;
+     fYYErrCalc  = 0.;
+
+    //Info from Gauss fit
+     fMagFit    = 0.;
+     fMaxFit    = 0.;
+     fMeanXFit  = 0.;
+     fMeanYFit  = 0.;
+     fSigmaXFit = 0.;
+     fSigmaYFit = 0.;
+     fCorrXYFit = 0.;
+     fXXErrFit  = 0.;
+     fXYErrFit  = 0.;
+     fYYErrFit  = 0.;
+
+     fChiSquareFit = 0.;
+     fNdofFit      = 1;
 
 }
@@ -103 +101 @@
 }
 
-void MStarPos::SetCalcValues(Float_t mag, Float_t max, 
-        Float_t x, Float_t y, Float_t sigmaMinorAxis, Float_t sigmaMajorAxis)
-{
-     fMagCalc = mag;
-     fMaxCalc = max;
-     fMeanXCalc = x;
-     fMeanYCalc = y;
-     fSigmaMinorAxisCalc = sigmaMinorAxis;
-     fSigmaMajorAxisCalc = sigmaMajorAxis;
-}
-
-void MStarPos::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)
-{
-     fMagFit = mag;
-     fMaxFit = max;
-     fMeanXFit = x;
-     fMeanYFit = y;
-     fSigmaMinorAxisFit = sigmaMinorAxis;
-     fSigmaMajorAxisFit = sigmaMajorAxis;
-     fChiSquare = chiSquare;
-     fNdof = ndof;
-}
-
-void MStarPos::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;
-}
-
-void MStarPos::SetCGFitValues(
+void MStarPos::SetCalcValues(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)
+{
+     fMagCalc    = mag;
+     fMaxCalc    = max;
+     fMeanXCalc  = x;
+     fMeanYCalc  = y;
+     fSigmaXCalc = sigmaX;
+     fSigmaYCalc = sigmaY;
+     fCorrXYCalc = correlation;
+     fXXErrCalc  = xx;
+     fXYErrCalc  = xy;
+     fYYErrCalc  = yy;
+}
+
+
+void MStarPos::SetFitValues(
                Float_t mag,       Float_t max,    Float_t x,    Float_t y, 
                Float_t sigmaX,    Float_t sigmaY, Float_t correlation, 
@@ -145 +124 @@
                Float_t chiSquare, Int_t ndof)
 {
-     fMagCGFit    = mag;
-     fMaxCGFit    = max;
-     fMeanXCGFit  = x;
-     fMeanYCGFit  = y;
-     fSigmaXCGFit = sigmaX;
-     fSigmaYCGFit = sigmaY;
-     fCorrXYCGFit = correlation;
-     fXXErrCGFit  = xx;
-     fXYErrCGFit  = xy;
-     fYYErrCGFit  = yy;
-
-     fChiSquareCGFit = chiSquare;
-     fNdofCGFit      = ndof;
+     fMagFit    = mag;
+     fMaxFit    = max;
+     fMeanXFit  = x;
+     fMeanYFit  = y;
+     fSigmaXFit = sigmaX;
+     fSigmaYFit = sigmaY;
+     fCorrXYFit = correlation;
+     fXXErrFit  = xx;
+     fXYErrFit  = xy;
+     fYYErrFit  = yy;
+
+     fChiSquareFit = chiSquare;
+     fNdofFit      = ndof;
 }
 
@@ -173 +152 @@
   mexp.Paint(); 
 
-  if (fSigmaMinorAxisCalc>0. && fSigmaMajorAxisCalc>0.)
-    {
-      TEllipse ecalc(fMeanXCalc, fMeanYCalc, fSigmaMinorAxisCalc, fSigmaMajorAxisCalc, 0, 360, 0);
+  if (fSigmaXCalc>0. && fSigmaYCalc>0.)
+    {
+      TEllipse ecalc(fMeanXCalc, fMeanYCalc, fSigmaXCalc, fSigmaYCalc, 
+                     0, 360, 0);
       ecalc.SetLineWidth(3);
-      ecalc.SetLineColor(kBlue);
+      //ecalc.SetLineColor(kBlue);
+      ecalc.SetLineColor(kMagenta);
       ecalc.Paint();
     }
 
-  if (fSigmaMinorAxisFit>0. && fSigmaMajorAxisFit>0.)
-    {
-      TEllipse efit(fMeanXFit, fMeanYFit, fSigmaMinorAxisFit, fSigmaMajorAxisFit, 0, 360, 0);
-      efit.SetLineWidth(3);
-      efit.SetLineColor(kBlack);
-      efit.Paint();
-    }
-
-  if (fSigmaXCGFit>0. && fSigmaYCGFit>0.)
+  if (fSigmaXFit>0. && fSigmaYFit>0.)
     {
       //Print a cross in the fitted position
-      //TMarker mCGFit(fMeanXCGFit, fMeanYCGFit, 3);
-      //mCGFit.SetMarkerSize(3);
-      //mCGFit.SetMarkerColor(1);
-      //mCGFit.Paint(); 
-
-      Double_t cxx = fSigmaXCGFit*fSigmaXCGFit;
-      Double_t cyy = fSigmaYCGFit*fSigmaYCGFit;
+      //TMarker mFit(fMeanXFit, fMeanYFit, 3);
+      //mFit.SetMarkerSize(3);
+      //mFit.SetMarkerColor(1);
+      //mFit.Paint(); 
+
+      Double_t cxx = fSigmaXFit*fSigmaXFit;
+      Double_t cyy = fSigmaYFit*fSigmaYFit;
       Double_t d   = cyy - cxx;
-      Double_t cxy = fCorrXYCGFit * fSigmaXCGFit * fSigmaYCGFit;
+      Double_t cxy = fCorrXYFit * fSigmaXFit * fSigmaYFit;
       Double_t tandel;
       if (cxy != 0.0)
@@ -216 +189 @@
                         / (1.0 + tandel*tandel);  
 
-      TEllipse efit(fMeanXCGFit, fMeanYCGFit, sqrt(major), sqrt(minor), 
+      TEllipse efit(fMeanXFit, fMeanYFit, sqrt(major), sqrt(minor), 
                     0, 360,      delta*kRad2Deg);
       efit.SetLineWidth(3);
-      efit.SetLineColor(kMagenta);
+      //efit.SetLineColor(kMagenta);
+      //efit.SetLineColor(kBlack);
       efit.Paint();
     }
@@ -237 +211 @@
   
       *fLog << inf << "Star magnitude:" << endl;
+      *fLog << inf << " Ideal \t" << setw(4) << fMagIdeal << endl;
       *fLog << inf << " Expected \t" << setw(4) << fMagExp << endl;
       *fLog << inf << " Calcultated \t " << setw(4) << fMagCalc << endl;
       *fLog << inf << " Fitted \t " << setw(4) << fMagFit << endl;
-      *fLog << inf << " CGFitted \t " << setw(4) << fMagCGFit << endl;
     }
   
@@ -249 +223 @@
             << endl;
       *fLog << inf << " Fitted \t " << setw(4) << fMaxFit << " uA" << endl;
-      *fLog << inf << " CGFitted \t " << setw(4) << fMaxCGFit << " uA" << endl;
     }
   
@@ -255 +228 @@
     {
       *fLog << inf << "Star position:" << endl;
+      *fLog << inf << " Ideal \t X " << setw(4) << fXIdeal 
+            << " mm \tY " << setw(4) << fYIdeal << " mm" << endl;
       *fLog << inf << " Expected \t X " << setw(4) << fXExp 
             << " mm \tY " << setw(4) << fYExp << " mm" << endl;
@@ -261 +236 @@
       *fLog << inf << " Fitted \t X " << setw(4) << fMeanXFit 
             << " mm \tY " << setw(4) << fMeanYFit << " mm" << endl;
-      *fLog << inf << " CGFitted \t X " << setw(4) << fMeanXCGFit 
-            << " mm \tY " << setw(4) << fMeanYCGFit << " mm" << endl;
     }
 
@@ -268 +241 @@
     {
       *fLog << inf << "Star size:" << endl;
-      *fLog << inf << " Calcultated \t X " << setw(4) << fSigmaMinorAxisCalc 
-            << " mm \tY " << setw(4) << fSigmaMajorAxisCalc << " mm" << endl;
-      *fLog << inf << " Fitted \t X " << setw(4) << fSigmaMinorAxisFit 
-            << " mm \tY " << setw(4) << fSigmaMajorAxisFit << " mm" << endl;
-      *fLog << inf << " CGFitted \t X " << setw(4) << fSigmaXCGFit 
-            << " mm \tY " << setw(4) << fSigmaYCGFit << " mm \t correlation" 
-            << setw(4) << fCorrXYCGFit << endl;
+      *fLog << inf << " Calcultated \t X " << setw(4) << fSigmaXCalc 
+            << " mm \tY " << setw(4) << fSigmaYCalc << " mm \t correlation " 
+            << setw(4) << fCorrXYCalc << endl;
+      *fLog << inf << " Fitted \t X " << setw(4) << fSigmaXFit 
+            << " mm \tY " << setw(4) << fSigmaYFit << " mm \t correlation " 
+            << setw(4) << fCorrXYFit << endl;
     }
 
@@ -280 +252 @@
     {
       *fLog << inf << "Star Fit Quality:" << endl;
-      *fLog << inf << " ChiSquare/Ndof \t " << setw(3) << fChiSquare 
-            << "/" << fNdof << endl;
-
-      *fLog << inf << "Star CGFit Quality:" << endl;
-      *fLog << inf << " ChiSquareCGFit/NdofCGFit \t " << setw(3) 
-            << fChiSquareCGFit << "/" << fNdofCGFit << endl;
+      *fLog << inf << " ChiSquareFit/NdofFit \t " << setw(3) 
+            << fChiSquareFit << "/" << fNdofFit << endl;
     }
 
   if (o.Contains("err", TString::kIgnoreCase) || opt == NULL)
     {
-      *fLog << inf << "CGFit Error Matrix of (fMeanXCGFit,fMeanYCGFit) :" 
+      *fLog << inf << "Error Matrix of (fMeanX,fMeanY) :" 
             << endl;
-      *fLog << inf << " xx,xy,yy \t " << setw(3) << fXXErrCGFit << ", " 
-            << fXYErrCGFit << ", " << fYYErrCGFit << endl;
+      *fLog << inf << " xxCalc,xyCalc,yyCalc \t " << setw(3) << fXXErrCalc 
+            << ", " << fXYErrCalc << ", " << fYYErrCalc << endl;
+      *fLog << inf << " xxFit,xyFit,yyFit \t " << setw(3) << fXXErrFit << ", " 
+            << fXYErrFit << ", " << fYYErrFit << endl;
     }
 

trunk/MagicSoft/Mars/mstarcam/MStarPos.h

@@ -25 +25 @@
     Float_t fMeanXCalc;          //[mm]
     Float_t fMeanYCalc;          //[mm]
-    Float_t fSigmaMinorAxisCalc; //[mm]
-    Float_t fSigmaMajorAxisCalc; //[mm]
+    Float_t fSigmaXCalc;         //[mm]
+    Float_t fSigmaYCalc;         //[mm]
+    Float_t fCorrXYCalc;          // correlation coefficient
+    Float_t fXXErrCalc;           // error matrix of (fMeanXCalc,fMeanYCalc)
+    Float_t fXYErrCalc;
+    Float_t fYYErrCalc;
 
-    //Info from uncorrelated Gauss fit
+    //Info from Gauss fit
     Float_t fMagFit;
     Float_t fMaxFit;             //[uA]
     Float_t fMeanXFit;           //[mm]
     Float_t fMeanYFit;           //[mm]
-    Float_t fSigmaMinorAxisFit;  //[mm]
-    Float_t fSigmaMajorAxisFit;  //[mm]
-    Float_t fXXErr;          
-    Float_t fXYErr;
-    Float_t fYYErr;
+    Float_t fSigmaXFit;          //[mm]
+    Float_t fSigmaYFit;          //[mm]
+    Float_t fCorrXYFit;          // correlation coefficient
+    Float_t fXXErrFit;           // error matrix of (fMeanXFit,fMeanYFit)
+    Float_t fXYErrFit;
+    Float_t fYYErrFit;
 
-    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;
+    Float_t fChiSquareFit;
+    Int_t   fNdofFit;
 
 
@@ -75 +65 @@
     Float_t GetMeanXCalc() {return fMeanXCalc;}
     Float_t GetMeanYCalc() {return fMeanYCalc;}
-    Float_t GetSigmaMinorAxisCalc() {return fSigmaMinorAxisCalc;}
-    Float_t GetSigmaMajorAxisCalc() {return fSigmaMajorAxisCalc;}
+    Float_t GetSigmaXCalc() {return fSigmaXCalc;}
+    Float_t GetSigmaYCalc() {return fSigmaYCalc;}
+    Float_t GetCorrXYCalc()        {return fCorrXYCalc;}
+    Float_t GetXXErrCalc()         {return fXXErrCalc;}
+    Float_t GetXYErrCalc()         {return fXYErrCalc;}
+    Float_t GetYYErrCalc()         {return fYYErrCalc;}
 
-    Float_t GetMagFit() {return fMagFit;}
-    Float_t GetMaxFit() {return fMaxFit;}
-    Float_t GetMeanXFit() {return fMeanXFit;}
-    Float_t GetMeanYFit() {return fMeanYFit;}
-    Float_t GetSigmaMinorAxisFit() {return fSigmaMinorAxisFit;}
-    Float_t GetSigmaMajorAxisFit() {return fSigmaMajorAxisFit;}
-    Float_t GetChiSquare() {return fChiSquare;}
-    UInt_t GetNdof() {return fNdof;}
-    Float_t GetChiSquareNdof() {return fChiSquare/fNdof;}
+    
+    // getters for the Gauss fit
+    Float_t GetMagFit()           {return fMagFit;}
+    Float_t GetMaxFit()           {return fMaxFit;}
+    Float_t GetMeanXFit()         {return fMeanXFit;}
+    Float_t GetMeanYFit()         {return fMeanYFit;}
+    Float_t GetSigmaXFit()        {return fSigmaXFit;}
+    Float_t GetSigmaYFit()        {return fSigmaYFit;}
+    Float_t GetCorrXYFit()        {return fCorrXYFit;}
+    Float_t GetXXErrFit()         {return fXXErrFit;}
+    Float_t GetXYErrFit()         {return fXYErrFit;}
+    Float_t GetYYErrFit()         {return fYYErrFit;}
+    Float_t GetChiSquareFit()     {return fChiSquareFit;}
+    UInt_t  GetNdofFit()          {return fNdofFit;}
+    Float_t GetChiSquareNdofFit() {return fChiSquareFit/fNdofFit;}
 
+    // -----
     Float_t GetMeanX() {return fMeanXFit!=0?fMeanXFit:fMeanXCalc;}
-    Float_t GetMeanY() {return fMeanXFit!=0?fMeanYFit:fMeanYCalc;}
-    Float_t GetSigmaMinorAxis() {return fSigmaMinorAxisFit!=0?fSigmaMinorAxisFit:fSigmaMinorAxisCalc;}
-    Float_t GetSigmaMajorAxis() {return fSigmaMajorAxisFit!=0?fSigmaMajorAxisFit:fSigmaMajorAxisCalc;}
-    
-    // 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;}
+    Float_t GetMeanY() {return fMeanYFit!=0?fMeanYFit:fMeanYCalc;}
+
+    Float_t GetSigmaX() {return fSigmaXFit!=0?fSigmaXFit:fSigmaXCalc;}
+    Float_t GetSigmaY() {return fSigmaYFit!=0?fSigmaYFit:fSigmaYCalc;}
 
 
@@ -115 +102 @@
     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);
+    void SetCalcValues(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);
 
-    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 SetFitValues(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);

trunk/MagicSoft/Mars/mtemp/MSourceDirections.cc

@@ -124 +124 @@
 
   Int_t rc = fAstro.AddObject(ra,dec,1,name);
-
+//   if (rc) {
+//     MStarPos *starpos = new MStarPos;
+//     starpos->SetName(name);
+//     fStars->GetList()->Add(starpos);
+//   }
   return rc;
 }