]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSvSDD03.cxx
Adding the AliAnalysisGUI class which is the main class that controls the GUI.
[u/mrichter/AliRoot.git] / ITS / AliITSvSDD03.cxx
index 5d9a853e5e67c1fb2c1056b634d7bd501138d425..eb7183ba07b5934a408c8053b6b52b294e747a9c 100644 (file)
 /*
  $Id$ 
 */
+/////////////////////////////////////////////////////////////////
+//  Class for the SDD beam test August2004                     //
+//                                                             //
+//                                                             //
+/////////////////////////////////////////////////////////////////
 
-#include <Riostream.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <TMath.h>
 #include <TGeometry.h>
 #include <TNode.h>
-#include <TTUBE.h>
-#include <TTUBS.h>
-#include <TPCON.h>
-#include <TFile.h>    // only required for Tracking function?
-#include <TCanvas.h>
-#include <TObjArray.h>
-#include <TLorentzVector.h>
-#include <TObjString.h>
-#include <TClonesArray.h>
 #include <TBRIK.h>
-#include <TSystem.h>
+#include <TLorentzVector.h>
 #include <TVirtualMC.h>
+#include <TGeoMatrix.h>
 
 #include "AliMC.h"
 #include "AliRun.h"
 #include "AliMagF.h"
-#include "AliConst.h"
-#include "AliITSGeant3Geometry.h"
 #include "AliTrackReference.h"
 #include "AliITShit.h"
 #include "AliITS.h"
 #include "AliITSvSDD03.h"
 #include "AliITSgeom.h"
-#include "AliITSgeomSPD.h"
 #include "AliITSgeomSDD.h"
 #include "AliITSgeomSSD.h"
-#include "AliITSDetType.h"
-#include "AliITSresponseSPD.h"
-#include "AliITSresponseSDD.h"
-#include "AliITSresponseSSD.h"
+#include "AliITSDetTypeSim.h"
+#include "AliITSCalibrationSPD.h"
+#include "AliITSCalibrationSDD.h"
+#include "AliITSCalibrationSSD.h"
 #include "AliITSsegmentationSPD.h"
 #include "AliITSsegmentationSDD.h"
 #include "AliITSsegmentationSSD.h"
 #include "AliITSsimulationSPD.h"
 #include "AliITSsimulationSDD.h"
 #include "AliITSsimulationSSD.h"
-#include "AliITSClusterFinderSPD.h"
-#include "AliITSClusterFinderSDD.h"
-#include "AliITSClusterFinderSSD.h"
 
 
 ClassImp(AliITSvSDD03)
 
 //______________________________________________________________________
