Changeset 3056 for trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

Timestamp:

02/08/04 20:52:18 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc (modified) (31 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -42 +42 @@
 #include <TPaveText.h>
 #include <TText.h>
+#include <TGraph.h>
+
+#include "MFFT.h"
 
 #include "MLog.h"
@@ -52 +55 @@
 const Int_t   MHCalibrationPixel::fChargeNbinsHiGain = 2100;
 const Int_t   MHCalibrationPixel::fChargeNbinsLoGain = 1010;
-const Int_t   MHCalibrationPixel::fChargevsNbins     = 5000;
-const Int_t   MHCalibrationPixel::fAbsTimeNbins      = 32;
+const Int_t   MHCalibrationPixel::fAbsTimeNbins      = 16;
 const Axis_t  MHCalibrationPixel::fAbsTimeFirst      = - 0.25;
 const Axis_t  MHCalibrationPixel::fAbsTimeLast       =  15.75;
-const Int_t   MHCalibrationPixel::fRelTimeNbins      = 900;
-const Axis_t  MHCalibrationPixel::fRelTimeFirst      = -13.;
-const Axis_t  MHCalibrationPixel::fRelTimeLast       =  13.;
 const Float_t MHCalibrationPixel::fProbLimit         = 0.001;
 const Int_t   MHCalibrationPixel::fNDFLimit          = 5;
 
+const Axis_t  MHCalibrationPixel::fNyquistFreq       = 1.0;
+const Axis_t  MHCalibrationPixel::fMinFreq           = 0.;
+const Int_t   MHCalibrationPixel::fPSDNbins          = 30;
+  
 // --------------------------------------------------------------------------
 //
@@ -69 +72 @@
       : fPixId(-1),
         fHivsLoGain(NULL),
+        fPSDHiGain(NULL),
+        fPSDLoGain(NULL),
+        fChargeGausFit(NULL),
         fHPSD(NULL),
-        fChargeGausFit(NULL),
-        fRelTimeGausFit(NULL), 
-        fFitLegend(NULL)
+        fPSDExpFit(NULL),
+        fChargeXaxis(NULL),
+        fPSDXaxis(NULL),
+        fFitLegend(NULL),
+        fCurrentSize(1024)
 { 
 
     fName  = name  ? name  : "MHCalibrationPixel";
-    fTitle = title ? title : "Fill the accumulated charges and times of all events and perform fits";
+    fTitle = title ? title : "Fill the accumulated charges of all events and perform fits";
 
     fChargeFirstHiGain = -100.5;
@@ -110 +118 @@
     fHAbsTimeLoGain->SetYTitle("Nr. of events");
 
-    // Relative Times
-    fHRelTimeHiGain = new TH1F("HRelTimeHiGain","Distribution of Relative Arrival Times High Gain Pixel ",
-                               fRelTimeNbins,fRelTimeFirst,fRelTimeLast);
-    fHRelTimeLoGain = new TH1F("HRelTimeLoGain","Distribution of Relative Arrival Time Low Gain Pixel ",
-                               fRelTimeNbins,fRelTimeFirst,fRelTimeLast);
-
-    fHRelTimeHiGain->SetXTitle("Relative Arrival Times [Hi Gain FADC slice nr]");
-    fHRelTimeLoGain->SetXTitle("Relative Arrival Times [Lo Gain FADC slice nr]");
-
-    fHRelTimeHiGain->SetYTitle("Nr. of events");
-    fHRelTimeLoGain->SetYTitle("Nr. of events");
-
-    // We define a reasonable number and later enlarge it if necessary
-    fHChargevsNHiGain = new TH1I("HChargevsNHiGain","Sum of Hi Gain Charges vs. Event Number Pixel ",
-                                 fChargevsNbins,-0.5,(Axis_t)fChargevsNbins - 0.5);
-    fHChargevsNLoGain = new TH1I("HChargevsNLoGain","Sum of Lo Gain Charges vs. Event Number Pixel ",
-                                 fChargevsNbins,-0.5,(Axis_t)fChargevsNbins - 0.5);
-
-    fHChargevsNHiGain->SetXTitle("Event Nr.");
-    fHChargevsNLoGain->SetXTitle("Event Nr.");
-
-    fHChargevsNHiGain->SetYTitle("Sum of Hi Gain FADC slices");
-    fHChargevsNLoGain->SetYTitle("Sum of Lo Gain FADC slices");
 
     fHChargeHiGain->SetDirectory(NULL);
@@ -138 +123 @@
     fHAbsTimeHiGain->SetDirectory(NULL);
     fHAbsTimeLoGain->SetDirectory(NULL);
-    fHRelTimeHiGain->SetDirectory(NULL);
-    fHRelTimeLoGain->SetDirectory(NULL);
-    fHChargevsNHiGain->SetDirectory(NULL);
-    fHChargevsNLoGain->SetDirectory(NULL);
-
-    fHiGains = new TArrayF();
-    fLoGains = new TArrayF();
+
+    fHiGains = new TArrayF(fCurrentSize);
+    fLoGains = new TArrayF(fCurrentSize);
 
     Clear();
@@ -155 +136 @@
   delete fHChargeHiGain;
   delete fHAbsTimeHiGain;
-  delete fHRelTimeHiGain;
-  delete fHChargevsNHiGain;
 
   delete fHChargeLoGain;
   delete fHAbsTimeLoGain;
-  delete fHRelTimeLoGain;
-  delete fHChargevsNLoGain;
 
   delete fHiGains;
@@ -168 +145 @@
   if (fChargeGausFit)
     delete fChargeGausFit;
-  if (fRelTimeGausFit)
-    delete fRelTimeGausFit;
+  if (fPSDExpFit)
+    delete fPSDExpFit;
+  if (fHPSD)
+    delete fHPSD;
   if (fFitLegend)
     delete fFitLegend;
   if (fHivsLoGain)
     delete fHivsLoGain;
+  if (fChargeXaxis)
+    delete fChargeXaxis;
+  if (fPSDXaxis)
+    delete fPSDXaxis;
 }
 
@@ -181 +164 @@
   
   fTotalEntries            = 0;
+  fCurrentSize             = 1024;
 
   fChargeFirstHiGain       = -100.5;
@@ -191 +175 @@
   fChargeNdf               = -1;
 
-  fRelTimeChisquare        = -1.;
-  fRelTimeProb             = -1.;
-  fRelTimeNdf              = -1;
-  fRelTimeMean             = -1.;
-  fRelTimeSigma            = -1.;
-
-  fRelTimeLowerFitRangeHiGain = -99.;
-  fRelTimeUpperFitRangeHiGain = -99.;
-  fRelTimeLowerFitRangeLoGain = -99.;
-  fRelTimeUpperFitRangeLoGain = -99.;
-
   fAbsTimeFirstHiGain     = -1.;
   fAbsTimeFirstLoGain     = -1.;
@@ -216 +189 @@
   if (fChargeGausFit)
     delete fChargeGausFit;
-  if (fRelTimeGausFit)
-    delete fRelTimeGausFit;
+  if (fPSDExpFit)
+    delete fPSDExpFit;
+  if (fHPSD)
+    delete fHPSD;
   if (fFitLegend)
     delete fFitLegend;
   if (fHivsLoGain)
     delete fHivsLoGain;
-  if (fHPSD)
-    delete fHPSD;
+  if (fChargeXaxis)
+    delete fChargeXaxis;
+  if (fPSDXaxis)
+    delete fPSDXaxis;
+  if (fPSDHiGain)
+    delete fPSDHiGain;
+  if (fPSDLoGain)
+    delete fPSDLoGain;
 
   CLRBIT(fFlags,kUseLoGain);
   CLRBIT(fFlags,kChargeFitOK);
-  CLRBIT(fFlags,kTimeFitOK);
+  CLRBIT(fFlags,kOscillating);
 
   return;
@@ -240 +221 @@
   fHChargeHiGain->Reset();
   fHChargeLoGain->Reset();
+
   fHAbsTimeHiGain->Reset();
   fHAbsTimeLoGain->Reset();
-  fHRelTimeHiGain->Reset();
-  fHRelTimeLoGain->Reset();
-  fHChargevsNHiGain->Reset();
-  fHChargevsNLoGain->Reset();
-
-  fHiGains->Reset();
-  fLoGains->Reset();
+
+  fHiGains->Set(1024);
+  fLoGains->Set(1024);
+
+  fHiGains->Reset(0.);
+  fLoGains->Reset(0.);
 
 }
