Train: corrections for femtoQA task

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliAnalysisTaskParticleEfficiency.cxx b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliAnalysisTaskParticleEfficiency.cxx
index 9d4207f9181626a4b8a43bf7b8d308e5fd22353b..fb92409f698c147ecafa85cb42f1b629213beede 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliAnalysisTaskParticleEfficiency.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliAnalysisTaskParticleEfficiency.cxx
@@ -69,7 +69,10 @@ AliAnalysisTaskSE(partName), centrality(0), fHistoList(0),  fHistEv(0), fpidResp
   fHistoList->SetOwner(kTRUE);
 
   DefineInput(0, TChain::Class());
-  DefineOutput(0, TList::Class());
+  // DefineOutput(0, TTree::Class()); 
+  DefineOutput(1, TList::Class());
+
+ 
 }
 
 //_______________________________________________________
@@ -241,7 +244,7 @@ void AliAnalysisTaskParticleEfficiency::UserCreateOutputObjects()
 
   // ************************
 
-  PostData(0, fHistoList);
+  PostData(1, fHistoList);
 }
 
 
@@ -359,7 +362,6 @@ bool IsElectron(float nsigmaTPCE, float nsigmaTPCPi,float nsigmaTPCK, float nsig
 void AliAnalysisTaskParticleEfficiency::UserExec(Option_t *)
 {
 
-
   /***Get Event****/
   //AliESDEvent *esdEvent = dynamic_cast<AliESDEvent *>(InputEvent());
   AliAODEvent* aodEvent = dynamic_cast<AliAODEvent*>(InputEvent());
@@ -515,8 +517,6 @@ void AliAnalysisTaskParticleEfficiency::UserExec(Option_t *)
     }
   }
 
-
-
   //RECONSTRUCTED TRACKS 
 
   TObjArray recoParticleArray[PARTTYPES];
@@ -925,7 +925,7 @@ void AliAnalysisTaskParticleEfficiency::UserExec(Option_t *)
       }
     
   }
-  PostData(0, fHistoList);
+  PostData(1, fHistoList);
 }
 //-----------------------------------------------------------------
 