-AliITSvSDD03::AliITSvSDD03() {
+AliITSvSDD03::AliITSvSDD03() :
+AliITS(),
+fGeomDetOut(kFALSE),
+fGeomDetIn(kFALSE),
+fMajorVersion(1),
+fMinorVersion(2),
+fEuclidGeomDet(),
+fRead(),
+fWrite(),
+fDet1(300.0),
+fDet2(300.0),
+fChip1(300.0),
+fChip2(300.0),
+fIDMother(0),
+fYear(2003){
     ////////////////////////////////////////////////////////////////////////
     // Standard default constructor for the ITS SDD test beam 2002 version 1.
     // Inputs:
@@ -83,16 +84,28 @@ AliITSvSDD03::AliITSvSDD03() {
     fIdName       = 0;
     fIdSens       = 0;
     fEuclidOut    = kFALSE; // Don't write Euclide file
-    fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kFALSE; // Don't Read .det file
-    fMajorVersion = IsVersion();
-    fMinorVersion = -1;
     for(i=0;i<60;i++) fRead[i] = '\0';
     for(i=0;i<60;i++) fWrite[i] = '\0';
     for(i=0;i<60;i++) fEuclidGeomDet[i] = '\0';
+    fTarg=kNoTarg;
+    fTargThick=0;
 }
 //______________________________________________________________________
-AliITSvSDD03::AliITSvSDD03(const char *title,Int_t year) : AliITS("ITS", title){
+AliITSvSDD03::AliITSvSDD03(const char *title,Int_t year):
+AliITS("ITS", title),
+fGeomDetOut(kFALSE),
+fGeomDetIn(kFALSE),
+fMajorVersion(1),
+fMinorVersion(2),
+fEuclidGeomDet(),
+fRead(),
+fWrite(),
+fDet1(300.0),
+fDet2(300.0),
+fChip1(300.0),
+fChip2(300.0),
+fIDMother(0),
+fYear(2003){
     ////////////////////////////////////////////////////////////////////////
     //    Standard constructor for the ITS SDD testbeam 2002 version 1.
     // Inputs:
@@ -104,18 +117,17 @@ AliITSvSDD03::AliITSvSDD03(const char *title,Int_t year) : AliITS("ITS", title){
     ////////////////////////////////////////////////////////////////////////
     Int_t i;
 
-    fIdN = 2;
+    fIdN = 3;
     fIdName = new TString[fIdN];
     fIdName[0] = "IMBS";
     fIdName[1] = "ITST";
+    fIdName[2] = "ISNT";
     fIdSens    = new Int_t[fIdN];
     for(i=0;i<fIdN;i++) fIdSens[i] = 0;
-    fMajorVersion = IsVersion();
-    fMinorVersion = 2;
     fEuclidOut    = kFALSE; // Don't write Euclide file
-    fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kFALSE; // Don't Read .det file
     fYear         = year;
+    fTarg=kNoTarg;
+    fTargThick=0;    
     SetThicknessDet1();
     SetThicknessDet2();
     SetThicknessChip1();
@@ -127,7 +139,7 @@ AliITSvSDD03::AliITSvSDD03(const char *title,Int_t year) : AliITS("ITS", title){
     strncpy(fWrite,fEuclidGeomDet,60);
 }
 //______________________________________________________________________
-AliITSvSDD03::AliITSvSDD03(const AliITSvSDD03 &source) : AliITS(source){
+AliITSvSDD03::AliITSvSDD03(const AliITSvSDD03 &source) :  AliITS(source){
     ////////////////////////////////////////////////////////////////////////
     //     Copy Constructor for ITS SDD test beam 2002 version 1.
     // This class is not to be copied. Function only dummy.
@@ -192,118 +204,137 @@ void AliITSvSDD03::BuildGeometry(){
     //    none.
     ////////////////////////////////////////////////////////////////////////
     // Get the top alice volume.
-    TNode *ALIC = gAlice->GetGeometry()->GetNode("alice");
-    ALIC->cd();
+    TNode *nALIC = gAlice->GetGeometry()->GetNode("alice");
+    nALIC->cd();
 
     // Define ITS Mother Volume
     Float_t data[3];
     Float_t ddettest=200.0E-4,ddettelescope=300.0E-4;
-    Float_t dchipMiniBus=750.0E-4,dchiptest=300.0E-4;
     //Float_t yposition= 0.0;
     TRotMatrix *r0 = new TRotMatrix("ITSidrotm0","ITSidrotm0",
                                    90.0,0,0.0,0,90.0,270.0);
     data[0] = 10.0;
-    data[1] = 50.0;
+    data[1] = 10.0;
     data[2] = 100.0;
-    TBRIK *ITSVshape = new TBRIK("ITSVshape","ITS Logical Mother Volume","Air",
+    TBRIK *sITSVshape =new TBRIK("ITSVshape","ITS Logical Mother Volume","Air",
                                 data[0],data[1],data[2]);
-    TNode *ITSV = new TNode("ITSV","ITS Mother Volume",ITSVshape,
+    TNode *sITSV = new TNode("ITSV","ITS Mother Volume",sITSVshape,
                            0.0,0.0,0.0,0,0);
-    ITSV->cd(); // set ourselve into ITSV subvolume of ALIC
+    sITSV->cd(); // set ourselve into ITSV subvolume of ALIC
 
-    // SDD part of telescope (MiniBuS)
-    data[0] = 0.705;
+    // SSD part of telescope (MiniBuS)
+    data[0] = 1.06;
     data[1] = 0.5*ddettelescope;
-    data[2] = 3.536;
-    TBRIK *IMB0shape = new TBRIK("IMB0shape","SDD wafer","Si",
+    data[2] = 1.1;
+    TBRIK *sIMB0shape = new TBRIK("IMB0shape","SDD wafer","Si",
                                 data[0],data[1],data[2]);
     Float_t detMiniBusX,detMiniBusY,detMiniBusZ;
-    data[0] = detMiniBusX = 0.64;
+    data[0] = detMiniBusX = 0.5*384*50.0E-4;
     data[1] = detMiniBusY = 0.5*ddettelescope;
-    data[2] = detMiniBusZ = 3.48;
-    TBRIK *IMBSshape = new TBRIK("IMBSshape","SDD Sensitive volume","Si",
-                                data[0],data[1],data[2]);
-    Float_t chipMiniBusX,chipMiniBusY,chipMiniBusZ;
-    data[0] = chipMiniBusX = 0.793;
-    data[1] = chipMiniBusY = 0.5*dchipMiniBus;
-    data[2] = chipMiniBusZ = 0.68;
-    TBRIK *ICMBshape = new TBRIK("ICMBshape","chip Minibus","Si",
+    data[2] = detMiniBusZ = 1.0;
+    TBRIK *sIMBSshape = new TBRIK("IMBSshape","SDD Sensitive volume","Si",
                                 data[0],data[1],data[2]);
-    data[0] = TMath::Max(detMiniBusX,chipMiniBusX);
-    data[1] = detMiniBusY+chipMiniBusY;
-    data[2] = TMath::Max(detMiniBusZ,chipMiniBusZ);
-    TBRIK *ITELshape = new TBRIK("ITELshape","ITELshape","Air",
+
+    data[0] = 1.36;
+    data[1] = 0.47;
+    data[2] = 1.36;
+    TBRIK *sITELshape = new TBRIK("ITELshape","ITELshape","Air",
                                 data[0],data[1],data[2]);
 
+
     // SDD under test
-    Float_t spdX,spdY,spdZ,spdchipX,spdchipY,spdchipZ;
-    data[0] = 0.705;
-    data[1] = ddettest;
-    data[2] = 3.536;
-    TBRIK *ITS0shape = new TBRIK("ITS0shape","SDD wafer","Si",
+    Float_t spdX,spdY,spdZ;
+    data[0] = 3.62500;
+    data[1] = 0.5*ddettest;
+    data[2] = 4.37940;
+    TBRIK *sITS0shape = new TBRIK("ITS0shape","SDD wafer","Si",
                                 data[0],data[1],data[2]); // contains detector
-    data[0] = spdX = 0.64;
-    data[1] = spdY = ddettest;
-    data[2] = spdZ = 3.48;
-    TBRIK *ITSTshape = new TBRIK("ITSTshape","SDD sensitive volume","Si",
+    data[0] = spdX = 3.50860;
+    data[1] = spdY = 0.5*ddettest;
+    data[2] = spdZ = 3.76320;
+    TBRIK *sITSTshape = new TBRIK("ITSTshape","SDD sensitive volume","Si",
                                 data[0],data[1],data[2]);
-    // ITS0 with no translation and unit rotation matrix.
-    data[0] = spdchipX = 0.793;
-    data[1] = spdchipY = dchiptest;
-    data[2] = spdchipZ = 0.68;
-    TBRIK *IPC0shape = new TBRIK("IPC0shape","Readout Chips","Si",
-                                data[0],data[1],data[2]); // chip under test
-    data[0] = TMath::Max(spdchipX,spdX);
-    data[1] = spdY+spdchipY;
-    data[2] = TMath::Max(spdchipZ,spdZ);
-    TBRIK *IDETshape = new TBRIK("IDETshape","Detector Under Test","Air",
+
+    data[0] = 4.2;
+    data[1] = 0.52;
+    data[2] = 5.2;
+    TBRIK *sIDETshape = new TBRIK("IDETshape","Detector Under Test","Air",
                                 data[0],data[1],data[2]);
+
+
     // Place volumes in geometry
-    Int_t i,j;
     char name[20],title[50];
-    Double_t px=0.0,py=0.0,pz[4]={-38.0,0.0,0.0,0.0};
-    pz[1] = pz[0]+2.0;
-    pz[2] = pz[1]+38.0+spdY+spdchipY+34.5;
-    pz[3] = pz[2]+2.0;
-    TNode *ITEL[4],*ICMB[4],*IMB0[4],*IMBS[4];
-    TNode *IDET = new TNode("IDET","Detector Under Test",IDETshape,
-                           0.0,0.0,pz[1]+38.0,r0,0);
-    IDET->cd();
-    TNode *ITS0 = new TNode("ITS0","SDD Chip",ITS0shape,
-                           0.0,IDETshape->GetDy()-spdY,0.0,0,0);
-    TNode *IPC0[5];
-    for(i=0;i<5;i++) { //place readout chips on the back of SDD chip under test
-       sprintf(name,"IPC0%d",i);
-       sprintf(title,"Readout chip #%d",i+1);
-       j = i-2;
-       IPC0[i] = new TNode(name,title,IPC0shape,
-                           0.0,spdchipY-IDETshape->GetDy(),
-                           j*2.0*spdchipZ+j*0.25*(spdZ-5.*spdchipZ),0,0);
-    } // end for i
-    ITS0->cd();
-    TNode *ITST = new TNode("ITST","SDD sensitive volume",ITSTshape,
+
+    //place SDD under test
+    Double_t px=0.0,py=0.0;
+    Double_t pz[2]={0.0,5.2};
+    TNode *nIDET[2],*nITS0[2],*nITST[2];
+    for(Int_t i=0;i<2;i++){
+       sITSV->cd();
+       sprintf(name,"IDET%d",i);
+       sprintf(title,"SDD #%d under test",i+1);
+       nIDET[i] = new TNode(name,title,sIDETshape,px,py,pz[i],r0,0);
+        nIDET[i]->cd();
+       nITS0[i] = new TNode("ITS0","SDD wafer",sITS0shape,0.0,0.0,0.0,0,0);
+        nITS0[i]->cd();
+       nITST[i] = new TNode("ITST","SDD sensitive volume",sITSTshape,
                            0.0,0.0,0.0,0,0);
-    for(Int_t i=0;i<4;i++){
-       ITSV->cd();
+        nITST[i]->SetLineColor(kYellow);
+        fNodes->Add(nITST[i]);
+    } // end for i
+
+    //place SSD telescope planes
+    Double_t qx=0.0,qy=0.0;
+    Double_t qz[10]={-58.4,-57.4,-50.4,-49.4,60.1,61.1,68.4,69.4,87.7,88.7};
+    TNode *nITEL[10],*nIMB0[10],*nIMBS[10];
+    for(Int_t i=0;i<10;i++){
+       sITSV->cd();
        sprintf(name,"ITEL%d",i);
        sprintf(title,"Test beam telescope element #%d",i+1);
-       ITEL[i] = new TNode(name,title,ITELshape,px,py,pz[i],r0,0);
-       ITEL[i]->cd();
-       ICMB[i] = new TNode("ICMB","Chip MiniBus",ICMBshape,
-                           0.0,-ITELshape->GetDy()+detMiniBusY,0.0,0,0);
-       IMB0[i] = new TNode("IMB0","Chip MiniBus",IMB0shape,
-                           0.0, ITELshape->GetDy()-detMiniBusY,0.0,0,0);
-       IMB0[i]->cd();
-       IMBS[i] = new TNode("IMBS","IMBS",IMBSshape,0.0,0.0,0.0,0,0);
-       // place IMBS inside IMB0 with no translation and unit rotation matrix.
-    } // end for i
-    ALIC->cd();
-    ITST->SetLineColor(kYellow);
-    fNodes->Add(ITST);
-    for(i=0;i<4;i++){
-       IMBS[i]->SetLineColor(kGreen);
-       fNodes->Add(IMBS[i]);
+       nITEL[i] = new TNode(name,title,sITELshape,qx,qy,qz[i],r0,0);
+       nITEL[i]->cd();
+       nIMB0[i] = new TNode("IMB0","Chip MiniBus",sIMB0shape,
+                           0.0, 0.0,0.0,0,0);
+       nIMB0[i]->cd();
+       nIMBS[i] = new TNode("IMBS","IMBS",sIMBSshape,0.0,0.0,0.0,0,0);
+       nIMBS[i]->SetLineColor(kGreen);
+       fNodes->Add(nIMBS[i]);
     } // end for i
+    nALIC->cd();
+    sITSV->Draw();
+}
+//______________________________________________________________________
+Int_t AliITSvSDD03::DecodeDetector(Int_t id,Int_t cpy,Int_t &lay,
+                                   Int_t &det,Int_t &lad) const{
+    // Given the Geant id and copy volume number, returns the layer, ladder,
+    // and detector number, allong with the module number of the detector
+    // involved. Returns -1 and lay=0, lad=0, and det=0 if not a sensitive 
+    // volume.
+    // Inputs:
+    //    Int_t id    Geometry volume id number
+    //    Int_t cpy   Geometry copy number
+    // Outputs:
+    //    Int_t lay   ITS layer number
+    //    Int_t lad   ITS ladder number
+    //    Int_t det   ITS detector number
+    // Return:
+    //    Int_t module number.
+    Int_t mod;
+
+    lay = 0; lad = 0; det = 0; mod = -1;
+    if(id==fIdSens[0]){ // Volume name is IMBS (ITEL)
+        lad = 1; det = 1;
+        lay = cpy;
+        if(cpy>4) lay+=2;
+        mod = lay-1;
+        return mod;
+    }// end if
+    if(id==fIdSens[1]){ // Volume name is ITST (IDet)
+        lad = 1; det = 1;lay = cpy+4; 
+       mod = lay-1;
+        return mod;
+    }// end if
+    return mod;
 }
 //______________________________________________________________________
 void AliITSvSDD03::CreateGeometry(){
@@ -311,7 +342,7 @@ void AliITSvSDD03::CreateGeometry(){
     //  This routine defines and Creates the geometry for version 1 of the ITS.
     //    ALIC    ALICE Mother Volume
     //     |- ITSV     ITS Mother Volume
-    //         |- IDET       Detector under Test (box containing SDD)
+    //         |- IDET       Detector under Test (boxcontaining SDD)
     //         |   |-IDAI        Air inside box
     //         |       |- ITS0       SDD Si Chip
     //         |          |- ITST      SDD Sensitivve Volume
@@ -334,62 +365,65 @@ void AliITSvSDD03::CreateGeometry(){
     //Float_t ddettest=200.0E-4,ddettelescope=300.0E-4;
     //Float_t dchipMiniBus=750.0E-4,dchiptest=300.0E-4;
     //Float_t yposition= 0.0;
-    const Float_t kmm=0.1,kcm=1.0,kmicm=0.001;
-
+    const Float_t kmm=0.1,kcm=1.0,kmicm=kmm/1000.;
     // Define Rotation-reflextion Matrixes needed
     // 0 is the unit matrix
     AliMatrix(idrotm[0], 90.0,0.0, 0.0,0.0, 90.0,270.0); // SDD and SSD X
-    AliMatrix(idrotm[1], 90.0,0.0, 0.0,0.0, 90.0,270.0); // SSD Y
-    data[0] = 100.0*kmm;
-    data[1] = 100.0*kmm;
-    data[2] = 800.0*kmm;
+    AliMatrix(idrotm[1], 90.0,90.0, 0.0,180.0, 90.0,270.0); // SSD Y
+    AliMatrix(idrotm[2],90.0,90.0,90.0,180.0,0.0,0.0);  //Rotate about Z 90 degree
+
+    data[0] = 150.0*kmm;
+    data[1] = 150.0*kmm;
+    data[2] = 1100.0*kmm;
     gMC->Gsvolu("ITSV","BOX ",idtmed[0],data,3);
     gMC->Gspos("ITSV",1,"ALIC",0.0,0.0,0.0,0,"ONLY");
 
-    //cout << "idtmed[0]=" << idtmed[0]<<endl;
-    //cout << "idtmed[1]=" << idtmed[1]<<endl;
+
     // Crossed sintilator triggers (2 in front 2 in back)
-    AliMatrix(idrotm[2],90.0,0.0,90.0,90.0,90.0,0.0);//Rotate about Z 90 degree
     data[0] = 10.0*kcm;
     data[1] = 2.0*kcm;
     data[2] = 2.0*kmm;
-    gMC->Gsvolu("ISNT","BOX ",idtmed[3],data,3);
-    gMC->Gspos("ISNT",1,"ITSV",0.0,0.0,800.0*kmm+data[2],0,"ONLY");
-    gMC->Gspos("ISNT",2,"ITSV",0.0,0.0,800.0*kmm,idrotm[2],"ONLY");
-    gMC->Gspos("ISNT",3,"ITSV",0.0,0.0,-800.0*kmm,0,"ONLY");
-    gMC->Gspos("ISNT",4,"ITSV",0.0,0.0,-800.0*kmm-data[2],idrotm[2],"ONLY");
-    Float_t detMiniBusX,detMiniBusY,detMiniBusZ;
+    gMC->Gsvolu("ISNT","BOX ",idtmed[2],data,3);
+    gMC->Gspos("ISNT",1,"ITSV",0.0,0.0,-950.0*kmm,0,"ONLY");
+    gMC->Gspos("ISNT",2,"ITSV",0.0,0.0,-950.0*kmm-data[2],idrotm[2],"ONLY");
+    gMC->Gspos("ISNT",3,"ITSV",0.0,0.0,950.0*kmm+data[2],0,"ONLY");
+    gMC->Gspos("ISNT",4,"ITSV",0.0,0.0,950.0*kmm,idrotm[2],"ONLY");
+
+
+////Create Volumes
+
     // SSD part of telescope (MiniBuS)
+    Float_t detMiniBusX,detMiniBusY,detMiniBusZ;
     data[0] = detMiniBusX = 10600.0*kmicm;
-    data[1] = detMiniBusY = 0.0150*kcm;
+    data[1] = detMiniBusY = 0.150*kmm;
     data[2] = detMiniBusZ = 1.1*kcm;
     gMC->Gsvolu("IMB0", "BOX ", idtmed[1], data, 3);   // contains detector
     data[0] = 0.5*384*50*kmicm;
-    data[1] = 0.1499*kcm;
+    data[1] = 0.1499*kmm;
     data[2] = 1.0*kcm;
-    gMC->Gsvolu("IMBS","BOX ",idtmed[1],data,3); // sensitive detecor volulme
+    gMC->Gsvolu("IMBS","BOX ",idtmed[1],data,3); // sensitive detector volume
     gMC->Gspos("IMBS",1,"IMB0",0.0,0.0,0.0,0,"ONLY"); // place IMBS inside
     // Box containing SSD's
-    data[0] = 4.0*kcm;
-    data[1] = 0.500*kcm;
-    data[2] = 5.0*kcm;
+    data[0] = 11600.0*kmicm;
+    data[1] = 0.450*kcm;
+    data[2] = 1.16*kcm;
     gMC->Gsvolu("ITAI","BOX ",idtmed[0],data,3);
     // Plastic box size = insize + thickness.
     data[0] = data[0] + 2.0*kmm;
     data[1] = data[1] + 200.0*kmicm;
     data[2] = data[2] + 2.0*kmm;
-    gMC->Gsvolu("ITEL","BOX ",idtmed[4],data,3);
+    gMC->Gsvolu("ITEL","BOX ",idtmed[3],data,3);
     gMC->Gspos("ITAI",1,"ITEL",0.0,0.0,0.0,0,"ONLY");
-    gMC->Gspos("IMB0",1,"ITAI",0.0,data[1]-detMiniBusY,0.0,0,"ONLY");
+    gMC->Gspos("IMB0",1,"ITAI",0.0,0.0,0.0,0,"ONLY");
 
     // SDD under test
     Float_t sddX,sddY,sddZ;
     data[0] = sddX = 3.62500*kcm;
-    data[1] = sddY = 0.01500*kcm;
+    data[1] = sddY = 0.1500*kmm;
     data[2] = sddZ = 4.37940*kcm;
     gMC->Gsvolu("ITS0", "BOX ", idtmed[1], data, 3);   // contains detector
     data[0] = 3.50860*kcm;
-    data[1] = 0.01499*kcm;
+    data[1] = 0.1499*kmm;
     data[2] = 3.76320*kcm;
     gMC->Gsvolu("ITST","BOX ",idtmed[1],data,3);// sensitive detecor volume
     gMC->Gspos("ITST",1,"ITS0",0.0,0.0,0.0,0,"ONLY"); // place ITST inside
@@ -400,58 +434,93 @@ void AliITSvSDD03::CreateGeometry(){
     gMC->Gsvolu("IDAI","BOX ",idtmed[0],data,3);
     data[0] = data[0] + 2.0*kmm;
     data[1] = data[1] + 200.0*kmicm;
-    data[2] = data[2] = 2.0*kmm;
-    gMC->Gsvolu("IDET","BOX ",idtmed[0],data,3);
+    data[2] = data[2] + 2.0*kmm;
+    gMC->Gsvolu("IDET","BOX ",idtmed[3],data,3);
     gMC->Gspos("IDAI",1,"IDET",0.0,0.0,0.0,0,"ONLY");
     gMC->Gspos("ITS0",1,"IDAI",0.0,0.0,0.0,0,"ONLY");
 
-    // Positions detectors, Beam Axis Z, X to the right, Y up to the sky.
+
+//// Position detectors, Beam Axis Z, X to the right, Y up to the sky.
+    // Upsteram planes of the telescope    
     Float_t p00X,p00Y,p00Z,p01X,p01Y,p01Z,p10X,p10Y,p10Z,p11X,p11Y,p11Z;
     p00X = 0.0*kcm;
     p00Y = 0.0*kcm;
-    p00Z = -694*kmm;
+    p00Z = -584*kmm;
     gMC->Gspos("ITEL",1,"ITSV",p00X,p00Y,p00Z,idrotm[0],"ONLY");//SSD X
     p01X = 0.0*kcm;
     p01Y = 0.0*kcm;
-    p01Z = -684*kmm;
+    p01Z = -574*kmm;
     gMC->Gspos("ITEL",2,"ITSV",p01X,p01Y,p01Z,idrotm[1],"ONLY");//SSD Y
     p01X = 0.0*kcm;
     p01Y = 0.0*kcm;
-    p01Z = -612*kmm;
+    p01Z = -504*kmm;
     gMC->Gspos("ITEL",3,"ITSV",p01X,p01Y,p01Z,idrotm[0],"ONLY");//SSD X
     p01X = 0.0*kcm;
     p01Y = 0.0*kcm;
-    p01Z = -602*kmm;
-    Float_t pdetX,pdetY,pdetZ;
+    p01Z = -494*kmm;
     gMC->Gspos("ITEL",4,"ITSV",p01X,p01Y,p01Z,idrotm[1],"ONLY");//SSD Y
-    pdetX = 0.0*kcm;
-    pdetY = 0.0*kcm;
-    pdetZ = 0.0*kcm;
-    gMC->Gspos("IDET",1,"ITSV",pdetX,pdetY,pdetZ,idrotm[0],"ONLY");// Detecor
+
+    // Downstream planes of the telescope
     p10X = 0.0*kcm;
     p10Y = 0.0*kcm;
-    p10Z = +450.0*kmm;
+    p10Z = +601.0*kmm; 
     gMC->Gspos("ITEL",5,"ITSV",p10X,p10Y,p10Z,idrotm[0],"ONLY");//SSD X
     p11X = 0.0*kcm;
     p11Y = 0.0*kcm;
-    p11Z = +460.0*kcm;
+    p11Z = +610.0*kmm; //611.0
     gMC->Gspos("ITEL",6,"ITSV",p11X,p11Y,p11Z,idrotm[1],"ONLY");//SSD Y
     p11X = 0.0*kcm;
     p11Y = 0.0*kcm;
-    p11Z = +540.0*kcm;
+    p11Z = +684.0*kmm;
     gMC->Gspos("ITEL",7,"ITSV",p11X,p11Y,p11Z,idrotm[0],"ONLY");//SSD X
     p11X = 0.0*kcm;
     p11Y = 0.0*kcm;
-    p11Z = +550.0*kcm;
+    p11Z = +694.0*kmm;
     gMC->Gspos("ITEL",8,"ITSV",p11X,p11Y,p11Z,idrotm[1],"ONLY");//SSD Y
     p11X = 0.0*kcm;
     p11Y = 0.0*kcm;
-    p11Z = +737.0*kcm;
+    p11Z = +877.0*kmm;
     gMC->Gspos("ITEL",9,"ITSV",p11X,p11Y,p11Z,idrotm[0],"ONLY");//SSD X
     p11X = 0.0*kcm;
     p11Y = 0.0*kcm;
-    p11Z = +747.0*kcm;
+    p11Z = +887.0*kmm;
     gMC->Gspos("ITEL",10,"ITSV",p11X,p11Y,p11Z,idrotm[1],"ONLY");//SSD Y
+
+    // SDDs 
+    Float_t pdet1X,pdet1Y,pdet1Z;
+    Float_t pdet2X,pdet2Y,pdet2Z;
+    pdet1X = 0.0*kcm;
+    pdet1Y = 0.0*kcm;
+    pdet1Z = 0.0*kcm;
+    gMC->Gspos("IDET",1,"ITSV",pdet1X,pdet1Y,pdet1Z,idrotm[0],"ONLY");// Detector1
+    pdet2X = 0.0*kcm;
+    pdet2Y = 0.0*kcm;
+    pdet2Z = 52*kmm; //52
+    gMC->Gspos("IDET",2,"ITSV",pdet2X,pdet2Y,pdet2Z,idrotm[0],"ONLY");// Detector2
+
+// Target definition and placement
+    if(fTarg){
+      data[0] = 30*kmm;
+      data[1] = fTargThick*kmm;  // Target thickness
+      data[2] = 30*kmm;
+      gMC->Gsvolu("ITGT","BOX ",idtmed[fTarg],data,3);
+
+      Float_t a,z,dens,radl,absl;
+      Float_t* ubuf=0; Int_t nbuf;
+      char* ssss="";
+      gMC->Gfmate(idtmed[fTarg],ssss,a,z,dens,radl,absl,ubuf,nbuf);
+
+      Info("CreateGeometry","Target A=%f,  Z=%f,  dens=%f",a,z,dens);
+      Info("Creategeometry","Target thickness=%f mm",fTargThick);
+
+      Float_t ptgtX,ptgtY,ptgtZ;
+      ptgtX = 0.0*kcm;
+      ptgtY = 0.0*kcm;
+      ptgtZ = -50*kmm;
+      gMC->Gspos("ITGT",1,"ITSV",ptgtX,ptgtY,ptgtZ,idrotm[0],"ONLY");// Target
+    }else{
+      Info("CreateGeometry","No target defined");
+    }
 }
 //______________________________________________________________________
 void AliITSvSDD03::CreateMaterials(){
@@ -462,7 +531,7 @@ void AliITSvSDD03::CreateMaterials(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSDD03.
     // In general it is automatically replaced by
-    // the CreatMaterials routine defined in AliITSv?. Should the function
+    // the CreateMaterials routine defined in AliITSv?. Should the function
     // CreateMaterials not exist for the geometry version you are using this
     // one is used. See the definition found in AliITSv5 or the other routine
     // for a complete definition.
@@ -475,44 +544,159 @@ void AliITSvSDD03::CreateMaterials(){
     //    none.
     /////////////////////////////////////////////////////////////////////////
     Float_t tmaxfdSi = 0.1; // Degree
-    Float_t stemaxSi = 0.0075; // cm
+    Float_t stemaxSi = 0.0075; // cm //0.0075
     Float_t deemaxSi = 0.1; // Fraction of particle's energy 0<deemax<=1
     Float_t epsilSi  = 1.0E-4;//
     Float_t stminSi  = 0.0; // cm "Default value used"
 
     Float_t tmaxfdAir = 0.1; // Degree
-    Float_t stemaxAir = .10000E+01; // cm
+    Float_t stemaxAir = .10000E+01; // 1 cm  //cm
     Float_t deemaxAir = 0.1; // Fraction of particle's energy 0<deemax<=1
     Float_t epsilAir  = 1.0E-4;//
     Float_t stminAir  = 0.0; // cm "Default value used"
     Int_t   ifield = gAlice->Field()->Integ();
     Float_t fieldm = gAlice->Field()->Max();
     //
-    const Float_t kgpcm3=1.0,kcm=1.0;
-    //
-    Float_t z[10],a[10],w[10];
 
-    z[0] = 7.0; a[0] = 14.00674; w[0] = 0.80;
-    z[1] = 8.0; a[1] = 15.99940; w[1] = 0.20;
-    AliMixture(1,"AIR$",a,z,0.12050E-02*kgpcm3,2,w);
+    // AIR
+    Float_t aAir[4]={12.0107,14.0067,15.9994,39.948};
+    Float_t zAir[4]={6.,7.,8.,18.};
+    Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
+    Float_t dAir = 1.20479E-3;
+    // Lucite/Plexiglass
+    Float_t aLuc[3] = {1.,12.,16.};
+    Float_t zLuc[3] = {1.,6.,8.};
+    Float_t wLuc[3] = {8.,5.,2.};
+    Float_t dLuc = 1.19;
+    // stainless steel
+    Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
+    Float_t zsteel[4] = { 26.,24.,28.,14. };
+    Float_t wsteel[4] = { .715,.18,.1,.005 };
+    Float_t dsteel = 7.88;
+
+    AliMixture(1, "AIR$",aAir,zAir,dAir,4,wAir);
+    AliMaterial(2,"SI$",28.086,14.0,2.3300,9.3600,999.00);
+    AliMixture(3,"Sintilator$",aLuc,zLuc,dLuc,-3,wLuc);
+    AliMixture(4,"PlasticBox$",aLuc,zLuc,dLuc,-3,wLuc);
+    AliMaterial(5, "IRON$", 55.85, 26., 7.87, 1.76, 999.00);
+    AliMaterial(6, "LEAD$", 207.19, 82., 11.35, .56, 999.00);
+    AliMixture(7, "STAINLESS STEEL$", asteel, zsteel,dsteel, 4, wsteel);
+    AliMaterial(9, "C$", 12.011, 6., 2.265, 18.8, 999.00);
+    AliMaterial(10, "Al$", 26.98, 13., 2.70, 8.9, 999.00);
+    AliMaterial(11, "Be$", 9.012, 4., 1.848, 35.3, 999.00);
+    AliMaterial(12, "Ti$", 47.88, 22., 4.54, 3.56, 999.00);
+    AliMaterial(13, "Sn$", 118.69, 50., 7.31, 1.21, 999.00); 
+    AliMaterial(14, "Cu$", 63.55, 29., 8.96, 1.43, 999.00);
+    AliMaterial(15, "Ge$", 72.59, 32., 5.323, 2.30, 999.00);
+    AliMaterial(20, "W$", 183.85, 74., 19.3, 0.35, 999.00);
     AliMedium(1,"AIR$",1,0,ifield,fieldm,tmaxfdAir,stemaxAir,deemaxAir,
              epsilAir,stminAir);
-
-    AliMaterial(2,"SI$",0.28086E+02,0.14000E+02,0.23300E+01,
-               0.93600E+01*kcm,0.99900E+03);
     AliMedium(2,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
              epsilSi,stminSi);
-    // sintilator is basicaly polystyrene
-    z[0] = 7.0; a[0] = 14.00674; w[0] = 0.80;
-    AliMixture(3,"Sintilator$",a,z,1.032*kgpcm3,0,w);
-    AliMedium(3,"Sintilator$",3,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+    AliMedium(3,"Scintillator$",3,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
              epsilSi,stminSi);
-    // assumed to be Lucite/Plexiglas
-    z[0] = 7.0; a[0] = 14.00674; w[0] = 0.80;
-    AliMixture(4,"PlasticBox$",a,z,1.18*kgpcm3,0,w);
     AliMedium(4,"PlasticBox$",4,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
              epsilSi,stminSi);
-}
+    AliMedium(5,"IRON$",5,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+    AliMedium(6,"LEAD$",6,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+    AliMedium(7,"StainlessSteel$",7,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+
+    AliMedium(9,"C$",9,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(10,"Al$",10,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(11,"Be$",11,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(12,"Ti$",12,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(13,"Sn$",13,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(14,"Cu$",14,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(15,"Ge$",15,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    AliMedium(20,"W$",20,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,epsilSi,stminSi);
+    //dummy materials to avoid warning during simulation (galice.cuts)
+
+   AliMedium(21,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(25,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(26,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(27,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(51,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(52,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(53,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(54,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(55,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(56,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(61,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(62,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(63,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(64,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(65,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(68,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(69,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(70,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(71,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(72,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(73,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(74,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(75,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(76,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(77,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(78,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(79,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(80,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(81,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(82,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(83,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(84,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(85,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(90,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(91,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(92,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(93,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(94,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(95,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+   AliMedium(96,"SI$",2,0,ifield,fieldm,tmaxfdSi,stemaxSi,deemaxSi,
+             epsilSi,stminSi);
+
+}           
 //______________________________________________________________________
 void AliITSvSDD03::InitAliITSgeom(){
     //     Based on the geometry tree defined in Geant 3.21, this
@@ -524,84 +708,64 @@ void AliITSvSDD03::InitAliITSgeom(){
     //    none.
     // Return:
     //    none.
+    const Int_t knlayers=12;
+    //   const Int_t kndeep=6;
+    const Int_t kltypess=2;
+    const AliITSDetector kidet[knlayers]={kSSD,kSDD};
+    const TString knames[kltypess]={
+        "/ALIC_1/ITSV_1/ITEL_%d/ITAI_1/IMB0_1/IMBS_1",
+        "/ALIC_1/ITSV_1/IDET_%d/IDAI_1/ITS0_1/ITST_1"};
+    const Int_t kitsGeomTreeCopys[kltypess]={10,2};
+    const Int_t knp=384;
+    const Float_t kpitch=50.E-4;/*cm*/
+    Float_t box[3]={0.5*kpitch*(Float_t)knp,150.E-4,1.0},p[knp+1],n[knp+1];
+    Int_t nlad[knlayers]={knlayers*1};
+    Int_t ndet[knlayers]={knlayers*1};
+    Int_t mod=knlayers,lay=0,lad=0,det=0,i,j,cp0;
+    TString path,shapeName;
+    TGeoHMatrix matrix;
+    Double_t trans[3]={3*0.0},rot[10]={10*0.0};
+    TArrayD shapePar;
+    TArrayF shapeParF;
+    Bool_t isShapeDefined[kltypess]={kltypess*kFALSE};
+    AliITSgeom *geom = new AliITSgeom(0,knlayers,nlad,ndet,mod);
+    if(GetITSgeom()!=0) SetITSgeom(0x0);// delet existing if there.
+    SetITSgeom(geom);
 
-    if(strcmp(gMC->GetName(),"TGeant3")) {
-        Error("InitAliITSgeom",
-              "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
-        return;
-    } // end if
-    cout << "Reading Geometry transformation directly from Geant 3." << endl;
-    const Int_t np=384;
-    const Float_t pitch=50.E-4;/*cm*/
-    Float_t box[3]={0.5*pitch*(Float_t)np,150.E-4,1.0},p[np],n[np];
-    const Int_t ltypess = 2;
-    const Int_t nlayers = 6;
-    const Int_t ndeep = 6;
-    Int_t itsGeomTreeNames[ltypess][ndeep],lnam[20],lnum[20];
-    Int_t nlad[nlayers],ndet[nlayers];
-    Double_t t[3],r[10];
-    Float_t  par[20],att[20];
-    Int_t    npar,natt,idshape,imat,imed;
-    AliITSGeant3Geometry *ig = new AliITSGeant3Geometry();
-    Int_t mod,typ,lay,lad,det,cpy,i,j,k;
-    Char_t names[ltypess][ndeep][4];
-    Int_t itsGeomTreeCopys[ltypess][ndeep];
-    Char_t *namesA[ltypess][ndeep] = {
-        {"ALIC","ITSV","ITEL","ITAI","IMB0","IMBS"}, // lay=5
-        {"ALIC","ITSV","IDET","IDAI","ITS0","ITST"}};// Test SDD
-    Int_t itsGeomTreeCopysA[ltypess][ndeep]= {{1,1,10,1,1,1},// lay=5
-                                              {1,1,1,1,1,1}};//lay=3 TestSDD
-    for(i=0;i<ltypess;i++)for(j=0;j<ndeep;j++){
-        for(k=0;k<4;k++) names[i][j][k] = namesA[i][j][k];
-        itsGeomTreeCopys[i][j] = itsGeomTreeCopysA[i][j];
-    } // end for i,j
-    for(i=0;i<np;i++){// Fill in anode and cathode strip locations (lower edge)
-        p[i] = 0.5*pitch*(Float_t)np + pitch*(Float_t)i;
-        n[i] = pitch*(Float_t)np - p[i];
+    p[0]=-box[0];
+    n[0]=box[0];
+    // Fill in anode and cathode strip locations (lower edge)
+    for(i=1;i<knp;i++){
+        p[i] =p[i-1]+kpitch;
+        n[i] =n[i-1]-kpitch;
     } // end for i
-    // Sorry, but this is not very pritty code. It should be replaced
-    // at some point with a version that can search through the geometry
-    // tree its self.
-    cout << "Reading Geometry informaton from Geant3 common blocks" << endl;
-    for(i=0;i<20;i++) lnam[i] = lnum[i] = 0;
-    for(i=0;i<ltypess;i++)for(j=0;j<ndeep;j++) 
-        strncpy((char*) &itsGeomTreeNames[i][j],names[i][j],4);
-    // itsGeomTreeNames[i][j] = ig->StringToInt(names[i][j]);
-    mod = 5;
-    if(fITSgeom!=0) delete fITSgeom;
-    nlad[0]=1;nlad[1]=1;nlad[2]=1;nlad[3]=1;nlad[4]=1;
-    ndet[0]=1;ndet[1]=1;ndet[2]=1;ndet[3]=1;ndet[4]=1;
-    fITSgeom = new AliITSgeom(0,nlayers,nlad,ndet,mod);
-    for(typ=1;typ<=ltypess;typ++){
-        for(j=0;j<ndeep;j++) lnam[j] = itsGeomTreeNames[typ-1][j];
-        for(j=0;j<ndeep;j++) lnum[j] = itsGeomTreeCopys[typ-1][j];
-        lad = 1;
-        det = 1;
-        for(cpy=1;cpy<=itsGeomTreeCopys[typ-1][2];cpy++){
-            lnum[2] = cpy;
-            lay = cpy;
-            if(cpy>2 && typ==1) lay = cpy +1;
-            if(typ==2) lay = 3;
-            mod = lay-1;
-            ig->GetGeometry(ndeep,lnam,lnum,t,r,idshape,npar,natt,par,att,
-                            imat,imed);
-            switch (typ){
-            case 1:
-                if(!(fITSgeom->IsShapeDefined((Int_t)kSDD))){
-                    fITSgeom->CreatMatrix(mod,lay,lad,det,kSDD,t,r);
-                    fITSgeom->ReSetShape(kSDD,new AliITSgeomSDD256(npar,par));
-                } // end if
-                break;
-            case 2:
-                if(!(fITSgeom->IsShapeDefined((Int_t)kSSD))){
-                    fITSgeom->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
-                    fITSgeom->ReSetShape(kSSD,new AliITSgeomSSD(box,0.0,0.0,
-                                                              np+1,p,np+1,n));
-                } // end if
-                break;
-            } // end switch
-        } // end for cpy
-    } // end for typ
+    p[knp]=box[0];
+    n[knp]=-box[0];
+    for(i=0;i<kltypess;i++)for(cp0=1;cp0<=kitsGeomTreeCopys[i];cp0++){
+        mod = DecodeDetector(fIdSens[i],cp0,lay,lad,det);
+        path.Form(knames[i].Data(),cp0);
+        gMC->GetTransformation(path.Data(),matrix);
+        gMC->GetShape(path.Data(),shapeName,shapePar);
+        shapeParF.Set(shapePar.GetSize());
+        for(j=0;j<shapePar.GetSize();j++)shapeParF[j]=shapePar[j];
+        geom->CreateMatrix(mod,lay,lad,det,kidet[i],trans,rot);
+        geom->SetTrans(mod,matrix.GetTranslation());
+        geom->SetRotMatrix(mod,matrix.GetRotationMatrix());
+        geom->GetGeomMatrix(mod)->SetPath(path.Data());
+        switch (kidet[i]){
+        case kSDD: if(!(GetITSgeom()->IsShapeDefined((Int_t)kSDD))){
+            geom->ReSetShape(kSDD,new AliITSgeomSDD256(shapeParF.GetSize(),
+                                                       shapeParF.GetArray()));
+            isShapeDefined[i]=kTRUE;
+        } break;
+        case kSSD:if(!(GetITSgeom()->IsShapeDefined((Int_t)kSSD))){
+            geom->ReSetShape(kSSD,new AliITSgeomSSD(box,0.0,0.0,
+                                                    knp+1,p,knp+1,n));
+            isShapeDefined[i]=kTRUE;
+        } break;
+        default:{} break;
+        } // end switch
+    } // end for i,cp0
     return;
 }
 //______________________________________________________________________
@@ -615,25 +779,21 @@ void AliITSvSDD03::Init(){
     // Return:
     //    none.
     ////////////////////////////////////////////////////////////////////////
-    Int_t i;
 
-    cout << endl;
-    for(i=0;i<26;i++) cout << "*";
-    cout << " AliITSvSDD03" << fMinorVersion << "_Init ";
-    for(i=0;i<25;i++) cout << "*";cout << endl;
-//
+
+    Info("Init","**********AliITSvSDD03 %d _Init *************",fMinorVersion);
+
     if(fRead[0]=='\0') strncpy(fRead,fEuclidGeomDet,60);
     if(fWrite[0]=='\0') strncpy(fWrite,fEuclidGeomDet,60);
-    if(fITSgeom!=0) delete fITSgeom;
-    fITSgeom = new AliITSgeom();
-    if(fGeomDetIn) fITSgeom->ReadNewFile(fRead);
+    if(GetITSgeom()!=0) SetITSgeom(0x0);
+    AliITSgeom* geom = new AliITSgeom();
+    SetITSgeom(geom);
+    if(fGeomDetIn) GetITSgeom()->ReadNewFile(fRead);
     if(!fGeomDetIn) this->InitAliITSgeom();
-    if(fGeomDetOut) fITSgeom->WriteNewFile(fWrite);
+    if(fGeomDetOut) GetITSgeom()->WriteNewFile(fWrite);
     AliITS::Init();
-//
-    for(i=0;i<72;i++) cout << "*";
-    cout << endl;
     fIDMother = gMC->VolId("ITSV"); // ITS Mother Volume ID.
+
 }
 //______________________________________________________________________
 void AliITSvSDD03::SetDefaults(){
@@ -644,58 +804,59 @@ void AliITSvSDD03::SetDefaults(){
     //    none.
     // Return:
     //    none.
-    const Float_t kconv = 1.0e+04; // convert cm to microns
 
-    Info("SetDefaults","Setting up only SDD detector");
+  //    const Float_t kconv = 1.0e+04; // convert cm to microns
 
-    AliITSDetType *iDetType;
+    if(!fDetTypeSim) fDetTypeSim = new AliITSDetTypeSim();
+    fDetTypeSim->SetITSgeom(GetITSgeom());
+    fDetTypeSim->ResetCalibrationArray();
+    fDetTypeSim->ResetSegmentation();
     AliITSgeomSDD *s1;
     AliITSgeomSSD *s2;
-    //Int_t i;
-    //Float_t bx[256],bz[280];
+    SetCalibrationModel(GetITSgeom()->GetStartSPD(),new AliITSCalibrationSPD());
+    SetSegmentationModel(kSPD,(AliITSsegmentationSPD*)
+                        (GetITSgeom()->GetShape(kSPD)));
+    fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigitSPD");
 
     // SDD
-    iDetType=DetType(kSDD);
-    s1 = (AliITSgeomSDD*) fITSgeom->GetShape(kSDD);// Get shape info. Do it this way for now.
-    AliITSresponseSDD *resp1=new AliITSresponseSDD("simulated");
-    SetResponseModel(kSDD,resp1);
-    AliITSsegmentationSDD *seg1=new AliITSsegmentationSDD(fITSgeom,resp1);
-    seg1->SetDetSize(s1->GetDx()*kconv, // base this on AliITSgeomSDD
-                    s1->GetDz()*2.*kconv, // for now.
-                    s1->GetDy()*2.*kconv); // x,z,y full width in microns.
+    s1 = (AliITSgeomSDD*) GetITSgeom()->GetShape(kSDD);// Get shape info. Do it this way for now.
+    AliITSCalibrationSDD *resp1=new AliITSCalibrationSDD("simulated");
+    SetCalibrationModel(GetITSgeom()->GetStartSDD(),resp1);
+
+    AliITSsegmentationSDD *seg1 = (AliITSsegmentationSDD*)
+                        (GetITSgeom()->GetShape(kSDD));
+    seg1->SetDriftSpeed(resp1->GetDriftSpeed());
     seg1->SetNPads(256,256);// Use AliITSgeomSDD for now
     SetSegmentationModel(kSDD,seg1);
-    const char *kData1=(iDetType->GetResponseModel())->DataType();
-    const char *kopt=iDetType->GetResponseModel()->ZeroSuppOption();
+    const char *kData1=(fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSDD()))->DataType();
+    const char *kopt=resp1->GetZeroSuppOption();
     if((!strstr(kopt,"2D")) && (!strstr(kopt,"1D")) || strstr(kData1,"real") ){
-       iDetType->ClassNames("AliITSdigit","AliITSRawClusterSDD");
-    } else iDetType->ClassNames("AliITSdigitSDD","AliITSRawClusterSDD");
-//    SetSimulationModel(kSDD,new AliITSsimulationSDD(seg1,resp1));
-//    iDetType->ReconstructionModel(new AliITSClusterFinderSDD());
+       fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigit");
+    } else fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigitSDD");
 
     // SSD  Layer 5
-    iDetType=DetType(kSSD);
-    s2 = (AliITSgeomSSD*) fITSgeom->GetShape(kSSD);// Get shape info. Do it this way for now.
-    AliITSresponse *resp2=new AliITSresponseSSD("simulated");
-    SetResponseModel(kSSD,resp2);
-    AliITSsegmentationSSD *seg2=new AliITSsegmentationSSD(fITSgeom);
-    seg2->SetDetSize(s2->GetDx()*2.*kconv, // base this on AliITSgeomSSD
-                    s2->GetDz()*2.*kconv, // for now.
-                    s2->GetDy()*2.*kconv); // x,z,y full width in microns.
-    seg2->SetPadSize(95.,0.); // strip x pitch in microns
-    seg2->SetNPads(768,0); // number of strips on each side.
-    seg2->SetAngles(0.0075,0.0275); // strip angels rad P and N side.
-    seg2->SetAnglesLay5(0.0075,0.0275); // strip angels rad P and N side.
-    seg2->SetAnglesLay6(0.0275,0.0075); // strip angels rad P and N side.
+
+    s2 = (AliITSgeomSSD*) GetITSgeom()->GetShape(kSSD);// Get shape info. Do it this way for now.
+   
+    AliITSCalibration *resp2= new AliITSCalibrationSSD("simulated");
+    SetCalibrationModel(GetITSgeom()->GetStartSSD(),resp2);
+
+    AliITSsegmentationSSD *seg2 = (AliITSsegmentationSSD*)
+                        (GetITSgeom()->GetShape(kSSD));
+    seg2->SetPadSize(50.,0.); // strip x pitch in microns
+    seg2->SetNPads(384,0); // number of strips on each side.
+    seg2->SetLayer(5);
+    seg2->SetAngles(0.,0.); // strip angles rad P and N side.
+    seg2->SetAnglesLay5(0.,0.); // strip angles rad P and N side.
+    seg2->SetAnglesLay6(0.,0.); // strip angles rad P and N side.
+
     SetSegmentationModel(kSSD,seg2); 
-    const char *kData2=(iDetType->GetResponseModel())->DataType();
-    if(strstr(kData2,"real") ) iDetType->ClassNames("AliITSdigit",
-                                                   "AliITSRawClusterSSD");
-    else iDetType->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
-//    SetSimulationModel(kSSD,new AliITSsimulationSSD(seg2,resp2));
-//    iDetType->ReconstructionModel(new AliITSClusterFinderSSD());
-
-    if(kNTYPES>3){
+    const char *kData2=(fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSSD()))->DataType();
+    if(strstr(kData2,"real") ) fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigit");
+    else fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigitSSD");
+
+    if(fgkNTYPES>3){
        Warning("SetDefaults",
                "Only the four basic detector types are initialised!");
     }// end if
@@ -711,62 +872,58 @@ void AliITSvSDD03::SetDefaultSimulation(){
     // Return:
     //      none.
 
-    AliITSDetType *iDetType;
-    AliITSsimulation *sim;
-    iDetType=DetType(kSPD);
-    sim = iDetType->GetSimulationModel();
+  if(!fDetTypeSim) fDetTypeSim = new AliITSDetTypeSim();
+  AliITSsimulation *sim;
+  //AliITSsegmentation *seg;
+  //AliITSCalibration *res;
+  //SPD
+  if(fDetTypeSim){
+    sim = fDetTypeSim->GetSimulationModel(kSPD);
     if (!sim) {
-        AliITSsegmentation *seg0=
-            (AliITSsegmentation*)iDetType->GetSegmentationModel();
-        AliITSresponse *res0 = (AliITSresponse*)iDetType->GetResponseModel();
-        AliITSsimulationSPD *sim0=new AliITSsimulationSPD(seg0,res0);
-        SetSimulationModel(kSPD,sim0);
+      //seg =(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
+      //if(seg==0) seg = new AliITSsegmentationSPD();
+      //res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD());
+      //if(res==0) res = new AliITSCalibrationSPD();
+      sim = new AliITSsimulationSPD(fDetTypeSim);
+      SetSimulationModel(kSPD,sim);
     }else{ // simulation exists, make sure it is set up properly.
-        ((AliITSsimulationSPD*)sim)->Init(
-            (AliITSsegmentationSPD*) iDetType->GetSegmentationModel(),
-            (AliITSresponseSPD*) iDetType->GetResponseModel());
-//        if(sim->GetResponseModel()==0) sim->SetResponseModel(
-//            (AliITSresponse*)iDetType->GetResponseModel());
-//        if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel(
-//            (AliITSsegmentation*)iDetType->GetSegmentationModel());
+      sim->SetSegmentationModel(kSPD,(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD));
+      sim->SetCalibrationModel(GetITSgeom()->GetStartSPD(),(AliITSCalibration*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSPD()));
+      sim->Init();
     } // end if
-    iDetType=DetType(kSDD);
-    sim = iDetType->GetSimulationModel();
+  } // end if iDetType
+  //SDD
+  if(fDetTypeSim){
+    sim = fDetTypeSim->GetSimulationModel(kSDD);
     if (!sim) {
-        AliITSsegmentation *seg1=
-            (AliITSsegmentation*)iDetType->GetSegmentationModel();
-        AliITSresponse *res1 = (AliITSresponse*)iDetType->GetResponseModel();
-        AliITSsimulationSDD *sim1=new AliITSsimulationSDD(seg1,res1);
-        SetSimulationModel(kSDD,sim1);
+      //      seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD);
+      //res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD());
+      sim = new AliITSsimulationSDD(fDetTypeSim);
+      SetSimulationModel(kSDD,sim);
     }else{ // simulation exists, make sure it is set up properly.
-        ((AliITSsimulationSDD*)sim)->Init(
-            (AliITSsegmentationSDD*) iDetType->GetSegmentationModel(),
-            (AliITSresponseSDD*) iDetType->GetResponseModel());
-//        if(sim->GetResponseModel()==0) sim->SetResponseModel(
-//            (AliITSresponse*)iDetType->GetResponseModel());
-//        if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel(
-//            (AliITSsegmentation*)iDetType->GetSegmentationModel());
+      sim->SetSegmentationModel(kSDD,(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD));
+      sim->SetCalibrationModel(GetITSgeom()->GetStartSDD(),(AliITSCalibration*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSDD()));
+      
+      sim->Init();
     } //end if
-    iDetType=DetType(kSSD);
-    sim = iDetType->GetSimulationModel();
+  } // end if iDetType
+  //SSD
+  if(fDetTypeSim){
+    sim = fDetTypeSim->GetSimulationModel(kSSD);
     if (!sim) {
-        AliITSsegmentation *seg2=
-            (AliITSsegmentation*)iDetType->GetSegmentationModel();
-        AliITSresponse *res2 = (AliITSresponse*)iDetType->GetResponseModel();
-        AliITSsimulationSSD *sim2=new AliITSsimulationSSD(seg2,res2);
-        SetSimulationModel(kSDD,sim2);
+      //      seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD);
+      // res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD());
+      sim = new AliITSsimulationSSD(fDetTypeSim);
+      SetSimulationModel(kSSD,sim);
     }else{ // simulation exists, make sure it is set up properly.
-        ((AliITSsimulationSSD*)sim)->Init(
-            (AliITSsegmentationSSD*) iDetType->GetSegmentationModel(),
-            (AliITSresponseSSD*) iDetType->GetResponseModel());
-//        if(sim->GetResponseModel()==0) sim->SetResponseModel(
-//            (AliITSresponse*)iDetType->GetResponseModel());
-//        if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel(
-//            (AliITSsegmentation*)iDetType->GetSegmentationModel());
+      sim->SetSegmentationModel(kSSD,(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD));
+      sim->SetCalibrationModel(GetITSgeom()->GetStartSSD(),(AliITSCalibration*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSSD()));
+      sim->Init();
     } // end if
+  } // end if iDetType
 }
 //______________________________________________________________________
-void AliITSvSDD03::DrawModule(){
+void AliITSvSDD03::DrawModule() const{
     ////////////////////////////////////////////////////////////////////////
     //     Draw a shaded view of the ITS SDD test beam version 1.
     // Inputs:
@@ -781,19 +938,23 @@ void AliITSvSDD03::DrawModule(){
     // Set ALIC mother visible
     gMC->Gsatt("ALIC","SEEN",0);
     // Set ALIC ITS visible
-    gMC->Gsatt("ITSV","SEEN",0);
+    gMC->Gsatt("ITSV","SEEN",1);
     // Set ALIC Telescopes visible
-    gMC->Gsatt("ITEL","SEEN",0);
+    gMC->Gsatt("ITEL","SEEN",1);
+    gMC->Gsatt("ITEL","colo",2);
     // Set ALIC detetcor visible
-    gMC->Gsatt("IDET","SEEN",0);
-    // Set Detector chip mother visible and drawn
-    gMC->Gsatt("IPC0","SEEN",1);
+    gMC->Gsatt("IDET","SEEN",1);
+    gMC->Gsatt("IDET","colo",4);
+    // Set ALIC Scintillator visible
+    gMC->Gsatt("ISNT","SEEN",1);
+    gMC->Gsatt("ISNT","colo",3);
     // Set Detector mother visible and drawn
-    gMC->Gsatt("ITS0","SEEN",1);
-    // Set minibus chip mother visible and drawn
-    gMC->Gsatt("ICMB","SEEN",1);
+//    gMC->Gsatt("ITS0","SEEN",1);
     // Set minibus mother visible and drawn
-    gMC->Gsatt("IMB0","SEEN",1);
+//    gMC->Gsatt("IMB0","SEEN",1);
+
+    // Draw
+    gMC->Gdraw("alic", 60, 30, 180, 10,10, .12, .12);
 }
 //______________________________________________________________________
 void AliITSvSDD03::StepManager(){
@@ -813,23 +974,46 @@ void AliITSvSDD03::StepManager(){
     // Return:
     //    none.
     ////////////////////////////////////////////////////////////////////////
-    Int_t         copy, id;
-    TLorentzVector position, momentum;
+    Int_t  copy, id;
     static TLorentzVector position0;
     static Int_t stat0=0;
     if((id=gMC->CurrentVolID(copy) == fIDMother)&&
        (gMC->IsTrackEntering()||gMC->IsTrackExiting())){
-       copy = fTrackReferences->GetEntriesFast();
-       TClonesArray &lTR = *fTrackReferences;
-       // Fill TrackReference structure with this new TrackReference.
-       new(lTR[copy]) AliTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber());
+        copy = fTrackReferences->GetEntriesFast();
+        TClonesArray &lTR = *fTrackReferences;
+        // Fill TrackReference structure with this new TrackReference.
+        new(lTR[copy]) AliTrackReference(gAlice->GetMCApp()->
+                                         GetCurrentTrackNumber());
     } // if Outer ITS mother Volume
-    if(!(this->IsActive())){
-       return;
-    } // end if !Active volume.
-    Int_t   vol[5];
+    //if(!(this->IsActive())) return;
+    if(!(gMC->TrackCharge())) return;
+    Int_t   vol[5],copy3;
+    TLorentzVector position, momentum;
     TClonesArray &lhits = *fHits;
     //
+    // Fill hit structure.
+    gMC->TrackPosition(position);
+    gMC->TrackMomentum(momentum);
+    id   = gMC->CurrentVolID(copy);
+    if(id==fIdSens[0] || id==fIdSens[1]){ // Volumes "ITST" or "IMBS"
+        copy = gMC->CurrentVolOffID(3,copy3);
+        copy = DecodeDetector(id,copy3,vol[0],vol[1],vol[2]);
+       //    cout << "0: mod,lay,lad,det="<<copy<<","<<vol[0]<<","<<vol[1]
+        //     <<","<<vol[2]<<" name="<<gMC->CurrentVolName()
+       //     <<","<<fIdSens[0]<<","<<fIdSens[1]<<","<<id<<" z="
+        //     <<position.Z()<<endl;
+    }else if(id==fIdSens[2]){ // "ISNT" Sintilator
+        //cout << "1: id,copy="<<id<<","<<copy
+        //     <<" name="<<gMC->CurrentVolName()<<" z="
+        //     <<position.Z()<<endl;
+        return; // Do nothing for now.
+    }else{
+        //cout << "2: id,copy="<<id<<","<<copy
+        //     <<" name="<<gMC->CurrentVolName()<<" z="
+        //     <<position.Z()<<endl;
+        return;
+    } // end if
+    //
     // Track status
     vol[3] = 0;
     vol[4] = 0;
@@ -841,42 +1025,17 @@ void AliITSvSDD03::StepManager(){
     if(gMC->IsTrackStop())        vol[3] += 32;
     if(gMC->IsTrackAlive())       vol[3] += 64;
     //
-    // Fill hit structure.
-    if(!(gMC->TrackCharge())) return;
-    id = gMC->CurrentVolID(copy);
-    if(id==fIdSens[0]){  // Volume name "IMBS"
-       vol[2] = 1; // detector
-       id = gMC->CurrentVolOffID(3,copy);
-       //detector copy in the ladder = 1<->4  (ITS1 < I101 < I103 < I10A)
-       vol[1] = copy; // ladder
-       vol[0] = 5; // Lay
-       if(copy>4){
-           vol[0] = 6;
-           vol[1] = copy - 4;
-       } // end if
-       if(copy>2) vol[0]++;
-    } else if(id == fIdSens[1]){ // Volume name "ITST"
-       vol[0] = 3; // layer
-       vol[1] = 1; // ladder
-       id = gMC->CurrentVolOffID(3,copy);
-       //detector copy in the ladder = 1<->4  (ITS2 < I1D1 < I1D3 < I20A)
-       vol[2] = 1;  // detector
-    } else return; // end if
-    //
-    gMC->TrackPosition(position);
-    gMC->TrackMomentum(momentum);
     vol[4] = stat0;
     if(gMC->IsTrackEntering()){
-       position0 = position;
-       stat0 = vol[3];
-       return;
-    } // end if IsEntering
-    // Fill hit structure with this new hit only for non-entrerance hits.
-    else new(lhits[fNhits++]) AliITShit(fIshunt,
-                                       gAlice->GetMCApp()->GetCurrentTrackNumber(),vol,
-                                       gMC->Edep(),gMC->TrackTime(),position,
-                                       position0,momentum);
-    //
+        position0 = position;
+        stat0 = vol[3];
+        return;
+    }else{
+        new(lhits[fNhits++]) AliITShit(fIshunt,
+                                   gAlice->GetMCApp()->GetCurrentTrackNumber(),
+                                       vol,gMC->Edep(),gMC->TrackTime(),
+                                       position,position0,momentum);
+    }// end if gMC->IsTrackEntering()
     position0 = position;
     stat0 = vol[3];