Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4223)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4224)
@@ -39,4 +39,8 @@
        error remains around 20%). 
 
+   * mcalib/MCalibrationChargeCalc.cc
+     - write the number of photons directy into MCalibrationChargeCam. 
+       These numbers would otherwise have to be assembled by different 
+       parts in separate code. 
 
  2004/05/27: Thomas Bretz
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4223)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4224)
@@ -1239,9 +1239,9 @@
 
   const Float_t avphotons   = avpix.GetPheFFactorMethod()       
-                           / qepix.GetQEFFactor(fPulserColor)
+                           / qepix.GetDefaultQE(fPulserColor)
                            / fQECam->GetPlexiglassQE();
 
   const Float_t avphotrelvar = avpix.GetPheFFactorMethodRelVar() 
-                            + qepix.GetQEFFactorRelVar(fPulserColor)
+                            + qepix.GetDefaultQERelVar(fPulserColor)
                             + fQECam->GetPlexiglassQERelVar();
 
@@ -1365,5 +1365,21 @@
 
   const UInt_t npixels  = fGeom->GetNumPixels();
-  
+
+  //
+  // Set the results in the MCalibrationChargeCam
+  //
+  if (fBlindPixel)
+    {
+      if (fBlindPixel->IsFluxInsidePlexiglassAvailable())
+        {
+          const Float_t photons = fBlindPixel->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA()
+                               / fQECam->GetPlexiglassQE();
+          fCam->SetNumPhotonsBlindPixelMethod   (photons);
+          const Float_t photrelvar = fBlindPixel->GetFluxInsidePlexiglassRelVar() 
+                                   + fQECam->GetPlexiglassQERelVar();
+          if (photrelvar > 0.)
+            fCam->SetNumPhotonsBlindPixelMethodErr(TMath::Sqrt( photrelvar * photons * photons));  
+        }
+    }
   //
   //  With the knowledge of the overall photon flux, calculate the