changes from gsi svn

diff --git a/PWG4/GammaConv/AliAODConversionMother.cxx b/PWG4/GammaConv/AliAODConversionMother.cxx
index 79773db2676a0dc153bc496bec50310934d7acfd..de34a567578c4de33956a347067c78bbdb2b785b 100644 (file)
--- a/PWG4/GammaConv/AliAODConversionMother.cxx
+++ b/PWG4/GammaConv/AliAODConversionMother.cxx
@@ -13,7 +13,8 @@ AliAODConversionMother::AliAODConversionMother() :
 AliAODConversionParticle(),
 fChi2(-1),
 fOpeningAngle(-1),
-fAlpha(-1)
+    fAlpha(-1),
+    fWeight(1)
 {
        fLabel[0] = -1;
        fLabel[1] = -1;
@@ -23,7 +24,8 @@ AliAODConversionMother::AliAODConversionMother(AliKFConversionMother *kf):
 AliAODConversionParticle(),
 fChi2(kf->GetChi2()),
 fOpeningAngle(kf->GetOpeningAngle()),
-fAlpha(kf->GetAlpha())
+fAlpha(kf->GetAlpha()),
+fWeight(1)
 {
     // Set 4momentu
     SetPxPyPzE(kf->GetPx(),kf->GetPy(),kf->GetPz(),kf->GetE());
@@ -37,7 +39,8 @@ AliAODConversionMother::AliAODConversionMother(AliAODConversionPhoton *y1,AliAOD
 AliAODConversionParticle(),
 fChi2(-1),
 fOpeningAngle(-1),
-fAlpha(-1)
+fAlpha(-1),
+fWeight(1)
 {
     // Set 4momentum
     SetPxPyPzE(y1->Px()+y2->Px(),y1->Py()+y2->Py(),y1->Pz()+y2->Pz(),y1->E()+y2->E());

diff --git a/PWG4/GammaConv/AliAODConversionMother.h b/PWG4/GammaConv/AliAODConversionMother.h
index 6184839977e60c0abc27f7e3078d030f68171c56..ca0b7b3eb45ffcaf52d16cdcf86f4ff13b99e525 100644 (file)
--- a/PWG4/GammaConv/AliAODConversionMother.h
+++ b/PWG4/GammaConv/AliAODConversionMother.h
@@ -52,14 +52,17 @@ class AliAODConversionMother : public AliAODConversionParticle{
 
      Double_t GetAlpha() const { return fAlpha;}
 
+     void SetWeight(Double_t weight) {fWeight=weight;}
+     Double_t GetWeight() const {return fWeight;}
 
 private:
     Int_t fLabel[2]; // Labels of the decay photons
     Float_t fChi2; // Chi sq of reconstructed mother
     Double_t fOpeningAngle;
     Double_t fAlpha;
+    Double_t fWeight; // Weight for BG Calculation
 
-    ClassDef(AliAODConversionMother,1)
+    ClassDef(AliAODConversionMother,2)
 };
 
 #endif

diff --git a/PWG4/GammaConv/AliAODConversionPhoton.h b/PWG4/GammaConv/AliAODConversionPhoton.h
index 20b4b868ca9b04b37ae13ae76f0a8a9f354a968d..e088fd196a155bd67a2b54790c5a2ac6b34e6f88 100644 (file)
--- a/PWG4/GammaConv/AliAODConversionPhoton.h
+++ b/PWG4/GammaConv/AliAODConversionPhoton.h
@@ -30,6 +30,7 @@ class AliAODConversionPhoton : public AliAODConversionParticle, public AliConver
   virtual Double_t GetPhotonPt() const {return AliAODConversionParticle::Pt();}
   virtual Double_t GetPhotonP() const {return AliAODConversionParticle::P();}
   virtual Double_t GetPhotonEta() const {return AliAODConversionParticle::Eta();}
+  virtual Double_t GetPhotonPhi() const {return AliAODConversionParticle::Phi();}
 
   ClassDef(AliAODConversionPhoton,1)
 };

diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx b/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx
index 6177e74aa2cb970603fd8b0aba48dffd755d4176..f96f72faa662015658e4bde2c4b4bb4ade079fa4 100644 (file)
--- a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx
+++ b/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx
@@ -1127,6 +1127,11 @@ void AliAnalysisTaskGammaConversion::ProcessMCData(){
                        }
                }
 
+               if(  particle->GetPdgCode()==310 ){
+                       if(TMath::Abs(rapidity) < fV0Reader->GetRapidityMesonCut() ){
+                               fHistograms->FillHistogram("MC_K0S_Pt", particle->Pt());
+                       }
+               }
 
                if(iTracks<=fStack->GetNprimary() ){
                        if ( particle->GetPdgCode()== -211 ||   particle->GetPdgCode()== 211 ||
@@ -1139,13 +1144,13 @@ void AliAnalysisTaskGammaConversion::ProcessMCData(){
                                if(particle->GetMother(0)>-1){
                                        // cout<<"Mother ::"<<fStack->Particle(particle->GetMother(0))->GetPdgCode()<<endl;
                                        if (fStack->Particle(particle->GetMother(0))->GetPdgCode()== -211 ||fStack->Particle(particle->GetMother(0))->GetPdgCode()== -3122 ){
-                                               cout<<"Mother K0, lambda::"<<fStack->Particle(particle->GetMother(0))->GetPdgCode()<<endl;
+                                               //                                              cout<<"Mother K0, lambda::"<<fStack->Particle(particle->GetMother(0))->GetPdgCode()<<endl;
                                        continue;
                                        }
                                }
                                
                                fHistograms->FillHistogram("MC_PhysicalPrimaryCharged_Pt", particle->Pt());
-                               //cout << "hihi" << endl;
+
                                if (particle->GetPdgCode() == 211 ) fHistograms->FillHistogram("MC_PiPlus_Pt", particle->Pt());
                                if (particle->GetPdgCode() == 321 ) fHistograms->FillHistogram("MC_KaonPlus_Pt", particle->Pt());
                                if (particle->GetPdgCode() == 2212 ) fHistograms->FillHistogram("MC_Proton_Pt", particle->Pt());
@@ -1153,6 +1158,9 @@ void AliAnalysisTaskGammaConversion::ProcessMCData(){
                                if (particle->GetPdgCode() == -321 ) fHistograms->FillHistogram("MC_KaonMinus_Pt", particle->Pt());
                                if (particle->GetPdgCode() == -2212 ) fHistograms->FillHistogram("MC_AntiProton_Pt", particle->Pt()); 
                        }
+                       if(TMath::Abs(particle->Eta())<=0.8 ){
+                               if (particle->GetPdgCode() == 111 ) fHistograms->FillHistogram("MC_Pi0_Test_Pt", particle->Pt());
+                       }
                }
 
 
@@ -1253,7 +1261,7 @@ void AliAnalysisTaskGammaConversion::ProcessMCData(){
                        Double_t eNegPhi = eNeg->Phi();
                        if(eNeg->Phi()> TMath::Pi()) eNegPhi = eNeg->Phi()-(2*TMath::Pi());
                                                        
-                       if(ePos->Pt()<fV0Reader->GetPtCut() || eNeg->Pt()<fV0Reader->GetPtCut()){
+                       if(ePos->Pt()<fV0Reader->GetSinglePtCut() || eNeg->Pt()<fV0Reader->GetSinglePtCut()){
                                continue; // no reconstruction below the Pt cut
                        }
                                        
@@ -1543,6 +1551,12 @@ void AliAnalysisTaskGammaConversion::ProcessMCData(){
                                                        fHistograms->FillHistogram("MC_Pi0_Secondaries_Pt_Eta_ConvGamma_withinAcceptance", particle->Pt(),particle->Eta());
                                                        fHistograms->FillHistogram("MC_Pi0_Secondaries_Pt_Rapid_ConvGamma_withinAcceptance", particle->Pt(),rapidity);
                                                }
+                                               if(particle->GetMother(0) > -1){
+                                                       Int_t pdgPionMother=fStack->Particle(particle->GetMother(0))->GetPdgCode();
+                                                       if(pdgPionMother ==310 ){
+                                                               fHistograms->FillHistogram("MC_K0S_Pt_FromPi0", fStack->Particle(particle->GetMother(0))->Pt());
+                                                       }
+                                               }
                                        }
                                } else{
 
@@ -1780,8 +1794,8 @@ void AliAnalysisTaskGammaConversion::ProcessV0sNoCut(){
                Double_t dTpos = TOFsignalPos - t0pos - timesPos[0];
                Double_t dTneg = TOFsignalNeg - t0neg - timesNeg[0];
 
-               if( (statusPos & AliESDtrack::kTOFpid) && !(statusPos & AliESDtrack::kTOFmismatch) ) fHistograms->FillHistogram("ESD_NoCutConvGamma_EandP_P_dT", fV0Reader->GetPositiveTrackP(), dTpos);
-               if( (statusNeg & AliESDtrack::kTOFpid) && !(statusNeg & AliESDtrack::kTOFmismatch) ) fHistograms->FillHistogram("ESD_NoCutConvGamma_EandP_P_dT", fV0Reader->GetNegativeTrackP(), dTneg);
+               if( (statusPos & AliESDtrack::kTOFpid) && !(statusPos & AliESDtrack::kTOFmismatch) ) fHistograms->FillHistogram("ESD_WOCutConvGamma_EandP_P_dT", fV0Reader->GetPositiveTrackP(), dTpos);
+               if( (statusNeg & AliESDtrack::kTOFpid) && !(statusNeg & AliESDtrack::kTOFmismatch) ) fHistograms->FillHistogram("ESD_WOCutConvGamma_EandP_P_dT", fV0Reader->GetNegativeTrackP(), dTneg);
                // RRnewTOF end /////////////////////////////////////////////////
                
                if(fDoMCTruth){
@@ -3116,6 +3130,9 @@ void AliAnalysisTaskGammaConversion::ProcessGammasForNeutralMesonAnalysis(){
                                                                                        if (secPi0MC->GetMother(0) >-1){
                                                                                                if(fStack->Particle(secPi0MC->GetMother(0))->GetPdgCode()==kK0Short){
                                                                                                        fHistograms->FillHistogram("ESD_TruePi0SecFromK0S_InvMass_vs_Pt",massTwoGammaCandidate,momentumVectorTwoGammaCandidate.Pt());
+                                                                                                       if(massTwoGammaCandidate>0.09 && massTwoGammaCandidate<0.145){
+                                                                                                               fHistograms->FillHistogram("ESD_K0SFromSecPi0_Pt",fStack->Particle(secPi0MC->GetMother(0))->Pt());
+                                                                                                       }
                                                                                                }
                                                                                        }
                                                                                }
@@ -3213,7 +3230,7 @@ void AliAnalysisTaskGammaConversion::AddGammaToAOD(AliKFConversionPhoton * kfPar
        AliESDtrack *trackpos=fESDEvent->GetTrack(labelp);
        AliESDtrack *trackneg=fESDEvent->GetTrack(labeln);
 
-       if(trackpos&&trackneg){
+       if(trackpos&&trackneg&&fPIDResponse){
 
            Float_t fNSigmadEdxPositive[5];
            Float_t fNSigmadEdxNegative[5];

diff --git a/PWG4/GammaConv/AliConversionPhotonBase.h b/PWG4/GammaConv/AliConversionPhotonBase.h
index eb4f10a2f819e008172fb863a372f886095db3f0..a7b19849584c0816aa80e1c0e58929b8c8fe21a8 100644 (file)
--- a/PWG4/GammaConv/AliConversionPhotonBase.h
+++ b/PWG4/GammaConv/AliConversionPhotonBase.h
@@ -87,6 +87,7 @@ class AliConversionPhotonBase {
   virtual Double_t GetPhotonPt()const = 0;
   virtual Double_t GetPhotonP() const = 0;
   virtual Double_t GetPhotonEta() const = 0;
+  virtual Double_t GetPhotonPhi() const =0;
 
 
  protected:

diff --git a/PWG4/GammaConv/AliKFConversionPhoton.h b/PWG4/GammaConv/AliKFConversionPhoton.h
index 681f8108edf5d21232b0d1e6cf271e11efefe815..f0b3917760325bb32fe91c4bfedbb3f368419581 100644 (file)
--- a/PWG4/GammaConv/AliKFConversionPhoton.h
+++ b/PWG4/GammaConv/AliKFConversionPhoton.h
@@ -54,10 +54,11 @@ class AliKFConversionPhoton : public AliKFParticle, public AliConversionPhotonBa
   Double_t P() const {return AliKFParticle::GetP();}
   Double_t Eta() const {return AliKFParticle::GetEta();}
 
-  virtual Double_t GetPhotonMass() const {return AliKFParticle::GetMass();}
-  virtual Double_t GetPhotonPt() const {return AliKFParticle::GetPt();}
-  virtual Double_t GetPhotonP() const {return AliKFParticle::GetP();}
-  virtual Double_t GetPhotonEta() const {return AliKFParticle::GetEta();}
+  virtual Double_t GetPhotonMass() const {return M();}
+  virtual Double_t GetPhotonPt() const {return Pt();}
+  virtual Double_t GetPhotonP() const {return P();}
+  virtual Double_t GetPhotonEta() const {return Eta();}
+  virtual Double_t GetPhotonPhi() const {return Phi();} 
 
   ClassDef(AliKFConversionPhoton,1)
 };

diff --git a/PWG4/GammaConv/AliV0Reader.h b/PWG4/GammaConv/AliV0Reader.h
index 7e42028093f3d507689819536a279a7ebf9d0fea..33799933e04836fbd3443b794d57dacb8609e727 100644 (file)
--- a/PWG4/GammaConv/AliV0Reader.h
+++ b/PWG4/GammaConv/AliV0Reader.h
@@ -501,7 +501,7 @@ class AliV0Reader : public TObject {
    * Gets the Pt cut value.
    */
   Double_t GetPtCut() const{return fPtCut;}
-       
+  Double_t GetSinglePtCut() const{return fSinglePtCut;}        
        
   /*
    * Gets the MaxZCut value.