@@ -261 +242 @@
 
 
+Bool_t MHCalibrationPixel::CheckOscillations()
+{
+
+  if (fPSDExpFit)
+    return IsOscillating();
+
+  MFFT fourier;
+
+  fPSDLoGain = fourier.PowerSpectrumDensity(fLoGains);
+  fPSDHiGain = fourier.PowerSpectrumDensity(fHiGains);
+
+  Int_t entries;
+  TArrayF *array;
+  
+  if (IsUseLoGain())
+    {
+      fHPSD = new TH1F(Form("%s%d","HPSD",fPixId),
+                       Form("%s%s","Power Spectrum Density Projection ","LoGain"),
+                       fPSDNbins,fMinFreq,fNyquistFreq);
+      
+      array = fPSDLoGain;
+    }
+  else
+    {
+
+      fHPSD = new TH1F(Form("%s%d","HPSD",fPixId),
+                       Form("%s%s","Power Spectrum Density Projection ","HiGain"),
+                       fPSDNbins,fMinFreq,fNyquistFreq);
+      
+      array = fPSDLoGain;
+    }
+  
+  entries = array->GetSize();
+  
+  for (Int_t i=0;i<entries;i++)
+    fHPSD->Fill(array->At(i));
+
+  //
+  // First guesses for the fit (should be as close to reality as possible, 
+  //
+  const Double_t area_guess  = entries*10.;
+
+  fPSDExpFit = new TF1(Form("%s%d","PSDExpFit",fPixId),"[0]*exp(-[1]*x)",0.,1.);
+
+  fPSDExpFit->SetParameters(entries,10.);
+  fPSDExpFit->SetParNames("Area","slope");
+  fPSDExpFit->SetParLimits(0,0.,3.*area_guess);
+  fPSDExpFit->SetParLimits(1,5.,20.);
+  fPSDExpFit->SetRange(fMinFreq,fNyquistFreq);
+
+  fHPSD->Fit(fPSDExpFit,"RQL0");
+  
+  fPSDProb  = fPSDExpFit->GetProb();
+
+  if (fPSDProb < gkProbLimit)
+    {
+      SETBIT(fFlags,kOscillating);
+      return kTRUE;
+    }
+  
+  CLRBIT(fFlags,kOscillating);
+
+  return kFALSE;
+}
+
+void MHCalibrationPixel::CreatePSDXaxis(Int_t n)
+{
+  
+  if (fPSDXaxis)
+    return;
+
+  fPSDXaxis = new TArrayF(n);
+
+  for (Int_t i=0;i<n;i++)
+    fPSDXaxis->AddAt((Float_t)i,i);
+}
+
+void MHCalibrationPixel::CreateChargeXaxis(Int_t n)
+{
+  
+  if (!fChargeXaxis)
+    {
+      fChargeXaxis = new TArrayF(n);
+      for (Int_t i=0;i<n;i++)
+        fChargeXaxis->AddAt((Float_t)i,i);
+      return;
+    }
+
+  if (fChargeXaxis->GetSize() == n)
+    return;
+
+  const Int_t diff = fChargeXaxis->GetSize()-n;
+  fChargeXaxis->Set(n);
+  if (diff < 0)
+    for (Int_t i=n;i<n+diff;i++)
+      fChargeXaxis->AddAt((Float_t)i,i);
+}
+
+void MHCalibrationPixel::CutArrayBorder(TArrayF *array)
+{
+  
+  Int_t i;
+
+  for (i=array->GetSize()-1;i>=0;i--)
+    if (array->At(i) != 0)
+      {
+        array->Set(i+1);
+        break;
+      }
+}
+
+
+
 Bool_t MHCalibrationPixel::IsEmpty() const
 {
@@ -276 +370 @@
 }
 
