Fix added to take into account of new/changed macros.

diff --git a/ITS/AliITStest.C b/ITS/AliITStest.C
index eb5fe14f7addff58a3be078a6a1d191c1a02db50..a9f32ad3228c6956b51e2990d2c48345d6bc7db5 100644 (file)
--- a/ITS/AliITStest.C
+++ b/ITS/AliITStest.C
@@ -5,23 +5,23 @@ Int_t AliITStest() {
    gROOT->LoadMacro("$(ALICE_ROOT)/macros/grun.C");
    grun();
 
-   Int_t ver=gAlice->GetDetector("ITS")->IsVersion();
+   AliITSgeom *gm = ((AliITS*)(gAlice->GetDetector("ITS")))->GetITSgeom();
    delete gAlice; gAlice=0;
 
-   if (ver!=5) {
-      cerr<<"Invalid ITS version: "<<ver<<" ! (must be 5 for the moment)\n";
+   if (!gm) {
+       cerr << "This version of the ITS geometry does not have a"
+           << " AliITSgeom defined" << endl;
       return 12345;
    }
 
-   if (ver==5) {
-     gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSHits2Digits.C");
-     if (rc=AliITSHits2Digits()) return rc;
-
+   if (gm) {
+     gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSHits2DigitsDefault.C");
+     if (rc=AliITSHits2DigitsDefault()) return rc;
    }
 
-   printf("start reconstruction\n");
+   cout << "start reconstruction" << endl;
 
-//Test ITS reconstruction
+   //Test ITS reconstruction
    gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSFindClusters.C");
 
    delete gAlice; gAlice=0;

diff --git a/ITS/GeneralTest.C b/ITS/GeneralTest.C
index ca5d5b7f021e14a971389c9e3a5883c2cde5c99a..d0ee91b152194cf95d847e6846624c3630340123 100644 (file)
--- a/ITS/GeneralTest.C
+++ b/ITS/GeneralTest.C
@@ -38,11 +38,12 @@ Int_t GeneralTest(Int_t verpoint=2) {
      exit(5);
    }
            
-   Int_t ver=gAlice->GetDetector("ITS")->IsVersion();
+   AliITSgeom *gm = ((AliITS*)gAlice->GetDetector("ITS"))->GetITSgeom();
    delete gAlice; gAlice=0;
 
-   if (ver!=5) {
-      cerr<<"Invalid ITS version: "<<ver<<" ! (must be 5 for the moment)\n";
+   if (!gm) {
+       cerr  << "This version of the ITS geometry does not have a AliITSgeom"
+            << " defined" << endl;
       return 12345;
    }
 cout<<" verpoint = "<<verpoint<<"\n";
@@ -56,11 +57,9 @@ cout<<" verpoint = "<<verpoint<<"\n";
     break;  
   case 2:
   printf("Start digitization \n");
-  
-   if (ver==5) {
-     gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSHits2Digits.C");
-     if (rc=AliITSHits2Digits()) return rc;
-   }
+
+  gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSHits2DigitsDefault.C");
+  if (rc=AliITSHits2Digits()) return rc;
 
    printf("start reconstruction\n");