run locally the train with all tasks connected

"ALL CLRES EFFC CAL ALGN PIDR" after AliEn/Grid update

diff --git a/PWG1/TRD/AliTRDpidRefMaker.cxx b/PWG1/TRD/AliTRDpidRefMaker.cxx
index cf30639f4b0123c6eb79d6a783f08511e8a2c2f5..1bd12fdd6f5b3dd7c8d510a0c56b296a9b9435d2 100644 (file)
--- a/PWG1/TRD/AliTRDpidRefMaker.cxx
+++ b/PWG1/TRD/AliTRDpidRefMaker.cxx
@@ -177,10 +177,11 @@ void AliTRDpidRefMaker::UserExec(Option_t *)
   // Main loop
   // Called for each event
 
-  fV0s  = dynamic_cast<TObjArray*>(GetInputData(2));
-  fInfo = dynamic_cast<TObjArray*>(GetInputData(3));
+  if(!(fTracks = dynamic_cast<TObjArray*>(GetInputData(1)))) return;
+  if(!(fV0s    = dynamic_cast<TObjArray*>(GetInputData(2)))) return;
+  if(!(fInfo   = dynamic_cast<TObjArray*>(GetInputData(3)))) return;
 
-  AliInfo(Form("Analyse N[%d] tracks", fTracks->GetEntriesFast()));
+  AliDebug(1, Form("Analyse N[%d] tracks", fTracks->GetEntriesFast()));
   AliTRDtrackInfo     *track = NULL;
   AliTRDtrackV1    *trackTRD = NULL;
   AliTrackReference     *ref = NULL;
@@ -272,8 +273,7 @@ void AliTRDpidRefMaker::Fill()
 
   if(!fPIDdataArray->fNtracklets) return;
   fPIDbin = TMath::LocMax(AliPID::kSPECIES, fPID); // get particle type
-// Fill data tree
-  AliInfo(Form("fData[%p]", (void*)fData));
+  // Fill data tree
   fData->Fill();
 
   

diff --git a/PWG1/TRD/AliTRDpidRefMakerLQ.cxx b/PWG1/TRD/AliTRDpidRefMakerLQ.cxx
index 3c96808568aa2d66d13db7b2955d45b714f724ae..eadbbc0184929055a0bf9ca7ac7fdb32ce692c85 100644 (file)
--- a/PWG1/TRD/AliTRDpidRefMakerLQ.cxx
+++ b/PWG1/TRD/AliTRDpidRefMakerLQ.cxx
@@ -241,6 +241,10 @@ void AliTRDpidRefMakerLQ::UserExec(Option_t */*opt*/)
 {
 // Load PID data into local data storage
 
+  if(!(fTracks = dynamic_cast<TObjArray*>(GetInputData(1)))) return;
+  if(!(fV0s    = dynamic_cast<TObjArray*>(GetInputData(2)))) return;
+  if(!(fInfo   = dynamic_cast<TObjArray*>(GetInputData(3)))) return;
+
   AliTRDpidInfo *pid(NULL);
   const AliTRDpidInfo::AliTRDpidData *data(NULL);
   Char_t s(-1);

diff --git a/PWG1/TRD/AliTRDpidRefMakerNN.h b/PWG1/TRD/AliTRDpidRefMakerNN.h
index 2f32c2054525905b158e9d3c555202d9bc2b07a9..e48960d7881d32db3430b9290c0ad76280d86300 100644 (file)
--- a/PWG1/TRD/AliTRDpidRefMakerNN.h
+++ b/PWG1/TRD/AliTRDpidRefMakerNN.h
@@ -55,7 +55,7 @@ public:
   void    SetDoTraining(Bool_t train) {fDoTraining = train;};
   void    SetContinueTraining(Bool_t continTrain) {fContinueTraining = continTrain;};
   void    SetTrainPath(Int_t path) {fTrainPath = path;};
-  Bool_t    LoadFile(const Char_t *InFileNN);
+  Bool_t  LoadFile(const Char_t *InFileNN);
   void    SetScaledEdx(Float_t s) {fScale = s;};
 
   void    MakeTrainingLists(Int_t mombin = 0);                                 // build the training and the test list

diff --git a/PWG1/TRD/macros/AddTRDresolution.C b/PWG1/TRD/macros/AddTRDresolution.C
index 824927203e941b347da9e98c122afbff20037096..601a7addf7687dc687ef3ca3fe2e75a6501c6ece 100644 (file)
--- a/PWG1/TRD/macros/AddTRDresolution.C
+++ b/PWG1/TRD/macros/AddTRDresolution.C
@@ -55,7 +55,7 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
       mgr->ConnectInput(taskCl,  1, (AliAnalysisDataContainer*)coa->FindObject(Form("%sCl2Trk%s", res->GetName(), suffix)));
       mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibClErrParam", mgr->GetCommonFileName())));*/
   
-      AliLog::SetClassDebugLevel("AliTRDclusterResolution", 5);  
+      //AliLog::SetClassDebugLevel("AliTRDclusterResolution", 5);  
       mgr->AddTask(taskCl = new AliTRDclusterResolution((char*)"ClErrCalibMC"));
       taskCl->SetExB();
       taskCl->SetDebugLevel(0);
@@ -67,13 +67,12 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta
 
   // TRD alignment
   if(TSTBIT(map, kAlignment)){
-    TObjArray *coa = mgr->GetContainers();
     AliTRDalignmentTask *taskAlign(NULL);
     mgr->AddTask(taskAlign = new AliTRDalignmentTask((char*)"TRDalignment"));
     taskAlign->SetDebugLevel(0);
     //AliLog::SetClassDebugLevel("AliTRDalignmentTask", 5);  
     mgr->ConnectInput(taskAlign,  0, mgr->GetCommonInputContainer());  
-    mgr->ConnectInput(taskAlign,  1, (AliAnalysisDataContainer*)coa->FindObject("TRDresolutionCl2Trk"));  
+    mgr->ConnectInput(taskAlign,  1, ci[0]);
     mgr->ConnectOutput(taskAlign, 1, mgr->CreateContainer(Form("h%s", taskAlign->GetName()), TObjArray::Class(), AliAnalysisManager::kExchangeContainer));
     mgr->ConnectOutput(taskAlign, 2, mgr->CreateContainer(taskAlign->GetName(), TTree::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.Calib%s",mgr->GetCommonFileName(), taskAlign->GetName())));
   }