-Bool_t MHCalibrationPixel::IsTimeFitOK() const 
-{
-    return TESTBIT(fFlags,kTimeFitOK);
+Bool_t MHCalibrationPixel::IsOscillating()
+{
+
+  if (fPSDExpFit)
+    return TESTBIT(fFlags,kOscillating);
+
+  return CheckOscillations();
+
 }
 
@@ -291 +390 @@
 }
 
-Bool_t MHCalibrationPixel::FillRelTimeLoGain(Float_t t)
-{
-    return (fHRelTimeLoGain->Fill(t) > -1);
-}
-
-Bool_t MHCalibrationPixel::FillChargevsNLoGain(Float_t q, Int_t n)
-{
-    return (fHChargevsNLoGain->Fill(n,q) > -1);
-}
-
 Bool_t MHCalibrationPixel::FillChargeHiGain(Float_t q)
 {
@@ -309 +398 @@
 {
     return (fHAbsTimeHiGain->Fill(t) > -1);
-}
-
-Bool_t MHCalibrationPixel::FillRelTimeHiGain(Float_t t)
-{
-    return (fHRelTimeHiGain->Fill(t) > -1);
-}
-
-Bool_t MHCalibrationPixel::FillChargevsNHiGain(Float_t q, Int_t n)
-{
-    return (fHChargevsNHiGain->Fill(n,q) > -1);
 }
 
@@ -333 +412 @@
       fHChargeHiGain->SetName(   Form("%s%d",fHChargeHiGain->GetName(),   id));
       fHAbsTimeHiGain->SetName(  Form("%s%d",fHAbsTimeHiGain->GetName(),  id));
-      fHRelTimeHiGain->SetName(  Form("%s%d",fHRelTimeHiGain->GetName(),  id));
-      fHChargevsNHiGain->SetName(Form("%s%d",fHChargevsNHiGain->GetName(),id));
       
       //
@@ -341 +418 @@
       fHChargeHiGain->SetTitle(    Form("%s%d",fHChargeHiGain->GetTitle(),   id));
       fHAbsTimeHiGain->SetTitle(   Form("%s%d",fHAbsTimeHiGain->GetTitle(),  id));
-      fHRelTimeHiGain->SetTitle(   Form("%s%d",fHRelTimeHiGain->GetTitle(),  id));
-      fHChargevsNHiGain->SetTitle( Form("%s%d",fHChargevsNHiGain->GetTitle(),id));
   
       //
@@ -349 +424 @@
       fHChargeLoGain->SetName( Form("%s%d",fHChargeLoGain->GetName(),id));
       fHAbsTimeLoGain->SetName( Form("%s%d",fHAbsTimeLoGain->GetName(),id));
-      fHRelTimeLoGain->SetName( Form("%s%d",fHRelTimeLoGain->GetName(),id));
-      fHChargevsNLoGain->SetName( Form("%s%d",fHChargevsNLoGain->GetName(),id));
 
       //
@@ -357 +430 @@
       fHChargeLoGain->SetTitle( Form("%s%d",fHChargeLoGain->GetTitle(),id));
       fHAbsTimeLoGain->SetTitle( Form("%s%d",fHAbsTimeLoGain->GetTitle(),id));
-      fHRelTimeLoGain->SetTitle( Form("%s%d",fHRelTimeLoGain->GetTitle(),id));
-      fHChargevsNLoGain->SetTitle( Form("%s%d",fHChargevsNLoGain->GetTitle(),id));
       
       fPixId = id;
     }
   
