Changeset 2725 for trunk/MagicSoft/Mars/manalysis/MCalibrate.cc

Timestamp:

12/19/03 15:41:03 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MCalibrate.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCalibrate.cc

@@ -44 +44 @@
 
 #include "MCalibrate.h"
+#include "MCalibrationConfig.h"
 
 #include "MLog.h"
@@ -137 +138 @@
         MCalibrationPix &pix = (*fCalibrations)[pixid];
 
+
         if (pix.IsBlindPixelMethodValid())
         {
             MExtractedSignalPix &sig =  (*fSignals)[pixid];
 
-            Bool_t logain = sig.IsLoGainUsed();
-        
             Float_t signal;
-            if (logain)
-                signal = sig.GetExtractedSignalLoGain();
+            Float_t signalErr = 0.;
+
+            if (sig.IsLoGainUsed())
+              {
+                signal    = sig.GetExtractedSignalLoGain()*pix.GetConversionHiLo();
+                signalErr = signal*pix.GetConversionHiLoError();
+              }
             else
-                signal = sig.GetExtractedSignalHiGain();
-            
-            
+              {
+                signal = sig.GetExtractedSignalHiGain();
+              }
+            
             //      Float_t calibrationConvertionFactor = pix.GetMeanConversionFFactorMethod();
-            Float_t calibrationConversionFactor = pix.GetMeanConversionBlindPixelMethod();
+            Float_t calibrationConversionFactor      = pix.GetMeanConversionBlindPixelMethod();
             Float_t calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
             
 
-            Float_t nphot = signal*calibrationConversionFactor;
-            Float_t nphoterr = signal*calibrationConversionFactorError;;
-            
-            fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);
+            Float_t nphot    = signal*calibrationConversionFactor;
+
+            Float_t nphotErr = signal*calibrationConversionFactorError*signal*calibrationConversionFactorError;
+            nphotErr += signalErr*signalErr*calibrationConversionFactor*calibrationConversionFactor;
+            nphotErr  = TMath::Sqrt(nphotErr);
+
+            fCerPhotEvt->AddPixel(pixid, nphot, nphotErr);
         }
         else