#if !defined(__CINT__) || defined(__MAKECINT__)
#include <Riostream.h>
+#include <TPDGCode.h>
#include <TRandom.h>
#include <TSystem.h>
#include <TVirtualMC.h>
#include "STRUCT/AliFRAMEv2.h"
#include "STRUCT/AliSHILv3.h"
#include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
#include "TPC/AliTPCv2.h"
#include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
-#include "ZDC/AliZDCv1.h"
+#include "HMPID/AliHMPIDv3.h"
+#include "ZDC/AliZDCv3.h"
#include "TRD/AliTRDv1.h"
#include "FMD/AliFMDv1.h"
#include "MUON/AliMUONv1.h"
new TGeant3TGeo("C++ Interface to Geant3");
if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
- AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+ AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
AliCDBManager::Instance()->SetRun(0);
}
// gAlice->SetGeometryFromCDB();
// Set the trigger configuration
- gAlice->SetTriggerDescriptor("Pb-Pb");
+ AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
cout<<"Trigger configuration is set to Pb-Pb"<<endl;
//
// g1->SetMomentumRange(0, 3);
// g1->SetOrigin(0,0,0); //vertex position
// g1->SetSigma(0,0,0); //Sigma in (X,Y,Z) (cm) on IP position
- // g1->SetPart(310); //K0short(310), Lambda(3122)
+ // g1->SetPart(kK0Short); //K0short(310), Lambda(3122)
/***************** M E V S I M ********************************/
//=================== FRAME parameters ============================
AliFRAME *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-
+ FRAME->SetHoles(1);
}
if (iSHIL)
{
//=================== ITS parameters ============================
- AliITSvPPRasymmFMD *ITS = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+ AliITS *ITS = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
}
if (iHMPID)
{
//=================== HMPID parameters ===========================
- AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+ AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
}
{
//=================== ZDC parameters ============================
- AliZDC *ZDC = new AliZDCv1("ZDC", "normal ZDC");
+ AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
}
if (iACORDE)
if (iEMCAL && !iHMPID)
{
//=================== EMCAL parameters ============================
- AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+ AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
}
if (iT0)