-}
-
-
-Bool_t MHCalibrationPixel::SetupFill(const MParList *plist)
-{
- 
-  Reset();
-  
-  return kTRUE;
 }
 
@@ -390 +452 @@
 }
 
-Bool_t MHCalibrationPixel::FillPointInGraph(Float_t qhi,Float_t qlo)
-{
-
-  fHiGains->Set(++fTotalEntries);
-  fLoGains->Set(fTotalEntries);
-
-  fHiGains->AddAt(qhi,fTotalEntries-1);
-  fLoGains->AddAt(qlo,fTotalEntries-1);
+Bool_t MHCalibrationPixel::FillGraphs(Float_t qhi,Float_t qlo)
+{
+
+  if (fTotalEntries >= fCurrentSize)
+    {
+      fCurrentSize *= 2;
+
+      fHiGains->Set(fCurrentSize);
+      fLoGains->Set(fCurrentSize);
+    }
+  
+  fHiGains->AddAt(qhi,fTotalEntries);
+  fLoGains->AddAt(qlo,fTotalEntries);
+
+  fTotalEntries++;
 
   return kTRUE;
@@ -508 +577 @@
   fHChargeHiGain->Draw(opt);
   
-  c->Modified();
-  c->Update();
-  
   if (IsUseLoGain())
     {
@@ -528 +594 @@
         }
 
-      c->Modified();
-      c->Update();
-      
       c->cd(3);
       gROOT->SetSelectedPad(NULL);
@@ -536 +599 @@
       if (fHivsLoGain)
         fHivsLoGain->Draw("prof");
-      gPad->Modified();
-      gPad->Update();
-      
+
       c->cd(4);
       DrawLegend();
-      
     }
   else
@@ -558 +618 @@
       
       fHChargeLoGain->Draw(opt);
-      c->Modified();
-      c->Update();
-      
+
       c->cd(3);
       DrawLegend();
@@ -570 +628 @@
       if (fHivsLoGain)
         fHivsLoGain->Draw("prof");
-      gPad->Modified();
-      gPad->Update();
     }   
