Modify strip unit geometry according to the final drawings (Timur)

diff --git a/PHOS/AliPHOSEMCAGeometry.cxx b/PHOS/AliPHOSEMCAGeometry.cxx
index c8b0c579dcb2aaf46acca214ee5da7d6262664a8..c8cb891d9035b1a57bb897647acb764886e455fb 100644 (file)
--- a/PHOS/AliPHOSEMCAGeometry.cxx
+++ b/PHOS/AliPHOSEMCAGeometry.cxx
@@ -124,7 +124,7 @@ AliPHOSEMCAGeometry::AliPHOSEMCAGeometry():
   fStripWallWidthOut = 0.01 ;  // Side to another strip  
   fStripWallWidthIn  = 0.02 ;  // Side betveen crystals in one strip
 
-  fTyvecThickness = 0.01 ;     //Thickness of the tyvec
+  fTyvecThickness = 0.0175 ;     //Thickness of the tyvec
 
   fAirGapLed = 1.5 - 2 * fPreampHalfSize[1] - 2 * fPinDiodeHalfSize[1] ; // Air gap before crystalls for LED system
                                            // Note, that Cell in Strip 1.5 longer then crystall
@@ -135,24 +135,25 @@ AliPHOSEMCAGeometry::AliPHOSEMCAGeometry():
   fWrappedHalfSize[1] = fCrystalHalfSize[1] ;                             //wrapped into tyvec
   fWrappedHalfSize[2] = (2*fTyvecThickness + 2*fCrystalHalfSize[2])/2 ;   //
 
-  fAirCellHalfSize[0] = fWrappedHalfSize[0] ;                     //This is HALF-size of one cell
-  fAirCellHalfSize[1] = (fAirGapLed + 2*fPreampHalfSize[1] + 
-                         2*fPinDiodeHalfSize[1] + 2*fWrappedHalfSize[1])/2 ;  //in strip
-  fAirCellHalfSize[2] = fWrappedHalfSize[2]  ;                    //
-
-  fSupportPlateHalfSize[0] = ( (fNCellsXInStrip-1)*fStripWallWidthIn + 2*fStripWallWidthOut + 
-                              fNCellsXInStrip * (2*fTyvecThickness + 2*fCrystalHalfSize[0]) )/2 ;
-  fSupportPlateHalfSize[1] =  6.0  /2 ;
-  fSupportPlateHalfSize[2] = ( (fNCellsZInStrip-1)*fStripWallWidthIn + 2*fStripWallWidthOut +
-                              fNCellsZInStrip * (2*fTyvecThickness + 2*fCrystalHalfSize[2]) )/2;
-
+  fSteelCellHalfSize[0] = fWrappedHalfSize[0] + 0.01;
+  fSteelCellHalfSize[1] = (fAirGapLed + 2*fPreampHalfSize[1] + 
+                       2*fPinDiodeHalfSize[1] + 2*fWrappedHalfSize[1])/2 ;  //in strip
+  fSteelCellHalfSize[2] = fWrappedHalfSize[2] + 0.01;
+
+  //  fSupportPlateHalfSize[0] = ( (fNCellsXInStrip-1)*fStripWallWidthIn + 2*fStripWallWidthOut + 
+  //                          fNCellsXInStrip * (2*fTyvecThickness + 2*fCrystalHalfSize[0]) )/2 ;
+  fSupportPlateHalfSize[0] = 18.04  /2 ;
+  fSupportPlateHalfSize[1] =   6.0  /2 ;
+//  fSupportPlateHalfSize[2] = ( (fNCellsZInStrip-1)*fStripWallWidthIn + 2*fStripWallWidthOut +
+//                            fNCellsZInStrip * (2*fTyvecThickness + 2*fCrystalHalfSize[2]) )/2;
+  fSupportPlateHalfSize[2] =  4.51  /2 ;
   fSupportPlateThickness = 0.3 ;  
   fSupportPlateInHalfSize[0] = fSupportPlateHalfSize[0] ;                         //Half-sizes of the air
   fSupportPlateInHalfSize[1] = fSupportPlateHalfSize[1]-fSupportPlateThickness ;  //box in the support plate
   fSupportPlateInHalfSize[2] = fSupportPlateHalfSize[2]-fSupportPlateThickness/2 ;
 
   fStripHalfSize[0]= fSupportPlateHalfSize[0] ;  
-  fStripHalfSize[1]= ( 2*fSupportPlateHalfSize[1] + 2*fAirCellHalfSize[1] )/2;      
+  fStripHalfSize[1]= ( 2*fSupportPlateHalfSize[1] + 2*fSteelCellHalfSize[1] )/2;      
   fStripHalfSize[2]= fSupportPlateHalfSize[2] ;
 
   // ------- Inner hermoinsulation ---------------

diff --git a/PHOS/AliPHOSEMCAGeometry.h b/PHOS/AliPHOSEMCAGeometry.h
index 94145c11b38390b6ab6c57437f397645d98f1e79..675c6d4d34fcb86121a6cfdaa93c9cc1af745660 100644 (file)
--- a/PHOS/AliPHOSEMCAGeometry.h
+++ b/PHOS/AliPHOSEMCAGeometry.h
@@ -30,7 +30,7 @@ public:
 
   Float_t * GetStripHalfSize() {return fStripHalfSize ;}
   Float_t   GetStripWallWidthOut() const {return fStripWallWidthOut ;}
