Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc	(revision 3962)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc	(revision 3963)
@@ -86,27 +86,9 @@
 // - fAverageHiGainSectors, fAverageLoGainSectors
 //
-// Initializes to 0 entries:
-// - fAverageAreaNum           
-// - fAverageAreaRelSigma      
-// - fAverageAreaRelSigmaVar   
-// - fAverageAreaSat           
-// - fAverageAreaSigma         
-// - fAverageAreaSigmaVar 
-// - fAverageSectorNum         
-// - fRunNumbers               
-//
 // Initializes:
 // - fPulserFrequency to fgPulserFrequency
 //
 MHCalibrationCam::MHCalibrationCam(const char *name, const char *title)
-    :    fAverageAreaNum(0),           
-         fAverageAreaRelSigma(0),      
-         fAverageAreaRelSigmaVar(0),   
-         fAverageAreaSat(0),           
-         fAverageAreaSigma(0),         
-         fAverageAreaSigmaVar(0), 
-         fAverageSectorNum(0),         
-         fRunNumbers(0),               
-         fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL)
+    :  fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL)
 {
     fName  = name  ? name  : "MHCalibrationCam";
@@ -359,6 +341,8 @@
   cam->fAverageAreaRelSigmaVar = fAverageAreaRelSigmaVar;   
   cam->fAverageSectorNum       = fAverageSectorNum;      
+  cam->fRunNumbers             = fRunNumbers;
 
   cam->fPulserFrequency        = fPulserFrequency;
+  cam->fAverageNbins           = fAverageNbins;
 
   return cam;
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 3962)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 3963)
@@ -96,5 +96,5 @@
 const Double_t MHCalibrationChargeBlindPix::gkElectronicAmpErr   = 0.002;
 
-const Int_t    MHCalibrationChargeBlindPix::fgChargeNbins        = 5300;
+const Int_t    MHCalibrationChargeBlindPix::fgChargeNbins        =  300;
 const Axis_t   MHCalibrationChargeBlindPix::fgChargeFirst        = -100.5;
 const Axis_t   MHCalibrationChargeBlindPix::fgChargeLast         = 5199.5;
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 3962)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 3963)
@@ -1618,5 +1618,5 @@
                     {
                       half[j]->SetLineColor(kRed+i+2*j);
-                      half[j]->SetDirectory(0);
+                      half[j]->SetDirectory(NULL);
                       half[j]->SetBit(kCanDelete);
                       half[j]->Draw("same");
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3962)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3963)
@@ -841,4 +841,5 @@
   MExtractSlidingWindow    extract2;
   MExtractTimeSpline       timespline;
+  MArrivalTimeCalc         arrcalc;
   MCalibrationChargeCalc   calcalc;
   MCalibrationRelTimeCalc  timecalc;
@@ -876,5 +877,6 @@
       *fLog << warn << GetDescriptor() 
             << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
-      tlist.AddToList(&extract2);
+      //      tlist.AddToList(&extract2);
+      tlist.AddToList(&arrcalc);
     }