Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7990)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7991)
@@ -390,5 +390,4 @@
 
 
->>>>>>> 1.3372
  2006/08/22 Daniela Dorner
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7990)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7991)
@@ -2,4 +2,6 @@
 
  *** Version  <cvs>
+
+   - callisto: New swapped pixels have been found and corrected
 
    - general: The algorithm to build seqeunces has been redesigned
Index: /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
===================================================================
--- /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 7990)
+++ /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 7991)
@@ -229,17 +229,95 @@
 //   [...]
 //
+// --------------------------------------------------------------------------
+//
+// MAGIC runbook CC_2006_04_22_22_28_52.rbk
+//
+// [2006-04-22 23:14:13]
+//
+// [...]
+// Found 2 pairs of swapped pixels.
+// We corrected swapped pixels 54<->55 in the receiver boards. We probably
+// swapped today in the camera.
+// We did not correct 92<-<93 which are likely swapped. Will check and correct
+// tomorrow.
+//
+// ---
+//
+// comments:
+// - 54<->55 were corrected but have not been swapped, hence they are swapped
+//   since then (run 88560 ok, run 88669 swapped; between them mostly dummy and
+//   test runs)
+// - 92<->93 are never swapped, always ok.
+//
+// --------------------------------------------------------------------------
+//
+// MAGIC runbook CC_2006_08_28_19_40_18.rbk
+//
+// [2006-08-28 23:09:07]
+// While doing a flatfielding we have found out that the signals for pixels
+// 119 and 120 were swapped. We have fixed it by exchanging the corresponding
+// fibers at the input of the receivers (not before the splitters!).
+//
+// ---
+//
+// MAGIC runbook CC_2006_08_29_15_19_14.rbk
+//
+// [2006-08-29 16:43:09]
+// In the last hours we have found out and fixed a good number of pixels which
+// were swapped: 119-120, 160-161-162 and 210-263. According to Florian,
+// 160-161-162 and 210-263 were swapped since November 2005.
+//
+// ---
+//
+// mail Florian Goebel (08/30/2006 03:13 PM):
+//
+// As far as I can tell pixels 161 and 162 as well as 263 and 210 were
+// swapped in the trigger. This leads to some inefficiency of the trigger.
+// However, they were not swapped in the readout. So, you don't have to
+// correct anything in the data for these pixels.
+//
+// ---
+//
+// comments:
+// - 119-120 swapped between run 93251 (not swapped) and 93283 (swapped)
+//   (only testruns between these runs)
+//   corrected since run 99354 (== runbook [2006-08-28 23:09:07])
+// - 160 never swapped
+// - 161-162 were only swapped in the trigger, but nevertheless were
+//   "corrected" also in the signal. Hence signal swapped since 99354
+//
+// --------------------------------------------------------------------------
+
 Bool_t MRawRunHeader::FixAssignment()
 {
-    if (fRunNumber<53300 || fRunNumber>68754)
-        return kTRUE;
-
-    if (!SwapAssignment(554, 559))
-        return kFALSE;
-
-    if (!SwapAssignment(555, 558))
-        return kFALSE;
-
-    if (!SwapAssignment(556, 557))
-        return kFALSE;
+    if (fRunNumber>=53300 && fRunNumber<=68754)
+    {
+        if (!SwapAssignment(554, 559))
+            return kFALSE;
+        if (!SwapAssignment(555, 558))
+            return kFALSE;
+        if (!SwapAssignment(556, 557))
+            return kFALSE;
+    }
+
+    if (fRunNumber>=93283 && fRunNumber<99354)
+    {
+        if (!SwapAssignment(119, 120))
+            return kFALSE;
+    }
+
+    if (fRunNumber>=99354 && fRunNumber<=101789)
+    {
+        if (!SwapAssignment(161, 162))
+            return kFALSE;
+        if (!SwapAssignment(210, 263))
+            return kFALSE;
+    }
+
+    if (fRunNumber>=88669 && fRunNumber<=101789)
+    {
+        if (!SwapAssignment(54, 55))
+            return kFALSE;
+    }
 
     return kTRUE;