Changeset 5412 for trunk/MagicSoft

Timestamp:

11/16/04 14:56:32 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1675 +1675 @@
       qepix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
 
-      if (!qepix.UpdateFFactorMethod( qecam->GetPlexiglassQE(), qecam->GetPlexiglassQERelVar() ))
+      if (!qepix.UpdateFFactorMethod( qecam->GetPlexiglassQE() ))
         *fLog << warn << GetDescriptor() 
               << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl;
@@ -1903 +1903 @@
       qepix.SetBlindPixelMethodValid(  kTRUE   , fPulserColor );
 
-      if (!qepix.UpdateBlindPixelMethod( qecam->GetPlexiglassQE(), qecam->GetPlexiglassQERelVar() ))
+      if (!qepix.UpdateBlindPixelMethod( qecam->GetPlexiglassQE()))
         *fLog << warn << GetDescriptor() 
               << ": Cannot update Quantum efficiencies with the Blind Pixel Method" << endl;

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

@@ -1260 +1260 @@
 // Update the Blind Pixel Method: Calculate new average QE's
 //
-Bool_t  MCalibrationQEPix::UpdateBlindPixelMethod( const Float_t plex, const Float_t plexrelvar )
+Bool_t  MCalibrationQEPix::UpdateBlindPixelMethod( const Float_t plex )
 {
 
@@ -1275 +1275 @@
 
   fAvNormBlindPixel     = weightedav / plex / sumweights;
-  fAvNormBlindPixelVar  = 1./ sumweights  + plexrelvar*fAvNormFFactor;
+  fAvNormBlindPixelVar  = 1./ sumweights;
 
   SetAverageQEBlindPixelAvailable();
@@ -1326 +1326 @@
 // Update the F-Factor Method: Calculate new average QE's
 //
-Bool_t  MCalibrationQEPix::UpdateFFactorMethod( const Float_t plex, const Float_t plexrelvar)
+Bool_t  MCalibrationQEPix::UpdateFFactorMethod( const Float_t plex )
 {
 
@@ -1341 +1341 @@
 
   fAvNormFFactor     = weightedav / plex / sumweights;
-  fAvNormFFactorVar  = 1./ sumweights + plexrelvar*fAvNormFFactor;
+  fAvNormFFactorVar  = 1./ sumweights;
   
   SetAverageQEFFactorAvailable();

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h

@@ -166 +166 @@
 
   // Updates
-  Bool_t  UpdateBlindPixelMethod( const Float_t plex, const Float_t plexrelvar );
+  Bool_t  UpdateBlindPixelMethod( const Float_t plex );
   Bool_t  UpdateCombinedMethod  ();
-  Bool_t  UpdateFFactorMethod   ( const Float_t plex, const Float_t plexrelvar );
+  Bool_t  UpdateFFactorMethod   ( const Float_t plex );
   Bool_t  UpdatePINDiodeMethod  ();