Changeset 4796 for trunk

Timestamp:

08/30/04 06:30:45 (20 years ago)

Author:

wittek

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/MTelAxisFromStars.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/mtemp/MTelAxisFromStars.cc

@@ -179 +179 @@
    }
 
+   //-----------------------------------------------------------------
     fStarCamTrans = new MStarCamTrans(*geom, *obs);
+
+   *fLog << all   << "MTelAxisFromStars::Preprocess; the optical aberration factor is set equal to : " 
+         << fAberr ;
+
+   *fLog << all   << "MTelAxisFromStars::Preprocess; input type is set equal to : " 
+         << fInputType ;
+   if (fInputType == 0)
+     *fLog << " (calculated star positions)" << endl;
+   else
+     *fLog << " (fitted star positions)" << endl;
+
+   *fLog << all << "MTelAxisFromStars::Preprocess; scale factor will be fixed at : " 
+         << fFixedScaleFactor << endl;
+
+   *fLog << all << "MTelAxisFromStars::Preprocess; rotation angle will be fixed at : " 
+         << fFixedRotationAngle << endl;
 
     return kTRUE;
@@ -196 +213 @@
 void MTelAxisFromStars::SetOpticalAberr(Double_t aberr)
 {
-  *fLog << all   << "MTelAxisFromStars::SetOpticalAberr; the optical aberration factor is set equal to : " 
-        << aberr ;
-
   fAberr = aberr;
 }
@@ -211 +225 @@
 void MTelAxisFromStars::SetInputType(Int_t type)
 {
-  *fLog << all   << "MTelAxisFromStars::SetInputType; input type is set equal to : " 
-        << type ;
-  if (type == 0)
-    *fLog << " (calculated star positions)" << endl;
-  else
-    *fLog << " (fitted star positions)" << endl;
-
   fInputType = type;
 }
@@ -228 +235 @@
 void MTelAxisFromStars::FixScaleFactorAt(Double_t lambda)
 {
-  *fLog << all << "MTelAxisFromStars::FixScaleFactorAt; scale factor will be fixed at : " 
-        << lambda << endl;
-
   fFixedScaleFactor = lambda;
 }
@@ -242 +246 @@
 void MTelAxisFromStars::FixRotationAngleAt(Double_t alfa)
 {
-  *fLog << all << "MTelAxisFromStars::FixRotationAngleAt; rotation angle will be fixed at : " 
-        << alfa << endl;
-
   fFixedRotationAngle = alfa;    // [degrees]
 }
@@ -405 +406 @@
   if (fNStars < 1)
   {
-    *fLog << "MTelAxisFromStars::Process; no star for MTelAxisFromStars"
-          << endl;
+    //*fLog << "MTelAxisFromStars::Process; no star for MTelAxisFromStars"
+    //      << endl;
     fitOK = kFALSE;
   }
@@ -417 +418 @@
   }
 
