X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FUPGRADE%2FAliITSUv11.h;h=c3cce858e514bc7630fa7712769a167dbb4dc64a;hb=e7c0d8c7abe4d140d7456c13f2bd34b616be2bcd;hp=f2f80b995c069c91de0c9b0683873e5299402f5d;hpb=4f976c0812ff5311a2dc3b9ca3688f2cf0c2205a;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/UPGRADE/AliITSUv11.h b/ITS/UPGRADE/AliITSUv11.h index f2f80b995c0..c3cce858e51 100644 --- a/ITS/UPGRADE/AliITSUv11.h +++ b/ITS/UPGRADE/AliITSUv11.h @@ -31,39 +31,29 @@ class AliITSUv11 : public AliITSU { virtual void AddAlignableVolumes() const; virtual void CreateGeometry(); virtual void CreateMaterials(); - virtual void DefineLayer(const Int_t nlay, const Double_t r, - const Double_t zlen, const Int_t nladd, - const Int_t nmod, const Double_t lthick = 0., - const Double_t dthick = 0., - const UInt_t detType=0); - virtual void DefineLayerTurbo(const Int_t nlay, const Double_t r, - const Double_t zlen, const Int_t nladd, - const Int_t nmod, const Double_t width, - const Double_t tilt, - const Double_t lthick = 0., - const Double_t dthick = 0., - const UInt_t detType=0); - virtual void GetLayerParameters(const Int_t nlay, - Double_t &r, Double_t &zlen, + virtual void DefineLayer(Int_t nlay,Double_t phi0,Double_t r,Double_t zlen,Int_t nladd, + Int_t nmod, Double_t lthick=0.,Double_t dthick=0.,UInt_t detType=0); + virtual void DefineLayerTurbo(Int_t nlay,Double_t phi0,Double_t r,Double_t zlen,Int_t nladd, + Int_t nmod,Double_t width,Double_t tilt, + Double_t lthick = 0.,Double_t dthick = 0.,UInt_t detType=0); + virtual void GetLayerParameters(Int_t nlay, Double_t &phi0,Double_t &r, Double_t &zlen, Int_t &nladd, Int_t &nmod, Double_t &width, Double_t &tilt, - Double_t <hick, Double_t &mthick); + Double_t <hick, Double_t &mthick) const; virtual void Init(); - virtual Bool_t IsLayerTurbo(const Int_t nlay); - virtual Int_t IsVersion() const { return 20;} // vUpgrade ? do we need this + virtual Bool_t IsLayerTurbo(Int_t nlay); + virtual Int_t IsVersion() const { return 20;} // vUpgrade ? do we need this virtual void SetDefaults(); virtual void StepManager(); virtual void SetLayerDetTypeID(Int_t lr, UInt_t id); virtual Int_t GetLayerDetTypeID(Int_t lr); // - protected: - void SetT2Lmatrix(Int_t uid, Double_t yShift,Bool_t yFlip, Bool_t yRot180=kFALSE) const; // Set T2L matrix in TGeoPNEntries - private: AliITSUv11(const AliITSUv11 &source); // copy constructor AliITSUv11& operator=(const AliITSUv11 &source); // assignment operator // Bool_t *fLayTurbo; // True for "turbo" layers + Double_t *fLayPhi0; // Vector of layer's 1st ladder phi in lab Double_t *fLayRadii; // Vector of layer radii Double_t *fLayZLength; // Vector of layer length along Z Int_t *fLaddPerLay; // Vector of number of ladders per layer