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

Timestamp:

01/15/02 11:48:08 (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

@@ -38 +38 @@
 //  slice:                                                                 //
 //                                                                         //
-//  Y=sqrt(X*FADC_time/Number_of_slice*pixel_size)*Amp_single_phe_response //
+//  Y = sqrt(X * FADC_time / Number_of_slices * pixel_size)                //
+//      * Amp_single_phe_response                                          //
 //                                                                         //
 //  Input Containers:                                                      //
@@ -81 +82 @@
     // RunHeader tree the auto scheme is disabled by default
     //
-    AddToBranchList("fPedesMean");
-    AddToBranchList("fElecNoise");
+    AddToBranchList("MMcFadcHeader.fPedesMean");
+    AddToBranchList("MMcFadcHeader.fElecNoise");
 }
 
@@ -105 +106 @@
 // --------------------------------------------------------------------------
 //
-// The PreProcess does nothing since the process does not exist and
-// therefore it does not need any pointer or files already initialysed
-
+// - check whether we have a monte carlo file. if not skip this task
+// - try to get MMcFadcHeader, MGeomCam and MPedestalCam from the parameter
+//   list
+// - try to find a MMcRunHeader, too
+//
 Bool_t MMcPedestalNSBAdd::PreProcess(MParList *pList)
 {
-
-   // FIX ME , ReInit should be called automatically. When it is 
-   // implemented then this line should be removed.
-
     if (!CheckRunType(pList))
     {
@@ -149 +148 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// If a MMcRunHeader is available the DNSB MMcRunHeader::GetNumPheFromDNSB
+// is returned. Otherwise the user given number is used.
+//
 Float_t MMcPedestalNSBAdd::GetDnsb(MParList *pList) const
 {
@@ -206 +210 @@
     for (int i=0; i<num; 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    = fFadc->GetAmplitud();
+        MPedestalPix   &pix     = (*fPedCam)[i];
+        const MGeomPix &pixgeom = (*fGeom)[i];
+
+        const Float_t pedrms = pix.GetSigma();
+        const Float_t size   = pixgeom.GetR()*pixgeom.GetR()/size0;
+
+        const Float_t ampl   = fFadc->GetAmplitud();
 
         pix.SetSigma(sqrt(pedrms*pedrms + dnsbpix*ampl*ampl*size));