Changeset 4798 for trunk

Timestamp:

08/30/04 07:41:22 (20 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp

Files:

• MHTelAxisFromStars.cc (modified) (3 diffs)
• MTelAxisFromStars.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mtemp/MHTelAxisFromStars.cc

@@ -446 +446 @@
 
       while( (starSource = (MStarPos*)nextSource()) )
-      //if (starSource)
       {
         if (fInputType == 1)
@@ -459 +458 @@
         }
 
-        if (x>lowx  && x<higx  && y>lowy  && y<higy)
+        if (x>lowx  && x<higx  && y>lowy  && y<higy)
         {
          if     ( fNstarnames > 0  &&  starSource->GetName() == fStarnames[0] )
@@ -469 +468 @@
          else if( fNstarnames > 2  &&  starSource->GetName() == fStarnames[2] )
            fEstPos3->Fill(x, y, w);
-        }
-
-        /*
-        starSource = (MStarPos*)nextSource();
-        if (starSource)
-        {
-          if (fInputType == 1)
-          {
-            x = scale * starSource->GetMeanXFit(); 
-            y = scale * starSource->GetMeanYFit(); 
-          }
-          else 
-          {
-            x = scale * starSource->GetMeanXCalc(); 
-            y = scale * starSource->GetMeanYCalc(); 
-          }
-
-          if (x>lowx  && x<higx  && y>lowy  && y<higy)
-          {
-            fEstPos2  ->Fill(x, y, w);
-            //fEstPos2->SetName(starSource->GetName());
-          }
-
-          starSource = (MStarPos*)nextSource();
-          if (starSource)
-          {
-            if (fInputType == 1)
-            {
-              x = scale * starSource->GetMeanXFit(); 
-              y = scale * starSource->GetMeanYFit(); 
-            }
-            else 
-            {
-              x = scale * starSource->GetMeanXCalc(); 
-              y = scale * starSource->GetMeanYCalc(); 
-            }
-
-            if (x>lowx  && x<higx  && y>lowy  && y<higy)
-            {
-              fEstPos3  ->Fill(x, y, w);
-              //fEstPos3->SetName(starSource->GetName());
-            }
-          }
-        }
-        */
-
+        }
       }
     }

trunk/MagicSoft/Mars/mtemp/MTelAxisFromStars.cc

@@ -529 +529 @@
        Double_t corr = esxy[0][1][ix] / 
                        TMath::Sqrt( esxy[0][0][ix] * esxy[1][1][ix] );
-       starSource->SetFitValues(100.0, 100.0, bsxy[0][ix], bsxy[1][ix],
-                TMath::Sqrt(esxy[0][0][ix]), TMath::Sqrt(esxy[1][1][ix]), corr,
-                esxy[0][0][ix],       esxy[0][1][ix],       esxy[1][1][ix], 
-                fChi2, fNdof); 
+       if (fInputType == 1)
+       {
+         starSource->SetFitValues(100.0, 100.0, bsxy[0][ix], bsxy[1][ix],
+               TMath::Sqrt(esxy[0][0][ix]), TMath::Sqrt(esxy[1][1][ix]), corr,
+               esxy[0][0][ix],       esxy[0][1][ix],       esxy[1][1][ix], 
+               fChi2, fNdof); 
+       }
+       else
+       {
+         starSource->SetCalcValues(100.0, 100.0, bsxy[0][ix], bsxy[1][ix],
+               TMath::Sqrt(esxy[0][0][ix]), TMath::Sqrt(esxy[1][1][ix]), corr,
+               esxy[0][0][ix],       esxy[0][1][ix],       esxy[1][1][ix]); 
+       }
 
       ix++;
@@ -1114 +1123 @@
     return;
 
+  //*fLog << "MTelAxisFromStars::TransSkyCam; lambda, A, d = " 
+  //      << lambda << ";    " << A[0][0] << ",  " << A[0][1] << ",  "
+  //      << A[1][1] << ";   " << d[0] << ",  " << d[1] << endl;   
+
   //*fLog << "MTelAxisFromStars::TransSkyCam; expected and estimated positions :"
   //      << endl;
@@ -1119 +1132 @@
   for (Int_t ix=0; ix<numpos; ix++)
   {
-      //*fLog << "MTelAxisFromStars;  ix = " << ix << endl;
+    //    *fLog << "MTelAxisFromStars;  ix = " << ix << endl;
 
       b[0][ix] = lambda * (A[0][0]*a[0][ix] + A[0][1]*a[1][ix]) + d[0];
@@ -1129 +1142 @@
       e[1][1][ix] = errd[1][1];
 
-      //*fLog << "    ix, a[0], a[1], b[0], b[1], errxx, errxy, erryy = " 
+      // *fLog << "    ix, a[0], a[1], b[0], b[1], errxx, errxy, erryy = " 
       //      << ix << " :   " 
       //      << a[0][ix] << ",  " << a[1][ix] << ";    "