Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5414)
+++ trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5415)
@@ -123,4 +123,18 @@
     }
   
+  //
+  // Consider the case that a pedestal run is interleaved in the calibration run sequence ... prepare
+  // to skip this run.
+  //
+  const UShort_t runtype = header->GetRunType();
+
+  if (runtype == 1)
+    {
+      *fLog << warn << "New run is a pedestal run... need intensity calibration to treat this case!" << endl;
+      fPattern = 0;
+      fIsValid = kTRUE;      
+      return kTRUE;
+    }
+
   enum { kNONE, kGREEN, kBLUE, kUV, kCT1 };
   
@@ -192,4 +206,7 @@
     case 22246:
     case 22253:
+    case 25792:
+    case 35415:
+      //    case 31756:
       color = kBLUE;
       break;
@@ -387,5 +404,13 @@
 
   if (fIsValid)
-    fHeader->SetCalibrationPattern(fPattern);
+    {
+      if (fPattern == 0)
+        {
+          *fLog << err << "CONTINUE " << endl;
+          return kCONTINUE;
+        }
+      fHeader->SetCalibrationPattern(fPattern);
+    }
+  
   return kTRUE;
 }