]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
[u/mrichter/AliRoot.git] / JETAN / AliAnalysisTaskJetBackgroundSubtract.cxx
index 1b136a273c620896578f82e93c35c8824b596bba..1f7b5a0e2875d23ec61af14b5536b90828eace46 100644 (file)
@@ -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,14 +58,24 @@ AliAnalysisTaskJetBackgroundSubtract::AliAnalysisTaskJetBackgroundSubtract():
   fAODOut(0x0),
   fAODIn(0x0),  
   fAODExtension(0x0),
-  fJBArray(new TObjArray()),
+  fJBArray(0),
   fBackgroundBranch(""),
   fNonStdFile(""),
   fReplaceString1("B0"),
   fReplaceString2("B%d"),
-  fSubtraction(kArea),
+  fSubtraction(k4Area),
+  fKeepJets(kFALSE),
+  fExclude2Leading(kTRUE),
   fInJetArrayList(0x0),
   fOutJetArrayList(0x0),
+  fh2CentvsRho(0x0),
+  fh2CentvsSigma(0x0),
+  fh2MultvsRho(0x0),
+  fh2MultvsSigma(0x0),
+  fh2ShiftEta(0x0),
+  fh2ShiftPhi(0x0),
+  fh2ShiftEtaLeading(0x0),
+  fh2ShiftPhiLeading(0x0),
   fHistList(0x0)  
 {
 
@@ -73,14 +87,24 @@ AliAnalysisTaskJetBackgroundSubtract::AliAnalysisTaskJetBackgroundSubtract(const
   fAODOut(0x0),
   fAODIn(0x0),  
   fAODExtension(0x0),
-  fJBArray(new TObjArray()),
+  fJBArray(0),
   fBackgroundBranch(""),
   fNonStdFile(""),
   fReplaceString1("B0"),
   fReplaceString2("B%d"),
-  fSubtraction(kArea),
+  fSubtraction(k4Area),
+  fKeepJets(kFALSE),
+  fExclude2Leading(kTRUE),
   fInJetArrayList(0x0),
   fOutJetArrayList(0x0),
+  fh2CentvsRho(0x0),
+  fh2CentvsSigma(0x0),
+  fh2MultvsRho(0x0),
+  fh2MultvsSigma(0x0),
+  fh2ShiftEta(0x0),
+  fh2ShiftPhi(0x0),
+  fh2ShiftEtaLeading(0x0),
+  fh2ShiftPhiLeading(0x0),
   fHistList(0x0)  
 {
  DefineOutput(1, TList::Class());  
@@ -90,6 +114,8 @@ AliAnalysisTaskJetBackgroundSubtract::AliAnalysisTaskJetBackgroundSubtract(const
 
 Bool_t AliAnalysisTaskJetBackgroundSubtract::Notify()
 {
+  //
+  // exec with every new file
   //
   fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
 
@@ -100,9 +126,10 @@ 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);
-
+  
     TClonesArray* jarray = 0;      
     if(!jarray&&fAODOut){
       jarray = (TClonesArray*)(fAODOut->FindListObject(ostr->GetString().Data()));
@@ -124,6 +151,11 @@ Bool_t AliAnalysisTaskJetBackgroundSubtract::Notify()
     TString newName(ostr->GetString().Data());
     newName.ReplaceAll(fReplaceString1.Data(),Form(fReplaceString2.Data(),fSubtraction));
     TClonesArray* jarrayOut = 0;      
+    if(newName.CompareTo(ostr->GetString())==0){
+      Printf("%s:%d Input and output branch would have the same name, skipping %s ",(char*)__FILE__,__LINE__,ostr->GetString().Data());
+      continue;
+    }
+
     if(!jarrayOut&&fAODOut){
       jarrayOut = (TClonesArray*)(fAODOut->FindListObject(newName.Data()));
     }
@@ -155,12 +187,16 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
   // Connect the AOD
 
   if (fDebug > 1) printf("AnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects() \n");
+
+
+
   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());
-    fAODExtension = aodH->GetExtension(fNonStdFile.Data());
+
+    fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);
     
     if(!fAODExtension){
       if(fDebug>1)Printf("AODExtension found for %s",fNonStdFile.Data());
@@ -173,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())){
@@ -182,10 +218,16 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
       continue;
     }
 
+
     // add a new branch to the output for the background subtracted jets take the names from
     // the input jets and replace the background flag names
     TClonesArray *tca = new TClonesArray("AliAODJet", 0);
     newName.ReplaceAll(fReplaceString1.Data(),Form(fReplaceString2.Data(),fSubtraction));
+    if(newName.CompareTo(ostr->GetString())==0){
+      Printf("%s:%d Input and output branch would have the same name, skipping: %s ",(char*)__FILE__,__LINE__,ostr->GetString().Data());
+      continue;
+    }
+
     if(fDebug){
       Printf("%s:%d created branch \n %s from \n %s",(char*)__FILE__,__LINE__,newName.Data(),
             ostr->GetString().Data());
@@ -197,8 +239,17 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
 
   if(!fHistList)fHistList = new TList();
   fHistList->SetOwner();
+  PostData(1, fHistList); // post data in any case once
 
-  for(int iJB = 0;iJB<fJBArray->GetEntries();iJB++){
+  // 
+  
+  // delta pT vs. area vs. cent vs. mult
+  const Int_t nSparseBinsDelta = 4;
+  const Int_t nBinsDelta[nSparseBinsDelta] =   {   241,  10,  10,  25}; 
+  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?fJBArray->GetEntries():0);iJB++){
     TObjString *ostr = (TObjString*)fJBArray->At(iJB);
     TString oldName(ostr->GetString().Data()); 
     TString newName(ostr->GetString().Data()); 
@@ -208,8 +259,11 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
       continue;
     }
     newName.ReplaceAll(fReplaceString1.Data(),Form(fReplaceString2.Data(),fSubtraction));
-    TH2F *hTmp = new TH2F(Form("h2PtInPtOut_%d",iJB),Form(";%s p_{T}; %s p_{T}",oldName.Data(),newName.Data()),200,0,200.,200,0.,200.);
+    
+    TH2F *hTmp = new TH2F(Form("h2PtInPtOut_%d",iJB),Form(";%s p_{T}; %s p_{T}",oldName.Data(),newName.Data()),200,0,200.,400,-200.,200.);
     fHistList->Add(hTmp);
+    THnSparseF *hFTmp = new THnSparseF(Form("hnDPtAreaCentMult_%d",iJB),Form("%s delta;#delta p_{T};Area;cent;mult",newName.Data()),nSparseBinsDelta,nBinsDelta,xminDelta,xmaxDelta);
+    fHistList->Add(hFTmp);
   }
 
   Bool_t oldStatus = TH1::AddDirectoryStatus();
@@ -219,6 +273,28 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
   //  Histogram booking, add som control histograms here
   //    
 
+    fh2CentvsRho = new TH2F("fh2CentvsRho","centrality vs background density", 100,0.,100.,600,0.,300.);
+    fh2CentvsSigma = new TH2F("fh2CentvsSigma","centrality vs backgroun sigma",100,0.,100.,500,0.,50.);
+    fHistList->Add(fh2CentvsRho);
+    fHistList->Add(fh2CentvsSigma);
+
+    fh2MultvsRho = new TH2F("fh2MultvsRho","mult vs background density", 100,0.,5000.,600,0.,300.);
+    fh2MultvsSigma = new TH2F("fh2MultvsSigma","mult vs background sigma",100,0.,5000.,500,0.,50.);
+    fHistList->Add(fh2MultvsRho);
+    fHistList->Add(fh2MultvsSigma);
+
+   if(fSubtraction==k4Area){
+    fh2ShiftEta = new TH2F("fh2ShiftEta","extended correction Eta",100,-0.9,0.9,100,-0.9,0.9);
+    fh2ShiftPhi = new TH2F("fh2ShiftPhi","extended correction Phi",100,0.,6.5,100,0.,6.5);
+    fh2ShiftEtaLeading = new TH2F("fh2ShiftEtaLeading","extended correction Eta",100,-0.9,0.9,100,-0.9,0.9);
+    fh2ShiftPhiLeading = new TH2F("fh2ShiftPhiLeading","extended correction Phi",100,0.,6.5,100,0.,6.5);
+     fHistList->Add(fh2ShiftEta);
+     fHistList->Add(fh2ShiftPhi);
+     fHistList->Add(fh2ShiftEtaLeading);
+     fHistList->Add(fh2ShiftPhiLeading);
+   }
+    
   // =========== Switch on Sumw2 for all histos ===========
   for (Int_t i=0; i<fHistList->GetEntries(); ++i) {
     TH1 *h1 = dynamic_cast<TH1*>(fHistList->At(i));
@@ -233,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__));
 }
 
