Added line for closed space frame option

[u/mrichter/AliRoot.git] / macros / Config.C

diff --git a/macros/Config.C b/macros/Config.C
index 0058571504ad1775f14ff3431f42ddf22b9471b0..4d41fd1be1233e0c1dc1d16137887c300c12e054 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -74,7 +74,9 @@ 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;
 
 //=================== Alice BODY parameters =============================
 AliBODY *BODY = new AliBODY("BODY","Alice envelop");
@@ -110,6 +112,9 @@ if(iFRAME) {
 //=================== FRAME parameters ============================
 
 AliFRAME *FRAME  = new AliFRAMEv0("FRAME","Space Frame");
+// Uncomment the following line to obtain the closed version
+// of the space frame. The default is the version with holes
+// FRAME->SetEuclidFile("$(ALICE_ROOT)/Euclid/frame.tme","$(ALICE_ROOT)/Euclid/frame1099i.euc");
 }
 
 if(iSHIL) {
@@ -134,8 +139,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) {
@@ -161,27 +166,34 @@ AliTPCParam *param = &(paramd->GetParam());
 
 // Set geometrical parameters
 
-param->SetSectorAngles(40.,0.,20.,10.);
-param->SetInnerRadiusLow(83.7);
-param->SetInnerRadiusUp(132.9);
+param->SetSectorAngles(20.,0.,20.,0.);
+param->SetInnerRadiusLow(83.9);
+param->SetInnerRadiusUp(141.3);
 param->SetOuterRadiusLow(146.9);
 param->SetOuterRadiusUp(249.4);
 param->SetInSecLowEdge(81.6);
-param->SetInSecUpEdge(135.);
+param->SetInSecUpEdge(143.6);
 param->SetOuSecLowEdge(144.2);
 param->SetOuSecUpEdge(252.1);
 param->SetEdge(1.5);
 param->SetDeadZone(1.15);
+param->SetPadLength(2.0);
+param->SetPadWidth(0.3);
+param->SetPadPitchLength(2.05);
+param->SetPadPitchWidth(0.35);
 param->Update();
 
+if (TPC->IsVersion() != 2) paramd->Write("Param1");
+
 // set gas mixture
 
 TPC->SetGasMixt(2,20,10,-1,0.9,0.1,0.);
 TPC->SetSecAL(1);
 TPC->SetSecAU(1);
-TPC->SetSecLows(0, -1, -1, -1, -1, -1);
-TPC->SetSecUps(18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1);
-TPC->SetSens(-1);
+// Meaningless with versions other than 2
+TPC->SetSecLows(1, 2, 3, 1+18, 2+18, 3+18);
+TPC->SetSecUps(1+36, 2+36, 3+36, 1+38+18, 2+38+18, 3+38+18, -1,-1,-1,-1,-1,-1);
+TPC->SetSens(1);
 }
 
 if(iTOF) {
@@ -573,9 +585,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
@@ -585,9 +597,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
@@ -635,6 +646,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 ============================
 
@@ -645,5 +664,11 @@ PMD->SetGEO(0.0, 0.2, 4.);
 PMD->SetPadSize(0.8, 1.0, 1.0, 1.5);
 
 }
+
+if(iSTART) {
+//=================== START parameters ============================
+AliSTART *START  = new AliSTARTv0("START","START Detector");
+}
+
          
 }