Changeset 5404 for trunk/MagicSoft/Mars/mcalib

Timestamp:

11/16/04 10:01:24 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationQEPix.cc (modified) (4 diffs)
• MCalibrationQEPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

@@ -1260 +1260 @@
 // 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 +1274 @@
     return kFALSE;
 
-  fAvNormBlindPixel     = weightedav / sumweights;
-  fAvNormBlindPixelVar  = 1./ sumweights ;
+  fAvNormBlindPixel     = weightedav / plex / sumweights;
+  fAvNormBlindPixelVar  = 1./ sumweights  + plexrelvar*fAvNormFFactor;
 
   SetAverageQEBlindPixelAvailable();
@@ -1326 +1326 @@
 // 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 +1340 @@
     return kFALSE;
 
-  fAvNormFFactor     = weightedav / sumweights;
-  fAvNormFFactorVar  = 1./ sumweights ;
+  fAvNormFFactor     = weightedav / plex / sumweights;
+  fAvNormFFactorVar  = 1./ sumweights + plexrelvar*fAvNormFFactor;
   
   SetAverageQEFFactorAvailable();

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h

@@ -166 +166 @@
 
   // 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  ();