X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSLoader.h;h=fec7377cf3ef67b193fb4e092fe0f6ae4b50a99b;hb=bd8f520e269b288b425382d411bd92777ee4af82;hp=b834709e9219cbba3d07ade4d6aae948d456c75d;hpb=6c8cd88347bda0855157db61e9acccaac1bc7255;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h
index b834709e921..fec7377cf3e 100644
--- a/PHOS/AliPHOSLoader.h
+++ b/PHOS/AliPHOSLoader.h
@@ -26,20 +26,19 @@
 //  another set of RecPoints.
 // 
 //  The objects are retrived from folders.  
-//*-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (RRC KI & SUBATECH)
+//-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (RRC KI & SUBATECH)
 //    
 
 
 // --- ROOT system ---
-#include "TClonesArray.h"
 class TString ;
 class TParticle ;
-class TTask ;
+#include <TClonesArray.h>
+#include <TTree.h>
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
 #include "AliRun.h"
 #include "AliLoader.h"
 #include "AliRunLoader.h"
@@ -53,28 +52,19 @@ class AliPHOSEmcRecPoint ;
 class AliPHOSCpvRecPoint ; 
 class AliPHOSTrackSegment ;
 class AliPHOSRecParticle ;  
-class AliPHOSCalibrationDB ;
 class AliPHOSSDigitizer ; 
 class AliPHOSDigitizer ;
   
-
-
-//
-
 class AliPHOSLoader : public AliLoader {
   
 public:
 
   AliPHOSLoader();
-  AliPHOSLoader(const AliPHOSLoader & obj);
   AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername); 
   AliPHOSLoader(const Char_t *detname,TFolder *topfolder);
   
   virtual ~AliPHOSLoader() ; 
 
-  // assignement operator requested by coding convention, but not needed
-  AliPHOSLoader & operator = (const AliPHOSLoader & ) {return *this;}
-
   Int_t   GetEvent();//extends the method on PHOS RecPart posting
   Int_t   SetEvent();//extends the method on PHOS RecPart posting
   
@@ -102,11 +92,6 @@ public:
   void    CleanTracks()const;
   void    CleanRecParticles();
 
-//up to now it is only here -> no definition about global/incremental tracking/PID
- 
-//   Int_t   WriteRecParticles(Option_t* opt="");//writes the reconstructed particles
-//   Int_t   WritePID(Option_t* opt="");//writes the task for PID to file
-//   Bool_t  PostPID  (AliPHOSPID * pid) const {return kTRUE;}
   
 /*******************************************************************/
 /*******************************************************************/
@@ -124,11 +109,11 @@ public:
 
   static AliPHOSLoader* GetPHOSLoader(const  char* eventfoldername);
 
-  //Method to be used when digitizing under AliRunDigitizer, who opens all files etc.
+  //Method to be used when digitizing under AliDigitizationInput, who opens all files etc.
   Int_t  EventNumber()       { return (Int_t) GetRunLoader()->GetEventNumber();}
   Int_t  MaxEvent()          { return (Int_t) GetRunLoader()->TreeE()->GetEntries();}
 
-  const AliPHOS *         PHOS();
+/*   const AliPHOS *         PHOS(); */
   // Alarms
   // TFolder * Alarms() const { return (TFolder*)(ReturnO("Alarms", 0)); }
   TObjArray *  Alarms() {return 0x0;}  
@@ -162,38 +147,22 @@ public:
   TClonesArray * RecParticles() ;
   const AliPHOSRecParticle * RecParticle(Int_t index);
   void MakeRecParticlesArray();
-
-  /*********************************************/
-  /************    T A S K S      **************/
-  /*********************************************/
-  // 
-  //  AliPHOSSDigitizer*  PHOSSDigitizer(TString name = AliConfig::GetDefaultEventFolderName());
-  //AliPHOSDigitizer*   PHOSDigitizer()  { return  dynamic_cast<AliPHOSDigitizer*>(Digitizer()) ;}
-
-  AliPHOSPID * PID () const {return dynamic_cast<AliPHOSPID*>(PIDTask()) ;}
-  Int_t LoadPID(Option_t * opt="") const {return LoadPIDTask(opt);}
-  Int_t WritePID(Option_t * opt="") const {return WritePIDTask(opt);}
-
-
-  AliPHOSTrackSegmentMaker * TrackSegmentMaker () const { return dynamic_cast<AliPHOSTrackSegmentMaker *>(Tracker()) ;}
-  Int_t LoadTrackSegmentMaker(Option_t * opt="") const {return LoadTracker(opt);}
-  Int_t WriteTrackSegmentMaker(Option_t * opt="") const {return WriteTracker(opt);}
-
   
   void   SetDebug(Int_t level) {fDebug = level;} // Set debug level
   void   SetBranchTitle(const TString& btitle);
 
   Int_t   GetDebug()                     const {return fDebug;      }
   TString GetBranchTitle()               const {return fBranchTitle;}
-  AliPHOSCalibrationDB * CalibrationDB() const {return fcdb;        }
-  void ReadCalibrationDB(const char * name, const char * filename);
   
 protected:
   TString fBranchTitle;            //Title of the branch
-  AliPHOSCalibrationDB * fcdb ;       //!
 
 private:
 
+  // assignement operator requested by coding convention, but not needed
+  AliPHOSLoader(const AliPHOSLoader &);                //Not implemented
+  AliPHOSLoader & operator = (const AliPHOSLoader & ); //Not implemented
+
   Int_t ReadHits();
   Int_t ReadDigits();
   Int_t ReadSDigits();
@@ -202,6 +171,7 @@ private:
   Int_t ReadRecParticles();
   
   Int_t  fDebug ;             // Debug level
+  TClonesArray *fTmpHits;     //! Temporary array of hits per track
 
   static const TString fgkHitsName;//Name for TClonesArray with hits from one event
   static const TString fgkSDigitsName;//Name for TClonesArray 
@@ -217,7 +187,7 @@ private:
   static const TString fgkRecParticlesBranchName;//Name for branch
   
  
-  ClassDef(AliPHOSLoader,3)  // Algorithm class that provides methods to retrieve objects from a list knowing the index 
+  ClassDef(AliPHOSLoader,4)  // Algorithm class that provides methods to retrieve objects from a list knowing the index 
 
 };