X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSLoader.h;h=f4a714ba799918ba7265d584530a8905b640e589;hb=08b801a6de165ef29fb388dc4fc9c0516b7b9486;hp=f9c0c106e9a1640ffeb7d7634fa920542c9f62b6;hpb=e62c1aea50441c3bce7508f78f3056faf7f91fa5;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSLoader.h b/ITS/AliITSLoader.h
index f9c0c106e9a..f4a714ba799 100644
--- a/ITS/AliITSLoader.h
+++ b/ITS/AliITSLoader.h
@@ -5,8 +5,8 @@
 //////////////////////////////////////////////////////////
 #include <AliLoader.h>
 #include <AliESDVertex.h>
-#include <AliITSgeom.h>
-#include <AliITSpidESD.h>
+#include "AliITSgeom.h"
+class AliITSpidESD;
 class AliITSdigit;
 class TObjArray;
 
@@ -15,9 +15,6 @@ class AliITSLoader: public AliLoader{
     AliITSLoader();
     AliITSLoader(const Char_t *name,const Char_t *topfoldername);
     AliITSLoader(const Char_t *name,TFolder *topfolder);
-    AliITSLoader(const AliITSLoader &ob); // copy constructor
-    AliITSLoader& operator=(const AliITSLoader & /* source */); // ass.
-
 
     virtual ~AliITSLoader();
 
@@ -109,13 +106,22 @@ class AliITSLoader: public AliLoader{
     virtual Int_t  WriteBackTracks(Option_t* opt=""){
         return GetBackTracksDataLoader()->GetBaseLoader(0)->WriteData(opt);}
 
-    // Geometry
-    AliITSgeom* GetITSgeom();
-    // PID
-    AliITSpidESD* GetITSpid() const {return fITSpid;}
-    void  AdoptITSpid(AliITSpidESD* pid) {fITSpid=pid;}
+    // Geometry. Geom is read from file, unless already loaded
+    // readout from file can be forced if force=kTRUE
+    AliITSgeom* GetITSgeom(Bool_t force=kFALSE); 
+    void SetITSgeom(AliITSgeom* g);
+    //
+    static const TString& GetDefaultRawClustersContainerName();
+    static const TString& GetDefaultBackTracksContainerName();
+    static const TString& GetDefaultVerticesContainerName();
+    static const TString& GetDefaultV0ContainerName();
+    static const TString& GetDefaultCascadeContainerName();
+    //
   protected:
 
+    AliITSLoader(const AliITSLoader &ob); // copy constructor
+    AliITSLoader& operator=(const AliITSLoader & /* source */); // ass.
+
     // METHODS
     virtual void   MakeRawClustersContainer() {GetRawClLoader()->MakeTree();}
     Int_t          PostRawClusters(){
@@ -133,14 +139,10 @@ class AliITSLoader: public AliLoader{
     Int_t          PostCascades(){
         return GetCascadeDataLoader()->GetBaseLoader(0)->Post();}
 
-    // DATA
-    static const TString fgkDefaultRawClustersContainerName;  //default for Raw Clusters container name
-    static const TString fgkDefaultBackTracksContainerName;   //default for Back propag. tracks container name
-    static const TString fgkDefaultVerticesContainerName;     //default for primary vertices container name
-    static const TString fgkDefaultV0ContainerName;           //default for V0 container name
-    static const TString fgkDefaultCascadeContainerName;      //default fo cascade container name
-    AliITSpidESD* fITSpid; //!pointer for ITS pid
-    ClassDef(AliITSLoader,4) // Loader for additional ITS specific trees.
+    AliITSgeom *fGeom;     //! pointer to the ITS geometry class
+
+
+    ClassDef(AliITSLoader,6) // Loader for additional ITS specific trees.
 };
  
 #endif