Revert "Revert "#103626: Commit DCal geometry to master" since the files are broken."

[u/mrichter/AliRoot.git] / ITS / AliITSLoader.h

diff --git a/ITS/AliITSLoader.h b/ITS/AliITSLoader.h
index e718bf87c941ba5da0f1196c5a230a6040ad9957..f4a714ba799918ba7265d584530a8905b640e589 100644 (file)
--- 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();
 
@@ -113,11 +110,18 @@ class AliITSLoader: public AliLoader{
     // readout from file can be forced if force=kTRUE
     AliITSgeom* GetITSgeom(Bool_t force=kFALSE); 
     void SetITSgeom(AliITSgeom* g);
-    // PID
-    AliITSpidESD* GetITSpid() const {return fITSpid;}
-    void  AdoptITSpid(AliITSpidESD* pid) {fITSpid=pid;}
+    //
+    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(){
@@ -135,15 +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
     AliITSgeom *fGeom;     //! pointer to the ITS geometry class
-    ClassDef(AliITSLoader,5) // Loader for additional ITS specific trees.
+
+
+    ClassDef(AliITSLoader,6) // Loader for additional ITS specific trees.
 };
  
 #endif