Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5421)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5422)
@@ -50,4 +50,7 @@
      - fixed a bug in the setting of the window which set always the
        default before.
+
+   * mcalib/MCalibrationChargePINDiode.[h,cc]
+     - updated numbers to the currently installed pin diode
 
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc	(revision 5421)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc	(revision 5422)
@@ -35,16 +35,17 @@
 // Currently, the following numbers are implemented:
 //
-// Area of PIN Diode   Ap: 100.000 +- 10 mm^2 
+// Area of PIN Diode   Ap: 63.5 +- 0.1 mm^2 
+// Transparency of window T: 0.88 +- 0.05
 //
 // Ratio of areas: 
 //
-// Distance of PIN Diode to pulser D1:   1.5  +- 0.3 m
-// Distance of Inner Pixel to pulser D2: 18.0 +- 0.5 m
+// Distance of PIN Diode to pulser D1:   1.139  +- 0.005 m
+// Distance of Inner Pixel to pulser D2: 18.135 +- 0.015 m
 //
 //                          D1*D1
-// gkSolidAngleRatio   =   -------- = 0.00007
-//                         Ap*D2*D2
-//
-// gkSolidAngleRatioErr = 0.00002
+// gkSolidAngleRatio   =   -------- = 7.06 * 10^-5
+//                         Ap*T*D2*D2
+//
+// gkSolidAngleRatioErr = 0.4 * 10^-5
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -61,6 +62,7 @@
 const Float_t MCalibrationChargePINDiode::fgChargeToPhotons    = -1.; 
 const Float_t MCalibrationChargePINDiode::fgChargeToPhotonsErr = -1.; 
-const Float_t MCalibrationChargePINDiode::gkSolidAngleRatio      = 0.00007;
-const Float_t MCalibrationChargePINDiode::gkSolidAngleRatioErr   = 0.00002;
+const Float_t MCalibrationChargePINDiode::gkAbsorptionWindow   = 0.88; 
+const Float_t MCalibrationChargePINDiode::gkSolidAngleRatio    = 0.0000705;
+const Float_t MCalibrationChargePINDiode::gkSolidAngleRatioErr = 0.000004;
 const Float_t MCalibrationChargePINDiode::gkPINDiodeQEGreen    = -1.0;
 const Float_t MCalibrationChargePINDiode::gkPINDiodeQEBlue     = -1.0;
@@ -112,5 +114,5 @@
   SetChargeFitValid     ( kFALSE );
   SetTimeFitValid       ( kFALSE );
-  SetColor              ( MCalibrationCam::kNONE);
+  SetColor              ( MCalibrationCam::kNONE );
     
   fAbsTimeMean              =  -1.;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h	(revision 5421)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h	(revision 5422)
@@ -24,4 +24,5 @@
   static const Float_t gkPINDiodeQEUVErr;     //! Uncertainty QE at 370 nm
   static const Float_t gkPINDiodeQECT1Err;    //! Uncertainty QE at 370 nmu
+  static const Float_t gkAbsorptionWindow;    //! Absorption of the protection window (incl. EMS-wires)
   static const Float_t gkSolidAngleRatio;     //! Solid angles ratio PIN Diode - inner pixel
   static const Float_t gkSolidAngleRatioErr;  //! Error solid angle ratio PIN Diode - inn. pix.