AliVMC and AliGeant3 classes introduced

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

diff --git a/macros/Config_gener.C b/macros/Config_gener.C
index 1d241ee1d815c41e36cf4c4a8120283586a759bc..fb661b86a35f5d87183ef972e3352de26637cc93 100644 (file)
--- a/macros/Config_gener.C
+++ b/macros/Config_gener.C
@@ -140,7 +140,7 @@ geant3->SetCUTS(cut,cut, cut, cut, cut, cut,  cut,  cut, cut,  cut, tofmax);
 // Example for a FLUKA Boundary Source                  *
 //*******************************************************
      AliGenFLUKAsource *gener = new AliGenFLUKAsource(-1);
-     gener->AddFile("$(ALICE_ROOT)/data/all32.root"); 
+     gener->SetFileName("$(ALICE_ROOT)/data/all32.root"); 
      gener->SetPartFlag(9);
      gener->SetAgeMax(1.e-5);
 //  31.7 events     
@@ -236,7 +236,6 @@ Int_t iPIPE=1;
 Int_t iFMD=1;
 Int_t iMUON=1;
 Int_t iPHOS=1;
-Int_t iCPV=1;
 Int_t iPMD=1;
 Int_t iSTART=0;
 
@@ -319,33 +318,40 @@ if(iTPC) {
 //
 //-----------------------------------------------------------------------------
 
-AliTPC *TPC  = new AliTPCv1("TPC","Normal TPC");
+AliTPC *TPC  = new AliTPCv2("TPC","Normal TPC");
 AliTPCD *paramd = TPC->GetDigParam();
 AliTPCParam *param = &(paramd->GetParam());
 
 // Set geometrical parameters
 
-param->SetSectorAngles(40.,0.,20.,10.);
-param->SetInnerRadiusLow(83.7);
-param->SetInnerRadiusUp(132.9);
+param->SetSectorAngles(20.,0.,20.,0.);
+param->SetInnerRadiusLow(83.9);
+param->SetInnerRadiusUp(141.3);
 param->SetOuterRadiusLow(146.9);
 param->SetOuterRadiusUp(249.4);
 param->SetInSecLowEdge(81.6);
-param->SetInSecUpEdge(135.);
+param->SetInSecUpEdge(143.6);
 param->SetOuSecLowEdge(144.2);
 param->SetOuSecUpEdge(252.1);
 param->SetEdge(1.5);
 param->SetDeadZone(1.15);
+param->SetPadLength(2.0);
+param->SetPadWidth(0.3);
+param->SetPadPitchLength(2.05);
+param->SetPadPitchWidth(0.35);
 param->Update();
 
+if (TPC->IsVersion() != 2) paramd->Write("Param1");
+
 // set gas mixture
 
 TPC->SetGasMixt(2,20,10,-1,0.9,0.1,0.);
 TPC->SetSecAL(1);
 TPC->SetSecAU(1);
-TPC->SetSecLows(0, -1, -1, -1, -1, -1);
-TPC->SetSecUps(18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1);
-TPC->SetSens(-1);
+TPC->SetSecLows(1, 2, 3, 1+18, 2+18, 3+18);
+TPC->SetSecUps(1+36, 2+36, 3+36, 1+38+18, 2+38+18, 3+38+18, -1,-1,-1,-1,-1,-1);
+TPC->SetSens(1);
+
 }
 
 if(iTOF) {
@@ -738,69 +744,7 @@ AliMUON *MUON  = new AliMUONv0("MUON","normal MUON");
 }
  
 if(iPHOS) {
-AliPHOS *PHOS  = new AliPHOSv1("PHOS","normal PHOS");
-// * PHOSflags:    YES: X<>0   NO: X=0
-// * PHOSflags(1) : -----X  Create branch for TObjArray of AliPHOSCradle
-// *                ----X-  Create file (ftn03 on HP-UX) with list of SHAKER particles (7Mb/event)
-// *                
-PHOS->SetFlags(000001);
-PHOS->SetRadius(460); //Distance from beam to PHOS crystals.
-// (crystal_side_size,crystal_length,wrap_thikness,air_thikness,PIN_size,PIN length)
-PHOS->SetCell(2.2,          18.,         0.01,        0.01,        1.,      0.1);
-PHOS->SetCradleSize(48, 90, 4); // Nz (along beam), Nphi, Ncradles
-PHOS->SetCradleA(0);   //Angle between Cradles
-// *  ===============
-// * PHOS extra parameters (contact Maxim Volkov volkov@mail.cern.ch)
-// * 1. STE_THICK         Steel cover thickness
-// * 2. SUP_Y             Crystal support height
-// * 3. FTIU_THICK        Thermo Insulating outer cover Upper plate thickness
-// * 4. UFP_Y             Upper Polystyrene Foam plate thickness
-// * 5. TCB_THICK         Thermo insulating Crystal Block wall thickness
-// * 6. UCP_Y             Upper Cooling Plate thickness
-// * 7. ASP_Y             Al Support Plate thickness
-// * 8. TIP_Y             Lower Thermo Insulating Plate thickness
-// * 9. TXP_Y             Lower Textolit Plate thickness
-PHOS->SetExtra(0.001, 6.95, 4., 5., 2., 0.06, 10., 3., 1.);   
-PHOS->SetTextolitWall(209., 71., 250.);    //Textolit Wall box dimentions
-PHOS->SetInnerAir(206.,    66.,     244.); //Inner AIR volume dimensions
-// *  ===============================
-// * 1. FTI_X             Foam Thermo Insulating outer cover dimensions
-// * 2. FTI_Y             ==//==
-// * 3. FTI_Z             ==//==
-// * 4. FTI_R             Distance from IP to Foam Thermo Insulating top plate
-PHOS->SetFoam(214.6,  80.,  260., 467.); 
-//    =================================
-// *******************************************************************************
-// * KINE 700  - SHAKER generator
-// * KINE 700 x y z NDNDY YLIM PTLIM ChargeFlag
-// *     JWEAK=0
-// *     JPI0=JETA=1
-// *     JPIC=JPRO=JKAC=JKA0=JRHO=JOME=JPHI=JPSI=JDRY=ChargeFlag
-// *     Int_t               JWEI;           // Unweighted generation
-// *     Int_t               NDNDY;          // Density of charged particles
-// *     Float_t             YLIM;           // Rapidity Limit
-// *     Float_t             PTLIM;          // Pt limit in GeV/c
-// *     Int_t               JWEAK;          // Disable weak decays
-// *     Int_t               JPI0;           // pi0 generation
-// *     Int_t               JETA;           // eta generation
-// *     Int_t               JPIC;           // pi+/- generation
-// *     Int_t               JPRO;           // proton generation
-// *     Int_t               JKAC;           // K+/- generation
-// *     Int_t               JKA0;           // K0 generation
-// *     Int_t               JRHO;           // rho generation
-// *     Int_t               JOME;           // omega generation
-// *     Int_t               JPHI;           // phi generation
-// *     Int_t               JPSI;           // J/psi generation
-// *     Int_t               JDRY;           // Drell-Yan generation
-// * KINE  700     5.    175.    0.          800. 1.5 5. 1.
-// *******************************************************************************
-}
-
-if(iCPV) {
-//=================== CPV parameters ============================
-
-  printf ("CPV in initializing\n");
-  AliCPV *CPV  = new AliCPVv0("CPV","normal CPV");
+AliPHOS *PHOS  = new AliPHOSv0("PHOS","normal PHOS");
 }
 
 if(iPMD) {