new selection of good events on top of AlihyicsSelection, only loose vtx cuts by now

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
index 9d5a93da8d53aff16ce9f7604ad398b116344319..5688a571af5d9467918b2939471e02a20afffbf0 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
@@ -35,7 +35,7 @@
 #include <TList.h>
 #include <TLorentzVector.h>
 #include <TClonesArray.h>
-#include  "TDatabasePDG.h"
+#include "TDatabasePDG.h"
 
 #include "AliAnalysisTaskJetServices.h"
 #include "AliAnalysisDataContainer.h"
@@ -71,7 +71,11 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices(): AliAnalysisTaskSE(),
   fUsePhysicsSelection(kFALSE),
   fRealData(kFALSE),
   fAvgTrials(1),
-  fZVtxCut(8.),
+  fVtxXMean(0),
+  fVtxYMean(0),
+  fVtxZMean(0),
+  fVtxRCut(1.),
+  fVtxZCut(8.),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
@@ -93,7 +97,11 @@ AliAnalysisTaskJetServices::AliAnalysisTaskJetServices(const char* name):
   fUsePhysicsSelection(kFALSE),
   fRealData(kFALSE),
   fAvgTrials(1),
-  fZVtxCut(8.),
+  fVtxXMean(0),
+  fVtxYMean(0),
+  fVtxZMean(0),
+  fVtxRCut(1.),
+  fVtxZCut(8.),
   fh1Xsec(0x0),
   fh1Trials(0x0),
   fh1PtHard(0x0),
@@ -299,8 +307,11 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
        fh2ESDTriggerRun->Fill(run,iTrig+2);
        fh2VtxXY->Fill(xvtx,yvtx);
       }
+      xvtx -= fVtxXMean; 
+      yvtx -= fVtxYMean; 
+      zvtx -= fVtxZMean; 
       Float_t r2 = xvtx *xvtx + yvtx *yvtx; 
-      if(TMath::Abs(zvtx)<fZVtxCut&&r2<1)fh2ESDTriggerRun->Fill(run,iTrig+3);
+      if(TMath::Abs(zvtx)<fVtxZCut&&r2<fVtxRCut)fh2ESDTriggerRun->Fill(run,iTrig+3);
     }
     else{
       fh2ESDTriggerRun->Fill(run,0);
@@ -309,69 +320,73 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
   }
   
