#include "EVGEN/AliGenCocktail.h"
#include "EVGEN/AliGenCosmicsParam.h"
#include "EVGEN/AliGenHIJINGpara.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
#include "STRUCT/AliBODY.h"
#include "STRUCT/AliMAG.h"
#include "STRUCT/AliABSOv0.h"
#include "STRUCT/AliFRAMEv2.h"
#include "STRUCT/AliSHILv2.h"
#include "STRUCT/AliPIPEv0.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11.h"
#include "TPC/AliTPCv2.h"
#include "TOF/AliTOFv5T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv3.h"
#include "ZDC/AliZDCv3.h"
#include "TRD/AliTRDv1.h"
#include "FMD/AliFMDv1.h"
#include "PMD/AliPMDv1.h"
#include "START/AliSTARTv1.h"
#include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
#include "VZERO/AliVZEROv7.h"
#endif
-//--- Magnetic Field ---
-enum Mag_t
-{
- k2kG, k4kG, k5kG
-};
-
-enum PprGeo_t
- {
- kHoles, kNoHoles
- };
-
Float_t EtaToTheta(Float_t arg);
-static Mag_t mag = k5kG;
-static PprGeo_t geo = kHoles;
+static AliMagF::BMap_t mag = AliMagF::k5kG;
void Config()
{
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");
- gAlice->SetTriggerDescriptor("ACORDE");
+ // AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
+ AliSimulation::Instance()->SetTriggerConfig("ACORDE");
cout<<"Trigger configuration is set to ACORDE"<<endl;
//
gGener = gener;
// MAGNETIC FIELD IN THE BARREL
- // AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag); // FIELD
- AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 0., 10., mag); // NO FIELD
+ AliMagF* field = new AliMagF("Maps","Maps",1.,1., mag);
field->SetL3ConstField(0); //Using const. field in the barrel
- rl->CdGAFile();
- gAlice->SetField(field);
+ TGeoGlobalMagField::Instance()->SetField(field);
+ rl->CdGAFile();
Int_t iABSO = 1;
Int_t iDIPO = 0;
//=================== FRAME parameters ============================
AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
- if (geo == kHoles) {
- FRAME->SetHoles(1);
- } else {
- FRAME->SetHoles(0);
- }
-
+ FRAME->SetHoles(1);
}
if (iSHIL)
{
//=================== ITS parameters ============================
- AliITSvPPRasymmFMD *ITS = new AliITSvPPRasymmFMD("ITS","ITS PPR detailed version with asymmetric services");
+ AliITS *ITS = new AliITSv11("ITS","ITS v11");
}
if (iTPC)
if (iHMPID)
{
//=================== HMPID parameters ===========================
- AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+ AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
}
if (iEMCAL)
{
//=================== EMCAL parameters ============================
- AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+ AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
}
if (iACORDE)
{
//=================== ACORDE parameters ============================
- AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+ AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
}
if (iVZERO)