Merging the VirtualMC branch to the main development branch (HEAD)

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

diff --git a/ITS/AliITSvtest.cxx b/ITS/AliITSvtest.cxx
index 2b8469f02b79cfad802f34ae6b26e58287fd3d8a..8f2e9e3f281d628bbac817ac77c25b39673a6e68 100644 (file)
--- a/ITS/AliITSvtest.cxx
+++ b/ITS/AliITSvtest.cxx
@@ -15,6 +15,19 @@
 
 /*
 $Log$
+Revision 1.13.8.2  2002/08/30 15:45:56  alibrary
+Adding geant4vmc support
+
+Revision 1.13.8.1  2002/06/10 17:51:17  hristov
+Merged with v3-08-02
+
+Revision 1.13  2001/10/01 19:34:09  nilsen
+Fixed a bug in asigning detector types in SetDefaults under SSD layer 6.
+
+Revision 1.12  2001/08/24 21:04:36  nilsen
+Added some include files. Needed due to new forward declorations in other
+files
+
 Revision 1.11  2001/05/30 16:15:47  fca
 Correct comparison wiht AliGeant3::Class() introduced. Thanks to I.Hrivnacova
 
@@ -103,7 +116,6 @@ $Id$
 
 #include "AliMC.h"
 #include "AliRun.h"
-#include "AliGeant3.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITShit.h"
 #include "AliITS.h"
@@ -249,7 +261,8 @@ void AliITSvtest::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()!=AliGeant3::Class()) {
+//    if(gMC->IsA()!=TGeant3::Class()) {
+  if(strcmp(gMC->GetName(),"TGeant3")) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;
@@ -347,9 +360,9 @@ void AliITSvtest::InitAliITSgeom(){
                                fITSgeom->ReSetShape(kSSD,new AliITSgeomSSD275and75());
                            break;
                        case 6:
-                           fITSgeom->CreatMatrix(mod,lay,lad,det,kSSDp,t,r);
-                           if(!(fITSgeom->IsShapeDefined(kSSDp))) 
-                               fITSgeom->ReSetShape(kSSDp,new AliITSgeomSSD75and275());
+                           fITSgeom->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
+                           if(!(fITSgeom->IsShapeDefined(kSSD))) 
+                               fITSgeom->ReSetShape(kSSD,new AliITSgeomSSD75and275());
                            break;
                        } // end switch
                } // end for det