More consrvative binning in pt + update in macro

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

diff --git a/ITS/AliITSInitGeometry.h b/ITS/AliITSInitGeometry.h
index ec4a419f85c729aa9059405127d386396cdc1276..6b24e57a9908a2cd182cf3c5dc540e68c67fe2d6 100644 (file)
--- a/ITS/AliITSInitGeometry.h
+++ b/ITS/AliITSInitGeometry.h
@@ -14,13 +14,11 @@ $Id$
 
 #include <TObject.h>
 #include <TString.h>
-#include "AliITSgeom.h"
+
+class AliITSgeom;
 
 typedef enum {
-    kvtest=-1,kvDefault=0,
-    kvSPD02=1,kvSDD03=2,kvSSD03=3,kvITS04=4,
-    kvPPRcourseasymm=6,kvPPRasymmFMD=10,
-    kv11=11,kv11Hybrid=110
+  kvDefault=0,kv11=11
 } AliITSVersion_t;
 
 class TArrayD;
@@ -86,109 +84,16 @@ class AliITSInitGeometry : public TObject{
 
  private:
     // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvtest2(Int_t mod,Int_t &lay,
-                                   Int_t &lad,Int_t &det){
-        lay=mod+1;lad=det=1;};
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvtest2(Int_t &mod,Int_t lay,Int_t cpn0,
-                             Int_t cpn1,Int_t cpn2) const{
-        mod=lay-1;cpn0=cpn1=cpn2=1;};
-    // Given module number, find copy numbers.
-    void RecodeDetectorvtest2(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                             Int_t &cpn2){
-        mod=cpn0=cpn1=cpn2=1;};
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvSPD02(Int_t mod,Int_t &lay,
-                                   Int_t &lad,Int_t &det);
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvSPD02(Int_t &mod,Int_t lay,Int_t cpn0,
-                             Int_t cpn1,Int_t cpn2) const;
-    // Given module number, find copy numbers.
-    void RecodeDetectorvSPD02(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                             Int_t &cpn2);
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvSDD03(Int_t mod,Int_t &lay,
-                                   Int_t &lad,Int_t &det);
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvSDD03(Int_t &mod,Int_t lay,Int_t cpn0,
-                             Int_t cpn1,Int_t cpn2) const;
-    // Given module number, find copy numbers.
-    void RecodeDetectorvSDD03(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                             Int_t &cpn2);
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvSSD03(Int_t mod,Int_t &lay,
-                                   Int_t &lad,Int_t &det);
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvSSD03(Int_t &mod,Int_t lay,Int_t cpn0,
-                             Int_t cpn1,Int_t cpn2) const;
-    // Given module number, find copy numbers.
-    void RecodeDetectorvSSD03(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                             Int_t &cpn2);
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvITS04(Int_t mod,Int_t &lay,
-                                   Int_t &lad,Int_t &det);
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvITS04(Int_t &mod,Int_t lay,Int_t cpn0,
-                             Int_t cpn1,Int_t cpn2) const;
-    // Given module number, find copy numbers.
-    void RecodeDetectorvITS04(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                             Int_t &cpn2);
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvPPRcourseasymm(Int_t mod,Int_t &lay,
-                                   Int_t &lad,Int_t &det){
-        lay=lad=det=mod;/*Dummy*/};
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvPPRcourseasymm(Int_t &mod,Int_t lay,Int_t cpn0,
-                             Int_t cpn1,Int_t cpn2) const{
-        mod=lay=cpn0=cpn1=cpn2;/*Dummy*/};
-    // Given module number, find copy numbers.
-    void RecodeDetectorvPPRcourseasymm(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                             Int_t &cpn2){
-        cpn0=cpn1=cpn2=mod;/*Dummy*/};
-    // Decode module number into old layer, ladder, and detector numbers
-    void DecodeDetectorLayersvPPRasymmFMD(Int_t mod,Int_t &lay,
-                                         Int_t &lad,Int_t &det);
-    // find module number by layer, and copy numbers
-    void DecodeDetectorvPPRasymmFMD(Int_t &mod,Int_t lay,Int_t cpn0,
-                                    Int_t cpn1,Int_t cpn2) const;
-    // Given module number, find copy numbers.
-    void RecodeDetectorvPPRasymmFMD(Int_t mod,Int_t &cpn0,Int_t &cpn1,
-                                    Int_t &cpn2);
-    // 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=cpn0=cpn1=cpn2;};
+    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);
-                  
-    // Virtual MC code reproduction
-    Bool_t InitAliITSgeomSPD02(AliITSgeom *geom);
-    Bool_t InitAliITSgeomSDD03(AliITSgeom *geom);
-    Bool_t InitAliITSgeomSSD03(AliITSgeom *geom);
-    Bool_t InitAliITSgeomITS04(AliITSgeom *geom);
-    Bool_t InitAliITSgeomtest2(AliITSgeom *geom);
-    Bool_t InitAliITSgeomPPRasymmFMD(AliITSgeom *geom);
-    Bool_t InitAliITSgeomV11Hybrid(AliITSgeom *geom);
+                          Int_t &cpn2);                   
+    // Virtual MC code 
     Bool_t InitAliITSgeomV11(AliITSgeom *geom);
-    Bool_t InitGeomShapePPRasymmFMD(AliITSDetector idet,Bool_t *initSeg,
-                                      TArrayD &shapePar,AliITSgeom *geom);
-    Bool_t InitSegmentationPPRasymmFMD(AliITSDetector idet,Bool_t *initSeg,
-                                      TArrayD &shapePar,AliITSgeom *geom);
     Bool_t GetTransformation(const TString &volumePath,TGeoHMatrix &mat);
     Bool_t GetShape(const TString &volumePath,TString &shapeType,TArrayD &par);
     void TransposeTGeoHMatrix(TGeoHMatrix *m) const;