Changeset 7615

Timestamp:

03/20/06 10:09:18 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/03/20 Thomas Bretz
+
+   * mraw/MRawRunHeader.cc:
+     - if the pixels to be swaped are both not found, assume they are
+       intentially not mapped. Changed the Error to a Warning
+
+
 
  2006/03/16 Daniela Dorner

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
  *** Version  <cvs>
+
+   - callisto: At some times six pixels had to be exchanged manually in the
+     data. If the pixels to be swaped are both not found, an error was raised
+     and calibration was stopped. Now it is assumed they are intentially not
+     mapped and the Error has been changed to a Warning.
 
    - star: Added new image cleaning based on the arrival time of the shower.
@@ -7 +12 @@
      the the old one (like "Absolute) in the star.rc-file.
      Recommended parameters:
-     MImgCleanStd.CleanLevel1:  8.2
-     MImgCleanStd.CleanLevel2:  5
-     MImgCleanStd.CleanRings:   2
-     MImgCleanStd.KeepSinglePixels: No
+      + MImgCleanStd.CleanLevel1:  8.2
+      + MImgCleanStd.CleanLevel2:  5
+      + MImgCleanStd.CleanRings:   2
+      + MImgCleanStd.KeepSinglePixels: No
 
    - star: Simplified the calculation of the effective on time. By letting

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -147 +147 @@
     if (i==n)
     {
-        *fLog << err << "ERROR - Assignment of pixels with hardware ID " << id0 << " and " << id1;
+        *fLog << warn << "WARNING - Assignment of pixels with hardware ID " << id0 << " and " << id1;
         *fLog << " should be exchanged, but none were found." << endl;
-        return kFALSE;
+        return kTRUE;
     }