Introduction of new ITS and CPV and PHOS separated

diff --git a/macros/Config.C b/macros/Config.C
index 3064972352728b8584fb87ef94c7f53c94ab3a91..9fa6dda80e6172599ffb0bcabe2fd095195782d9 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -74,6 +74,7 @@ Int_t iPIPE=1;
 Int_t iFMD=1;
 Int_t iMUON=1;
 Int_t iPHOS=1;
+Int_t iCPV=1;
 Int_t iPMD=1;
 Int_t iSTART=0;
 
@@ -135,8 +136,8 @@ if(iITS) {
 // understandable to the CAD system EUCLID. The default (=0) means that you 
 // dont want to use this facility.
 //
-AliITS *ITS  = new AliITSv3("ITS","normal ITS");
-ITS->SetEUCLID(1);
+AliITS *ITS  = new AliITSv5("ITS","normal ITS");
+ITS->SetEUCLID(0);
 }
 
 if(iTPC) {
@@ -574,9 +575,9 @@ AliMUON *MUON  = new AliMUONv0("MUON","normal MUON");
  MUON->SetPADSIZ(station, 1, 0.75, 0.5);
 }
  
-if(iPHOS) {
 //=================== PHOS parameters ===========================
 
+if(iPHOS) {
 AliPHOS *PHOS  = new AliPHOSv1("PHOS","normal PHOS");
 // * PHOSflags:    YES: X<>0   NO: X=0
 // * PHOSflags(1) : -----X  Create branch for TObjArray of AliPHOSCradle
@@ -586,9 +587,8 @@ PHOS->SetFlags(000001);
 PHOS->SetRadius(460); //Distance from beam to PHOS crystals.
 // (crystal_side_size,crystal_length,wrap_thikness,air_thikness,PIN_size,PIN length)
 PHOS->SetCell(2.2,          18.,         0.01,        0.01,        1.,      0.1);
-PHOS->SetCradleSize(104, 88, 4); // Nz (along beam), Nphi, Ncradles
+PHOS->SetCradleSize(48, 90, 4); // Nz (along beam), Nphi, Ncradles
 PHOS->SetCradleA(0);   //Angle between Cradles
-PHOS->SetCPV(1., 2.); //CPV thikness, CPV-PHOS distance
 // *  ===============
 // * PHOS extra parameters (contact Maxim Volkov volkov@mail.cern.ch)
 // * 1. STE_THICK         Steel cover thickness
@@ -636,6 +636,14 @@ PHOS->SetFoam(214.6,  80.,  260., 467.);
 // *******************************************************************************
 }
 
+if(iCPV) {
+//=================== CPV parameters ============================
+
+  printf ("CPV in initializing\n");
+  AliCPV *CPV  = new AliCPVv0("CPV","normal CPV");
+}
+
+
 if(iPMD) {
 //=================== PMD parameters ============================
 

diff --git a/macros/Config_gener.C b/macros/Config_gener.C
index 3510d406c971526630649433f84baa93261b8170..1d241ee1d815c41e36cf4c4a8120283586a759bc 100644 (file)
--- a/macros/Config_gener.C
+++ b/macros/Config_gener.C
@@ -236,6 +236,7 @@ Int_t iPIPE=1;
 Int_t iFMD=1;
 Int_t iMUON=1;
 Int_t iPHOS=1;
+Int_t iCPV=1;
 Int_t iPMD=1;
 Int_t iSTART=0;
 
@@ -297,8 +298,8 @@ if(iITS) {
 // understandable to the CAD system EUCLID. The default (=0) means that you 
 // dont want to use this facility.
 //
-AliITS *ITS  = new AliITSv3("ITS","normal ITS");
-ITS->SetEUCLID(1);
+AliITS *ITS  = new AliITSv5("ITS","normal ITS");
+ITS->SetEUCLID(0);
 }
 
 if(iTPC) {
@@ -737,8 +738,6 @@ AliMUON *MUON  = new AliMUONv0("MUON","normal MUON");
 }
  
 if(iPHOS) {
-//=================== PHOS parameters ===========================
-
 AliPHOS *PHOS  = new AliPHOSv1("PHOS","normal PHOS");
 // * PHOSflags:    YES: X<>0   NO: X=0
 // * PHOSflags(1) : -----X  Create branch for TObjArray of AliPHOSCradle
@@ -748,9 +747,8 @@ PHOS->SetFlags(000001);
 PHOS->SetRadius(460); //Distance from beam to PHOS crystals.
 // (crystal_side_size,crystal_length,wrap_thikness,air_thikness,PIN_size,PIN length)
 PHOS->SetCell(2.2,          18.,         0.01,        0.01,        1.,      0.1);
-PHOS->SetCradleSize(104, 88, 4); // Nz (along beam), Nphi, Ncradles
+PHOS->SetCradleSize(48, 90, 4); // Nz (along beam), Nphi, Ncradles
 PHOS->SetCradleA(0);   //Angle between Cradles
-PHOS->SetCPV(1., 2.); //CPV thikness, CPV-PHOS distance
 // *  ===============
 // * PHOS extra parameters (contact Maxim Volkov volkov@mail.cern.ch)
 // * 1. STE_THICK         Steel cover thickness
@@ -798,6 +796,13 @@ PHOS->SetFoam(214.6,  80.,  260., 467.);
 // *******************************************************************************
 }
 
+if(iCPV) {
+//=================== CPV parameters ============================
+
+  printf ("CPV in initializing\n");
+  AliCPV *CPV  = new AliCPVv0("CPV","normal CPV");
+}
+
 if(iPMD) {
 //=================== PMD parameters ============================
 

diff --git a/macros/loadlibs.C b/macros/loadlibs.C
index a1247225c74b0d7805ac34c56345bb8bff26238e..5732c0db338ab0b988623a211542bbb498c9d723 100644 (file)
--- a/macros/loadlibs.C
+++ b/macros/loadlibs.C
@@ -1,5 +1,6 @@
 void loadlibs () 
 {
+  gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libminicern");
   gSystem->Load("$(ROOTSYS)/lib/libEG");
   gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libSTEER");
   gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libTGeant3Dummy");
@@ -19,4 +20,5 @@ void loadlibs ()
   gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libZDC");
   gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libITS");
   gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libCASTOR");
+  gSystem->Load("$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)/libCPV");
 }