Changeset 3685 for trunk/MagicSoft

Timestamp:

04/08/04 20:25:12 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

@@ -660 +660 @@
 // ------------------------------------------------------------------------------
 //
+// Get the error on the averaged Quantum efficiency folded over the cascade spectrum, 
+// obtained with the blind pixel method and averaged over the results from the 
+// different colours.
+//
+Float_t MCalibrationQEPix::GetQECascadesBlindPixelErr( const Float_t zenith  )  const
+{
+  const Float_t var = GetQECascadesBlindPixel(zenith);
+  
+  if (var < 0.)
+    return -1.;
+
+  return TMath::Sqrt(var);
+}
+
+// ------------------------------------------------------------------------------
+//
 // Get the averaged Quantum efficiency folded over the cascade spectrum, obtained 
 // with the combination of the three methods and averaged over the results 
@@ -671 +687 @@
 // ------------------------------------------------------------------------------
 //
+// Get the error on the averaged Quantum efficiency folded over the cascade spectrum, 
+// obtained with the combined method and averaged over the results from the 
+// different colours.
+//
+Float_t MCalibrationQEPix::GetQECascadesCombinedErr( const Float_t zenith  )  const
+{
+  const Float_t var = GetQECascadesCombined(zenith);
+  
+  if (var < 0.)
+    return -1.;
+
+  return TMath::Sqrt(var);
+}
+
+// ------------------------------------------------------------------------------
+//
 // Get the variance of the averaged Quantum efficiency folded over the cascade spectrum, 
 // obtained with the combination of the three methods and averaged over the results from the 
@@ -693 +725 @@
 // ------------------------------------------------------------------------------
 //
+// Get the error on the averaged Quantum efficiency folded over the cascade spectrum, 
+// obtained with the F-Factor method and averaged over the results from the 
+// different colours.
+//
+Float_t MCalibrationQEPix::GetQECascadesFFactorErr( const Float_t zenith  )  const
+{
+  const Float_t var = GetQECascadesFFactor(zenith);
+  
+  if (var < 0.)
+    return -1.;
+
+  return TMath::Sqrt(var);
+}
+
+// ------------------------------------------------------------------------------
+//
 // Get the variance of the averaged Quantum efficiency folded over the cascade spectrum, 
 // obtained with the F-Factor method and averaged over the results from the 
@@ -711 +759 @@
 {
   return fAvNormPINDiode * GetAverageQE ( zenith );
+}
+
+// ------------------------------------------------------------------------------
+//
+// Get the error on the averaged Quantum efficiency folded over the cascade spectrum, 
+// obtained with the PIN Diode method and averaged over the results from the 
+// different colours.
+//
+Float_t MCalibrationQEPix::GetQECascadesPINDiodeErr( const Float_t zenith  )  const
+{
+  const Float_t var = GetQECascadesPINDiode(zenith);
+  
+  if (var < 0.)
+    return -1.;
+
+  return TMath::Sqrt(var);
 }
 
@@ -1042 +1106 @@
     return kFALSE;
 
-  weightedav /= sumweights;
-
-  fAvNormFFactor     = gkDefaultAverageQE   *  weightedav;
-  fAvNormFFactorVar  = GetAverageQERelVar() + (sumweights / weightedav / weightedav );  
-  fAvNormFFactorVar *= fAvNormFFactor * fAvNormFFactor;
+  fAvNormFFactor     = weightedav / sumweights;
+  fAvNormFFactorVar  = 1./ sumweights ;
 
   return kTRUE;

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h

@@ -86 +86 @@
   Float_t GetQEBlindPixelRelVar          ( const MCalibrationCam::PulserColor_t col ) const;  
   Float_t GetQECascadesBlindPixel        ( const Float_t zenith=0.)                   const;
+  Float_t GetQECascadesBlindPixelErr     ( const Float_t zenith=0.)                   const;
   Float_t GetQECascadesBlindPixelVar     ( const Float_t zenith=0.)                   const;
   Float_t GetQECascadesCombined          ( const Float_t zenith=0.)                   const;  
-  Float_t GetQECascadesCombinedVar       ( const Float_t zenith=0.)                   const;  
+  Float_t GetQECascadesCombinedErr       ( const Float_t zenith=0.)                   const;
+  Float_t GetQECascadesCombinedVar       ( const Float_t zenith=0.)                   const;    
   Float_t GetQECascadesFFactor           ( const Float_t zenith=0.)                   const;  
-  Float_t GetQECascadesFFactorVar        ( const Float_t zenith=0 )                   const;  
+  Float_t GetQECascadesFFactorErr        ( const Float_t zenith=0 )                   const;
+  Float_t GetQECascadesFFactorVar        ( const Float_t zenith=0 )                   const;    
   Float_t GetQECascadesPINDiode          ( const Float_t zenith=0.)                   const;
-  Float_t GetQECascadesPINDiodeVar       ( const Float_t zenith=0.)                   const;
+  Float_t GetQECascadesPINDiodeErr       ( const Float_t zenith=0.)                   const;
+  Float_t GetQECascadesPINDiodeVar       ( const Float_t zenith=0.)                   const;  
   Float_t GetQECombined                  ( const MCalibrationCam::PulserColor_t col ) const;        
   Float_t GetQECombinedErr               ( const MCalibrationCam::PulserColor_t col ) const;