Make AliTRDgeometryFull default

diff --git a/TRD/AliTRD.cxx b/TRD/AliTRD.cxx
index 6b5d36e31660a0eef80dd6de7502c202463949e7..8444b0a6063454b1412c06c87a51b60bd5b9b2a1 100644 (file)
--- a/TRD/AliTRD.cxx
+++ b/TRD/AliTRD.cxx
@@ -102,13 +102,9 @@ AliTRD::AliTRD(const char *name, const char *title)
     exit(1);
   } 
 
-  // Define the TRD geometry according to the FRAME geometry
-  if      (frame->IsVersion() == 0) {
-    // Geometry with hole
-    fGeometry = new AliTRDgeometryHole();
-  }
-  else if (frame->IsVersion() == 1) {
-    // Geometry without hole
+  // Define the TRD geometry
+  if ((frame->IsVersion() == 0) ||
+      (frame->IsVersion() == 1)) {
     fGeometry = new AliTRDgeometryFull();
   }
   else {
@@ -788,16 +784,16 @@ void AliTRD::Init()
     printf("\n");
   }
 
-  if      (fGeometry->IsVersion() == 0) {
-    printf("%s: Geometry for spaceframe with holes initialized\n",ClassName());
-  }
-  else if (fGeometry->IsVersion() == 1) {
-    printf("%s: Geometry for spaceframe without holes initialized\n",ClassName());
+  if (fGeometry->IsVersion() == 1) {
+    printf("%s: Full geometry version initialized\n",ClassName());
     if (fGeometry->GetPHOShole())
       printf("%s: Leave space in front of PHOS free\n",ClassName());
     if (fGeometry->GetRICHhole())
       printf("%s: Leave space in front of RICH free\n",ClassName());
   }
+  else {
+    printf("%s: Not a valid geometry\n",ClassName());
+  }
   
   if (fGasMix == 1) {
     printf("%s: Gas Mixture: 85%% Xe + 15%% CO2\n",ClassName());