Changeset 3015 for trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -124 +124 @@
   fNumPixels        = 0;
   fNumSamplesTot    = 0;
-  fUseHists         = kFALSE;
   
   fRawEvt    = NULL;
@@ -160 +159 @@
 
     fSignals = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-
-    if (!fSignals && fUseHists)
-    {
-        *fLog << warn << "Cannot find MExtractedSignalCam... will not use histograms!" << endl;
-        fUseHists = kFALSE;
-    }
 
     fNumSamplesTot=0;
@@ -207 +200 @@
     // the other one
     fNumHiGainSamples = runheader->GetNumSamplesHiGain() & ~1;
-
-    if (fUseHists)
-      fPedestals->InitUseHists();
 
     return kTRUE;
@@ -260 +250 @@
         fSumx2[idx] += msum*msum;
 
-        if (fUseHists)
-          {
-            MExtractedSignalPix &sig =  (*fSignals)[idx];            
-            const Float_t signal = sig.GetExtractedSignalHiGain();
-            (*fPedestals)[idx].FillHists(signal);
-          }
     }
     
@@ -290 +274 @@
   while (pixel.Next())
     {
-      const UInt_t pixid = pixel.GetPixelId();
+      const Int_t pixid = pixel.GetPixelId();
       
       const Float_t sum  = fSumx.At(pixid);
@@ -307 +291 @@
       (*fPedestals)[pixid].Set(higainped, higainrms);
 
-      if (fUseHists)
-        (*fPedestals)[pixid].FitCharge();
-      
     }
   
-  fPedestals->SetNumTotSlices(fNumSamplesTot);
-
-  if (fUseHists)
-    fPedestals->SetNumExtractSlices(fSignals->GetNumUsedHiGainFADCSlices());
+  fPedestals->SetTotalEntries(fNumSamplesTot);
 
   return kTRUE;