kParam_8000, kParam_4000, kParam_2000,
kHijing_cent1, kHijing_cent2,
kHijing_per1, kHijing_per2, kHijing_per3, kHijing_per4, kHijing_per5,
- kHijing_jj25, kHijing_jj50, kHijing_jj75, kHijing_jj100, kHijing_jj125,
- kHijing_gj25, kHijing_gj50, kHijing_gj75, kHijing_gj100, kHijing_gj125
+ kHijing_jj25, kHijing_jj50, kHijing_jj75, kHijing_jj100, kHijing_jj200,
+ kHijing_gj25, kHijing_gj50, kHijing_gj75, kHijing_gj100, kHijing_gj200
};
enum PprGeo_t
// Set Random Number seed
// gRandom->SetSeed(12345);
- new AliGeant3("C++ Interface to Geant3");
+ new TGeant3("C++ Interface to Geant3");
if (!gSystem->Getenv("CONFIG_FILE"))
{
if(iITS) {
-//=================== ITS parameters ============================
+ //=================== ITS parameters ============================
//
// As the innermost detector in ALICE, the Inner Tracking System "impacts" on
// almost all other detectors. This involves the fact that the ITS geometry
//
//AliITS *ITS = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");
//
- AliITSvPPRasymm *ITS = new AliITSvPPRasymm("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(kFALSE); // don't touch this parameter if you're not an ITS developer
+ AliITSvPPRasymm *ITS = new AliITSvPPRasymm("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(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->SetRails(1); // 1 --> rails in ; 0 --> rails out
- ITS->SetCoolingFluid(1); // 1 --> water ; 0 --> freon
- //
+ 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->SetRails(0); // 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->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->SetRails(1); // 1 --> rails in ; 0 --> rails out
+ //ITS->SetRails(0); // 1 --> rails in ; 0 --> rails out
//ITS->SetCoolingFluid(1); // 1 --> water ; 0 --> freon
//
//
//
//
//AliITSvPPRcoarseasymm *ITS = new AliITSvPPRcoarseasymm("ITS","New ITS PPR coarse version with asymmetric services");
- //ITS->SetRails(1); // 1 --> rails in ; 0 --> rails out
+ //ITS->SetRails(0); // 1 --> rails in ; 0 --> rails out
//ITS->SetSupportMaterial(0); // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
//
//AliITS *ITS = new AliITSvPPRcoarsesymm("ITS","New ITS PPR coarse version with symmetric services");
- //ITS->SetRails(1); // 1 --> rails in ; 0 --> rails out
+ //ITS->SetRails(0); // 1 --> rails in ; 0 --> rails out
//ITS->SetSupportMaterial(0); // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
//
//
// ITSgeometry.tme) in a format understandable to the CAD system EUCLID.
// The default (=0) means that you dont want to use this facility.
//
- ITS->SetEUCLID(0);
- }
-
+ ITS->SetEUCLID(0);
+ }
if (iTPC)
{
}
+
if (iTOF) {
if (geo == kHoles) {
//=================== TOF parameters ============================
AliTOF *TOF = new AliTOFv2FHoles("TOF", "TOF with Holes");
} else {
- AliTOF *TOF = new AliTOFv4("TOF", "normal TOF");
+ AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
}
}
+
if (iRICH)
{
//=================== RICH parameters ===========================
if (iFMD)
{
//=================== FMD parameters ============================
-
- AliFMD *FMD = new AliFMDv1("FMD", "normal FMD");
+ AliFMD *FMD = new AliFMDv1("FMD", "normal FMD");
FMD->SetRingsSi1(256);
- FMD->SetRingsSi2(64);
+ FMD->SetRingsSi2(128);
FMD->SetSectorsSi1(20);
- FMD->SetSectorsSi2(24);
+ FMD->SetSectorsSi2(40);
}
if (iMUON)
{
//=================== PMD parameters ============================
AliPMD *PMD = new AliPMDv1("PMD", "normal PMD");
- PMD->SetPAR(1., 1., 0.8, 0.02);
- PMD->SetIN(6., 18., -580., 27., 27.);
- PMD->SetGEO(0.0, 0.2, 4.);
- PMD->SetPadSize(0.8, 1.0, 1.0, 1.5);
}
if (iSTART)
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(1);
- gener->SetPtMinJet(25.);
+ gener->SetPtJet(25.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.3,0.3);
+ gener->SetJetPhiRange(75., 165.);
break;
case kHijing_jj50:
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(1);
- gener->SetPtMinJet(50.);
+ gener->SetPtJet(50.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.3,0.3);
+ gener->SetJetPhiRange(75., 165.);
break;
case kHijing_jj75:
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(1);
- gener->SetPtMinJet(75.);
+ gener->SetPtJet(75.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.3,0.3);
+ gener->SetJetPhiRange(75., 165.);
break;
case kHijing_jj100:
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(1);
- gener->SetPtMinJet(100.);
+ gener->SetPtJet(100.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.3,0.3);
+ gener->SetJetPhiRange(75., 165.);
break;
- case kHijing_jj125:
- comment = comment.Append("HIJING Jet 125 GeV");
+ case kHijing_jj200:
+ comment = comment.Append("HIJING Jet 200 GeV");
AliGenHijing *gener = HijingStandard();
// impact parameter range
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(1);
- gener->SetPtMinJet(125.);
+ gener->SetPtJet(200.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.3,0.3);
+ gener->SetJetPhiRange(75., 165.);
break;
//
// Gamma-Jet
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(2);
- gener->SetPtMinJet(25.);
+ gener->SetPtJet(25.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.12, 0.12);
+ gener->SetJetPhiRange(220., 320.);
break;
case kHijing_gj50:
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(2);
- gener->SetPtMinJet(50.);
+ gener->SetPtJet(50.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.12, 0.12);
+ gener->SetJetPhiRange(220., 320.);
break;
case kHijing_gj75:
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(2);
- gener->SetPtMinJet(75.);
+ gener->SetPtJet(75.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.12, 0.12);
+ gener->SetJetPhiRange(220., 320.);
break;
case kHijing_gj100:
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(2);
- gener->SetPtMinJet(100.);
+ gener->SetPtJet(100.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.12, 0.12);
+ gener->SetJetPhiRange(220., 320.);
break;
- case kHijing_gj125:
- comment = comment.Append("HIJING Gamma 125 GeV");
+ case kHijing_gj200:
+ comment = comment.Append("HIJING Gamma 200 GeV");
AliGenHijing *gener = HijingStandard();
// impact parameter range
gener->SetImpactParameterRange(0., 5.);
// trigger
gener->SetTrigger(2);
- gener->SetPtMinJet(125.);
+ gener->SetPtJet(200.);
gener->SetRadiation(isw);
- gener->JetEtaRange(-0.3,0.3);
- gener->JetPhiRange(15.,105.);
+ gener->SetSimpleJets(!isw);
+ gener->SetJetEtaRange(-0.12, 0.12);
+ gener->SetJetPhiRange(220., 320.);
break;
}
return gener;
// tell hijing to keep the full parent child chain
gener->KeepFullEvent();
// enable jet quenching
- gener->SetJetQuenching(1);
+ gener->SetJetQuenching(4);
// enable shadowing
gener->SetShadowing(1);
// neutral pion and heavy particle decays switched off
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff