Changeset 7867 for trunk

Timestamp:

08/08/06 17:51:35 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MMath.cc (modified) (1 diff)
• mbase/MMath.h (modified) (1 diff)
• mhist/MHCamera.cc (modified) (2 diffs)
• mhist/MHCamera.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
    * msignal/MExtractedSignalCam.cc:
      - some update to returning the hi-/lo-gain ratio
+
+   * mbase/MMath.[h,cc]:
+     - new functions MedianDev
+
+   * mhist/MHCamera.[h,cc]:
+     - new function GetMedian
+     - new function GetMedianDev
 
 

trunk/MagicSoft/Mars/NEWS

@@ -8 +8 @@
    - general: Fixed some warnings thrown if more warnings are switched
      on in the compiler
+
+   - general: Added a function to MMath which returns the Median of
+     the distribution abs(y[i]-median), which is somehow the median
+     counterpart of the rms.
 
    - showplot:

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -161 +161 @@
 }
 
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+template <class Size, class Element>
+Double_t MMath::MedianDevImp(Size n, const Element *a)
+{
+    // Get median of distribution
+    const Double_t med = TMath::Median(n, a);
+
+    // Allocate space for distribution
+    Double_t *arr = new Double_t[n];
+
+    // Create the abs(a[i]-med) distribution
+    for (int i=0; i<n; i++)
+        arr[i] = TMath::Abs(a[i]-med);
+
+    // FIXME: GausProb() is a workaround. It should be taken into account in Median!
+    const Double_t rc = TMath::Median(n, arr);
+
+    // delete space
+    delete arr;
+
+    // return result
+    return rc;
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+Double_t MMath::MedianDev(Long64_t n, const Short_t *a)
+{
+    return MedianDevImp(n, a);
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+Double_t MMath::MedianDev(Long64_t n, const Int_t *a)
+{
+    return MedianDevImp(n, a);
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+Double_t MMath::MedianDev(Long64_t n, const Float_t *a)
+{
+    return MedianDevImp(n, a);
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+Double_t MMath::MedianDev(Long64_t n, const Double_t *a)
+{
+    return MedianDevImp(n, a);
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+Double_t MMath::MedianDev(Long64_t n, const Long_t *a)
+{
+    return MedianDevImp(n, a);
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value of the distribution of abs(a[i]-Median)
+//
+Double_t MMath::MedianDev(Long64_t n, const Long64_t *a)
+{
+    return MedianDevImp(n, a);
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -18 +18 @@
 
     Double_t GaussProb(Double_t x, Double_t sigma=1, Double_t mean=0);
+
+    template <class Size, class Element> Double_t MedianDevImp(Size n, const Element *a);
+    Double_t  MedianDev(Long64_t n, const Short_t  *a);
+    Double_t  MedianDev(Long64_t n, const Int_t    *a);
+    Double_t  MedianDev(Long64_t n, const Float_t  *a);
+    Double_t  MedianDev(Long64_t n, const Double_t *a);
+    Double_t  MedianDev(Long64_t n, const Long_t   *a);
+    Double_t  MedianDev(Long64_t n, const Long64_t *a);
 
     Double_t Significance(Double_t s, Double_t b);

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -84 +84 @@
 
 #include "MArrayD.h"
+#include "MMath.h"    // MMath::GaussProb
 
 #define kItemsLegend 48 // see SetPalette(1,0)
@@ -312 +313 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
         arr[idx] ? SetUsed(idx) : ResetUsed(idx);
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value on the y-axis (profile option is correctly taken
+// into account)
+//
+Stat_t MHCamera::GetMedian() const
+{
+    // Just for speed reasons
+    if (!TestBit(kProfile))
+        return TMath::Median(GetSize()-2, GetArray()+1);
+
+    // Copy profiled data into new array (FIXME: Should we take errors into account?)
+    TArrayD arr(fNcells-2);
+    for (int i=1; i<fNcells-1; i++)
+        arr[i-1] = GetBinContent(i);
+
+    // return Median of the profile data
+    return TMath::Median(arr.GetSize(), arr.GetArray());
+}
+
+// ------------------------------------------------------------------------
+//
+// Return the median value (divided by MMath::GausProb(1.0)) of the
+// distribution of abs(y[i]-Median). This is my Median equivalent of the RMS
+//
+Stat_t MHCamera::GetMedianDev() const
+{
+    // Just for speed reasons
+    if (!TestBit(kProfile))
+        return MMath::MedianDev(GetSize()-2, GetArray()+1);
+
+    // Copy profiled data into new array (FIXME: Should we take errors into account?)
+    TArrayD arr(fNcells-2);
+    for (int i=1; i<fNcells-1; i++)
+        arr[i-1] = GetBinContent(i);
+
+    // return MedianDev of the profile data
+    return MMath::MedianDev(arr.GetSize(), arr.GetArray())/MMath::GaussProb(1.0);
 }
 

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -240 +240 @@
     Stat_t   GetMean(Int_t=0) const { return GetMeanSectors(TArrayI(), TArrayI(), kFALSE); }
     Stat_t   GetRMS(Int_t=0)  const { return GetRmsSectors(TArrayI(), TArrayI(), kFALSE); }
+
+    Stat_t   GetMedian() const;
+    Stat_t   GetMedianDev() const;
 
     Stat_t   GetMeanSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const