Coding convention, cosmetic changes

diff --git a/ANALYSIS/AliD0toKpi.cxx b/ANALYSIS/AliD0toKpi.cxx
index b91c43dc420cf173134b30fc10f18d8bed933319..87d4b1aedd4625c6995c08cf46bf0f43304a3d50 100644 (file)
--- a/ANALYSIS/AliD0toKpi.cxx
+++ b/ANALYSIS/AliD0toKpi.cxx
@@ -127,10 +127,10 @@ AliD0toKpi::AliD0toKpi( const AliD0toKpi& d0toKpi):TObject(d0toKpi) {
   // dummy copy constructor
 }
 //----------------------------------------------------------------------------
-void AliD0toKpi::ApplyPID(TString pidScheme) {
+void AliD0toKpi::ApplyPID(const Char_t * pidScheme) {
   // Applies particle identification
-  const char *tofparampbpb = strstr(pidScheme.Data(),"TOFparamPbPb");
-  const char *tofparampp   = strstr(pidScheme.Data(),"TOFparamPP");
+  const char *tofparampbpb = strstr(pidScheme,"TOFparamPbPb");
+  const char *tofparampp   = strstr(pidScheme,"TOFparamPP");
 
   if((tofparampbpb || tofparampp) && fPdg[0]==0) {
     printf("AliD0toKpi::ApplyPID :\n Warning: TOF parameterized PID can be used only for simulation!\n"); 
@@ -496,11 +496,11 @@ void AliD0toKpi::SetPIDresponse(Double_t resp0[5],Double_t resp1[5]) {
   return;
 } 
 //-----------------------------------------------------------------------------
-void AliD0toKpi::DrawPIDinTOF(TString pidScheme) const {
+void AliD0toKpi::DrawPIDinTOF(const Char_t * pidScheme) const {
   // Draw parameterized PID probabilities in TOF
 
-  const char *tofparampbpb = strstr(pidScheme.Data(),"TOFparamPbPb");
-  const char *tofparampp = strstr(pidScheme.Data(),"TOFparamPP");
+  const char *tofparampbpb = strstr(pidScheme,"TOFparamPbPb");
+  const char *tofparampp = strstr(pidScheme,"TOFparamPP");
 
   TH2F* framePi = new TH2F("framePi","Tag probabilities for PIONS",2,0,2.5,2,0,1);
   framePi->SetXTitle("p [GeV/c]"); 

diff --git a/ANALYSIS/AliD0toKpi.h b/ANALYSIS/AliD0toKpi.h
index 4f5981ea3c4dbc2abd7ac456fa6c77681f0e1c0e..4893f03810917f15a76ef12a39b228bd01430673 100644 (file)
--- a/ANALYSIS/AliD0toKpi.h
+++ b/ANALYSIS/AliD0toKpi.h
@@ -10,6 +10,7 @@
 //         Origin: A. Dainese    andrea.dainese@pd.infn.it                  
 //-------------------------------------------------------------------------
 
+#include <TObject.h>
 #include <TMath.h>
 
 //----------------------------------------------------------------------------
@@ -83,7 +84,7 @@ class AliD0toKpi : public TObject {
   AliD0toKpi(const AliD0toKpi& d0toKpi);
 
   Double_t Alpha() const { return (Ql(0)-Ql(1))/(Ql(0)+Ql(1)); }
-  void     ApplyPID(TString pidScheme="TOFparamPbPb");
+  void     ApplyPID(const Char_t * pidScheme="TOFparamPbPb");
   Double_t ChildrenRelAngle() const; 
   void     ComputeWgts();
   void     CorrectWgt4BR(Double_t factor);
@@ -102,9 +103,9 @@ class AliD0toKpi : public TObject {
   Int_t    GetPdgMum(Int_t child) const {return fMum[child]; }
   void     GetWgts(Double_t &WgtD0,Double_t &WgtD0bar,TString sample) const;
   void     GetPrimaryVtx(Double_t vtx[3]) const 
-    { vtx[0]=fV1x; vtx[1]=fV1y; vtx[2]=fV1z; return; }
+    { vtx[0]=fV1x; vtx[1]=fV1y; vtx[2]=fV1z; }
   void     GetSecondaryVtx(Double_t vtx[3]) const 
-    { vtx[0]=fV2x; vtx[1]=fV2y; vtx[2]=fV2z; return; }
+    { vtx[0]=fV2x; vtx[1]=fV2y; vtx[2]=fV2z; }
 
   void     InvMass(Double_t &mD0,Double_t &mD0bar) const;
   Bool_t   IsSignal() const { if(fSignal) return kTRUE; return kFALSE; } 
@@ -124,15 +125,15 @@ class AliD0toKpi : public TObject {
   Double_t Rapidity() const { return 0.5*TMath::Log((Energy()+Pz())/(Energy()-Pz()+1.e-13)); }
   Bool_t   Select(const Double_t* cuts,Int_t& okD0,Int_t& okD0bar) const;
   void     SetPrimaryVtx(Double_t vtx[3]) 
-    { fV1x=vtx[0]; fV1y=vtx[1]; fV1z=vtx[2]; return; }
-  void     SetSignal() { fSignal =  kTRUE; return; }
+    { fV1x=vtx[0]; fV1y=vtx[1]; fV1z=vtx[2]; }
+  void     SetSignal() { fSignal =  kTRUE; }
   void     SetTOFmasses(Double_t mass[2]) 
-    { fTOFmass[0]=mass[0]; fTOFmass[1]=mass[1]; return; }
+    { fTOFmass[0]=mass[0]; fTOFmass[1]=mass[1]; }
   void     SetPIDresponse(Double_t resp0[5],Double_t resp1[5]); 
-  void     SetPdgCodes(Int_t pdg[2]) {fPdg[0]=pdg[0];fPdg[1]=pdg[1];return;}
-  void     SetMumPdgCodes(Int_t mum[2]) {fMum[0]=mum[0];fMum[1]=mum[1];return;}
+  void     SetPdgCodes(Int_t pdg[2]) {fPdg[0]=pdg[0];fPdg[1]=pdg[1]; }
+  void     SetMumPdgCodes(Int_t mum[2]) {fMum[0]=mum[0];fMum[1]=mum[1]; }
 
-  void     DrawPIDinTOF(TString pidScheme="TOFparamPbPb") const;
+  void     DrawPIDinTOF(const Char_t * pidScheme="TOFparamPbPb") const;
   Double_t LinearInterpolation(Double_t p,Int_t nBins,Double_t Bin,
                               const Double_t *values) const;
   //  void     SetPtWgts4pp();

diff --git a/ANALYSIS/AliD0toKpiAnalysis.h b/ANALYSIS/AliD0toKpiAnalysis.h
index 326d085c1e8b4c27a85d26dea441d521e6c0c7f2..be493cefb4842e7b021e32bfc34b2a31b067fe95 100644 (file)
--- a/ANALYSIS/AliD0toKpiAnalysis.h
+++ b/ANALYSIS/AliD0toKpiAnalysis.h
@@ -10,16 +10,10 @@
 //         Origin: A. Dainese    andrea.dainese@pd.infn.it                  
 //-------------------------------------------------------------------------
 
-#include <Riostream.h>
 #include <TString.h>
 #include <TNamed.h>
 #include "AliESD.h"
 #include "AliITStrackV2.h"
-#include "AliITSVertexerTracks.h"
-#include "AliESDVertex.h"
-#include "AliV0vertexer.h"
-#include "AliV0vertex.h"
-#include "AliD0toKpi.h"
 
 //-----------------------------------------------------------------------------
 class AliD0toKpiAnalysis : public TNamed {
@@ -35,20 +29,20 @@ class AliD0toKpiAnalysis : public TNamed {
   void FindCandidatesESD(Int_t evFirst=0,Int_t evLast=0,
                         const Char_t *outName="AliD0toKpi.root");
   void PrintStatus() const;
-  void SetBz(Double_t bz=-9999.) { fBz=bz; return; }
-  void SetVertexOnTheFly() { fVertexOnTheFly=kTRUE; return; }
-  void SetSimulation() { fSim=kTRUE; return; }
-  void SetOnlySignal() { fOnlySignal=kTRUE; return; }
-  void SetPtCut(Double_t pt=0.) { fPtCut=pt; return; }
-  void Setd0Cut(Double_t d0=0.) { fd0Cut=d0; return; } 
-  void SetMassCut(Double_t deltaM=1000.) { fMassCut=deltaM; return; }
+  void SetBz(Double_t bz=-9999.) { fBz=bz; }
+  void SetVertexOnTheFly() { fVertexOnTheFly=kTRUE; }
+  void SetSimulation() { fSim=kTRUE; }
+  void SetOnlySignal() { fOnlySignal=kTRUE; }
+  void SetPtCut(Double_t pt=0.) { fPtCut=pt; }
+  void Setd0Cut(Double_t d0=0.) { fd0Cut=d0; } 
+  void SetMassCut(Double_t deltaM=1000.) { fMassCut=deltaM; }
   void SetD0Cuts(Double_t cut0=1000.,Double_t cut1=100000.,
                 Double_t cut2=1.1,Double_t cut3=0.,Double_t cut4=0.,
                 Double_t cut5=100000.,Double_t cut6=100000.,
                 Double_t cut7=100000000.,Double_t cut8=-1.1); 
   void SetD0Cuts(const Double_t cuts[9]); 
-  void SetPID(TString pid="TOFparam_PbPb") { fPID=pid; return; }
-  void SetDebug() { fDebug=kTRUE; return; }
+  void SetPID(const Char_t * pid="TOFparam_PbPb") { fPID=pid; }
+  void SetDebug() { fDebug=kTRUE; }
   //
  private:
   //
@@ -81,16 +75,16 @@ class AliD0toKpiAnalysis : public TNamed {
   void     MakeTracksRefFileESD() const;
   Bool_t   SelectInvMass(const Double_t p[6]) const;
   void     SelectTracks(TTree &trkTree,
-                     TObjArray &trksP,Int_t *trkEntryP,Int_t &nTrksP,
-                     TObjArray &trksN,Int_t *trkEntryN,Int_t &nTrksN) const; 
+                       TObjArray &trksP,Int_t *trkEntryP,Int_t &nTrksP,
+                       TObjArray &trksN,Int_t *trkEntryN,Int_t &nTrksN) const;
   void     SelectTracksESD(AliESD &event,
-       TObjArray &trksP,Int_t *trkEntryP,Int_t &nTrksP,
-       TObjArray &trksN,Int_t *trkEntryN,Int_t &nTrksN) const; 
+                          TObjArray &trksP,Int_t *trkEntryP,Int_t &nTrksP,
+                          TObjArray &trksN,Int_t *trkEntryN,Int_t &nTrksN) const;
   void     SelectTracksESDvtx(AliESD &event,TTree *trkTree,
-       TObjArray &trksP,Int_t *trkEntryP,Int_t &nTrksP,
-       TObjArray &trksN,Int_t *trkEntryN,Int_t &nTrksN) const; 
+                             TObjArray &trksP,Int_t *trkEntryP,Int_t &nTrksP,
+                             TObjArray &trksN,Int_t *trkEntryN,Int_t &nTrksN) const;
   void     SetVertex1(Double_t x=0.,Double_t y=0.,Double_t z=0.) 
-    { fV1[0]=x;fV1[1]=y;fV1[2]=z; return; }
+    { fV1[0]=x;fV1[1]=y;fV1[2]=z; }
   void     SimulationInfo(TTree *treeD0in,TTree *treeD0out) const;
   Bool_t   SingleTrkCuts(const AliITStrackV2& trk) const;
   //