]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSvSPD02.cxx
Overlap fixed (M. Sitta)
[u/mrichter/AliRoot.git] / ITS / AliITSvSPD02.cxx
index f8622659ecb67719e1ea3b7f7e659cd183baecd5..1455fe60f1931e2a96cc5ca4a9fa4c7a093df528 100644 (file)
 /* $Id$ */
 
 #include <TGeometry.h>
+#include <TGeoManager.h>
 #include <TNode.h>
 #include <TLorentzVector.h>
 #include <TClonesArray.h>
 #include <TBRIK.h>
+#include <TGeoMatrix.h>
+#include <TVirtualMC.h>
 
 #include "AliRun.h"
 #include "AliMagF.h"
-#include "AliITSGeant3Geometry.h"
 #include "AliTrackReference.h"
+
 #include "AliITShit.h"
 #include "AliITS.h"
 #include "AliITSvSPD02.h"
 #include "AliITSgeom.h"
 #include "AliITSgeomSPD.h"
 #include "AliITSDetTypeSim.h"
-#include "AliITSresponseSPD.h"
+#include "AliITSCalibrationSPD.h"
 #include "AliITSsegmentationSPD.h"
-#include "AliITSsimulationSPDdubna.h"
+#include "AliITSsimulationSPD.h"
 #include "AliMC.h"
 
 
@@ -52,7 +55,7 @@ AliITSvSPD02::AliITSvSPD02():
 AliITS(),
 fGeomDetOut(kFALSE),
 fGeomDetIn(kFALSE),
-fMajorVersion(1),
+fMajorVersion((Int_t)kvSPD02),
 fMinorVersion(2),
 fGeomNumber(2002),
 fEuclidGeomDet(),
@@ -61,7 +64,9 @@ fWrite(),
 fDet1(300.0),
 fDet2(300.0),
 fChip1(300.0),
