]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSInitGeometry.cxx
Made chi2-cut, road definitions AliITSUTrackCond and layer dependent
[u/mrichter/AliRoot.git] / ITS / AliITSInitGeometry.cxx
index 03cc2cf55efba8c260b6384888062c5e3d986b1b..6cfc2943f5292aaaa6c139e2a17656f770a7e797 100644 (file)
@@ -45,9 +45,6 @@ $Id$
 #include <TMath.h>
 
 #include "AliLog.h"
-#include "AliITSgeomSPD.h"
-#include "AliITSgeomSDD.h"
-#include "AliITSgeomSSD.h"
 #include "AliITSsegmentationSPD.h"
 #include "AliITSsegmentationSDD.h"
 #include "AliITSsegmentationSSD.h"
@@ -109,16 +106,17 @@ fDebug(0){                   // Debug flag
     // Return:
     //   A default inilized AliITSInitGeometry object
 
-    if(version == kvPPRasymmFMD && (fMinorVersion==1|| fMinorVersion==2)){
-        fName="AliITSvPPRasymmFMD";
-    }else if(version == kv11Hybrid){
-        fName="AliITSv11Hybrid";
-    }else {
+  switch (version) {
+    case kv11:
+        fName="AliITSv11";
+       break;
+    case kvDefault:
+    default:
         AliFatal(Form("Undefined geometry: fMajorVersion=%d, "
                       "fMinorVersion= %d",(Int_t)fMajorVersion,fMinorVersion));
         fName = "Undefined";
-    } // end if
-    return;
+       break;
+    } // switch
 }
 //______________________________________________________________________
 AliITSgeom* AliITSInitGeometry::CreateAliITSgeom(){
@@ -140,7 +138,7 @@ AliITSgeom* AliITSInitGeometry::CreateAliITSgeom(){
   TDatime datetime;
   TGeoVolume *itsV = gGeoManager->GetVolume("ITSV");
   if(!itsV){
-    Error("CreateAliITSgeom","Can't find ITS volume ITSV, aborting");
+    AliError("Can't find ITS volume ITSV, exiting - nothing done!");
     return 0;
   }// end if
   const Char_t *title = itsV->GetTitle();
@@ -170,22 +168,10 @@ AliITSgeom* AliITSInitGeometry::CreateAliITSgeom(Int_t major,Int_t minor){
     //   pointer = 0 then failed to init.
 
     switch(major){
-    case kvPPRcourseasymm:
-        SetGeometryName("AliITSvPPRcourseasymm");
-        SetVersion(kvPPRcourseasymm,minor);
-        break;
-    case kvPPRasymmFMD:
-        SetGeometryName("AliITSvPPRasymmFMD");
-        SetVersion(kvPPRasymmFMD,minor);
-        break;
     case kv11:
         SetGeometryName("AliITSv11");
         SetVersion(kv11,minor);
         break;
-    case kv11Hybrid:
-        SetGeometryName("AliITSv11Hybrid");
-        SetVersion(kv11Hybrid,minor);
-        break;
     case kvDefault:
     default:
         SetGeometryName("Undefined");
@@ -219,15 +205,6 @@ Bool_t AliITSInitGeometry::InitAliITSgeom(AliITSgeom *geom){
         return kFALSE;
     } // end if
     switch(fMajorVersion) {
-    case kvPPRasymmFMD: { 
-        return InitAliITSgeomPPRasymmFMD(geom);
-    } break; // end case
-    case kvPPRcourseasymm: { 
-        return kTRUE; // No sensitive detectors in course geometry
-    } break; // end case
-    case kv11Hybrid: { 
-        return InitAliITSgeomV11Hybrid(geom);
-    } break; // end case
     case kv11: {
         return InitAliITSgeomV11(geom);
     } break; // end case
@@ -264,111 +241,18 @@ void AliITSInitGeometry::TransposeTGeoHMatrix(TGeoHMatrix *m)const{
     return;
 }
 
-//______________________________________________________________________
-Bool_t AliITSInitGeometry::InitAliITSgeomPPRasymmFMD(AliITSgeom *geom){
-    // Initilizes the geometry transformation class AliITSgeom
-    // to values appropreate to this specific geometry. Now that
-    // the segmentation is part of AliITSgeom, the detector
-    // segmentations are also defined here.
-    // Inputs:
-    //   AliITSgeom *geom  A pointer to the AliITSgeom class
-    // Outputs:
-    //   AliITSgeom *geom  This pointer recreated and properly inilized.
-    // Return:
-    //   none.
-  //    const Double_t kcm2micron = 1.0E4;
-    const Int_t kItype=0; // Type of transormation defined 0=> Geant
-    const Int_t klayers = 6; // number of layers in the ITS
-    const Int_t kladders[klayers]   = {20,40,14,22,34,38}; // Number of ladders
-    const Int_t kdetectors[klayers] = {4,4,6,8,22,25};// number of detector/lad
-    const AliITSDetector kIdet[6]   = {kSPD,kSPD,kSDD,kSDD,kSSD,kSSD};
-    const TString kPathbase = "/ALIC_1/ITSV_1/ITSD_1/";
-    const TString kNames[2][klayers] = {
-       {"%sIT12_1/I12A_%d/I10A_%d/I103_%d/I101_1/ITS1_1", // lay=1
-        "%sIT12_1/I12A_%d/I20A_%d/I1D3_%d/I1D1_1/ITS2_1", // lay=2
-        "%sIT34_1/I004_%d/I302_%d/ITS3_%d/", // lay=3
-        "%sIT34_1/I005_%d/I402_%d/ITS4_%d/", // lay=4
-        "%sIT56_1/I565_%d/I562_%d/ITS5_%d/", // lay=5
-        "%sIT56_1/I569_%d/I566_%d/ITS6_%d/"},// lay=6
-//     {"%sIT12_1/I12B_%d/I10B_%d/I107_%d/I101_1/ITS1_1", // lay=1
-//      "%sIT12_1/I12B_%d/I20B_%d/I1D7_%d/I1D1_1/ITS2_1", // lay=2
-       {"%sIT12_1/I12B_%d/I10B_%d/L1H-STAVE%d_1/I107_%d/I101_1/ITS1_1",//lay=1
-        "%sIT12_1/I12B_%d/I20B_%d/L2H-STAVE%d_1/I1D7_%d/I1D1_1/ITS2_1",//lay=2
-        "%sIT34_1/I004_%d/I302_%d/ITS3_%d", // lay=3
-        "%sIT34_1/I005_%d/I402_%d/ITS4_%d", // lay=4
-        "%sIT56_1/I565_%d/I562_%d/ITS5_%d", // lay=5
-        "%sIT56_1/I569_%d/I566_%d/ITS6_%d"}};// Lay=6
-    /*
-      Int_t itsGeomTreeCopys[knlayers][3]= {{10, 2, 4},// lay=1
-      {10, 4, 4},// lay=2
-      {14, 6, 1},// lay=3
-      {22, 8, 1},// lay=4
-      {34,22, 1},// lay=5
-      {38,25, 1}};//lay=6
-    */
-    Int_t mod,nmods=0,lay,lad,det,cpn0,cpn1,cpn2, cpnHS;
-    Double_t tran[3]={0.0,0.0,0.0},rot[10]={9*0.0,1.0};
-    TArrayD shapePar;
-    TString path,shapeName;
-    TGeoHMatrix matrix;
-    Bool_t initSeg[3]={kFALSE,kFALSE,kFALSE};
-    TStopwatch *time = 0x0;if(fTiming) time=new TStopwatch();
-
-    if(fTiming) time->Start();
-    for(mod=0;mod<klayers;mod++) nmods += kladders[mod]*kdetectors[mod];
-    geom->Init(kItype,klayers,kladders,kdetectors,nmods);
-    for(mod=0;mod<nmods;mod++){
-        DecodeDetectorLayers(mod,lay,lad,det); // Write
-        geom->CreateMatrix(mod,lay,lad,det,kIdet[lay-1],tran,rot);
-        RecodeDetector(mod,cpn0,cpn1,cpn2); // Write reusing lay,lad,det.
 
-       if (kIdet[lay-1]==kSPD) { // we need 1 more copy number because 
-                                  // of the half-stave
-         if (det<3) cpnHS = 0; else cpnHS = 1;
-         path.Form(kNames[fMinorVersion-1][lay-1].Data(),kPathbase.Data(),
-                   cpn0,cpn1,cpnHS,cpn2);
-       } else {
-         path.Form(kNames[fMinorVersion-1][lay-1].Data(),kPathbase.Data(),
-                   cpn0,cpn1,cpn2);
-       };
-//         path.Form(kNames[fMinorVersion-1][lay-1].Data(),
-//                   kPathbase.Data(),cpn0,cpn1,cpn2);
-
-        geom->GetGeomMatrix(mod)->SetPath(path);
-        GetTransformation(path.Data(),matrix);
-        geom->SetTrans(mod,matrix.GetTranslation());
-       TransposeTGeoHMatrix(&matrix); //Transpose TGeo's rotation matrixes
-        geom->SetRotMatrix(mod,matrix.GetRotationMatrix());
-        if(initSeg[kIdet[lay-1]]) continue;
-        GetShape(path,shapeName,shapePar);
-        if(shapeName.CompareTo("BOX")){
-         Error("InitITSgeomPPRasymmFMD",
-               "Geometry changed without proper code update or error "
-               "in reading geometry. Shape is not BOX. Shape is %s",
-               shapeName.Data());
-         return kFALSE;
-        } // end if
-       InitGeomShapePPRasymmFMD(kIdet[lay-1],initSeg,shapePar,geom);
-    } // end for module
-    if(fTiming){
-        time->Stop();
-        time->Print();
-        delete time;
-    } // end if
-    return kTRUE;
-}
 //______________________________________________________________________
-Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
-    // Initilizes the geometry transformation class AliITSgeom
-    // to values appropreate to this specific geometry. Now that
-    // the segmentation is part of AliITSgeom, the detector
-    // segmentations are also defined here.
-    // Inputs:
-    //   AliITSgeom *geom  A pointer to the AliITSgeom class
-    // Outputs:
-    //   AliITSgeom *geom  This pointer recreated and properly inilized.
-    // Return:
-    //   none.
+Bool_t AliITSInitGeometry::InitAliITSgeomV11(AliITSgeom *geom){
+  // Initilizes the geometry transformation class AliITSgeom
+  // Now that the segmentation is part of AliITSgeom, the detector
+  // segmentations are also defined here.
+  //
+  // Inputs:
+  //   AliITSgeom *geom  A pointer to the AliITSgeom class
+  // Outputs:
+  //   AliITSgeom *geom  This pointer recreated and properly inilized.
+  // LG
 
   const Int_t kItype  = 0; // Type of transformation defined 0=> Geant
   const Int_t klayers = 6; // number of layers in the ITS
@@ -378,31 +262,16 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
   const TString kPathbase = "/ALIC_1/ITSV_1/";
 
   const char *pathSPDsens1, *pathSPDsens2;
-  if (SPDIsTGeoNative()) {
-    pathSPDsens1="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay1-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay1-Ladder_%d/ITSSPDlay1-sensor_1";
-    pathSPDsens2="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay2-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay2-Ladder_%d/ITSSPDlay2-sensor_1";
-  } else{
-    pathSPDsens1 = "%sITSD_1/IT12_1/I12B_%d/I10B_%d/L1H-STAVE%d_1/I107_%d/I101_1/ITS1_1";
-    pathSPDsens2 = "%sITSD_1/IT12_1/I12B_%d/I20B_%d/L2H-STAVE%d_1/I1D7_%d/I1D1_1/ITS2_1";
-  }
+  pathSPDsens1="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay1-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay1-Ladder_%d/ITSSPDlay1-sensor_1";
+  pathSPDsens2="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay2-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay2-Ladder_%d/ITSSPDlay2-sensor_1";
 
   const char *pathSDDsens1, *pathSDDsens2;
-  if (SDDIsTGeoNative()) {
-    pathSDDsens1 = "%sITSsddLayer3_1/ITSsddLadd_%d/ITSsddSensor3_%d/ITSsddWafer3_%d/ITSsddSensitivL3_1";
-    pathSDDsens2 = "%sITSsddLayer4_1/ITSsddLadd_%d/ITSsddSensor4_%d/ITSsddWafer4_%d/ITSsddSensitivL4_1";
-  } else{
-    pathSDDsens1 = "%sITSD_1/IT34_1/I004_%d/I302_%d/ITS3_%d";
-    pathSDDsens2 = "%sITSD_1/IT34_1/I005_%d/I402_%d/ITS4_%d";
-  }
+  pathSDDsens1 = "%sITSsddLayer3_1/ITSsddLadd_%d/ITSsddSensor3_%d/ITSsddWafer3_%d/ITSsddSensitivL3_1";
+  pathSDDsens2 = "%sITSsddLayer4_1/ITSsddLadd_%d/ITSsddSensor4_%d/ITSsddWafer4_%d/ITSsddSensitivL4_1";
 
   const char *pathSSDsens1, *pathSSDsens2;
-  if (SSDIsTGeoNative()) {
-    pathSSDsens1 = "%sITSssdLayer5_1/ITSssdLay5Ladd_%d/ITSssdSensor5_%d/ITSssdSensitivL5_1";
-    pathSSDsens2 = "%sITSssdLayer6_1/ITSssdLay6Ladd_%d/ITSssdSensor6_%d/ITSssdSensitivL6_1";
-  } else{
-    pathSSDsens1 = "%sITSD_1/IT56_1/I565_%d/I562_%d/ITS5_%d";
-    pathSSDsens2 = "%sITSD_1/IT56_1/I569_%d/I566_%d/ITS6_%d";
-  }
+  pathSSDsens1 = "%sITSssdLayer5_1/ITSssdLay5Ladd_%d/ITSssdSensor5_%d/ITSssdSensitivL5_1";
+  pathSSDsens2 = "%sITSssdLayer6_1/ITSssdLay6Ladd_%d/ITSssdSensor6_%d/ITSssdSensitivL6_1";
 
   const TString kNames[klayers] = {
     pathSPDsens1, // lay=1
@@ -429,26 +298,7 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
 
     DecodeDetectorLayers(mod,lay,lad,det);
     geom->CreateMatrix(mod,lay,lad,det,kIdet[lay-1],tran,rot);
-    RecodeDetectorv11Hybrid(mod,cpn0,cpn1,cpn2);
-
-//     if (SPDIsTGeoNative())
-//       if (kIdet[lay-1]==kSPD) {
-//     cpn0 = lad-1;
-//     cpn1 = det-1;
-//     cpn2 = 1;
-//       }
-//     if (SDDIsTGeoNative())
-//       if (kIdet[lay-1]==kSDD) {
-//     cpn0 = lad-1;
-//     cpn1 = det-1;
-//     cpn2 = 1;
-//       }
-//     if (SSDIsTGeoNative())
-//       if (kIdet[lay-1]==kSSD) {
-//     cpn0 = lad-1;
-//     cpn1 = det-1;
-//     cpn2 = 1;
-//       }
+    RecodeDetector(mod,cpn0,cpn1,cpn2);
 
     if (kIdet[lay-1]==kSPD) { // we need 1 more copy number because of the half-stave
       if (det<3) cpnHS = 0; else cpnHS = 1;
@@ -469,7 +319,6 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
            "or error in reading geometry. Shape is not BOX.");
       return kFALSE;
     } // end if
-    InitGeomShapePPRasymmFMD(kIdet[lay-1],initSeg,shapePar,geom);
   } // end for module
 
   if(fTiming){
@@ -479,213 +328,8 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
   } // end if
   return kTRUE;
 }
-//______________________________________________________________________
-Bool_t AliITSInitGeometry::InitAliITSgeomV11(AliITSgeom *geom){
-  // Initilizes the geometry transformation class AliITSgeom
-  // Now that the segmentation is part of AliITSgeom, the detector
-  // segmentations are also defined here.
-  //
-  // Inputs:
-  //   AliITSgeom *geom  A pointer to the AliITSgeom class
-  // Outputs:
-  //   AliITSgeom *geom  This pointer recreated and properly inilized.
-  // LG
-
-
-  const Int_t kItype=0; // Type of transormation defined 0=> Geant
-  const Int_t klayers = 6; // number of layers in the ITS
-  const Int_t kladders[klayers]   = {20,40,14,22,34,38}; // Number of ladders
-  const Int_t kdetectors[klayers] = {4,4,6,8,22,25};// number of detector/lad
-  const AliITSDetector kIdet[6]   = {kSPD,kSPD,kSDD,kSDD,kSSD,kSSD};
-
-  const TString kPathbase = "/ALIC_1/ITSV_1/";
-  const TString kNames[klayers] =
-    {"AliITSInitGeometry:spd missing", // lay=1
-     "AliITSInitGeometry:spd missing", // lay=2
-     "%sITSsddLayer3_1/ITSsddLadd_%d/ITSsddSensor_%d/ITSsddWafer_1/ITSsddSensitiv_1", // lay=3
-     "%sITSsddLayer4_1/ITSsddLadd_%d/ITSsddSensor_%d/ITSsddWafer_1/ITSsddSensitiv_1", // lay=4
-     "AliITSInitGeometry:ssd missing", // lay=5
-     "AliITSInitGeometry:ssd missing"};// lay=6
-  Int_t mod,nmods=0,lay,lad,det,cpn0,cpn1,cpn2;
-  Double_t tran[3]={0.0,0.0,0.0},rot[10]={9*0.0,1.0};
-  TArrayD shapePar;
-  TString path,shapeName;
-  TGeoHMatrix matrix;
-  Bool_t initSeg[3]={kFALSE,kFALSE,kFALSE};
-  TStopwatch *time = 0x0;if(fTiming) time=new TStopwatch();
-  
-  if(fTiming) time->Start();
-  for(mod=0;mod<klayers;mod++) nmods += kladders[mod]*kdetectors[mod];
-  
-  geom->Init(kItype,klayers,kladders,kdetectors,nmods);
-  for(mod=0;mod<nmods;mod++) {
-    
-    DecodeDetectorLayers(mod,lay,lad,det); // Write
-    geom->CreateMatrix(mod,lay,lad,det,kIdet[lay-1],tran,rot);
-    RecodeDetector(mod,cpn0,cpn1,cpn2); // Write reusing lay,lad,det.
-    path.Form(kNames[lay-1].Data(),
-             kPathbase.Data(),cpn0,cpn1,cpn2);
-    geom->GetGeomMatrix(mod)->SetPath(path);
-    if (GetTransformation(path.Data(),matrix)) {
-      geom->SetTrans(mod,matrix.GetTranslation());
-      TransposeTGeoHMatrix(&matrix); //Transpose TGeo's rotation matrixes
-      geom->SetRotMatrix(mod,matrix.GetRotationMatrix());
-    }
-    
-    if(initSeg[kIdet[lay-1]]) continue;
-    GetShape(path,shapeName,shapePar);
-    if(shapeName.CompareTo("BOX")){
-      Error("InitAliITSgeomV11","Geometry changed without proper code update"
-           "or error in reading geometry. Shape is not BOX.");
-      return kFALSE;
-    } // end if
-    InitGeomShapePPRasymmFMD(kIdet[lay-1],initSeg,shapePar,geom);
-    
-  } // end for module
-  
-  if(fTiming){
-    time->Stop();
-    time->Print();
-    delete time;
-  } // end if
-  return kTRUE;
-}
-
-//______________________________________________________________________
-Bool_t AliITSInitGeometry::InitGeomShapePPRasymmFMD(AliITSDetector idet,
-                                                      Bool_t *initSeg,
-                                                      TArrayD &shapePar,
-                                                      AliITSgeom *geom){
-    // Initilizes the geometry segmentation class AliITSgeomS?D, or
-    // AliITSsegmentationS?D depending on the vaule of fSegGeom,
-    // to values appropreate to this specific geometry. Now that
-    // the segmentation is part of AliITSgeom, the detector
-    // segmentations are also defined here.
-    // Inputs:
-    //   Int_t      lay    The layer number/name.
-    //   AliITSgeom *geom  A pointer to the AliITSgeom class
-    // Outputs:
-    //   AliITSgeom *geom  This pointer recreated and properly inilized.
-    // Return:
-    //   none.
-  //   const Double_t kcm2micron = 1.0E4;
-    const Double_t kmicron2cm = 1.0E-4;
-    Int_t i;
-    TArrayF shapeParF;
-
-    shapeParF.Set(shapePar.GetSize());
-    for(i=0;i<shapePar.GetSize();i++) shapeParF[i]=shapePar[i];
-    switch (idet){
-    case kSPD:{
-       initSeg[idet] = kTRUE;
-       AliITSgeomSPD *geomSPD = new AliITSgeomSPD425Short();
-       Float_t bx[256],bz[280];
-       for(i=000;i<256;i++) bx[i] = 50.0*kmicron2cm;//in x all are 50 microns.
-       for(i=000;i<160;i++) bz[i] =425.0*kmicron2cm; // most are 425 microns
-       // except below
-       for(i=160;i<280;i++) bz[i] =   0.0*kmicron2cm; // Outside of detector.
-       bz[ 31] = bz[ 32] = 625.0*kmicron2cm; // first chip boundry
-       bz[ 63] = bz[ 64] = 625.0*kmicron2cm; // first chip boundry
-       bz[ 95] = bz[ 96] = 625.0*kmicron2cm; // first chip boundry
-       bz[127] = bz[128] = 625.0*kmicron2cm; // first chip boundry
-       bz[160] = 425.0*kmicron2cm;// Set so that there is no zero 
-                                   // pixel size for fNz.
-       geomSPD->ReSetBins(shapeParF[1],256,bx,160,bz);
-       geom->ReSetShape(idet,geomSPD);
-    }break;
-    case kSDD:{
-       initSeg[idet] = kTRUE;
-       AliITSgeomSDD *geomSDD = new AliITSgeomSDD256(shapeParF.GetSize(),
-                                                     shapeParF.GetArray());
-       geom->ReSetShape(idet,geomSDD);
-    }break;
-    case kSSD:{
-       initSeg[idet] = kTRUE;
-       AliITSgeomSSD *geomSSD = new AliITSgeomSSD275and75(
-           shapeParF.GetSize(),shapeParF.GetArray());
-       geom->ReSetShape(idet,geomSSD);
-    }break;
-    default:{// Others, Note no kSDDp or kSSDp in this geometry.
-       geom->ReSetShape(idet,0);
-       Info("InitGeomShapePPRasymmFMD",
-            "default Dx=%f Dy=%f Dz=%f default=%d",
-            shapePar[0],shapePar[1],shapePar[2],idet);
-    }break;
-    } // end switch
-    return kTRUE;
-}
-//______________________________________________________________________
-Bool_t AliITSInitGeometry::InitSegmentationPPRasymmFMD(AliITSDetector idet,
-                                                      Bool_t *initSeg,
-                                                      TArrayD &shapePar,
-                                                      AliITSgeom *geom){
-    // Initilizes the geometry segmentation class AliITSgeomS?D, or
-    // AliITSsegmentationS?D depending on the vaule of fSegGeom,
-    // to values appropreate to this specific geometry. Now that
-    // the segmentation is part of AliITSgeom, the detector
-    // segmentations are also defined here.
-    // Inputs:
-    //   Int_t      lay    The layer number/name.
-    //   AliITSgeom *geom  A pointer to the AliITSgeom class
-    // Outputs:
-    //   AliITSgeom *geom  This pointer recreated and properly inilized.
-    // Return:
-    //   none.
-    const Double_t kcm2micron = 1.0E4;
-    Int_t i;
 
-    switch (idet){
-    case kSPD:{
-       initSeg[idet] = kTRUE;
-       AliITSsegmentationSPD *segSPD = new AliITSsegmentationSPD();
-       segSPD->SetDetSize(2.*shapePar[0]*kcm2micron, // X
-                          2.*shapePar[2]*kcm2micron, // Z
-                          2.*shapePar[1]*kcm2micron);// Y  Microns
-       segSPD->SetNPads(256,160);// Number of Bins in x and z
-       Float_t bx[256],bz[280];
-       for(i=000;i<256;i++) bx[i] =  50.0; // in x all are 50 microns.
-       for(i=000;i<160;i++) bz[i] = 425.0; // most are 425 microns
-       // except below
-       for(i=160;i<280;i++) bz[i] =   0.0; // Outside of detector.
-       bz[ 31] = bz[ 32] = 625.0; // first chip boundry
-       bz[ 63] = bz[ 64] = 625.0; // first chip boundry
-       bz[ 95] = bz[ 96] = 625.0; // first chip boundry
-       bz[127] = bz[128] = 625.0; // first chip boundry
-       bz[160] = 425.0;// Set so that there is no zero pixel size for fNz.
-       segSPD->SetBinSize(bx,bz); // Based on AliITSgeomSPD for now.
-       geom->ReSetShape(idet,segSPD);
-    }break;
-    case kSDD:{
-       initSeg[idet] = kTRUE;
-       AliITSsegmentationSDD *segSDD = new AliITSsegmentationSDD();
-       segSDD->SetDetSize(shapePar[0]*kcm2micron, // X
-                          2.*shapePar[2]*kcm2micron, // Z
-                          2.*shapePar[1]*kcm2micron);// Y  Microns
-       segSDD->SetNPads(256,256);// Anodes, Samples
-       geom->ReSetShape(idet,segSDD);
-    }break;
-    case kSSD:{
-       initSeg[idet] = kTRUE;
-       AliITSsegmentationSSD *segSSD = new AliITSsegmentationSSD();
-       segSSD->SetDetSize(2.*shapePar[0]*kcm2micron, // X
-                          2.*shapePar[2]*kcm2micron, // Z
-                          2.*shapePar[1]*kcm2micron);// Y  Microns.
-       segSSD->SetPadSize(95.,0.); // strip x pitch in microns
-       segSSD->SetNPads(768,2); // number of strips on each side, sides.
-       segSSD->SetAngles(0.0075,0.0275); // strip angels rad P and N side.
-       geom->ReSetShape(idet,segSSD);
-    }break;
-    default:{// Others, Note no kSDDp or kSSDp in this geometry.
-       geom->ReSetShape(idet,0);
-       Info("InitSegmentationPPRasymmFMD",
-            "default segmentation Dx=%f Dy=%f Dz=%f default=%d",
-            shapePar[0],shapePar[1],shapePar[2],idet);
-    }break;
-    } // end switch
-    return kTRUE;
-}
-//______________________________________________________________________
+//_______________________________________________________________________
 Bool_t AliITSInitGeometry::GetTransformation(const TString &volumePath,
                                             TGeoHMatrix &mat){
     // Returns the Transformation matrix between the volume specified
@@ -1003,18 +647,9 @@ void AliITSInitGeometry::DecodeDetector(
     case kvDefault:{
         Error("DecodeDetector","Major version = kvDefault, not supported");
     }break;
-    case kvPPRcourseasymm:{
-        return DecodeDetectorvPPRcourseasymm(mod,layer,cpn0,cpn1,cpn2);
-    }break;
-    case kvPPRasymmFMD:{
-        return DecodeDetectorvPPRasymmFMD(mod,layer,cpn0,cpn1,cpn2);
-    }break;
     case kv11:{
         return DecodeDetectorv11(mod,layer,cpn0,cpn1,cpn2);
     }break;
-    case kv11Hybrid:{
-        return DecodeDetectorv11Hybrid(mod,layer,cpn0,cpn1,cpn2);
-    }break;
     default:{
         Error("DecodeDetector","Major version = %d, not supported",
               (Int_t)fMajorVersion);
@@ -1046,18 +681,9 @@ void AliITSInitGeometry::RecodeDetector(Int_t mod,Int_t &cpn0,
         Error("RecodeDetector","Major version = kvDefault, not supported");
         return;
     }
-    case kvPPRcourseasymm:{
-        return RecodeDetectorvPPRcourseasymm(mod,cpn0,cpn1,cpn2);
-    }break;
-    case kvPPRasymmFMD:{
-        return RecodeDetectorvPPRasymmFMD(mod,cpn0,cpn1,cpn2);
-    }break;
     case kv11:{
         return RecodeDetectorv11(mod,cpn0,cpn1,cpn2);
     }break;
-    case kv11Hybrid:{
-        return RecodeDetectorv11Hybrid(mod,cpn0,cpn1,cpn2);
-    }break;
     default:{
         Error("RecodeDetector","Major version = %d, not supported",
               (Int_t)fMajorVersion);
@@ -1093,18 +719,9 @@ void AliITSInitGeometry::DecodeDetectorLayers(Int_t mod,Int_t &layer,
               "Major version = kvDefault, not supported");
         return;
     }break;
-    case kvPPRcourseasymm:{
-        return DecodeDetectorLayersvPPRcourseasymm(mod,layer,lad,det);
-    }break;
-    case kvPPRasymmFMD:{
-        return DecodeDetectorLayersvPPRasymmFMD(mod,layer,lad,det);
-    }break;
     case kv11:{
         return DecodeDetectorLayersv11(mod,layer,lad,det);
     }break;
-    case kv11Hybrid:{
-        return DecodeDetectorLayersv11Hybrid(mod,layer,lad,det);
-    }break;
     default:{
         Error("DecodeDetectorLayers","Major version = %d, not supported",
               (Int_t)fMajorVersion);
@@ -1115,260 +732,7 @@ void AliITSInitGeometry::DecodeDetectorLayers(Int_t mod,Int_t &layer,
 }
 
 //______________________________________________________________________
-void AliITSInitGeometry::DecodeDetectorvPPRasymmFMD(Int_t &mod,Int_t layer,
-                                    Int_t cpn0,Int_t cpn1,Int_t cpn2) const {
-    // decode geometry into detector module number. There are two decoding
-    // Scheams. Old which does not follow the ALICE coordinate system
-    // requirements, and New which dose.
-    // Inputs:
-    //    Int_t layer    The ITS layer
-    //    Int_t cpn0     The lowest copy number
-    //    Int_t cpn1     The middle copy number
-    //    Int_t cpn2     the highest copy number
-    // Output:
-    //    Int_t &mod     The module number assoicated with this set
-    //                   of copy numbers.
-    // Return:
-    //    none.
-    const Int_t kDetPerLadderSPD[2]={2,4};
-    const Int_t kDetPerLadder[6]={4,4,6,8,22,25};
-    const Int_t kLadPerLayer[6]={20,40,14,22,34,38};
-    Int_t lay=-1,lad=-1,det=-1,i;
-
-    if(fDecode){ // New decoding scheam
-        switch (layer){
-        case 1:{
-            lay = layer;
-            det = 5-cpn2;
-            if(cpn0==4&&cpn1==1) lad=1;
-            else if(cpn0==4&&cpn1==2) lad=20;
-            else if(cpn0<4){
-                lad = 8-cpn1-kDetPerLadderSPD[layer-1]*(cpn0-1);
-            }else{ // cpn0>4
-                lad = 28-cpn1-kDetPerLadderSPD[layer-1]*(cpn0-1);
-            } // end if
-        } break;
-        case 2:{
-            lay = layer;
-            det = 5-cpn2;
-            if(cpn0==4&&cpn1==1) lad=1;
-            else if(cpn0<4){
-                lad = 14-cpn1-kDetPerLadderSPD[layer-1]*(cpn0-1);
-            }else{ // cpn0>4
-                lad = 54-cpn1-kDetPerLadderSPD[layer-1]*(cpn0-1);
-            } // end if
-        } break;
-        case 3:{
-            lay = layer;
-            if(cpn0<5) lad = 5-cpn0;
-            else lad = 19-cpn0;
-            det = 7-cpn1;
-        } break;
-        case 4:{
-            lay = layer;
-            if(cpn0<7) lad = 7-cpn0;
-            else lad = 29-cpn0;
-            det = 9-cpn1;
-        } break;
-        case 5:{
-            lay = layer;
-            if(cpn0<10) lad = 10-cpn0;
-            else lad = 44-cpn0;
-            det = 23-cpn1;
-        } break;
-        case 6:{
-            lay = layer;
-            if(cpn0<9) lad = 9-cpn0;
-            else lad = 47-cpn0;
-            det = 26-cpn1;
-        } break;
-        } // end switch
-        mod = 0;
-        for(i=0;i<layer-1;i++) mod += kLadPerLayer[i]*kDetPerLadder[i];
-        mod += kDetPerLadder[layer-1]*(lad-1)+det-1;// module start at zero.
-        return;
-    } // end if
-    // Old decoding scheam
-    switch(layer){
-    case 1: case 2:{
-        lay = layer;
-        lad = cpn1+kDetPerLadderSPD[layer-1]*(cpn0-1);
-        det = cpn2;
-        }break;
-    case 3: case 4:{
-        lay = layer;
-        lad = cpn0;
-        det = cpn1;
-        }break;
-    case 5: case 6:{
-        lay = layer;
-        lad = cpn0;
-        det = cpn1;
-        }break;
-    default:{
-        }break;
-    } // end switch
-    mod = 0;
-    for(i=0;i<layer-1;i++) mod += kLadPerLayer[i]*kDetPerLadder[i];
-    mod += kDetPerLadder[layer-1]*(lad-1)+det-1;// module start at zero.
-    return;
-}
-//______________________________________________________________________
-void AliITSInitGeometry::RecodeDetectorvPPRasymmFMD(Int_t mod,Int_t &cpn0,
-                                        Int_t &cpn1,Int_t &cpn2){
-    // decode geometry into detector module number. There are two decoding
-    // Scheams. Old which does not follow the ALICE coordinate system
-    // requirements, and New which dose.
-    // Inputs:
-    //    Int_t mod      The module number assoicated with this set
-    //                   of copy numbers.
-    // Output:
-    //    Int_t cpn0     The lowest copy number
-    //    Int_t cpn1     The middle copy number
-    //    Int_t cpn2     the highest copy number
-    // Return:
-    //    none.
-    const Int_t kITSgeoTreeCopys[6][3]= {{10, 2, 4},// lay=1
-                                         {10, 4, 4},// lay=2
-                                         {14, 6, 1},// lay=3
-                                         {22, 8, 1},// lay=4
-                                         {34,22, 1},// lay=5
-                                         {38,25, 1}};//lay=6
-    const Int_t kDetPerLadderSPD[2]={2,4};
-    //    const Int_t kDetPerLadder[6]={4,4,6,8,22,25};
-    //    const Int_t kLadPerLayer[6]={20,40,14,22,34,38};
-    Int_t lay,lad,det;
-
-    cpn0 = cpn1 = cpn2 = 0;
-    DecodeDetectorLayers(mod,lay,lad,det);
-    if(fDecode){ // New decoding scheam
-        switch (lay){
-        case 1:{
-            cpn2 = 5-det;     // Detector 1-4
-            cpn1 = 1+(lad-1)%kDetPerLadderSPD[lay-1];
-            cpn0 = 5-(lad+kDetPerLadderSPD[lay-1])/kDetPerLadderSPD[lay-1];
-            if(mod>27) cpn0 = 15-(lad+kDetPerLadderSPD[lay-1])/
-                          kDetPerLadderSPD[lay-1];
-        } break;
-        case 2:{
-            cpn2 = 5-det;     // Detector 1-4
-            cpn1 = 4-(lad+2)%kDetPerLadderSPD[lay-1];
-            cpn0 = 1+(14-cpn1-lad)/kDetPerLadderSPD[lay-1];
-            if(mod>131) cpn0 = 1+(54-lad-cpn1)/kDetPerLadderSPD[lay-1];
-        } break;
-        case 3:{
-            cpn2 = 1;
-            if(lad<5) cpn0 = 5-lad;
-            else cpn0 = 19-lad;
-            cpn1 = 7-det;
-        } break;
-        case 4:{
-            cpn2 = 1;
-            if(lad<7) cpn0 = 7-lad;
-            else cpn0 = 29-lad;
-            cpn1 = 9-det;
-        } break;
-        case 5:{
-            cpn2 = 1;
-            if(lad<10) cpn0 = 10-lad;
-            else cpn0 = 44-lad;
-            cpn1 = 23-det;
-        } break;
-        case 6:{
-            cpn2 = 1;
-            if(lad<9) cpn0 = 9-lad;
-            else cpn0 = 47-lad;
-            cpn1 = 26-det;
-        } break;
-        default:{
-         AliError(Form("New: mod=%d lay=%d not 1-6.",mod,lay));
-            return;
-        } break;
-        } // end switch
-        if(cpn0<1||cpn1<1||cpn2<1||
-           cpn0>kITSgeoTreeCopys[lay-1][0]||
-           cpn1>kITSgeoTreeCopys[lay-1][1]||
-           cpn2>kITSgeoTreeCopys[lay-1][2])
-            Error("RecodeDetector",
-                  "cpn0=%d cpn1=%d cpn2=%d mod=%d lay=%d lad=%d det=%d",
-                  cpn0,cpn1,cpn2,mod,lay,lad,det);
-        return;
-    } // end if
-    // Old encoding
-    switch (lay){
-    case 1: case 2:{
-        cpn2 = det;     // Detector 1-4
-        cpn0 = (lad+kDetPerLadderSPD[lay-1]-1)/kDetPerLadderSPD[lay-1];
-        cpn1 = (lad+kDetPerLadderSPD[lay-1]-1)%kDetPerLadderSPD[lay-1] + 1;
-    } break;
-    case 3: case 4: case 5 : case 6:{
-        cpn2 = 1;
-        cpn1 = det;
-        cpn0 = lad;
-    } break;
-    default:{
-      AliError(Form("Old: mod=%d lay=%d not 1-6.",mod,lay));
-        return;
-    } break;
-    } // end switch
-    if(cpn0<1||cpn1<1||cpn2<1||
-       cpn0>kITSgeoTreeCopys[lay-1][0]||
-       cpn1>kITSgeoTreeCopys[lay-1][1]||
-       cpn2>kITSgeoTreeCopys[lay-1][2])
-        Error("RecodeDetector",
-              "cpn0=%d cpn1=%d cpn2=%d mod=%d lay=%d lad=%d det=%d",
-              cpn0,cpn1,cpn2,mod,lay,lad,det);
-    return;
-}
-//______________________________________________________________________
-void AliITSInitGeometry::DecodeDetectorLayersvPPRasymmFMD(Int_t mod,Int_t &lay,
-                                              Int_t &lad,Int_t &det){
-    // decode geometry into detector module number. There are two decoding
-    // Scheams. Old which does not follow the ALICE coordinate system
-    // requirements, and New which dose. Note, this use of layer ladder
-    // and detector numbers are strictly for internal use of this
-    // specific code. They do not represent the "standard" layer ladder
-    // or detector numbering except in a very old and obsoleate sence.
-    // Inputs:
-    //    Int_t mod      The module number assoicated with this set
-    //                   of copy numbers.
-    // Output:
-    //    Int_t lay     The layer number
-    //    Int_t lad     The ladder number
-    //    Int_t det     the dettector number
-    // Return:
-    //    none.
-  //    const Int_t kDetPerLadderSPD[2]={2,4};
-    const Int_t kDetPerLadder[6]={4,4,6,8,22,25};
-    const Int_t kLadPerLayer[6]={20,40,14,22,34,38};
-    Int_t mod2;
-
-    det  = 0;
-    lad  = 0;
-    lay  = 0;
-    mod2 = 0;
-    do{
-        mod2 += kLadPerLayer[lay]*kDetPerLadder[lay];
-        lay++;
-    }while(mod2<=mod); // end while
-    if(lay>6||lay<1) Error("DecodeDetectorLayers","0<lay=%d>6",lay);
-    mod2 -= kLadPerLayer[lay-1]*kDetPerLadder[lay-1];
-    do{
-        lad++;
-        mod2 += kDetPerLadder[lay-1];
-    }while(mod2<=mod); // end while
-    if(lad>kLadPerLayer[lay-1]||lad<1) Error("DecodeDetectorLayers",
-            "lad=%d>kLadPerLayer[lay-1=%d]=%d mod=%d mod2=%d",lad,lay-1,
-                                            kLadPerLayer[lay-1],mod,mod2);
-    mod2 -= kDetPerLadder[lay-1];
-    det = mod-mod2+1;
-    if(det>kDetPerLadder[lay-1]||det<1) Error("DecodeDetectorLayers",
-           "det=%d>detPerLayer[lay-1=%d]=%d mod=%d mod2=%d lad=%d",det,
-                                  lay-1,kDetPerLadder[lay-1],mod,mod2,lad);
-    return;
-}
-//______________________________________________________________________
-void AliITSInitGeometry::DecodeDetectorv11Hybrid(Int_t &mod,Int_t layer,
+void AliITSInitGeometry::DecodeDetectorv11(Int_t &mod,Int_t layer,
                                  Int_t cpn0,Int_t cpn1,Int_t cpn2) const {
     // decode geometry into detector module number
     // Inputs:
@@ -1388,31 +752,16 @@ void AliITSInitGeometry::DecodeDetectorv11Hybrid(Int_t &mod,Int_t layer,
   
   switch(layer) {
   case 1: case 2:{
-    if (SPDIsTGeoNative()) {
-      lad = cpn1+kDetPerLadderSPD[layer-1]*(cpn0-1);
-      det = cpn2;
-    } else {
-      lad = cpn1+kDetPerLadderSPD[layer-1]*(cpn0-1);
-      det = cpn2;
-    }
+    lad = cpn1+kDetPerLadderSPD[layer-1]*(cpn0-1);
+    det = cpn2;
   } break;
   case 3: case 4:{
-    if (SDDIsTGeoNative()) {
-      lad = cpn0+1;
-      det = cpn1+1;
-    } else {
-      lad = cpn0;
-      det = cpn1;
-    }
+    lad = cpn0+1;
+    det = cpn1+1;
   } break;
   case 5: case 6:{
-    if (SSDIsTGeoNative()) {
-      lad = cpn0+1;
-      det = cpn1+1;
-    } else {
-      lad = cpn0;
-      det = cpn1;
-    }
+    lad = cpn0+1;
+    det = cpn1+1;
   } break;
   default:{
   } break;
@@ -1424,13 +773,11 @@ void AliITSInitGeometry::DecodeDetectorv11Hybrid(Int_t &mod,Int_t layer,
 }
 
 
-
 //______________________________________________________________________
-void AliITSInitGeometry::RecodeDetectorv11Hybrid(Int_t mod,Int_t &cpn0,
-                                        Int_t &cpn1,Int_t &cpn2) {
-    // decode geometry into detector module number. There are two decoding
-    // Scheams. Old which does not follow the ALICE coordinate system
-    // requirements, and New which does.
+void AliITSInitGeometry::RecodeDetectorv11(Int_t mod,Int_t &cpn0,
+                                          Int_t &cpn1,Int_t &cpn2) {
+    // decode geometry into detector module number using the new decoding
+    // Scheme.
     // Inputs:
     //    Int_t mod      The module number assoicated with this set
     //                   of copy numbers.
@@ -1443,41 +790,32 @@ void AliITSInitGeometry::RecodeDetectorv11Hybrid(Int_t mod,Int_t &cpn0,
     const Int_t kDetPerLadderSPD[2]={2,4};
     Int_t lay,lad,det;
 
-    DecodeDetectorLayersv11Hybrid(mod,lay,lad,det);
+    DecodeDetectorLayersv11(mod,lay,lad,det);
     if (lay<3) { // SPD
         cpn2 = det;     // Detector 1-4
         cpn0 = (lad+kDetPerLadderSPD[lay-1]-1)/kDetPerLadderSPD[lay-1];
         cpn1 = (lad+kDetPerLadderSPD[lay-1]-1)%kDetPerLadderSPD[lay-1] + 1;
-        //if (SPDIsTGeoNative()) {
-        //    cpn2--;
-        //    cpn1--;
-        //}
     } else { // SDD and SSD
         cpn2 = 1;
         cpn1 = det;
         cpn0 = lad;
         if (lay<5) { // SDD
-            if (SDDIsTGeoNative()) {
-                cpn1--;
-                cpn0--;
-            } // end if SDDIsTGeoNative()
+         cpn1--;
+         cpn0--;
         } else { //SSD
-            if (SSDIsTGeoNative()) {
-                cpn1--;
-                cpn0--;
-            }// end if SSDIsTGeoNative()
+         cpn1--;
+         cpn0--;
         } // end if Lay<5/else
     } // end if lay<3/else
-    /*printf("AliITSInitGeometry::RecodeDetectorv11Hybrid:"
-           "mod=%d lay=%d lad=%d det=%d cpn0=%d cpn1=%d cpn2=%d\n",
-           mod,lay,lad,det,cpn0,cpn1,cpn2);*/
+
 }
 
+
 //______________________________________________________________________
-void AliITSInitGeometry::DecodeDetectorLayersv11Hybrid(Int_t mod,Int_t &lay,
-                                              Int_t &lad,Int_t &det) {
+void AliITSInitGeometry::DecodeDetectorLayersv11(Int_t mod,Int_t &lay,
+                                                Int_t &lad,Int_t &det) {
 
-  // decode module number into detector indices for v11Hybrid
+  // decode module number into detector indices for v11
   // mod starts from 0
   // lay, lad, det start from 1
 
@@ -1577,8 +915,7 @@ Bool_t AliITSInitGeometry::WriteVersionString(Char_t *str,Int_t length,
         cvsdate[i] = cvslikedate[6+i]; else cvsdate[i] = 0;
     for(i=0;i<length;i++) str[i] = 0; // zero it out for now.
     i = (Int_t)maj;
-    sprintf(str,"Major Version= %d Minor Version= %d Revision: %s Date: %s",
-            i,min,cvsrevision,cvsdate);
+    snprintf(str,length-1,"Major Version= %d Minor Version= %d Revision: %s Date: %s",i,min,cvsrevision,cvsdate);
     /* this gives compilation warnings on some compilers: descriptor zu
     if(GetDebug()>1)printf("AliITSInitGeometry::WriteVersionString: "
                        "n=%d str=%s revision[%zu] date[%zu]\n",
@@ -1609,13 +946,20 @@ Bool_t AliITSInitGeometry::ReadVersionString(const Char_t *str,Int_t length,
     Bool_t ok;
     Char_t cvsRevision[10],cvsDate[11],cvsTime[9];
     Int_t i,m,n=strlen(str),year,month,day,hours,minuits,seconds;
+    memset(cvsRevision,0,10*sizeof(Char_t));
+    memset(cvsDate,0,11*sizeof(Char_t));    
+    memset(cvsTime,0,9*sizeof(Char_t));
 
     if(GetDebug()>1)printf("AliITSInitGeometry::ReadVersionString:"
                        "str=%s length=%d\n",
                        str,length);
     if(n<35) return kFALSE; // not enough space for numbers
-    m = sscanf(str,"Major Version= %d  Minor Version= %d Revision: %s "
-               "Date: %s %s",&i,&min,cvsRevision,cvsDate,cvsTime);
+    m = sscanf(str,"Major Version= %d  Minor Version= %d Revision: %9s "
+               "Date: %10s %8s",&i,&min,cvsRevision,cvsDate,cvsTime);
+
+    // v11Hybrid geometry is treated as a v11 geometry
+    if(i == 110)i=11;
+
     ok = m==5;
     if(!ok) return !ok;
     m = sscanf(cvsDate,"%d/%d/%d",&year,&month,&day);
@@ -1632,15 +976,9 @@ Bool_t AliITSInitGeometry::ReadVersionString(const Char_t *str,Int_t length,
                        " month=%d day=%d hours=%d minuits=%d seconds=%d\n",
                        year,month,day,hours,minuits,seconds);
     switch (i){
-    case kvPPRasymmFMD:{
-        maj = kvPPRasymmFMD;
-    } break;
     case kv11:{
         maj = kv11;
     } break;
-    case kv11Hybrid:{
-        maj = kv11Hybrid;
-    } break;
     default:{
         maj = kvDefault;
     } break;