Changeset 7179 for trunk/MagicSoft/Mars/mpointing

Timestamp:

07/11/05 10:34:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -19 +19 @@
 !   Author(s): Abelardo Moralejo 1/2005 <mailto:moralejo@pd.infn.it>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -28 +28 @@
 // MSrcPosCalc
 //
-// Calculate the current source position in the camera from the (possibly already
-// corrected, by starguider) J2000 sky coordinates of the camera center (contained
-// in MPointingPos), and the source J2000 sky coordinates contained in MSourcePos
-// (of type MPointingPos as well). If no MSourcePos is found in the parameter list, 
-// source position is assumed to be the same for all events, that specified in 
-// MSrcPosCam (if it already existed in the parameter list), or (0,0), the center 
-// of the camera, if no MSrcPosCam was present in the parameter list. In both cases,
-// no calculation is necessary and then the PreProcess returns kSKIP so that the task
-// is removed from the task list.
-//
-// The conversion factor between the camera plain (mm) and the
-// sky (deg) is taken from MGeomCam. The time is taken from MTime, and the coordinates
-// of the observatory from MObservatory.
-//
+// Calculate the current source position in the camera from the (possibly
+// already corrected, by starguider) J2000 sky coordinates of the camera
+// center (contained in MPointingPos), and the source J2000 sky
+// coordinates contained in MSourcePos (of type MPointingPos as well). If
+// no MSourcePos is found in the parameter list,  source position is
+// assumed to be the same for all events, that specified in  MSrcPosCam
+// (if it already existed in the parameter list), or (0,0), the center  of
+// the camera, if no MSrcPosCam was present in the parameter list. In both
+// cases, no calculation is necessary and then the PreProcess returns
+// kSKIP so that the task is removed from the task list.
+// 
+// The conversion factor between the camera plain (mm) and the sky (deg)
+// is taken from MGeomCam. The time is taken from MTime, and the
+// coordinates of the observatory from MObservatory.
+// 
 // Input Container:
 //   MPointingPos
@@ -53 +54 @@
 //
 // To be done:
-//   - wobble mode missing   /// NOTE, A. Moralejo: I see no need for special code
-//
 //   - a switch between using sky-coordinates and time or local-coordinates
 //     from MPointingPos for determine the rotation angle
@@ -98 +97 @@
     fName  = name  ? name  : "MSrcPosCalc";
     fTitle = title ? title : "Calculates the source position in the camera";
+
+    AddToBranchList("MTime.*");
+    AddToBranchList("MPointingPos.*");
 }
 
@@ -191 +193 @@
     //*fLog << "Pointing Position: " << GetRaDec(*fPointPos)  << endl;
     *fLog << "Source Position: " << GetRaDec(*fSourcePos) << endl;
+
+    // For the case ReInit is never called we try:
+    fObservatory = (MObservatory*)pList->FindObject("MObservatory");
+    fTime        = (MTime*)       pList->FindObject("MTime");
+    fRunType     = MRawRunHeader::kRTNone;
 
     return kTRUE;
