Changeset 2765 for trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

Timestamp:

01/09/04 22:57:10 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -239 +239 @@
     for (UInt_t i=0;i<cam->GetNumPixels();i++)
       {
+
         MCalibrationPix &pix = (*fCalibrations)[i];
         pix.DefinePixId(i);
+        MHCalibrationPixel *hist = pix.GetHist();
+
+        hist->SetTimeFitRangesHiGain(fSignals->GetFirstUsedSliceHiGain(),
+                                    fSignals->GetLastUsedSliceHiGain());
+        hist->SetTimeFitRangesLoGain(fSignals->GetFirstUsedSliceLoGain(),
+                                    fSignals->GetLastUsedSliceLoGain());
+        
       }
     
@@ -453 +461 @@
       MCalibrationPix &pix = (*fCalibrations)[pixid];
 
+      //
+      // get the pedestals
+      //
       const Float_t ped    = (*fPedestals)[pixid].GetPedestal() * fNumHiGainSamples;
-      const Float_t prms   = (*fPedestals)[pixid].GetPedestalRms() * TMath::Sqrt((float)fNumHiGainSamples);
-
+      const Float_t prms   = (*fPedestals)[pixid].GetPedestalRms() * fSqrtHiGainSamples;
+
+      //
+      // set them in the calibration camera
+      //
       pix.SetPedestal(ped,prms);
 
+      //
+      // perform the Gauss fits to the charges
+      //
       pix.FitCharge();
 
+      //
+      // Fill 1-dim histograms with the results
+      //
+      fCalibrations->Fill1DimCharges(pix.GetCharge(),pix.GetErrCharge(),
+                                     pix.GetSigmaCharge(),pix.GetChargeProb());
+
+      //
+      // Perform the Gauss fits to the arrival times
+      //
       if (TESTBIT(fFlags,kUseTimeFits))
         pix.FitTime();