X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSInitGeometry.h;h=683416836e3c9e3a362c777e33661e83f5944cb0;hb=391e140629a3413d325391f893da4c1ddf0af897;hp=8854ae747f978146394eef526aaddd73146964b1;hpb=f736d2354f2cb971010c740c1cc99af106053154;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSInitGeometry.h b/ITS/AliITSInitGeometry.h index 8854ae747f9..683416836e3 100644 --- a/ITS/AliITSInitGeometry.h +++ b/ITS/AliITSInitGeometry.h @@ -17,10 +17,7 @@ $Id$ #include "AliITSgeom.h" 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,kv11Hybrid=110 } AliITSVersion_t; class TArrayD; @@ -86,86 +83,14 @@ 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) const { - 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) const { - 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) const; - // 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) const; - // Decode module number into old layer, ladder, and detector numbers - void DecodeDetectorLayersvSDD03(Int_t mod,Int_t &lay, - Int_t &lad,Int_t &det) const; - // 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) const; - // Decode module number into old layer, ladder, and detector numbers - void DecodeDetectorLayersvSSD03(Int_t mod,Int_t &lay, - Int_t &lad,Int_t &det) const; - // 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) const; - // Decode module number into old layer, ladder, and detector numbers - void DecodeDetectorLayersvITS04(Int_t mod,Int_t &lay, - Int_t &lad,Int_t &det) const; - // 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) const; - // Decode module number into old layer, ladder, and detector numbers - void DecodeDetectorLayersvPPRcourseasymm(Int_t mod,Int_t &lay, - Int_t &lad,Int_t &det) const { - 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) const { - 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;}; + Int_t &cpn2); // 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; @@ -176,19 +101,9 @@ class AliITSInitGeometry : public TObject{ 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) const; - Bool_t InitAliITSgeomtest2(AliITSgeom *geom); - Bool_t InitAliITSgeomPPRasymmFMD(AliITSgeom *geom); + // Virtual MC code Bool_t InitAliITSgeomV11Hybrid(AliITSgeom *geom); 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;