- call UserExec instead of Exec of base class AliTRDreco

- special constructor to be used with AliTRDinfoGen

diff --git a/PWG1/TRD/AliTRDalignmentTask.cxx b/PWG1/TRD/AliTRDalignmentTask.cxx
index 157afcd7c1019106c24f576bae51b9299e4c119b..d97fda2b44cbd6da340bc7807abebc8ead5baa56 100644 (file)
--- a/PWG1/TRD/AliTRDalignmentTask.cxx
+++ b/PWG1/TRD/AliTRDalignmentTask.cxx
@@ -80,7 +80,7 @@ void AliTRDalignmentTask::UserExec(Option_t *opt)
 {
 // Documentation to come
 
-  AliTRDrecoTask::Exec(opt);
+  AliTRDrecoTask::UserExec(opt);
   PostData(2, fTree);
 }
 

diff --git a/PWG1/TRD/AliTRDcheckDET.cxx b/PWG1/TRD/AliTRDcheckDET.cxx
index addf40a69388e61434dca55ec811eaf765273122..689a920384f685d3b9f4bd2de47af0e3e68d790b 100644 (file)
--- a/PWG1/TRD/AliTRDcheckDET.cxx
+++ b/PWG1/TRD/AliTRDcheckDET.cxx
@@ -145,7 +145,7 @@ void AliTRDcheckDET::UserExec(Option_t *opt){
   // Filling TRD quality histos
   //
   if(!HasMCdata() && fEventInfo->GetEventHeader()->GetEventType() != 7) return;        // For real data we select only physical events
-  AliTRDrecoTask::Exec(opt);  
+  AliTRDrecoTask::UserExec(opt);  
   Int_t nTracks = 0;           // Count the number of tracks per event
   Int_t triggermask = fEventInfo->GetEventHeader()->GetTriggerMask();
   TString triggername =  fEventInfo->GetRunInfo()->GetFiredTriggerClasses(triggermask);

diff --git a/PWG1/TRD/AliTRDcheckPID.cxx b/PWG1/TRD/AliTRDcheckPID.cxx
index a3bbe3cc0e861901eaaa71b69562b1439dd190aa..7d743dbe42f866e69c29e6d9d38a4fdf948f67d7 100644 (file)
--- a/PWG1/TRD/AliTRDcheckPID.cxx
+++ b/PWG1/TRD/AliTRDcheckPID.cxx
@@ -140,7 +140,7 @@ void AliTRDcheckPID::UserExec(Option_t *opt)
 
   fPID->Delete();
 
-  AliTRDrecoTask::Exec(opt);
+  AliTRDrecoTask::UserExec(opt);
 
   PostData(2, fPID);
 }

diff --git a/PWG1/TRD/AliTRDinfoGen.cxx b/PWG1/TRD/AliTRDinfoGen.cxx
index a2616b5829c21996006f7f1ca86141fc8a5cefd1..276c20d9fce91591acf56d797a51248f2b434c0a 100644 (file)
--- a/PWG1/TRD/AliTRDinfoGen.cxx
+++ b/PWG1/TRD/AliTRDinfoGen.cxx
@@ -109,7 +109,7 @@ AliTRDinfoGen::AliTRDinfoGen()
 
 //____________________________________________________________________
 AliTRDinfoGen::AliTRDinfoGen(char* name)
-  :AliTRDrecoTask(name, "MC-REC TRD-track list generator")
+  :AliTRDrecoTask(name)
   ,fEvTrigger("")
   ,fESDev(NULL)
   ,fMCev(NULL)
@@ -153,6 +153,7 @@ void AliTRDinfoGen::UserCreateOutputObjects()
   //
   // Create Output Containers (TObjectArray containing 1D histograms)
   //
+ 
   fTrackInfo = new AliTRDtrackInfo();
   fEventInfo = new AliTRDeventInfo();
   fV0Info    = new AliTRDv0Info();
