]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSvPPRasymmFMD.cxx
warning added if the method GetITSgeom has to fetch the AliITSgeom pointer from file
[u/mrichter/AliRoot.git] / ITS / AliITSvPPRasymmFMD.cxx
index 5de2cd69aa401380f8b64d7b2a600f7f2ff24a53..2126bb4d683c4ae61abd0e5b699a67b9f75cb230 100644 (file)
 #include <TClonesArray.h>
 #include <TGeometry.h>
 #include <TLorentzVector.h>
+#include <TGeoMatrix.h>
+#include <TArrayD.h>
+#include <TArrayF.h>
+#include <TString.h>
 #include <TNode.h>
 #include <TTUBE.h>
+#include <TGeoManager.h>
+#include <TGeoVolume.h>
 
 #include "AliITS.h"
 #include "AliITSDetTypeSim.h"
@@ -44,8 +50,9 @@
 #include "AliITSgeomSSD.h"
 #include "AliITShit.h"
 #include "AliITSresponseSDD.h"
-#include "AliITSresponseSPD.h"
-#include "AliITSresponseSSD.h"
+#include "AliITSCalibrationSDD.h"
+#include "AliITSCalibrationSPD.h"
+#include "AliITSCalibrationSSD.h"
 #include "AliITSsegmentationSDD.h"
 #include "AliITSsegmentationSPD.h"
 #include "AliITSsegmentationSSD.h"
