Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4612)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4613)
@@ -378,6 +378,5 @@
 
     if (fRelTimes)
-      {
-
+    {
         disp30.SetCamContent(fRelTimeCam,0);
         disp30.SetCamError(  fRelTimeCam,1);
@@ -393,8 +392,8 @@
         disp33.SetYTitle("[1]");
         disp34.SetYTitle("[1]");
-      }
+    }
     
     if (fDisplayType == kDataCheckDisplay)
-      {
+    {
 
         TCanvas &c1 = fDisplay->AddTab("Fit.Charge");
@@ -429,18 +428,18 @@
 
         if (fRelTimes)
-          {
+        {
             // Rel. Times
             TCanvas &c5 = fDisplay->AddTab("Rel. Times");
             c5.Divide(2,4);
-            
+
             disp30.CamDraw(c5, 1, 2, 2);
             disp31.CamDraw(c5, 2, 2, 2);
-          }
+        }
 
         return;
-      }
-    
+    }
+
     if (fDisplayType == kNormalDisplay)
-      {
+    {
 
         // Charges
@@ -500,41 +499,40 @@
 
         if (fRelTimes)
-          {
+        {
             // Rel. Times
             TCanvas &c17 = fDisplay->AddTab("Rel. Times");
             c17.Divide(2,4);
-            
+
             disp30.CamDraw(c17, 1, 2, 5, 1);
             disp31.CamDraw(c17, 2, 2, 5, 1);
-          }
+        }
         
         return;
-      }
+    }
     
     if (fDisplayType == kFullDisplay)
-      {
-
+    {
         MHCalibrationCam *cam = (MHCalibrationCam*)plist.FindObject("MHCalibrationChargeCam");
 
         for (Int_t sector=1;sector<cam->GetAverageSectors();sector++)
-          {
+        {
             cam->GetAverageHiGainSector(sector).DrawClone("all");
             cam->GetAverageLoGainSector(sector).DrawClone("all");
-          }
+        }
 
         // Charges
         TCanvas &c21 = fDisplay->AddTab("Fit.Charge");
         c21.Divide(2, 4);
-        
+
         disp1.CamDraw(c21, 1, 2, 2, 1);
         disp2.CamDraw(c21, 2, 2, 2, 1);
-        
+
         // Reduced Sigmas
         TCanvas &c23 = fDisplay->AddTab("Red.Sigma");
         c23.Divide(2,4);
-        
+
         disp3.CamDraw(c23, 1, 2, 2, 1);
         disp4.CamDraw(c23, 2, 2, 2, 1);
-        
+
         //  F-Factor
         TCanvas &c24 = fDisplay->AddTab("Phe's");
@@ -598,5 +596,5 @@
 
         if (fRelTimes)
-          {
+        {
             // Rel. Times
             TCanvas &c31 = fDisplay->AddTab("Rel. Times");
@@ -617,13 +615,13 @@
             
             for (Int_t sector=1;sector<cam->GetAverageSectors();sector++)
-              {
+            {
                 cam->GetAverageHiGainSector(sector).DrawClone("fourierevents");
                 cam->GetAverageLoGainSector(sector).DrawClone("fourierevents");
-              }
-            
-          }
+            }
+
+        }
 
         return;
-      }
+    }
 }
 
@@ -1038,4 +1036,6 @@
     *fLog << endl;
 
+    CheckEnv();
+
     // Setup Tasklist
     MParList plist;
Index: /trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc
===================================================================
--- /trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc	(revision 4612)
+++ /trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc	(revision 4613)
@@ -394,29 +394,19 @@
 
   const Int_t npixels  = fPedestals->GetSize();
-//  const Int_t areas    = fPedestals->GetAverageAreas();
-//  const Int_t sectors  = fPedestals->GetAverageSectors();
   
   if (fSumx.GetSize()==0)
-    {
+  {
       fSumx. Set(npixels);
       fSumx2.Set(npixels);
-      
-//      fAreaSumx. Set(areas);
-//      fAreaSumx2.Set(areas);
-//      fAreaValid.Set(areas);
-      
-//      fSectorSumx. Set(sectors);
-//      fSectorSumx2.Set(sectors);
-//      fSectorValid.Set(sectors);
-      
+
       fSumx.Reset();
       fSumx2.Reset();
-    }
+  }
   
   if (fWindowSizeHiGain == 0 && fWindowSizeLoGain == 0)
     {
-      *fLog << err << GetDescriptor() 
+        *fLog << err << GetDescriptor()
             << ": Number of extracted Slices is 0, abort ... " << endl;
-      return kFALSE;
+        return kFALSE;
     }