-  if (!fitOK)
+  if (!fitOK  &&  fNStars >= 1)
   {
     *fLog << err 
@@ -423 +424 @@
           << endl;
     
-    if (fNStars > 0)
-    {
-      *fLog << err 
-            << "    fNumIter, fNdof, fChi2, fChi2Prob = " << fNumIter
-            << ",  " << fNdof << ",  " << fChi2 << ",  " << fChi2Prob << endl;
-    }
+    //if (fNStars > 0)
+    //{
+    //  *fLog << err 
+    //        << "    fNumIter, fNdof, fChi2, fChi2Prob = " << fNumIter
+    //        << ",  " << fNdof << ",  " << fChi2 << ",  " << fChi2Prob << endl;
+    //}
 
     return kTRUE;
@@ -472 +473 @@
   SetSourcePosition(fStarCamTrans, fPointPos, fSourcePos, fSrcPos);
 
-  *fLog << "after calling SetSourcePosition : , X, Y ,fD = " 
-        << fSrcPos->GetX() << ",  " << fSrcPos->GetY() << ",  "
-        << fD[0] << ",  " << fD[1] << endl;
+  //*fLog << "after calling SetSourcePosition : , X, Y ,fD = " 
+  //      << fSrcPos->GetX() << ",  " << fSrcPos->GetY() << ",  "
+  //      << fD[0] << ",  " << fD[1] << endl;
 
   //--------------------------------------
@@ -1085 +1086 @@
   fChi2Prob = TMath::Prob(fChi2, fNdof);
 
-  *fLog << "MTelAxisFromStars::FindSkyCamTrans :" << endl;
-  *fLog <<  "   fNumStars, fChi2, fNdof, fChi2Prob, fNumIter, fChangeofd2, dalfa, dlambda = "
-        << fNumStars << ",  " << fChi2 << ",  " << fNdof << ",  " 
-        << fChi2Prob << ",  " 
-        << fNumIter << ",  "  << fChangeofd2 << ",  " << dalfa << ",  "
-        << dlambda << endl;
-  *fLog << "    lambda, alfadeg, d[0], d[1] = " << lambda << ",  " 
-        << alfadeg   << ",  " << d[0] << ",  " << d[1] << endl;
+  //*fLog << "MTelAxisFromStars::FindSkyCamTrans :" << endl;
+  //*fLog <<  "   fNumStars, fChi2, fNdof, fChi2Prob, fNumIter, fChangeofd2, dalfa, dlambda = "
+  //      << fNumStars << ",  " << fChi2 << ",  " << fNdof << ",  " 
+  //      << fChi2Prob << ",  " 
+  //      << fNumIter << ",  "  << fChangeofd2 << ",  " << dalfa << ",  "
+  //      << dlambda << endl;
+  //*fLog << "    lambda, alfadeg, d[0], d[1] = " << lambda << ",  " 
+  //      << alfadeg   << ",  " << d[0] << ",  " << d[1] << endl;
 
   return kTRUE;
@@ -1175 +1176 @@
   fpointpos->SetReadyToSave();
 
-  *fLog << "SetPointingPosition : decdrive, hdrive, radrive Xpoint, Ypoint = "
-        << decdrive << ",  " << hdrive << ",  " << radrive << ",  "
-        << Xpoint << ",  " << Ypoint << endl;
-
-  *fLog << "SetPointingPosition : thetadrive, phidrive, thetapoint, phipoint = "       
-        << thetadrive << ",  " << phidrive << ",  " << thetapoint << ",  "
-        << phipoint << endl;
+  //*fLog << "SetPointingPosition : decdrive, hdrive, radrive Xpoint, Ypoint = "
+  //      << decdrive << ",  " << hdrive << ",  " << radrive << ",  "
+  //      << Xpoint << ",  " << Ypoint << endl;
+
+  //*fLog << "SetPointingPosition : thetadrive, phidrive, thetapoint, phipoint = "       
+  //      << thetadrive << ",  " << phidrive << ",  " << thetapoint << ",  "
+  //      << phipoint << endl;
 
   return kTRUE;
@@ -1228 +1229 @@
   fsourcepos->SetReadyToSave();
 
-  *fLog << "SetSourcePosition : decpoint, hpoint, decsource, hsource, Xsource, Ysource = "
-        << decpoint << ",  " << hpoint << ",  " << decsource << ",  "
-        << hsource  << ",  " << Xsource << ",  " << Ysource << endl;
-  *fLog << "SetSourcePosition : thetapoint, phipoint, thetasource, phisource = "
-        << thetapoint << ",  " << phipoint << ",  " << thetasource << ",  "
-        << phisource << endl;
+  //*fLog << "SetSourcePosition : decpoint, hpoint, decsource, hsource, Xsource, Ysource = "
+  //      << decpoint << ",  " << hpoint << ",  " << decsource << ",  "
+  //      << hsource  << ",  " << Xsource << ",  " << Ysource << endl;
+  //*fLog << "SetSourcePosition : thetapoint, phipoint, thetasource, phisource = "
+  //      << thetapoint << ",  " << phipoint << ",  " << thetasource << ",  "
+  //      << phisource << endl;
 
   return kTRUE;