Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5822)
+++ trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5823)
@@ -254,4 +254,5 @@
     case 45485:
     case 45489:
+    case 45607:
       //    case 31756:
       color = kBLUE;
@@ -277,4 +278,5 @@
     case 45372:
     case 45373:
+    case 45608:
       color = kGREEN;
       break;
@@ -300,4 +302,6 @@
     case 45484:
     case 45490:
+    case 45614:
+    case 45618:
       color = kUV;
       break;
@@ -308,4 +312,5 @@
       break;
       
+    case 45609:
     case 45219:
       *fLog << err << "Sorry, run 45219 was taken with a combination of colours used to flat-field ";
@@ -313,4 +318,17 @@
       return kFALSE;
       break;
+      
+    case 45605:
+      *fLog << err << "Sorry, run 45605 was taken with the continuous light source." << endl;
+      *fLog << err << "It cannot be used for calibration. Try to run a pedestal extraction on it." << endl;
+      return kFALSE;
+      break;
+
+    case 45606:
+      *fLog << err << "Sorry, run 45606 was taken with mal-functionning pulser." << endl;
+      *fLog << err << "It cannot be used for calibration. Try to run a pedestal extraction on it." << endl;
+      return kFALSE;
+      break;
+
     }
   
@@ -333,41 +351,41 @@
 
   // Possible green combinations
-  CheckAndSet(proj, "0.1led[sS]?gree", fPattern, k01LedGreen, color, kGREEN);
-  CheckAndSet(proj, "1led[sS]?gree",   fPattern, k1LedGreen,  color, kGREEN);
-  CheckAndSet(proj, "2led[sS]?gree",   fPattern, k2LedGreen,  color, kGREEN);
-  CheckAndSet(proj, "3led[sS]?gree",   fPattern, k3LedGreen,  color, kGREEN);
-  CheckAndSet(proj, "5led[sS]?gree",   fPattern, k5LedGreen,  color, kGREEN);
-  CheckAndSet(proj, "6led[sS]?gree",   fPattern, k6LedGreen,  color, kGREEN);
-  CheckAndSet(proj, "7led[sS]?gree",   fPattern, k7LedGreen,  color, kGREEN);
-  CheckAndSet(proj, "8led[sS]?gree",   fPattern, k8LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "0.1led[s]?gree", fPattern, k01LedGreen, color, kGREEN);
+  CheckAndSet(proj, "1led[s]?gree",   fPattern, k1LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "2led[s]?gree",   fPattern, k2LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "3led[s]?gree",   fPattern, k3LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "5led[s]?gree",   fPattern, k5LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "6led[s]?gree",   fPattern, k6LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "7led[s]?gree",   fPattern, k7LedGreen,  color, kGREEN);
+  CheckAndSet(proj, "8led[s]?gree",   fPattern, k8LedGreen,  color, kGREEN);
 
   // Possible blue combinations
-  CheckAndSet(proj, "0.1led[sS]?blue", fPattern, k01LedBlue,  color, kBLUE);
-  CheckAndSet(proj, "1led[sS]?blue",   fPattern, k1LedBlue,   color, kBLUE);
-  CheckAndSet(proj, "2led[sS]?blue",   fPattern, k2LedBlue,   color, kBLUE);
-  CheckAndSet(proj, "3led[sS]?blue",   fPattern, k3LedBlue,   color, kBLUE);
-  CheckAndSet(proj, "5led[sS]?blue",   fPattern, k5LedBlue1,  color, kBLUE);
-  CheckAndSet(proj, "6led[sS]?blue",   fPattern, k6LedBlue,   color, kBLUE);
-  CheckAndSet(proj, "7led[sS]?blue",   fPattern, k7LedBlue,   color, kBLUE);
-  CheckAndSet(proj, "8led[sS]?blue",   fPattern, k8LedBlue,   color, kBLUE);
-  CheckAndSet(proj, "10led[sS]?blue",  fPattern, k10LedBlue,  color, kBLUE);
-  CheckAndSet(proj, "15led[sS]?blue",  fPattern, k15LedBlue,  color, kBLUE);
-  CheckAndSet(proj, "20led[sS]?blue",  fPattern, k20LedBlue,  color, kBLUE);
-  CheckAndSet(proj, "21led[sS]?blue",  fPattern, k21LedBlue,  color, kBLUE);
-  CheckAndSet(proj, "22led[sS]?blue",  fPattern, k22LedBlue,  color, kBLUE);
-  CheckAndSet(proj, "23led[sS]?blue",  fPattern, k23LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "0.1led[s]?blue", fPattern, k01LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "1led[s]?blue",   fPattern, k1LedBlue,   color, kBLUE);
+  CheckAndSet(proj, "2led[s]?blue",   fPattern, k2LedBlue,   color, kBLUE);
+  CheckAndSet(proj, "3led[s]?blue",   fPattern, k3LedBlue,   color, kBLUE);
+  CheckAndSet(proj, "5led[s]?blue",   fPattern, k5LedBlue1,  color, kBLUE);
+  CheckAndSet(proj, "6led[s]?blue",   fPattern, k6LedBlue,   color, kBLUE);
+  CheckAndSet(proj, "7led[s]?blue",   fPattern, k7LedBlue,   color, kBLUE);
+  CheckAndSet(proj, "8led[s]?blue",   fPattern, k8LedBlue,   color, kBLUE);
+  CheckAndSet(proj, "10led[s]?blue",  fPattern, k10LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "15led[s]?blue",  fPattern, k15LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "20led[s]?blue",  fPattern, k20LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "21led[s]?blue",  fPattern, k21LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "22led[s]?blue",  fPattern, k22LedBlue,  color, kBLUE);
+  CheckAndSet(proj, "23led[s]?blue",  fPattern, k23LedBlue,  color, kBLUE);
 
   // Possible UV combinations
