Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4947)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4948)
@@ -286,7 +286,8 @@
 
   SetCheckDeadPixels       ();
+  SetCheckDeviatingBehavior();
   SetCheckExtractionWindow ();
   SetCheckHistOverflow     ();
-  SetCheckDeviatingBehavior();
+  SetCheckOscillations     ();
 
   Clear();
@@ -602,4 +603,5 @@
     case MCalibrationCam::kUV:    *fLog << "UV.";     break;
     case MCalibrationCam::kCT1:   *fLog << "CT1.";    break;
+    default: break;
     }
   *fLog << endl;
@@ -2248,5 +2250,29 @@
       rc = kTRUE;
     }
-  // void SetPulserColor(const MCalibrationCam::PulserColor_t col) { fPulserColor = col; }
+  if (IsEnvDefined(env, prefix, "CheckDeadPixels", print))
+    {
+      SetCheckDeadPixels(GetEnvValue(env, prefix, "CheckDeadPixels", IsCheckDeadPixels()));
+      rc = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "CheckDeviatingBehavior", print))
+    {
+      SetCheckDeviatingBehavior(GetEnvValue(env, prefix, "CheckDeviatingBehavior", IsCheckDeviatingBehavior()));
+      rc = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "CheckExtractionWindow", print))
+    {
+      SetCheckExtractionWindow(GetEnvValue(env, prefix, "CheckExtractionWindow", IsCheckExtractionWindow()));
+      rc = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "CheckHistOverflow", print))
+    {
+      SetCheckHistOverflow(GetEnvValue(env, prefix, "CheckHistOverflow", IsCheckHistOverflow()));
+      rc = kTRUE;
+    }
+  if (IsEnvDefined(env, prefix, "CheckOscillations", print))
+    {
+      SetCheckOscillations(GetEnvValue(env, prefix, "CheckOscillations", IsCheckOscillations()));
+      rc = kTRUE;
+    }
   
   return rc;