Changes to comply with analysis train naming

diff --git a/PWG2/FORWARD/analysis/AddTaskFMD.C b/PWG2/FORWARD/analysis/AddTaskFMD.C
index 31bbc47e86a9e3ba9d316293b38612cdd061607b..544f2e49543308784af0631d807de3ccf99f0caa 100644 (file)
--- a/PWG2/FORWARD/analysis/AddTaskFMD.C
+++ b/PWG2/FORWARD/analysis/AddTaskFMD.C
@@ -22,8 +22,10 @@ AliFMDAnalysisTaskSE* AddTaskFMD() {
   pars->SetProcessPrimary(kTRUE);
   pars->SetProcessHits(kFALSE);
   
-  
-  AliAnalysisDataContainer *cout_fmd = mgr->CreateContainer("BackgroundCorrected", TList::Class(), AliAnalysisManager::kOutputContainer,"fmdana.root");                             
+  TString outputfile = AliAnalysisManager::GetCommonFileName();
+  outputfile += Form(":%s",pars->GetDndetaAnalysisName());
+
+  AliAnalysisDataContainer *cout_fmd = mgr->CreateContainer("BackgroundCorrected", TList::Class(), AliAnalysisManager::kOutputContainer,outputfile);                             
   mgr->ConnectInput(taskfmd, 0, mgr->GetCommonInputContainer());
   mgr->ConnectOutput(taskfmd, 1, cout_fmd);
 

diff --git a/PWG2/FORWARD/analysis/AliFMDAnaParameters.h b/PWG2/FORWARD/analysis/AliFMDAnaParameters.h
index b27d75a4c19cf7df24c19ee258d8ecff8ce75b65..cd873e87fbf3791908908b14a5d78483bb3c6c80 100644 (file)
--- a/PWG2/FORWARD/analysis/AliFMDAnaParameters.h
+++ b/PWG2/FORWARD/analysis/AliFMDAnaParameters.h
@@ -120,6 +120,8 @@ public:
   void     SetCollisionSystem(Species collsystem) {fSpecies = collsystem;}
   void     PrintStatus() const;
   void     Print(Option_t* /* option */) const { PrintStatus(); }
+  char*    GetDndetaAnalysisName() {return "FORWARD_DnDeta";}
+  
 protected:
   
   AliFMDAnaParameters(const AliFMDAnaParameters& o) 

diff --git a/PWG2/FORWARD/analysis/AliFMDDndeta.cxx b/PWG2/FORWARD/analysis/AliFMDDndeta.cxx
index 04db794cee2db2ea5231543c9414db846f64b38a..6571f7b822826d1b37798b757b1c83940e49a722 100644 (file)
--- a/PWG2/FORWARD/analysis/AliFMDDndeta.cxx
+++ b/PWG2/FORWARD/analysis/AliFMDDndeta.cxx
@@ -175,10 +175,14 @@ void AliFMDDndeta::Init(const Char_t* filename) {
     AliWarning("No file - aborting !");
     return;
   }
-  fList = (TList*)fin->Get("BackgroundCorrected");
   AliFMDAnaParameters* pars =  AliFMDAnaParameters::Instance();
-  pars->Init();
+  //pars->Init();
   
+  fList = (TList*)fin->Get(Form("%s/BackgroundCorrected",pars->GetDndetaAnalysisName()));
+  
+  if(!fList) //an old file ? Perhaps...
+    fList = (TList*)fin->Get("BackgroundCorrected");
+    
   fIsGenerated[kHits]      = kFALSE;
   fIsGenerated[kMult]      = kFALSE;  
   fIsGenerated[kMultTrVtx] = kFALSE;
@@ -283,9 +287,9 @@ void AliFMDDndeta::GenerateMult(Analysis what) {
            nNonZero++;
        }
        Int_t nBinsOld = fNbinsToCut;
-       if(det == 2 && ringChar =='I') {
-         fNbinsToCut = 1;
-       }
+       //      if(det == 2 && ringChar =='I') {
+       //  fNbinsToCut = 1;
+       //      }
        TH1F* hRingMult = (TH1F*)fMultList.FindObject(Form("hRingMult_FMD%d%c",det,ringChar));
        
        for(Int_t i=1; i<=hRingMult->GetNbinsX(); i++) {