updated for changes in Config.C and new versions of detectors

diff --git a/AliGeant4/macro/MUON/Config.C b/AliGeant4/macro/MUON/Config.C
index d1ac75488abd0e5b4c0900da61a4d5fbb2c5107c..14c5fca7cf0a9ae894b94621c3599d37a78e4bca 100644 (file)
--- a/AliGeant4/macro/MUON/Config.C
+++ b/AliGeant4/macro/MUON/Config.C
@@ -6,324 +6,6 @@ void Config(Int_t version)
   AliMUON *MUON = 0;
   switch (version) {
     case 0: MUON  = new AliMUONv0("MUON","normal MUON"); break;
+    case 1: MUON  = new AliMUONv1("MUON","normal MUON"); break;
   }  
-
-//=================== MUON parameters ===========================
-  MUON->SetMaxStepGas(0.1);
-  MUON->SetMaxStepAlu(0.1);
-
-//
-// Version 0
-//
-// First define the number of planes that are segmented (1 or 2) by a call
-// to SetNsec. 
-// Then chose for each chamber (chamber plane) the segmentation 
-// and response model.
-// They should be equal for the two chambers of each station. In a future
-// version this will be enforced.
-//
-//  
- Int_t chamber;
- Int_t station;
-// Default response
- AliMUONresponseV0* response0 = new AliMUONresponseV0;
- response0->SetSqrtKx3(0.7131);
- response0->SetKx2(1.0107);
- response0->SetKx4(0.4036);
- response0->SetSqrtKy3(0.7642);
- response0->SetKy2(0.9706);
- response0->SetKy4(0.3831);
- response0->SetPitch(0.25);
- response0->SetSigmaIntegration(10.);
- response0->SetChargeSlope(50);
- response0->SetChargeSpread(0.18, 0.18);
- response0->SetMaxAdc(4096);
-//--------------------------------------------------------
-// Configuration for Chamber TC1/2  (Station 1) ----------           
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-// Float_t rseg1[4]={17.5, 55.2, 71.3, 95.5};
- Float_t rseg1[4]={15.5, 55.2, 71.3, 95.5};
- Int_t   nseg1[4]={4, 4, 2, 1};
-//
- chamber=1;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg11=new AliMUONsegmentationV01;
- 
- seg11->SetSegRadii(rseg1);
- seg11->SetPADSIZ(3, 0.5);
- seg11->SetDAnod(3.0/3./4);
- seg11->SetPadDivision(nseg1);
- 
- MUON->SetSegmentationModel(chamber-1, 1, seg11);
-//
- AliMUONsegmentationV02 *seg12=new AliMUONsegmentationV02;
- seg12->SetSegRadii(rseg1); 
- seg12->SetPADSIZ(0.75, 2.0);
- seg12->SetDAnod(3.0/3./4);
- seg12->SetPadDivision(nseg1);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg12);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=2;
-//^^^^^^^^^
-//
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg21=new AliMUONsegmentationV01;
- seg21->SetSegRadii(rseg1);
- seg21->SetPADSIZ(3, 0.5);
- seg21->SetDAnod(3.0/3./4);
- seg21->SetPadDivision(nseg1);
- MUON->SetSegmentationModel(chamber-1, 1, seg21);
-//
- AliMUONsegmentationV02 *seg22=new AliMUONsegmentationV02;
- seg22->SetSegRadii(rseg1); 
- seg22->SetPADSIZ(0.75, 2.);
- seg22->SetDAnod(3.0/3./4);
- seg22->SetPadDivision(nseg1);
- MUON->SetSegmentationModel(chamber-1, 2, seg22);
-
- MUON->SetResponseModel(chamber-1, response0);     
-//
-//--------------------------------------------------------
-// Configuration for Chamber TC3/4 -----------------------
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-// Float_t rseg2[4]={23.5, 47.1, 87.7, 122.5};
- Float_t rseg2[4]={21.5, 47.1, 87.7, 122.5};
- Int_t   nseg2[4]={4, 4, 2, 1};
-//
- chamber=3;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg31=new AliMUONsegmentationV01;
- seg31->SetSegRadii(rseg2);
- seg31->SetPADSIZ(3, 0.5);
- seg31->SetDAnod(3.0/3./4);
- seg31->SetPadDivision(nseg2);
- MUON->SetSegmentationModel(chamber-1, 1, seg31);
-//
- AliMUONsegmentationV02 *seg32=new AliMUONsegmentationV02;
- seg32->SetSegRadii(rseg2); 
- seg32->SetPADSIZ(0.75, 2.);
- seg32->SetPadDivision(nseg2);
- seg32->SetDAnod(3.0/3./4);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg32);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=4;
-//^^^^^^^^^
-//
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg41=new AliMUONsegmentationV01;
- seg41->SetSegRadii(rseg2);
- seg41->SetPADSIZ(3, 0.5);
- seg41->SetDAnod(3.0/3./4);
- seg41->SetPadDivision(nseg2);
- MUON->SetSegmentationModel(chamber-1, 1, seg41);
-//
- AliMUONsegmentationV02 *seg42=new AliMUONsegmentationV02;
- seg42->SetSegRadii(rseg2); 
- seg42->SetPADSIZ(0.75, 2.);
- seg42->SetPadDivision(nseg2);
- seg42->SetDAnod(3.0/3./4);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg42);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
-
-//--------------------------------------------------------
-// Configuration for Chamber TC5/6 -----------------------
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/*
- seg5 =  new AliMUONsegmentationV1;
- AliMUONresponseV0* response5 =  new AliMUONresponseV0;
- // K3 = 0.62
- response5->SetSqrtKx3(0.78740079);
- response5->SetKx2(0.95237319); //  0.5 * kPI * (1- 0.5*sqrtky3 )
- response5->SetKx4(0.37480633); // 0.25/TMath::ATan(sqrtkx3)
- // K3 = 0.55
- response5->SetSqrtKy3(0.74161985);
- response5->SetKy2(0.98832946);
- response5->SetKy4(0.39177817);
- response5->SetPitch(0.325);
- response5->SetSigmaIntegration(10.);
- response5->SetChargeSlope(50);
- response5->SetChargeSpread(0.4, 0.4);
- response5->SetMaxAdc(4096);
-
- chamber=5;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg5);
- MUON->SetResponseModel(chamber-1, response5);     
-
- chamber=6;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg5);
- MUON->SetResponseModel(chamber-1, response5);     
-//
-// Station 3
- station=3;
- MUON->SetPADSIZ(station, 1, 0.975, 0.55);
-*/
-
- chamber=5;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV0 *seg51=new AliMUONsegmentationV0;
- seg51->SetPADSIZ(0.75, 0.5);
- seg51->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 1, seg51);
-//
- AliMUONsegmentationV0 *seg52=new AliMUONsegmentationV0;
- seg52->SetPADSIZ(0.5,0.75);
- seg52->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 2, seg52);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=6;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV0 *seg61=new AliMUONsegmentationV0;
- seg61->SetPADSIZ(0.75, 0.5);
- seg61->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 1, seg61);
-//
- AliMUONsegmentationV0 *seg62=new AliMUONsegmentationV0;
- seg62->SetPADSIZ(0.5,0.75);
- seg62->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 2, seg62);
-
- MUON->SetResponseModel(chamber-1, response0);   
-
-//--------------------------------------------------------
-// Configuration for Chamber TC7/8  (Station 4) ----------           
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
- Int_t   nseg4[4]={4, 4, 2, 1};
-
- chamber=7;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV04 *seg71=new AliMUONsegmentationV04;
- seg71->SetPADSIZ(10.,0.5);
- seg71->SetDAnod(0.25);
- seg71->SetPadDivision(nseg4);
- MUON->SetSegmentationModel(chamber-1, 1, seg71);
-
- AliMUONsegmentationV05 *seg72=new AliMUONsegmentationV05;
- seg72->SetPADSIZ(1,10);
- seg72->SetDAnod(0.25);
- seg72->SetPadDivision(nseg4);
- MUON->SetSegmentationModel(chamber-1, 2, seg72);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=8;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
- AliMUONsegmentationV04 *seg81=new AliMUONsegmentationV04;
- seg81->SetPADSIZ(10., 0.5);
- seg81->SetPadDivision(nseg4);
- seg81->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 1, seg81);
-
- AliMUONsegmentationV05 *seg82=new AliMUONsegmentationV05;
- seg82->SetPADSIZ(1, 10);
- seg82->SetPadDivision(nseg4);
- seg82->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 2, seg82);
-
- MUON->SetResponseModel(chamber-1, response0);     
-//--------------------------------------------------------
-// Configuration for Chamber TC9/10  (Station 5) ---------           
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- chamber=9;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV04 *seg91=new AliMUONsegmentationV04;
- seg91->SetPADSIZ(10.,0.5);
- seg91->SetDAnod(0.25);
- seg91->SetPadDivision(nseg4);
- MUON->SetSegmentationModel(chamber-1, 1, seg91);
-
- AliMUONsegmentationV05 *seg92=new AliMUONsegmentationV05;
- seg92->SetPADSIZ(1,10);
- seg92->SetDAnod(0.25);
- seg92->SetPadDivision(nseg4);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg92);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=10;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
- AliMUONsegmentationV04 *seg101=new AliMUONsegmentationV04;
- seg101->SetPADSIZ(10., 0.5);
- seg101->SetPadDivision(nseg4);
- seg101->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 1, seg101);
-
- AliMUONsegmentationV05 *seg102=new AliMUONsegmentationV05;
- seg102->SetPADSIZ(1,10);
- seg102->SetPadDivision(nseg4);
- seg102->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 2, seg102);
-
- MUON->SetResponseModel(chamber-1, response0);     
-//--------------------------------------------------------
-// Configuration for Trigger staions --------------------- 
-// (not yet used/implemented) ----------------------------          
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
- chamber=11;
- MUON->SetNsec(chamber-1,1);
- AliMUONsegmentationV0 *seg1112=new AliMUONsegmentationV0;
- seg1112->SetDAnod(0.51/3.);
-
- MUON->SetSegmentationModel(chamber-1, 1, seg1112);
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=12;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg1112);
- MUON->SetResponseModel(chamber-1, response0);     
-//
-// Trigger Station 1
- station=6;
- MUON->SetPADSIZ(station, 1, 0.75, 0.5);
-
- chamber=13;
- MUON->SetNsec(chamber-1,1);
- AliMUONsegmentationV0 *seg1314=new AliMUONsegmentationV0;
- seg1314->SetDAnod(0.51/3.);
-
- MUON->SetSegmentationModel(chamber-1, 1, seg1314);
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=14;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg1314);
- MUON->SetResponseModel(chamber-1, response0);     
-//
-// Trigger Station 2
- station=7;
- MUON->SetPADSIZ(station, 1, 0.75, 0.5);
-
-
-
 }

