X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG1%2FAliTreeDraw.cxx;h=657ed62ba1abbdd3c04c2489a5fb933b27dda671;hb=f78c97810b382e6d9abb061b060954d48638954e;hp=5349cc355d9d74092af6ae1a3821b8da7148979a;hpb=a36eadd7fdca1e8fe581f976838dce69272b9a61;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG1/AliTreeDraw.cxx b/PWG1/AliTreeDraw.cxx
index 5349cc355d9..657ed62ba1a 100644
--- a/PWG1/AliTreeDraw.cxx
+++ b/PWG1/AliTreeDraw.cxx
@@ -46,7 +46,6 @@ marian.ivanov@cern.ch
 #include "TF1.h"
 #include "TView.h"
 #include "TView3D.h"
-#include "TGeometry.h"
 #include "TPolyLine3D.h"
 #include "TPolyMarker3D.h"
 #include "TObjString.h"
@@ -351,6 +350,109 @@ TH1F* AliTreeDraw::CreateResHisto(TH2F* hRes2, TH1F **phMean,  Bool_t drawBinFit
   return hRes;
 }
 
+TH1F* AliTreeDraw::CreateResHistoI(TH2F* hRes2, TH1F **phMean, Int_t integ,  Bool_t drawBinFits)
+{
+  TVirtualPad* currentPad = gPad;
+  TAxis* axis = hRes2->GetXaxis();
+  Int_t nBins = axis->GetNbins();
+  Bool_t overflowBinFits = kFALSE;
+  TH1F* hRes, *hMean;
+  if (axis->GetXbins()->GetSize()){
+    hRes = new TH1F("hRes", "", nBins, axis->GetXbins()->GetArray());
+    hMean = new TH1F("hMean", "", nBins, axis->GetXbins()->GetArray());
+  }
+  else{
+    hRes = new TH1F("hRes", "", nBins, axis->GetXmin(), axis->GetXmax());
+    hMean = new TH1F("hMean", "", nBins, axis->GetXmin(), axis->GetXmax());
+
+  }
+  hRes->SetStats(false);
+  hRes->SetOption("E");
+  hRes->SetMinimum(0.);
+  //
+  hMean->SetStats(false);
+  hMean->SetOption("E");
+ 
+  // create the fit function
+  TF1 * fitFunc = new TF1("G","[0]*exp(-(x-[1])*(x-[1])/(2.*[2]*[2]))",-3,3);
+  
+  fitFunc->SetLineWidth(2);
+  fitFunc->SetFillStyle(0);
+  // create canvas for fits
+  TCanvas* canBinFits = NULL;
+  Int_t nPads = (overflowBinFits) ? nBins+2 : nBins;
+  Int_t nx = Int_t(sqrt(nPads-1.));// + 1;
+  Int_t ny = (nPads-1) / nx + 1;
+  if (drawBinFits) {
+    canBinFits = (TCanvas*)gROOT->FindObject("canBinFits");
+    if (canBinFits) delete canBinFits;
+    canBinFits = new TCanvas("canBinFits", "fits of bins", 200, 100, 500, 700);
+    canBinFits->Divide(nx, ny);
+  }
+
+  // loop over x bins and fit projection
+  Int_t dBin = ((overflowBinFits) ? 1 : 0);
+  for (Int_t bin = 1-dBin; bin <= nBins+dBin; bin++) {
+    if (drawBinFits) canBinFits->cd(bin + dBin);
+    Int_t bin0=TMath::Max(bin-integ,0);
+    Int_t bin1=TMath::Min(bin+integ,nBins);
+    TH1D* hBin = hRes2->ProjectionY("hBin", bin0, bin1);
+    //    
+    if (hBin->GetEntries() > 5) {
+      fitFunc->SetParameters(hBin->GetMaximum(),hBin->GetMean(),hBin->GetRMS());
+      hBin->Fit(fitFunc,"s");
+      Double_t sigma = TMath::Abs(fitFunc->GetParameter(2));
+
+      if (sigma > 0.){
+	hRes->SetBinContent(bin, TMath::Abs(fitFunc->GetParameter(2)));
+	hMean->SetBinContent(bin, fitFunc->GetParameter(1));	
+      }
+      else{
+	hRes->SetBinContent(bin, 0.);
+	hMean->SetBinContent(bin,0);
+      }
+      hRes->SetBinError(bin, fitFunc->GetParError(2));
+      hMean->SetBinError(bin, fitFunc->GetParError(1));
+      
+      //
+      //
+
+    } else {
+      hRes->SetBinContent(bin, 0.);
+      hRes->SetBinError(bin, 0.);
+      hMean->SetBinContent(bin, 0.);
+      hMean->SetBinError(bin, 0.);
+    }
+    
+
+    if (drawBinFits) {
+      char name[256];
+      if (bin == 0) {
+	sprintf(name, "%s < %.4g", axis->GetTitle(), axis->GetBinUpEdge(bin));
+      } else if (bin == nBins+1) {
+	sprintf(name, "%.4g < %s", axis->GetBinLowEdge(bin), axis->GetTitle());
+      } else {
+	sprintf(name, "%.4g < %s < %.4g", axis->GetBinLowEdge(bin),
+		axis->GetTitle(), axis->GetBinUpEdge(bin));
+      }
+      canBinFits->cd(bin + dBin);
+      hBin->SetTitle(name);
+      hBin->SetStats(kTRUE);
+      hBin->DrawCopy("E");
+      canBinFits->Update();
+      canBinFits->Modified();
+      canBinFits->Update();
+    }
+    
+    delete hBin;
+  }
+
+  delete fitFunc;
+  currentPad->cd();
+  *phMean = hMean;
+  return hRes;
+}
+
 
 
 
@@ -369,8 +471,8 @@ void   AliTreeDraw::GetPoints3D(const char * label, const char * chpoints,
    Int_t npoints = fTree->Draw(label,selection);
    Float_t xyz[30000];
    rmin*=rmin;
-   for (Int_t i=0;i<npoints;i++){
-     Int_t index = (Int_t)fTree->GetV1()[i];
+   for (Int_t ii=0;ii<npoints;ii++){
+     Int_t index = (Int_t)fTree->GetV1()[ii];
      tpoints->GetEntryWithIndex(index,index);
      if (points->GetNPoints()<2) continue;
      Int_t goodpoints=0;