Changeset 4539 for trunk

Timestamp:

08/06/04 20:10:56 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationTestCam.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -34 +34 @@
      - fixed a bug in one possible output using Form() 
        which produced a segm.violation in that case.
+
+   * mcalib/MHCalibrationTestCam.cc
+     - adapt class for the interpolation of pixels.
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc

@@ -317 +317 @@
       MHGausEvents &histhi = (*this)[i];
 
-      if (histhi.IsExcluded())
-        continue;
-
       const MCerPhotPix *pix = calibration->GetPixById(i);
       if (!pix)
@@ -326 +323 @@
       const Float_t   signal = pix->GetNumPhotons();
 
+      if (signal < 0.0001)
+        continue;
+      
       const Int_t aidx   = (*fGeom)[i].GetAidx();
       const Int_t sector = (*fGeom)[i].GetSector();
 
       histhi.FillHistAndArray(signal) ;
+
       sumareahi  [aidx]   += signal;
       numareahi  [aidx]   ++;
@@ -340 +341 @@
       MHGausEvents &histhi = GetAverageHiGainArea(j);
       histhi.FillHistAndArray(numareahi[j] == 0 ? 0. : sumareahi[j]/numareahi[j]);
-
     }
   
@@ -364 +364 @@
 {
 
+  *fLog << endl;
+
   TArrayI numaidx;
   numaidx.Set(fGeom->GetNumAreas());
@@ -372 +374 @@
       MHGausEvents &hist = (*this)[i];
       
-      if (hist.IsExcluded())
-        continue;
-      
       if (hist.IsEmpty())
-        continue;
+        {
+          *fLog << warn << GetDescriptor() << ": WARNING: Not interpolated histogram pixel: " << i << endl;
+          continue;
+        }
       
       if (!hist.FitGaus())
         if (!hist.RepeatFit())
-          {
-            hist.BypassFit();
-          }
+          hist.BypassFit();
       
       hist.CreateFourierSpectrum();
@@ -406 +406 @@
       if (!hist.FitGaus())
         if (!hist.RepeatFit())
-          {
-            hist.BypassFit();
-          }
+          hist.BypassFit();
       
       hist.CreateFourierSpectrum();
@@ -435 +433 @@
       if (!hist.FitGaus())
         if (!hist.RepeatFit())
-          {
-            hist.BypassFit();
-          }
+          hist.BypassFit();
+
       hist.CreateFourierSpectrum();
-      
-
     }
 
@@ -496 +491 @@
   const MHGausEvents &pix = (*this)[idx];
 
-  if (pix.IsExcluded())
+  if (pix.IsEmpty())
     return kFALSE;