diff --git a/AliGeant4/macro/PHOS/Config.C b/AliGeant4/macro/PHOS/Config.C
index 07ba69c9031c0c225bf288e7e3d359ec0c73d388..32b8f5f2896f219f20b16fad2b2f761a6118f6f1 100644 (file)
--- a/AliGeant4/macro/PHOS/Config.C
+++ b/AliGeant4/macro/PHOS/Config.C
@@ -6,6 +6,10 @@ void Config(Int_t version)
   switch (version) {
     case 0: PHOS  = new AliPHOSv0("PHOS","GPS2");                break;
     case 1: PHOS  = new AliPHOSv1("PHOS","GPS2");                break;
+    case 2: PHOS  = new AliPHOSv2("PHOS","GPS2");                break;
+    case 3: PHOS  = new AliPHOSv3("PHOS","GPS2");                break;
+    case 4: PHOS  = new AliPHOSv4("PHOS","GPS2");                break;
+    case 5: PHOS  = new AliPHOSvFast("PHOS","GPS2");                break;
   }  
 
 //=================== PHOS parameters ===========================

diff --git a/AliGeant4/macro/RICH/Config.C b/AliGeant4/macro/RICH/Config.C
index 099f648677c440d3d22fa0bfac602c715e2329a8..fb8afa9a67a29895f0f298ef872d56d5281b0983 100644 (file)
--- a/AliGeant4/macro/RICH/Config.C
+++ b/AliGeant4/macro/RICH/Config.C
@@ -5,52 +5,8 @@ void Config(Int_t version)
   AliRICH *RICH = 0;
   switch (version) {
     case 0: RICH  = new AliRICHv0("RICH","normal RICH"); break;
+    case 1: RICH  = new AliRICHv1("RICH","normal RICH"); break;
+    case 2: RICH  = new AliRICHv2("RICH","normal RICH"); break;
   }  
