Fix for loading selected branches in PROOF (Christian Holm)

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

diff --git a/ITS/AliITSInitGeometry.h b/ITS/AliITSInitGeometry.h
index 64972694e15c1f04a2421a38ea038716ed93dc29..6b24e57a9908a2cd182cf3c5dc540e68c67fe2d6 100644 (file)
--- a/ITS/AliITSInitGeometry.h
+++ b/ITS/AliITSInitGeometry.h
@@ -14,10 +14,11 @@ $Id$
 
 #include <TObject.h>
 #include <TString.h>
-#include "AliITSgeom.h"
+
+class AliITSgeom;
 
 typedef enum {
-  kvDefault=0,kv11=11,kv11Hybrid=110
+  kvDefault=0,kv11=11
 } AliITSVersion_t;
 
 class TArrayD;
@@ -84,28 +85,14 @@ class AliITSInitGeometry : public TObject{
  private:
     // Decode module number into old layer, ladder, and detector numbers
     void DecodeDetectorLayersv11(Int_t mod,Int_t &lay,
-                                         Int_t &lad,Int_t &det)const{
-        lay=lad=det=mod;};
+                                Int_t &lad,Int_t &det);
     // find module number by layer, and copy numbers
-    void DecodeDetectorv11(Int_t &mod,Int_t lay,Int_t /* cpn0 */,
-                           Int_t /* cpn1 */,Int_t /* cpn2 */) const{
-        mod=lay;};
+    void DecodeDetectorv11(Int_t &mod,Int_t lay,Int_t cpn0,Int_t cpn1,
+                          Int_t cpn2)const;
     // Given module number, find copy numbers.
     void RecodeDetectorv11(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                                    Int_t &cpn2)const{
-        cpn0=cpn1=cpn2=mod;};
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorv11Hybrid(Int_t &mod,Int_t lay,Int_t cpn0,Int_t cpn1,
-                                 Int_t cpn2)const;
-    // find module number by layer, and copy numbers
-    void RecodeDetectorv11Hybrid(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                                    Int_t &cpn2);
-    // Given module number, find copy numbers.
-    void DecodeDetectorLayersv11Hybrid(Int_t mod,Int_t &lay,Int_t &lad,
-                                    Int_t &det);
-                  
+                          Int_t &cpn2);                   
     // Virtual MC code 
-    Bool_t InitAliITSgeomV11Hybrid(AliITSgeom *geom);
     Bool_t InitAliITSgeomV11(AliITSgeom *geom);
     Bool_t GetTransformation(const TString &volumePath,TGeoHMatrix &mat);
     Bool_t GetShape(const TString &volumePath,TString &shapeType,TArrayD &par);