Changeset 7870 for trunk/MagicSoft

Timestamp:

08/09/06 11:01:30 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• datacenter/macros/fillsignal.C (modified) (5 diffs)
• mbase/MMath.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * mbase/MMath.cc:
      - changed MedianDev to support 68% division instead of 0.5%
+
+   * datacenter/macros/fillsignal.C:
+     - adapted to use Median for Pulse Offset and Gain
 
 

trunk/MagicSoft/Mars/NEWS

@@ -10 +10 @@
 
    - 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.
+     the distribution abs(y[i]-median) but at 68:32 division instead 
+     of 50:50, which is somehow the mediani counterpart of the rms.
 
    - showplot:

trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C

@@ -213 +213 @@
     Double_t meanoff = TMath::Nint(pullo->GetMean()*100.)/100.;
     Double_t rmsoff  = TMath::Nint(pullo->GetRMS() *100.)/100.;
- */
-    Double_t meanoff = TMath::Nint(hilooff->GetMean()*100.)/100.;
-    Double_t rmsoff  = TMath::Nint(hilooff->GetRMS() *100.)/100.;
-
-    Double_t meancal = TMath::Nint(hilocal->GetMean()*100.)/100.;
-    Double_t rmscal  = TMath::Nint(hilocal->GetRMS() *100.)/100.;
+    */
+
+    // USE MEDIAN INSTEAD? GetQuantiles(Int_t nprobSum, Double_t *q, const Double_t *probSum=0);
+
+    Double_t medoff = TMath::Nint(hilooff->GetMedian()   *10000)/10000.;
+    Double_t devoff = TMath::Nint(hilooff->GetMedianDev()*10000)/10000.;
+
+    Double_t medcal = TMath::Nint(hilocal->GetMedian()   *100)/100.;
+    Double_t devcal = TMath::Nint(hilocal->GetMedianDev()*100)/100.;
 
     //get sequence number from the filename
@@ -245 +248 @@
     TString rmspullo     =Form("%6.2f", rmslo);
     */
-    TString meanpuloff   =Form("%6.2f", meanoff);
-    TString rmspuloff    =Form("%6.2f", rmsoff);
-    TString meanhilocal  =Form("%6.2f", meancal);
-    TString rmshilocal   =Form("%6.2f", rmscal);
+    TString medpuloff    =Form("%7.4f", medoff);
+    TString devpuloff    =Form("%7.4f", devoff);
+    TString medhilocal   =Form("%6.2f", medcal);
+    TString devhilocal   =Form("%6.2f", devcal);
 
     if (meanextpul<0 && rmsextpul<0)
@@ -270 +273 @@
 //    cout << "  Mean ext.HiGain PulsePos " << meanpulhi     << " +- " << rmspulhi     << endl;
 //    cout << "  Mean ext.LoGain PulsePos " << meanpullo     << " +- " << rmspullo     << endl;
-    cout << "  Lo-Hi gain offset:       " << meanpuloff    << " +- " << rmspuloff    << endl;
-    cout << "  Hi/Lo gain ratio:        " << meanhilocal   << " +- " << rmshilocal   << endl;
+    cout << "  Lo-Hi gain offset:      " << medpuloff    << " +-  " << devpuloff    << endl;
+    cout << "  Hi/Lo gain ratio:        " << medhilocal   << " +- " << devhilocal   << endl;
     cout << endl;
 
@@ -285 +288 @@
                          //" fPulsePosHiMean=%s,    fPulsePosHiRms=%s,    "
                          //" fPulsePosLoMean=%s,    fPulsePosLoRms=%s,    "
-                         " fPulsePosOffMean=%s,   fPulsePosOffRms=%s,   "
-                         " fHiLoGainRatioMean=%s, fHiLoGainRatioRms=%s "
+                         " fPulsePosOffMed=%s,    fPulsePosOffDev=%s,   "
+                         " fHiLoGainRatioMed=%s,  fHiLoGainRatioDev=%s  "
                          " WHERE fSequenceFirst='%d' ",
                          meanrmsinner.Data(),  meanrmsouter.Data(),
@@ -294 +297 @@
                          //meanpulhi.Data(),     rmspulhi.Data(),
                          //meanpullo.Data(),     rmspullo.Data(),
-                         meanpuloff.Data(),    rmspuloff.Data(),
-                         meanhilocal.Data(),   rmshilocal.Data(),
+                         medpuloff.Data(),    devpuloff.Data(),
+                         medhilocal.Data(),   devhilocal.Data(),
                          seq);
 

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -181 +181 @@
 
     // FIXME: GausProb() is a workaround. It should be taken into account in Median!
-    return TMath::Median(n, arr);
-    /*
+    //return TMath::Median(n, arr);
+    
     // Sort distribution
     Long64_t idx[n];
@@ -199 +199 @@
 
     return dev;
-*/
 }