Changeset 1172 for trunk/MagicSoft/Mars/manalysis

Timestamp:

01/14/02 17:34:02 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcPedestalCopy.cc (modified) (4 diffs)
• MMcPedestalNSBAdd.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -26 +26 @@
 //                                                                         //
 //  MMcPedestalCopy                                                        //
+//                                                                         //
 //  This task looks for the ìnformation about FADC pedestals in            //
 //  MMcFadcHeader and translates it to the pedestal values in              //
@@ -64 +65 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Check for the run type. Return kTRUE if it is a MC run or if there
+// is no MC run header (old camera files) kFALSE in case of a different
+// run type
+//
 Bool_t MMcPedestalCopy::CheckRunType(MParList *pList) const
 {
@@ -76 +83 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Check runtype and search for MPedestalCam and MMcFadcHeader.
+// If the runtype check fails the task is removed from the task list.
+//
 Bool_t MMcPedestalCopy::PreProcess(MParList *pList)
 {
@@ -99 +111 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Check for the runtype. (not yet: If the check fails the eventloop is
+// stopped.)
+// Initialize the size of MPedestalCam to the number of pixels from
+// MMcFadcHeader.
+//
 Bool_t MMcPedestalCopy::ReInit(MParList *pList)
 {

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -33 +33 @@
 //  MPedestalCam the NSB contribution.                                     //
 //  The number of photons from the diffuse NSB follows a poisson           // 
-//  distribution with expected mean value X, then its standard desviation  //
+//  distribution with expected mean value X, then its standard deviation   //
 //  is sqrt(X).                                                            //
 //  X is the number of phe per ns so we have to convert in FADC counts per // 
@@ -85 +85 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Check for the run type. Return kTRUE if it is a MC run or if there
+// is no MC run header (old camera files) kFALSE in case of a different
+// run type
+//
 Bool_t MMcPedestalNSBAdd::CheckRunType(MParList *pList) const
 {
@@ -141 +147 @@
 
     return kTRUE;
+}
+
+Float_t MMcPedestalNSBAdd::GetDnsb(MParList *pList) const
+{
+    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 -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();
 }
 
@@ -158 +188 @@
 //   - MPedestalCam
 //
-Float_t MMcPedestalNSBAdd::GetDnsb(MParList *pList) const
-{
-    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 -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)
 {