Changeset 3845 for trunk/MagicSoft/Mars

Timestamp:

04/26/04 22:05:15 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (1 diff)
• mcalib/MCalibrationQEPix.cc (modified) (13 diffs)
• mcalib/MHCalibrationCam.h (modified) (1 diff)
• mcalib/MHCalibrationTestCam.cc (added)
• mcalib/MHCalibrationTestCam.h (added)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
  2004/04/26: Markus Gaug
+
+   * mcalib/MCalibrationQEPix.cc
+     - found a bug in the setting of validity flags of colours. This 
+       made the QE used for calibration uncorrect by about a factor 1.5 
+       for the outer pixels if only one colour is used for calibration.
 
    * mjobs/MJCalibration.[h,cc]

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -335 +335 @@
                       if (pix.IsFFactorMethodValid())
                       {
-                          calibQE      = qe.GetQECascadesFFactor   ( zenith );
+                          calibQE      = qe.GetQECascadesFFactor   ( zenith );
                           calibQEVar   = qe.GetQECascadesFFactorVar( zenith );
                       }

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

@@ -204 +204 @@
     const Float_t newavqe    =   GetQEBlindPixel(col)       / GetDefaultQE (col) ; 
     const Float_t newavqevar = ( GetQEBlindPixelRelVar(col) + GetDefaultQERelVar(col) ) * newavqe * newavqe;
-    wav  += newavqe / newavqevar;
-    sumw += 1. / newavqevar ;
+    const Float_t weight     = 1./newavqevar;
+    wav  += newavqe * weight;
+    sumw += weight;
   }
 }
@@ -224 +225 @@
     const Float_t newavqe    =   GetQECombined(col)       / GetDefaultQE (col) ; 
     const Float_t newavqevar = ( GetQECombinedRelVar(col) + GetDefaultQERelVar(col) ) * newavqe * newavqe;
-    wav  += newavqe / newavqevar;
-    sumw += 1./ newavqevar;
+    const Float_t weight     = 1./newavqevar;
+    wav  += newavqe * weight;
+    sumw += weight;
 
   }
@@ -243 +245 @@
   if (IsFFactorMethodValid (col))
   {
-    const Float_t newavqe    =   GetQEFFactor(col)       / GetDefaultQE (col) ; 
+    const Float_t newavqe    =   GetQEFFactor(col)       / GetDefaultQE (col) ;
     const Float_t newavqevar = ( GetQEFFactorRelVar(col) + GetDefaultQERelVar(col) ) * newavqe * newavqe;
-    wav  += newavqe / newavqevar;
-    sumw += 1./ newavqevar;
+    const Float_t weight     = 1./newavqevar;
+    wav  += newavqe *weight;
+    sumw += weight;
 
   }
@@ -268 +271 @@
     const Float_t newavqe    =   GetQEPINDiode(col)       / GetDefaultQE (col) ; 
     const Float_t newavqevar = ( GetQEPINDiodeRelVar(col) + GetDefaultQERelVar(col) ) * newavqe * newavqe;
-    wav  += newavqe / newavqevar;
-    sumw += 1./ newavqevar;
+    const Float_t weight     = 1./newavqevar;
+    wav  += newavqe *weight;
+    sumw += weight;
   }
 }
@@ -932 +936 @@
 Bool_t MCalibrationQEPix::IsBlindPixelMethodValid (MCalibrationCam::PulserColor_t col)  const
 {
-  return TESTBIT(fValidFlags[ MCalibrationCam::kGREEN ],kBlindPixelMethodValid);
+  return TESTBIT(fValidFlags[ col ],kBlindPixelMethodValid);
 }
 
@@ -942 +946 @@
 Bool_t MCalibrationQEPix::IsCombinedMethodValid (MCalibrationCam::PulserColor_t col)  const
 {
-  return TESTBIT(fValidFlags[ MCalibrationCam::kGREEN ],kCombinedMethodValid);
+  return TESTBIT(fValidFlags[ col ],kCombinedMethodValid);
 }
 
@@ -951 +955 @@
 Bool_t MCalibrationQEPix::IsFFactorMethodValid (MCalibrationCam::PulserColor_t col)  const
 {
-  return TESTBIT(fValidFlags[ MCalibrationCam::kGREEN ],kFFactorMethodValid);
+  return TESTBIT(fValidFlags[ col ],kFFactorMethodValid);
 }
 
@@ -960 +964 @@
 Bool_t MCalibrationQEPix::IsPINDiodeMethodValid (MCalibrationCam::PulserColor_t col)  const
 {
-  return TESTBIT(fValidFlags[ MCalibrationCam::kGREEN ],kPINDiodeMethodValid);
+  return TESTBIT(fValidFlags[ col ],kPINDiodeMethodValid);
 }
 
@@ -1018 +1022 @@
 {
   if (b) 
-    SETBIT(fValidFlags[ MCalibrationCam::kGREEN ],kBlindPixelMethodValid);
+    SETBIT(fValidFlags[ col ],kBlindPixelMethodValid);
   else
-    CLRBIT(fValidFlags[ MCalibrationCam::kGREEN ],kBlindPixelMethodValid);    
+    CLRBIT(fValidFlags[ col ],kBlindPixelMethodValid);    
 }
 
@@ -1030 +1034 @@
 {
   if (b) 
-    SETBIT(fValidFlags[ MCalibrationCam::kGREEN ],kCombinedMethodValid);
+    SETBIT(fValidFlags[ col ],kCombinedMethodValid);
   else
-    CLRBIT(fValidFlags[ MCalibrationCam::kGREEN ],kCombinedMethodValid);    
+    CLRBIT(fValidFlags[ col ],kCombinedMethodValid);    
 }
 
@@ -1042 +1046 @@
 {
   if (b) 
-    SETBIT(fValidFlags[ MCalibrationCam::kGREEN ],kFFactorMethodValid);
+    SETBIT(fValidFlags[ col ],kFFactorMethodValid);
   else
-    CLRBIT(fValidFlags[ MCalibrationCam::kGREEN ],kFFactorMethodValid);    
+    CLRBIT(fValidFlags[ col ],kFFactorMethodValid);    
 }
 
@@ -1054 +1058 @@
 {
   if (b) 
-    SETBIT(fValidFlags[ MCalibrationCam::kGREEN ],kPINDiodeMethodValid);
+    SETBIT(fValidFlags[ col ],kPINDiodeMethodValid);
   else
-    CLRBIT(fValidFlags[ MCalibrationCam::kGREEN ],kPINDiodeMethodValid);    
+    CLRBIT(fValidFlags[ col ],kPINDiodeMethodValid);    
 }
 
@@ -1128 +1132 @@
   AddAverageFFactorQEs(MCalibrationCam::kUV   , weightedav, sumweights);
   AddAverageFFactorQEs(MCalibrationCam::kCT1  , weightedav, sumweights);
-
+ 
   if (weightedav == 0. || sumweights == 0.)
     return kFALSE;

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

@@ -72 +72 @@
   virtual void   FinalizeBadPixels();
   
-  void CalcAverageSigma();
+  virtual void CalcAverageSigma();
   
   void DrawAverageSigma(Bool_t sat, Bool_t inner,