Less verbose prtoton ratio task

diff --git a/PWG2/SPECTRA/AliAnalysisTaskProtons.cxx b/PWG2/SPECTRA/AliAnalysisTaskProtons.cxx
index 8e62f182b12cdd411d1c26f66c3af1d683c084cd..60bdd264a9e48d0d04bf8d528f8ef99ff467d4d2 100644 (file)
--- a/PWG2/SPECTRA/AliAnalysisTaskProtons.cxx
+++ b/PWG2/SPECTRA/AliAnalysisTaskProtons.cxx
@@ -118,7 +118,8 @@ void AliAnalysisTaskProtons::Exec(Option_t *) {
     if(dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->IsEventTriggered(fESD,dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->GetTriggerMode())) {
       const AliESDVertex *vertex = dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->GetVertex(fESD,dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->GetAnalysisMode(),dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->GetVxMax(),dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->GetVyMax(),dynamic_cast<AliProtonAnalysisBase*>(fProtonAnalysis->GetProtonAnalysisBaseObject())->GetVzMax());
       if(vertex) {
-       Printf("Proton ESD analysis task: There are %d tracks in this event", fESD->GetNumberOfTracks());
+       AliDebug(1,Form("Proton ESD analysis task: There are %d tracks in this event",fESD->GetNumberOfTracks()));
+       //Printf("Proton ESD analysis task: There are %d tracks in this event", fESD->GetNumberOfTracks());
        fProtonAnalysis->Analyze(fESD,vertex);
       }//reconstructed vertex
     }//triggered event
@@ -129,8 +130,8 @@ void AliAnalysisTaskProtons::Exec(Option_t *) {
       Printf("ERROR: fAOD not available");
       return;
     }
-    
-    Printf("Proton AOD analysis task: There are %d tracks in this event", fAOD->GetNumberOfTracks());
+    AliDebug(1,Form("Proton AOD analysis task: There are %d tracks in this event", fAOD->GetNumberOfTracks()));
+    //Printf("Proton AOD analysis task: There are %d tracks in this event", fAOD->GetNumberOfTracks());
     fProtonAnalysis->Analyze(fAOD);
   }//AOD analysis
   
@@ -145,7 +146,8 @@ void AliAnalysisTaskProtons::Exec(Option_t *) {
       Printf("ERROR: Could not retrieve the stack");
       return;
     }
-    Printf("Proton MC analysis task: There are %d primaries in this event", stack->GetNprimary());
+    AliDebug(1,Form("Proton MC analysis task: There are %d primaries in this event", stack->GetNprimary()));
+    //Printf("Proton MC analysis task: There are %d primaries in this event", stack->GetNprimary());
     fProtonAnalysis->Analyze(stack,kFALSE);//kTRUE in case of inclusive measurement
   }//MC analysis                      
 

diff --git a/PWG2/SPECTRA/macros/configProtonAnalysis.C b/PWG2/SPECTRA/macros/configProtonAnalysis.C
index 31c6800d5b05d96871275845ebebba4f198c982a..c6bfa80fed3e8e756e351a87adb419dd5cd6f2d7 100644 (file)
--- a/PWG2/SPECTRA/macros/configProtonAnalysis.C
+++ b/PWG2/SPECTRA/macros/configProtonAnalysis.C
@@ -4,7 +4,7 @@ AliProtonAnalysis *GetProtonAnalysisObject(const char* analysisLevel = "ESD",
                                           const char* pidMode = "Bayesian") {
                                           
                                           
-  gROOT->LoadMacro("configProtonAnalysisBaseObject.C");  
+  gROOT->LoadMacro("$ALICE_ROOT/PWG2/SPECTRA/macros/configProtonAnalysisBaseObject.C");  
   //Function to setup the AliProtonAnalysis object and return it
   AliProtonAnalysisBase *baseAnalysis = GetProtonAnalysisBaseObject(analysisLevel,esdAnalysisType,pidMode);
 
@@ -32,7 +32,7 @@ AliProtonAnalysis *GetProtonAnalysisObject(const char* analysisLevel = "ESD",
 AliProtonQAAnalysis *GetProtonQAAnalysisObject(const char* analysisLevel = "ESD",
                                               const char* esdAnalysisType = "Hybrid",
                                               const char* pidMode = "Bayesian") {
-  gROOT->LoadMacro("configProtonAnalysisBaseObject.C"); 
+  gROOT->LoadMacro("$ALICE_ROOT/PWG2/SPECTRA/macros/configProtonAnalysisBaseObject.C"); 
   //Function to setup the AliProtonQAAnalysis object and return it
   AliProtonAnalysisBase *baseAnalysis = GetProtonAnalysisBaseObject(analysisLevel,esdAnalysisType,pidMode);
 

diff --git a/PWG2/SPECTRA/macros/configProtonAnalysisBaseObject.C b/PWG2/SPECTRA/macros/configProtonAnalysisBaseObject.C
index 6dfa2f017f9d81fe2951fe48922a0e278843959f..0952f622cfb225da83ee3f83482c584c3ca404e8 100644 (file)
--- a/PWG2/SPECTRA/macros/configProtonAnalysisBaseObject.C
+++ b/PWG2/SPECTRA/macros/configProtonAnalysisBaseObject.C
@@ -30,16 +30,15 @@ AliProtonAnalysisBase *GetProtonAnalysisBaseObject(const char* analysisLevel = "
       baseAnalysis->SetPhaseSpace(10, -0.5, 0.5, 16, 0.5, 0.9);\r
       //baseAnalysis->SetPhaseSpace(18, -0.9, 0.9, 32, 0.5, 1.3);\r
       baseAnalysis->SetTPCpid();\r
-      //baseAnalysis->SetMaxSigmaToVertex(2.0);\r
-      baseAnalysis->SetMaxSigmaToVertexTPC(2.0);\r
+      baseAnalysis->SetMaxSigmaToVertex(2.0);\r
       /*baseAnalysis->SetMaxDCAXY(1.5);\r
        baseAnalysis->SetMaxDCAZ(1.5);*/\r
       baseAnalysis->SetPointOnITSLayer6();\r
       baseAnalysis->SetPointOnITSLayer5();\r
       baseAnalysis->SetPointOnITSLayer4();\r
       baseAnalysis->SetPointOnITSLayer3();\r
-      /*baseAnalysis->SetPointOnITSLayer2();\r
-       baseAnalysis->SetPointOnITSLayer1();*/\r
+      baseAnalysis->SetPointOnITSLayer2();\r
+      baseAnalysis->SetPointOnITSLayer1();\r
       baseAnalysis->SetMinITSClusters(4);\r
       break;\r
     case "Global":\r