+  
+  c->cd(5);
+  gPad->SetTicks();
+  fHAbsTimeHiGain->Draw(opt);
+
+  c->cd(6);
+  gPad->SetTicks();
+  fHAbsTimeLoGain->Draw(opt);
+
+  CutArrayBorder(fHiGains);
+  CreateChargeXaxis(fHiGains->GetSize());
+
+  c->cd(7);
+  gPad->SetTicks();
+  TGraph *gr1 = new TGraph(fChargeXaxis->GetSize(),
+                           fChargeXaxis->GetArray(),
+                           fHiGains->GetArray());  
+  gr1->SetTitle("Evolution of HiGain charges with event number");
+  gr1->SetBit(kCanDelete);
+  gr1->Draw("AL");
+  
+  CutArrayBorder(fLoGains);  
+  CreateChargeXaxis(fHiGains->GetSize());
+
+  c->cd(8);
+  gPad->SetTicks();
+  TGraph *gr2 = new TGraph(fChargeXaxis->GetSize(),
+                           fChargeXaxis->GetArray(),
+                           fLoGains->GetArray());  
+  gr2->SetTitle("Evolution of HiGain charges with event number");
+  gr2->SetBit(kCanDelete);
+  gr2->Draw("AL");
   
   c->Modified();
   c->Update();
   
-  c->cd(5);
-  gStyle->SetOptStat(1111111);
-
-  gPad->SetTicks();  
-  gPad->SetLogy(0);
-  fHRelTimeHiGain->Draw(opt);
+  c->cd(9);
+  
+  TArrayF *array;
+
+  if(IsUseLoGain())
+    {
+      if (!fPSDLoGain)
+        return;
+      array = fPSDLoGain;
+    }
+  else
+    {
+      if (!fPSDHiGain)
+        return;
+      array = fPSDHiGain;
+    }
+  
+  if (!fPSDXaxis)
+    CreatePSDXaxis(array->GetSize());
+
+  TGraph *gr3 = new TGraph(fPSDXaxis->GetSize(),fPSDXaxis->GetArray(),array->GetArray());
+  gr3->SetTitle("Power Spectrum Density");
+  gr3->SetBit(kCanDelete);
+  gr3->Draw("AL");
+
   c->Modified();
   c->Update();
   
-  if (IsUseLoGain())
-      {
-        
-        c->cd(6);
-        gPad->SetTicks();
-        gPad->SetLogy(0);
-        fHRelTimeLoGain->Draw(opt);
-        c->Modified();
-        c->Update();
-        
-        if (fRelTimeGausFit)
-          {
-            fRelTimeGausFit->SetLineColor(IsTimeFitOK() ? kGreen : kRed);
-            fRelTimeGausFit->Draw("same");
-          }
-
-        c->Modified();
-        c->Update();
-      }
-    else
-      {  
-        if (fRelTimeGausFit)
-          {
-            fRelTimeGausFit->SetLineColor(IsTimeFitOK() ? kGreen : kRed);
-            fRelTimeGausFit->Draw("same");
-          }
-        
-        c->Modified();
-        c->Update();
-        
-        c->cd(6);
-        gPad->SetTicks();
-        gPad->SetLogy(0);
-        fHRelTimeLoGain->Draw(opt);     
-        c->Modified();
-        c->Update();
-    
-      }
-    c->Modified();
-    c->Update();
-    
-    c->cd(7);
-    gPad->SetTicks();
-    fHAbsTimeHiGain->Draw(opt);
-    c->Modified();
-    c->Update();
-
-    c->cd(8);
-    gPad->SetTicks();
-    fHAbsTimeLoGain->Draw(opt);
-    c->Modified();
-    c->Update();
-
-
-    c->cd(9);
-    gPad->SetTicks();
-    fHChargevsNHiGain->Draw(opt);
-    c->Modified();
-    c->Update();
-
-    c->cd(10);
-    gPad->SetTicks();
-    fHChargevsNLoGain->Draw(opt);
-    c->Modified();
-    c->Update();
-
-    return;
+  c->cd(10);
+  
+  gStyle->SetOptStat(111111);
+  gPad->SetTicks();  
+
+  if (fHPSD->Integral() > 0)
+    gPad->SetLogy();
+
+  fHPSD->Draw(opt);
+
+  if (fPSDExpFit)
+    {
+      fPSDExpFit->SetLineColor(IsOscillating() ? kRed : kGreen);          
+      fPSDExpFit->Draw("same");
+    }
+
+  c->Modified();
+  c->Update();
+  
+  return;
 }
 
