Analysis code updated

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

diff --git a/PWGJE/AliAnalysisTaskJetServices.cxx b/PWGJE/AliAnalysisTaskJetServices.cxx
index 8d41a5c85c95ffa921da90909bf0cc927f53c229..1d00af66124c0a107d2cd7cb6ed136e7dbcf8091 100644 (file)
--- a/PWGJE/AliAnalysisTaskJetServices.cxx
+++ b/PWGJE/AliAnalysisTaskJetServices.cxx
@@ -108,14 +108,15 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices():
   fTriggerName(0x0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
+  fh1AvgTrials(0x0),
   fh1PtHard(0x0),
   fh1PtHardTrials(0x0),
   fh1SelectionInfoESD(0x0),
   fh1EventCutInfoESD(0),
   fh1CentralityESD(0),
   fh1Centrality(0),
-  fh1ReducedTrigger(0),
   fh1RP(0),
+  fh2ReducedTrigger(0),
   fh2CentralityTriggerESD(0),
   fh2CentralityTrigger(0),
   fh2TriggerCount(0x0),
@@ -181,14 +182,15 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices(const char* name):
   fTriggerName(0x0),
   fh1Xsec(0x0),
   fh1Trials(0x0),
+  fh1AvgTrials(0x0),
   fh1PtHard(0x0),
   fh1PtHardTrials(0x0),
   fh1SelectionInfoESD(0x0),
   fh1EventCutInfoESD(0),
   fh1CentralityESD(0),
   fh1Centrality(0),
-  fh1ReducedTrigger(0),
   fh1RP(0),
+  fh2ReducedTrigger(0),
   fh2CentralityTriggerESD(0),
   fh2CentralityTrigger(0),
   fh2TriggerCount(0x0),
@@ -250,6 +252,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 +282,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.;
     }
   }
   
@@ -300,8 +307,8 @@ void AliAnalysisTaskJetServices::UserCreateOutputObjects()
   fh1RP = new TH1F("fh1RP","RP;#Psi",440, -1.*TMath::Pi(), 2.*TMath::Pi());
   fHistList->Add(fh1RP);
 
-  fh1ReducedTrigger = new TH1F("fh1ReducedTrigger","red trigger;red trigger",1<<fNTrigger,-0.5,(1<<fNTrigger)-0.5);
-  fHistList->Add(fh1ReducedTrigger);
+  fh2ReducedTrigger = new TH2F("fh2ReducedTrigger","red trigger;red trigger;centrality",1<<fNTrigger,-0.5,(1<<fNTrigger)-0.5,100,-0.5,99.5);
+  fHistList->Add(fh2ReducedTrigger);
 
   fh2CentralityTriggerESD = new TH2F("fh2CentralityTriggerESD",";cent;trigger no",103,-1,102,fNTrigger,-0.5,fNTrigger-0.5);
   fHistList->Add(fh2CentralityTriggerESD);
@@ -310,8 +317,8 @@ void AliAnalysisTaskJetServices::UserCreateOutputObjects()
   fHistList->Add(fh2CentralityTrigger);
 
   for(int i = 0;i<fNTrigger;++i){
-    fh2CentralityTriggerESD->GetYaxis()->SetBinLabel(i+2,fTriggerName[i].Data());
-    fh2CentralityTrigger->GetYaxis()->SetBinLabel(i+2,fTriggerName[i].Data());
+    fh2CentralityTriggerESD->GetYaxis()->SetBinLabel(i+1,fTriggerName[i].Data());
+    fh2CentralityTrigger->GetYaxis()->SetBinLabel(i+1,fTriggerName[i].Data());
   }
 
 
@@ -599,7 +606,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
            ir |= (1<<it);
          }
        }
-       fh1ReducedTrigger->Fill(ir);
+       fh2ReducedTrigger->Fill(ir,cent);
       }
     }
   }
@@ -687,7 +694,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){
@@ -894,15 +901,16 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliAODVertex* vtx) con
     return kFALSE;
   }
 
-
+  TString vtxName(vtx->GetName());
   if(fDebug){
     Printf(" n contrib %d",vtx->GetNContributors());
+    Printf("vtxName: %s",vtxName.Data());
     vtx->Print();
   }
   
   //  if(vtx->GetNContributors()<3)return kFALSE;
   // do not want tpc only primary vertex
-  TString vtxName(vtx->GetName());
+
   if(vtxName.Contains("TPCVertex"))return kFALSE;
 
   // no dispersion yet...