Changeset 3670

Timestamp:

04/06/04 16:53:00 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mcalib/MHCalibrationCam.h (modified) (1 diff)
• mcalib/MHCalibrationChargePINDiode.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -145 +145 @@
 
    * mcalib/MCalibrationChargeCalc.[h,cc],
-     mcalib/MCalibrationChargeCam.cc:
+   * mcalib/MCalibrationChargeCam.cc:
      - holds also pointers to MExtractedSignalPINDiode and 
        MExtractedSignalBlindPixel and does the checks inside the task 
@@ -151 +151 @@
 
    * mcalib/MCalibrationChargeBlindPix.[h,cc],
-    calib/MCalibrationChargePINDiode.[h,cc]:
+   * mcalib/MCalibrationChargePINDiode.[h,cc]:
      - updated and enlarged documentation
 
-
+   * mcalib/MCalibrationPix.h
+   * mcalib/MHCalibrationChargePINDiode.cc
+   * mcalib/MHCalibrationChargeCam.[h,cc]
+     - rename Setter for fMeanVar from SetMeanErr() to SetMeanVar()
+     - rename arrays of fAverageSigmaErr to AverageSigmaVar
 
  2004/04/05: Nadia Tonello

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

@@ -61 +61 @@
   TArrayI fAverageAreaSat;              // Number of saturated slices in average pixels per area
   TArrayF fAverageAreaSigma;            // Re-normalized sigmas in average pixels per area
-  TArrayF fAverageAreaSigmaErr;         // Errors of Re-normalized sigmas in average pixels per area
+  TArrayF fAverageAreaSigmaVar;         // Variance Re-normalized sigmas in average pixels per area
   TArrayF fAverageAreaRelSigma;         // Re-normalized relative sigmas in average pixels per area
-  TArrayF fAverageAreaRelSigmaErr;      // Errors of Re-normalized relative sigmas in average pixels per area
+  TArrayF fAverageAreaRelSigmaVar;      // Variance Re-normalized relative sigmas in average pixels per area
   TArrayI fAverageSectorNum;            // Number of pixels in average pixels per sector 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc

@@ -249 +249 @@
   fPINDiode->SetOscillating  ( !IsFourierSpectrumOK() );
 
-  fPINDiode->SetMean     (  GetMean()     );
-  fPINDiode->SetMeanErr  (  GetMeanErr()  );
-  fPINDiode->SetSigma    (  GetSigma()    );
-  fPINDiode->SetSigmaErr (  GetSigmaErr() );
-  fPINDiode->SetProb     (  GetProb()     );
+  fPINDiode->SetMean     (  fMean     );
+  fPINDiode->SetMeanVar  (  fMeanErr  * fMeanErr );
+  fPINDiode->SetSigma    (  fSigma    );
+  fPINDiode->SetSigmaVar (  fSigmaErr * fMeanErr );
+  fPINDiode->SetProb     (  fProb     );
 
   fPINDiode->SetAbsTimeMean(    GetAbsTimeMean() );