Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / JETAN / AliAnalysisTaskJetBackgroundSubtract.cxx

diff --git a/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx b/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
index eea515f6a5ab3b318db64b39a30f228e9b93a4b1..1f7b5a0e2875d23ec61af14b5536b90828eace46 100644 (file)
--- a/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
+++ b/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
@@ -25,6 +25,7 @@
 #include <TH2F.h>
 #include <THnSparse.h>
 #include <TSystem.h>
+#include <TObjArray.h>
 #include <TInterpreter.h>
 #include <TList.h>
 #include <TLorentzVector.h>
@@ -44,6 +45,9 @@
 ClassImp(AliAnalysisTaskJetBackgroundSubtract)
 
 AliAnalysisTaskJetBackgroundSubtract::~AliAnalysisTaskJetBackgroundSubtract(){
+  // 
+  // destructor
+  //
   delete fJBArray;
   delete fOutJetArrayList;
   delete fInJetArrayList;
@@ -54,13 +58,14 @@ AliAnalysisTaskJetBackgroundSubtract::AliAnalysisTaskJetBackgroundSubtract():
   fAODOut(0x0),
   fAODIn(0x0),  
   fAODExtension(0x0),
-  fJBArray(new TObjArray()),
+  fJBArray(0),
   fBackgroundBranch(""),
   fNonStdFile(""),
   fReplaceString1("B0"),
   fReplaceString2("B%d"),
   fSubtraction(k4Area),
   fKeepJets(kFALSE),
+  fExclude2Leading(kTRUE),
   fInJetArrayList(0x0),
   fOutJetArrayList(0x0),
   fh2CentvsRho(0x0),
@@ -82,13 +87,14 @@ AliAnalysisTaskJetBackgroundSubtract::AliAnalysisTaskJetBackgroundSubtract(const
   fAODOut(0x0),
   fAODIn(0x0),  
   fAODExtension(0x0),
-  fJBArray(new TObjArray()),
+  fJBArray(0),
   fBackgroundBranch(""),
   fNonStdFile(""),
   fReplaceString1("B0"),
   fReplaceString2("B%d"),
   fSubtraction(k4Area),
   fKeepJets(kFALSE),
+  fExclude2Leading(kTRUE),
   fInJetArrayList(0x0),
   fOutJetArrayList(0x0),
   fh2CentvsRho(0x0),
@@ -108,6 +114,8 @@ AliAnalysisTaskJetBackgroundSubtract::AliAnalysisTaskJetBackgroundSubtract(const
 
 Bool_t AliAnalysisTaskJetBackgroundSubtract::Notify()
 {
+  //
+  // exec with every new file
   //
   fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
 
@@ -118,7 +126,7 @@ Bool_t AliAnalysisTaskJetBackgroundSubtract::Notify()
   fInJetArrayList->Clear();
   fOutJetArrayList->Clear();
 
-  for(int iJB = 0;iJB<fJBArray->GetEntries();iJB++){
+  for(int iJB = 0;iJB<(fJBArray?fJBArray->GetEntries():0);iJB++){
     TObjString *ostr = (TObjString*)fJBArray->At(iJB);
  
   
@@ -201,7 +209,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
   if(!fInJetArrayList)fInJetArrayList =new TList();
   if(!fOutJetArrayList)fOutJetArrayList =new TList();
 
-  for(int iJB = 0;iJB<fJBArray->GetEntries();iJB++){
+  for(int iJB = 0;iJB<(fJBArray?fJBArray->GetEntries():0);iJB++){
     TObjString *ostr = (TObjString*)fJBArray->At(iJB);
     TString newName(ostr->GetString().Data());
     if(!newName.Contains(fReplaceString1.Data())){
@@ -241,7 +249,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
   const Double_t xminDelta[nSparseBinsDelta] = {-120.5,   0,   0,   0};
   const Double_t xmaxDelta[nSparseBinsDelta] = { 120.5, 1.0, 100,5000};
  
-  for(int iJB = 0;iJB<fJBArray->GetEntries();iJB++){
+  for(int iJB = 0;iJB<(fJBArray?fJBArray->GetEntries():0);iJB++){
     TObjString *ostr = (TObjString*)fJBArray->At(iJB);
     TString oldName(ostr->GetString().Data()); 
     TString newName(ostr->GetString().Data()); 
@@ -301,7 +309,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
 
   if(fBackgroundBranch.Length()==0)
     AliError(Form("%s:%d No BackgroundBranch defined",(char*)__FILE__,__LINE__));
-  if(fJBArray->GetEntries()==0)
+  if((fJBArray?fJBArray->GetEntries():0)==0)
     AliError(Form("%s:%d No Jet Branches defined defined",(char*)__FILE__,__LINE__));
 }
 
@@ -315,10 +323,13 @@ void AliAnalysisTaskJetBackgroundSubtract::Init()
 
 void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
 {
+  //
+  // Execute for every selected event
+  //
 
   if (fDebug > 1) printf("AnalysisTaskJetBackgroundSubtract::UserExec() \n");
   ResetOutJets();
-  if(fBackgroundBranch.Length()==0||fJBArray->GetEntries()==0){
+  if(fBackgroundBranch.Length()==0||(fJBArray?fJBArray->GetEntries():0)==0){
     if(fDebug)Printf("%s:%d No background subtraction done",(char*)__FILE__,__LINE__);
     PostData(1,fHistList);
   }
@@ -403,12 +414,19 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
    if(fAODIn) cent = fAODIn->GetHeader()->GetCentrality();
 
    if(evBkg)sigma=evBkg->GetSigma(1); 
+  
+   if(fSubtraction==kArea) {rho = evBkg->GetBackground(1);
+      if(fExclude2Leading==kFALSE){
+       rho=evBkg->GetBackground(3);
+       sigma=evBkg->GetSigma(3);}}
 
-   if(fSubtraction==kArea) rho = evBkg->GetBackground(1);
    if(fSubtraction==k4Area){
+    
      rho = evBkg->GetBackground(0);
      sigma=evBkg->GetSigma(0);
    }
+ 
+   
 
    if(fSubtraction==kRhoRecalc){
      meanarea=evBkg->GetMeanarea(1);
@@ -464,7 +482,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
        if(fDebug>2){
          Printf("%s:%d Jet %d %3.3f %3.3f",(char*)__FILE__,__LINE__,i,jet->Pt(),ptSub);
        }
-       if(ptSub<0){
+       if(ptSub<=0){
          // optionally rescale it and keep??
          if(fKeepJets){
             bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
@@ -486,7 +504,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
        ptSub = jet->Pt() - background; 
         if(fDebug>2){
          Printf("%s:%d Jet %d %3.3f %3.3f %3.3f %3.3f",(char*)__FILE__,__LINE__,i,jet->Pt(),ptSub,background,rho);}
-       if(ptSub<0){
+       if(ptSub<=0){
          // optionally rescale it and keep
          if(fKeepJets){
             bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
@@ -507,7 +525,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
        Double_t background = rho * jet->EffectiveAreaCharged();
        ptSub = jet->Pt() - background; 
        if(fDebug>2){   Printf("%s:%d Jet %d %3.3f %3.3f %3.3f %3.3f",(char*)__FILE__,__LINE__,i,jet->Pt(),ptSub,background,rho);}
-       if(ptSub<0){
+       if(ptSub<=0){
          if(fKeepJets){
             bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
          }
@@ -527,7 +545,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
        else if(fSubtraction==k4Area&&jet->VectorAreaCharged()){
         backgroundv.SetPxPyPzE(rho*(jet->VectorAreaCharged())->Px(),rho*(jet->VectorAreaCharged())->Py(),rho*(jet->VectorAreaCharged())->Pz(),rho*(jet->VectorAreaCharged())->E());
         ptSub = jet->Pt()-backgroundv.Pt();
-        if((backgroundv.E()>jet->E())&&(backgroundv.Pt()>jet->Pt())){
+        if((backgroundv.E()>=jet->E())||(backgroundv.Pt()>=jet->Pt())){
           if(fKeepJets){
             bAdd =  RescaleJetMomentum(&tmpNewJet,0.1);
           }
@@ -613,10 +631,14 @@ Bool_t AliAnalysisTaskJetBackgroundSubtract::RescaleJet4vector(AliAODJet *jet,TL
 
 Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgClusters,Double_t meanarea){
   
+  //
+  // recalc rhoo
+  // 
+
   Double_t ptarea=0.;
   Int_t count=0;
   Double_t rho=0.; 
-  const Double_t Rlimit2=0.8*0.8;  //2*jet radius.
+  const Double_t rLimit2=0.8*0.8;  //2*jet radius.
   TClonesArray* jarray=0;
   
   for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
@@ -638,7 +660,7 @@ Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgCluste
        (first->Phi()-clus->Phi())*(first->Phi()-clus->Phi());
       Double_t distance2= (second->Eta()-clus->Eta())*(second->Eta()-clus->Eta())+
        (second->Phi()-clus->Phi())*(second->Phi()-clus->Phi());
-      if((distance1<Rlimit2)||(distance2<Rlimit2)) continue;    
+      if((distance1<rLimit2)||(distance2<rLimit2)) continue;    
       ptarea=ptarea+clus->Pt()/clus->EffectiveAreaCharged(); 
       count=count+1;}
     if(count!=0) rho=ptarea/count; 
@@ -646,12 +668,16 @@ Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgCluste
   return rho;
 }
 
-   Double_t AliAnalysisTaskJetBackgroundSubtract::RhoRC(TClonesArray* bkgClustersRC){
+Double_t AliAnalysisTaskJetBackgroundSubtract::RhoRC(TClonesArray* bkgClustersRC){
+
+  // 
+  // calc rho from random cones
+  //
   
        Double_t ptarea=0.;
        Int_t count=0;
        Double_t rho=0.; 
-       const Double_t Rlimit2=0.8*0.8;  //2*jet radius.
+       const Double_t rLimit2=0.8*0.8;  //2*jet radius.
        TClonesArray* jarray=0;
         for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
          TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
@@ -672,7 +698,7 @@ Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgCluste
             (first->Phi()-clus->Phi())*(first->Phi()-clus->Phi());
           Double_t distance2= (second->Eta()-clus->Eta())*(second->Eta()-clus->Eta())+
             (second->Phi()-clus->Phi())*(second->Phi()-clus->Phi());
-          if((distance1<Rlimit2)||(distance2<Rlimit2)) continue;    
+          if((distance1<rLimit2)||(distance2<rLimit2)) continue;    
           ptarea=ptarea+clus->Pt()/clus->EffectiveAreaCharged(); 
           count=count+1;}
          if(count!=0) rho=ptarea/count;  }
@@ -688,6 +714,10 @@ Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgCluste
 
 
 void AliAnalysisTaskJetBackgroundSubtract::ResetOutJets(){
+  //
+  // Reset the output jets
+  //
+
   if(!fOutJetArrayList)return;
   for(int iJB = 0;iJB<fOutJetArrayList->GetEntries();iJB++){
     TClonesArray* jarray = (TClonesArray*)fOutJetArrayList->At(iJB);
@@ -697,6 +727,11 @@ void AliAnalysisTaskJetBackgroundSubtract::ResetOutJets(){
 
 
 void AliAnalysisTaskJetBackgroundSubtract::PrintAODContents(){
+
+  //
+  // guess from the name what this function does
+  //
+
   if(fAODIn){
     Printf("%s:%d >>>>>> Input",(char*)__FILE__,__LINE__);
     fAODIn->Print();
@@ -712,6 +747,10 @@ void AliAnalysisTaskJetBackgroundSubtract::PrintAODContents(){
 }
 
 Int_t AliAnalysisTaskJetBackgroundSubtract::MultFromJetRefs(TClonesArray* jets){
+  //
+  // calculate multiplicty based on jet references
+  //
+
   if(!jets)return 0;
 
   Int_t refMult = 0;
@@ -725,3 +764,8 @@ Int_t AliAnalysisTaskJetBackgroundSubtract::MultFromJetRefs(TClonesArray* jets){
   return refMult;
 
 }
+
+void  AliAnalysisTaskJetBackgroundSubtract::AddJetBranch(const char* c){
+  if(!fJBArray)fJBArray = new TObjArray();
+  fJBArray->Add(new TObjString(c));
+}