-  CheckAndSet(proj, "1led[sS]?uv",     fPattern, k1LedUV,    color,  kUV);
-  CheckAndSet(proj, "2led[sS]?uv",     fPattern, k2LedUV,    color,  kUV);
-  CheckAndSet(proj, "3led[sS]?uv",     fPattern, k3LedUV,    color,  kUV);
-  CheckAndSet(proj, "5led[sS]?uv",     fPattern, k5LedUV1,   color,  kUV);
-  CheckAndSet(proj, "6led[sS]?uv",     fPattern, k6LedUV,    color,  kUV);
-  CheckAndSet(proj, "7led[sS]?uv",     fPattern, k7LedUV,    color,  kUV);
-  CheckAndSet(proj, "8led[sS]?uv",     fPattern, k8LedUV,    color,  kUV);
-  CheckAndSet(proj, "10led[sS]?uv",    fPattern, k10LedUV,   color,  kUV);
-  CheckAndSet(proj, "11led[sS]?uv",    fPattern, k11LedUV,   color,  kUV);
-  CheckAndSet(proj, "12led[sS]?uv",    fPattern, k12LedUV,   color,  kUV);
-  CheckAndSet(proj, "13led[sS]?uv",    fPattern, k13LedUV,   color,  kUV);
+  CheckAndSet(proj, "1led[s]?uv",     fPattern, k1LedUV,    color,  kUV);
+  CheckAndSet(proj, "2led[s]?uv",     fPattern, k2LedUV,    color,  kUV);
+  CheckAndSet(proj, "3led[s]?uv",     fPattern, k3LedUV,    color,  kUV);
+  CheckAndSet(proj, "5led[s]?uv",     fPattern, k5LedUV1,   color,  kUV);
+  CheckAndSet(proj, "6led[s]?uv",     fPattern, k6LedUV,    color,  kUV);
+  CheckAndSet(proj, "7led[s]?uv",     fPattern, k7LedUV,    color,  kUV);
+  CheckAndSet(proj, "8led[s]?uv",     fPattern, k8LedUV,    color,  kUV);
+  CheckAndSet(proj, "10led[s]?uv",    fPattern, k10LedUV,   color,  kUV);
+  CheckAndSet(proj, "11led[s]?uv",    fPattern, k11LedUV,   color,  kUV);
+  CheckAndSet(proj, "12led[s]?uv",    fPattern, k12LedUV,   color,  kUV);
+  CheckAndSet(proj, "13led[s]?uv",    fPattern, k13LedUV,   color,  kUV);
 
   // Possible slot combinations
@@ -413,5 +431,5 @@
           if (proj.Contains("cl",TString::kIgnoreCase))
           {
-              *fLog << warn;
+              *fLog << err;
               *fLog << "This run has been taken with the continuous light source." << endl;
               *fLog << "It cannot be used for calibration. Try to run a pedestal extraction on it." << endl;