@@ -684 +744 @@
 }
 
-
-Bool_t MHCalibrationPixel::FitTime(Option_t *option)
-{
-
-  if (fRelTimeGausFit)
-    return kFALSE;
-
-  //
-  // From the absolute time, we only take the mean and RMS
-  //
-  fAbsTimeMean    = (Float_t)fHAbsTimeHiGain->GetMean();
-  fAbsTimeRms     = (Float_t)fHAbsTimeHiGain->GetRMS();
-  fAbsTimeMeanErr = (Float_t)fAbsTimeRms / TMath::Sqrt(fHAbsTimeHiGain->GetEntries());
-  
-  if (TESTBIT(fFlags,kUseLoGain))
-    {
-      fAbsTimeMean    = fHAbsTimeLoGain->GetMean();
-      fAbsTimeRms     = fHAbsTimeLoGain->GetRMS();
-      fAbsTimeMeanErr = fAbsTimeRms / TMath::Sqrt(fHAbsTimeLoGain->GetEntries());
-    }
-  
-  //
-  // Get the fitting ranges
-  //
-  Axis_t rmin = fRelTimeLowerFitRangeHiGain;
-  Axis_t rmax = fRelTimeUpperFitRangeHiGain;
-  TH1F *hist = fHRelTimeHiGain;
-
-  if (TESTBIT(fFlags,kUseLoGain))
-    {
-      rmin = fRelTimeLowerFitRangeLoGain;
-      rmax = fRelTimeUpperFitRangeLoGain;
-      hist = fHRelTimeLoGain;
-    }
-  
-  const Stat_t   entries     = hist->Integral("width");
-  const Double_t mu_guess    = hist->GetBinCenter(hist->GetMaximumBin());
-  const Double_t sigma_guess = (rmax - rmin)/2.;
-  const Double_t area_guess  = 2.*entries/gkSq2Pi/sigma_guess;
-
-  TString name = TString("GausRelTime");
-  name += fPixId;
-  fRelTimeGausFit = new TF1(name.Data(),"gaus",rmin,rmax);  
-
-  if (!fRelTimeGausFit) 
-    {
-    *fLog << warn << dbginf << "WARNING: Could not create fit function for RelTime fit" << endl;
-    return kFALSE;
-    }
-
-  fRelTimeGausFit->SetParameters(area_guess,mu_guess,sigma_guess);
-  fRelTimeGausFit->SetParNames("Area","#mu","#sigma");
-  fRelTimeGausFit->SetParLimits(0,0.,5.*area_guess);
-  fRelTimeGausFit->SetParLimits(1,rmin,rmax);
-  fRelTimeGausFit->SetParLimits(2,0.,(rmax-rmin));
-  fRelTimeGausFit->SetRange(rmin,rmax);
-
-  hist->Fit(fRelTimeGausFit,option);
-
-  //
-  // If the fit does not converge, try another one with smaller bounderies
-  //
-  if (fRelTimeGausFit->GetProb() < 0.001)
-    {
-      rmin = fRelTimeGausFit->GetParameter(1) - 1.5*fRelTimeGausFit->GetParameter(2);
-      rmax = fRelTimeGausFit->GetParameter(1) + 1.5*fRelTimeGausFit->GetParameter(2);
-      fRelTimeGausFit->SetRange(rmin,rmax);  
-      hist->Fit(fRelTimeGausFit,option);
-    }
-  
-  fRelTimeChisquare = fRelTimeGausFit->GetChisquare();
-  fRelTimeNdf       = fRelTimeGausFit->GetNDF();
-  fRelTimeProb      = fRelTimeGausFit->GetProb();
-
-  fRelTimeMean      = fRelTimeGausFit->GetParameter(1);
-  fRelTimeSigma     = fRelTimeGausFit->GetParameter(2);
-
-  fRelTimeMeanErr   = fRelTimeGausFit->GetParError(1);
-
-  if (TMath::IsNaN(fRelTimeMean) || TMath::IsNaN(fRelTimeSigma))
-    {
-      CLRBIT(fFlags,kTimeFitOK);
-      return kFALSE;
-    }
-  
-  if (TMath::IsNaN(fRelTimeChisquare) || (fRelTimeProb < fProbLimit))
-    {
-      CLRBIT(fFlags,kTimeFitOK);
-      return kFALSE;
-    }
-  
-  SETBIT(fFlags,kTimeFitOK);
-
-  return kTRUE;
-
-}
 
 
@@ -850 +814 @@
 
   //
