Changeset 5384 for trunk/MagicSoft/Mars

Timestamp:

11/11/04 11:58:03 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mcalib/MCalibrationBlindPix.cc (modified) (4 diffs)
• mcalib/MCalibrationBlindPix.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/11/11: Markus Gaug
+
+   * mcalib/MCalibrationBlindPix.[h,cc]
+     - introduced new data member: fAreaErr which is not zero for the
+       third blind pixel
+
+   * msignal/MExtractor.cc:
+     - changed default argument of SetNoiseCalculation back from kTRUE
+       to kFALSE
+
+
  2004/11/11: Thomas Bretz
 
@@ -65 +76 @@
 
 
-
  2004/11/10: Abelardo Moralejo
 
@@ -75 +85 @@
        on the text messages. At high energies the underestimation of Q
        could be as large as a 20%.
-
-
 
  2004/11/10: Markus Gaug

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc

@@ -101 +101 @@
 
   fArea = fgArea;
+  fAreaErr = 0.;
 
   Float_t att[MCalibrationCam::gkNumPulserColors];
@@ -226 +227 @@
   pix.fFlags      = fFlags;
   pix.fArea       = fArea;                     
+  pix.fAreaErr    = fAreaErr;                     
   pix.fColor      = fColor;
 
@@ -345 +347 @@
 // --------------------------------------------------------------------------
 //
+// Return fAreaErr^2 / (fArea^2 )
+// 
+const Float_t MCalibrationBlindPix::GetAreaRelVar() const
+{
+  return fAreaErr*fAreaErr/fArea/fArea;
+}
+
+
+// --------------------------------------------------------------------------
+//
 // Return TMath::Power(10,fAtt[fColor])
 //
@@ -498 +510 @@
       return kFALSE;
 
-  fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetQERelVar() + GetAttRelVar() + GetCollEffRelVar();
+  fFluxInsidePlexiglassVar = GetLambdaRelVar() + GetQERelVar() + GetAttRelVar() + GetCollEffRelVar() + GetAreaRelVar();
 
   //

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.h

@@ -38 +38 @@
   static const Float_t fgCollEffErr;   //! Uncertainty Collection Efficiency
 
-  Float_t fArea;                       // Blind Pixel Area 
+  Float_t fArea;                       // Blind Pixel Area
+  Float_t fAreaErr;                    // Blind Pixel Area Error
   MArrayF fAtt;                        // Attenuation filter (per color)
   MArrayF fAttErr;                     // Error attnuation filter (per color)
@@ -75 +76 @@
   
   // Getters
+  const Float_t GetAreaRelVar   () const;
   const Float_t GetAtt          () const; 
   const Float_t GetAttRelVar    () const; 
@@ -109 +111 @@
   
   // Setters
-  void SetArea      ( Float_t f )               { fArea = f; }
+  void SetArea      ( Float_t f )               { fArea    = f; }
+  void SetAreaErr   ( Float_t f )               { fAreaErr = f; }  
   
   void SetAtt       ( Int_t n, Float_t *array ) { fAtt       .Set(n,array); }
@@ -138 +141 @@
   void SetFluxInsidePlexiglassAvailable( const Bool_t b=kTRUE);
 
-  ClassDef(MCalibrationBlindPix, 1)     // Container Calibration Results Blind Pixel
+  ClassDef(MCalibrationBlindPix, 2)     // Container Calibration Results Blind Pixel
 };