-  // loop over all possible trigger and 
-  for(int it = AliAnalysisHelperJetTasks::kAcceptAll;it < AliAnalysisHelperJetTasks::kTrigger;it++){
-    Bool_t esdTrig = kFALSE;
-    if(esd){
-      esdTrig = AliAnalysisHelperJetTasks::IsTriggerFired(esd,(AliAnalysisHelperJetTasks::Trigger)it);
-      if(esdTrig)fh2ESDTriggerCount->Fill(it,kAllTriggered);
-    }
-    Bool_t aodTrig = kFALSE;
-    if(aod){
-      aodTrig = AliAnalysisHelperJetTasks::IsTriggerFired(aod,(AliAnalysisHelperJetTasks::Trigger)it);
-      if(aodTrig)fh2TriggerCount->Fill(it,kAllTriggered);
-    }
 
-    // Check wether we have also an SPD vertex
-    
-    if(aod){
+  // Apply additional constraints
+  Bool_t esdEventSelected = IsEventSelectedESD(esd);
+  Bool_t aodEventSelected = IsEventSelectedAOD(aod);
+  
+
+  if(esd&&aod&&fDebug){
+    if(esdEventSelected&&!aodEventSelected){
+      Printf("%s:%d Different Selection for ESD and AOD",(char*)__FILE__,__LINE__);
+      const AliESDVertex *vtxESD = esd->GetPrimaryVertex();
       const AliAODVertex *vtxAOD = aod->GetPrimaryVertex();
-      //      Printf(">> AODvtx %s %s",vtxAOD->GetName(),vtxAOD->GetTitle());vtxAOD->Print();
-      
-      if(vtxAOD->GetNContributors()>0){
-       if(aodTrig)fh2TriggerCount->Fill(it,kTriggeredSPDVertex);
-       Float_t zvtx = vtxAOD->GetZ();
-       Float_t yvtx = vtxAOD->GetY();
-       Float_t xvtx = vtxAOD->GetX();
-       fh2TriggerVtx->Fill(it,zvtx);
-       Float_t r2   = yvtx*yvtx+xvtx*xvtx;  
-       if(TMath::Abs(zvtx)<fZVtxCut&&aodTrig&&r2<1){
-         fh2TriggerCount->Fill(it,kTriggeredVertexIn);
-       }
-      }
+      Printf("ESD Vtx %s %s %d",vtxESD->GetName(),vtxESD->GetTitle(),vtxESD->GetNContributors());
+      vtxESD->Print();
+      Printf("AOD Vtx %s %s %d",vtxAOD->GetName(),vtxAOD->GetTitle(),vtxAOD->GetNContributors());
+      vtxAOD->Print();
     }
-    if(esd){
-      const AliESDVertex *vtxESD = esd->GetPrimaryVertex();
-      //      Printf(">> ESDvtx %s %s",vtxESD->GetName(),vtxESD->GetTitle());vtxESD->Print();
+  }
+
+  // loop over all possible triggers for esd 
+
+  if(esd){
+    const AliESDVertex *vtxESD = esd->GetPrimaryVertex();
+    //      Printf(">> ESDvtx %s %s",vtxESD->GetName(),vtxESD->GetTitle());vtxESD->Print();
+    TString vtxName(vtxESD->GetName());
+    for(int it = AliAnalysisHelperJetTasks::kAcceptAll;it < AliAnalysisHelperJetTasks::kTrigger;it++){
+      Bool_t esdTrig = kFALSE;
+      esdTrig = AliAnalysisHelperJetTasks::IsTriggerFired(esd,(AliAnalysisHelperJetTasks::Trigger)it);
+      if(esdTrig)fh2ESDTriggerCount->Fill(it,kAllTriggered);
       Bool_t cand = fInputHandler->IsEventSelected();
       if(cand){
        fh2ESDTriggerCount->Fill(it,kSelectedALICE); 
       }
       if(!fUsePhysicsSelection)cand =  AliAnalysisHelperJetTasks::IsTriggerFired(esd,AliAnalysisHelperJetTasks::kMB1);
-
-      if(vtxESD->GetNContributors()>0){
-       if(esdTrig)fh2ESDTriggerCount->Fill(it,kTriggeredSPDVertex);
+      if(vtxESD->GetNContributors()>0&&!vtxName.Contains("TPCVertex")){
+       if(esdTrig)fh2ESDTriggerCount->Fill(it,kTriggeredVertex);
        Float_t zvtx = vtxESD->GetZ();
-       Float_t yvtx = vtxESD->GetY();
-       Float_t xvtx = vtxESD->GetX();
-       Float_t r2   = yvtx*yvtx+xvtx*xvtx;  
        fh2ESDTriggerVtx->Fill(it,zvtx);
-       Bool_t vtxIn = TMath::Abs(zvtx)<fZVtxCut&&r2<1;
-       
-       if(cand&&vtxIn){
-         fh2ESDTriggerCount->Fill(it,kSelectedALICEVertexIn);
-         fh2ESDTriggerCount->Fill(it,kSelected);
-         AliAnalysisHelperJetTasks::Selected(kTRUE,kTRUE);// select this event
-       }
-       if(vtxIn&&esdTrig){
+       if(esdEventSelected&&esdTrig){
          fh2ESDTriggerCount->Fill(it,kTriggeredVertexIn);
-         // here we select based on ESD info...
        }
       }
+      if(cand&&esdEventSelected){
+       fh2ESDTriggerCount->Fill(it,kSelectedALICEVertexIn);
+       fh2ESDTriggerCount->Fill(it,kSelected);
+       AliAnalysisHelperJetTasks::Selected(kTRUE,kTRUE);// select this event
+      }
     }
   }
 
-
+  if(aod){
+    const AliAODVertex *vtxAOD = aod->GetPrimaryVertex();
+    //      Printf(">> AODvtx %s %s",vtxAOD->GetName(),vtxAOD->GetTitle());vtxAOD->Print();
+    TString vtxTitle(vtxAOD->GetTitle());
+    for(int it = AliAnalysisHelperJetTasks::kAcceptAll;it < AliAnalysisHelperJetTasks::kTrigger;it++){
+      Bool_t aodTrig = kFALSE;
+      aodTrig = AliAnalysisHelperJetTasks::IsTriggerFired(aod,(AliAnalysisHelperJetTasks::Trigger)it);
+      if(aodTrig)fh2TriggerCount->Fill(it,kAllTriggered);
+      if(vtxAOD->GetNContributors()>0&&!vtxTitle.Contains("TPCVertex")){
+       if(aodTrig)fh2TriggerCount->Fill(it,kTriggeredVertex);
+       Float_t zvtx = vtxAOD->GetZ();
+       fh2TriggerVtx->Fill(it,zvtx);
+       if(aodTrig&&aodEventSelected){
+         fh2TriggerCount->Fill(it,kTriggeredVertexIn);
+       }
+      }
+    }
+  }
 
   if (fDebug > 1)printf(" AliAnalysisTaskJetServices: Analysing event # %5d\n", (Int_t) fEntry);
 
@@ -408,6 +423,75 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
   PostData(1, fHistList);
 }
 
+Bool_t AliAnalysisTaskJetServices::IsEventSelectedESD(AliESDEvent* esd){
+  if(!esd)return kFALSE;
+  const AliESDVertex *vtx = esd->GetPrimaryVertex();
+  // We can check the type of the vertex by its name and title
+  // if vertexer failed title is empty (default c'tor) and ncontributors is 0
+  // vtx       name                  title
+  // Tracks    PrimaryVertex         VertexerTracksNoConstraint
+  // TPC       TPCVertex             VertexerTracksNoConstraint
+  // SPD       SPDVertex             vertexer: 3D
+  // SPD       SPDVertex             vertexer: Z
+  
+
+
+  if(vtx->GetNContributors()<1)return kFALSE;
+
+  // do not want tpc only primary vertex
+  TString vtxName(vtx->GetName());
+  if(vtxName.Contains("TPCVertex"))return kFALSE;
+  Float_t zvtx = vtx->GetZ();
+  Float_t yvtx = vtx->GetY();
+  Float_t xvtx = vtx->GetX();
+
+  // here we may fill the histos for run dependence....
+
+  xvtx -= fVtxXMean;
+  yvtx -= fVtxYMean;
+  zvtx -= fVtxZMean;
+
+  Float_t r2   = yvtx*yvtx+xvtx*xvtx;      
+
+  Bool_t eventSel = TMath::Abs(zvtx)<fVtxZCut&&r2<(fVtxRCut*fVtxRCut);
+  return eventSel;
+}
+
+Bool_t AliAnalysisTaskJetServices::IsEventSelectedAOD(AliAODEvent* aod){
+  if(!aod)return kFALSE;
+  const AliAODVertex *vtx = aod->GetPrimaryVertex();
+  // We can check the type of the vertex by its name and title
+  // if vertexer failed title is empty (default c'tor) and ncontributors is 0
+  // vtx       name                  title
+  // Tracks    PrimaryVertex         VertexerTracksNoConstraint
+  // TPC       TPCVertex             VertexerTracksNoConstraint
+  // SPD       SPDVertex             vertexer: 3D
+  // SPD       SPDVertex             vertexer: Z
+  
+
+
+  if(vtx->GetNContributors()<1)return kFALSE;
+
+  // do not want tpc only primary vertex
+  TString vtxName(vtx->GetName());
+  if(vtxName.Contains("TPCVertex"))return kFALSE;
+
+  Float_t zvtx = vtx->GetZ();
+  Float_t yvtx = vtx->GetY();
+  Float_t xvtx = vtx->GetX();
+
+  // here we may fill the histos for run dependence....
+
+  xvtx -= fVtxXMean;
+  yvtx -= fVtxYMean;
+  zvtx -= fVtxZMean;
+
+  Float_t r2   = yvtx*yvtx+xvtx*xvtx;      
+  Bool_t eventSel = TMath::Abs(zvtx)<fVtxZCut&&r2<(fVtxRCut*fVtxRCut);
+  return eventSel;
+}
+
+
 
 void AliAnalysisTaskJetServices::Terminate(Option_t */*option*/)
 {

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetServices.h b/PWG4/JetTasks/AliAnalysisTaskJetServices.h
index 889ad867a9a1ec546f22648c53e0b087a0605721..3c1c8f8aa09881ea9515439f1ae03aa83026d0b9 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetServices.h
+++ b/PWG4/JetTasks/AliAnalysisTaskJetServices.h
@@ -22,6 +22,7 @@ class AliCFManager;
 
 class TList;
 class TChain;
+class TH1F;
 class TH2F;
 class TH3F;
 class TProfile;
@@ -40,14 +41,16 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     virtual void LocalInit() { Init(); }
     virtual void UserExec(Option_t *option);
     virtual void Terminate(Option_t *option);
-    virtual void SetZVertexCut(Float_t f){fZVtxCut = f;}
+    virtual void SetZVertexCut(Float_t f){fVtxZCut = f;}
     virtual Bool_t Notify();
 
     virtual void SetAODInput(Bool_t b){fUseAODInput = b;}
     virtual void SetRunRange(Float_t fLo,Float_t fUp){fRunRange[0] = fLo;fRunRange[1] = fUp;}
     virtual void SetRealData(Bool_t b){fRealData = b;}
     virtual void SetUsePhysicsSelection(Bool_t b){fUsePhysicsSelection = b;}
-    enum { kAllTriggered = 0,kTriggeredSPDVertex,kTriggeredVertexIn,kSelectedALICE,kSelectedALICEVertexIn,kSelected,kConstraints};
+    Bool_t IsEventSelectedESD(AliESDEvent* esd);
+    Bool_t IsEventSelectedAOD(AliAODEvent* aod);
+    enum { kAllTriggered = 0,kTriggeredVertex,kTriggeredVertexIn,kSelectedALICE,kSelectedALICEVertexIn,kSelected,kConstraints};
 
  private:
 
@@ -58,7 +61,11 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     Bool_t        fUsePhysicsSelection;// decide wether we take into account physicsselction task
     Bool_t        fRealData;           // true for real data to allow correct trigger slection
     Float_t       fAvgTrials;          // Average number of trials
-    Float_t       fZVtxCut;            // Average number of trials
+    Float_t       fVtxXMean;          // mean x for cuts
+    Float_t       fVtxYMean;          // mean y for cuts
+    Float_t       fVtxZMean;          // mean z for cuts
+    Float_t       fVtxRCut;           // vtx cut in R
+    Float_t       fVtxZCut;           // vtzx cut in Z
     Float_t       fRunRange[2];        // only important for real data for 
     TProfile*     fh1Xsec;             // pythia cross section and trials
     TH1F*         fh1Trials;           // trials are added
@@ -72,7 +79,7 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     TH2F*         fh2VtxXY;          // XY position of VTX were available
     TList *fHistList; // Output list
    
-    ClassDef(AliAnalysisTaskJetServices,3)
+    ClassDef(AliAnalysisTaskJetServices,4)
 };
  
 #endif

diff --git a/PWG4/macros/AddTaskJetServices.C b/PWG4/macros/AddTaskJetServices.C
index e79488983a40980ee6afbd78bdc7ed7fc8ac4d3e..82dc4f8589303980def30f1e0456fe6b8eef6234 100644 (file)
--- a/PWG4/macros/AddTaskJetServices.C
+++ b/PWG4/macros/AddTaskJetServices.C
@@ -20,7 +20,7 @@ AliAnalysisTaskJetServices *AddTaskJetServices()
    // Create the task and configure it.\r
    //===========================================================================\r
    \r
-   AliAnalysisTaskJetServices* pwg4serv = new  AliAnalysisTaskJetServices("Jet Services");\r
+   AliAnalysisTaskJetServices* pwg4serv = new  AliAnalysisTaskJetServices("JetServices");\r
       \r
 \r
    if(type == "AOD"){\r