Removing obsolete macros

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

diff --git a/ITS/AliITSv5asymm.cxx b/ITS/AliITSv5asymm.cxx
index 66361f48e9c27a5954b1091930e2b233cdf0c41f..eed6e7ea6e8dc5c5d0b90cebfd80455c3443d76d 100644 (file)
--- a/ITS/AliITSv5asymm.cxx
+++ b/ITS/AliITSv5asymm.cxx
@@ -15,6 +15,33 @@
 
 /*
 $Log$
+Revision 1.20  2002/10/22 14:45:47  alibrary
+Introducing Riostream.h
+
+Revision 1.19  2002/10/14 14:57:08  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+
+Revision 1.18.10.2  2002/08/30 15:45:54  alibrary
+Adding geant4vmc support
+
+Revision 1.18.10.1  2002/06/10 17:51:15  hristov
+Merged with v3-08-02
+
+Revision 1.18  2001/05/30 16:15:47  fca
+Correct comparison wiht AliGeant3::Class() introduced. Thanks to I.Hrivnacova
+
+Revision 1.17  2001/05/30 15:55:35  hristov
+Strings compared instead of pointers
+
+Revision 1.16  2001/05/30 14:04:31  hristov
+Dynamic cast replaced (F.Carminati)
+
+Revision 1.15  2001/05/25 06:47:16  hristov
+Bug fix in the creation of the AliITSgeom::fShape entry for SPD. Now there is both a proper shape entry and a default, should there be future changes. This bug was related to fMinorVersion=3 was not antisipated. (B.Nilsen)
+
+Revision 1.14  2001/05/16 14:57:16  alibrary
+New files for folders and Stack
+
 Revision 1.13  2001/05/09 01:00:19  nilsen
 Fixed up a typo in the cout of Init(). Now properly indecates which version
 of code is being used.
@@ -108,8 +135,7 @@ Introduction of the Copyright and cvs Log
 // Created October 7 2000.
 //
 ///////////////////////////////////////////////////////////////////////////////
-#include <iostream.h>
-#include <iomanip.h>
+#include <Riostream.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <TMath.h>
@@ -125,9 +151,7 @@ Introduction of the Copyright and cvs Log
 #include <TBRIK.h>
 #include <TSystem.h>
 
-#include "AliMC.h"
 #include "AliRun.h"
-#include "../TGeant3/TGeant3.h"
 #include "AliITShit.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITS.h"
@@ -653,7 +677,8 @@ void AliITSv5asymm::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(!(dynamic_cast<TGeant3*>(gMC))) {
+//    if(gMC->IsA()!=TGeant3::Class()) {
+    if(strcmp(gMC->GetName(),"TGeant3")) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;
@@ -725,9 +750,16 @@ void AliITSv5asymm::InitAliITSgeom(){
                            if(fMinorVersion==1){
                              fITSgeom->ReSetShape(kSPD,
                                                  new AliITSgeomSPD300());
-                           } else if(fMinorVersion==2)
+                           } else if(fMinorVersion==2){
+                             fITSgeom->ReSetShape(kSPD,
+                                                 new AliITSgeomSPD300());
+                           }else if(fMinorVersion==3){
+                             fITSgeom->ReSetShape(kSPD,
+                                                 new AliITSgeomSPD425Long());
+                           }else{
                              fITSgeom->ReSetShape(kSPD,
                                                  new AliITSgeomSPD300());
+                           } // end if
                    } // end for det
                } // end for k
             } // end for j