Add sigma2 jet shape and fill constituent info. for subtracted jets

[u/mrichter/AliRoot.git] / PWGJE / AliAnalysisTaskJetServices.cxx

diff --git a/PWGJE/AliAnalysisTaskJetServices.cxx b/PWGJE/AliAnalysisTaskJetServices.cxx
index ad765ac7a58ecf8e49da674d543a2c8976baf896..868f8c984585ef57b581dd605b5ac0771548bb22 100644 (file)
--- a/PWGJE/AliAnalysisTaskJetServices.cxx
+++ b/PWGJE/AliAnalysisTaskJetServices.cxx
@@ -93,6 +93,7 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices():
   fVtxZMean(0),
   fVtxRCut(1.),
   fVtxZCut(8.),
+  fVtxDeltaZCut(0.1),
   fPtMinCosmic(5.),
   fRIsolMinCosmic(3.),
   fMaxCosmicAngle(0.01),
@@ -108,6 +109,7 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices():
   fTriggerName(0x0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
+  fh1AvgTrials(0x0),
   fh1PtHard(0x0),
   fh1PtHardTrials(0x0),
   fh1SelectionInfoESD(0x0),
@@ -166,6 +168,7 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices(const char* name):
   fVtxZMean(0),
   fVtxRCut(1.),
   fVtxZCut(8.),
+  fVtxDeltaZCut(0.1),
   fPtMinCosmic(5.),
   fRIsolMinCosmic(3.),
   fMaxCosmicAngle(0.01),
@@ -181,6 +184,7 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices(const char* name):
   fTriggerName(0x0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
+  fh1AvgTrials(0x0),
   fh1PtHard(0x0),
   fh1PtHardTrials(0x0),
   fh1SelectionInfoESD(0x0),
@@ -250,6 +254,7 @@ Bool_t AliAnalysisTaskJetServices::Notify()
     // construct a poor man average trials 
     Float_t nEntries = (Float_t)tree->GetTree()->GetEntries();
     if(ftrials>=nEntries && nEntries>0.)fAvgTrials = ftrials/nEntries;
+    fh1Trials->Fill("#sum{avg ntrials}",ftrials); 
   }  
   return kTRUE;
 }
@@ -279,14 +284,18 @@ void AliAnalysisTaskJetServices::UserCreateOutputObjects()
   fh1Trials->GetXaxis()->SetBinLabel(1,"#sum{ntrials}");
   fHistList->Add(fh1Trials);
 
-  const Int_t nBinPt = 100;
+  fh1AvgTrials = new TH1F("fh1AvgTrials","avg trials root file",1,0,1);
+  fh1AvgTrials->GetXaxis()->SetBinLabel(1,"#sum{avg ntrials}");
+  fHistList->Add(fh1AvgTrials);
+
+  const Int_t nBinPt = 125;
   Double_t binLimitsPt[nBinPt+1];
   for(Int_t iPt = 0;iPt <= nBinPt;iPt++){
     if(iPt == 0){
       binLimitsPt[iPt] = 0.0;
     }
     else {// 1.0
-      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 2.5;
+      binLimitsPt[iPt] =  binLimitsPt[iPt-1] + 2.;
     }
   }
   
@@ -494,7 +503,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
 
   fEventCutInfoESD |= kPhysicsSelectionCut; // other alreay set via IsEventSelected
-  fh1EventCutInfoESD->Fill(fEventCutInfoESD);
+  fh1EventCutInfoESD->Fill (fEventCutInfoESD);
 
   if(esdEventSelected) fSelectionInfoESD |=  AliAnalysisHelperJetTasks::kVertexIn;
   if(esdEventPileUp)   fSelectionInfoESD |=  AliAnalysisHelperJetTasks::kIsPileUp;
