updating HLT TRD ESDWriter follow reorganization of the friends in AliESDs.root ...

diff --git a/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx b/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx
index c968c52de340558b11b1f6642555db67428fddcd..7518afe2098fa0be9c2f72778b998366916543c5 100644 (file)
--- a/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx
+++ b/HLT/TRD/AliHLTTRDEsdWriterComponent.cxx
@@ -37,9 +37,11 @@ ClassImp(AliHLTTRDEsdWriterComponent)
 AliHLTTRDEsdWriterComponent::AliHLTTRDEsdWriterComponent()
 :AliHLTRootFileWriterComponent()
   ,fTree(NULL)
+  ,fFrTree(NULL)
   ,fESD(NULL)
   ,fESDfriend(NULL)
   ,fFile(NULL)
+  ,fFrFile(NULL)
   ,fTracksArray(NULL)
 {
   // see header file for class documentation
@@ -52,6 +54,7 @@ AliHLTTRDEsdWriterComponent::AliHLTTRDEsdWriterComponent()
 AliHLTTRDEsdWriterComponent::AliHLTTRDEsdWriterComponent(const AliHLTTRDEsdWriterComponent&)
   :AliHLTRootFileWriterComponent()
   ,fTree(NULL)
+  ,fFrTree(NULL)
   ,fESD(NULL)
   ,fESDfriend(NULL)
   ,fFile(NULL)
@@ -77,15 +80,16 @@ int AliHLTTRDEsdWriterComponent::InitWriter()
   // see header file for class documentation
   
   fFile = new TFile("AliHLTTRDESDs.root", "recreate");
-  fFile->cd();
   fESD = new AliESDEvent;
   fESD->CreateStdContent();
-  fTree = new TTree("esdTree", "Tree with HLT ESD objects");
+  fTree = new TTree("esdTree", "Tree with HLT::TRD ESD objects");
   fESD->WriteToTree(fTree);
+  fFrFile = new TFile("AliHLTTRDESDfriends.root", "recreate");
   fESDfriend = new AliESDfriend();
-  /*TBranch* br=*/fTree->Branch("ESDfriend.","AliESDfriend", &fESDfriend);
-  //br->SetFile("AliHLTTRDESDfriends.root");
+  fFrTree = new TTree("esdFriendTree", "Tree with HLT::TRD ESD Friend objects");
+  fFrTree->Branch("ESDfriend.","AliESDfriend", &fESDfriend);
   fESD->AddObject(fESDfriend);
+  fFile->cd();
   fTree->GetUserInfo()->Add(fESD);
   fTracksArray = new TClonesArray("AliTRDtrackV1");
 
@@ -99,9 +103,16 @@ int AliHLTTRDEsdWriterComponent::CloseWriter()
   // see header file for class documentation
 
   //fTree->Print();
+  fFile->cd();
+  fTree->Write(fTree->GetName(),TObject::kOverwrite);
   fFile->Write();
   fFile->Close();
+  fFrFile->cd();
+  fFrTree->Write(fFrTree->GetName(),TObject::kOverwrite);
+  fFrFile->Write();
+  fFrFile->Close();
   delete fFile; fFile=0;
+  delete fFrFile; fFrFile=0;
   //delete fTree;
   delete fTracksArray; fTracksArray=0;
 
@@ -176,8 +187,10 @@ int AliHLTTRDEsdWriterComponent::DumpEvent( const AliHLTComponentEventData& /*ev
   }
   
   fESD->GetESDfriend(fESDfriend);
-  Int_t nb = fTree->Fill();  //endless-
-  printf("Tree filled with %i bytes\n", nb);
+  Int_t nb = fTree->Fill();
+  HLTInfo("Tree filled with %i bytes\n", nb);  
+  nb = fFrTree->Fill();
+  HLTInfo("FrTree filled with %i bytes\n", nb);
   fESD->Reset();
   fESDfriend->~AliESDfriend();
   new (fESDfriend) AliESDfriend();

diff --git a/HLT/TRD/AliHLTTRDEsdWriterComponent.h b/HLT/TRD/AliHLTTRDEsdWriterComponent.h
index 63cc1fffc78a278ead049a17483c03dd26d03797..9e38fee236813536c3c1228b8d91675f8f09f2ca 100644 (file)
--- a/HLT/TRD/AliHLTTRDEsdWriterComponent.h
+++ b/HLT/TRD/AliHLTTRDEsdWriterComponent.h
@@ -93,11 +93,13 @@ class AliHLTTRDEsdWriterComponent : public AliHLTRootFileWriterComponent
 
   /** the ESD tree */
   TTree* fTree; //! transient value
+  TTree* fFrTree; //! transient value
   
   /** the ESD */
   AliESDEvent* fESD; //! transient value
   AliESDfriend* fESDfriend; //! transient value
   TFile* fFile; //! transient value
+  TFile* fFrFile; //! transient value
   TClonesArray* fTracksArray; //! transient value
 
   ClassDef(AliHLTTRDEsdWriterComponent, 1)