@@ -247,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);
   }
@@ -261,31 +340,43 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
 
 
 
-  static AliAODJetEventBackground*  evBkg = 0;
-  static TClonesArray*              bkgClusters = 0;
-  static TString bkgClusterName(fBackgroundBranch.Data());
+  AliAODJetEventBackground*  evBkg = 0;
+  TClonesArray*              bkgClusters = 0;
+  TClonesArray*              bkgClustersRC = 0;
+  TString bkgClusterName(fBackgroundBranch.Data());
   bkgClusterName.ReplaceAll(Form("%s_",AliAODJetEventBackground::StdBranchName()),"");
-  if(!evBkg&&!bkgClusters&&fAODOut){
+  TString bkgClusterRCName(Form("%s%s",bkgClusterName.Data(),"RandomCone")); 
+
+  if(!evBkg&&!bkgClusters&&!bkgClustersRC&&fAODOut){
     evBkg = (AliAODJetEventBackground*)(fAODOut->FindListObject(fBackgroundBranch.Data()));
     bkgClusters = (TClonesArray*)(fAODOut->FindListObject(bkgClusterName.Data()));
+    bkgClustersRC = (TClonesArray*)(fAODOut->FindListObject(bkgClusterRCName.Data()));
+
     if(fDebug&&bkgClusters)Printf("%s:%d Background cluster branch %s found",(char*)__FILE__,__LINE__,bkgClusterName.Data());
+    if(fDebug&&bkgClustersRC)Printf("%s:%d Background cluster RC branch %s found",(char*)__FILE__,__LINE__,bkgClusterRCName.Data());
     if(fDebug&&evBkg)Printf("%s:%d Backgroundbranch %s found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
   }
-  if(!evBkg&&!bkgClusters&&fAODExtension){
+  if(!evBkg&&!bkgClusters&&!bkgClustersRC&&fAODExtension){
     evBkg = (AliAODJetEventBackground*)(fAODExtension->GetAOD()->FindListObject(fBackgroundBranch.Data()));
     bkgClusters = (TClonesArray*)(fAODExtension->GetAOD()->FindListObject(bkgClusterName.Data()));
+    bkgClustersRC = (TClonesArray*)(fAODExtension->GetAOD()->FindListObject(bkgClusterRCName.Data()));
     if(fDebug&&bkgClusters)Printf("%s:%d Background cluster branch %s found",(char*)__FILE__,__LINE__,bkgClusterName.Data());
+    if(fDebug&&bkgClustersRC)Printf("%s:%d Background cluster RC branch %s found",(char*)__FILE__,__LINE__,bkgClusterRCName.Data());
+
     if(fDebug&&evBkg)Printf("%s:%d Backgroundbranch %s found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
   }
 
-  if(!evBkg&&!bkgClusters&&fAODIn){
+  if(!evBkg&&!bkgClusters&&!bkgClustersRC&&fAODIn){
     evBkg = (AliAODJetEventBackground*)(fAODIn->FindListObject(fBackgroundBranch.Data()));
     bkgClusters = (TClonesArray*)(fAODIn->FindListObject(bkgClusterName.Data()));
+    bkgClustersRC = (TClonesArray*)(fAODIn->FindListObject(bkgClusterRCName.Data()));
+
     if(fDebug&&bkgClusters)Printf("%s:%d Background cluster branch %s found",(char*)__FILE__,__LINE__,bkgClusterName.Data());
+    if(fDebug&&bkgClustersRC)Printf("%s:%d Background cluster RC branch %s found",(char*)__FILE__,__LINE__,bkgClusterRCName.Data());
     if(fDebug&&evBkg)Printf("%s:%d Backgroundbranch %s found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
   }
 
-  if(!evBkg){
+  if(!evBkg&&(fSubtraction==kArea||fSubtraction==kRhoRecalc||fSubtraction==k4Area)){
     if(fDebug){
       Printf("%s:%d Backgroundbranch %s not found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
       PrintAODContents();
@@ -294,7 +385,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     return;
   }
 
-  if(!bkgClusters){
+  if(!bkgClusters&&(fSubtraction==kRhoRecalc)){
     if(fDebug){
       Printf("%s:%d Background cluster branch %s not found",(char*)__FILE__,__LINE__,bkgClusterName.Data());
       PrintAODContents();
@@ -303,14 +394,65 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     return;
   }
 
-
+  if(!bkgClustersRC&&(fSubtraction==kRhoRC)){
+    if(fDebug){
+      Printf("%s:%d Background cluster RC branch %s not found",(char*)__FILE__,__LINE__,bkgClusterRCName.Data());
+      PrintAODContents();
+    }
+    PostData(1,fHistList);
+    return;
+  }
   // LOOP over all jet branches and subtract the background
 
-  Float_t rho = 0;
-  if(fSubtraction==kArea)rho =  evBkg->GetBackground(2);
+   Float_t rho = 0;
+   Float_t sigma=0.;
+   Double_t meanarea = 0;
+   TLorentzVector backgroundv;
+   Float_t cent=0.;
+   
+   if(fAODOut)cent = fAODOut->GetHeader()->GetCentrality();
+   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);}}
 
-  for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
+   if(fSubtraction==k4Area){
+    
+     rho = evBkg->GetBackground(0);
+     sigma=evBkg->GetSigma(0);
+   }
+   
+
+   if(fSubtraction==kRhoRecalc){
+     meanarea=evBkg->GetMeanarea(1);
+     rho =RecalcRho(bkgClusters,meanarea);
+   }
+   if(fSubtraction==kRhoRC) rho=RhoRC(bkgClustersRC);
+
+   Float_t mult = 0;
+   for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
+    TClonesArray* jarray = (TClonesArray*)fInJetArrayList->At(iJB);
+    if(jarray){
+      TString tmp(jarray->GetName());
+      if(tmp.Contains("cluster")){
+       mult = MultFromJetRefs(jarray);
+       if(mult>0)break;
+      }
+    }
+   }
+
+   fh2CentvsRho->Fill(cent,rho);
+   fh2CentvsSigma->Fill(cent,sigma);
+
+   fh2MultvsRho->Fill(mult,rho);
+   fh2MultvsSigma->Fill(mult,sigma);
+   
+   for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
     TClonesArray* jarray = (TClonesArray*)fInJetArrayList->At(iJB);
     TClonesArray* jarrayOut = (TClonesArray*)fOutJetArrayList->At(iJB);
     
@@ -319,57 +461,136 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
       continue;
     }
     TH2F* h2PtInOut = (TH2F*)fHistList->FindObject(Form("h2PtInPtOut_%d",iJB));
+    THnSparseF* hnDPtAreaCentMult = (THnSparseF*)fHistList->FindObject(Form("hnDPtAreaCentMult_%d",iJB));
     // loop over all jets
     Int_t nOut = 0;
+      
+    Double_t deltaPt[4];
+    deltaPt[2] = cent;
+    deltaPt[3] = mult;
+
     for(int i = 0;i < jarray->GetEntriesFast();i++){
       AliAODJet *jet = (AliAODJet*)jarray->At(i);
       AliAODJet tmpNewJet(*jet);
       Bool_t bAdd = false;
+      Float_t ptSub = 0;
+
+
       if(fSubtraction==kArea){ 
        Double_t background = rho * jet->EffectiveAreaCharged();
-       Float_t ptSub = jet->Pt() - background; 
+       ptSub = jet->Pt() - background; 
        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??
-         bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
-         if(h2PtInOut)h2PtInOut->Fill(jet->Pt(),0.1);
+         if(fKeepJets){
+            bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
+         }
+         else{
+           bAdd = false;
+         }
        }
        else{
          bAdd = RescaleJetMomentum(&tmpNewJet,ptSub);
-         if(h2PtInOut)h2PtInOut->Fill(jet->Pt(),ptSub);
        }
        // add background estimates to the new jet object
        // allows to recover old p_T and rho...
        tmpNewJet.SetBgEnergy(background,0);
+       tmpNewJet.SetPtSubtracted(ptSub,0);
       }// kAREA
-      else if(fSubtraction==kRhoRecalc1){
-       // Put a function call to calculate rho here
-       // * exclude edges
-       // * exclude clusters with small area
-       // * exclude areas around leading jets
-      }
+      else if(fSubtraction==kRhoRecalc){
+       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){
+         // optionally rescale it and keep
+         if(fKeepJets){
+            bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
+         }
+         else{
+           bAdd = false;
+         }
+       }
+       else{
+         bAdd = RescaleJetMomentum(&tmpNewJet,ptSub);
+       }
+       // add background estimates to the new jet object
+       // allows to recover old p_T and rho...
+       tmpNewJet.SetBgEnergy(background,0);
+       tmpNewJet.SetPtSubtracted(ptSub,0);
+      }//kRhoRecalc
+       else if(fSubtraction==kRhoRC){
+       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(fKeepJets){
+            bAdd = RescaleJetMomentum(&tmpNewJet,0.1);
+         }
+         else{
+           bAdd = false;
+         }
+       }
+       else{
+         bAdd = RescaleJetMomentum(&tmpNewJet,ptSub);
+       }
+       // add background estimates to the new jet object
+       // allows to recover old p_T and rho...
+       tmpNewJet.SetBgEnergy(background,0);
+       tmpNewJet.SetPtSubtracted(ptSub,0);
+       }//kRhoRC
+
+       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(fKeepJets){
+            bAdd =  RescaleJetMomentum(&tmpNewJet,0.1);
+          }
+          else{
+            bAdd = false;
+          }
+        }
+        else{
+          bAdd = RescaleJet4vector(&tmpNewJet,backgroundv);
+        }
+        // add background estimates to the new jet object
+        // allows to recover old p_T and rho...
+        tmpNewJet.SetBgEnergy(backgroundv.Pt(),0);
+        tmpNewJet.SetPtSubtracted(ptSub,0);
+        
+       }//kArea4vector  
 
       if(bAdd){
         AliAODJet *newJet = new ((*jarrayOut)[nOut++]) AliAODJet(tmpNewJet);
        // what about track references, clear for now...
+       if(fSubtraction==k4Area){
+         fh2ShiftEta->Fill(jet->Eta(),newJet->Eta());
+         fh2ShiftPhi->Fill(jet->Phi(),newJet->Phi());
+         if(i==0){fh2ShiftEtaLeading->Fill(jet->Eta(),newJet->Eta());
+          fh2ShiftPhiLeading->Fill(jet->Phi(),newJet->Phi());}}
+
+       // set the references 
        newJet->GetRefTracks()->Clear();
+       TRefArray *refs = jet->GetRefTracks();
+       for(Int_t ir=0;ir<refs->GetEntriesFast();ir++){
+         AliVParticle *vp = dynamic_cast<AliVParticle*>(refs->At(ir));
+         if(vp)newJet->AddTrack(vp);
+       }
       }
-
+      if(h2PtInOut)h2PtInOut->Fill(jet->Pt(),ptSub);
+      if(hnDPtAreaCentMult){
+       deltaPt[0] = ptSub;
+       deltaPt[1] = jet->EffectiveAreaCharged();
+       hnDPtAreaCentMult->Fill(deltaPt);
+      }
+    }
+    if(jarrayOut)jarrayOut->Sort();
    }
