]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCcalibTimeGain.cxx
correcting AliHLTGlobalTriggerDecision::Clear(): using Delete instead of Clear for...
[u/mrichter/AliRoot.git] / TPC / AliTPCcalibTimeGain.cxx
index 96c9669ae99709dfe0c561bb99a0342d7a8fa98d..11093d43b9c3533ee7b296b0f2173844f35e9151 100644 (file)
 
 /*
 
-//0.  Libraries to lod
+This class provides the calibration of the time dependence of the TPC gain due to pressure and temperature changes etc.
+
+
+//0.  Libraries to load
 gSystem->Load("libANALYSIS");
 gSystem->Load("libSTAT");
 gSystem->Load("libTPCcalib");
@@ -31,28 +34,104 @@ gSystem->Load("libTPCcalib");
 TFile fcalib("CalibObjects.root");
 TObjArray * array = (TObjArray*)fcalib.Get("TPCCalib");
 AliTPCcalibTimeGain * gain = ( AliTPCcalibTimeGain *)array->FindObject("calibTimeGain");
-TGraphErrors * gr = AliTPCcalibBase::FitSlices(gain->GetHistGainTime(),0,1,2000,10,0.2,0.8);
-gain->GetHistGainTime()->Projection(0,1)->Draw("colz")
-gr->SetMarkerStyle(25);
-gr->Draw("lp")
+TGraphErrors * gr = gain->GetGraphGainVsTime(0,1000)
 
+// gain->GetHistGainTime()->GetAxis(1)->SetRangeUser(1213.8e6,1214.3e6)
+TH2D * GainTime = gain->GetHistGainTime()->Projection(0,1)
+GainTime->GetXaxis()->SetTimeDisplay(kTRUE)
+GainTime->GetXaxis()->SetTimeFormat("#splitline{%d/%m}{%H:%M}")
+GainTime->Draw("colz")
 
 //
 // MakeSlineFit example
 //
-AliSplineFit fit;
-fit.SetGraph(gr)
-fit->SetMinPoints(gr->GetN()+1);
-fit->InitKnots(gr,2,0,0.001)
-fit.SplineFit(0)
-fit.MakeDiffHisto(gr)->Draw();
+AliSplineFit *fit = AliTPCcalibTimeGain::MakeSplineFit(gr)
+
 TGraph * grfit = fit.MakeGraph(gr->GetX()[0],gr->GetX()[gr->GetN()-1],50000,0);
 
 gr->SetMarkerStyle(25);
-gr->Draw("alp");
+gr->Draw("lp");
 grfit->SetLineColor(2);
 grfit->Draw("lu");
 
+//
+// QA - dE/dx resoultion as a function of time
+//TCa
+
+TGraph * grSigma = AliTPCcalibBase::FitSlicesSigma(gain->GetHistGainTime(),0,1,1800,5)
+
+TCanvas *c1 = new TCanvas("c1","transparent pad",200,10,700,500);
+   TPad *pad1 = new TPad("pad1","",0,0,1,1);
+   TPad *pad2 = new TPad("pad2","",0,0,1,1);
+   pad2->SetFillStyle(4000); //will be transparent
+   pad1->Draw();
+   pad1->cd();
+
+GainTime->Draw("colz")
+gr->Draw("lp")
+
+
+
+  c1->cd();
+ Double_t ymin = -0.04;
+ Double_t ymax = 0.12;
+Double_t dy = (ymax-ymin)/0.8;
+Double_t xmin = GainTime->GetXaxis()->GetXmin()
+Double_t xmax = GainTime->GetXaxis()->GetXmax()
+Double_t dx = (xmax-xmin)/0.8; //10 per cent margins left and right
+pad2->Range(xmin-0.1*dx,ymin-0.1*dy,xmax+0.1*dx,ymax+0.1*dy);
+   pad2->Draw();
+   pad2->cd();
+grSigma->SetLineColor(2);
+grSigma->SetLineWidth(2);
+grSigma->Draw("lp")
+TGaxis *axis = new TGaxis(xmax,ymin,xmax,ymax,ymin,ymax,50510,"+L");
+   axis->SetLabelColor(kRed);
+   axis->SetTitle("dE/dx resolution #sigma_{dE/dx}");
+   axis->Draw();
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ ----> make Attachment study
+
+TFile fcalib("CalibObjects40366b.root");
+TObjArray * array = (TObjArray*)fcalib.Get("TPCCalib");
+AliTPCcalibTimeGain * gain = ( AliTPCcalibTimeGain *)array->FindObject("calibTimeGain");
+TGraphErrors * grAttach = gain->GetGraphAttachment(2000,4)
+
+TCanvas *c1 = new TCanvas("c1","transparent pad",200,10,700,500);
+   TPad *pad1 = new TPad("pad1","",0,0,1,1);
+   TPad *pad2 = new TPad("pad2","",0,0,1,1);
+   pad2->SetFillStyle(4000); //will be transparent
+   pad1->Draw();
+   pad1->cd();
+
+gain->GetHistGainTime()->GetAxis(1)->SetRangeUser(1213.8e6,1214.3e6)
+TH2D * GainTime = gain->GetHistGainTime()->Projection(0,1)
+GainTime->GetXaxis()->SetTimeDisplay(kTRUE)
+GainTime->GetXaxis()->SetTimeFormat("#splitline{%d/%m}{%H:%M}")
+GainTime->Draw("colz")
+//gr->Draw("lp")
+
+  c1->cd();
+ Double_t ymin = -0.001;
+ Double_t ymax = 0.001;
+Double_t dy = (ymax-ymin)/0.8;
+Double_t xmin = GainTime->GetXaxis()->GetXmin()
+Double_t xmax = GainTime->GetXaxis()->GetXmax()
+Double_t dx = (xmax-xmin)/0.8; //10 per cent margins left and right
+pad2->Range(xmin-0.1*dx,ymin-0.1*dy,xmax+0.1*dx,ymax+0.1*dy);
+   pad2->Draw();
+   pad2->cd();
+grAttach->SetLineColor(2);
+grAttach->SetLineWidth(2);
+grAttach->Draw("lp")
+TGaxis *axis = new TGaxis(xmax,ymin,xmax,ymax,ymin,ymax,50510,"+L");
+   axis->SetLabelColor(kRed);
+   axis->SetTitle("attachment coefficient b");
+   axis->Draw();
+
+
 */
 
 