-  Float_t * GetAirCellHalfSize() {return fAirCellHalfSize ;}
+  Float_t * GetSteelCellHalfSize() {return fSteelCellHalfSize ;}
   Float_t * GetWrappedHalfSize() {return fWrappedHalfSize ;}
   Float_t   GetAirGapLed() const {return fAirGapLed ;}
   Float_t * GetCrystalHalfSize() {return fCrystalHalfSize ;}
@@ -86,7 +86,7 @@ public:
 private:
 
   Float_t fStripHalfSize[3]   ;        // Strip unit size/2
-  Float_t fAirCellHalfSize[3] ;        // geometry parameter
+  Float_t fSteelCellHalfSize[3] ;        // geometry parameter
   Float_t fWrappedHalfSize[3] ;        // geometry parameter
   Float_t fSupportPlateHalfSize[3] ;   // geometry parameter
   Float_t fSupportPlateInHalfSize[3] ; // geometry parameter

diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h
index 98e1b9a38356825a98f5239af958bb8af5335f26..d5e9951dd376367083e235162fbe8e6e2db9a500 100644 (file)
--- a/PHOS/AliPHOSGeometry.h
+++ b/PHOS/AliPHOSGeometry.h
@@ -93,8 +93,7 @@ public:
   Float_t  GetIPtoUpperCPVsurface(void)         const { return fIPtoUpperCPVsurface ; }
   Float_t  GetOuterBoxSize(Int_t index)         const { return 2.*fPHOSParams[index]; }
   Float_t  GetCrystalSize(Int_t index)          const { return fGeometryEMCA->GetCrystalSize(index) ;  }
-  Float_t  GetCellStep(void)                    const { return 2*(fGeometryEMCA->GetAirCellHalfSize()[0] + 
-                                                                 fGeometryEMCA->GetStripWallWidthOut()) ;}
+  Float_t  GetCellStep(void)                    const { return 2.*fGeometryEMCA->GetSteelCellHalfSize()[0];}
 
   Float_t GetModuleCenter(Int_t module, Int_t axis) const {
     return fModuleCenter[module][axis];}

diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx
index 6fec1b3c148424059e7f48e47c2517485fbee5a1..db877858934d1d5333afde34127fc0e8917bea88 100644 (file)
--- a/PHOS/AliPHOSv0.cxx
+++ b/PHOS/AliPHOSv0.cxx
@@ -17,6 +17,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.87  2007/04/01 07:37:10  kharlov
+ * TGeo RS to Local RS transf matr added
+ *
  * Revision 1.86  2007/03/06 06:55:46  kharlov
  * DP:Misalignment of CPV added
  *
@@ -406,10 +409,10 @@ void AliPHOSv0::CreateGeometryforEMC()
 
   gMC->Gsvolu("PSTR", "BOX ", idtmed[716], emcg->GetStripHalfSize(), 3) ;  //Made of stell
    
-      // --- define air volume (cell of the honeycomb)
-      gMC->Gsvolu("PCEL", "BOX ", idtmed[798], emcg->GetAirCellHalfSize(), 3);
+      // --- define steel volume (cell of the strip unit)
+      gMC->Gsvolu("PCEL", "BOX ", idtmed[716], emcg->GetSteelCellHalfSize(), 3);
 
-      // --- define wrapped crystal and put it into AirCell
+      // --- define wrapped crystal and put it into steel cell
 
       gMC->Gsvolu("PWRA", "BOX ", idtmed[702], emcg->GetWrappedHalfSize(), 3);
       Float_t * pin = emcg->GetAPDHalfSize() ; 
@@ -417,7 +420,7 @@ void AliPHOSv0::CreateGeometryforEMC()
       Float_t y = (emcg->GetAirGapLed()-2*pin[1]-2*preamp[1])/2;
       gMC->Gspos("PWRA", 1, "PCEL", 0.0, y, 0.0, 0, "ONLY") ;
     
-      // --- Define crystall and put it into wrapped crystall ---
+      // --- Define crystal and put it into wrapped crystall ---
       gMC->Gsvolu("PXTL", "BOX ", idtmed[699], emcg->GetCrystalHalfSize(), 3) ;
       gMC->Gspos("PXTL", 1, "PWRA", 0.0, 0.0, 0.0, 0, "ONLY") ;
       
@@ -434,11 +437,11 @@ void AliPHOSv0::CreateGeometryforEMC()
       gMC->Gspos("PREA", 1, "PCEL", 0.0, y, 0.0, 0, "ONLY") ;                    // to ceramics?
    
 
-      // --- Fill strip with wrapped cristalls in Air Cells
+      // --- Fill strip with wrapped cristals in steel cells
 
       Float_t* splate = emcg->GetSupportPlateHalfSize();  
       y = -splate[1] ;
-      Float_t* acel = emcg->GetAirCellHalfSize() ;
+      Float_t* acel = emcg->GetSteelCellHalfSize() ;
 
       for(Int_t lev = 2, icel = 1; icel <= emcg->GetNCellsXInStrip()*emcg->GetNCellsZInStrip(); icel += 2, lev += 2){
          Float_t x = (2*(lev / 2) - 1 - emcg->GetNCellsXInStrip())* acel[0] ;