Changeset 5045

Timestamp:

09/15/04 20:21:44 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationBlindCam.h (modified) (1 diff)
• MCalibrationChargeCam.cc (modified) (2 diffs)
• MCalibrationChargeCam.h (modified) (1 diff)
• MCalibrationChargePix.cc (modified) (2 diffs)
• MCalibrationQEPix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.h

@@ -20 +20 @@
   // Inits
   void  Init ( const MGeomCam &geom ) {}
-  void  InitSize ( const UInt_t n );
 
   Bool_t IsFluxInsidePlexiglassAvailable () const;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -118 +118 @@
 }
 
+/*
 // --------------------------------------------------------------------------
 //
@@ -162 +163 @@
   return cam;
 }
+*/
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h

@@ -36 +36 @@
   void   Clear ( Option_t *o="" );
   
-  // Clone
-  TObject *Clone(const char *name="") const;
-
   // Draws
   void   DrawPixelContent(Int_t num)   const;    

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -90 +90 @@
 const Float_t MCalibrationChargePix::fgConversionHiLoErr        = 2.5;
 const Float_t MCalibrationChargePix::fgPheFFactorMethodLimit    = 1.;
-const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.75;
+const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.85;
 // --------------------------------------------------------------------------
 //
@@ -886 +886 @@
   // 
   Float_t convrelvar = ffactorsquareRelVar + GetMeanRelVar() + rsigmaSquareRelVar;
-  const Float_t limit      = IsHiGainSaturation() ? fConvFFactorRelVarLimit * 4. : fConvFFactorRelVarLimit;
+  const Float_t limit = IsHiGainSaturation() ? fConvFFactorRelVarLimit * 4. : fConvFFactorRelVarLimit;
 
   //

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h

@@ -6 +6 @@
 #endif
 
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
+#ifndef MARS_MArrayF
+#include "MArrayF.h"
 #endif
 
@@ -41 +41 @@
   static const Float_t gkPMTCollectionEffErr; //! Uncertainty Def. Collection efficiency of the PMTs (0.01)
   
-  TArrayF fQEBlindPixel;                     // Calibrated QEs    (Blind Pixel Method)
-  TArrayF fQEBlindPixelVar;                  // Variance cal. QEs (Blind Pixel Method)
-  TArrayF fQECombined;                       // Calibrated QEs    (Combined Method)
-  TArrayF fQECombinedVar;                    // Variance cal. QEs (Combined Method)
-  TArrayF fQEFFactor;                        // Calibrated QEs    (F-Factor Method)
-  TArrayF fQEFFactorVar;                     // Variance cal. QEs (F-Factor Method)
-  TArrayF fQEPINDiode;                       // Calibrated QEs    (PIN Diode Method)
-  TArrayF fQEPINDiodeVar;                    // Variance cal. QEs (PIN Diode Method)
+  MArrayF fQEBlindPixel;                     // Calibrated QEs    (Blind Pixel Method)
+  MArrayF fQEBlindPixelVar;                  // Variance cal. QEs (Blind Pixel Method)
+  MArrayF fQECombined;                       // Calibrated QEs    (Combined Method)
+  MArrayF fQECombinedVar;                    // Variance cal. QEs (Combined Method)
+  MArrayF fQEFFactor;                        // Calibrated QEs    (F-Factor Method)
+  MArrayF fQEFFactorVar;                     // Variance cal. QEs (F-Factor Method)
+  MArrayF fQEPINDiode;                       // Calibrated QEs    (PIN Diode Method)
+  MArrayF fQEPINDiodeVar;                    // Variance cal. QEs (PIN Diode Method)
                                              
   Float_t fAvNormBlindPixel;                 // Normalization w.r.t. default QE (Blind Pixel Method)
@@ -85 +85 @@
   ~MCalibrationQEPix() {}
   
-  void    Clear(Option_t *o="");
-  
+  void Clear(Option_t *o="");
+  void Copy (TObject& object) const;  
+
   // Getters
-
   const Float_t GetAverageQE     ( const Float_t zenith=0. ) const;  
   const Float_t GetAverageQERelVar( const Float_t zenith=0. ) const;