@@ -108,14 +187,19 @@ AliTPCcalibTimeGain::AliTPCcalibTimeGain()
    fHistDeDxTotal(0),
    fIntegrationTimeDeDx(0),
    fMIP(0),
+   fUseMax(0),
    fLowerTrunc(0),
    fUpperTrunc(0),
    fUseShapeNorm(0),
    fUsePosNorm(0),
    fUsePadNorm(0),
+   fUseCookAnalytical(0),
    fIsCosmic(0),
    fLowMemoryConsumption(0)
 {  
+  //
+  // Default constructor
+  //
   AliInfo("Default Constructor");  
 }
 
@@ -127,56 +211,65 @@ AliTPCcalibTimeGain::AliTPCcalibTimeGain(const Text_t *name, const Text_t *title
    fHistDeDxTotal(0),
    fIntegrationTimeDeDx(0),
    fMIP(0),
+   fUseMax(0),
    fLowerTrunc(0),
    fUpperTrunc(0),
    fUseShapeNorm(0),
    fUsePosNorm(0),
    fUsePadNorm(0),
+   fUseCookAnalytical(0),
    fIsCosmic(0),
    fLowMemoryConsumption(0)
- {
-  
+{
+  //
+  // No default constructor
+  //
   SetName(name);
   SetTitle(title);
-
+  
   AliInfo("Non Default Constructor");
-
+  
   fIntegrationTimeDeDx = deltaIntegrationTimeGain;
+  
   Double_t deltaTime = EndTime - StartTime;
   
-
-  // main histogram for time dependence: dE/dx, time, type (1-muon cosmic,2-pion beam data), meanDriftlength, momenta (only filled if enough space is available)
+  
+  // main histogram for time dependence: dE/dx, time, type (1-muon cosmic,2-pion beam data), meanDriftlength, momenta (only filled if enough space is available), run number
   Int_t timeBins = TMath::Nint(deltaTime/deltaIntegrationTimeGain);
-  Int_t binsGainTime[5]    = {100,  timeBins,    2,  25, 200};
-  Double_t xminGainTime[5] = {0.5, StartTime,  0.5,   0, 0.1};
-  Double_t xmaxGainTime[5] = {  4,   EndTime,  2.5, 250, 50};
-  fHistGainTime = new THnSparseF("HistGainTime","dEdx time dep.;dEdx;dEdx,time,type,driftlength,momenta",5,binsGainTime,xminGainTime,xmaxGainTime);
+  Int_t binsGainTime[6]    = {150,  timeBins,    2,  25, 200, 10000000};
+  Double_t xminGainTime[6] = {0.5, StartTime,  0.5,   0, 0.1,    -0.5};
+  Double_t xmaxGainTime[6] = {  8,   EndTime,  2.5, 250,  50, 9999999.5};
+  fHistGainTime = new THnSparseF("HistGainTime","dEdx time dep.;dEdx,time,type,driftlength,momenta,run number;dEdx",6,binsGainTime,xminGainTime,xmaxGainTime);
   BinLogX(fHistGainTime, 4);
   //
-  fHistDeDxTotal = new TH2F("DeDx","dEdx; momentum p (GeV); TPC signal (a.u.)",250,0.01,100.,1000,0.,1000);
+  fHistDeDxTotal = new TH2F("DeDx","dEdx; momentum p (GeV); TPC signal (a.u.)",250,0.01,100.,1000,0.,8);
   BinLogX(fHistDeDxTotal);
   
   // default values for dE/dx
   fMIP = 50.;
-  fLowerTrunc = 0.0;
-  fUpperTrunc = 0.7;
+  fUseMax = kTRUE;
+  fLowerTrunc = 0.02;
+  fUpperTrunc = 0.6;
   fUseShapeNorm = kTRUE;
   fUsePosNorm = kFALSE;
   fUsePadNorm = kFALSE;
+  fUseCookAnalytical = kFALSE;
   //
   fIsCosmic = kTRUE;
   fLowMemoryConsumption = kTRUE;
   //
   
- }
+}
 
 
 
 AliTPCcalibTimeGain::~AliTPCcalibTimeGain(){
   //
+  // Destructor
   //
-  //
+  delete fHistGainTime;
+  delete fGainVsTime;
+  delete fHistDeDxTotal;
 }
 
 
@@ -202,15 +295,18 @@ void AliTPCcalibTimeGain::Process(AliESDEvent *event) {
 
 
 void AliTPCcalibTimeGain::ProcessCosmicEvent(AliESDEvent *event) {
-
-  AliESDfriend *ESDfriend=static_cast<AliESDfriend*>(event->FindListObject("AliESDfriend"));
-  if (!ESDfriend) {
+  //
+  // Process in case of cosmic event
+  //
+  AliESDfriend *esdFriend=static_cast<AliESDfriend*>(event->FindListObject("AliESDfriend"));
+  if (!esdFriend) {
    Printf("ERROR: ESDfriend not available");
    return;
   }
   //
   UInt_t time = event->GetTimeStamp();
   Int_t ntracks = event->GetNumberOfTracks();
+  Int_t runNumber = event->GetRunNumber();
   //
   // track loop
   //
@@ -218,25 +314,24 @@ void AliTPCcalibTimeGain::ProcessCosmicEvent(AliESDEvent *event) {
 
     AliESDtrack *track = event->GetTrack(i);
     if (!track) continue;
-        
+    AliESDfriendTrack *friendTrack = esdFriend->GetTrack(i);
+    if (!friendTrack) continue;        
     const AliExternalTrackParam * trackIn = track->GetInnerParam();
-    const AliExternalTrackParam * trackOut = track->GetOuterParam();
+    const AliExternalTrackParam * trackOut = friendTrack->GetTPCOut();
     if (!trackIn) continue;
     if (!trackOut) continue;
 
     // calculate necessary track parameters
     Double_t meanP = trackIn->GetP();
     Double_t meanDrift = 250 - 0.5*TMath::Abs(trackIn->GetZ() + trackOut->GetZ());
-    Int_t NclsDeDx = track->GetTPCNcls();
+    Int_t nclsDeDx = track->GetTPCNcls();
 
     // exclude tracks which do not look like primaries or are simply too short or on wrong sectors
-    if (NclsDeDx < 60) continue;     
+    if (nclsDeDx < 60) continue;     
     if (TMath::Abs(trackIn->GetTgl()) > 1) continue;
     if (TMath::Abs(trackIn->GetSnp()) > 0.6) continue;
     
     // Get seeds
-    AliESDfriendTrack *friendTrack = ESDfriend->GetTrack(i);
-    if (!friendTrack) continue;
     TObject *calibObject;
     AliTPCseed *seed = 0;
     for (Int_t l=0;(calibObject=friendTrack->GetCalibObject(l));++l) {
@@ -244,15 +339,15 @@ void AliTPCcalibTimeGain::ProcessCosmicEvent(AliESDEvent *event) {
     }    
 
     if (seed) { 
-      Double_t TPCsignalMax = (1/fMIP)*seed->CookdEdxNorm(fLowerTrunc,fUpperTrunc,1,0,159,fUseShapeNorm,fUsePosNorm,fUsePadNorm,0);
-      fHistDeDxTotal->Fill(meanP, TPCsignalMax);
+      Double_t tpcSignal = GetTPCdEdx(seed);
+      if (nclsDeDx > 100) fHistDeDxTotal->Fill(meanP, tpcSignal);
       //
       if (fLowMemoryConsumption) {
        if (meanP < 20) continue;
        meanP = 30; // set all momenta to one in order to save memory
       }
       //dE/dx, time, type (1-muon cosmic,2-pion beam data), momenta
-      Double_t vec[5] = {TPCsignalMax,time,1,meanDrift,meanP}; 
+      Double_t vec[6] = {tpcSignal,time,1,meanDrift,meanP,runNumber};
       fHistGainTime->Fill(vec);
     }
     
@@ -263,15 +358,18 @@ void AliTPCcalibTimeGain::ProcessCosmicEvent(AliESDEvent *event) {
 
 
 void AliTPCcalibTimeGain::ProcessBeamEvent(AliESDEvent *event) {
-
-  AliESDfriend *ESDfriend=static_cast<AliESDfriend*>(event->FindListObject("AliESDfriend"));
-  if (!ESDfriend) {
+  //
+  // Process in case of beam event
+  //
+  AliESDfriend *esdFriend=static_cast<AliESDfriend*>(event->FindListObject("AliESDfriend"));
+  if (!esdFriend) {
    Printf("ERROR: ESDfriend not available");
    return;
   }
   //
   UInt_t time = event->GetTimeStamp();
   Int_t ntracks = event->GetNumberOfTracks();
+  Int_t runNumber = event->GetRunNumber();
   //
   // track loop
   //
@@ -279,25 +377,25 @@ void AliTPCcalibTimeGain::ProcessBeamEvent(AliESDEvent *event) {
 
     AliESDtrack *track = event->GetTrack(i);
     if (!track) continue;
+    AliESDfriendTrack *friendTrack = esdFriend->GetTrack(i);
+    if (!friendTrack) continue;
         
     const AliExternalTrackParam * trackIn = track->GetInnerParam();
-    const AliExternalTrackParam * trackOut = track->GetOuterParam();
+    const AliExternalTrackParam * trackOut = friendTrack->GetTPCOut();
     if (!trackIn) continue;
     if (!trackOut) continue;
 
     // calculate necessary track parameters
     Double_t meanP = trackIn->GetP();
     Double_t meanDrift = 250 - 0.5*TMath::Abs(trackIn->GetZ() + trackOut->GetZ());
-    Int_t NclsDeDx = track->GetTPCNcls();
+    Int_t nclsDeDx = track->GetTPCNcls();
 
     // exclude tracks which do not look like primaries or are simply too short or on wrong sectors
-    if (NclsDeDx < 60) continue;     
+    if (nclsDeDx < 60) continue;     
     if (TMath::Abs(trackIn->GetTgl()) > 1) continue;
     if (TMath::Abs(trackIn->GetSnp()) > 0.6) continue;
     
     // Get seeds
-    AliESDfriendTrack *friendTrack = ESDfriend->GetTrack(i);
-    if (!friendTrack) continue;
     TObject *calibObject;
     AliTPCseed *seed = 0;
     for (Int_t l=0;(calibObject=friendTrack->GetCalibObject(l));++l) {
@@ -305,15 +403,15 @@ void AliTPCcalibTimeGain::ProcessBeamEvent(AliESDEvent *event) {
     }    
 
     if (seed) { 
-      Double_t TPCsignalMax = (1/fMIP)*seed->CookdEdxNorm(fLowerTrunc,fUpperTrunc,1,0,159,fUseShapeNorm,fUsePosNorm,fUsePadNorm,0);
-      fHistDeDxTotal->Fill(meanP, TPCsignalMax);
-      //
       if (fLowMemoryConsumption) {
        if (meanP > 0.5 || meanP < 0.4) continue;
        meanP = 0.45; // set all momenta to one in order to save memory
       }
+      Double_t tpcSignal = GetTPCdEdx(seed);
+      fHistDeDxTotal->Fill(meanP, tpcSignal);
+      //
       //dE/dx, time, type (1-muon cosmic,2-pion beam data), momenta
-      Double_t vec[5] = {TPCsignalMax,time,1,meanDrift,meanP}; 
+      Double_t vec[6] = {tpcSignal,time,2,meanDrift,meanP,runNumber};
       fHistGainTime->Fill(vec);
     }
     
@@ -322,9 +420,25 @@ void AliTPCcalibTimeGain::ProcessBeamEvent(AliESDEvent *event) {
 }
 
 
-void AliTPCcalibTimeGain::Analyze() {
+Float_t AliTPCcalibTimeGain::GetTPCdEdx(AliTPCseed * seed) {
   //
+  // calculate tpc dEdx
   //
+  Double_t signal = 0;
+  //
+  if (!fUseCookAnalytical) {
+    signal = (1/fMIP)*seed->CookdEdxNorm(fLowerTrunc,fUpperTrunc,fUseMax,0,159,fUseShapeNorm,fUsePosNorm,fUsePadNorm,0);
+  } else {
+    signal = (1/fMIP)*seed->CookdEdxAnalytical(fLowerTrunc,fUpperTrunc,fUseMax);
+  }
+  //
+  return signal;
+}
+
+
+void AliTPCcalibTimeGain::AnalyzeRun(Int_t minEntries) {
+  //
+  // Analyze results of calibration
   //
   if (fIsCosmic) {
     fHistGainTime->GetAxis(2)->SetRangeUser(0.51,1.49); // only cosmics
@@ -334,14 +448,33 @@ void AliTPCcalibTimeGain::Analyze() {
     fHistGainTime->GetAxis(4)->SetRangeUser(0.39,0.51); // only MIP pions
   }
   //
-  fGainVsTime = AliTPCcalibBase::FitSlices(fHistGainTime,0,1,2000,10);
+  fGainVsTime = AliTPCcalibBase::FitSlices(fHistGainTime,0,1,minEntries,10);
   //
   return;
 }
 
 
-Long64_t AliTPCcalibTimeGain::Merge(TCollection *li) {
+TGraphErrors * AliTPCcalibTimeGain::GetGraphGainVsTime(Int_t runNumber, Int_t minEntries) {
+  //
+  // Analyze results and get the graph 
+  //
+  if (runNumber == 0) {
+    if (!fGainVsTime) {
+      AnalyzeRun(minEntries);
+    }
+  } else {
+    // 1st check if the current run was cosmic or beam event
+    fHistGainTime->GetAxis(5)->SetRangeUser(runNumber,runNumber);
+    AnalyzeRun(minEntries);
+  }
+  if (fGainVsTime->GetN() == 0) return 0;
+  return fGainVsTime;
+}
 
+Long64_t AliTPCcalibTimeGain::Merge(TCollection *li) {
+  //
+  // merge component
+  //
   TIterator* iter = li->MakeIterator();
   AliTPCcalibTimeGain* cal = 0;
 
@@ -362,55 +495,127 @@ Long64_t AliTPCcalibTimeGain::Merge(TCollection *li) {
 }
 
 
+AliSplineFit * AliTPCcalibTimeGain::MakeSplineFit(TGraphErrors * graph) {
+  //
+  // make spline fit of gain
+  //
+  AliSplineFit *fit = new AliSplineFit();
+  fit->SetGraph(graph);
+  fit->SetMinPoints(graph->GetN()+1);
+  fit->InitKnots(graph,2,0,0.001);
+  fit->SplineFit(0);
+  return fit;
+  
+}
 
-void AliTPCcalibTimeGain::BinLogX(THnSparse *h, Int_t axisDim) {
 
-  // Method for the correct logarithmic binning of histograms
 
+TGraphErrors * AliTPCcalibTimeGain::GetGraphAttachment(Int_t minEntries, Int_t nmaxBin, Float_t /*fracLow*/, Float_t /*fracUp*/) {
+  //
+  // For each time bin the driftlength-dependence of the signal is fitted.
+  //
+  TH3D * hist = fHistGainTime->Projection(1, 0, 3);
+  Double_t *xvec = new Double_t[hist->GetNbinsX()];
+  Double_t *yvec = new Double_t[hist->GetNbinsX()];
+  Double_t *xerr = new Double_t[hist->GetNbinsX()];
+  Double_t *yerr = new Double_t[hist->GetNbinsX()];
+  Int_t counter  = 0;
+  TH2D * projectionHist = 0x0;
+  //
+  for(Int_t i=1; i < hist->GetNbinsX(); i++) {
+    Int_t nsum=0;
+    Int_t imin   =  i;
+    Int_t imax   =  i;    
+    for (Int_t idelta=0; idelta<nmaxBin; idelta++){
+      //
+      imin   =  TMath::Max(i-idelta,1);
+      imax   =  TMath::Min(i+idelta,hist->GetNbinsX());
+      nsum = TMath::Nint(hist->Integral(imin,imax,1,hist->GetNbinsY()-1,1,hist->GetNbinsZ()-1));
+      if (nsum==0) break;
+      if (nsum>minEntries) break;
+    }
+    if (nsum<minEntries) continue;
+    //
+    hist->GetXaxis()->SetRange(imin,imax);
+    projectionHist = (TH2D*)hist->Project3D("yzNUFNOF");
+    //
+    TObjArray arr;
+    projectionHist->FitSlicesY(0,2, projectionHist->GetNbinsX()-2,0,"QNR",&arr);
+    TH1D * histAttach = (TH1D*)arr.At(1);
+    TF1 pol1("polynom1","pol1",10,240);
+    histAttach->Fit(&pol1,"QNR");
+    xvec[counter] = 0.5*(hist->GetXaxis()->GetBinCenter(imin)+hist->GetXaxis()->GetBinCenter(imax));
+    yvec[counter] = pol1.GetParameter(1)/pol1.GetParameter(0);
+    xerr[counter] = 0;
+    yerr[counter] = pol1.GetParError(1)/pol1.GetParameter(0);
+    counter++;
+    //
+    delete projectionHist;
+  }
+  
+  TGraphErrors * graphErrors = new TGraphErrors(counter, xvec, yvec, xerr, yerr);
+  delete [] xvec;
+  delete [] yvec;
+  delete [] xerr;
+  delete [] yerr;
+  delete hist;
+  return graphErrors;
+  
+}
+
+
+
+void AliTPCcalibTimeGain::BinLogX(THnSparse *h, Int_t axisDim) {
+  //
+  // Method for the correct logarithmic binning of histograms
+  //
   TAxis *axis = h->GetAxis(axisDim);
   int bins = axis->GetNbins();
 
   Double_t from = axis->GetXmin();
   Double_t to = axis->GetXmax();
-  Double_t *new_bins = new Double_t[bins + 1];
+  Double_t *newBins = new Double_t[bins + 1];
    
-  new_bins[0] = from;
+  newBins[0] = from;
   Double_t factor = pow(to/from, 1./bins);
   
   for (int i = 1; i <= bins; i++) {
-   new_bins[i] = factor * new_bins[i-1];
+   newBins[i] = factor * newBins[i-1];
   }
-  axis->Set(bins, new_bins);
-  delete new_bins;
+  axis->Set(bins, newBins);
+  delete[] newBins;
   
 }
 
 
 void AliTPCcalibTimeGain::BinLogX(TH1 *h) {
-
+  //
   // Method for the correct logarithmic binning of histograms
-
+  //
   TAxis *axis = h->GetXaxis();
   int bins = axis->GetNbins();
 
   Double_t from = axis->GetXmin();
   Double_t to = axis->GetXmax();
-  Double_t *new_bins = new Double_t[bins + 1];
+  Double_t *newBins = new Double_t[bins + 1];
    
-  new_bins[0] = from;
+  newBins[0] = from;
   Double_t factor = pow(to/from, 1./bins);
   
   for (int i = 1; i <= bins; i++) {
-   new_bins[i] = factor * new_bins[i-1];
+   newBins[i] = factor * newBins[i-1];
   }
-  axis->Set(bins, new_bins);
-  delete new_bins;
+  axis->Set(bins, newBins);
+  delete[] newBins;
   
 }
 
 
 
 void AliTPCcalibTimeGain::CalculateBetheAlephParams(TH2F *hist, Double_t * ini) {
+  //
+  // Fit the bethe bloch params
+  //
   //{0.0762*MIP,10.632,1.34e-05,1.863,1.948}
   const Double_t sigma = 0.06;
 
@@ -428,7 +633,7 @@ void AliTPCcalibTimeGain::CalculateBetheAlephParams(TH2F *hist, Double_t * ini)
   foKaon->SetParameters(ini);
   foProton->SetParameters(ini);
   
-  TCanvas *CanvCheck1 = new TCanvas();
+  TCanvas *canvCheck1 = new TCanvas();
   hist->Draw("colz");
   foElectron->Draw("same");
   foMuon->Draw("same");
@@ -491,7 +696,7 @@ void AliTPCcalibTimeGain::CalculateBetheAlephParams(TH2F *hist, Double_t * ini)
   TF1 * funcAlephD = new TF1("AlephParametrizationD", "AliExternalTrackParam::BetheBlochAleph(x,[0],[1],[2],[3],[4])",0.3,10000);
   funcAlephD->SetParameters(ini);
 
-  TCanvas *CanvCheck2 = new TCanvas();
+  TCanvas *canvCheck2 = new TCanvas();
   histBG->Draw();
   
   //FitSlices
@@ -514,7 +719,7 @@ void AliTPCcalibTimeGain::CalculateBetheAlephParams(TH2F *hist, Double_t * ini)
   foKaon->SetParameters(ini);
   foProton->SetParameters(ini);
   
-  TCanvas *CanvCheck3 = new TCanvas();
+  TCanvas *canvCheck3 = new TCanvas();
   hist->Draw("colz");
   foElectron->Draw("same");
   foMuon->Draw("same");
@@ -522,9 +727,9 @@ void AliTPCcalibTimeGain::CalculateBetheAlephParams(TH2F *hist, Double_t * ini)
   foKaon->Draw("same");  
   foProton->Draw("same");
   
-  CanvCheck1->Print();
-  CanvCheck2->Print();
-  CanvCheck3->Print();
+  canvCheck1->Print();
+  canvCheck2->Print();
+  canvCheck3->Print();
 
   return;