ATO-98 - Connecting distortion trees - selection as an argument

diff --git a/TPC/Base/AliTPCcalibDButil.cxx b/TPC/Base/AliTPCcalibDButil.cxx
index 5bf4fe7040976c65e2cf5094e00f2bcfe49284f9..ec0e184937c01c8a05b1b7b18f2810d7e3a08e8d 100644 (file)
--- a/TPC/Base/AliTPCcalibDButil.cxx
+++ b/TPC/Base/AliTPCcalibDButil.cxx
@@ -3324,7 +3324,7 @@ TTree* AliTPCcalibDButil::ConnectPulserTrees(TString baseDir, TTree *tMain)
 }  
   
 
-TTree* AliTPCcalibDButil::ConnectDistortionTrees(TString baseDir, TTree *tMain){
+TTree* AliTPCcalibDButil::ConnectDistortionTrees(TString baseDir, TString  selection,  TTree *tMain){
   //
   // baseDir:   Base directory with Distortion information
   // TTrees are added to the base tree as a friend tree
@@ -3333,9 +3333,14 @@ TTree* AliTPCcalibDButil::ConnectDistortionTrees(TString baseDir, TTree *tMain){
   // === add the calibDistortion trees ======================================
   //TString inputTreesDistortionCalib       = gSystem->GetFromPipe(Form("ls %s/calibDistortion/20*/*.tree.root",baseDir.Data()));
   // TString baseDir="$NOTES/reconstruction/distortionFit/"; TTree *tMain=0;
+  // AliTPCcalibDButil::ConnectDistortionTrees("$NOTES/reconstruction/distortionFit/", "calibTimeResHisto.root", 0);
 
-
-  TString inputTreesDistortionCalib       = gSystem->GetFromPipe(Form("find  %s -iname \"calibTimeResHisto.root\"",baseDir.Data()));
+  TString inputTreesDistortionCalib       = "";
+  if (selection.Contains(".list")){    
+    inputTreesDistortionCalib=gSystem->GetFromPipe(Form("cat %s",selection.Data()));
+  }else{
+    inputTreesDistortionCalib=gSystem->GetFromPipe(Form("find  %s -iname \"%s\"",baseDir.Data(),selection.Data()));
+  }
   TObjArray *arrInputTreesDistortionCalib = inputTreesDistortionCalib.Tokenize("\n");  
   //
   for (Int_t itree=0; itree<arrInputTreesDistortionCalib->GetEntriesFast(); ++itree) {

diff --git a/TPC/Base/AliTPCcalibDButil.h b/TPC/Base/AliTPCcalibDButil.h
index 98f6aa3464b7f17e55c8825af71b673cec84ef75..137e6ce7b68dfd9019e0cb4bfd1bbfe31beec233 100644 (file)
--- a/TPC/Base/AliTPCcalibDButil.h
+++ b/TPC/Base/AliTPCcalibDButil.h
@@ -181,7 +181,7 @@ public:
   static TTree* ConnectGainTrees(TString baseDir);
   static TTree* ConnectPulserTrees(TString baseDir, TTree * tree=0);
   //static TTree* ConnectNoiseTrees(TString baseDir,  TTree * tree=0); 
-  static TTree* ConnectDistortionTrees(TString baseDir, TTree *tMain);
+  static TTree* ConnectDistortionTrees(TString baseDir, TString  selection, TTree *tMain);
   static  TTree* ConnectCalPadTrees(TString baseDir, TString pattern,  TTree *tMain, Bool_t checkAliases);
 
 private: