Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5403)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5404)
@@ -21,4 +21,17 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/11/16: Markus Gaug
+
+   * mcalib/MCalibrationQEPix.[h,cc]
+     - give as argument to UpdateBlindPixelMethod() and 
+       UpdateFFactorMethod() the transmission of the plexiglass and the 
+       its rel. variance. 
+       This divides the normalization factor by those numbers and fixes a 
+       bug in the absolute normalization.
+
+   * mcalib/MCalibrationChargeCalc.cc
+     - give the new arguments to MCalibrationQEPix
+
+
  2004/11/15: Thomas Bretz
 
@@ -77,4 +90,7 @@
        (MHCalibrationChargeChargeBlindCam -> MHCalibrationChargeBlindCam)
      - introduced the new blind pixels initialization
+
+   * msignal/MExtractBlindPixel.cc
+     - added MRawEvtData2 to BranchList
 
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc	(revision 5403)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc	(revision 5404)
@@ -1260,5 +1260,5 @@
 // Update the Blind Pixel Method: Calculate new average QE's
 //
-Bool_t  MCalibrationQEPix::UpdateBlindPixelMethod()
+Bool_t  MCalibrationQEPix::UpdateBlindPixelMethod( const Float_t plex, const Float_t plexrelvar )
 {
 
@@ -1274,6 +1274,6 @@
     return kFALSE;
 
-  fAvNormBlindPixel     = weightedav / sumweights;
-  fAvNormBlindPixelVar  = 1./ sumweights ;
+  fAvNormBlindPixel     = weightedav / plex / sumweights;
+  fAvNormBlindPixelVar  = 1./ sumweights  + plexrelvar*fAvNormFFactor;
 
   SetAverageQEBlindPixelAvailable();
@@ -1326,5 +1326,5 @@
 // Update the F-Factor Method: Calculate new average QE's
 //
-Bool_t  MCalibrationQEPix::UpdateFFactorMethod()
+Bool_t  MCalibrationQEPix::UpdateFFactorMethod( const Float_t plex, const Float_t plexrelvar)
 {
 
@@ -1340,6 +1340,6 @@
     return kFALSE;
 
-  fAvNormFFactor     = weightedav / sumweights;
-  fAvNormFFactorVar  = 1./ sumweights ;
+  fAvNormFFactor     = weightedav / plex / sumweights;
+  fAvNormFFactorVar  = 1./ sumweights + plexrelvar*fAvNormFFactor;
   
   SetAverageQEFFactorAvailable();
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h	(revision 5403)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h	(revision 5404)
@@ -166,7 +166,7 @@
 
   // Updates
-  Bool_t  UpdateBlindPixelMethod();
+  Bool_t  UpdateBlindPixelMethod( const Float_t plex, const Float_t plexrelvar );
   Bool_t  UpdateCombinedMethod  ();
-  Bool_t  UpdateFFactorMethod   ();
+  Bool_t  UpdateFFactorMethod   ( const Float_t plex, const Float_t plexrelvar );
   Bool_t  UpdatePINDiodeMethod  ();