Changeset 717 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/03/01 13:28:36 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1ReadAscii.cc (modified) (2 diffs)
• MCerPhotCalc.cc (modified) (1 diff)
• MImgCleanStd.cc (modified) (5 diffs)
• MMcPedestalCopy.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -156 +156 @@
 
         if (val > 0.0)
-            (*fPedest)[i].SetSigma(val);
+            (*fPedest)[i].SetMeanRms(val);
     }
 }
@@ -188 +188 @@
 
         if (nphot > 0.0)
-            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetSigma());
+            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetMeanRms());
     }
 

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -65 +65 @@
 
         const Float_t nphot = (Float_t)pixel.GetSumHiGainFadcSamples() - ped.GetMean();
-        fCerPhotEvt->AddPixel(pixid, nphot, 0);
+
+        fCerPhotEvt->AddPixel(pixid, nphot, ped.GetMeanRms());
 
         // FIXME! Handling of Lo Gains is missing!

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -18 +18 @@
     //   the default constructor
     //
-  
     *fName  = name  ? name  : "MImgCleanStd";
     *fTitle = title ? title : "Task which does a standard image cleaning";
+
+    *fLog << "Cleaning initialized. Using noise level " << lvl1 << " and " << lvl2 << endl;
 }
 
@@ -44 +45 @@
         const Float_t noise = pix.GetErrorPhot();
 
-        if (entry < fCleanLvl1 * noise )
+        // COBB: '<=' to skip entry=noise=0
+        if (entry <= fCleanLvl1 * noise )
             pix.SetPixelUnused();
     }
@@ -113 +115 @@
             pix.SetCorePixel();
     }
-
 } 
 
@@ -124 +125 @@
     //
     const Int_t entries = fEvt->GetNumPixels();
-
     for (Int_t i=0; i<entries; i++)
     {
@@ -174 +174 @@
         }
     }
+
 }
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -41 +41 @@
 Bool_t MMcPedestalCopy::Process()
 {
-    fPedestals->InitSize(fMcPedestals->GetNumPixel());
+    const int num = fMcPedestals->GetNumPixel();
 
-    for (int i=0; i<MFADC_CHANNELS; i++)
+    fPedestals->InitSize(num);
+
+    for (int i=0; i<num; i++)
     {
         MPedestalPix &pix = (*fPedestals)[i];
 
-        pix.SetPedestal(fMcPedestals->GetPedestal(i), 0);
-        pix.SetPedestalRms(fMcPedestals->GetPedestalRms(i), 0);
+        const Float_t pedest = fMcPedestals->GetPedestal(i);
+        const Float_t pedrms = fMcPedestals->GetPedestalRms(i);
+
+        const Float_t sigma  = pedest*sqrt(num);
+        const Float_t sigrms = sigma/sqrt(2*num);
+
+        pix.SetPedestal(pedest, sigma);
+        pix.SetPedestalRms(pedrms, sigrms);
+
+        *fLog << pedest << " " << sigma << " " << pedrms << " " << sigrms << endl;
     }