From: snelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 11 Aug 2010 12:11:50 +0000 (+0000)
Subject: fixes initialization
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=c855d803f7820c18b159ba9e3a0bd6a88da52505;p=u%2Fmrichter%2FAliRoot.git

fixes initialization
---

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.cxx
index 6b81f7f2f7a..bdf26936a58 100644
--- a/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.cxx
@@ -132,7 +132,9 @@ void AliFlowTrackSimple::AddV1( Double_t v1,
 {
   //afterburner, adds v1, uses Newton-Raphson iteration
   Double_t phi0=fPhi;
-  Double_t f,fp,phiprev;
+  Double_t f=0.;
+  Double_t fp=0.;
+  Double_t phiprev=0.;
 
   for (Int_t i=0; i<maxNumberOfIterations; i++)
   {
@@ -152,7 +154,9 @@ void AliFlowTrackSimple::AddV2( Double_t v2,
 {
   //afterburner, adds v2, uses Newton-Raphson iteration
   Double_t phi0=fPhi;
-  Double_t f,fp,phiprev;
+  Double_t f=0.;
+  Double_t fp=0.;
+  Double_t phiprev=0.;
 
   for (Int_t i=0; i<maxNumberOfIterations; i++)
   {
@@ -172,7 +176,9 @@ void AliFlowTrackSimple::AddV4( Double_t v4,
 {
   //afterburner, adds v4, uses Newton-Raphson iteration
   Double_t phi0=fPhi;
-  Double_t f,fp,phiprev;
+  Double_t f=0.;
+  Double_t fp=0.;
+  Double_t phiprev=0.;
 
   for (Int_t i=0; i<maxNumberOfIterations; i++)
   {
@@ -194,7 +200,9 @@ void AliFlowTrackSimple::AddFlow( Double_t v1,
 {
   //afterburner, adds v1,v2,v4 uses Newton-Raphson iteration
   Double_t phi0=fPhi;
-  Double_t f,fp,phiprev;
+  Double_t f=0.;
+  Double_t fp=0.;
+  Double_t phiprev=0.;
 
   for (Int_t i=0; i<maxNumberOfIterations; i++)
   {
diff --git a/PWG2/FLOW/AliFlowCommon/AliStarEvent.cxx b/PWG2/FLOW/AliFlowCommon/AliStarEvent.cxx
index f1ae277ca2b..bb5e86c0bee 100644
--- a/PWG2/FLOW/AliFlowCommon/AliStarEvent.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliStarEvent.cxx
@@ -120,13 +120,12 @@ void AliStarEvent::Print( Option_t* option ) const
   // event  = new TNtuple("event","event",
   //   "runId:eventNumber:VtxX:VtxY:VtxZ:BField:refMult:centralityId:numberOfPrimaryTracks:numberOfParticles:h0:h1:h2:h3:h4" ) ;
   //
-  Float_t   primaryVertexPosition[3] ;
 
   Int_t   runId                  = (Int_t)   fParams[0]  ;
   Int_t   eventNumber            = (Int_t)   fParams[1]  ;     
-  primaryVertexPosition[0]       = (Float_t) fParams[2]  ;  // (cm)
-  primaryVertexPosition[1]       = (Float_t) fParams[3]  ;  // (cm)
-  primaryVertexPosition[2]       = (Float_t) fParams[4]  ;  // (cm)
+  Float_t   primaryVertexPosition[3]={ (Float_t) fParams[2],
+                                       (Float_t) fParams[3],
+                                       (Float_t) fParams[4] };
   Float_t magneticField          = (Float_t) fParams[5]  ;  // kilogauss
   Int_t   refMult                = (Int_t)   fParams[6]  ;  // Raw Mult into 0.5 unit: a relative number, not total Mult.
   Int_t   centralityId           = (Int_t)   fParams[7]  ;  // STAR centrality bin # based on refMult
diff --git a/PWG2/FLOW/AliFlowCommon/AliStarEventReader.cxx b/PWG2/FLOW/AliFlowCommon/AliStarEventReader.cxx
index edfbbbd3668..e2021243543 100644
--- a/PWG2/FLOW/AliFlowCommon/AliStarEventReader.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliStarEventReader.cxx
@@ -103,7 +103,7 @@ Bool_t AliStarEventReader::GetNextEvent( )
   {
     while ( NextEntry < entries )
     {
-      Float_t* header ;
+      Float_t* header = NULL;
       Int_t numberOfParticles =  0 ;                   // Number of particle tracks in the next event
       Long64_t HeaderEntry    =  0 ;                   // Store position of Header and Set Flag in case of EOF or error
       Long64_t SkipEvent      =  0 ;                   // Flag in case of wrong number of tracks in this event
@@ -242,10 +242,9 @@ Bool_t AliStarEventReader::AcceptEvent( AliStarEvent* event )
   if ( NumberOfPrimaryTracks <= 0 || NumberOfPrimaryTracks > BlackEvent )  return false ;
 
   // Cut on Vertex location
-  Float_t vertex[3] ;
-  vertex[0] = event->GetVtxX() ;
-  vertex[1] = event->GetVtxY() ;
-  vertex[2] = event->GetVtxZ() ;
+  Float_t vertex[3] = { event->GetVtxX(),
+                        event->GetVtxY(),
+                        event->GetVtxZ() };
 
   if ( vertex[0] < VertexXMin || vertex[0] > VertexXMax )    return false ;  // Skip events that fall outside Vtx cuts
   if ( vertex[1] < VertexYMin || vertex[1] > VertexYMax )    return false ;
@@ -396,14 +395,13 @@ void AliStarEventReader::PrintEventHeader ( )
   //   "runId:eventNumber:VtxX:VtxY:VtxZ:BField:refMult:centralityId:numberOfPrimaryTracks:numberOfParticles:h0:h1:h2:h3:h4" ) ;
   //
   Float_t  *eventhd ;
-  Float_t   primaryVertexPosition[3] ;
   eventhd = fEventHeader->GetArgs() ;
 
   Int_t   runId                  = (int)   eventhd[0]  ;
   Int_t   eventNumber            = (int)   eventhd[1]  ;
-  primaryVertexPosition[0]       = (float) eventhd[2]  ;  // (cm)
-  primaryVertexPosition[1]       = (float) eventhd[3]  ;  // (cm)
-  primaryVertexPosition[2]       = (float) eventhd[4]  ;  // (cm)
+  Float_t   primaryVertexPosition[3] = { (float) eventhd[2],  // (cm)
+                                         (float) eventhd[3],  // (cm)
+                                         (float) eventhd[4] };  // (cm)
   Float_t magneticField          = (float) eventhd[5]  ;  // kilogauss
   Int_t   refMult                = (int)   eventhd[6]  ;  // Raw Mult into 0.5 unit: a relative number, not total Mult.
   Int_t   centralityId           = (int)   eventhd[7]  ;  // STAR centrality bin # based on refMult
@@ -427,13 +425,12 @@ void AliStarEventReader::PrintTrack ( Int_t counter )
   // tracks = new TNtuple("tracks","tracks",
   //   "ID:Charge:Eta:Phi:Pt:Dca:nHits:nHitsFit:nHitsPoss:nHitsDedx:dEdx:nSigElect:nSigPi:nSigK:nSigProton" ) ;
   //
-  Float_t* data ;
   if ( counter == 0 )
   {
     printf(
       "    id charge     eta     phi      pt     dca  nHits  nFit nPoss ndEdx   dEdx nSigElec nSigPi  nSigK nSigPr\n") ;
   }
-  data =  fTracks -> GetArgs()                ;  // Extract data from the track
+  Float_t* data = fTracks -> GetArgs()       ;  // Extract data from the track
   Int_t   id             = (int)   data[0]   ;  // id - a unique integer for each track in this event
   Int_t   charge         = (int)   data[1]   ;  // +1 or -1
   Float_t eta            = (float) data[2]   ;  // Pseudo-rapidity at the vertex
diff --git a/PWG2/FLOW/macros/readStarEvents.C b/PWG2/FLOW/macros/readStarEvents.C
index 4c1b35b1f3d..a661c14ebf2 100644
--- a/PWG2/FLOW/macros/readStarEvents.C
+++ b/PWG2/FLOW/macros/readStarEvents.C
@@ -12,9 +12,10 @@
 
 void  readStarEvents()
 {
-  gROOT->LoadMacro("AliStarTrack.cxx++");
-  gROOT->LoadMacro("AliStarEvent.cxx++");
-  gROOT->LoadMacro("AliStarEventReader.cxx++");
+  gSystem->Load("libTree.so");
+  gSystem->Load("libVMC.so");
+  gSystem->Load("libPhysics.so");
+  gSystem->Load("libPWG2flowCommon");
 
   Long64_t EventCounter = 0 ;
   Int_t    TrackCounter = 0 ;
diff --git a/PWG2/FLOW/macros/readStarEventsSimple.C b/PWG2/FLOW/macros/readStarEventsSimple.C
index d1d830a2ebc..496e96fa61f 100644
--- a/PWG2/FLOW/macros/readStarEventsSimple.C
+++ b/PWG2/FLOW/macros/readStarEventsSimple.C
@@ -7,20 +7,7 @@ void  readStarEventsSimple()
   gSystem->Load("libTree.so");
   gSystem->Load("libVMC.so");
   gSystem->Load("libPhysics.so");
-  gSystem->AddIncludePath("-I$ALICE_ROOT/include");
-  gSystem->AddIncludePath("-I$ALICE_ROOT/PWG2/FLOW/AliFlowCommon");
-  gSystem->Load("libSTEERBase");
-  gSystem->Load("libESD");
-  gSystem->Load("libAOD");
-  gSystem->Load("libANALYSIS");
-  gSystem->Load("libANALYSISalice");
-  gSystem->Load("libCORRFW");
   gSystem->Load("libPWG2flowCommon");
-  gSystem->Load("libPWG2flowTasks");
-  gROOT->LoadMacro("AliStarTrack.cxx++");
-  gROOT->LoadMacro("AliStarEvent.cxx++");
-  gROOT->LoadMacro("AliStarEventReader.cxx++");
-  gROOT->LoadMacro("AliFlowEventStar.cxx++");
 
   AliStarEventReader*  starReader = new AliStarEventReader( "/data/alice3/jthomas/testData/") ;