Fixes

diff --git a/FMD/AliFMDInput.cxx b/FMD/AliFMDInput.cxx
index d376f8e33ff0be1826afb7e02636ada9fc4a4d25..07c66020a8ed291660198d9ad235b8d0b3c9bb68 100644 (file)
--- a/FMD/AliFMDInput.cxx
+++ b/FMD/AliFMDInput.cxx
@@ -58,6 +58,8 @@
 #include <Riostream.h>         // ROOT_Riostream
 #include <TFile.h>              // ROOT_TFile
 #include <TStreamerInfo.h>
+#include <TArrayF.h>
+
 //____________________________________________________________________
 ClassImp(AliFMDInput)
 #if 0
@@ -269,6 +271,7 @@ AliFMDInput::Begin(Int_t event)
     AliError("Not initialized");
     return fIsInit;
   }
+
   // Get the event 
   if (fLoader->GetEvent(event)) return kFALSE;
   AliInfo(Form("Now in event %8d/%8d", event, NEvents()));
@@ -279,6 +282,7 @@ AliFMDInput::Begin(Int_t event)
     if (fLoader->LoadKinematics()) return kFALSE;
     fStack = fLoader->Stack();
   }
+
   // Possibly load FMD Hit information 
   if (TESTBIT(fTreeMask, kHits) || TESTBIT(fTreeMask, kTracks)) {
     // AliInfo("Getting FMD hits");
@@ -286,6 +290,7 @@ AliFMDInput::Begin(Int_t event)
     fTreeH = fFMDLoader->TreeH();
     if (!fArrayH) fArrayH = fFMD->Hits(); 
   }
+
   // Possibly load FMD Digit information 
   if (TESTBIT(fTreeMask, kDigits)) {
     // AliInfo("Getting FMD digits");
@@ -299,6 +304,7 @@ AliFMDInput::Begin(Int_t event)
       AliWarning(Form("Failed to load FMD Digits"));
     } 
   }
+
   // Possibly load FMD Sdigit information 
   if (TESTBIT(fTreeMask, kSDigits)) {
     // AliInfo("Getting FMD summable digits");
@@ -306,6 +312,7 @@ AliFMDInput::Begin(Int_t event)
     fTreeS = fFMDLoader->TreeS();
     if (!fArrayS) fArrayS = fFMD->SDigits();
   }
+
   // Possibly load FMD RecPoints information 
   if (TESTBIT(fTreeMask, kRecPoints)) {
     // AliInfo("Getting FMD reconstructed points");
@@ -313,13 +320,16 @@ AliFMDInput::Begin(Int_t event)
     fTreeR = fFMDLoader->TreeR();
     if (!fArrayR) fArrayR = new TClonesArray("AliFMDRecPoint");
     fTreeR->SetBranchAddress("FMD",  &fArrayR);
-  }  // Possibly load FMD ESD information 
+  }  
+
+  // Possibly load FMD ESD information 
   if (TESTBIT(fTreeMask, kESD)) {
     // AliInfo("Getting FMD event summary data");
     Int_t read = fChainE->GetEntry(event);
     if (read <= 0) return kFALSE;
     fESD = fESDEvent->GetFMDData();
     if (!fESD) return kFALSE;
+#if 0
     TFile* f = fChainE->GetFile();
     if (f) {
       TObject* o = f->GetStreamerInfoList()->FindObject("AliFMDMap");
@@ -330,7 +340,9 @@ AliFMDInput::Begin(Int_t event)
       }
     }
     // fESD->CheckNeedUShort(fChainE->GetFile());
+#endif
   }
+
   // Possibly load FMD Digit information 
   if (TESTBIT(fTreeMask, kRaw)) {
     // AliInfo("Getting FMD raw data digits");

diff --git a/FMD/AliFMDInput.h b/FMD/AliFMDInput.h
index fb27fc65b64d6b534d39cf7ae946f74095399c27..66978859c11d7a338680c2ba899aa0e3b0678bd5 100644 (file)
--- a/FMD/AliFMDInput.h
+++ b/FMD/AliFMDInput.h
@@ -30,6 +30,9 @@
 #ifndef ROOT_TString
 # include <TString.h>
 #endif
+#ifndef ROOT_TArrayF
+# include <TArrayF.h>
+#endif
 class AliRunLoader;
 class AliLoader;
 class AliStack;