Changeset 3015 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/04/04 15:03:44 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -630 +630 @@
       // so that we can use it for the fit
       //
-      if (fPedestals->IsUseHists())
+      if (fPedestals->GetHistSize() > fBlindPixelId)
         {
           //
           // retrieve the pedestal pix of the blind pixel
           //
-          MPedestalPix &ped = (*fPedestals)[fBlindPixelId];
+          MHPedestalPixel &pedhist = (*fPedestals)(fBlindPixelId);
+          MPedestalPix    &pedpix  = (*fPedestals)[fBlindPixelId];
           //
           // retrieve the histogram containers
           //
           MHCalibrationBlindPixel *hist = blindpixel.GetHist();
-          MHPedestalPixel *pedhist = ped.GetHist();
           //
           // Set the corresponding values
           //
           const Float_t nslices     = (Float_t)fSignals->GetNumUsedFADCSlices();
-          const Int_t   nentries    = pedhist->GetTotalEntries();
-          
-          const Float_t peddiff     = ped.GetMean() - ped.GetPedestal()*nslices;
-
-          Float_t pederr  = ped.GetMeanErr()*ped.GetMeanErr();
-          pederr         += ped.GetPedestalRms()*ped.GetPedestalRms()*nslices*nslices/nentries/nentries;
-          pederr          = TMath::Sqrt(pederr);
-          
-          const Float_t pedsigma    = ped.GetSigma();
-          const Float_t pedsigmaerr = ped.GetSigmaErr();
+          const ULong_t nentries    = fPedestals->GetTotalEntries();
+          
+          const Float_t peddiff     = (pedhist.GetChargeMean()-pedpix.GetPedestal())*nslices;
+
+          const Float_t sqrslice    = TMath::Sqrt(nslices);
+
+          Float_t pederr  = pedhist.GetChargeMeanErr()*pedhist.GetChargeMeanErr();
+          pederr         += pedpix.GetPedestalRms()*pedpix.GetPedestalRms()/nentries;
+          pederr          = TMath::Sqrt(pederr)*sqrslice;
+          
+          const Float_t pedsigma    = pedhist.GetChargeSigma()*sqrslice;
+          const Float_t pedsigmaerr = pedhist.GetChargeSigmaErr()*sqrslice;
           
           hist->SetMeanPedestal(peddiff);