Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4762)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4763)
@@ -1248,5 +1248,5 @@
 // For more details see the class description and the corresponding Getters
 // 
-Bool_t MJCalibration::CheckEnvLocal()
+Bool_t MJCalibration::CheckEnv()
 {
     TString col = GetEnv("Color", "");
@@ -1269,5 +1269,5 @@
     SetUsePINDiode(GetEnv("UsePINDiode", IsUsePINDiode()));
 
-    return kTRUE;
+    return MJob::CheckEnv();
 }
 
@@ -1386,4 +1386,7 @@
     }
 
+    //if (!CheckEnv())
+    //    return kFALSE;
+
     CheckEnv();
 
@@ -1559,5 +1562,5 @@
     if (!taskenv.GetTask() && !taskenv2.GetTask())
     {
-        *fLog << err << "ERROR - Neither ExtractSignal nor ExtractTime initializedor both '<dummy>'." << endl;
+        *fLog << err << "ERROR - Neither ExtractSignal nor ExtractTime initialized or both '<dummy>'." << endl;
         return kFALSE;
     }
@@ -1582,5 +1585,9 @@
     // FIND THE REASON! THE NEXT CHANGE SOMEBODY DOES MIGHT RESULT
     // IN __YOUR__ WORKAROUN NOT WORKING IF IT IS NOT CLEANLY DONE!
-    /*
+    //
+    // THE AUTHOR OF MFILLH SHOULD FIND THE REASON INSTEAD OF DELETING 
+    // CODE WITHOUT INFORMING THE DATACHECK PEOPLE - SORRY, I SPENT 
+    // TOO MANY DAYS TRYING TO FIND THIS REASON!
+    //
     if (fDisplay)
     {
@@ -1610,5 +1617,5 @@
         }
     }
-*/
+
     DisplayResult(plist);