adding pioinjet class
authorslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 9 May 2011 13:22:42 +0000 (13:22 +0000)
committerslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 9 May 2011 13:22:42 +0000 (13:22 +0000)
PWG4/CMakelibPWG4GammaConv.pkg
PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx
PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h
PWG4/GammaConv/ConvCorrelations/AliAnalysisTaskGammaJet.cxx
PWG4/PWG4GammaConvLinkDef.h

index 8aab497..a469098 100644 (file)
@@ -39,7 +39,8 @@ set ( SRCS  GammaConv/AliV0Reader.cxx
     GammaConv/ConvCorrelations/AliAnaConvCorrBase.cxx 
     GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx 
     GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.cxx 
-    GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx)
+    GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx
+    GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
index e95709b..5f47c8b 100644 (file)
@@ -35,12 +35,18 @@ ClassImp(AliAnaConvCorrPhotonJet)
 
 //________________________________________________________________________________
 AliAnaConvCorrPhotonJet::AliAnaConvCorrPhotonJet() :
-AliAnaConvCorrBase("photonJet") {
+AliAnaConvCorrBase("photonJet"),
+  fhPtFracGamma(NULL), 
+  fhPtFracPion(NULL)
+{
   //consctructor
 }
 //________________________________________________________________________________
 AliAnaConvCorrPhotonJet::AliAnaConvCorrPhotonJet(TString name) :
-AliAnaConvCorrBase(name) {
+  AliAnaConvCorrBase(name), 
+  fhPtFracGamma(NULL), 
+  fhPtFracPion(NULL)
+{
   //consctructor
 }
 
@@ -70,7 +76,7 @@ void AliAnaConvCorrPhotonJet::DoJetAnalysisGamma(AliAODJet * jet, const TClonesA
     if(photon) {
       trackIDs[0] = photon->GetLabel1();
       trackIDs[1] = photon->GetLabel2();
-      if(IsParticleInJet(jet, photon, 2, trackIDs)){
+      if(IsParticleInJet(jet, 2, trackIDs)){
        fhPtFracGamma->Fill(photon->Pt()/jet->Pt());
       }
     }
@@ -82,7 +88,7 @@ void AliAnaConvCorrPhotonJet::DoJetAnalysisGamma(AliAODJet * jet, const TClonesA
     AliAODConversionParticle * pion = dynamic_cast<AliAODConversionParticle*>(pions->At(i));
     if(pion) {
       pion->GetGrandChildren(photons, trackIDs);
-      if(IsParticleInJet(jet, pion, 4, trackIDs)){
+      if(IsParticleInJet(jet, 4, trackIDs)){
        fhPtFracPion->Fill(pion->Pt()/jet->Pt());
       }
     }
@@ -95,7 +101,7 @@ void AliAnaConvCorrPhotonJet::DoJetAnalysisGamma(AliAODJet * jet, const TClonesA
 }
 
 //________________________________________________________________________________
-Bool_t AliAnaConvCorrPhotonJet::IsParticleInJet(AliAODJet * jet, const AliAODConversionParticle * const particle, Int_t nTracks, Int_t * trackIds) const {
+Bool_t AliAnaConvCorrPhotonJet::IsParticleInJet(AliAODJet * jet, Int_t nTracks, Int_t * trackIds) const {
 
   Int_t mTracks = 0;
   TRefArray * refTracks = jet->GetRefTracks();
index 9d631c2..4f6e09b 100644 (file)
@@ -27,7 +27,7 @@ public:
   //Correlate photon with jets\r
   virtual void CorrelateWithHadrons(const AliAODConversionParticle * const photon, const TClonesArray * const jets, const Bool_t isolated);\r
   Double_t ExtractFromJet(AliAODJet * jet, const AliAODConversionParticle * const particle)  const;\r
-  Bool_t IsParticleInJet(AliAODJet * jet, const AliAODConversionParticle * const particle, Int_t nTracks, Int_t * trackIds) const;\r
+  Bool_t IsParticleInJet(AliAODJet * jet, Int_t nTracks, Int_t * trackIds) const;\r
   void DoJetAnalysisGamma(AliAODJet * jet, const TClonesArray * const photons, const  TClonesArray *const pions ) const;\r
   void CreateHistograms();\r
 \r
index 5486a0a..00becc0 100644 (file)
@@ -370,6 +370,10 @@ Bool_t AliAnalysisTaskGammaJet::EventIsSynced(const TClonesArray * const tracks,
       }
     }
   }
+
+  if(pions) { 
+    //placeholder
+  }
   
   //cout  <<"insync"<<endl;
   return kTRUE;
index ca31e4c..ce19f41 100644 (file)
@@ -19,5 +19,6 @@
 #pragma link C++ class AliAnaConvCorrPion++;
 #pragma link C++ class AliAnaConvCorrPhoton++;
 #pragma link C++ class AliAnaConvCorrPhotonJet++;
+#pragma link C++ class AliAnaConvCorrPionJet++;
 
 #endif