-fChip2(300.0){
+fChip2(300.0),
+fIDMother(0),
+fIgm(kvSPD02){
     ////////////////////////////////////////////////////////////////////////
     // Standard default constructor for the ITS SPD test beam 2002 version 1.
     // Inputs:
@@ -90,7 +95,9 @@ fWrite(),
 fDet1(300.0),
 fDet2(300.0),
 fChip1(300.0),
-fChip2(300.0){
+fChip2(300.0),
+fIDMother(0),
+fIgm(kvSPD02){
     ////////////////////////////////////////////////////////////////////////
     //    Standard constructor for the ITS SPD testbeam 2002 version 1.
     // Inputs:
@@ -121,38 +128,6 @@ fChip2(300.0){
     strncpy(fWrite,fEuclidGeomDet,60);
 }
 //______________________________________________________________________
-AliITSvSPD02::AliITSvSPD02(const AliITSvSPD02 &source) : AliITS(source){
-    ////////////////////////////////////////////////////////////////////////
-    //     Copy Constructor for ITS SPD test beam 2002 version 1.
-    // This class is not to be copied. Function only dummy.
-    // Inputs:
-    //    const AliITSvSPD02 &source   The class to be copied
-    // Outputs:
-    //    none.
-    // Return:
-    //    A warning message.
-    ////////////////////////////////////////////////////////////////////////
-    if(&source == this) return;
-    Warning("Copy Constructor","Not allowed to copy AliITSvSPD02");
-    return;
-}
-//______________________________________________________________________
-AliITSvSPD02& AliITSvSPD02::operator=(const AliITSvSPD02 &source){
-    ////////////////////////////////////////////////////////////////////////
-    //    Assignment operator for the ITS SPD test beam 2002 version 1.
-    // This class is not to be copied. Function only dummy.
-    // Inputs:
-    //    const AliITSvSPD02 &source   The class to be copied
-    // Outputs:
-    //    none.
-    // Return:
-    //    A Warning message
-    ////////////////////////////////////////////////////////////////////////
-    if(&source == this) return *this;
-    Warning("= operator","Not allowed to copy AliITSvSPD02");
-    return *this;
-}
-//______________________________________________________________________
 AliITSvSPD02::~AliITSvSPD02() {
     ////////////////////////////////////////////////////////////////////////
     //    Standard destructor for the ITS SPD test beam 2002 version 1.
@@ -377,6 +352,11 @@ void AliITSvSPD02::CreateGeometry2002(){
     //             |- IMB0       SPD Si Chip
     //             |   |- IMBS     SPD Sensitive volume
     //             |- ICMB       Chip MiniBus.
+    //
+    //      ITEL ITEL IDET ITEL ITEL
+    // Z->  -38  -36   02  36.5 38.5
+    //       |    |     |    |    |
+    // cpn1  1    2     1    3    4
     // Inputs:
     //    none.
     // Outputs:
@@ -391,16 +371,36 @@ void AliITSvSPD02::CreateGeometry2002(){
     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;
+    // These constant character strings are set by cvs during commit
+    // do not change them unless you know what you are doing!
+    const Char_t *cvsDate="$Date$";
+    const Char_t *cvsRevision="$Revision$";
 
     if(gMC==0) return;
     // 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);
+    /*
     data[0] = 10.0;
     data[1] = 50.0;
     data[2] = 100.0;
     gMC->Gsvolu("ITSV","BOX",idtmed[0],data,3);
     gMC->Gspos("ITSV",1,"ALIC",0.0,0.0,0.0,0,"ONLY");
+    */
+    TGeoVolumeAssembly *itsV = gGeoManager->MakeVolumeAssembly("ITSV");
+    const Int_t length=100;
+    Char_t vstrng[length];
+    if(fIgm.WriteVersionString(vstrng,length,(AliITSVersion_t)IsVersion(),
+                               fMinorVersion,cvsDate,cvsRevision))
+        itsV->SetTitle(vstrng);
+    else Error("CreateGeometry","Error writing/setting version string");
+    TGeoVolume *alic = gGeoManager->GetVolume("ALIC");
+    if(alic==0) {
+        Error("CreateGeometry","alic=0");
+        return;
+    } // end if
+    // See idrotm[199] for angle definitions.
+    alic->AddNode(itsV,1,0);
 
     //cout << "idtmed[0]=" << idtmed[0]<<endl;
     //cout << "idtmed[1]=" << idtmed[1]<<endl;
@@ -485,7 +485,7 @@ void AliITSvSPD02::CreateMaterials(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSPD02.
     // 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.
@@ -516,7 +516,7 @@ void AliITSvSPD02::CreateMaterials2002(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSPD02.
     // 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.
@@ -553,138 +553,27 @@ void AliITSvSPD02::CreateMaterials2002(){
               epsilSi,stminSi);
 }
 //______________________________________________________________________
-void AliITSvSPD02::InitAliITSgeom(){
-    //     Based on the geometry tree defined in Geant 3.21, this
-    // routine initilizes the Class AliITSgeom from the Geant 3.21 ITS geometry
-    // sturture.
-    // Inputs:
-    //    none.
-    // Outputs:
-    //    none.
-    // Return:
-    //    none.
-    const Int_t kltypess = 2;
-    const Int_t knlayers = 5;
-    const Int_t kndeep = 5;
-    Int_t itsGeomTreeNames[kltypess][kndeep],lnam[20],lnum[20];
-    Int_t nlad[knlayers],ndet[knlayers];
-    Double_t t[3],r[10];
-    Float_t  par[20],att[20];
-    Int_t    npar,natt,idshape,imat,imed;
-    AliITSGeant3Geometry *ig=0;
-    Int_t mod=0,typ=0,lay=0,lad=0,det=0,cpy=0,i=0,j=0,k=0;
-
-    if(gMC==0) {// No Monti Carlo to init. Default set fITSgeom by hand
-      if(GetITSgeom()!=0) SetITSgeom(0x0);
-        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;
-       AliITSgeom* geom = new AliITSgeom(0,knlayers,nlad,ndet,mod); 
-        SetITSgeom(geom);
-        r[0] = 1.0; r[1] =  0.0; r[2] = 0.0;
-        r[3] = 0.0; r[4] =  0.0; r[5] = 1.0;
-        r[6] = 0.0; r[7] = -1.0; r[8] = 0.0; r[9] = 1.0; // not Unit.
-        Double_t tt[5][3]={{0.0,0.0,-37.9625}, // 0,0,P00Z+.5*chipMiniBusY
-                           {0.0,0.0,-35.9625}, // 0,0,P00Z+2+.5*chipMiniBusY
-                           {0.0,0.0,  2.0150}, // 0,0,P01Z+38+SPDchipY
-                           {0.0,0.0, 36.5375}, //0,0,PdetZ+34.5+.5*chipMiniBusY
-                           {0.0,0.0, 38.5375}};// 0,0,P00Z+2+.5*chipMiniBusY
-        for(mod=0;mod<5;mod++){
-            lay = 1;
-            lad = 1;
-            det = mod+1;
-            t[0] = tt[mod][0]; t[1] = tt[mod][1]; t[2] = tt[mod][2];
-            GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSPD,t,r);
-            npar=3;par[0]=0.64;par[1]=0.5*300.0E-4;par[2]=3.48;
-            GetITSgeom()->ReSetShape(kSPD,new AliITSgeomSPD425Short(npar,par));
-        } // end for det
-        return;
-    } // end if gMC==0
-    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;
-    ig = new AliITSGeant3Geometry();
-    Char_t names[kltypess][kndeep][4];
-    Int_t itsGeomTreeCopys[kltypess][kndeep];
-    const char *namesA[kltypess][kndeep] = {
-        {"ALIC","ITSV","ITEL","IMB0","IMBS"}, // lay=1
-        {"ALIC","ITSV","IDET","ITS0","ITST"}};// Test SPD
-    Int_t itsGeomTreeCopysA[kltypess][kndeep]= {{1,1,4,1,1},// lay=1
-                                                {1,1,1,1,1}};//lay=2 TestSPD
-    for(i=0;i<kltypess;i++)for(j=0;j<kndeep;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
-    // 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<kltypess;i++)for(j=0;j<kndeep;j++) 
-        strncpy((char*) &itsGeomTreeNames[i][j],names[i][j],4);
-    // itsGeomTreeNames[i][j] = ig->StringToInt(names[i][j]);
-    mod = 5;
-    if(GetITSgeom()!=0) SetITSgeom(0x0);
-    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;
-    AliITSgeom* geom = new AliITSgeom(0,knlayers,nlad,ndet,mod);
-    SetITSgeom(geom);
-    for(typ=1;typ<=kltypess;typ++){
-        for(j=0;j<kndeep;j++) lnam[j] = itsGeomTreeNames[typ-1][j];
-        for(j=0;j<kndeep;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(kndeep,lnam,lnum,t,r,idshape,npar,natt,par,att,
-                            imat,imed);
-            GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSPD,t,r);
-            if(!(GetITSgeom()->IsShapeDefined((Int_t)kSPD)))
-                GetITSgeom()->ReSetShape(kSPD,
-                                     new AliITSgeomSPD425Short(npar,par));
-        } // end for cpy
-    } // end for typ
-    return;
-}
-//______________________________________________________________________
 void AliITSvSPD02::Init(){
-    ////////////////////////////////////////////////////////////////////////
     //     Initialise the ITS after it has been created.
     // Inputs:
-    //    none.
+    //   none.
     // Outputs:
-    //    none.
+    //   none.
     // Return:
-    //    none.
-    ////////////////////////////////////////////////////////////////////////
-    Int_t i;
+    //   none.
 
-    cout << endl;
-    for(i=0;i<26;i++) cout << "*";
-    cout << " ITSvSPD02" << fMinorVersion << "_Init ";
-    for(i=0;i<25;i++) cout << "*";cout << endl;
-
-    if(fRead[0]=='\0') strncpy(fRead,fEuclidGeomDet,60);
-    if(fWrite[0]=='\0') strncpy(fWrite,fEuclidGeomDet,60);
-    if(GetITSgeom()!=0) SetITSgeom(0x0);
-    AliITSgeom* geom = new AliITSgeom();
-    SetITSgeom(geom);
-    if(fGeomDetIn) GetITSgeom()->ReadNewFile(fRead);
-    if(!fGeomDetIn) this->InitAliITSgeom();
-    if(fGeomDetOut) GetITSgeom()->WriteNewFile(fWrite);
+    AliDebug(1,Form("Init: Major version %d Minor version %d",fMajorVersion,
+                 fMinorVersion));
+    //
+    UpdateInternalGeometry();
     AliITS::Init();
+    if(fGeomDetOut) GetITSgeom()->WriteNewFile(fWrite);
+
+    //
+    fIDMother = gMC->VolId("ITSV"); // ITS Mother Volume ID.
 
-    for(i=0;i<72;i++) cout << "*";
-    cout << endl;
-    if(gMC) fIDMother = gMC->VolId("ITSV"); // ITS Mother Volume ID.
-    else fIDMother = 0;
 }
+/*
 //______________________________________________________________________
 void AliITSvSPD02::SetDefaults(){
     // sets the default segmentation, response, digit and raw cluster classes
@@ -703,22 +592,18 @@ void AliITSvSPD02::SetDefaults(){
     AliITSgeomSPD  *s0;
     Int_t i;
     Float_t bx[256],bz[280];
-    fDetTypeSim->ResetResponse();
+    fDetTypeSim->ResetCalibrationArray();
     fDetTypeSim->ResetSegmentation();
  
     //SPD
     // Get shape info. Do it this way for now.
     s0 = (AliITSgeomSPD*) GetITSgeom()->GetShape(kSPD);
-    AliITSresponse *resp0=0;
-    for(Int_t nmod=0;nmod<GetITSgeom()->GetIndexMax();nmod++){      
-      if(GetITSgeom()->GetModuleType(nmod)==kSPD){
-       resp0 = new AliITSresponseSPD();
-       resp0->SetTemperature();
-       resp0->SetDistanceOverVoltage();
-       SetResponseModel(nmod,resp0);
-      }
-    }
-    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(GetITSgeom());
+    AliITSCalibration *resp0=new AliITSCalibrationSPD();
+    resp0->SetTemperature();
+    resp0->SetDistanceOverVoltage();
+    SetCalibrationModel(0,resp0); 
+       
+    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD();
     seg0->SetDetSize(s0->GetDx()*2.*kconv, // base this on AliITSgeomSPD
                     s0->GetDz()*2.*kconv, // for now.
                     s0->GetDy()*2.*kconv); // x,z,y full width in microns.
@@ -734,21 +619,21 @@ void AliITSvSPD02::SetDefaults(){
     seg0->SetBinSize(bx,bz); // Based on AliITSgeomSPD for now.
     SetSegmentationModel(kSPD,seg0);
     // set digit and raw cluster classes to be used
-    const char *kData0=(fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD()))->DataType();
+    const char *kData0=(fDetTypeSim->GetCalibrationModel(0))->DataType();
     if (strstr(kData0,"real")) fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigit");
     else fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigitSPD");
 //    SetSimulationModel(kSPD,new AliITSsimulationSPDdubna(seg0,resp0));
 //    iDetType->ReconstructionModel(new AliITSClusterFinderSPD());
    
-/*
-    SetResponseModel(kSDD,new AliITSresponseSDD());
-    SetSegmentationModel(kSDD,new AliITSsegmentationSDD());
-    DetType(kSDD)->ClassNames("AliITSdigitSDD","AliITSRawClusterSDD");
 
-    SetResponseModel(kSSD,new AliITSresponseSSD());
-    SetSegmentationModel(kSSD,new AliITSsegmentationSSD());
-    DetType(kSSD)->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
-*/
+//    SetResponseModel(kSDD,new AliITSCalibrationSDD());
+//    SetSegmentationModel(kSDD,new AliITSsegmentationSDD());
+//    DetType(kSDD)->ClassNames("AliITSdigitSDD","AliITSRawClusterSDD");
+
+//    SetResponseModel(kSSD,new AliITSCalibrationSSD());
+//    SetSegmentationModel(kSSD,new AliITSsegmentationSSD());
+//    DetType(kSSD)->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
+
     if(fgkNTYPES>3){
        Warning("SetDefaults",
                "Only the four basic detector types are initialised!");
@@ -772,51 +657,50 @@ void AliITSvSPD02::SetDefaultSimulation(){
 
   if(!fDetTypeSim) fDetTypeSim = new AliITSDetTypeSim();
   AliITSsimulation *sim;
-  AliITSsegmentation *seg;
-  AliITSresponse *res;
-    if(fDetTypeSim){
-        sim = fDetTypeSim->GetSimulationModel(kSPD);
-        if (!sim) {
-            seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
-            res = (AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD());
-            sim = new AliITSsimulationSPDdubna(seg,res,0);
-            SetSimulationModel(kSPD,sim);
-        }else{ // simulation exists, make sure it is set up properly.
-         sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(kSPD));
-         sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD));
-         sim->Init();
-        } // end if
-    } // end if iDetType
-
-    /*
-    if(fDetTypeSim){
-        sim = fDetTypeSim->GetSimulationModel(kSDD);
-        if (!sim) {
-            seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD);
-            res = (AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD());
-            sim = new AliITSsimulationSDD(seg,res);
-            SetSimulationModel(kSDD,sim);
-        }else{ // simulation exists, make sure it is set up properly.
-         sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD()));
-         sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD));
-         sim->Init();
-        } //end if
-    } // end if iDetType
-    if(fDetTypeSim){
-        sim = fDetTypeSim->GetSimulationModel(kSSD);
-        if (!sim) {
-            seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD);
-            res = (AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD());
-            sim = new AliITSsimulationSSD(seg,res);
-            SetSimulationModel(kSSD,sim);
-        }else{ // simulation exists, make sure it is set up properly.
-         sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()));
-         sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD));
-         sim->Init();
-        } // end if
-    } //
-    */ 
+  //AliITSsegmentation *seg;
+  //AliITSCalibration *res;
+  if(fDetTypeSim){
+    sim = fDetTypeSim->GetSimulationModel(kSPD);
+    if (!sim) {
+      //seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
+      //res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD());
+      sim = new AliITSsimulationSPD(fDetTypeSim);
+      SetSimulationModel(kSPD,sim);
+    }else{ // simulation exists, make sure it is set up properly.
+      sim->SetCalibrationModel(GetITSgeom()->GetStartSPD(),(AliITSCalibration*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSPD()));
+      sim->SetSegmentationModel(kSPD,(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD));
+      sim->Init();
+    } // end if
+  } // end if iDetType
+
+//      if(fDetTypeSim){
+//        sim = fDetTypeSim->GetSimulationModel(kSDD);
+//        if (!sim) {
+//            seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD);
+//            res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD());
+//            sim = new AliITSsimulationSDD(seg,res);
+//           SetSimulationModel(kSDD,sim);
+//        }else{ // simulation exists, make sure it is set up properly.
+//       sim->SetResponseModel((AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD()));
+//       sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD));
+//       sim->Init();
+//        } //end if
+//    } // end if iDetType
+//    if(fDetTypeSim){
+//        sim = fDetTypeSim->GetSimulationModel(kSSD);
+//        if (!sim) {
+//            seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD);
+//            res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD());
+//            sim = new AliITSsimulationSSD(seg,res);
+//            SetSimulationModel(kSSD,sim);
+//        }else{ // simulation exists, make sure it is set up properly.
+//       sim->SetResponseModel((AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()));
+//       sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD));
+//       sim->Init();
+//        } // end if
+//    } //
 }
+*/
 //______________________________________________________________________
 void AliITSvSPD02::DrawModule() const {
     ////////////////////////////////////////////////////////////////////////
@@ -865,69 +749,64 @@ void AliITSvSPD02::StepManager(){
     // Return:
     //    none.
     ////////////////////////////////////////////////////////////////////////
-    Int_t         copy, id;
-    TLorentzVector position, momentum;
-    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());
-    } // if Outer ITS mother Volume
+
     if(!(this->IsActive())){
         return;
     } // end if !Active volume.
-    Int_t   vol[5];
-    TClonesArray &lhits = *fHits;
+    if(!(gMC->TrackCharge())) return;
+
+    Int_t cpy0=0,cpy1=0,id,mod,ncpys,status;
+    TLorentzVector position, momentum;
+    static AliITShit hit;// Saves on calls to construtors
+    //TClonesArray &lhits = *(GetDetTypeSim()->GetHits());
+    TClonesArray &lhits = *(Hits());
     //
     // Track status
-    vol[3] = 0;
-    vol[4] = 0;
-    if(gMC->IsTrackInside())      vol[3] +=  1;
-    if(gMC->IsTrackEntering())    vol[3] +=  2;
-    if(gMC->IsTrackExiting())     vol[3] +=  4;
-    if(gMC->IsTrackOut())         vol[3] +=  8;
-    if(gMC->IsTrackDisappeared()) vol[3] += 16;
-    if(gMC->IsTrackStop())        vol[3] += 32;
-    if(gMC->IsTrackAlive())       vol[3] += 64;
+    // Track status
+    status = 0;
+    if(gMC->IsTrackInside())      status +=  1;
+    if(gMC->IsTrackEntering())    status +=  2;
+    if(gMC->IsTrackExiting())     status +=  4;
+    if(gMC->IsTrackOut())         status +=  8;
+    if(gMC->IsTrackDisappeared()) status += 16;
+    if(gMC->IsTrackStop())        status += 32;
+    if(gMC->IsTrackAlive())       status += 64;
     //
     // Fill hit structure.
-    if(!(gMC->TrackCharge())) return;
-    id = gMC->CurrentVolID(copy);
-    if(id==fIdSens[0]){  // Volume name "IMBS"
-        vol[2] = vol[1] = 1; // Det, ladder
-        id = gMC->CurrentVolOffID(2,copy);
-        //detector copy in the ladder = 1<->4  (ITS1 < I101 < I103 < I10A)
-        vol[0] = copy; // Lay
-        if(copy>2) vol[0]++;
+    id = gMC->CurrentVolID(cpy0);
+    if(id==fIdSens[0]){  // Volume name "IMBS". Det=1, ladder=1
+        ncpys = 4;
     } else if(id == fIdSens[1]){ // Volume name "ITST"
-        vol[0] = 3; // layer
-        vol[1] = 1; // ladder
-        id = gMC->CurrentVolOffID(2,copy);
-        //detector copy in the ladder = 1<->4  (ITS2 < I1D1 < I1D3 < I20A)
-        vol[2] = 1;  // detector
+        ncpys = 1;
     } else return; // end if
+    id = gMC->CurrentVolOffID(2,cpy1);
+    fIgm.DecodeDetector(mod,ncpys,cpy0,cpy1,0);
+    //
+    // Fill hit structure.
     //
+    hit.SetModule(mod);
+    hit.SetTrack(gAlice->GetMCApp()->GetCurrentTrackNumber());
     gMC->TrackPosition(position);
     gMC->TrackMomentum(momentum);
-    vol[4] = stat0;
+    hit.SetPosition(position);
+    hit.SetTime(gMC->TrackTime());
+    hit.SetMomentum(momentum);
+    hit.SetStatus(status);
+    hit.SetEdep(gMC->Edep());
+    hit.SetShunt(GetIshunt());
     if(gMC->IsTrackEntering()){
-        position0 = position;
-        stat0 = vol[3];
-        return;
+        hit.SetStartPosition(position);
+        hit.SetStartTime(gMC->TrackTime());
+        hit.SetStartStatus(status);
+        return; // don't save entering hit.
     } // 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];
-
+    // Fill hit structure with this new hit.
+    //Info("StepManager","Calling Copy Constructor");
+    new(lhits[fNhits++]) AliITShit(hit); // Use Copy Construtor.
+    // Save old position... for next hit.
+    hit.SetStartPosition(position);
+    hit.SetStartTime(gMC->TrackTime());
+    hit.SetStartStatus(status);
     return;
 }