Changeset 4744 for trunk/MagicSoft/Mars/mtemp

Timestamp:

08/26/04 15:28:53 (20 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp

Files:

• MTelAxisFromStars.cc (modified) (3 diffs)
• MTelAxisFromStars.h (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/MTelAxisFromStars.cc

@@ -137 +137 @@
 
    //-----------------------------------------------------------------
-    fSrcPos = (MSrcPosCam*)pList->FindCreateObj(AddSerialNumber("MSrcPosCam"));
+    fSrcPos = (MSrcPosCam*)pList->FindCreateObj(AddSerialNumber("MSrcPosCam"), "MSrcPosCam");
     if (!fSrcPos)
     {
         *fLog << err << "MTelAxisFromStars::PreProcess;  MSrcPosCam not found...  aborting" << endl;
+        return kFALSE;
+    }
+
+    fPntPos = (MSrcPosCam*)pList->FindCreateObj(AddSerialNumber("MSrcPosCam"), "MPntPosCam");
+    if (!fPntPos)
+    {
+        *fLog << err << "MTelAxisFromStars::PreProcess;  MPntPosCam not found...  aborting" << endl;
         return kFALSE;
     }
@@ -446 +453 @@
                               fNumStars, fNumIter, fNdof, fChi2, fChi2Prob);
   fSkyCamTrans->SetReadyToSave();
+
+  //--------------------------------------
+  // Put the camera position (X, Y) 
+  // obtained by transforming the camera center (0, 0)
+  // into MPntPosCam[MSrcPosCam]
+
+  fPntPos->SetXY(fD[0], fD[1]);
+  fPntPos->SetReadyToSave();       
 
 
@@ -469 +484 @@
 
   SetSourcePosition(fStarCamTrans, fPointPos, fSourcePos, fSrcPos);
-  //fSrcPos->SetXY(fD[0], fD[1]);
-  //fSrcPos->SetReadyToSave();       
+
   *fLog << "after calling SetSourcePosition : , X, Y ,fD = " 
         << fSrcPos->GetX() << ",  " << fSrcPos->GetY() << ",  "

trunk/MagicSoft/Mars/mtemp/MTelAxisFromStars.h

@@ -38 +38 @@
     MPointingPos        *fSourcePos;      //!
     MSrcPosCam          *fSrcPos;         //!
+    MSrcPosCam          *fPntPos;         //!
     MSkyCamTrans        *fSkyCamTrans;    //!
     MStarCamTrans       *fStarCamTrans;   //!