Add cluster error and shape parameterization class + routine to fit parameters

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

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index cc1ade0537050ad460daee3d2c65fd5acac17d9a..3aa00ea1240777476a54df4c94c416db65640412 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -21,16 +21,16 @@
 #include "STRUCT/AliPIPEv0.h"
 #include "ITS/AliITSvPPRasymm.h"
 #include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv4T0.h"
-#include "RICH/AliRICHv1.h"
+#include "TOF/AliTOFv5T0.h"
+#include "HMPID/AliHMPIDv1.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
 #include "MUON/AliMUONv1.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
-#include "START/AliSTARTv1.h"
-#include "CRT/AliCRTv1.h"
+#include "T0/AliT0v1.h"
+#include "ACORDE/AliACORDEv1.h"
 #endif
 
 void Config()
@@ -72,6 +72,10 @@ void Config()
   rl->SetNumberOfEventsPerFile(3);
   gAlice->SetRunLoader(rl);
 
+  // Set the trigger configuration
+  gAlice->SetTriggerDescriptor("Pb-Pb");
+  cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
+
   //
   // Set External decayer
   AliDecayer* decayer = new AliDecayerPythia();
@@ -157,7 +161,7 @@ void Config()
   gAlice->SetField(field);    
 
   Int_t iABSO=0;
-  Int_t iCRT=0;
+  Int_t iACORDE=0;
   Int_t iDIPO=0;
   Int_t iFMD=0;
   Int_t iFRAME=0;
@@ -168,9 +172,9 @@ void Config()
   Int_t iPHOS=0;
   Int_t iPIPE=0;
   Int_t iPMD=0;
-  Int_t iRICH=0;
+  Int_t iHMPID=0;
   Int_t iSHIL=0;
-  Int_t iSTART=0;
+  Int_t iT0=0;
   Int_t iTOF=0;
   Int_t iTPC=0;
   Int_t iTRD=0;
@@ -252,23 +256,11 @@ void Config()
     ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det");  // don't touch this parameter if you're not an ITS developer
     ITS->SetThicknessDet1(200.);   // detector thickness on layer 1 must be in the range [150,300]
     ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [150,300]
-    ITS->SetThicknessChip1(200.);  // chip thickness on layer 1 must be in the range [100,300]
-    ITS->SetThicknessChip2(200.);  // chip thickness on layer 2 must be in the range [100,300]
+    ITS->SetThicknessChip1(150.);  // chip thickness on layer 1 must be in the range [100,300]
+    ITS->SetThicknessChip2(150.);  // chip thickness on layer 2 must be in the range [100,300]
     ITS->SetRails(1);             // 1 --> rails in ; 0 --> rails out
     ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
     //
-    //AliITSvPPRsymm *ITS  = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric services");
-    //ITS->SetMinorVersion(2);                                       // don't touch this parameter if you're not an ITS developer
-    //ITS->SetReadDet(kFALSE);                                       // don't touch this parameter if you're not an ITS developer
-    //ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.det"); // don't touch this parameter if you're not an ITS developer
-    //ITS->SetThicknessDet1(300.);   // detector thickness on layer 1 must be in the range [150,300]
-    //ITS->SetThicknessDet2(300.);   // detector thickness on layer 2 must be in the range [150,300]
-    //ITS->SetThicknessChip1(300.);  // chip thickness on layer 1 must be in the range [100,300]
-    //ITS->SetThicknessChip2(300.);  // chip thickness on layer 2 must be in the range [100,300]
-    //ITS->SetRails(1);              // 1 --> rails in ; 0 --> rails out
-    //ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
-    //
-    //
     // Coarse geometries (warning: no hits are produced with these coarse geometries and they unuseful 
     // for reconstruction !):
     //                                                     
@@ -303,12 +295,12 @@ void Config()
 
   if(iTOF) {
     //=================== TOF parameters ============================
-    AliTOF *TOF  = new AliTOFv4T0("TOF","normal TOF");
+    AliTOF *TOF  = new AliTOFv5T0("TOF","normal TOF");
   }
 
-  if(iRICH) {
-    //=================== RICH parameters ===========================
-    AliRICH *RICH  = new AliRICHv1("RICH","normal RICH");    
+  if(iHMPID) {
+    //=================== HMPID parameters ===========================
+    AliHMPID *HMPID  = new AliHMPIDv1("HMPID","normal HMPID");    
 
   }
 
@@ -319,26 +311,16 @@ void Config()
     AliZDC *ZDC  = new AliZDCv1("ZDC","normal ZDC");
   }
 
-  if(iCRT) {
-    //=================== CRT parameters ============================
+  if(iACORDE) {
+    //=================== ACORDE parameters ============================
 
-    AliCRT *CRT  = new AliCRTv1("CRT","normal CRT");
+    AliACORDE *ACORDE  = new AliACORDEv1("ACORDE","normal ACORDE");
   }
 
   if(iTRD) {
     //=================== TRD parameters ============================
   
     AliTRD *TRD  = new AliTRDv1("TRD","TRD slow simulator");
-  
-    // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2)
-    TRD->SetGasMix(1);
-  
-    // With hole in front of PHOS
-    TRD->SetPHOShole();
-    // With hole in front of RICH
-    TRD->SetRICHhole();
-    // Switch on TR
-    AliTRDsim *TRDsim = TRD->CreateTR();
   }
 
   if(iFMD) {
@@ -370,9 +352,9 @@ void Config()
 
   }
 
-  if(iSTART) {
-    //=================== START parameters ============================
-    AliSTART *START  = new AliSTARTv1("START","START Detector");
+  if(iT0) {
+    //=================== T0 parameters ============================
+    AliT0 *T0  = new AliT0v1("T0","T0 Detector");
   }