Added option to write non-std jet branch and jet background to a separate file, added...

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index cd40523f55cf9944be1caac16d6b594b2e91a175..33ea51207090e04e2f322a383af4b026dab9dce0 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -48,8 +48,10 @@ AliAnalysisTaskJets::AliAnalysisTaskJets():
   AliAnalysisTaskSE(),
   fConfigFile("ConfigJetAnalysis.C"),
   fNonStdBranch(""), 
+  fNonStdFile(""),
   fJetFinder(0x0),
   fHistos(0x0),
+  fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(0x0),
   fOpt(0)
@@ -61,8 +63,10 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
   AliAnalysisTaskSE(name),
   fConfigFile("ConfigJetAnalysis.C"),
   fNonStdBranch(""),
+  fNonStdFile(""),
   fJetFinder(0x0),
   fHistos(0x0),
+  fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(0x0),
   fOpt(0)
@@ -75,8 +79,10 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name, TChain* chain):
   AliAnalysisTaskSE(name),
   fConfigFile("ConfigJetAnalysis.C"),
   fNonStdBranch(""),
+  fNonStdFile(""),
   fJetFinder(0x0),
   fHistos(0x0),
+  fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(chain),
   fOpt(0)
@@ -91,7 +97,10 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
   // Create the output container
   //
   if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
-  
+
+  // we already have a non standard output, need not to book a new file... 
+  if (!IsStandardAOD())fNonStdFile  = "";
+
   if(fNonStdBranch.Length()==0)
     {
       //  Connec default AOD to jet finder
@@ -108,15 +117,40 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
       // Create a new branch for jets...
       // how is this reset? -> cleared in the UserExec....
       // Can this be handled by the framework?
+      // here we can also have the case that the brnaches are written to a separate file
+
       TClonesArray *tca = new TClonesArray("AliAODJet", 0);
-      tca->SetName(fNonStdBranch);
-      AddAODBranch("TClonesArray",&tca);
+      tca->SetName(fNonStdBranch.Data());
+      AddAODBranch("TClonesArray",&tca,fNonStdFile.Data());
       if(!AODEvent()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data()))){
        AliAODJetEventBackground* evBkg = new AliAODJetEventBackground();
        evBkg->SetName(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data()));
-       AddAODBranch("AliAODJetEventBackground",&evBkg);
+       AddAODBranch("AliAODJetEventBackground",&evBkg,fNonStdFile.Data());
+      }
+
+      if(fNonStdFile.Length()!=0){
+       // 
+       // case that we have an AOD extension we need to fetch the jets from the extended output
+       // we identifay the extension aod event by looking for the branchname
+       AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
+       TObjArray* extArray = aodH->GetExtensions();
+       if (extArray) {
+         TIter next(extArray);
+         while ((fAODExtension=(AliAODExtension*)next())){
+           TObject *obj = fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data());
+           fAODExtension->GetAOD()->Dump();
+           if(obj){
+             if(fDebug>1)Printf("AODExtension found for %s",fNonStdBranch.Data());
+             break;
+           }
+           fAODExtension = 0;
+         }
+       }
+       if(fAODExtension)fJetFinder->ConnectAODNonStd(fAODExtension->GetAOD(), fNonStdBranch.Data()); 
+      }
+      else{
+       fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); 
       }
-      fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); 
     }
 
 
@@ -139,7 +173,8 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
       fH->SetName(Form("AliJetHeader_%s",fNonStdBranch.Data()));
     }
   }
-  OutputTree()->GetUserInfo()->Add(fH);
+  if(!fAODExtension)OutputTree()->GetUserInfo()->Add(fH);
+  else fAODExtension->GetTree()->GetUserInfo()->Add(fH);
 }
 
 //----------------------------------------------------------------
@@ -164,6 +199,7 @@ void AliAnalysisTaskJets::Init()
   fJetFinder->WriteHeaders();
 }
 
+
 //----------------------------------------------------------------
 void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
 {
@@ -179,11 +215,14 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
     evBkg->Reset();
   }
   else {
-    jarray = dynamic_cast<TClonesArray*>(AODEvent()->FindListObject(fNonStdBranch.Data()));
+    jarray = (TClonesArray*)(AODEvent()->FindListObject(fNonStdBranch.Data()));
+    if(!jarray)jarray = (TClonesArray*)(fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data()));
     jarray->Delete();    // this is our responsibility, clear before filling again
     evBkg = (AliAODJetEventBackground*)(AODEvent()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data())));
+    if(!evBkg)  evBkg = (AliAODJetEventBackground*)(fAODExtension->GetAOD()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data())));
     evBkg->Reset();
   }
+
   if (dynamic_cast<AliAODEvent*>(InputEvent()) !=  0) {
       fJetFinder->GetReader()->SetInputEvent(InputEvent(), InputEvent(), MCEvent());
   } else {
@@ -200,6 +239,7 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
 
   // Post the data
   PostData(1, fListOfHistos);
+  return;
 }
 
 

diff --git a/JETAN/AliAnalysisTaskJets.h b/JETAN/AliAnalysisTaskJets.h
index fb2eede37bb5ff610731c7b7d549af7307a203cd..c4f8c8aec159dcf257a0fba8b4639dfd9b243ff8 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.h
+++ b/JETAN/AliAnalysisTaskJets.h
@@ -11,6 +11,7 @@ class TTree;
 class TChain;
 class AliAODEvent;
 class AliJetHistos;
+class AliAODExtension;
 
 
 class AliAnalysisTaskJets : public AliAnalysisTaskSE
@@ -28,6 +29,7 @@ class AliAnalysisTaskJets : public AliAnalysisTaskSE
     virtual void SetConfigFile(const char *c) {fConfigFile = c;}
     virtual void SetJetFinder(AliJetFinder *finder) {fJetFinder = finder;}
     virtual void SetNonStdBranch(const char *c){fNonStdBranch = c;}
+    virtual void SetNonStdOutputFile(const char *c){fNonStdFile = c;}
     virtual void Terminate(Option_t *option);
 
  private:
@@ -36,14 +38,16 @@ class AliAnalysisTaskJets : public AliAnalysisTaskSE
     
  private:
   TString       fConfigFile;      // the name of the ConfigFile
-  TString       fNonStdBranch;    // the name of the non-std branch name//commented by syssy
+  TString       fNonStdBranch;    // the name of the non-std branch name
+  TString       fNonStdFile;      // The optional name of the output file the non-std brnach is written to
   AliJetFinder* fJetFinder;       //  Pointer to the jet finder 
   AliJetHistos* fHistos;          //  Histogram manager class
+  AliAODExtension* fAODExtension; //  AOD extension we in case we write a non-sdt brnach to a separate file and the aod is standard
   TList*        fListOfHistos;    //  Output list of histograms
   TChain*       fChain;           //  Chain 
   Int_t         fOpt;             //  Detector configuration used
 
-  ClassDef(AliAnalysisTaskJets, 3); // Analysis task for standard jet analysis
+  ClassDef(AliAnalysisTaskJets, 4); // Analysis task for standard jet analysis
 };
  
 #endif