X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSvSPD02.cxx;h=7945dd5c43c7237825ff6ddce72f0ef2c7719a66;hb=75fb37cce68c2073863a55b2919d636fa541b901;hp=c2f77da5d560b66a030d21a704766e258f9a57f0;hpb=fcf95fc7a1a40644de272f60ebe2a9059a8ba9a7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSvSPD02.cxx b/ITS/AliITSvSPD02.cxx
index c2f77da5d56..7945dd5c43c 100644
--- a/ITS/AliITSvSPD02.cxx
+++ b/ITS/AliITSvSPD02.cxx
@@ -20,11 +20,13 @@
 #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"
@@ -33,7 +35,7 @@
 #include "AliITSDetTypeSim.h"
 #include "AliITSCalibrationSPD.h"
 #include "AliITSsegmentationSPD.h"
-#include "AliITSsimulationSPDdubna.h"
+#include "AliITSsimulationSPD.h"
 #include "AliMC.h"
 
 
@@ -121,38 +123,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.
@@ -485,7 +455,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 +486,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,6 +523,30 @@ void AliITSvSPD02::CreateMaterials2002(){
               epsilSi,stminSi);
 }
 //______________________________________________________________________
+Int_t AliITSvSPD02::DecodeDetector(Int_t id,Int_t cpy,Int_t &lay,Int_t &lad,
+    Int_t &det)const{
+    //     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:
+    //    Int_t id   Detector volume id
+    //    Int_t cpy  Detector copy number
+    // Outputs:
+    //    Int_t lay  layer number
+    //    Int_t lad  ladder number
+    //    Int_t det  detector number
+    // Return:
+    //    The module number
+    Int_t mod;
+
+    lad = det = 1;
+    lay = cpy;
+    if(cpy>2 && id==fIdSens[0]) lay = cpy + 1;
+    if(id==fIdSens[1]) lay = 3;
+    mod = lay - 1;
+    return mod;
+}
+//______________________________________________________________________
 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
@@ -563,93 +557,39 @@ void AliITSvSPD02::InitAliITSgeom(){
     //    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);
+    const Int_t kltypess=2;
+    const Int_t knlayers=5;
+    const TString knames[kltypess]=
+        {"ALIC_1/ITSV_1/ITEL_%d/IMB0_1/IMBS_1",//lay=1,2,4,5
+         "ALIC_1/ITSV_1/IDET_%d/ITS0_1/ITST_1"};// lay=3
+    const Int_t kitsGeomTreeCopys[2]={4,1};
+    const Int_t knlad[knlayers]={knlayers*1},kndet[knlayers]={knlayers*1};
+    TString path,shapeName;
+    TGeoHMatrix matrix;
+    TArrayD shapePar;
+    TArrayF shapeParF;
+    Double_t trans[3]={3*0.0},rot[10]={10*0.0};
+    Int_t npar=3,mod,i,j,lay,lad,det,cpy;
+    Float_t par[20];
+
+    par[0]=0.64;par[1]=0.5*300.0E-4;par[2]=3.48;
+    mod=5;
+    AliITSgeom* geom = new AliITSgeom(0,knlayers,knlad,kndet,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
+    for(i=0;i<kltypess;i++)for(cpy=1;cpy<=kitsGeomTreeCopys[i];cpy++){
+        path.Form(knames[i].Data(),cpy);
+        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];
+        mod = DecodeDetector(fIdSens[i],cpy,lay,lad,det);
+        geom->CreateMatrix(mod,lay,lad,det,kSPD,trans,rot);
+        geom->SetTrans(mod,matrix.GetTranslation());
+        geom->SetRotMatrix(mod,matrix.GetRotationMatrix());
+        geom->GetGeomMatrix(mod)->SetPath(path.Data());
+        if(!(geom->IsShapeDefined((Int_t)kSPD)))
+            geom->ReSetShape(kSPD,new AliITSgeomSPD425Short(npar,par));
+    } // end for i,cpy/
     return;
 }
 //______________________________________________________________________
@@ -714,7 +654,7 @@ void AliITSvSPD02::SetDefaults(){
     resp0->SetDistanceOverVoltage();
     SetCalibrationModel(0,resp0); 
 	
-    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(GetITSgeom());
+    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.
@@ -775,7 +715,7 @@ void AliITSvSPD02::SetDefaultSimulation(){
     if (!sim) {
       //seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
       //res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD());
-      sim = new AliITSsimulationSPDdubna(fDetTypeSim);
+      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()));
@@ -861,7 +801,7 @@ void AliITSvSPD02::StepManager(){
     // Return:
     //    none.
     ////////////////////////////////////////////////////////////////////////
-    Int_t         copy, id;
+    Int_t         copy=0, id;
     TLorentzVector position, momentum;
     static TLorentzVector position0;
     static Int_t stat0=0;