Correct comparison wiht AliGeant3::Class() introduced. Thanks to I.Hrivnacova

diff --git a/ITS/AliITSv5.cxx b/ITS/AliITSv5.cxx
index b030fa6583042dda3b0a7bcb792a370ef2aa29a4..a8588bdbfcb470389a62dd79affb88cff05d981e 100644 (file)
--- a/ITS/AliITSv5.cxx
+++ b/ITS/AliITSv5.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.34  2001/05/30 15:55:35  hristov
+Strings compared instead of pointers
+
 Revision 1.33  2001/05/30 14:04:31  hristov
 Dynamic cast replaced (F.Carminati)
 
@@ -111,7 +114,7 @@ Introduction of the Copyright and cvs Log
 
 #include "AliMC.h"
 #include "AliRun.h"
-#include "../TGeant3/TGeant3.h"
+#include "AliGeant3.h"
 #include "AliITShit.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITS.h"
@@ -640,7 +643,7 @@ void AliITSv5::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(strcmp(gMC->GetName(),"TGeant3")) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;

diff --git a/ITS/AliITSv5asymm.cxx b/ITS/AliITSv5asymm.cxx
index 92ccd97d0d607e7d8fcbf7189365e9fa2a9a0305..9df005409826764f945648837afd4f142b2d4ad7 100644 (file)
--- a/ITS/AliITSv5asymm.cxx
+++ b/ITS/AliITSv5asymm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+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)
 
@@ -136,7 +139,7 @@ Introduction of the Copyright and cvs Log
 
 #include "AliMC.h"
 #include "AliRun.h"
-#include "../TGeant3/TGeant3.h"
+#include "AliGeant3.h"
 #include "AliITShit.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITS.h"
@@ -662,7 +665,7 @@ 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(strcmp(gMC->GetName(),"TGeant3")) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;

diff --git a/ITS/AliITSv5symm.cxx b/ITS/AliITSv5symm.cxx
index ba2dadbc21003b28c3ec97149b3ac3fbb610fbfe..fb55d851f0638b809c22fa5f3886e540c4a5fced 100644 (file)
--- a/ITS/AliITSv5symm.cxx
+++ b/ITS/AliITSv5symm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  2001/05/30 15:55:35  hristov
+Strings compared instead of pointers
+
 Revision 1.11  2001/05/30 14:04:31  hristov
 Dynamic cast replaced (F.Carminati)
 
@@ -120,7 +123,7 @@ Introduction of the Copyright and cvs Log
 
 #include "AliMC.h"
 #include "AliRun.h"
-#include "../TGeant3/TGeant3.h"
+#include "AliGeant3.h"
 #include "AliITShit.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITS.h"
@@ -645,7 +648,7 @@ void AliITSv5symm::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(strcmp(gMC->GetName(),"TGeant3")) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;

diff --git a/ITS/AliITSvPPRasymm.cxx b/ITS/AliITSvPPRasymm.cxx
index 9ce5a5f8aac5211bc5ea601e7d36b4aeb571aab3..37987c0fede797a0b293af552d927e9c656fa5b5 100644 (file)
--- a/ITS/AliITSvPPRasymm.cxx
+++ b/ITS/AliITSvPPRasymm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.42  2001/05/30 15:55:35  hristov
+Strings compared instead of pointers
+
 Revision 1.41  2001/05/30 14:04:31  hristov
 Dynamic cast replaced (F.Carminati)
 
@@ -165,7 +168,7 @@ New ITS detailed geometry to be used for the PPR
 #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"
@@ -4767,7 +4770,7 @@ void AliITSvPPRasymm::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(strcmp(gMC->GetName(),"TGeant3")) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;

diff --git a/ITS/AliITSvPPRsymm.cxx b/ITS/AliITSvPPRsymm.cxx
index 1081f36b48be220d0a938f0e2f823cbed91324f7..7469b2becc36fb5c2ec588a895f4c7101bd639e6 100644 (file)
--- a/ITS/AliITSvPPRsymm.cxx
+++ b/ITS/AliITSvPPRsymm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+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)
 
@@ -199,7 +202,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"
@@ -4712,7 +4715,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(strcmp(gMC->GetName(),"TGeant3")) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;

diff --git a/ITS/AliITSvtest.cxx b/ITS/AliITSvtest.cxx
index 69625999a4920355cf2c6ed0dd61c448fee2d18d..556d942b4f2cba51068e360b8ed1ab1477c644b1 100644 (file)
--- a/ITS/AliITSvtest.cxx
+++ b/ITS/AliITSvtest.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.10  2001/05/30 15:55:35  hristov
+Strings compared instead of pointers
+
 Revision 1.9  2001/05/30 14:04:31  hristov
 Dynamic cast replaced (F.Carminati)
 
@@ -95,7 +98,7 @@ $Id$
 
 #include "AliMC.h"
 #include "AliRun.h"
-#include "../TGeant3/TGeant3.h"
+#include "AliGeant3.h"
 #include "AliITSGeant3Geometry.h"
 #include "AliITShit.h"
 #include "AliITS.h"
@@ -241,7 +244,7 @@ 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(strcmp(gMC->GetName(),"TGeant3")) {
+    if(gMC->IsA()!=AliGeant3::Class()) {
        Error("InitAliITSgeom",
                "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
        return;

diff --git a/ITS/Makefile b/ITS/Makefile
index c6e2062c8235e7e80c88a21b4763e63e9ffdd71e..d3f2f59b8d1743f0fd681163ae0197ba8e13b3eb 100644 (file)
--- a/ITS/Makefile
+++ b/ITS/Makefile
@@ -73,7 +73,7 @@ OBJS          = $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(SRCS)) $(DICTO)
 
 # C++ compilation flags
 
-CXXFLAGS      = $(CXXOPTS) -I$(ROOTSYS)/include -I. -I$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/CONTAINERS
+CXXFLAGS      = $(CXXOPTS) -I$(ROOTSYS)/include -I. -I../TGeant3 -I$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/CONTAINERS
 
 # FORTRAN compilation flags