-
-//
-// Version 0
-// Default Segmentation
-    AliRICHSegmentationV0* SegmentationV0 = new AliRICHSegmentationV0;
-//
-//  Segmentation parameters
-    SegmentationV0->SetPadSize(0.84,0.80);
-    SegmentationV0->SetDAnod(0.84/2);
-//
-//  Geometry parameters
-    AliRICHGeometry* GeometryV0 = new AliRICHGeometryV0;
-    GeometryV0->SetGapThickness(7.6);
-    GeometryV0->SetProximityGapThickness(.4);
-    GeometryV0->SetQuartzLength(131);
-    GeometryV0->SetQuartzWidth(126.2);
-    GeometryV0->SetQuartzThickness(.5);
-    GeometryV0->SetOuterFreonLength(131);
-    GeometryV0->SetOuterFreonWidth(40.3);
-    GeometryV0->SetInnerFreonLength(131);
-    GeometryV0->SetInnerFreonWidth(40.3);
-    GeometryV0->SetFreonThickness(1);
-//
-//  Response parameters
-    AliRICHResponseV0*  Rresponse0   = new AliRICHResponseV0;
-    Rresponse0->SetSigmaIntegration(5.);
-    Rresponse0->SetChargeSlope(41.);
-    Rresponse0->SetChargeSpread(0.18, 0.18);
-    Rresponse0->SetMaxAdc(1024);
-    Rresponse0->SetAlphaFeedback(0.05);
-    Rresponse0->SetEIonisation(26.e-9);
-    Rresponse0->SetSqrtKx3(0.77459667);
-    Rresponse0->SetKx2(0.962);
-    Rresponse0->SetKx4(0.379);
-    Rresponse0->SetSqrtKy3(0.77459667);
-    Rresponse0->SetKy2(0.962);
-    Rresponse0->SetKy4(0.379);
-    Rresponse0->SetPitch(0.25);
-//
-//      
-  for (Int_t i=0; i<7; i++) {
-    RICH->SetGeometryModel(i,GeometryV0);
-    RICH->SetSegmentationModel(i, SegmentationV0);
-    RICH->SetResponseModel(i, Rresponse0);
-    RICH->SetNsec(i,1);
-  }
 }
 

