Changeset 3174 for trunk

Timestamp:

02/16/04 00:31:25 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/CalibLinkDef.h (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (11 diffs)
• mcalib/MHCalibrationChargePINDiode.cc (added)
• mcalib/MHCalibrationChargePix.cc (added)
• mcalib/MHCalibrationChargePix.h (added)
• mcalib/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
    * mcalib/Makefile
    * mcalib/CalibLinkDef.h
+
+   * mcalib/MHCalibrationChargePix.[h,cc]
+     - new base class for the calibration charges histogram pixel. 
+       Derives from MH and can be filled with the MH with the MH 
+       functions. 
+
    * mcalib/MExtractPINDiode.[h,cc]
      - new signal extractor for the PIN Diode

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -17 +17 @@
 #pragma link C++ class MHCalibrationBlindPixel+;
 #pragma link C++ class MHCalibrationPixel+;
+#pragma link C++ class MHCalibrationChargePix+;
 
 #pragma link C++ class MMcCalibrationCalc++;

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -60 +60 @@
 //                MalibrationCam::SkipBlindPixelFits()  (skip all blind
 //                pixel fits)
-//                MalibrationCam::SkipPinDiodeFits()  (skip all PIN Diode
-//                fits)
 //
 //                Hi-Gain vs. Lo-Gain Calibration (very memory-intensive)
@@ -106 +104 @@
 
 #include "MCalibrationBlindPix.h"
-#include "MCalibrationPINDiode.h"
 
 ClassImp(MCalibrationCalc);
@@ -112 +109 @@
 using namespace std;
 
-const UInt_t MCalibrationCalc::fBlindPixelId = 559;
-const UInt_t MCalibrationCalc::fPINDiodeId   = 9999;
+const UInt_t MCalibrationCalc::fgBlindPixelId    = 559;
+const UInt_t MCalibrationCalc::fgPINDiodeId      = 9999;
 const Byte_t MCalibrationCalc::fgSaturationLimit = 254;
 const Int_t  MCalibrationCalc::fgBlindPixelFirst = 3;
@@ -149 +146 @@
     CLRBIT(fFlags, kHiGainOverFlow);
     CLRBIT(fFlags, kLoGainOverFlow);
-    // As long as we don't have the PIN Diode:
-    CLRBIT(fFlags, kUsePinDiodeFit);
 
     fBlindPixelFirst   = 0;
@@ -178 +173 @@
 {
     return fCalibrations->GetBlindPixel();
-}
-
-MCalibrationPINDiode *MCalibrationCalc::GetPINDiode() const
-{
-    return fCalibrations->GetPINDiode();
 }
 
@@ -313 +303 @@
 
         // Exclude the blind pixel and the PIN Diode from normal pixel calibration:
-        if (i == fBlindPixelId)
+        if (i == fgBlindPixelId)
           pix.SetExcluded();
 
-        if (i == fPINDiodeId)
+        if (i == fgPINDiodeId)
           pix.SetExcluded();
 
@@ -395 +385 @@
   //
   MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
-  MCalibrationPINDiode &pindiode   = *(fCalibrations->GetPINDiode());
   
   MRawEvtPixelIter pixel(fRawEvt);
@@ -457 +446 @@
         {
           
-        case fBlindPixelId:
+        case fgBlindPixelId:
 
           if (TESTBIT(fFlags,kUseBlindPixelFit))
@@ -556 +545 @@
           
           break;
-        case fPINDiodeId:
-
-          if (TESTBIT(fFlags,kUsePinDiodeFit))
-            {
-          
-              if (!pindiode.FillCharge(sumhi)) 
-                *fLog << warn 
-                      << "Overflow or Underflow occurred filling PINDiode: sum = " 
-                      << sumhi << endl;
-              
-              if (!pindiode.FillAbsTime(abstime))
-                 *fLog << warn 
-                       << "Overflow or Underflow occurred filling PINDiode abs. time = " 
-                       << abstime << endl;
-
-              if (!pindiode.FillGraphs(sumhi,sumlo))
-                *fLog << warn 
-                      << "Overflow or Underflow occurred filling PINDiode: eventnr = " << endl;
-              
-            } /* if use PIN Diode */
-          
-          //          break;
-              
         default:
               
@@ -662 +628 @@
       const Int_t   nslices     = fBlindPixelLast-fBlindPixelFirst+1;
       const Float_t sqrslice    = TMath::Sqrt((Float_t)nslices);
-      //
-      // retrieve the pedestal pix of the blind pixel
-      //
-      if (fPedestals->GetHistSize() > fBlindPixelId)
-        {
-          MHPedestalPixel &pedhist = (*fPedestals)(fBlindPixelId);
-          pedestal    = pedhist.GetChargeMean()*nslices;
-          pederr      = pedhist.GetChargeMeanErr()*nslices;
-          //
-          // Fitted sigma: 1. one sqrt(Nr. slices) for the division which is not 
-          //                  not appropriate: sigma(real)/slice = GetSigma*sqrt(nslices)
-          //               2. another sqrt(Nr. slices) to calculate back to number 
-          //                  of slices
-          // 
-          pedsigma    = pedhist.GetChargeSigma()*nslices;
-          pedsigmaerr = pedhist.GetChargeSigmaErr()*nslices;
-        }
-      else
-        {
-          MPedestalPix    &pedpix  = (*fPedestals)[fBlindPixelId];
-          pedestal    = pedpix.GetPedestal()*nslices;
-          pederr      = pedpix.GetPedestalRms()*nslices/nentries;
-          pedsigma    = pedpix.GetPedestalRms()*sqrslice;
-          pedsigmaerr = pederr/2.;
-        }
+
+      MPedestalPix    &pedpix  = (*fPedestals)[fgBlindPixelId];
+      pedestal    = pedpix.GetPedestal()*nslices;
+      pederr      = pedpix.GetPedestalRms()*nslices/nentries;
+      pedsigma    = pedpix.GetPedestalRms()*sqrslice;
+      pedsigmaerr = pederr/2.;
       //
       // retrieve the histogram containers
@@ -779 +726 @@
 
 
-  if (TESTBIT(fFlags,kUsePinDiodeFit) && fCalibrations->IsPINDiodeMethodValid())
+  if (fCalibrations->IsPINDiodeMethodValid())
     {
       if (!fCalibrations->CalcFluxOutsidePlexiglass())
         {
           *fLog << err 
-                << "Could not calculate the number of photons from the blind pixel " << endl;
-          *fLog << err 
-                << "You can try to calibrate using the MCalibrationCalc::SkipPINDiodeFit()" << endl;
+                << "Could not calculate the number of photons from the PIN Diode " << endl;
           fCalibrations->SetPINDiodeMethodValid(kFALSE);
         }

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -47 +47 @@
            MHCalibrationPINDiode.cc \
            MHCalibrationPixel.cc \
+           MHCalibrationChargePix.cc \
            MMcCalibrationCalc.cc \
            MExtractPINDiode.cc \