Fixed a bug in asigning detector types in SetDefaults under SSD layer 6.

[u/mrichter/AliRoot.git] / ITS / AliITSvPPRsymm.cxx

diff --git a/ITS/AliITSvPPRsymm.cxx b/ITS/AliITSvPPRsymm.cxx
index 8c98fd26f660ce3bffa5afa3b8344888c13f735b..66d7eafebb5b763ae9cf42d42a2dc82443c43a6a 100644 (file)
--- a/ITS/AliITSvPPRsymm.cxx
+++ b/ITS/AliITSvPPRsymm.cxx
@@ -15,6 +15,21 @@
 
 /*
 $Log$
+Revision 1.29  2001/06/07 14:42:14  barbera
+Both chip and det thicknesses set to [100,300]
+
+Revision 1.28  2001/05/31 19:24:47  barbera
+Default values of SPD detector and chip thickness set to 200 microns as defined by the Technical Board
+
+Revision 1.27  2001/05/30 16:15:47  fca
+Correct comparison wiht AliGeant3::Class() introduced. Thanks to I.Hrivnacova
+
+Revision 1.26  2001/05/30 15:55:35  hristov
+Strings compared instead of pointers
+
+Revision 1.25  2001/05/30 14:04:31  hristov
+Dynamic cast replaced (F.Carminati)
+
 Revision 1.24  2001/05/25 15:59:59  morsch
 Overlaps corrected. (R. Barbera)
 
@@ -196,7 +211,7 @@ Introduction of the Copyright and cvs Log
 #include "AliRun.h"
 #include "AliMagF.h"
 #include "AliConst.h"
-#include "../TGeant3/TGeant3.h"
+#include "AliGeant3.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITShit.h"
 #include "AliITS.h"
@@ -381,7 +396,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   Float_t ddet2=300.;     // total detector thickness on layer 2 (micron)                         
   Float_t dchip2=300.;    // total chip thickness on layer 2 (micron)
   
-  Float_t dbus=200.;      // total bus thickness on both layers (micron)
+  Float_t dbus=300.;      // total bus thickness on both layers (micron)
 
   ddet1 = GetThicknessDet1();
   ddet2 = GetThicknessDet2();
@@ -400,14 +415,14 @@ void AliITSvPPRsymm::CreateGeometry(){
          ddet2=300.;
   }
   
-  if(dchip1 < 150. || dchip1 > 300.) {
-     cout << "ITS - WARNING: the chip thickness for layer 1 is outside the range of [150,300] microns."
+  if(dchip1 < 100. || dchip1 > 300.) {
+     cout << "ITS - WARNING: the chip thickness for layer 1 is outside the range of [100,300] microns."
          " The default value of 300 microns will be used." << endl;
          dchip1=300.;
   }
   
-  if(dchip2 < 150. || dchip2 > 300.) {
-     cout << "ITS - WARNING: the chip thickness for layer 2 is outside the range of [150,300] microns."
+  if(dchip2 < 100. || dchip2 > 300.) {
+     cout << "ITS - WARNING: the chip thickness for layer 2 is outside the range of [100,300] microns."
          " The default value of 300 microns will be used." << endl;
          dchip2=300.;
   }      
@@ -4709,7 +4724,7 @@ void AliITSvPPRsymm::InitAliITSgeom(){
 //     Based on the geometry tree defined in Geant 3.21, this
 // routine initilizes the Class AliITSgeom from the Geant 3.21 ITS geometry
 // sturture.
-    if(gMC->IsA()!=TGeant3::Class()) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;
@@ -4830,9 +4845,9 @@ void AliITSvPPRsymm::InitAliITSgeom(){
                                          new AliITSgeomSSD275and75(npar,par));
                            break;
                        case 6:
-                           fITSgeom->CreatMatrix(mod,lay,lad,det,kSSDp,t,r);
-                           if(!(fITSgeom->IsShapeDefined(kSSDp))) 
-                               fITSgeom->ReSetShape(kSSDp,
+                           fITSgeom->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
+                           if(!(fITSgeom->IsShapeDefined(kSSD))) 
+                               fITSgeom->ReSetShape(kSSD,
                                           new AliITSgeomSSD75and275(npar,par));
                            break;
                        } // end switch