Changeset 1123 for trunk/MagicSoft/Mars

Timestamp:

12/18/01 17:24:18 (23 years ago)

Author:

blanch

Message:

The ReInit fuction has been added and all the actions needed to re-do
foe each run have been moved from PreProcess to ReInit.
A bug in the reading of Pedestals and Pedestal fluctuations has been fixed (it
did not effect the results because it was also done in MCerPhotCalc).

File:

• trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.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              //
+//  MPedestalCam                                                           //
 //                                                                         //
 //  Input Containers:                                                      //
@@ -63 +66 @@
 Bool_t MMcPedestalCopy::PreProcess(MParList *pList)
 {
+    ReInit(pList);
+
+    return kTRUE;
+}
+
+Bool_t MMcPedestalCopy::ReInit(MParList *pList)
+{
     MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
     if (run)
+    {
         if (run->GetRunType() != kRTMonteCarlo)
         {
@@ -70 +81 @@
             return kSKIP;
         }
+    }   
     else
         *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
+    
 
     const MMcFadcHeader *mcped = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
@@ -94 +107 @@
         MPedestalPix &pix = (*pedcam)[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 pedrms = mcped->GetPedestalRms(i);
+        const Float_t pedrms = pedest/sqrt(num);
 
-        const Float_t sigma  = pedest*sqrt(num);
+        const Float_t sigma  = mcped->GetPedestalRms(i);
         const Float_t sigrms = sigma/sqrt(num*2);
 
-        pix.SetPedestal(pedest, sigma);
+        pix.SetPedestal(pedest, sigma);
         pix.SetPedestalRms(pedrms, sigrms);
     }