small improvements and commits addition in testing macros

diff --git a/EMCAL/macros/Config.C b/EMCAL/macros/Config.C
old mode 100755 (executable)
new mode 100644 (file)
index 216e768..80e8fc2
--- a/EMCAL/macros/Config.C
+++ b/EMCAL/macros/Config.C
@@ -154,8 +154,10 @@ void Config()
     gener->SetPhiRange(80.0,120.0);
   else if(year == 2011)
     gener->SetPhiRange(80.0,180.0);
-  else
+  else if(year == 2012 || year == 2013)
     gener->SetPhiRange(80.0,190.0);
+  else
+    gener->SetPhiRange(80.0,330.0); // Include DCal
   
   gener->SetThetaRange(EtaToTheta(0.7), EtaToTheta(-0.7));
   
@@ -378,14 +380,15 @@ void Config()
   if (iEMCAL)
   {
     //=================== EMCAL parameters ============================
+    AliEMCAL *EMCAL = 0;
     if      (year == 2010)  // d phi = 40 degrees
-      AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEARV1",    checkGeoAndRun);
+      EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEARV1",    checkGeoAndRun);
     else if (year == 2011)  // d phi = 100 degrees
-      AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1",     checkGeoAndRun);
-    else if (year > 2011)   // d phi = 110 degrees
-      AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE12SMV1", checkGeoAndRun);
-    else // Old configuration with 110 degrees but not perfect geometry
-      AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE",       checkGeoAndRun);
+      EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1",     checkGeoAndRun);
+    else if (year == 2012 || year == 2013)   // d phi = 107 degrees
+      EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE12SMV1", checkGeoAndRun);
+    else
+      EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE12SMV1_DCAL_8SM", checkGeoAndRun); // EMCAL+DCAL dphi = 107 (EMCAL) + 33 (gap) + 67 (DCAL)
   }
   
   if (iACORDE)

diff --git a/EMCAL/macros/TestEMCALReconstruction.C b/EMCAL/macros/TestEMCALReconstruction.C
index 32e0e45207c3eb9a4f32a67adda27d72cb58b6cb..e9aabf961ea187712465e27f141db00ecaeb1e12 100644 (file)
--- a/EMCAL/macros/TestEMCALReconstruction.C
+++ b/EMCAL/macros/TestEMCALReconstruction.C
@@ -21,11 +21,19 @@ void TestEMCALReconstruction(Int_t nev =-1) {
   rec.SetRunLocalReconstruction("EMCAL");  //only do emcal
   rec.SetFillESD("EMCAL");
   rec.SetEventRange(0,nev);
-  //rec.SetInput("raw.root");
-  //rec.SetRunQA(":");
+  rec.SetRunQA(":");
 
+  // Decomment this line in case of real data,
+  // add the proper name of the file
+  //rec.SetInput("raw.root");
+  
   //OCDB settings
   rec.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  
+  // Decommetn this line in case of anchored MC runs or data,
+  // with the appropriate year
+  //rec.SetDefaultStorage("alien://Folder=/alice/data/2011/OCDB");
+
   rec.SetSpecificStorage("GRP/GRP/Data",
                          Form("local://%s",gSystem->pwd()));
 

diff --git a/EMCAL/macros/TestEMCALSimulation.C b/EMCAL/macros/TestEMCALSimulation.C
index 94ada2a7d87505bb1e8882f8c1bb22e4f80f23ed..d581b709c33f6a0cbc7a097cfce378c41ccc9be1 100644 (file)
--- a/EMCAL/macros/TestEMCALSimulation.C
+++ b/EMCAL/macros/TestEMCALSimulation.C
@@ -12,7 +12,11 @@ void TestEMCALSimulation(Int_t nev =10, Bool_t raw = kFALSE) {
   AliSimulation simulator;
   simulator.SetConfigFile("Config.C");
   simulator.SetMakeSDigits("EMCAL");
-  simulator.SetMakeDigits("EMCAL");
+  simulator.SetMakeDigits ("EMCAL");
+
+  //simulator.SetRunGeneration(kFALSE); // Generate or not particles
+  //simulator.SetRunSimulation(kFALSE); // Generate or not HITS (detector response) or not, start from SDigits
+
   if(raw)  simulator.SetWriteRawData("EMCAL","raw.root",kTRUE);
 
   //OCDB settings
@@ -20,13 +24,22 @@ void TestEMCALSimulation(Int_t nev =10, Bool_t raw = kFALSE) {
   simulator.SetSpecificStorage("GRP/GRP/Data",
                                Form("local://%s",gSystem->pwd()));
 
+  // In case of anchoring MC, comment previous OCDB lines
+  // select the appropriate year
+  //simulator.SetDefaultStorage("alien://Folder=/alice/data/2011/OCDB");
+  //simulator.UseVertexFromCDB();
+  //simulator.UseMagFieldFromGRP();
+
   //Avoid the HLT to run
   simulator.SetRunHLT("");
 
+  //Avoid QA
+  simulator.SetRunQA(":");
+  
   TStopwatch timer;
   timer.Start();
 
-//  simulator.SetRunNumber(140234);
+  simulator.SetRunNumber(159582); // LHC11d run
   
   simulator.Run(nev);