New config for spectrum and UE

diff --git a/PWG4/macros/AddTaskJetSpectrum2.C b/PWG4/macros/AddTaskJetSpectrum2.C
index 4801dd86e82b3331b0a1f2b63720b9d35e7c5ca8..533058b8ce6bfb88721ab165231adfa614a33bf6 100644 (file)
--- a/PWG4/macros/AddTaskJetSpectrum2.C
+++ b/PWG4/macros/AddTaskJetSpectrum2.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(char* bRec = "jets",char* bGen = "jetsAODMC_UA104",UInt_t filterMask = 16, Int_t iPhysicsSelection = 1);\r
+AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec = "jets",const char* bGen = "jetsAODMC_UA104",UInt_t filterMask = 16, Int_t iPhysicsSelection = 1);\r
 \r
 \r
 AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2Delta(UInt_t filterMask = 16,Bool_t kUseAODMC = kFALSE,Int_t iPhysicsSelection = 1,UInt_t iFlag){\r
@@ -30,10 +30,9 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2Delta(UInt_t filterMask = 16,Boo
 }\r
 \r
 \r
-AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(char* bRec,char* bGen ,UInt_t filterMask,Int_t iPhysicsSelection)\r
+AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bGen ,UInt_t filterMask,Int_t iPhysicsSelection)\r
 {\r
 // Creates a jet fider task, configures it and adds it to the analysis manager.\r
-\r
    // Get the pointer to the existing analysis manager via the static access method.\r
    //==============================================================================\r
    AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();\r
@@ -63,8 +62,13 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(char* bRec,char* bGen ,UInt_t f
    // pwg4spec->SetAnalysisType(AliAnalysisTaskJetSpectrum2::kAnaMC);\r
    // if(iAODanalysis)pwg4spec->SetAODInput(kTRUE);\r
    // pwg4spec->SetDebugLevel(11); \r
-   pwg4spec->SetBranchRec(bRec); \r
+   Printf("Rec %sXXX",bRec);\r
+   Printf("Gen %sXXX",bGen);\r
+\r
    pwg4spec->SetBranchGen(bGen); \r
+   pwg4spec->SetBranchRec(bRec); \r
+\r
+\r
    pwg4spec->SetFilterMask(filterMask); \r
    pwg4spec->SetUseGlobalSelection(kTRUE); \r
 \r
@@ -97,14 +101,10 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(char* bRec,char* bGen ,UInt_t f
    else if (typeGen.Contains("AODMC")){\r
      pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAODMCAll);\r
    }\r
-   else { // catch all use AOD\r
+   else if (typeGen.Length()>0){ // catch all use AOD\r
      pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAOD);\r
    }\r
 \r
-\r
-\r
-\r
-\r
    if(iPhysicsSelection)pwg4spec->SelectCollisionCandidates();\r
 \r
    mgr->AddTask(pwg4spec);\r

diff --git a/PWG4/macros/AnalysisTrainPWG4Jets.C b/PWG4/macros/AnalysisTrainPWG4Jets.C
index e4f43ed3e182bcf4b367924373a5771dc7d9c67e..717bb530148688f5480335e27ae4e70e4443bc81 100644 (file)
--- a/PWG4/macros/AnalysisTrainPWG4Jets.C
+++ b/PWG4/macros/AnalysisTrainPWG4Jets.C
@@ -273,11 +273,13 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       cout_aod->SetSpecialOutput();
    }
    // Debugging if needed
+
    if (kUseDebug){
      mgr->SetDebugLevel(3);
    }
-   mgr->SetDebugLevel(0);
-   AliLog::SetGlobalLogLevel(AliLog::kError);
+   else{
+     AliLog::SetGlobalLogLevel(AliLog::kError);
+   }
    //==========================================================================
    // Create the chain. In this example it is created only from ALIEN files but
    // can be done to work in batch or grid mode as well.
@@ -397,18 +399,16 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      AliAnalysisTaskUE *taskUE = 0;
      if(iPWG4UE&1)taskUE = AddTaskUE(); 
      if(iPWG4UE&2){
-       taskUE = AddTaskUE("jetsAOD_CDF07","CDF","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_UA1LO07","CDF","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_UA1LO07","CDF","BB","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_FASTKT04","CDF","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_FASTJET04","CDF","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_SISCONE04","CDF","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_CDF07","ALICE","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_UA1LO07","ALICE","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_UA1LO07","ALICE","BB","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_FASTKT04","ALICE","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_FASTJET04","ALICE","LJ","TRANSV"); 
-       taskUE = AddTaskUE("jetsAOD_SISCONE04","ALICE","LJ","TRANSV"); 
+       taskUE = AddTaskUE("jetsAOD_CDF07","CDF","LJ","TRANSV","MSP"); 
+       taskUE = AddTaskUE("jetsAOD_CDF07","CDF","LJCC","TRANSV","MSP"); 
+       taskUE = AddTaskUE("jetsAOD_CDF07","CDF","LJ","TRANSV","MAP"); 
+       taskUE = AddTaskUE("jetsAOD_ICDF","CDF","LJ","TRANSV","MSP"); 
+       taskUE = AddTaskUE("jetsAOD_ICDF","CDF","LJCC","TRANSV","MSP"); 
+       taskUE = AddTaskUE("jetsAOD_ICDF","CDF","LJCC","TRANSV","MAP"); 
+       taskUE = AddTaskUE("jetsAOD_NONE","CDF","MP","TRANSV","MSP"); 
+       taskUE = AddTaskUE("jetsAOD_NONE","CDF","MP","TRANSV","MAP") 
+        taskUE = AddTaskUE("jetsAOD_FASTKT04","CDF","LJ","TRANSV","MSP"); 
+       taskUE = AddTaskUE("jetsAOD_FASTKT04","CDF","LJ","TRANSV","MAP");
      }
 
      if (!taskUE) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskUE cannot run for this train conditions - EXCLUDED");
@@ -684,7 +684,8 @@ void CheckModuleFlags(const char *mode) {
 
      }
      if (!kUseTR) {
-       //         ::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "iPWG2evchar disabled if not reading track references");
+       ::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "iPWG4QATPC disabled if not reading track references");
+       iPWG4PtQAMC        = 0;
      }   
      if (iJETAN){
        iESDfilter=1;