@@ -167,7 +168,6 @@ void AliTRDinfoGen::UserExec(Option_t *){
   //
   // Run the Analysis
   //
-
   printf("AliTRDinfoGen::UserExec : ESD[%p] MC[%p]\n", (void*)fESDev, (void*)fMCev);
 
   fESDev = dynamic_cast<AliESDEvent*>(InputEvent());
@@ -376,6 +376,7 @@ void AliTRDinfoGen::UserExec(Option_t *){
     fContainer->Add(new AliTRDtrackInfo(*fTrackInfo));
     fTrackInfo->Delete("");
   }
+
   AliDebug(2, Form("%3d Tracks: TPCout[%d] TRDin[%d] TRDout[%d]\n", (Int_t)AliAnalysisManager::GetAnalysisManager()->GetCurrentEntry(), nTPC, nTRDin, nTRDout));
 
 //   AliESDv0 *v0 = NULL;

diff --git a/PWG1/TRD/AliTRDinfoGen.h b/PWG1/TRD/AliTRDinfoGen.h
index 90ad14b7774aa02975cf2b203237116f89f90e30..72989b888ff0b322fb04d9d90b696d54074e5ef3 100644 (file)
--- a/PWG1/TRD/AliTRDinfoGen.h
+++ b/PWG1/TRD/AliTRDinfoGen.h
@@ -43,6 +43,7 @@ public:
 
   void    UserCreateOutputObjects();
   void    UserExec(Option_t *);
+  void    ConnectInputData(Option_t *opt) {AliAnalysisTaskSE::ConnectInputData(opt);}
   static Float_t GetTPCx() { return fgkTPC;}
   static Float_t GetTOFx() { return fgkTOF;}
 

diff --git a/PWG1/TRD/AliTRDrecoTask.cxx b/PWG1/TRD/AliTRDrecoTask.cxx
index 2a0930c6c71c44e2b33d8f3c5f2f02571b42a220..7d73a554337941547171e3b7e3e80adfcfeb4fb6 100644 (file)
--- a/PWG1/TRD/AliTRDrecoTask.cxx
+++ b/PWG1/TRD/AliTRDrecoTask.cxx
@@ -67,6 +67,20 @@ AliTRDrecoTask::AliTRDrecoTask(const char *name, const char *title)
   DefineOutput(1, TObjArray::Class());
 }
 
+AliTRDrecoTask::AliTRDrecoTask(const char *name)
+  : AliAnalysisTaskSE(name)
+  ,fNRefFigures(0)
+  ,fContainer(NULL)
+  ,fTracks(NULL)
+  ,fkTrack(NULL)
+  ,fkMC(NULL)
+  ,fkESD(NULL)
+  ,fDebugLevel(0)
+  ,fPlotFuncList(NULL)
+{
+  DefineOutput(1, TObjArray::Class());
+}
+
 //_______________________________________________________
 AliTRDrecoTask::~AliTRDrecoTask() 
 {

diff --git a/PWG1/TRD/AliTRDrecoTask.h b/PWG1/TRD/AliTRDrecoTask.h
index 369255a0fbe491a031461af62690053ce41ef0d5..a1d56175cca2f75dae3c934c00deb894c6d981b7 100644 (file)
--- a/PWG1/TRD/AliTRDrecoTask.h
+++ b/PWG1/TRD/AliTRDrecoTask.h
@@ -61,6 +61,7 @@ public:
   virtual void   Terminate(Option_t *);
 
 protected:
+  AliTRDrecoTask(const char *name);
   static TTreeSRedirector* DebugStream() { return fgDebugStream;}
   void           InitFunctorList();
   void           Adjust(TF1 *f, TH1 * const h);

diff --git a/PWG1/TRD/AliTRDresolution.cxx b/PWG1/TRD/AliTRDresolution.cxx
index e3741221d31fa91e4d8f6f2ce7fb0af0e7e7f230..22a6d69478a03583660671259538fc6b14d43560 100644 (file)
--- a/PWG1/TRD/AliTRDresolution.cxx
+++ b/PWG1/TRD/AliTRDresolution.cxx
@@ -284,7 +284,7 @@ void AliTRDresolution::UserExec(Option_t *opt)
   fMCcl->Delete();
   fMCtrklt->Delete();
 
-  AliTRDrecoTask::Exec(opt);
+  AliTRDrecoTask::UserExec(opt);
 
   PostData(1, fCl);
   PostData(2, fTrklt);

diff --git a/PWG1/TRD/macros/AddTRDinfoGen.C b/PWG1/TRD/macros/AddTRDinfoGen.C
index 4ec2c822bf988d504ce8c6f0c89b38555347bbcb..866e87df4ddfd16ce39362584b2376a7082f8734 100644 (file)
--- a/PWG1/TRD/macros/AddTRDinfoGen.C
+++ b/PWG1/TRD/macros/AddTRDinfoGen.C
@@ -18,10 +18,7 @@ void AddTRDinfoGen(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContaine
   mgr->AddTask(info = new AliTRDinfoGen((char*)"genInfo"));
   info->SetDebugLevel(0);
   info->SetMCdata(mgr->GetMCtruthEventHandler());
-  AliAnalysisDataContainer* cin   = mgr->CreateContainer("dummy", TObjArray::Class(), AliAnalysisManager::kInputContainer);
-  
 
-  mgr->ConnectInput( info, 0, mgr->GetCommonInputContainer());
   // settings for collisions
   info->SetCollision(kFALSE);
   if(info->IsCollision()){
@@ -37,7 +34,7 @@ void AddTRDinfoGen(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContaine
   co[2] = mgr->CreateContainer("v0Info",    TObjArray::Class(),       AliAnalysisManager::kExchangeContainer);
 
   mgr->ConnectInput (info, 0, mgr->GetCommonInputContainer());
-  mgr->ConnectInput (info, 1, cin  );   // Dummy to avoid orphan
+
   mgr->ConnectOutput(info, 1, co[0]);
   mgr->ConnectOutput(info, 2, co[1]);
   mgr->ConnectOutput(info, 3, co[2]);