Changeset 9145 for trunk

Timestamp:

10/29/08 11:41:41 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/10/29 Thomas Bretz
+
+   * mpointing/MSrcPosCalc.cc:
+     - return kERROR instead of kFALSE if source position is too far
+       away from the camera center
+     - DeltaPhi replaced by Angle to take declination into account
+
+
 
  2008/10/23 Daniel Hoehne-Moench

trunk/MagicSoft/Mars/NEWS

@@ -44 +44 @@
      quite weak. Now sum events pass the calculation if and only if they
      have also a level 1 trigger.
+
+ ;ganymed
+
+   * If the source position is more than 1deg away from the camera
+     center an error is raised now.
 
 

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -439 +439 @@
     // source position given by the user. (Checking every individual
     // event is not the fastest, but the safest)
-    if (pos.DeltaPhi(pos0)*TMath::RadToDeg()>1)
-    {
-        *fLog << err << "ERROR - Defined source position deviates from pointing-ra/dec by more than 1deg!" << endl;
+    if (pos.Angle(pos0)*TMath::RadToDeg()>1)
+    {
+        *fLog << err << "ERROR - Defined source position deviates from pointing-ra/dec by more than 1deg (";
+        *fLog << pos.Angle(pos0) << ")!" << endl;
         *fLog << "User defined source pos:  ";
         fSourcePos->Print();
@@ -447 +448 @@
         fPointPos->Print();
 
-        return kFALSE;
+        return kERROR;
     }