Further small updates

[u/mrichter/AliRoot.git] / JETAN / DEV / AliAnalysisTaskJetCluster.cxx

diff --git a/JETAN/DEV/AliAnalysisTaskJetCluster.cxx b/JETAN/DEV/AliAnalysisTaskJetCluster.cxx
index 3fc92ac90b289d0aedb8b1056108e41ad6b3e046..c99458000e78e303bec55ef080ae2966a5eff5ba 100644 (file)
--- a/JETAN/DEV/AliAnalysisTaskJetCluster.cxx
+++ b/JETAN/DEV/AliAnalysisTaskJetCluster.cxx
@@ -103,6 +103,8 @@ AliAnalysisTaskJetCluster::AliAnalysisTaskJetCluster():
   fUseAODMCInput(kFALSE),
   fUseBackgroundCalc(kFALSE),
   fEventSelection(kFALSE),     
+  fRequireVZEROAC(kFALSE),     
+  fRequireTZEROvtx(kFALSE),
   fFilterMask(0),
   fFilterMaskBestPt(0),
   fFilterType(0),
@@ -267,7 +269,10 @@ AliAnalysisTaskJetCluster::AliAnalysisTaskJetCluster(const char* name):
   fUseAODTrackInput(kFALSE),
   fUseAODMCInput(kFALSE),
   fUseBackgroundCalc(kFALSE),
-  fEventSelection(kFALSE),                                                       fFilterMask(0),
+  fEventSelection(kFALSE),
+  fRequireVZEROAC(kFALSE),     
+  fRequireTZEROvtx(kFALSE), 
+  fFilterMask(0),
   fFilterMaskBestPt(0),
   fFilterType(0),
   fJetTypes(kJet),
@@ -945,7 +950,28 @@ void AliAnalysisTaskJetCluster::UserExec(Option_t */*option*/)
       selectEvent = true;
     }
   }
+
+
+  Bool_t T0 = false;
+  Bool_t V0 = false;
+  const AliAODVZERO  *vzero = fAOD->GetVZEROData();
+  if(vzero){
+    if((vzero->GetTriggerChargeA()>0)&&(vzero->GetTriggerChargeC()>0)){
+      V0 = true;
+    }
+  }
   
+  const AliAODTZERO  *tzero = fAOD->GetTZEROData();
+  if(tzero){
+    if(TMath::Abs(tzero->GetT0VertexRaw())<100){
+      T0 = true;
+    }
+  }
+  
+  if(fRequireVZEROAC&&fRequireTZEROvtx)selectEvent = selectEvent&&V0&&T0;
+  else if(fRequireTZEROvtx)selectEvent = selectEvent&&T0;
+  else if(fRequireVZEROAC)selectEvent = selectEvent&&V0;
+
 
   if(!selectEvent){
     PostData(1, fHistList);
@@ -1481,11 +1507,19 @@ void AliAnalysisTaskJetCluster::UserExec(Option_t */*option*/)
      Double_t sigma2=0.;
      Double_t meanarea2=0.;
 
+     Double_t bkg4=0;
+     Double_t sigma4=0.;
+     Double_t meanarea4=0.;
+
      clustSeq.get_median_rho_and_sigma(jets2, range, true, bkg1, sigma1, meanarea1, true);
      fAODJetBackgroundOut->SetBackground(0,bkg1,sigma1,meanarea1);
 
      //     fh1BiARandomCones[0]->Fill(omCone-(bkg1*areaRandomCone));    
-     //  fh1BiARandomConesRan[0]->Fill(ptRandomConeRan-(bkg1*areaRandomCone));    
+     //  fh1BiARandomConesRan[0]->Fill(ptRandomConeRan-(bkg1*areaRandomCone));      
+       clustSeq.get_median_rho_and_sigma(sortedJets, range, true, bkg4, sigma4, meanarea4, true);
+     fAODJetBackgroundOut->SetBackground(3,bkg4,sigma4,meanarea4);
+
+     //////////////////////
      
      clustSeq.get_median_rho_and_sigma(jets2, range, false, bkg2, sigma2, meanarea2, true);
      fAODJetBackgroundOut->SetBackground(1,bkg2,sigma2,meanarea2);