Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3692)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3693)
@@ -27,39 +27,48 @@
 //   MCalibrationChargeCalc
 //
-//   Task to calculate the calibration conversion factors from the FADC
-//   time slices. The integrated time slices have to be delivered by an 
-//   MExtractedSignalCam. The pedestals by an MPedestalCam.
+//   Task to calculate the calibration conversion factors and quantum efficiencies 
+//   from the FADC time slices. The integrated time slices have to be delivered by an 
+//   MExtractedSignalCam, pedestals by an MPedestalCam.
 //
 //   The output container MCalibrationCam holds one entry of type MCalibrationChargePix 
 //   for every pixel. It is filled in the following way:
 //
-//   ProProcess: Initialize MCalibrationCam
-//               Initialize pulser light wavelength
+//   PreProcess(): Initialize MCalibrationCam
+//                 Initialize pulser light wavelength
 //               
-//   ReInit:     MCalibrationCam::InitSize(NumPixels) is called from MGeomApply (which allocates
-//               memory in a TClonesArray of type MCalibrationChargePix)
-//               Initializes pointer to MBadPixelsCam
-//
-//   Process:    Nothing done by this class, histograms are filled by 
-//               MHCalibrationChargeCam
-//
-//   PostProcess:  Fit results from MHCalibrationChargeCam are retrieved
-//                and used for the calculation of the reduced sigma, 
-//                the F-Factor method, the blind pixel method (photon flux 
-//                                     inside plexiglass) and
-//                                     the PINDiode method (photon flux
-//                                     outside plexiglass)
-//
-//                Hi-Gain vs. Lo-Gain Calibration (very memory-intensive)
-//                can be skipped with the command:
-//                MalibrationCam::SkipHiLoGainCalibration()
+//   ReInit():     MCalibrationCam::InitSize(NumPixels) is called from MGeomApply (which allocates
+//                 memory in a TClonesArray of type MCalibrationChargePix)
+//                 Initializes pointer to MBadPixelsCam
+//
+//   Process():    Nothing to be done, histograms getting filled by MHCalibrationChargeCam
+//
+//   PostProcess(): - FinalizePedestals()
+//                  - FinalizeAvPedestals()
+//                  - FinalizeCharges()
+//                  - FinalizeFFactorMethod()
+//                  - FinalizeBadPixels()
+//                  - FinalizeBlindPixel()
+//                  - FinalizePINDiode()
+//                  - FinalizeFFactorQECam()
+//                  - FinalizeBlindPixelQECam()
+//                  - FinalizePINDiodeQECam()
 //
 //  Input Containers:
-//   MRawEvtData
+//   MCalibrationChargeCam
+//   MCalibrationChargeBlindPix
+//   MCalibrationChargePINDiode
+//   MCalibrationQECam
+//   MExtractedSignalCam
+//   MExtractedSignalBlindPixel
+//   MExtractedSignalPINDiode
 //   MPedestalCam
 //   MBadPixelsCam
+//   MGeomCam
+//   MTime
 //
 //  Output Containers:
-//   MCalibrationCam
+//   MCalibrationChargeCam
+//   MCalibrationChargeBlindPix
+//   MCalibrationChargePINDiode
 //   MCalibrationQECam
 //   MBadPixelsCam
@@ -253,6 +262,5 @@
     : fBadPixels(NULL), fCam(NULL), fBlindPixel(NULL), fPINDiode(NULL), 
       fQECam(NULL), fSignals(NULL), fSigBlind(NULL), fSigPIN(NULL),
-      fGeom(NULL), fPedestals(NULL), fRawEvt(NULL), fRunHeader(NULL), 
-      fEvtTime(NULL)
+      fGeom(NULL), fPedestals(NULL), fEvtTime(NULL)
       {
 
@@ -318,11 +326,4 @@
 {
   
-  fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
-  if (!fRawEvt)
-    {
-      *fLog << err << "MRawEvtData not found... aborting." << endl;
-      return kFALSE;
-    }
-  
   fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
   if (!fPedestals)
@@ -411,11 +412,4 @@
 Bool_t MCalibrationChargeCalc::ReInit(MParList *pList )
 {
-
-  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-  if (!fRunHeader)
-    {
-      *fLog << err << "MRawRunHeader not found... aborting." << endl;
-      return kFALSE;
-    }
 
   fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
@@ -690,6 +684,6 @@
     {
       *fLog << warn << GetDescriptor() << ": Sigma of Fitted Charge smaller than Pedestal RMS in PINDiode " << endl;
-      return kFALSE;
-    }
+    }
+      return kFALSE;
 
   const Byte_t  loweredge  = fSigPIN->GetFirstUsedSlice();
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h	(revision 3692)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h	(revision 3693)
@@ -79,6 +79,4 @@
   MGeomCam                   *fGeom;           //! Camera geometry
   MPedestalCam               *fPedestals;      //! Pedestals all pixels (calculated previously from ped.file)
-  MRawEvtData                *fRawEvt;         //! Raw calibration event data 
-  MRawRunHeader              *fRunHeader;      //! RunHeader information
   MTime                      *fEvtTime;        //! Time of the event