@@ -321 +328 @@
 Int_t MSrcPosCalc::Process()
 {
-    if (fRunType==MRawRunHeader::kRTMonteCarlo || !fSourcePos)
+    if (fRunType==MRawRunHeader::kRTMonteCarlo || !fSourcePos || !fTime || !fObservatory)
         return kTRUE;
 
-  //     *fLog << dbg << "Camera center : Zd=" << fPointPos->GetZd() << " Az=" << fPointPos->GetAz() << endl;
-  //     *fLog << dbg << "Camera center : RA=" << fPointPos->GetRa() << " Dec=" << fPointPos->GetDec() << endl;
-  //     *fLog << dbg << "MJD: " << fTime->GetMjd() << ", time [ms]: " << fTime->GetTime() << endl;
-
-  MVector3 pos, pos0;  // pos: source position;  pos0: camera center
-
-  if (fSourcePos)
-    {
-      // Set Sky coordinates of source, taken from container "MSourcePos" of type MPointingPos. The sky 
-      // coordinates must be J2000, as the sky coordinates of the camera center that we get from the container 
-      // "MPointingPos" filled by the Drive.
-
-      pos.SetRaDec(fSourcePos->GetRaRad(), fSourcePos->GetDecRad());
-
-      //        *fLog << dbg << "Sky position of source: Ra=" << fSourcePos->GetRa() << 
-      //          " Dec=" << fSourcePos->GetDec() << endl;
-    }
-
-  // Convert sky coordinates of source to local coordinates. Warning! These are not the "true" local 
-  // coordinates, since this transformation ignores precession and nutation effects.
-  const MAstroSky2Local conv(*fTime, *fObservatory);
-  pos *= conv;
-
-
-  // Set sky coordinates of camera center in pos0, and then convert to local. Same comment as above. These 
-  // coordinates differ from the true local coordinates of the camera center that one could get from 
-  // "MPointingPos", calculated by the Drive: the reason is that the Drive takes into account precession 
-  // and nutation corrections, while MAstroSky2Local (as of Jan 27 2005 at least) does not. Since we just 
-  // want to get the source position on the camera from the local coordinates of the center and the source,
-  // it does not matter that the coordinates contained in pos and pos0 ignore precession and nutation... 
-  // since the shift would be the same in both cases. What would be wrong is to set in pos0 directly the 
-  // local coordinates found in MPointingPos!
-
-  pos0.SetRaDec(fPointPos->GetRaRad(), fPointPos->GetDecRad());
-  pos0 *= conv;
-
-  //     *fLog << dbg << "From MAstroSky2Local, without precession and nutation corrections:" << endl;
-  //     *fLog << dbg << "- Camera center (2) from RA,dec and time : Zd=" << pos0.Theta()*180./TMath::Pi() 
-  //      << " Az=" << pos0.Phi()*180./TMath::Pi() << endl;
-  //     *fLog << dbg << "- Local position of source: Zd=" << pos.Theta()*TMath::RadToDeg() << " Az=" << pos.Phi()*TMath::RadToDeg() << endl;
-
-
-  // Calculate source position in camera, and convert to mm:
-  TVector2 v = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
-  SetSrcPos(v);
-
-  //     v *= fGeom->GetConvMm2Deg();
-  //     *fLog << dbg << "X=" << v.X() << " deg,  Y=" << v.Y() << " deg" << endl;
-  //     *fLog << *fTime << endl;
-  //     *fLog << endl;
-
-  return kTRUE;
+    // Set Sky coordinates of source, taken from container "MSourcePos"
+    // of type MPointingPos. The sky coordinates must be J2000, as the
+    // sky coordinates of the camera center that we get from the container
+    // "MPointingPos" filled by the Drive.
+    MVector3 pos;  // pos: source position
+    pos.SetRaDec(fSourcePos->GetRaRad(), fSourcePos->GetDecRad());
+
+    // Convert sky coordinates of source to local coordinates. Warning! These are not the "true" local
+    // coordinates, since this transformation ignores precession and nutation effects.
+    const MAstroSky2Local conv(*fTime, *fObservatory);
+    pos *= conv;
+
+    // Set sky coordinates of camera center in pos0, and then convert to
+    // local. Same comment as above. These coordinates differ from the true
+    // local coordinates of the camera center that one could get from
+    // "MPointingPos", calculated by the Drive: the reason is that the Drive
+    // takes into account precession and nutation corrections, while
+    // MAstroSky2Local (as of Jan 27 2005 at least) does not. Since we just
+    // want to get the source position on the camera from the local
+    // coordinates of the center and the source, it does not matter that
+    // the coordinates contained in pos and pos0 ignore precession and
+    // nutation... since the shift would be the same in both cases. What
+    // would be wrong is to set in pos0 directly the local coordinates
+    // found in MPointingPos!
+    MVector3 pos0;  // pos0: camera center
+    pos0.SetRaDec(fPointPos->GetRaRad(), fPointPos->GetDecRad());
+    pos0 *= conv;
+
+    // Calculate source position in camera, and convert to mm:
+    TVector2 v = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
+    SetSrcPos(v);
+
+    return kTRUE;
 }