-
-
-
-    // subtract the background
-    
-
-    // remove jets??
-
-    // sort jets...
-
-  }
-  PostData(1, fHistList);
+   
+   PostData(1, fHistList);
 }
 
 void AliAnalysisTaskJetBackgroundSubtract::Terminate(Option_t */*option*/)
@@ -387,10 +608,116 @@ Bool_t AliAnalysisTaskJetBackgroundSubtract::RescaleJetMomentum(AliAODJet *jet,F
   Double_t mass  = jet->M();
   Double_t pNew = jet->P() * scale;
   jet->SetPxPyPzE(scale*jet->Px(),scale*jet->Py(),scale*jet->Pz(),TMath::Sqrt(mass*mass+pNew*pNew));
+
+
   return kTRUE;
 }
 
+Bool_t AliAnalysisTaskJetBackgroundSubtract::RescaleJet4vector(AliAODJet *jet,TLorentzVector backgroundv){
+  
+  if(backgroundv.Pt()<0.) return kFALSE;
+  jet->SetPxPyPzE(jet->Px()-backgroundv.Px(),jet->Py()-backgroundv.Py(),jet->Pz()-backgroundv.Pz(),jet->E()-backgroundv.E());
+ return kTRUE;
+}
+
+
+
+
+
+
+
+
+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.
+  TClonesArray* jarray=0;
+  
+  for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
+    TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
+    TString jetref=ostr->GetString().Data();
+    if(jetref.Contains("ANTIKT04")){ 
+      jarray = (TClonesArray*)fInJetArrayList->At(iJB);
+    }
+  }
+  if(!jarray)return rho;
+  if(jarray->GetEntries()>=2){ 
+    AliAODJet *first = (AliAODJet*)(jarray->At(0)); 
+    AliAODJet *second= (AliAODJet*)(jarray->At(1)); 
+    for(Int_t k=0;k<bkgClusters->GetEntriesFast();k++){
+      AliAODJet *clus = (AliAODJet*)(bkgClusters->At(k));
+      if(TMath::Abs(clus->Eta())>0.5) continue;
+      if((clus->EffectiveAreaCharged())<0.1*meanarea) continue; 
+      Double_t distance1=(first->Eta()-clus->Eta())*(first->Eta()-clus->Eta())+
+       (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;    
+      ptarea=ptarea+clus->Pt()/clus->EffectiveAreaCharged(); 
+      count=count+1;}
+    if(count!=0) rho=ptarea/count; 
+  }        
+  return rho;
+}
+
+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.
+       TClonesArray* jarray=0;
+        for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
+         TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
+         TString jetref=ostr->GetString().Data();
+         if(jetref.Contains("ANTIKT04")){ 
+           jarray = (TClonesArray*)fInJetArrayList->At(iJB);
+         }
+       }
+       if(!jarray)return rho;
+
+         if(jarray->GetEntries()>=2){ 
+          AliAODJet *first = (AliAODJet*)(jarray->At(0)); 
+          AliAODJet *second=(AliAODJet*)(jarray->At(1)); 
+         for(Int_t k=0;k<bkgClustersRC->GetEntriesFast();k++){
+          AliAODJet *clus = (AliAODJet*)(bkgClustersRC->At(k));
+          if(TMath::Abs(clus->Eta())>0.5) continue;
+          Double_t distance1=(first->Eta()-clus->Eta())*(first->Eta()-clus->Eta())+
+            (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;    
+          ptarea=ptarea+clus->Pt()/clus->EffectiveAreaCharged(); 
+          count=count+1;}
+         if(count!=0) rho=ptarea/count;  }
+         return rho;
+}
+
+
+
+
+
+
+
+
+
 void AliAnalysisTaskJetBackgroundSubtract::ResetOutJets(){
+  //
+  // Reset the output jets
+  //
+
   if(!fOutJetArrayList)return;
   for(int iJB = 0;iJB<fOutJetArrayList->GetEntries();iJB++){
     TClonesArray* jarray = (TClonesArray*)fOutJetArrayList->At(iJB);
@@ -400,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();
@@ -413,3 +745,27 @@ void AliAnalysisTaskJetBackgroundSubtract::PrintAODContents(){
     fAODOut->Print();
   }
 }
+
+Int_t AliAnalysisTaskJetBackgroundSubtract::MultFromJetRefs(TClonesArray* jets){
+  //
+  // calculate multiplicty based on jet references
+  //
+
+  if(!jets)return 0;
+
+  Int_t refMult = 0;
+  for(int ij = 0;ij < jets->GetEntries();++ij){
+    AliAODJet* jet = (AliAODJet*)jets->At(ij);
+    if(!jet)continue;
+    TRefArray *refs = jet->GetRefTracks();
+    if(!refs)continue;
+    refMult += refs->GetEntries();
+  }
+  return refMult;
+
+}
+
+void  AliAnalysisTaskJetBackgroundSubtract::AddJetBranch(const char* c){
+  if(!fJBArray)fJBArray = new TObjArray();
+  fJBArray->Add(new TObjString(c));
+}