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

Timestamp:

01/28/04 21:50:34 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -58 +58 @@
 #include "MPedestalCam.h"
 
+#include "MExtractedSignalPix.h"
+#include "MExtractedSignalCam.h"
+
+
 #include "MGeomCamMagic.h"
 
@@ -69 +73 @@
 //
 MPedCalcPedRun::MPedCalcPedRun(const char *name, const char *title)
+    : fRawEvt(NULL), fPedestals(NULL), fSignals(NULL)
 {
     fName  = name  ? name  : "MPedCalcPedRun";
@@ -75 +80 @@
     AddToBranchList("fHiGainPixId");
     AddToBranchList("fHiGainFadcSamples");
-}
+
+    Clear();
+}
+
+void MPedCalcPedRun::Clear(const Option_t *o)
+{
+
+  fNumHiGainSamples = 0;
+  fNumPixels        = 0;
+  fNumSamplesTot    = 0;
+  fUseHists         = kFALSE;
+  
+  fRawEvt    = NULL;
+  fPedestals = NULL;
+  fSignals   = NULL;
+
+  return;
+  
+}
+
 
 // --------------------------------------------------------------------------
@@ -101 +125 @@
         return kFALSE;
 
+    fSignals = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+
+    if (!fSignals && fUseHists)
+    {
+        *fLog << warn << "Cannot find MExtractedSignalCam... will not use histograms!" << endl;
+        fUseHists = kFALSE;
+    }
+
     fNumSamplesTot=0;
 
@@ -141 +173 @@
     // the other one
     fNumHiGainSamples = runheader->GetNumSamplesHiGain() & ~1;
+
+    if (fUseHists)
+      fPedestals->InitUseHists();
 
     return kTRUE;
@@ -170 +205 @@
         
         const Float_t msum = (Float_t)sum;
-        const Float_t msqr = (Float_t)sqr;
-        
-        const Float_t higainped = msum/fNumHiGainSamples;
-        const Float_t higainrms = TMath::Sqrt((msqr-msum*msum/fNumHiGainSamples)/(fNumHiGainSamples-1.));
-        
+
         const UInt_t idx = pixel.GetPixelId();
-        (*fPedestals)[idx].Set(higainped, higainrms);
+        //
+        // These three lines have been uncommented by Markus Gaug
+        // If anybody needs them, please contact me!!
+        //
+        //      const Float_t higainped = msum/fNumHiGainSamples;
+        //      const Float_t higainrms = TMath::Sqrt((msqr-msum*msum/fNumHiGainSamples)/(fNumHiGainSamples-1.));
+        //      (*fPedestals)[idx].Set(higainped, higainrms);
         
         fSumx[idx]  += msum;
@@ -182 +219 @@
         // The old version:
         //
+        //       const Float_t msqr = (Float_t)sqr;
         //      fSumx2[idx] += msqr;
         //
@@ -187 +225 @@
         //
         fSumx2[idx] += msum*msum;
+
+        if (fUseHists)
+          {
+            MExtractedSignalPix &sig =  (*fSignals)[idx];            
+            const Float_t signal = sig.GetExtractedSignalHiGain();
+            const Float_t signalPerSlice = signal/(Float_t)fSignals->GetNumUsedFADCSlices();
+            (*fPedestals)[idx].FillHists(signalPerSlice);
+          }
     }
     
     fPedestals->SetReadyToSave();
     fNumSamplesTot += fNumHiGainSamples;
+
     
     return kTRUE;
@@ -225 +272 @@
       
       (*fPedestals)[pixid].Set(higainped, higainrms);
+
+      if (fUseHists)
+        (*fPedestals)[pixid].FitCharge();
+      
     }