Fix for IsTriggerInputFired,GetFiredTriggerInputs

[u/mrichter/AliRoot.git] / STEER / AliKFParticleTest.C

diff --git a/STEER/AliKFParticleTest.C b/STEER/AliKFParticleTest.C
index e05775f453317112b67cb4acdc25ca769a137775..3cee6b9cbe2eaab22a987b64be9cb84a72fdddb8 100644 (file)
--- a/STEER/AliKFParticleTest.C
+++ b/STEER/AliKFParticleTest.C
@@ -139,7 +139,7 @@ void RunV0(  AliESDEvent *event )
   cout<<"Event "<<iEvent++<<endl;
 
   if( !gAlice ) return;
-  AliRunLoader *rl = gAlice->GetRunLoader(); 
+  AliRunLoader *rl = AliRunLoader::Instance(); 
  
   AliStack *stack = rl->Stack();
   if( !stack ) return;  
@@ -168,7 +168,7 @@ void RunV0(  AliESDEvent *event )
       if ( !( pTrack->GetStatus()&AliESDtrack::kITSrefit ) ) continue;
       Int_t indi[12];
       if( pTrack->GetITSclusters(indi) <5 ) continue;
-      Int_t PDG = ( pTrack->Get1Pt() <0 ) ?321 :211;
+      Int_t PDG = ( pTrack->GetSigned1Pt() <0 ) ?321 :211;
 
       //* take MC PDG  
       { 
@@ -255,7 +255,7 @@ void RunV0(  AliESDEvent *event )
 
       //* Check chi^2 for a case
 
-      if( TMath::Sqrt( TMath::Abs(V0.GetChi2()/V0.GetNDF()) >3. )) continue;
+      if( TMath::Sqrt( TMath::Abs(V0.GetChi2()/V0.GetNDF())) >3. ) continue;
 
       //* Get V0 decay length with estimated error
 
@@ -306,8 +306,12 @@ Int_t AliKFParticleTest(Int_t n1=0,Int_t n2=1000,char *dire="/d/alice10/sma/my_v
     
     cout <<"  Opening "<<filename<<"\nand ESD "<<esdfile<<endl;
     
+    TFile* ftemp = TFile::Open(filename);
+    Printf("ftemp = %p", ftemp);
+    if (!ftemp) continue;
+
     if (gAlice) {
-      delete gAlice->GetRunLoader();
+      delete AliRunLoader::Instance();
       delete gAlice;
       gAlice=0;
     }
@@ -328,8 +332,6 @@ Int_t AliKFParticleTest(Int_t n1=0,Int_t n2=1000,char *dire="/d/alice10/sma/my_v
       continue;
     }
     rl->LoadKinematics();
-    AliTracker::SetFieldMap(gAlice->Field(),1);
-    AliKFParticle::SetField( AliTracker::GetBz() );
 
     //---------------------------------------//
     //                                       //
@@ -344,7 +346,7 @@ Int_t AliKFParticleTest(Int_t n1=0,Int_t n2=1000,char *dire="/d/alice10/sma/my_v
     if (!ef || !ef->IsOpen()) {cerr<<"Error open AliESDs.root !\n"; continue ;}
 
     //create event object
-    AliESD *event = new AliESDEvent;
+    AliESDEvent *event = new AliESDEvent;
 
     //Set pointer to the esd tree in the file
     TTree* tree = (TTree*) ef->Get("esdTree");
@@ -353,7 +355,7 @@ Int_t AliKFParticleTest(Int_t n1=0,Int_t n2=1000,char *dire="/d/alice10/sma/my_v
     if (!tree) {cerr<<"no ESD tree found\n"; continue;};
     
     //Set pointer to the esd object in the tree
-    event->ReadFromTree(event);
+    event->ReadFromTree(tree);
     
     //Number of events
     Int_t nevents=tree->GetEntriesFast();
@@ -363,6 +365,7 @@ Int_t AliKFParticleTest(Int_t n1=0,Int_t n2=1000,char *dire="/d/alice10/sma/my_v
     for (Int_t iev=0; iev<nevents; iev++){
       tree->GetEvent(iev);
       rl->GetEvent(iev);
+      AliKFParticle::SetField(event->GetMagneticField());
       RunV0(event);
     }
     EndV0();