Changeset 4838 for trunk

Timestamp:

09/03/04 09:33:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCameraData.cc (modified) (1 diff)
• manalysis/MCameraData.h (modified) (1 diff)
• mimage/MImgCleanStd.cc (modified) (6 diffs)
• mimage/MImgCleanStd.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/09/03: Thomas Bretz
+
+   * manalysis/MCameraData.[h,cc], mimage/MImgCleanStd.[h,cc]:
+     - implemeted cleaning in absolute number of photons
+
+
+
  2004/09/02: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MCameraData.cc

@@ -374 +374 @@
 // --------------------------------------------------------------------------
 //
+// Function to calculate the cleaning level for all pixels in a given event.
+// The level is the absolute number of photons times the area-ratio.
+//
+void MCameraData::CalcCleaningAbsolute(const MCerPhotEvt &evt, const MGeomCam &geom)
+{
+    const Int_t n = geom.GetNumPixels();
+
+    // Reset arrays
+    fData.Set(n);
+    fData.Reset();
+
+    fValidity.Set(n);
+    fValidity.Reset();
+
+    const Int_t entries = evt.GetNumPixels();
+
+    // calculate cleaning levels
+    for (Int_t i=0; i<entries; i++)
+    {
+        const MCerPhotPix &spix = evt[i];
+
+        const Int_t idx = spix.GetPixId();
+
+        // Set probability
+        fData[idx]     = spix.GetNumPhotons() * geom.GetPixRatio(idx);
+        fValidity[idx] = 1;
+    }
+}
+
+// --------------------------------------------------------------------------
+//
 // Returns the contents of the pixel.
 //

trunk/MagicSoft/Mars/manalysis/MCameraData.h

@@ -45 +45 @@
     void CalcCleaningProbability(const MCerPhotEvt &evt, const MPedPhotCam &pcam,
                                  const MGeomCam &geom,   const MArrivalTime *tcam);
+    void CalcCleaningAbsolute(const MCerPhotEvt &evt, const MGeomCam &geom);
 
     const TArrayD &GetData() const { return fData; }

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -211 +211 @@
 //
 //
+// ABSOLUTE CLEANING
+// =================
+// This method takes signal height (photons) times area ratio
+// ad the cleaning levels.
+//
+// The cleaning now is done in these levels (eg. 16, 20)
+// The meaning of the cleaning levels is essentially the same (the same cleaning
+// algorithm is used) but the cleaning is not done in different 'units'
+//
+// Example:
+//
+// MImgCleanStd clean(20, 16);
+// clean.SetMethod(MImgCleanStd::kAbsolulte);
+//
+//
 // Member Function:  SetMethod()
 // ============================
@@ -579 +594 @@
         fData->CalcCleaningProbability(*fEvt, *fPed, *fCam, fTime);
         break;
+    case kAbsolute:
+        fData->CalcCleaningAbsolute(*fEvt, *fCam);
+        break;
     default:
         break;
@@ -637 +655 @@
     case kProbability:
         *fLog << "probability";
+        break;
+    case kAbsolute:
+        *fLog << "absolute";
         break;
     }
@@ -769 +790 @@
         case kDemocratic:  out << "Democratic";  break;
         case kProbability: out << "Probability"; break;
+        case kAbsolute:    out << "Absolute";    break;
         default:
             break;
@@ -786 +808 @@
 //   MImgCleanStd.CleanLevel1: 3.0
 //   MImgCleanStd.CleanLevel2: 2.5
-//   MImgCleanStd.CleanMethod: Standard, Scaled, Democratic, Probability
+//   MImgCleanStd.CleanMethod: Standard, Scaled, Democratic, Probability, Absolute
 //   MImgCleanStd.CleanRings:  1
 //
@@ -821 +843 @@
         if (s.BeginsWith("probability"))
             SetMethod(kProbability);
+        if (s.BeginsWith("absolute"))
+            SetMethod(kAbsolute);
     }
 

trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

@@ -23 +23 @@
         kScaled,
         kDemocratic,
-        kProbability
+        kProbability,
+        kAbsolute
     } CleaningMethod_t;