git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11c37b8)
Make revisions needed for compilation from the main AliRoot tree
authorakisiel <akisiel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 27 Apr 2007 07:25:59 +0000 (07:25 +0000)
committerakisiel <akisiel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 27 Apr 2007 07:25:59 +0000 (07:25 +0000)
PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx patch | blob | blame | history
PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx patch | blob | blame | history

diff --git a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx
index a6062ec71ace9503ba3fde0b32e09ad489552f73..39245b93e814c2205320a35bbe7cb8ed1856e83d 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESD.cxx
@@ -164,7 +164,7 @@ AliFemtoEvent* AliFemtoEventReaderESD::ReturnHbtEvent()
          fEventFriend = 0;
          delete fEvent;//added 1.04.2007
          fEvent=new AliESD();
          fEventFriend = 0;
          delete fEvent;//added 1.04.2007
          fEvent=new AliESD();
-         delete fTree;
+         //      delete fTree;
          //fTree=0;
          delete fEsdFile;
                
          //fTree=0;
          delete fEsdFile;
                
@@ -180,6 +180,14 @@ AliFemtoEvent* AliFemtoEventReaderESD::ReturnHbtEvent()
          fTree->AddFriend("esdFriendTree",tFriendFileName.c_str());
          fTree->SetBranchAddress("ESDfriend",&fEventFriend);
 
          fTree->AddFriend("esdFriendTree",tFriendFileName.c_str());
          fTree->SetBranchAddress("ESDfriend",&fEventFriend);
 
+//       chain->SetBranchStatus("*",0);
+//       chain->SetBranchStatus("fUniqueID",1);
+//       chain->SetBranchStatus("fTracks",1);
+//       chain->SetBranchStatus("fTracks.*",1);
+//       chain->SetBranchStatus("fTracks.fTPCindex[160]",1);
+         fTree->SetBranchStatus("fTracks.fCalibContainer",0);
+
+
          fNumberofEvent=fTree->GetEntries();
          cout<<"Number of Entries in file "<<fNumberofEvent<<endl;
          fCurEvent=0;
          fNumberofEvent=fTree->GetEntries();
          cout<<"Number of Entries in file "<<fNumberofEvent<<endl;
          fCurEvent=0;
@@ -199,7 +207,7 @@ AliFemtoEvent* AliFemtoEventReaderESD::ReturnHbtEvent()
        
   hbtEvent = new AliFemtoEvent;
   //setting basic things
        
   hbtEvent = new AliFemtoEvent;
   //setting basic things
-  //hbtEvent->SetEventNumber(fEvent->GetEventNumber());
+  hbtEvent->SetEventNumber(fEvent->GetEventNumber());
   hbtEvent->SetRunNumber(fEvent->GetRunNumber());
   //hbtEvent->SetNumberOfTracks(fEvent->GetNumberOfTracks());
   hbtEvent->SetMagneticField(fEvent->GetMagneticField()*kilogauss);//to check if here is ok
   hbtEvent->SetRunNumber(fEvent->GetRunNumber());
   //hbtEvent->SetNumberOfTracks(fEvent->GetNumberOfTracks());
   hbtEvent->SetMagneticField(fEvent->GetMagneticField()*kilogauss);//to check if here is ok
diff --git a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx
index 302d5d9478522b88b662e15cd9f7b4c98912eef4..641dca05b6594fc7bc3689b3daa3e2bdde9eb71b 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/Reader/AliFemtoEventReaderESDChain.cxx
@@ -94,7 +94,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChain::ReturnHbtEvent()
        
   hbtEvent = new AliFemtoEvent;
   //setting basic things
        
   hbtEvent = new AliFemtoEvent;
   //setting basic things
-  //hbtEvent->SetEventNumber(fEvent->GetEventNumber());
+  hbtEvent->SetEventNumber(fEvent->GetEventNumber());
   hbtEvent->SetRunNumber(fEvent->GetRunNumber());
   //hbtEvent->SetNumberOfTracks(fEvent->GetNumberOfTracks());
   hbtEvent->SetMagneticField(fEvent->GetMagneticField()*kilogauss);//to check if here is ok
   hbtEvent->SetRunNumber(fEvent->GetRunNumber());
   //hbtEvent->SetNumberOfTracks(fEvent->GetNumberOfTracks());
   hbtEvent->SetMagneticField(fEvent->GetMagneticField()*kilogauss);//to check if here is ok