diff --git a/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/AddTaskQAPartEff.C b/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/AddTaskQAPartEff.C
index bdaa5b39ffb0408bf4aea9b2733df075cf29e2c6..3c64cbd7b3d8d51a81b06d259c6376b3331b6d33 100644 (file)
--- a/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/AddTaskQAPartEff.C
+++ b/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/AddTaskQAPartEff.C
@@ -25,13 +25,14 @@ AliAnalysisTaskParticleEfficiency *AddTaskQAPartEff(const char* outfilename="Ana
   if (!outfilename)
     outfilename = AliAnalysisManager::GetCommonFileName();
 
-  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("MyList", TList::Class(),AliAnalysisManager::kOutputContainer,outfilename);
+  //AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("MyList", TList::Class(),AliAnalysisManager::kOutputContainer,outfilename);
+  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("MyList", TList::Class(), AliAnalysisManager::kOutputContainer, Form("%s", AliAnalysisManager::GetCommonFileName()));
 
  mgr->AddTask(ana);
   
 
   mgr->ConnectInput  (ana, 0, mgr->GetCommonInputContainer());
-  mgr->ConnectOutput (ana, 0, coutput1 );
+  mgr->ConnectOutput (ana, 1, coutput1 );
  
   return ana;
 

diff --git a/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/runBatch.C b/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/runBatch.C
deleted file mode 100644 (file)
index e71ef46..0000000
--- a/PWGCF/FEMTOSCOPY/macros/Train/QAEffContTask/runBatch.C
+++ /dev/null
@@ -1,116 +0,0 @@
-void runBatch(int Nevents=20000000, const char* outfilename="AnalysisResults.root",  bool batchmode=kTRUE, const char* collectionfile="collection.xml") {
-  TStopwatch timer;
-  timer.Start();
-
-  printf("*** Connect to AliEn ***\n");
-  TGrid::Connect("alien://");
-
-  gSystem->Load("libTree.so");
-  gSystem->Load("libGeom.so");
-  gSystem->Load("libVMC.so");
-  gSystem->Load("libPhysics.so");
-  //____________________________________________________//
-  //_____________Setting up required packages___________//
-  //____________________________________________________//
-  gSystem->Load("libSTEERBase.so");
-  gSystem->Load("libESD.so");
-  gSystem->Load("libAOD.so");
-  gSystem->Load("libANALYSIS.so");
-  gSystem->Load("libANALYSISalice.so");
-  gROOT->ProcessLine(".include $ALICE_ROOT/include");
-  //ANALYSIS PART
-  // gROOT->LoadMacro("AliAnalysisCheck.cxx+g");
-
-gROOT->LoadMacro("AliAnalysisTaskParticleEfficiency.cxx+g");
-
-  //gROOT->LoadMacro("$ALICE_ROOT/PWG0/CreateESDChain.C");
-  
-
-
-  TChain *chain = new TChain("aodTree");
-
-  const char *collectionfile="wn.xml";
-  ifstream *istr = new ifstream(collectionfile);
-
-  char fname[2000];
-  char pname[2000];
-  while (!istr->eof()) {
-    fname[0] = '\0';
-    (*istr) >> fname;
-    if (strlen(fname) > 10) {
-      sprintf(pname, "alien://%s", fname);
-      chain->Add(pname);
-    }
-    }
-
-
-  //chain->Add("../../data/AOD/PbPb/AOD95/AliAOD.root");
-  //chain->Add("/opt/alice/workdir/TestConfig/data/Pythia/AOD/1/AliAOD.root");
-  //chain->Add("/opt/alice/workdir/TestConfig/data/AOD/PbPb/PbPb.LHC10h/AOD86/1/AliAOD.root");
-   //chain->Add("/opt/alice/workdir/TestConfig/data/AOD/PbPb/PbPb.LHC10h/AOD86/2/AliAOD.root");
-   // chain->Add("/opt/alice/workdir/TestConfig/data/AOD/PbPb/PbPb.LHC10h/AOD86/3/AliAOD.root");
-   //chain->Add("/opt/alice/workdir/TestConfig/data/AOD/PbPb/PbPb.LHC10h/AOD86/4/AliAOD.root");
-  // chain->Add("../../data/AOD/PbPb/New.PbPb.2012.01/AliAOD.root");
-  //chain->Add("../../data/AOD/PbPb/New.PbPb.2012.01.2/AliAOD.root");
-// else {
- 
-
-//   chain = CreateChainFromCollection(collectionfile, "esdTree");
-    //  }
-
-   
-  //____________________________________________//
-  // Make the analysis manager
-  AliAnalysisManager *mgr = new AliAnalysisManager("TestManager");
-
-  AliAODInputHandler* aodH = new AliAODInputHandler;
-  mgr->SetInputEventHandler(aodH);
-  //____________________________________________//
-  // 1st Pt task
-
-
-  //AddTaskPIDResponse
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C");
-  Bool_t isMC=kTRUE; Bool_t tuneOnData = kTRUE; // kTRUE in case of MC
-  AddTaskPIDResponse(isMC,kTRUE,tuneOnData); 
-
-  //gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDqa.C");
-  //AddTaskPIDqa();
-
-  AliAnalysisTaskParticleEfficiency *myTask = new AliAnalysisTaskParticleEfficiency("MyTask");
-  if(!myTask) exit(-1);
-  mgr->AddTask(myTask);
-
-  // Create containers for input/output
-  AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();
-  AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("MyList", TList::Class(),AliAnalysisManager::kOutputContainer,outfilename);
- 
-  //____________________________________________//
-  mgr->ConnectInput(myTask,0,cinput);  
-  mgr->ConnectOutput(myTask,1,coutput2);       
-
-  if (!mgr->InitAnalysis()) return;
-  mgr->PrintStatus();
-  mgr->StartAnalysis("local",chain, Nevents);
-
-  timer.Stop();
-  timer.Print();
-}
-
-//______________________________________________________________________________
-TChain *CreateChainFromCollection(const char* xmlfile, const char *treeName="esdTree")
-{
-// Create a chain from an alien collection.
-   TAlienCollection * myCollection  = TAlienCollection::Open(xmlfile);
-
-   if (!myCollection) {
-      ::Error("CreateChainSingle", "Cannot create an AliEn collection from %s", xmlfile) ;
-      return NULL ;
-  }
-
-  TChain* chain = new TChain(treeName);
-  myCollection->Reset() ;
-  while ( myCollection->Next() ) chain->Add(myCollection->GetTURL("")) ;
-  chain->ls();
-  return chain;
-}