Changeset 2972 for trunk/MagicSoft

Timestamp:

01/30/04 10:19:25 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (5 diffs)
• mcalib/MHCalibrationBlindPixel.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
      - fill Blind Pixel with information about its fitted pedestal if 
        available
+     - initialize charges histogram with a bigger range
+     - use pedestal information to constrain the pedestal fit ranges
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -114 +114 @@
 using namespace std;
 
+const Int_t MCalibrationCalc::fBlindPixelId = 559;
+const Int_t MCalibrationCalc::fPINDiodeId   = 9999;
+
 // --------------------------------------------------------------------------
 //
@@ -121 +124 @@
     : fPedestals(NULL), fCalibrations(NULL), fSignals(NULL),
       fRawEvt(NULL), fRunHeader(NULL), fArrivalTime(NULL), fEvtTime(NULL)
-  //      fBlindPixelId(559), fPINDiodeId(9999)
 {
 
@@ -461 +463 @@
         {
           
-        case kBlindPixelId:
+        case fBlindPixelId:
           
           if (!blindpixel.FillCharge(sumhi)) 
@@ -479 +481 @@
           break;
           
-        case kPINDiodeId:
+        case fPINDiodeId:
 
           if (!pindiode.FillCharge(sumhi)) 
@@ -583 +585 @@
       *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
 
+      //
+      // retrieve mean and sigma of the blind pixel pedestal, 
+      // so that we can use it for the fit
+      //
+      if (fPedestals->IsUseHists())
+        {
+          //
+          // retrieve the pedestal pix of the blind pixel
+          //
+          MPedestalPix &ped = (*fPedestals)[fBlindPixelId];
+          //
+          // retrieve the blind pixel histogram container
+          //
+          MHCalibrationBlindPixel *hist = blindpixel.GetHist();
+          //
+          // Set the corresponding values
+          //
+          const Float_t peddiff     = ped.GetMean() 
+                                    - ped.GetPedestal()*fSignals->GetNumUsedFADCSlices();
+          const Float_t pederr      = ped.GetMeanErr();
+          const Float_t pedsigma    = ped.GetSigma();
+          const Float_t pedsigmaerr = ped.GetSigmaErr();
+          
+          hist->SetMeanPedestal(peddiff);
+          hist->SetMeanPedestalErr(pederr);
+          hist->SetSigmaPedestal(pedsigma);
+          hist->SetSigmaPedestalErr(pedsigmaerr);
+        }
+      
       if (!blindpixel.FitCharge())
         {

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h

@@ -64 +64 @@
   Double_t  fLambdaCheckErr;
 
+  Double_t  fMeanPedestal;
+  Double_t  fMeanPedestalErr;
+  Double_t  fSigmaPedestal;
+  Double_t  fSigmaPedestalErr;
+  
 public:
 
@@ -76 +81 @@
   Bool_t FillBlindPixelChargevsN(Stat_t rq, Int_t t);
   
-
-  //Getters
+  // Setters
+  void SetMeanPedestal(const Float_t f)      { fMeanPedestal = f;     }
+  void SetMeanPedestalErr(const Float_t f)   { fMeanPedestalErr = f;  }
+  void SetSigmaPedestal(const Float_t f)     { fSigmaPedestal = f;    }
+  void SetSigmaPedestalErr(const Float_t f)  { fSigmaPedestalErr = f; }
+  
+  // Getters
   const Double_t GetLambda()         const { return fLambda;         }
   const Double_t GetLambdaCheck()    const { return fLambdaCheck;    }
@@ -224 +234 @@
       Double_t arg = 0.;
       
-      //      Double_t mu0 = 0.;
       Double_t mu0 = par[1];
       Double_t mu1 = par[2];