+  // From the absolute time, we only take the mean and RMS
+  //
+  fAbsTimeMean    = (Float_t)fHAbsTimeHiGain->GetMean();
+  fAbsTimeRms     = (Float_t)fHAbsTimeHiGain->GetRMS();
+  fAbsTimeMeanErr = (Float_t)fAbsTimeRms / TMath::Sqrt(fHAbsTimeHiGain->GetEntries());
+  
+  if (TESTBIT(fFlags,kUseLoGain))
+    {
+      fAbsTimeMean    = fHAbsTimeLoGain->GetMean();
+      fAbsTimeRms     = fHAbsTimeLoGain->GetRMS();
+      fAbsTimeMeanErr = fAbsTimeRms / TMath::Sqrt(fHAbsTimeLoGain->GetEntries());
+    }
+
+  //
   // The fit result is accepted under condition:
   // 1) The results are not nan's
@@ -880 +858 @@
 
 
-
- 
 void MHCalibrationPixel::CutAllEdges()
 {
 
-  Int_t nbins = 50;
+  Int_t nbins = 30;
 
   CutEdges(fHChargeHiGain,nbins);
@@ -899 +875 @@
                       +fHChargeLoGain->GetBinWidth(0);
 
-  CutEdges(fHRelTimeHiGain,0);
-
-  fRelTimeLowerFitRangeHiGain = fHRelTimeHiGain->GetBinLowEdge(fHRelTimeHiGain->GetXaxis()->GetFirst());
-  fRelTimeUpperFitRangeHiGain = fHRelTimeHiGain->GetBinLowEdge(fHRelTimeHiGain->GetXaxis()->GetLast())
-                               +fHRelTimeHiGain->GetBinWidth(0);
-
-  CutEdges(fHRelTimeLoGain,0);
-
-  fRelTimeLowerFitRangeLoGain = fHRelTimeLoGain->GetBinLowEdge(fHRelTimeLoGain->GetXaxis()->GetFirst());
-  fRelTimeUpperFitRangeLoGain = fHRelTimeLoGain->GetBinLowEdge(fHRelTimeLoGain->GetXaxis()->GetLast())
-                               +fHRelTimeLoGain->GetBinWidth(0);
 
   CutEdges(fHAbsTimeHiGain,0);
@@ -923 +888 @@
                        +fHAbsTimeLoGain->GetBinWidth(0);
 
-  CutEdges(fHChargevsNHiGain,0);
-  CutEdges(fHChargevsNLoGain,0);
 
 }
@@ -939 +902 @@
 }
 
-void MHCalibrationPixel::PrintTimeFitResult()
-{
-
-  *fLog << all << "Results of the Time Slices Fit: "                        << endl;
-  *fLog << all << "Chisquare: "   << fRelTimeChisquare                      << endl;
-  *fLog << all << "Ndf: "         << fRelTimeNdf                            << endl;
-  *fLog << all << "Probability: " << fRelTimeProb                           << endl;
-  *fLog << all                                                              << endl;
-
-}