Change in the cocktail to avoid interference with Pythia MB (Andreas)

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

diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index b84ca7310f4a08d7908505c90b15ca587d54a5cb..aa3c5211f0bf0a086a5f475851f8994cb18fbbdb 100644 (file)
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -85,6 +85,17 @@ enum Mag_t
 {
     k2kG, k4kG, k5kG
 };
+
+//--- Trigger config ---
+enum TrigConf_t
+{
+    kDefaultPPTrig, kDefaultPbPbTrig
+};
+
+const char * TrigConfName[] = {
+    "p-p","Pb-Pb"
+};
+
 //--- Functions ---
 AliGenPythia *PythiaHVQ(PDC06Proc_t proc);
 AliGenerator *MbCocktail();
@@ -96,6 +107,7 @@ static PDC06Proc_t   proc     = kPyOmegaPlus;
 static DecayHvFl_t   decHvFl  = kNature; 
 static YCut_t        ycut     = kFull;
 static Mag_t         mag      = k5kG; 
+static TrigConf_t    trig     = kDefaultPPTrig; // default pp trigger configuration
 //========================//
 // Set Random Number seed //
 //========================//
@@ -168,6 +180,10 @@ void Config()
   rl->SetCompressionLevel(2);
   rl->SetNumberOfEventsPerFile(1000);
   gAlice->SetRunLoader(rl);
+  
+  // Set the trigger configuration
+  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //
   //=======================================================================
@@ -306,7 +322,7 @@ void Config()
   printf("\n \n Diamond size x-y: %10.3e z: %10.3e\n \n", sigmaxy, sigmaz);
     
   gener->SetSigma(sigmaxy, sigmaxy, sigmaz);      // Sigma in (X,Y,Z) (cm) on IP position
-  gener->SetCutVertexZ(1.);        // Truncate at 1 sigma
+  gener->SetCutVertexZ(3.);        // Truncate at 3 sigma
   gener->SetVertexSmear(kPerEvent);
 
   gener->Init();
@@ -430,12 +446,12 @@ void Config()
     //
        AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
        ITS->SetMinorVersion(2);  // don't touch this parameter if you're not an ITS developer
-       ITS->SetReadDet(kTRUE);   // 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_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 [100,300]
        ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [100,300]
-       ITS->SetThicknessChip1(200.);  // chip thickness on layer 1 must be in the range [150,300]
-       ITS->SetThicknessChip2(200.);  // chip thickness on layer 2 must be in the range [150,300]
+       ITS->SetThicknessChip1(150.);  // chip thickness on layer 1 must be in the range [150,300]
+       ITS->SetThicknessChip2(150.);  // chip thickness on layer 2 must be in the range [150,300]
        ITS->SetRails(0);            // 1 --> rails in ; 0 --> rails out
        ITS->SetCoolingFluid(1);   // 1 --> water ; 0 --> freon
 
@@ -474,6 +490,13 @@ void Config()
     if (iTOF) {
         //=================== TOF parameters ============================
        AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF");
+       // Partial geometry: modules at 2,3,4,6,7,11,12,14,15,16
+       // starting at 6h in positive direction
+       //      Int_t TOFSectors[18]={-1,-1,0,0,0,-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0};
+       // Partial geometry: modules at 1,2,6,7,9,10,11,12,15,16,17
+       // (ALICE numbering convention)
+               Int_t TOFSectors[18]={-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0,-1,-1,0,0,0};
+       TOF->SetTOFSectors(TOFSectors);
     }
 
 
@@ -497,11 +520,19 @@ void Config()
         //=================== 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);
-       // Switch on TR
-       AliTRDsim *TRDsim = TRD->CreateTR();
+        AliTRDgeometry *geoTRD = TRD->GetGeometry();
+       // Partial geometry: modules at 2,3,4,6,11,12,14,15
+       // starting at 6h in positive direction
+       geoTRD->SetSMstatus(0,0);
+        geoTRD->SetSMstatus(1,0);
+        geoTRD->SetSMstatus(5,0);
+        geoTRD->SetSMstatus(7,0);
+        geoTRD->SetSMstatus(8,0);
+        geoTRD->SetSMstatus(9,0);
+        geoTRD->SetSMstatus(10,0);
+        geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(16,0);
+        geoTRD->SetSMstatus(17,0);
     }
 
     if (iFMD)
@@ -729,9 +760,10 @@ AliGenerator* MbCocktail()
       jpsi->SetPhiRange(0., 360.);
       jpsi->SetForceDecay(kAll);
 //
-//        
+//
+      gener->AddGenerator(jpsi,   "J/Psi", 8.e-4);              
       gener->AddGenerator(pythia, "Pythia", 1.);
-      gener->AddGenerator(jpsi,   "J/Psi", 8.e-4);      
+
       
       return gener;
 }