X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=test%2Fembedding%2FConfig.C;h=52474dd315ecd2ba1cbafbd56c3bf50d6a2c662c;hb=44c5ae37f8baf608eaf46f460d89d3809007afb8;hp=5574db38bc11a8fab8d1995e0f65cfcb94ff9832;hpb=0fcbe7a4f16f434f04ef6e4511749a95f185e919;p=u%2Fmrichter%2FAliRoot.git

diff --git a/test/embedding/Config.C b/test/embedding/Config.C
index 5574db38bc1..52474dd315e 100644
--- a/test/embedding/Config.C
+++ b/test/embedding/Config.C
@@ -21,7 +21,7 @@
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "PYTHIA6/AliGenPythia.h"
 #include "TDPMjet/AliGenDPMjet.h"
-#include "STEER/AliMagFCheb.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -40,7 +40,8 @@
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
 #include "PHOS/AliPHOSv1.h"
-#include "PHOS/AliPHOSSimParam.h"
+
+#include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
@@ -144,12 +145,12 @@ void Config()
   
   // Set the trigger configuration
   if ((embedrun == kBackground) || (embedrun == kMerged)) {
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
   }
   else {
     // Set the trigger configuration: proton-proton
-    gAlice->SetTriggerDescriptor("p-p");
+    AliSimulation::Instance()->SetTriggerConfig("p-p");
   }
 
   //
@@ -222,6 +223,8 @@ void Config()
     Float_t thmin = EtaToTheta(1);   // theta min. <---> eta max
     Float_t thmax = EtaToTheta(-1);  // theta max. <---> eta min 
     gener->SetThetaRange(thmin,thmax);
+    gener->SetProjectile("A",208,82);
+    gener->SetTarget("A",208,82);
 
     AliGenTherminator *genther = new AliGenTherminator();
     genther->SetFileName("event.out");
@@ -276,25 +279,25 @@ void Config()
 
   // FIELD
   //
-  AliMagFCheb* field = 0x0;
+// Field
+
+    //  AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagFCheb("Maps","Maps", 2, 0., 10., AliMagFCheb::k2kG);
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform));
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagFCheb("Maps","Maps", 2, 1., 10., AliMagFCheb::k5kG);
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
+  //  TGeoGlobalMagField::Instance()->SetField(field);
     
   rl->CdGAFile();
-  gAlice->SetField(field);    
-
-
-
+  
   Int_t iABSO  = 1;
   Int_t iACORDE= 0;
   Int_t iDIPO  = 1;
-  Int_t iEMCAL = 0;
+  Int_t iEMCAL = 1;
   Int_t iFMD   = 1;
   Int_t iFRAME = 1;
   Int_t iHALL  = 1;
@@ -303,7 +306,7 @@ void Config()
   Int_t iMUON  = 1;
   Int_t iPHOS  = 1;
   Int_t iPIPE  = 1;
-  Int_t iPMD   = 0;
+  Int_t iPMD   = 1;
   Int_t iHMPID = 1;
   Int_t iSHIL  = 1;
   Int_t iT0    = 1;
@@ -414,23 +417,6 @@ void Config()
         //=================== TRD parameters ============================
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
-        AliTRDgeometry *geoTRD = TRD->GetGeometry();
-	// Partial geometry: modules at 0,8,9,17
-	// starting at 3h in positive direction
-        geoTRD->SetSMstatus(1,0);
-	geoTRD->SetSMstatus(2,0);
-	geoTRD->SetSMstatus(3,0);
-	geoTRD->SetSMstatus(4,0);
-        geoTRD->SetSMstatus(5,0);
-	geoTRD->SetSMstatus(6,0);
-        geoTRD->SetSMstatus(7,0);
-        geoTRD->SetSMstatus(10,0);
-        geoTRD->SetSMstatus(11,0);
-        geoTRD->SetSMstatus(12,0);
-        geoTRD->SetSMstatus(13,0);
-        geoTRD->SetSMstatus(14,0);
-        geoTRD->SetSMstatus(15,0);
-        geoTRD->SetSMstatus(16,0);
     }
 
     if (iFMD)
@@ -451,25 +437,7 @@ void Config()
     if (iPHOS)
     {
         //=================== PHOS parameters ===========================
-
         AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
-        //Set simulation parameters different from the default ones.
-        AliPHOSSimParam* simEmc = AliPHOSSimParam::GetInstance() ;
-  
-        // APD noise of warm (+20C) PHOS:
-        // a2 = a1*(Y1/Y2)*(M1/M2), where a1 = 0.012 is APD noise at -25C,
-        // Y1 = 4.3 photo-electrons/MeV, Y2 = 1.7 p.e/MeV - light yields at -25C and +20C,
-        // M1 = 50, M2 = 50 - APD gain factors chosen for t1 = -25C and t2 = +20C,
-        // Y = MeanLightYield*APDEfficiency.
-
-        Float_t apdNoise = 0.012*2.5; 
-        simEmc->SetAPDNoise(apdNoise);
-
-        //Raw Light Yield at +20C
-        simEmc->SetMeanLightYield(18800);
-
-        //ADC channel width at +18C.
-        simEmc->SetADCchannelW(0.0125);
     }
 
 
@@ -490,7 +458,7 @@ void Config()
     {
         //=================== EMCAL parameters ============================
 
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1");
     }
 
      if (iACORDE)
@@ -533,9 +501,10 @@ AliGenerator* MbPhojet()
 //
 //    DPMJET
 #if defined(__CINT__)
-  gSystem->Load("libdpmjet");      // Parton density functions
-  gSystem->Load("libTDPMjet");      // Parton density functions
 #endif
+      gSystem->Load("libdpmjet");      // Parton density functions
+      gSystem->Load("libTDPMjet");      // Parton density functions
+
       AliGenDPMjet* dpmjet = new AliGenDPMjet(-1); 
       dpmjet->SetMomentumRange(0, 999999.);
       dpmjet->SetThetaRange(0., 180.);