Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h	(revision 3679)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h	(revision 3680)
@@ -14,6 +14,6 @@
 private:
 
-  static const Float_t gkPlexiglassQE   ;  //! Quantum Efficiency Plexiglass
-  static const Float_t gkPlexiglassQEErr;  //! Uncertainty QE Plexiglass
+  static const Float_t gkPlexiglassQE   ;  //! Quantum Efficiency Plexiglass (now set to: 0.96)
+  static const Float_t gkPlexiglassQEErr;  //! Uncertainty QE Plexiglass     (now set to: 0.01)
 
   TArrayC fFlags;
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc	(revision 3679)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc	(revision 3680)
@@ -30,6 +30,6 @@
 // This container (like MCalibrationQECam) is designed to persist during 
 // several eventloops over different calibration files, especially those 
-// with different colour LEDs. It is the class calibration the Quantum 
-// efficiency for each individual pixel.
+// with different colour LEDs. This class contains all measured Quantum 
+// Efficiencies with the calibration system for each individual pixel.
 // 
 // At the moment, this calibration works in the following steps:
@@ -42,26 +42,27 @@
 //     
 // 3)  MHCalibrationChargePINDiode extracts the mean of a charge distribution 
-//     of the signals collected by the PIN Diode and stores it in MCalibrationChargePINDiode
+//     of the signals collected by the PIN Diode and stores it in 
+//     MCalibrationChargePINDiode
 //     
-// 4)  MCalibrationCalc calculates for every pixel the number of photo-electrons
-//     with the F-Factor method (see MCalibrationCalc)
-//
-// 5)  MCalibrationCalc calculates the (weighted) average number of photo-electrons 
-//     from the pixels with the area index 0 (Inner pixels for the MAGIC camera) 
-//     and divides this number by gkDefaultQEGreen, gkDefaultQEBlue, gkDefaultQEUV 
-//     or gkDefaultQECT1, depending on the implied pulser LED colour, and further 
-//     by MCalibratinoQECam::gkPlexiglassQE. The obtained number gives the NUMBER 
-//     OF PHOTONS incident on a pixel with area index 0 (INNER pixel) OUTSIDE THE 
-//     PLEXIGLASS of the camera, obtained with the F-Factor method.
-//
-// 6)  MCalibrationCalc calculates the mean photon flux per mm^2 in the camera 
+// 4)  MCalibrationChargeCalc calculates for every pixel the number of 
+//     photo-electrons with the F-Factor method and stores them in MCalibrationChargePix
+//
+// 5)  MCalibrationChargeCalc calculates the (weighted) average number of photo-
+//     electrons from the pixels with the area index 0 (Inner pixels for the MAGIC 
+//     camera) and divides this number by gkDefaultQEGreen, gkDefaultQEBlue, 
+//     gkDefaultQEUV or gkDefaultQECT1, depending on the used pulser LED colour, 
+//     and further by MCalibrationQECam::gkPlexiglassQE. The obtained number gives 
+//     the NUMBER OF PHOTONS incident on a pixel with area index 0 (INNER pixel) 
+//     OUTSIDE THE PLEXIGLASS of the camera, obtained with the F-Factor method.
+//
+// 6)  MCalibrationChargeCalc calculates the mean photon flux per mm^2 in the camera 
 //     from the MCalibrationChargeBlindPix, multiplies it with the area of 
 //     one pixel with area index 0 (Inner pixel) and divides it by the quantum 
-//     efficiency of the plexi-glass (MCalibratinoQECam::gkPlexiglassQE). The obtained 
+//     efficiency of the plexi-glass (MCalibrationQECam::gkPlexiglassQE). The obtained 
 //     number gives the NUMBER OF PHOTONS incident on a pixel with area index 0 
 //     (INNER pixel) OUTSIDE THE PLEXIGLASS of the camera, obtained with the 
 //     Blind Pixel method. 
 //
-// 7)  MCalibrationCalc calculates the mean photon flux per mm^2 in the camera 
+// 7)  MCalibrationChargeCalc calculates the mean photon flux per mm^2 in the camera 
 //     from the MCalibrationChargePINDiode and multiplies it with the area of 
 //     one pixel with area index 0 (Inner pixel). The obtained number gives the 
@@ -71,14 +72,19 @@
 // 8)  Each of the three photons numbers is divided by the mean sum of FADC counts 
 //     and defined as MEASURED QUANTUM EFFICIENCY AT A GIVEN COLOUR. They are stored 
-//     in the variables SetQE*Method ( qe, colour ). 
-//
-// 9)  Errors are propagated and corresponding variances get stored in: SetQE*Var( qe, colour).
-//
-// 10) After every eventloop, MCalibrationChargeCalc calls the function: Update*Method().
-//     which calculates the ratio measured QE / gkDefaultQE* of every colour implied so far 
+//     in the variables SetQEBlindPixel(qe, color), SetQEFFactor(qe,color) and 
+//     SetQEPINDiode(qe,color) 
+//
+// 9)  Errors are propagated and corresponding variances get stored in 
+//     SetQEBlindPixelVar(var,color), SetQEFFactorVar(var,color) and 
+//     SetQEPINDiodeVar(var,color).
+//
+// 10) After every eventloop, MCalibrationChargeCalc calls the functions UpdateBlindPixelMethod(),
+//     UpdateFFactorMethod() and UpdatePINDiodeMethod() which calculate the ratio 
+//     measured QE / gkDefaultQEGreen (or gkDefaultQEBlue or gkDefaultQEUV or gkDefaultQECT1) 
 //     and calculates an weighted average of these quantum-efficiency normalizations obtained
 //     by one of the three methods.
 //
-// 11) A call to GetQECascades* returns then the normalization multiplied with an average QE 
+// 11) A call to GetQECascadesBlindPixel(zenith), GetQECascadesFFactor(zenith) or 
+//     GetQECascadesPINDiode(zenith) returns then the normalization multiplied with an average QE 
 //     folded into a cascades spectrum. This number should be dependent on zenith angle, but 
 //     this feature is not yet implemented, instead a fixed number gkDefaultAverageQE is used.