Changeset 2889 for trunk/MagicSoft/Mars

Timestamp:

01/23/04 13:29:38 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMcCalibrationUpdate.cc (modified) (3 diffs)
• manalysis/MMcCalibrationUpdate.h (modified) (1 diff)
• mcalib/MMcCalibrationCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/23: Abelardo Moralejo
+
+   * manalysis/MMcCalibrationUpdate.[h,cc] 
+     - Added check to guarantee that the FADC simulation parameters of
+       all read files (those used for calibration and those analyzed) 
+       are the same.
+
+   * mcalib/MMcCalibrationCalc.cc
+     - Removed obsolete FIXME comment.
 
  2004/01/23: Raquel de los Reyes

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -74 +74 @@
     fADC2PhOuter = 1.;
 
+    fAmplitude = -1.;
+    fAmplitudeOuter = -1.;
+    fConversionHiLo = -1.;
+
     fFillCalibrationCam = kTRUE;
 
@@ -178 +182 @@
 
     //
+    // Initialize Fadc simulation parameters:
+    //
+    if ( fAmplitude < 0. )
+      {
+        fAmplitude = fHeaderFadc->GetAmplitud();
+        fAmplitudeOuter = fHeaderFadc->GetAmplitudOuter();
+        fConversionHiLo = fHeaderFadc->GetLow2HighGain();
+      }
+    else   // Check that following files have all the same FADC parameters
+      {
+        if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude) > 1.e-6  ||
+             fabs(fHeaderFadc->GetAmplitudOuter()-fAmplitudeOuter) > 1.e-6  ||
+             fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain()) > 1.e-6 )
+          {
+            *fLog << err << endl << endl << dbginf << "Parameters of MMcFadcHeader are not the same for all the read files. Aborting..." << endl << endl;
+            return kFALSE;
+          }
+      }
+
+    //
     // If MCalibrationCam already existed in the parameter list before
     // MMcCalibrationUpdate::PreProcess was executed (from a 
@@ -189 +213 @@
     // Set the ADC to photons conversion factor for outer pixels:
     //
-    fADC2PhOuter = fADC2PhInner *
-      (fHeaderFadc->GetAmplitud() / fHeaderFadc->GetAmplitudOuter());
-
-    //
-    // Set the conversion factor between high and low gain:
-    //
-    fConversionHiLo = fHeaderFadc->GetLow2HighGain();
+    fADC2PhOuter = fADC2PhInner * (fAmplitude / fAmplitudeOuter);
 
     const int num = fCalCam->GetSize();

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -28 +28 @@
     Float_t fADC2PhInner; // Conversion factor from ADC counts to photons
     Float_t fADC2PhOuter; // for inner and outer pixels.
-    Float_t fConversionHiLo;
 
     Bool_t  fFillCalibrationCam;
+
+    Float_t fAmplitude;      // FADC parameters from camera simulation (see camera manual)
+    Float_t fAmplitudeOuter; // to be read from the MMcFadcHeader.
+    Float_t fConversionHiLo; // Ratio of high to low gain.
+
 
 public:

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -176 +176 @@
     }
 
-  //
-  // FIXME: Check that the relevant parameters in the FADC header are the
-  // same for all the analyzed data, both Calibration and Analyzed data!
-  //
-
   return kTRUE;
 }