Changeset 1035 for trunk/MagicSoft/Mars/manalysis

Timestamp:

11/06/01 13:44:26 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcPedestalCopy.cc (modified) (3 diffs)
• MMcPedestalCopy.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -43 +43 @@
 
 #include "MPedestalCam.h"
+#include "MRawRunHeader.h"
 #include "MMcFadcHeader.hxx"
 
@@ -58 +59 @@
 Bool_t MMcPedestalCopy::PreProcess(MParList *pList)
 {
-    fMcPedestals = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
-    if (!fMcPedestals)
+    MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (run)
+    {
+        if (run->GetRunType() != kRTMonteCarlo)
+            return kTRUE;
+    }
+
+    const MMcFadcHeader *mcped = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
+    if (!mcped)
     {
         *fLog << dbginf << "MMcFadcHeader not found... aborting." << endl;
@@ -65 +73 @@
     }
 
-    fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (!fPedestals)
+    MPedestalCam *pedcam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    if (!pedcam)
         return kFALSE;
 
-    return kTRUE;
-}
+    const int num = mcped->GetNumPixel();
 
-Bool_t MMcPedestalCopy::Process()
-{
-    const int num = fMcPedestals->GetNumPixel();
-
-    fPedestals->InitSize(num);
+    pedcam->InitSize(num);
 
     for (int i=0; i<num; i++)
     {
-        MPedestalPix &pix = (*fPedestals)[i];
+        MPedestalPix &pix = (*pedcam)[i];
 
-        const Float_t pedest = fMcPedestals->GetPedestal(i);
-        const Float_t pedrms = fMcPedestals->GetPedestalRms(i);
+        const Float_t pedest = mcped->GetPedestal(i);
+        const Float_t pedrms = mcped->GetPedestalRms(i);
 
         const Float_t sigma  = pedest*sqrt(num);
-        const Float_t sigrms = sigma/sqrt(2*num);
+        const Float_t sigrms = sigma/sqrt(num*2);
 
         pix.SetPedestal(pedest, sigma);
         pix.SetPedestalRms(pedrms, sigrms);
-
-        *fLog << pedest << " " << sigma << " " << pedrms << " " << sigrms << endl;
     }
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h

@@ -23 +23 @@
 class MMcPedestalCopy : public MTask
 {
-    const MMcFadcHeader *fMcPedestals;  //
-          MPedestalCam  *fPedestals;    //
-
-          TString       *fSrc;
+    TString *fSrc;
 
 public:
@@ -32 +29 @@
 
     Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
 
     ClassDef(MMcPedestalCopy, 0)   // Task which copies the pedestals from the MC into the standard container