Changeset 1132 for trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

Timestamp:

12/19/01 15:44:07 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -71 +71 @@
 //
 MMcPedestalNSBAdd::MMcPedestalNSBAdd(const Float_t difnsb,
-                               const char *name, const char *title)
+                                     const char *name, const char *title)
+    : fDnsbPixel(difnsb)
 {
     fName  = name  ? name  : "MMcPedestalNSBAdd";
@@ -82 +83 @@
     AddToBranchList("fPedesMean");
     AddToBranchList("fElecNoise");
-
-    fDnsbPixel=difnsb;
+}
+
+Bool_t MMcPedestalNSBAdd::CheckRunType(MParList *pList) const
+{
+    MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (!runheader)
+    {
+        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
+        return kTRUE;
+    }
+
+    return runheader->GetRunType() == kRTMonteCarlo;
 }
 
@@ -97 +108 @@
    // implemented then this line should be removed.
 
-    ReInit(pList);    
+    if (!CheckRunType(pList))
+    {
+        *fLog << warn << dbginf << "Warning - MMcPedestalNSB is for Monte Carlo files only... removing this task from list." << endl;
+        return kSKIP;
+    }
+
+    fFadc = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
+    if (!fFadc)
+    {
+        *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
+    if (!fGeom)
+    {
+        *fLog << err << dbginf << "MGeomCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fPedCam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    if (!fPedCam)
+        return kFALSE;
+
+    MMcRunHeader *mcrunheader = (MMcRunHeader*)pList->FindObject("MMcRunHeader");
+    if (!mcrunheader && fDnsbPixel < 0 )
+    {
+        *fLog << err << dbginf << "Using the default argument of MMcPedestalNSB::MMcPedestalNSB() ";
+        *fLog << "only allowed if MMcRunHeader is available... aborting." << endl;
+        return kFALSE;
+    }
 
     return kTRUE;
@@ -117 +158 @@
 //   - MPedestalCam
 //
-Bool_t MMcPedestalNSBAdd::ReInit(MParList *pList)
-{
-
-    MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-    if (runheader)
-    {
-        if (runheader->GetRunType() != kRTMonteCarlo)
-        {
-            *fLog << warn << dbginf << "Warning - MMcPedestalNSB 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;
-
-
-    MMcFadcHeader *fadc = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
-    if (!fadc)
-    {
-        *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl;
-        return kFALSE;
-    }
-
-
+Float_t MMcPedestalNSBAdd::GetDnsb(MParList *pList) const
+{
     MMcRunHeader *mcrunheader = (MMcRunHeader*)pList->FindObject("MMcRunHeader");
     if (!mcrunheader && fDnsbPixel < 0 )
@@ -146 +165 @@
         *fLog << err << dbginf << "Using the default argument of MMcPedestalNSB::MMcPedestalNSB() ";
         *fLog << "only allowed if MMcRunHeader is available... aborting." << endl;
+        return -1;
+    }
+
+    if (!mcrunheader)
+        return fDnsbPixel;
+
+    if (fDnsbPixel >= 0 && fDnsbPixel != mcrunheader->GetNumPheFromDNSB())
+    {
+        *fLog << warn << dbginf << "The MC file has been generated with diffuse nsb " << mcrunheader->GetNumPheFromDNSB();
+        *fLog <<" but you set up the diffuse NSB to " << fDnsbPixel << endl;
+
+        return fDnsbPixel;
+    }
+
+    return mcrunheader->GetNumPheFromDNSB();
+}
+
+Bool_t MMcPedestalNSBAdd::ReInit(MParList *pList)
+{
+    if (!CheckRunType(pList))
         return kFALSE;
-    }
-
-    if (mcrunheader)
-    {
-        if (fDnsbPixel >= 0 && fDnsbPixel != mcrunheader->GetNumPheFromDNSB())
-        {
-            *fLog << warn << dbginf << "The MC file has been generated with diffuse nsb " << mcrunheader->GetNumPheFromDNSB();
-            *fLog <<" but you set up the diffuse NSB to " << fDnsbPixel << endl;
-        }
-        else
-            fDnsbPixel = mcrunheader->GetNumPheFromDNSB();
-    }
-
-    fDnsbPixel *= 50.0/15.0;
-
-
-    MGeomCam *geometry = (MGeomCam*)pList->FindObject("MGeomCam");
-    if (!geometry)
-    {
-        *fLog << err << dbginf << "MGeomCam not found... aborting." << endl;
-        return kFALSE;
-    }
-
-
-    MPedestalCam *pedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (!pedestals)
-        return kFALSE;
-
-
-    const int num = fadc->GetNumPixel();
+
+    Float_t dnsbpix = GetDnsb(pList) * 50.0/15.0;
+
+    if (dnsbpix < 0)
+        return kFALSE;
+
+    const int num = fFadc->GetNumPixel();
     
-    pedestals->InitSize(num);
-
-    const Float_t size0 = (*geometry)[0].GetR()*(*geometry)[0].GetR();
+    fPedCam->InitSize(num);
+
+    const Float_t size0 = (*fGeom)[0].GetR() * (*fGeom)[0].GetR();
 
     for (int i=0; i<num; i++)
     {
-        MPedestalPix &pix     = (*pedestals)[i];
-        MGeomPix     &pixgeom = (*geometry)[i];
+        MPedestalPix &pix     = (*fPedCam)[i];
+        MGeomPix     &pixgeom = (*fGeom)[i];
 
         const Float_t pedrms  = pix.GetSigma();
         const Float_t size    = pixgeom.GetR()*pixgeom.GetR()/size0;
 
-        const Float_t ampl    = fadc->GetAmplitud();
-
-        pix.SetSigma(sqrt(pedrms*pedrms + fDnsbPixel*ampl*ampl*size));
+        const Float_t ampl    = fFadc->GetAmplitud();
+
+        pix.SetSigma(sqrt(pedrms*pedrms + dnsbpix*ampl*ampl*size));
     }