Changeset 5921 for trunk

Timestamp:

01/21/05 10:54:30 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mpointing/MSrcPosFromModel.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/01/20 Thomas Bretz
+
+   * mpointing/MSrcPosFromModel.cc:
+     - fixed crash in Process if no pointing model available
+
+
+
  2005/01/20 Markus Gaug
 
    * mcalib/MCalibrationIntensityChargeCam.[h,cc] 
-     - added function to display fluyctuations of a variable
+     - added function to display fluctuations of a variable
 
    * mcalib/MCalibrationPix.cc
@@ -31 +38 @@
    * msignal/MExtractTimeAndCharge.[h,cc]
      - introduced high-gain maximum limit before extracting the low-gain
+
+
 
  2005/01/20 Thomas Bretz

trunk/MagicSoft/Mars/mpointing/MSrcPosFromModel.cc

@@ -130 +130 @@
         conv = fPoint0405;
 
-    MVector3 sky;
-    sky.SetRaDec(fPointPos->GetRaRad(), fPointPos->GetDecRad());
+    TVector2 d;
 
-    // Get current star position (off center)
-    MVector3 vl2 = MAstroSky2Local(*fTime, *fObservatory)*sky;
-    // Get corrected position camera center)
-    TVector3 vl1 = conv->Correct(vl2);
+    if (conv)
+    {
+        MVector3 sky;
+        sky.SetRaDec(fPointPos->GetRaRad(), fPointPos->GetDecRad());
 
-    // Calculate x,y of za2
-    TVector2 d = MAstro::GetDistOnPlain(vl1, vl2, fGeom->GetCameraDist()*1000);
+        // Get current star position (off center)
+        MVector3 vl2 = MAstroSky2Local(*fTime, *fObservatory)*sky;
+        // Get corrected position camera center)
+        TVector3 vl1 = conv->Correct(vl2);
+
+        // Calculate x,y of za2
+        d = MAstro::GetDistOnPlain(vl1, vl2, fGeom->GetCameraDist()*1000);
+    }
 
     // Set Source position