diff --git a/AliGeant4/macro/START/Config.C b/AliGeant4/macro/START/Config.C
index 3f6c5e6a6f91c678ed977b840f15cb80551add6c..4dfaca5fae6eb6f95a75a71585d8b8c3d4f9a007 100644 (file)
--- a/AliGeant4/macro/START/Config.C
+++ b/AliGeant4/macro/START/Config.C
@@ -5,6 +5,7 @@ void Config(Int_t version)
   AliSTART* START = 0;
   switch (version) {
     case 0: START  = new AliSTARTv0("START","START Detector"); break;
+    //case 1: START  = new AliSTARTv1("START","START Detector"); break;
   }  
 
 //=================== START parameters ============================

diff --git a/AliGeant4/macro/TOF/Config.C b/AliGeant4/macro/TOF/Config.C
index 93c51bec2420c568c1bb0196aeab39c0c93efe42..4d6e91bbf8983a58db2f32b418f9dc3f58862792 100644 (file)
--- a/AliGeant4/macro/TOF/Config.C
+++ b/AliGeant4/macro/TOF/Config.C
@@ -9,8 +9,6 @@ void Config(Int_t version)
     case 2: TOF  = new AliTOFv2("TOF", "TOFv2 detector"); break;
     case 3: TOF  = new AliTOFv3("TOF", "TOFv3 detector"); break;
     case 4: TOF  = new AliTOFv4("TOF", "TOFv4 detector"); break;
-    case 5: TOF  = new AliTOFv5("TOF", "TOFv5 detector"); break;
-    case 6: TOF  = new AliTOFv6("TOF", "TOFv6 detector"); break;
   }   
 
 //=================== TOF parameters ============================

