Changeset 1131 for trunk/MagicSoft

Timestamp:

12/19/01 15:39:46 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/MagicHillas.C (modified) (2 diffs)
• macros/readMagic.C (modified) (1 diff)
• manalysis/MMcPedestalCopy.cc (modified) (2 diffs)
• manalysis/MMcPedestalNSB.cc (modified) (1 diff)

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -68 +68 @@
     // read.AddFile("data/cer000019.root");
 
-    MMcPedestalCopy pcopy;
-    MMcPedestalNSB  pnsb;
-    MCerPhotCalc    ncalc;
-    MImgCleanStd    clean;
-    MHillasCalc     hcalc;
-    MFillH          hfill("MHillas", "MHHillas");
-    MFillH          sfill("MHillas", "MHStarMap");
+    MMcPedestalCopy   pcopy;
+    MMcPedestalNSBAdd pnsb;
+    MCerPhotCalc      ncalc;
+    MImgCleanStd      clean;
+    MHillasCalc       hcalc;
+    MFillH            hfill("MHillas", "MHHillas");
+    MFillH            sfill("MHillas", "MHStarMap");
 
     //
@@ -104 +104 @@
     if (!evtloop.Eventloop())
         return;
+
     tlist.PrintStatistics();
 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -38 +38 @@
     plist.AddToList(&tlist);
 
-    MReadMarsFile   read("Events", "~/data/camera.root");
-    MMcPedestalCopy pcopy;
-    MMcPedestalNSB  pnsb;
-    MCerPhotCalc    ncalc;
-    MClone          clone("MCerPhotEvt");
-    MImgCleanStd    clean;
-    MHillasCalc     hcalc;
+    MReadMarsFile     read("Events", "~/data/camera.root");
+    MMcPedestalCopy   pcopy;
+    MMcPedestalNSBAdd pnsb;
+    MCerPhotCalc      ncalc;
+    MClone            clone("MCerPhotEvt");
+    MImgCleanStd      clean;
+    MHillasCalc       hcalc;
 
     tlist.AddToList(&read);

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -64 +64 @@
 }
 
+Bool_t MMcPedestalCopy::CheckRunType(MParList *pList) const
+{
+    MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (!run)
+    {
+        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
+        return kTRUE;
+    }
+
+    return run->GetRunType() == kRTMonteCarlo;
+}
+
 Bool_t MMcPedestalCopy::PreProcess(MParList *pList)
 {
-    ReInit(pList);
+    if (!CheckRunType(pList))
+    {
+        *fLog << warn << dbginf << " MMcPedestalCopy is for Monte Carlo files only... ";
+        *fLog << "removing task from list." << endl;
+        return kSKIP;
+    }
+
+    fPedCam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    if (!fPedCam)
+        return kFALSE;
+
+    fMcPed = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
+    if (!fMcPed)
+    {
+        *fLog << warn << dbginf << "MMcFadcHeader not found... aborting." << endl;
+        return kFALSE;
+    }
 
     return kTRUE;
@@ -73 +101 @@
 Bool_t MMcPedestalCopy::ReInit(MParList *pList)
 {
-    MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-    if (run)
-    {
-        if (run->GetRunType() != kRTMonteCarlo)
-        {
-            *fLog << warn << dbginf << "MMcPedestalCopy is for Monte Carlo files only... removing this task from list." << endl;
-            return kSKIP;
-        }
-    }   
-    else
-        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
-    
-
-    const MMcFadcHeader *mcped = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
-    if (!mcped)
-    {
-        *fLog << warn << dbginf << "MMcFadcHeader not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    MPedestalCam *pedcam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (!pedcam)
+    if (!CheckRunType(pList))
         return kFALSE;
 
-    const int num = mcped->GetNumPixel();
+    const int num = fMcPed->GetNumPixel();
 
-    pedcam->InitSize(num);
-
-    *fLog << "Pixels: " << num << endl;
+    fPedCam->InitSize(num);
 
     for (int i=0; i<num; i++)
     {
-        MPedestalPix &pix = (*pedcam)[i];
+        MPedestalPix &pix = (*fPedCam)[i];
 
         // Here one should compute the Pedestal taking into account how
         // the MC makes the transformation analogic-digital for the FADC.
 
-        const Float_t pedest = mcped->GetPedestal(i);
+        const Float_t pedest = fMcPed->GetPedestal(i);
         const Float_t pedrms = pedest/sqrt(num);
 
-        const Float_t sigma  = mcped->GetPedestalRms(i);
+        const Float_t sigma  = fMcPed->GetPedestalRms(i);
         const Float_t sigrms = sigma/sqrt(num*2);
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSB.cc

@@ -63 +63 @@
 }
 
-Bool_t MMcPedestalNSB::PreProcess(MParList *pList)
+Bool_t MMcPedestalNSB::ReInit(MParList *pList)
 {
     MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader");