Changeset 2886 for trunk/MagicSoft/Mars/manalysis

Timestamp:

01/22/04 20:54:16 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcCalibrationUpdate.cc (modified) (8 diffs)
• MMcCalibrationUpdate.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -37 +37 @@
 //   MMcFadcHeader
 //   MRawRunHeader
+//  [MCalibrationCam] (if it existed previously)
 //
 //  Output Containers:
-//   MCalibrationCam
 //   MPedPhotCam
+//  [MCalibrationCam] (if it did not exist previously)
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -95 +96 @@
 }
 
-
-//---------------------------------------------------------------------------
-//
-// Set ADC to photon conversion factors.
-//
-void MMcCalibrationUpdate::SetADC2PhInner(Float_t x)
-{
-  fADC2PhInner = x;
-
-  return;
-}
-
 // --------------------------------------------------------------------------
 //
@@ -123 +112 @@
   if ( !fCalCam )
     {
-      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
+      *fLog << inf << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
 
       fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
@@ -135 +124 @@
     {
       fFillCalibrationCam = kFALSE;
-      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
+      *fLog << inf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
     }
 
@@ -189 +178 @@
 
     //
-    // 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();
-
-    //
     // If MCalibrationCam already existed in the parameter list before
     // MMcCalibrationUpdate::PreProcess was executed (from a 
@@ -208 +186 @@
       return kTRUE;
 
+    //
+    // 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();
 
     const int num = fCalCam->GetSize();
@@ -264 +252 @@
         // counts for the RMS per slice:
         //
-
 
         const Float_t pedestrms  = sigpix.IsLoGainUsed()? 
@@ -279 +266 @@
         MPedPhotPix &pedpix = (*fPedPhotCam)[i];
 
-        Float_t adc2phot = (fGeom->GetPixRatio(i) < fGeom->GetPixRatio(0))?
-          fADC2PhOuter : fADC2PhInner;
+        MCalibrationPix &calpix = (*fCalCam)[i];
+        Float_t adc2phot = calpix.GetMeanConversionBlindPixelMethod();
+        Float_t hi2lo    = calpix.GetConversionHiLo();
 
         if (sigpix.IsLoGainUsed())
-          pedpix.Set(adc2phot*fConversionHiLo*pedestmean, 
-                     adc2phot*fConversionHiLo*pedestrms);
+          pedpix.Set(adc2phot*hi2lo*pedestmean, 
+                     adc2phot*hi2lo*pedestrms);
         else
           pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms);

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -35 +35 @@
     MMcCalibrationUpdate(const char *name=NULL, const char *title=NULL);
 
-    void SetADC2PhInner(Float_t x);
-
     ClassDef(MMcCalibrationUpdate, 0)   // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons. 
 };