Changeset 3712 for trunk

Timestamp:

04/13/04 11:21:32 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCam.h (modified) (1 diff)
• mcalib/MCalibrationChargePix.cc (modified) (2 diffs)
• mcalib/MCalibrationPix.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
    * mcalib/MCalibrationPix.[h,cc]
-     add functions GetHiLoMeansDivided(), GetHiLoSigmasDivided() and 
-     errors
-
+     - add functions GetHiLoMeansDivided(), GetHiLoSigmasDivided() and 
+       errors
+
+   * mcalib/MCalibrationChargeCam.[h,cc]
+     - removed hi-vs.Lo histograms (come into a separate MIntensityCam) 
+     - updated GetPixelContents
+     - updated class documentation
+  
 
  2004/04/13: Thomas Bretz

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h

@@ -6 +6 @@
 #endif
 
-class TH1D;
-class TH2D;
-
 class MCalibrationChargeCam : public MCalibrationCam
 {
 private:
   
-  TH1D* fOffsets;                    //! Histogram with Higain-vs-LoGain fit result Offsets
-  TH1D* fSlopes;                     //! Histogram with Higain-vs-LoGain fit result Slopes
-  TH2D* fOffvsSlope;                 //! Histogram with Higain-vs-LoGain fit result Offsets vs. Slopes
-
   Byte_t  fFlags;                    // Bit-field to hold the flags
 
   enum  { kFFactorMethodValid };
 
-  
 public:
 
   MCalibrationChargeCam(const char *name=NULL, const char *title=NULL);
-  ~MCalibrationChargeCam();
   
   void   Clear ( Option_t *o="" );
   
   // Draws
-//  void DrawHiLoFits();
   void   DrawPixelContent(Int_t num)   const;    
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -349 +349 @@
 }
 
+
+
 // --------------------------------------------------------------------------
 //
@@ -659 +661 @@
 //
 // Calculate the total F-Factor with the formula:
-//   fMeanFFactorFADC2Phot = Sqrt ( fRSigmaSquare ) / GetMean()  * sqrt( nphotons )
+//   fMeanFFactorFADC2Phot = Sqrt ( fRSigmaSquare ) / GetMean()  * sqrt(nphotons)
 //
 // Calculate the error of the total F-Factor

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -132 +132 @@
 // --------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Mean is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Mean is -1.         (has not yet been set) 
@@ -139 +140 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainMean == 0. || fLoGainMean == -1.)
     return -1.;
@@ -151 +155 @@
 // ----------------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Mean or its variance is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Mean or its variance is -1.         (has not yet been set) 
@@ -158 +163 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainMean == 0. || fLoGainMean == -1.)
     return -1.;
@@ -180 +188 @@
 // --------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Sigma is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Sigma is -1.         (has not yet been set) 
@@ -187 +196 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainSigma == 0. || fLoGainSigma == -1.)
     return -1.;
@@ -199 +211 @@
 // ----------------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Sigma or its variance is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Sigma or its variance is -1.         (has not yet been set) 
@@ -206 +219 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainSigma == 0. || fLoGainSigma == -1.)
     return -1.;