@@ -77,7 +84,7 @@ AliITSvPPRasymmFMD::AliITSvPPRasymmFMD() {
     fIdSens       = 0;
     fEuclidOut    = kFALSE; // Don't write Euclide file
     fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kTRUE; // Read .det file
+    fGeomDetIn    = kFALSE; // Read .det file
     fMajorVersion = IsVersion();
     fMinorVersion = -1;
     for(i=0;i<60;i++) fRead[i] = '\0';
@@ -113,7 +120,7 @@ AliITSvPPRasymmFMD::AliITSvPPRasymmFMD(const char *name, const char *title)
     fMinorVersion = 2;
     fEuclidOut    = kFALSE; // Don't write Euclide file
     fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kTRUE; // Read .det file
+    fGeomDetIn    = kFALSE; // Read .det file
     SetThicknessDet1();
     SetThicknessDet2();
     SetThicknessChip1();
@@ -534,6 +541,7 @@ void AliITSvPPRasymmFMD::CreateGeometry(){
        AliMatrix(idrotm[218],90.0,337.003998,90.0,67.003998,0.0,0.0);
        AliMatrix(idrotm[219],90.0,247.000305,90.0,337.000305,0.0,0.0);
        AliMatrix(idrotm[220],90.0,305.633514,90.0,35.633499,0.0,0.0);
+
        AliMatrix(idrotm[221],90.0,58.000198,90.0,148.000198,0.0,0.0);
        AliMatrix(idrotm[222],90.0,327.997101,90.0,57.997101,0.0,0.0);
        AliMatrix(idrotm[223],90.0,237.994202,90.0,327.994202,0.0,0.0);
@@ -1074,6 +1082,7 @@ void AliITSvPPRasymmFMD::CreateGeometry(){
        dits[4] = 75.261;
        gMC->Gsvolu("I137", "TUBS", idtmed[253], dits, 5);  
 
+
        dits[0] = 1.3401;
        dits[1] = 0.01;
        dits[2] = 24;
@@ -1745,28 +1754,28 @@ void AliITSvPPRasymmFMD::CreateGeometry(){
   cos30 = cos(30.*3.14159/180.);
   sin30 = sin(30.*3.14159/180.);
 
-  
+  Double_t maxRadius = 28.5;  
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
   dits[3] = -34.6; 
   dits[4] = 23.49;
-  dits[5] = 28;
+  dits[5] = maxRadius;
   dits[6] = -27.35; 
   dits[7] = 23.49;
-  dits[8] = 28;
+  dits[8] = maxRadius;
   dits[9] = -27.35;  
   dits[10] = 14.59; 
-  dits[11] = 28;
+  dits[11] = maxRadius;
   dits[12] = 27.35;   
   dits[13] = 14.59;
-  dits[14] = 28;
+  dits[14] = maxRadius;
   dits[15] = 27.35;    
   dits[16] = 23.49;
-  dits[17] = 28;
+  dits[17] = maxRadius;
   dits[18] = 34.6;  
   dits[19] = 23.49;
-  dits[20] = 28;
+  dits[20] = maxRadius;
   gMC->Gsvolu("IT34", "PCON", idtmed[209], dits, 21);  
 
   // block of the SDD electronics and related ladder frame 
@@ -2102,7 +2111,8 @@ void AliITSvPPRasymmFMD::CreateGeometry(){
   dits[18] = 57.45;
   dits[19] = 43.6;
   dits[20] = 48;   
-  gMC->Gsvolu("IT56", "PCON", idtmed[220], dits, 21);   
+  //gMC->Gsvolu("IT56", "PCON", idtmed[220], dits, 21);  // SSD air 
+  gMC->Gsvolu("IT56", "PCON", idtmed[204], dits, 21);    // air 
   
   dits[0] =  3.4;
   dits[1] = 1.955;
@@ -4479,6 +4489,222 @@ void AliITSvPPRasymmFMD::CreateGeometry(){
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
 
+
+  {
+    if (!gGeoManager) {
+      AliError("TGeoManager doesn't exist !");
+      return;
+    }
+
+    //======  Converting mother volumes of alignable objects
+    //======  into TGeoAssemblies :
+
+    TObjArray *list = gGeoManager->GetListOfVolumes();
+
+    {
+      char spdLaddName[20] = "I10B";
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(spdLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(spdLaddName,toTransform->GetName()) == 0);
+    }
+
+    // SPD 2
+    {
+      char spdLaddName[20] = "I20B";
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(spdLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(spdLaddName, toTransform->GetName()) == 0);
+    }
+
+    //---
+
+    // SPD 1
+    {
+      char spdLaddName[20] = "I107"; // "I107"
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(spdLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(spdLaddName,toTransform->GetName()) == 0);
+    }
+
+    // SPD 2
+    {
+      char spdLaddName[20] = "I1D7"; // "I1D7"
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(spdLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(spdLaddName, toTransform->GetName()) == 0);
+    }
+
+    // SDD 1
+    {
+      char sddLaddName[20] = "I004";// "I302"
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(sddLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(sddLaddName, toTransform->GetName()) == 0);
+    }
+
+    // SDD 2
+    {
+      char sddLaddName[20] = "I005";// "I402"
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(sddLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(sddLaddName, toTransform->GetName()) == 0);
+    }
+
+
+    // SSD 1
+    {
+      char ssdLaddName[20] = "I565";// "I562"
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(ssdLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(ssdLaddName,toTransform->GetName()) == 0);
+    }
+
+    // SSD 2
+    {
+      char ssdLaddName[20] = "I569";// "I566"
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(ssdLaddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(ssdLaddName, toTransform->GetName()) == 0);
+    }
+
+
+    //======  Converting some virtual volumes to assemblies in order
+    //====== to avoid overlaps :
+
+    {
+      char sddName[20] = "I047";
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(sddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(sddName, toTransform->GetName()) == 0);
+    }
+
+    {
+      char sddName[20] = "I048";
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(sddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(sddName, toTransform->GetName()) == 0);
+    }
+
+    {
+      char sddName[20] = "I018";
+
+      TGeoVolume *toTransform = gGeoManager->FindVolumeFast(sddName);
+      Int_t index = list->IndexOf(toTransform);
+      do {
+       TGeoVolume *transformed = 0; // this will be in fact TGeoVolumeAssembly
+       if (toTransform)
+         transformed = TGeoVolumeAssembly::MakeAssemblyFromVolume(toTransform);
+       if (transformed)
+         gGeoManager->ReplaceVolume(toTransform, transformed);
+       index++;
+       toTransform = (TGeoVolume*)list->At(index);
+      }
+      while (strcmp(sddName, toTransform->GetName()) == 0);
+    }
+
+
+  }
+
 }
 //______________________________________________________________________
 void AliITSvPPRasymmFMD::CreateMaterials(){
@@ -4773,7 +4999,14 @@ void AliITSvPPRasymmFMD::CreateMaterials(){
     AliMaterial(75,"ELASTO SIL$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
     AliMedium(75,"ELASTO SIL$",75,0,ifield,fieldm,tmaxfd,stemax,deemax,epsil,stmin);
 
-    AliMaterial(76,"SPDBUS(AL+KPT+EPOX)$",0.19509E+02,0.96502E+01,0.19060E+01,0.15413E+02,0.99900E+03);
+    // SPD bus (data from Petra Riedler)
+    Float_t aSPDbus[5] = {1.00794,12.0107,14.01,15.9994,26.982 };
+    Float_t zSPDbus[5] = {1.,6.,7.,8.,13.};
+    Float_t wSPDbus[5] = {0.023523,0.318053,0.009776,0.078057,0.570591};
+    Float_t dSPDbus    = 2.128505;
+
+    //   AliMaterial(76,"SPDBUS(AL+KPT+EPOX)$",0.19509E+02,0.96502E+01,0.19060E+01,0.15413E+02,0.99900E+03);
+    AliMixture(76,"SPDBUS(AL+KPT+EPOX)$",aSPDbus,zSPDbus,dSPDbus,5,wSPDbus);
     AliMedium(76,"SPDBUS(AL+KPT+EPOX)$",76,0,ifield,fieldm,tmaxfd,stemax,deemax,epsil,stmin);
                
     AliMixture(77,"SDD X7R capacitors$",aX7R,zX7R,dX7R,7,wX7R);
@@ -4964,7 +5197,14 @@ void AliITSvPPRasymmFMD::CreateMaterials(){
     AliMaterial(90,"SPD shield$", 12.011, 6., 1.93/10. , 22.1*10., 999);
     AliMedium(90,"SPD shield$",90,0,ifield,fieldm,tmaxfdServ,stemaxServ,deemaxServ,epsilServ,stminServ);
 
-    AliMaterial(91, "SPD End ladder$", 47.0447, 21.7963, 3.6374, 4.4711, 999); 
+    // SPD End Ladder (data from Petra Riedler)
+    Float_t aSPDel[5] = {1.00794,12.0107,14.01,15.9994,63.54 };
+    Float_t zSPDel[5] = {1.,6.,7.,8.,29.};
+    Float_t wSPDel[5] = {0.004092,0.107274,0.011438,0.032476,0.844719};
+    Float_t dSPDel    = 3.903403;
+
+    //   AliMaterial(91, "SPD End ladder$", 47.0447, 21.7963, 3.6374, 4.4711, 999); 
+    AliMixture(91,"SPD End ladder$",aSPDel,zSPDel,dSPDel,5,wSPDel);
     AliMedium(91,"SPD End ladder$",91,0,ifield,fieldm,tmaxfdServ,stemaxServ,deemaxServ,epsilServ,stminServ);
 
     AliMaterial(92, "SPD cone$",28.0855, 14., 2.33, 9.36, 999);    
@@ -4993,142 +5233,103 @@ void AliITSvPPRasymmFMD::InitAliITSgeom(){
     //   none.
     // Return:
     //   none.
-//#if GEANTGEOMETRY
-    if(strcmp(gMC->GetName(),"TGeant3")) {
-       Error("InitAliITSgeom",
-             "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
-       return;
-    } // end if
-    AliDebug(1,"Reading Geometry transformation directly from Geant 3.");
     const Int_t knlayers = 6;
-    const Int_t kndeep = 9;
-    Int_t itsGeomTreeNames[knlayers][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 = new AliITSGeant3Geometry();
-    Int_t mod,lay,lad,det,i,j,k;
-    Char_t names[knlayers][kndeep][4];
-    Int_t itsGeomTreeCopys[knlayers][kndeep];
-    if(fMinorVersion == 1){ // Option A
-    const char *namesA[knlayers][kndeep] = {
-     {"ALIC","ITSV","ITSD","IT12","I12A","I10A","I103","I101","ITS1"}, // lay=1
-     {"ALIC","ITSV","ITSD","IT12","I12A","I20A","I1D3","I1D1","ITS2"}, // lay=2
-     {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3","    ","    "}, // lay=3
-     {"ALIC","ITSV","ITSD","IT34","I005","I402","ITS4","    ","    "}, // lay=4
-     {"ALIC","ITSV","ITSD","IT56","I565","I562","ITS5","    ","    "}, // lay=5
-     {"ALIC","ITSV","ITSD","IT56","I569","I566","ITS6","    ","    "}};// lay=6
-    Int_t itsGeomTreeCopysA[knlayers][kndeep]= {{1,1,1,1,10, 2, 4,1,1},// lay=1
-                                             {1,1,1,1,10, 4, 4,1,1},// lay=2
-                                             {1,1,1,1,14, 6, 1,0,0},// lay=3
-                                             {1,1,1,1,22, 8, 1,0,0},// lay=4
-                                             {1,1,1,1,34,22, 1,0,0},// lay=5
-                                             {1,1,1,1,38,25, 1,0,0}};//lay=6
-    for(i=0;i<knlayers;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
-    }else if(fMinorVersion == 2){ // Option B
-    const char *namesB[knlayers][kndeep] = {
-     {"ALIC","ITSV","ITSD","IT12","I12B","I10B","I107","I101","ITS1"}, // lay=1
-     {"ALIC","ITSV","ITSD","IT12","I12B","I20B","I1D7","I1D1","ITS2"}, // lay=2
-     {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3","    ","    "}, // lay=3
-     {"ALIC","ITSV","ITSD","IT34","I005","I402","ITS4","    ","    "}, // lay=4
-     {"ALIC","ITSV","ITSD","IT56","I565","I562","ITS5","    ","    "}, // lay=5
-     {"ALIC","ITSV","ITSD","IT56","I569","I566","ITS6","    ","    "}};// lay=6
-    Int_t itsGeomTreeCopysB[knlayers][kndeep]= {{1,1,1,1,10, 2, 4,1,1},// lay=1
-                                             {1,1,1,1,10, 4, 4,1,1},// lay=2
-                                             {1,1,1,1,14, 6, 1,0,0},// lay=3
-                                             {1,1,1,1,22, 8, 1,0,0},// lay=4
-                                             {1,1,1,1,34,22, 1,0,0},// lay=5
-                                             {1,1,1,1,38,25, 1,0,0}};//lay=6
-    for(i=0;i<knlayers;i++)for(j=0;j<kndeep;j++){
-       for(k=0;k<4;k++) names[i][j][k] = namesB[i][j][k];
-       itsGeomTreeCopys[i][j] = itsGeomTreeCopysB[i][j];
-    } // end for i,j
-    } // end if fMinorVersion
-    // 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.
-    AliDebug(1,"Reading Geometry informaton from Geant3 common blocks");
-    for(i=0;i<20;i++) lnam[i] = lnum[i] = 0;
-    for(i=0;i<knlayers;i++)for(j=0;j<kndeep;j++)
-        strncpy((char*) &itsGeomTreeNames[i][j],names[i][j],4); 
-    // itsGeomTreeNames[i][j] = ig->StringToInt(names[i][j]);
+    const Int_t kndeep = 3;
+    const AliITSDetector idet[knlayers]={kSPD,kSPD,kSDD,kSDD,kSSD,kSSD};
+    const TString names[2][knlayers] = {
+     {"/ALIC_1/ITSV_1/ITSD_1/IT12_1/I12A_%d/I10A_%d/I103_%d/I101_1/ITS1_1", // lay=1
+      "/ALIC_1/ITSV_1/ITSD_1/IT12_1/I12A_%d/I20A_%d/I1D3_%d/I1D1_1/ITS2_1", // lay=2
+      "/ALIC_1/ITSV_1/ITSD_1/IT34_1/I004_%d/I302_%d/ITS3_%d", // lay=3
+      "/ALIC_1/ITSV_1/ITSD_1/IT34_1/I005_%d/I402_%d/ITS4_%d", // lay=4
+      "/ALIC_1/ITSV_1/ITSD_1/IT56_1/I565_%d/I562_%d/ITS5_%d", // lay=5
+      "/ALIC_1/ITSV_1/ITSD_1/IT56_1/I569_%d/I566_%d/ITS6_%d"},// lay=6
+     {"/ALIC_1/ITSV_1/ITSD_1/IT12_1/I12B_%d/I10B_%d/I107_%d/I101_1/ITS1_1", // lay=1
+      "/ALIC_1/ITSV_1/ITSD_1/IT12_1/I12B_%d/I20B_%d/I1D7_%d/I1D1_1/ITS2_1", // lay=2
+      "/ALIC_1/ITSV_1/ITSD_1/IT34_1/I004_%d/I302_%d/ITS3_%d", // lay=3
+      "/ALIC_1/ITSV_1/ITSD_1/IT34_1/I005_%d/I402_%d/ITS4_%d", // lay=4
+      "/ALIC_1/ITSV_1/ITSD_1/IT56_1/I565_%d/I562_%d/ITS5_%d", // lay=5
+      "/ALIC_1/ITSV_1/ITSD_1/IT56_1/I569_%d/I566_%d/ITS6_%d"}
+    };
+    const Int_t itsGeomTreeCopys[knlayers][kndeep]= {{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       nlad[knlayers],ndet[knlayers];
+    Int_t       mod,lay,lad=0,det=0,i,j,k,cp0,cp1,cp2;
+    TString path,shapeName;
+    TGeoHMatrix materix;
+    Double_t trans[3]={3*0.0},rot[10]={9*0.0,1.0};
+    TArrayD shapePar;
+    TArrayF shapeParF;
+
+    AliDebug(1,"Reading Geometry transformation directly from Modler.");
     mod = 0;
     for(i=0;i<knlayers;i++){
-       k = 1;
-       for(j=0;j<kndeep;j++) if(itsGeomTreeCopys[i][j]!=0)
-           k *= TMath::Abs(itsGeomTreeCopys[i][j]);
-       mod += k;
+        k = 1;
+        for(j=0;j<kndeep;j++) if(itsGeomTreeCopys[i][j]!=0)
+            k *= TMath::Abs(itsGeomTreeCopys[i][j]);
+        mod += k;
     } // end for i
 
-    if(GetITSgeom()!=0) SetITSgeom(0x0);
+    if(GetITSgeom()!=0) delete GetITSgeom();
+    SetITSgeom(0);
     nlad[0]=20;nlad[1]=40;nlad[2]=14;nlad[3]=22;nlad[4]=34;nlad[5]=38;
-    ndet[0]=4;ndet[1]=4;ndet[2]=6;ndet[3]=8;ndet[4]=22;ndet[5]=25;
+    ndet[0]= 4;ndet[1]= 4;ndet[2]= 6;ndet[3]= 8;ndet[4]=22;ndet[5]=25;
     AliITSgeom* geom = new AliITSgeom(0,6,nlad,ndet,mod);
     SetITSgeom(geom);
-    mod = -1;
+    mod = 0;
     for(lay=1;lay<=knlayers;lay++){
-       for(j=0;j<kndeep;j++) lnam[j] = itsGeomTreeNames[lay-1][j];
-       for(j=0;j<kndeep;j++) lnum[j] = itsGeomTreeCopys[lay-1][j];
-       switch (lay){
-       case 1: case 2: // layers 1 and 2 are a bit special
-           lad = 0;
-           for(j=1;j<=itsGeomTreeCopys[lay-1][4];j++){
-               lnum[4] = j;
-               for(k=1;k<=itsGeomTreeCopys[lay-1][5];k++){
-                   lad++;
-                   lnum[5] = k;
-                   for(det=1;det<=itsGeomTreeCopys[lay-1][6];det++){
-                       lnum[6] = det;
-                       mod++;
-                       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 det
-               } // end for k
-            } // end for j
-           break;
-       case 3: case 4: case 5: case 6: // layers 3-6
-           lnum[6] = 1;
-           for(lad=1;lad<=itsGeomTreeCopys[lay-1][4];lad++){
-               lnum[4] = lad;
-               for(det=1;det<=itsGeomTreeCopys[lay-1][5];det++){
-                   lnum[5] = det;
-                   mod++;
-                   ig->GetGeometry(7,lnam,lnum,t,r,idshape,npar,natt,
-                                   par,att,imat,imed);
-                   switch (lay){
-                   case 3: case 4:
-                       GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSDD,t,r);
-                       if(!(GetITSgeom()->IsShapeDefined(kSDD))) 
-                           GetITSgeom()->ReSetShape(kSDD,
-                                            new AliITSgeomSDD256(npar,par));
-                           break;
-                       case 5:
-                           GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
-                           if(!(GetITSgeom()->IsShapeDefined(kSSD))) 
-                               GetITSgeom()->ReSetShape(kSSD,
-                                         new AliITSgeomSSD275and75(npar,par));
-                           break;
-                       case 6:
-                           GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
-                           if(!(GetITSgeom()->IsShapeDefined(kSSD))) 
-                               GetITSgeom()->ReSetShape(kSSD,
-                                         new AliITSgeomSSD75and275(npar,par));
-                           break;
-                       } // end switch
-               } // end for det
-           } // end for lad
-           break;
-       } // end switch
+        for(cp0=1;cp0<=itsGeomTreeCopys[lay-1][0];cp0++){
+            for(cp1=1;cp1<=itsGeomTreeCopys[lay-1][1];cp1++){
+                for(cp2=1;cp2<=itsGeomTreeCopys[lay-1][2];cp2++){
+                    path.Form(names[fMinorVersion-1][lay-1].Data(),
+                              cp0,cp1,cp2);
+                    switch (lay){
+                    case 1:{
+                        det = cp2;
+                        lad = cp1+2*(cp0-1);
+                    }break;
+                    case 2:{
+                        det = cp2;
+                        lad = cp1+4*(cp0-1);
+                    } break;
+                    case 3: case 4: case 5: case 6:{
+                        det = cp1;
+                        lad = cp0;
+                    } break;
+                    } // end switch
+                         //AliInfo(Form("path=%s lay=%d lad=%d det=%d",
+                         //             path.Data(),lay,lad,det));
+                    gMC->GetTransformation(path.Data(),materix);
+                    gMC->GetShape(path.Data(),shapeName,shapePar);
+                    shapeParF.Set(shapePar.GetSize());
+                    for(i=0;i<shapePar.GetSize();i++) shapeParF[i]=shapePar[i];
+                    geom->CreatMatrix(mod,lay,lad,det,idet[lay-1],trans,rot);
+                    geom->SetTrans(mod,materix.GetTranslation());
+                    geom->SetRotMatrix(mod,materix.GetRotationMatrix());
+                    switch (lay){
+                    case 1: case 2:{
+                        geom->ReSetShape(kSPD,new AliITSgeomSPD425Short(
+                                shapeParF.GetSize(),shapeParF.GetArray()));
+                    }break;
+                    case 3: case 4:{
+                        geom->ReSetShape(kSDD,new AliITSgeomSDD256(
+                                shapeParF.GetSize(),shapeParF.GetArray()));
+                    }break;
+                    case 5: case 6:{
+                        geom->ReSetShape(kSSD,new AliITSgeomSSD75and275(
+                                shapeParF.GetSize(),shapeParF.GetArray()));
+                    }break;
+                    default:{
+                    }break;
+                    } // end switch
+                    mod++;
+                } /// end for cp2
+            } // end for cp1
+        } // end for cp0
     } // end for lay
-//#endif
     return;
 }
 //______________________________________________________________________
@@ -5177,14 +5378,12 @@ void AliITSvPPRasymmFMD::SetDefaults(){
     Int_t i;
     Float_t bx[256],bz[280];
    
-    fDetTypeSim->ResetResponse();
-    fDetTypeSim->ResetSegmentation();
     
     fDetTypeSim->SetDefaults();
     
     //SPD
     s0 = (AliITSgeomSPD*) GetITSgeom()->GetShape(kSPD);// Get shape info. Do it this way for now.
-    //AliITSresponseSPD* resp0=new AliITSresponseSPD();
+    //AliITSCalibrationSPD* resp0=new AliITSCalibrationSPD();
 
     //AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(GetITSgeom());
 
@@ -5204,13 +5403,13 @@ void AliITSvPPRasymmFMD::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(GetITSgeom()->GetStartSPD()))->DataType();
     if (strstr(kData0,"real")) fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigit");
     else fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigitSPD");
     // SDD
     s1 = (AliITSgeomSDD*) GetITSgeom()->GetShape(kSDD);// Get shape info. Do it this way for now.
 
-    //AliITSresponseSDD* resp1=new AliITSresponseSDD("simulated");
+    //AliITSCalibrationSDD* resp1=new AliITSCalibrationSDD("simulated");
     
     //AliITSsegmentationSDD *seg1=new AliITSsegmentationSDD(GetITSgeom(),resp1);    
 
@@ -5220,8 +5419,9 @@ void AliITSvPPRasymmFMD::SetDefaults(){
                     s1->GetDy()*2.*kconv); // x,z,y full width in microns.
     seg1->SetNPads(256,256);// Use AliITSgeomSDD for now
     SetSegmentationModel(kSDD,seg1);
-    const char *kData1=(fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD()))->DataType();
-    const char *kopt=fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD())->ZeroSuppOption();
+    const char *kData1=(fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSDD()))->DataType();
+    AliITSCalibrationSDD* rsp = (AliITSCalibrationSDD*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSDD());
+    const char *kopt=rsp->GetZeroSuppOption();
     if((!strstr(kopt,"2D")) && (!strstr(kopt,"1D")) || strstr(kData1,"real") ){
        fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigit");
     } else fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigitSDD");
@@ -5230,7 +5430,7 @@ void AliITSvPPRasymmFMD::SetDefaults(){
     s2 = (AliITSgeomSSD*) GetITSgeom()->GetShape(kSSD);// Get shape info. Do it this way for now.
 
 
-    //SetResponseModel(GetITSgeom()->GetStartSSD(),new AliITSresponseSSD("simulated"));
+    //SetCalibrationModel(GetITSgeom()->GetStartSSD(),new AliITSCalibrationSSD("simulated"));
     
     //AliITSsegmentationSSD *seg2=new AliITSsegmentationSSD(GetITSgeom());
     AliITSsegmentationSSD* seg2 = (AliITSsegmentationSSD*)fDetTypeSim->GetSegmentationModel(2);
@@ -5243,7 +5443,7 @@ void AliITSvPPRasymmFMD::SetDefaults(){
     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.
     SetSegmentationModel(kSSD,seg2); 
-        const char *kData2=(fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()))->DataType();
+        const char *kData2=(fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSSD()))->DataType();
     if(strstr(kData2,"real") ) fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigit");
     else fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigitSSD");
     if(fgkNTYPES>3){