@@ -538,8 +547,9 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
   if(esd){
     const AliESDVertex *vtxESD = esd->GetPrimaryVertex();
+    const AliESDVertex *vtxESDSPD = esd->GetPrimaryVertexSPD();
     esdVtxValid = IsVertexValid(vtxESD);
-    esdVtxIn = IsVertexIn(vtxESD);
+    esdVtxIn = IsVertexIn(vtxESD,vtxESDSPD);
     if(aodH&&physicsSelection&&fFilterAODCollisions&&aod){
       if(fDebug)Printf("%s:%d Centrality %3.3f vtxin %d",(char*)__FILE__,__LINE__,cent,esdVtxIn);
       if(cent<=80&&esdVtxIn){
@@ -608,8 +618,9 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
   if(aod){
     const AliAODVertex *vtxAOD = aod->GetPrimaryVertex();
+    const AliAODVertex *vtxAODSPD = aod->GetPrimaryVertexSPD();
     aodVtxValid = IsVertexValid(vtxAOD);
-    aodVtxIn = IsVertexIn(vtxAOD);
+    aodVtxIn = IsVertexIn(vtxAOD,vtxAODSPD);
     Float_t zvtx = vtxAOD->GetZ();
     Int_t  iCl = GetEventClass(aod);
     AliAnalysisHelperJetTasks::EventClass(kTRUE,iCl);
@@ -687,7 +698,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
   Double_t ptHard = 0; 
   Double_t nTrials = 1; // Trials for MC trigger 
 
-  fh1Trials->Fill("#sum{ntrials}",fAvgTrials); 
+  fh1AvgTrials->Fill("#sum{avg ntrials}",fAvgTrials); 
   AliMCEvent* mcEvent = MCEvent();
   //    AliStack *pStack = 0; 
   if(mcEvent){
@@ -772,7 +783,8 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 Bool_t AliAnalysisTaskJetServices::IsEventSelected(const AliESDEvent* esd){
   if(!esd)return kFALSE;
   const AliESDVertex *vtx = esd->GetPrimaryVertex();
-  return IsVertexIn(vtx); // vertex in calls vertex valid
+  const AliESDVertex *vtxSPD = esd->GetPrimaryVertex();
+  return IsVertexIn(vtx,vtxSPD); // vertex in calls vertex valid
 }
 
 AliAnalysisTaskJetServices::~AliAnalysisTaskJetServices(){
@@ -828,7 +840,8 @@ void AliAnalysisTaskJetServices::SetV0Centroids(TProfile *xa,TProfile *ya,TProfi
 Bool_t AliAnalysisTaskJetServices::IsEventSelected(const AliAODEvent* aod) const {
   if(!aod)return kFALSE;
   const AliAODVertex *vtx = aod->GetPrimaryVertex();
-  return IsVertexIn(vtx); // VertexIn calls VertexValid
+  const AliAODVertex *vtxSPD = aod->GetPrimaryVertexSPD();
+  return IsVertexIn(vtx,vtxSPD); // VertexIn calls VertexValid
 }
 
 Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliESDVertex* vtx) {
@@ -906,7 +919,7 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliAODVertex* vtx) con
 
   if(vtxName.Contains("TPCVertex"))return kFALSE;
 
-  // no dispersion yet...
+  // no dispersion yet... 
   /* 
   TString vtxTitle(vtx->GetTitle());
   if(vtxTitle.Contains("vertexer: Z")){
@@ -917,13 +930,15 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliAODVertex* vtx) con
 }
 
 
-Bool_t  AliAnalysisTaskJetServices::IsVertexIn (const AliESDVertex* vtx) {
+Bool_t  AliAnalysisTaskJetServices::IsVertexIn (const AliESDVertex* vtx,const AliESDVertex* vtxSPD) {
 
   if(!IsVertexValid(vtx))return kFALSE;
 
   Float_t zvtx = vtx->GetZ();
   Float_t yvtx = vtx->GetY();
   Float_t xvtx = vtx->GetX();
+  Float_t deltaZ = zvtx - vtxSPD->GetZ();
+  if(fDebug)Printf("%s:%d deltaz %3.3f ",__FILE__,__LINE__,deltaZ);
 
   xvtx -= fVtxXMean;
   yvtx -= fVtxYMean;
@@ -940,17 +955,25 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexIn (const AliESDVertex* vtx) {
     return kFALSE;
   }
   fEventCutInfoESD |= kVertexRCut;  
+
+
+
+
+  if(TMath::Abs(deltaZ)>fVtxDeltaZCut)return kFALSE;
+  fEventCutInfoESD |= kVertexDeltaZCut;  
   return kTRUE;
 }
 
 
-Bool_t  AliAnalysisTaskJetServices::IsVertexIn (const AliAODVertex* vtx) const {
+Bool_t  AliAnalysisTaskJetServices::IsVertexIn (const AliAODVertex* vtx,const AliAODVertex* vtxSPD) const {
 
   if(!IsVertexValid(vtx))return kFALSE;
 
   Float_t zvtx = vtx->GetZ();
   Float_t yvtx = vtx->GetY();
   Float_t xvtx = vtx->GetX();
+  Float_t deltaZ = zvtx - vtxSPD->GetZ();
+  if(fDebug)Printf("%s:%d deltaz %3.3f ",__FILE__,__LINE__,deltaZ);
 
   xvtx -= fVtxXMean;
   yvtx -= fVtxYMean;
@@ -959,6 +982,12 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexIn (const AliAODVertex* vtx) const {
   Float_t r2   = yvtx*yvtx+xvtx*xvtx;      
 
   Bool_t vertexIn = TMath::Abs(zvtx)<fVtxZCut&&r2<(fVtxRCut*fVtxRCut);
+
+
+  if(TMath::Abs(deltaZ)>fVtxDeltaZCut)vertexIn = kFALSE;
+  if(fDebug)Printf("%s:%d vertexIn %d ",__FILE__,__LINE__,vertexIn);
+  
+
   return vertexIn;
 }