Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 4632)
+++ 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();
     }