Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7614)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7615)
@@ -18,4 +18,12 @@
 
                                                  -*-*- 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
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7614)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7615)
@@ -2,4 +2,9 @@
 
  *** 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,8 +12,8 @@
      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
Index: /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
===================================================================
--- /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 7614)
+++ /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 7615)
@@ -147,7 +147,7 @@
     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;
     }