Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4634)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4635)
@@ -268,5 +268,5 @@
 {
     Bool_t rc = kFALSE;
-    if (IsEnvDefined(env, prefix, "PedestalLevel"))
+    if (IsEnvDefined(env, prefix, "PedestalLevel", print))
     {
         rc = kTRUE;
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 4634)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 4635)
@@ -591,34 +591,34 @@
 //
 // Read the setup from a TEnv, eg:
-//   MBadPixelsCalc.UseInterpolation: no
-//   MBadPixelsCalc.UseCentralPixel:  no
-//   MBadPixelsCalc.HardTreatment:    no
-//   MBadPixelsCalc.ProcessRMS:       no
-//   MBadPixelsCalc.NumMinNeighbors:  3
+//   MBadPixelsTreat.UseInterpolation: no
+//   MBadPixelsTreat.UseCentralPixel:  no
+//   MBadPixelsTreat.HardTreatment:    no
+//   MBadPixelsTreat.ProcessRMS:       no
+//   MBadPixelsTreat.NumMinNeighbors:  3
 //
 Int_t MBadPixelsTreat::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     Bool_t rc = kFALSE;
-    if (IsEnvDefined(env, prefix, "UseInterpolation"))
+    if (IsEnvDefined(env, prefix, "UseInterpolation", print))
     {
         rc = kTRUE;
         SetUseInterpolation(GetEnvValue(env, prefix, "UseInterpolation", IsUseInterpolation()));
     }
-    if (IsEnvDefined(env, prefix, "UseCentralPixel"))
+    if (IsEnvDefined(env, prefix, "UseCentralPixel", print))
     {
         rc = kTRUE;
         SetUseCentralPixel(GetEnvValue(env, prefix, "UseCentralPixel", IsUseCentralPixel()));
     }
-    if (IsEnvDefined(env, prefix, "HardTreatment"))
+    if (IsEnvDefined(env, prefix, "HardTreatment", print))
     {
         rc = kTRUE;
         SetHardTreatment(GetEnvValue(env, prefix, "HardTreatment", IsHardTreatment()));
     }
-    if (IsEnvDefined(env, prefix, "ProcessRMS"))
+    if (IsEnvDefined(env, prefix, "ProcessRMS", print))
     {
         rc = kTRUE;
         SetProcessRMS(GetEnvValue(env, prefix, "ProcessRMS", IsProcessRMS()));
     }
-    if (IsEnvDefined(env, prefix, "NumMinNeighbors"))
+    if (IsEnvDefined(env, prefix, "NumMinNeighbors", print))
     {
         rc = kTRUE;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 4634)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 4635)
@@ -648,39 +648,39 @@
 {
     Bool_t rc = kFALSE;
-    if (IsEnvDefined(env, prefix, "PedestalFlag"))
+    if (IsEnvDefined(env, prefix, "PedestalFlag", print))
     {
         rc = kTRUE;
         TString s = GetEnvValue(env, prefix, "PedestalFlag", "");
         s.ToLower();
-        if (s==(TString)"no")
+        if (s.BeginsWith("no"))
             SetPedestalFlag(kNo);
-        if (s==(TString)"run")
+        if (s.BeginsWith("run"))
             SetPedestalFlag(kRun);
-        if (s==(TString)"event")
+        if (s.BeginsWith("event"))
             SetPedestalFlag(kEvent);
     }
 
-    if (IsEnvDefined(env, prefix, "CalibrationMode"))
+    if (IsEnvDefined(env, prefix, "CalibrationMode", print))
     {
         rc = kTRUE;
         TString s = GetEnvValue(env, prefix, "CalibrationMode", "");
         s.ToLower();
-        if (s==(TString)"skip")
+        if (s.BeginsWith("skip"))
             SetCalibrationMode(kSkip);
-        if (s==(TString)"none")
+        if (s.BeginsWith("none"))
             SetCalibrationMode(kNone);
-        if (s==(TString)"flatcharge")
+        if (s.BeginsWith("flatcharge"))
             SetCalibrationMode(kFlatCharge);
-        if (s==(TString)"blindpixel")
+        if (s.BeginsWith("blindpixel"))
             SetCalibrationMode(kBlindPixel);
-        if (s==(TString)"ffactor")
+        if (s.BeginsWith("ffactor"))
             SetCalibrationMode(kFfactor);
-        if (s==(TString)"pindiode")
+        if (s.BeginsWith("pindiode"))
             SetCalibrationMode(kPinDiode);
-        if (s==(TString)"combined")
+        if (s.BeginsWith("combined"))
             SetCalibrationMode(kCombined);
-        if (s==(TString)"dummy")
+        if (s.BeginsWith("dummy"))
             SetCalibrationMode(kDummy);
-        if (s==(TString)"default")
+        if (s.BeginsWith("default"))
             SetCalibrationMode();
     }