diff --git a/AliGeant4/macro/g4Config.C b/AliGeant4/macro/g4Config.C
index 1c8ea96ed3c6db8782b2ddb50ea72d26c75739b0..5e72ed7ba564bf1353e8c0d14df4cd6efe684cb4 100644 (file)
--- a/AliGeant4/macro/g4Config.C
+++ b/AliGeant4/macro/g4Config.C
@@ -97,7 +97,7 @@ Int_t iITS=1;
 Int_t iTPC=1;
 Int_t iTOF=1;
 Int_t iRICH=1;
-Int_t iZDC=0; 
+Int_t iZDC=0;
 Int_t iCASTOR=1;
 Int_t iTRD=1;
 Int_t iABSO=1;
@@ -106,11 +106,11 @@ Int_t iHALL=1;
 Int_t iFRAME=1;
 Int_t iSHIL=1;
 Int_t iPIPE=1;
-Int_t iFMD=0;
+Int_t iFMD=1;
 Int_t iMUON=1;
 Int_t iPHOS=1;
 Int_t iPMD=1;
-Int_t iSTART=1;
+Int_t iSTART=0;
 
     // Exclude detectors that do not work with Geant4
       iRICH=0; 
@@ -201,21 +201,21 @@ if(iTPC) {
 //
 //-----------------------------------------------------------------------------
 
-  gROOT->LoadMacro("SetTPCParam.C");
-  AliTPCParam *param = SetTPCParam();
-  AliTPC *TPC  = new AliTPCv1("TPC","Normal TPC"); //v1 is default
-  TPC->SetParam(param); // pass the parameter object to the TPC
+  //  gROOT->LoadMacro("SetTPCParam.C");
+  //  AliTPCParam *param = SetTPCParam();
+  AliTPC *TPC  = new AliTPCv1("TPC","Default"); //v1 is default
+  //  TPC->SetParam(param); // pass the parameter object to the TPC
 
 // set gas mixture
 
-TPC->SetGasMixt(2,20,10,-1,0.9,0.1,0.);
-TPC->SetSecAL(4);
-TPC->SetSecAU(4);
-TPC->SetSecLows(1,  2,  3, 19, 20, 21);
-TPC->SetSecUps(37, 38, 39, 37+18, 38+18, 39+18, -1, -1, -1, -1, -1, -1);
-TPC->SetSens(1);
+  //TPC->SetGasMixt(2,20,10,-1,0.9,0.1,0.);
+  //TPC->SetSecAL(4);
+  //TPC->SetSecAU(4);
+  //TPC->SetSecLows(1,  2,  3, 19, 20, 21);
+  //TPC->SetSecUps(37, 38, 39, 37+18, 38+18, 39+18, -1, -1, -1, -1, -1, -1);
+  //TPC->SetSens(1);
 
-if (TPC->IsVersion()==1) param->Write(param->GetTitle());
+  //if (TPC->IsVersion()==1) param->Write(param->GetTitle());
 }
 
 if(iTOF) {
@@ -225,53 +225,8 @@ AliTOF *TOF  = new AliTOFv1("TOF","normal TOF");
 
 if(iRICH) {
 //=================== RICH parameters ===========================
-    AliRICH *RICH  = new AliRICHv0("RICH","normal RICH");
+    AliRICH *RICH  = new AliRICHv1("RICH","normal RICH");
     
-//
-// Version 0
-// Default Segmentation
-    AliRICHSegmentationV0* SegmentationV0 = new AliRICHSegmentationV0;
-//
-//  Segmentation parameters
-    SegmentationV0->SetPadSize(0.84,0.80);
-    SegmentationV0->SetDAnod(0.84/2);
-//
-//  Geometry parameters
-    AliRICHGeometry* GeometryV0 = new AliRICHGeometryV0;
-    GeometryV0->SetGapThickness(7.6);
-    GeometryV0->SetProximityGapThickness(.4);
-    GeometryV0->SetQuartzLength(131);
-    GeometryV0->SetQuartzWidth(126.2);
-    GeometryV0->SetQuartzThickness(.5);
-    GeometryV0->SetOuterFreonLength(131);
-    GeometryV0->SetOuterFreonWidth(40.3);
-    GeometryV0->SetInnerFreonLength(131);
-    GeometryV0->SetInnerFreonWidth(40.3);
-    GeometryV0->SetFreonThickness(1);
-//
-//  Response parameters
-    AliRICHResponseV0*  Rresponse0   = new AliRICHResponseV0;
-    Rresponse0->SetSigmaIntegration(5.);
-    Rresponse0->SetChargeSlope(41.);
-    Rresponse0->SetChargeSpread(0.18, 0.18);
-    Rresponse0->SetMaxAdc(1024);
-    Rresponse0->SetAlphaFeedback(0.05);
-    Rresponse0->SetEIonisation(26.e-9);
-    Rresponse0->SetSqrtKx3(0.77459667);
-    Rresponse0->SetKx2(0.962);
-    Rresponse0->SetKx4(0.379);
-    Rresponse0->SetSqrtKy3(0.77459667);
-    Rresponse0->SetKy2(0.962);
-    Rresponse0->SetKy4(0.379);
-    Rresponse0->SetPitch(0.25);
-//
-//      
-  for (Int_t i=0; i<7; i++) {
-    RICH->SetGeometryModel(i,GeometryV0);
-    RICH->SetSegmentationModel(i, SegmentationV0);
-    RICH->SetResponseModel(i, Rresponse0);
-    RICH->SetNsec(i,1);
-  }
 }
 
 
@@ -318,325 +273,12 @@ if(iMUON) {
 
 AliMUON *MUON  = new AliMUONv0("MUON","normal MUON");
 
-  MUON->SetMaxStepGas(0.1);
-  MUON->SetMaxStepAlu(0.1);
-//
-// Version 0
-//
-// First define the number of planes that are segmented (1 or 2) by a call
-// to SetNsec. 
-// Then chose for each chamber (chamber plane) the segmentation 
-// and response model.
-// They should be equal for the two chambers of each station. In a future
-// version this will be enforced.
-//
-//  
- Int_t chamber;
- Int_t station;
-// Default response
- AliMUONresponseV0* response0 = new AliMUONresponseV0;
- response0->SetSqrtKx3(0.7131);
- response0->SetKx2(1.0107);
- response0->SetKx4(0.4036);
- response0->SetSqrtKy3(0.7642);
- response0->SetKy2(0.9706);
- response0->SetKy4(0.3831);
- response0->SetPitch(0.25);
- response0->SetSigmaIntegration(10.);
- response0->SetChargeSlope(50);
- response0->SetChargeSpread(0.18, 0.18);
- response0->SetMaxAdc(4096);
-//--------------------------------------------------------
-// Configuration for Chamber TC1/2  (Station 1) ----------           
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-// Float_t rseg1[4]={17.5, 55.2, 71.3, 95.5};
- Float_t rseg1[4]={15.5, 55.2, 71.3, 95.5};
- Int_t   nseg1[4]={4, 4, 2, 1};
-//
- chamber=1;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg11=new AliMUONsegmentationV01;
- 
- seg11->SetSegRadii(rseg1);
- seg11->SetPADSIZ(3, 0.5);
- seg11->SetDAnod(3.0/3./4);
- seg11->SetPadDivision(nseg1);
- 
- MUON->SetSegmentationModel(chamber-1, 1, seg11);
-//
- AliMUONsegmentationV02 *seg12=new AliMUONsegmentationV02;
- seg12->SetSegRadii(rseg1); 
- seg12->SetPADSIZ(0.75, 2.0);
- seg12->SetDAnod(3.0/3./4);
- seg12->SetPadDivision(nseg1);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg12);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=2;
-//^^^^^^^^^
-//
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg21=new AliMUONsegmentationV01;
- seg21->SetSegRadii(rseg1);
- seg21->SetPADSIZ(3, 0.5);
- seg21->SetDAnod(3.0/3./4);
- seg21->SetPadDivision(nseg1);
- MUON->SetSegmentationModel(chamber-1, 1, seg21);
-//
- AliMUONsegmentationV02 *seg22=new AliMUONsegmentationV02;
- seg22->SetSegRadii(rseg1); 
- seg22->SetPADSIZ(0.75, 2.);
- seg22->SetDAnod(3.0/3./4);
- seg22->SetPadDivision(nseg1);
- MUON->SetSegmentationModel(chamber-1, 2, seg22);
-
- MUON->SetResponseModel(chamber-1, response0);     
-//
-//--------------------------------------------------------
-// Configuration for Chamber TC3/4 -----------------------
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-// Float_t rseg2[4]={23.5, 47.1, 87.7, 122.5};
- Float_t rseg2[4]={21.5, 47.1, 87.7, 122.5};
- Int_t   nseg2[4]={4, 4, 2, 1};
-//
- chamber=3;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg31=new AliMUONsegmentationV01;
- seg31->SetSegRadii(rseg2);
- seg31->SetPADSIZ(3, 0.5);
- seg31->SetDAnod(3.0/3./4);
- seg31->SetPadDivision(nseg2);
- MUON->SetSegmentationModel(chamber-1, 1, seg31);
-//
- AliMUONsegmentationV02 *seg32=new AliMUONsegmentationV02;
- seg32->SetSegRadii(rseg2); 
- seg32->SetPADSIZ(0.75, 2.);
- seg32->SetPadDivision(nseg2);
- seg32->SetDAnod(3.0/3./4);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg32);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=4;
-//^^^^^^^^^
-//
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV01 *seg41=new AliMUONsegmentationV01;
- seg41->SetSegRadii(rseg2);
- seg41->SetPADSIZ(3, 0.5);
- seg41->SetDAnod(3.0/3./4);
- seg41->SetPadDivision(nseg2);
- MUON->SetSegmentationModel(chamber-1, 1, seg41);
-//
- AliMUONsegmentationV02 *seg42=new AliMUONsegmentationV02;
- seg42->SetSegRadii(rseg2); 
- seg42->SetPADSIZ(0.75, 2.);
- seg42->SetPadDivision(nseg2);
- seg42->SetDAnod(3.0/3./4);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg42);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
-
-//--------------------------------------------------------
-// Configuration for Chamber TC5/6 -----------------------
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/*
- seg5 =  new AliMUONsegmentationV1;
- AliMUONresponseV0* response5 =  new AliMUONresponseV0;
- // K3 = 0.62
- response5->SetSqrtKx3(0.78740079);
- response5->SetKx2(0.95237319); //  0.5 * kPI * (1- 0.5*sqrtky3 )
- response5->SetKx4(0.37480633); // 0.25/TMath::ATan(sqrtkx3)
- // K3 = 0.55
- response5->SetSqrtKy3(0.74161985);
- response5->SetKy2(0.98832946);
- response5->SetKy4(0.39177817);
- response5->SetPitch(0.325);
- response5->SetSigmaIntegration(10.);
- response5->SetChargeSlope(50);
- response5->SetChargeSpread(0.4, 0.4);
- response5->SetMaxAdc(4096);
-
- chamber=5;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg5);
- MUON->SetResponseModel(chamber-1, response5);     
-
- chamber=6;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg5);
- MUON->SetResponseModel(chamber-1, response5);     
-//
-// Station 3
- station=3;
- MUON->SetPADSIZ(station, 1, 0.975, 0.55);
-*/
-
- chamber=5;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV0 *seg51=new AliMUONsegmentationV0;
- seg51->SetPADSIZ(0.75, 0.5);
- seg51->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 1, seg51);
-//
- AliMUONsegmentationV0 *seg52=new AliMUONsegmentationV0;
- seg52->SetPADSIZ(0.5,0.75);
- seg52->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 2, seg52);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=6;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV0 *seg61=new AliMUONsegmentationV0;
- seg61->SetPADSIZ(0.75, 0.5);
- seg61->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 1, seg61);
-//
- AliMUONsegmentationV0 *seg62=new AliMUONsegmentationV0;
- seg62->SetPADSIZ(0.5,0.75);
- seg62->SetDAnod(3.0/3./4);
- MUON->SetSegmentationModel(chamber-1, 2, seg62);
-
- MUON->SetResponseModel(chamber-1, response0);   
-
-//--------------------------------------------------------
-// Configuration for Chamber TC7/8  (Station 4) ----------           
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
- Int_t   nseg4[4]={4, 4, 2, 1};
-
- chamber=7;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV04 *seg71=new AliMUONsegmentationV04;
- seg71->SetPADSIZ(10.,0.5);
- seg71->SetDAnod(0.25);
- seg71->SetPadDivision(nseg4);
- MUON->SetSegmentationModel(chamber-1, 1, seg71);
-
- AliMUONsegmentationV05 *seg72=new AliMUONsegmentationV05;
- seg72->SetPADSIZ(1,10);
- seg72->SetDAnod(0.25);
- seg72->SetPadDivision(nseg4);
- MUON->SetSegmentationModel(chamber-1, 2, seg72);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=8;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
- AliMUONsegmentationV04 *seg81=new AliMUONsegmentationV04;
- seg81->SetPADSIZ(10., 0.5);
- seg81->SetPadDivision(nseg4);
- seg81->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 1, seg81);
-
- AliMUONsegmentationV05 *seg82=new AliMUONsegmentationV05;
- seg82->SetPADSIZ(1, 10);
- seg82->SetPadDivision(nseg4);
- seg82->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 2, seg82);
-
- MUON->SetResponseModel(chamber-1, response0);     
-//--------------------------------------------------------
-// Configuration for Chamber TC9/10  (Station 5) ---------           
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- chamber=9;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
-//
- AliMUONsegmentationV04 *seg91=new AliMUONsegmentationV04;
- seg91->SetPADSIZ(10.,0.5);
- seg91->SetDAnod(0.25);
- seg91->SetPadDivision(nseg4);
- MUON->SetSegmentationModel(chamber-1, 1, seg91);
-
- AliMUONsegmentationV05 *seg92=new AliMUONsegmentationV05;
- seg92->SetPADSIZ(1,10);
- seg92->SetDAnod(0.25);
- seg92->SetPadDivision(nseg4);
-
- MUON->SetSegmentationModel(chamber-1, 2, seg92);
-
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=10;
-//^^^^^^^^^
- MUON->SetNsec(chamber-1,2);
- AliMUONsegmentationV04 *seg101=new AliMUONsegmentationV04;
- seg101->SetPADSIZ(10., 0.5);
- seg101->SetPadDivision(nseg4);
- seg101->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 1, seg101);
-
- AliMUONsegmentationV05 *seg102=new AliMUONsegmentationV05;
- seg102->SetPADSIZ(1,10);
- seg102->SetPadDivision(nseg4);
- seg102->SetDAnod(0.25);
- MUON->SetSegmentationModel(chamber-1, 2, seg102);
-
- MUON->SetResponseModel(chamber-1, response0);     
-//--------------------------------------------------------
-// Configuration for Trigger staions --------------------- 
-// (not yet used/implemented) ----------------------------          
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
- chamber=11;
- MUON->SetNsec(chamber-1,1);
- AliMUONsegmentationV0 *seg1112=new AliMUONsegmentationV0;
- seg1112->SetDAnod(0.51/3.);
-
- MUON->SetSegmentationModel(chamber-1, 1, seg1112);
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=12;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg1112);
- MUON->SetResponseModel(chamber-1, response0);     
-//
-// Trigger Station 1
- station=6;
- MUON->SetPADSIZ(station, 1, 0.75, 0.5);
-
- chamber=13;
- MUON->SetNsec(chamber-1,1);
- AliMUONsegmentationV0 *seg1314=new AliMUONsegmentationV0;
- seg1314->SetDAnod(0.51/3.);
-
- MUON->SetSegmentationModel(chamber-1, 1, seg1314);
- MUON->SetResponseModel(chamber-1, response0);     
-
- chamber=14;
- MUON->SetNsec(chamber-1,1);
- MUON->SetSegmentationModel(chamber-1, 1, seg1314);
- MUON->SetResponseModel(chamber-1, response0);     
-//
-// Trigger Station 2
- station=7;
- MUON->SetPADSIZ(station, 1, 0.75, 0.5);
 }
  
 //=================== PHOS parameters ===========================
 
 if(iPHOS) {
-  AliPHOS *PHOS  = new AliPHOSv0("PHOS","GPS2");
+  AliPHOS *PHOS  = new AliPHOSv1("PHOS","GPS2");
 }
 
 
@@ -656,7 +298,6 @@ if(iSTART) {
 AliSTART *START  = new AliSTARTv0("START","START Detector");
 }
 
-         
 } // end (!isSetInteractively)
 
 }