Radiator to Pad goes static.

diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx
index 9008e4dd02a7ac2c7d9ebba6054589b2cc094c8c..1336c9edfec8c3cf67455e573ed9ef5d44e094fb 100644 (file)
--- a/RICH/AliRICH.cxx
+++ b/RICH/AliRICH.cxx
@@ -716,9 +716,6 @@ void AliRICH::Print(Option_t *option)const
 void AliRICH::CreateGeometry()
 {//Creates detailed geometry simulation (currently GEANT volumes tree)         
   if(GetDebug())Info("CreateGeometry","Start.");
-//???????? to be removed to AliRICHParam?
-  Param()->RadiatorToPads(Param()->FreonThickness()/2+Param()->QuartzThickness()+Param()->GapThickness());
-    
 //Opaque quartz thickness
   Float_t oqua_thickness = .5;
 //CsI dimensions

diff --git a/RICH/AliRICHParam.cxx b/RICH/AliRICHParam.cxx
index 30f5078c57f0cfa5d8d590b3eeaa0a745ab51f54..db0f04a53a7f24b5201398045bb98eec1537f776 100644 (file)
--- a/RICH/AliRICHParam.cxx
+++ b/RICH/AliRICHParam.cxx
@@ -28,17 +28,13 @@ fCurrentPadX(0),fCurrentPadY(0),fCurrentWire(0),
 fSizeZ(0),
 fAngleRot(0),fAngleYZ(0),fAngleXY(0),
 fOffset(0),
-fGapThickness(0),
 fProximityGapThickness(0),
 fQuartzLength(0),
 fQuartzWidth(0),
-fQuartzThickness(0),
 fOuterFreonLength(0),
 fOuterFreonWidth(0),
 fInnerFreonLength(0),
 fInnerFreonWidth(0),
-fFreonThickness(0),
-fRadiatorToPads(0),
 fChargeSlope(0),
 fChargeSpreadX(0),
 fChargeSpreadY(0),
@@ -53,17 +49,13 @@ fVoltage(0)
   AngleRot             (-60);                         //rotation of the whole RICH around Z, deg
   Angles               (20,19.5);                     //XY angle, YZ angle  deg  
   Offset               (490*kcm+1.267*kcm);           //1.267???????cm distance from IP to the center of module 
-  GapThickness         (8*kcm);              
   ProximityGapThickness(0.4*kcm);            
   QuartzLength         (133*kcm);            
   QuartzWidth          (127.9*kcm);          
-  QuartzThickness      (0.5*kcm);            
   OuterFreonLength     (133*kcm);            
   OuterFreonWidth      (41.3*kcm);           
   InnerFreonLength     (133*kcm);            
   InnerFreonWidth      (41.3*kcm);           
-  FreonThickness       (1.5*kcm);            
-  RadiatorToPads       (80*kmm);                 
   
   ChargeSlope(27.);
   ChargeSpreadX(0.18);ChargeSpreadY(0.18);

diff --git a/RICH/AliRICHParam.h b/RICH/AliRICHParam.h
index 9c1f3960b358a134ce06015776acb66a4da4d87f..82000e8b7ac122b45a1677be084d07651d7024a2 100644 (file)
--- a/RICH/AliRICHParam.h
+++ b/RICH/AliRICHParam.h
@@ -52,16 +52,14 @@ public:
   Float_t AngleXY()                     const{return fAngleXY*kD2r;} 
   void    AngleRot(Float_t angle)            {       fAngleRot=angle;}
   Float_t AngleRot()                    const{return fAngleRot*kD2r;}                
-  void    GapThickness(Float_t a)            {       fGapThickness=a;}    
-  Float_t GapThickness()                const{return fGapThickness;}      
+  static Float_t GapThickness()              {return 8.0;}      
   void    ProximityGapThickness(Float_t a)   {       fProximityGapThickness=a;}
   Float_t ProximityGapThickness()       const{return fProximityGapThickness;}    
   void    QuartzLength(Float_t a)            {       fQuartzLength=a;}
   Float_t QuartzLength()                const{return fQuartzLength;}   
   void    QuartzWidth(Float_t a)             {       fQuartzWidth=a;}
   Float_t QuartzWidth()                 const{return fQuartzWidth;}
-  void    QuartzThickness(Float_t a)         {       fQuartzThickness=a;}
-  Float_t QuartzThickness()             const{return fQuartzThickness;}   
+  static Float_t QuartzThickness()           {return 0.5;}   
   void    OuterFreonLength(Float_t a)        {       fOuterFreonLength=a;}
   Float_t OuterFreonLength()            const{return fOuterFreonLength;}   
   void    OuterFreonWidth(Float_t a)         {       fOuterFreonWidth=a;}
@@ -70,10 +68,8 @@ public:
   Float_t InnerFreonLength()            const{return fInnerFreonLength;}   
   void    InnerFreonWidth(Float_t a)         {       fInnerFreonWidth=a;}
   Float_t InnerFreonWidth()             const{return fInnerFreonWidth;}   
-  void    FreonThickness(Float_t a)          {       fFreonThickness=a;}
-  Float_t FreonThickness()              const{return fFreonThickness;}   
-  void    RadiatorToPads(Float_t a)          {       fRadiatorToPads=a;}
-  Float_t RadiatorToPads()              const{return fRadiatorToPads;}   
+  static  Float_t FreonThickness()           {return 1.5;}   
+  static  Float_t RadiatorToPads()           {return FreonThickness()+QuartzThickness()+GapThickness();}   
         
   void    SigmaIntegration(Float_t a)        {       fSigmaIntegration=a;}    
   Float_t SigmaIntegration()            const{return fSigmaIntegration;}    
@@ -113,13 +109,10 @@ protected:
   Float_t fAngleYZ;                                                               //angle between chambers YZ plane, deg
   Float_t fAngleXY;                                                               //angle between chambers XY plane, deg
   Float_t fOffset;                                                                //chambers offset from IP, cm   
-  Float_t fGapThickness;                                                          //gap thickness, cm
   Float_t fProximityGapThickness;                                                 //proximity gap thickness, cm
-  Float_t fQuartzLength;     Float_t fQuartzWidth;     Float_t fQuartzThickness;  //quartz window size, cm
+  Float_t fQuartzLength;     Float_t fQuartzWidth;                                //quartz window size, cm
   Float_t fOuterFreonLength; Float_t fOuterFreonWidth;                            //freon box outer size, cm
   Float_t fInnerFreonLength; Float_t fInnerFreonWidth;                            //freon box inner size, cm
-  Float_t fFreonThickness;                                                        //freon thickness
-  Float_t fRadiatorToPads;                                                        //distance from radiator to pads, cm
   
   Float_t fChargeSlope;              //Slope of the charge distribution
   Float_t fChargeSpreadX;            //Width of the charge distribution in x