Improvements in V0 classes

diff --git a/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg b/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg
index b4cb766b8f6216aa5b83eb9b995c72c3e9be23eb..fa160431b1ef435863e7aa0d6cc2b39034385f37 100644 (file)
--- a/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg
+++ b/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg
@@ -25,7 +25,7 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS  FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityKTPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoTPCInnerCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoChi2CorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnSource.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnTrueQ.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnNonIdDR.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DLCMSSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelAllHiddenInfo.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCchiNdof.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQAEventCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCncls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDG.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnTPCNcls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnGammaMonitor.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQinvCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctn3DSphericalEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoBPLCMS3DCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutAntiGamma.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistance.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutPt.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoAvgSepCorrFctn.cxx)
+set ( SRCS  FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityKTPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoTPCInnerCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoChi2CorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnSource.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnTrueQ.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnNonIdDR.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DLCMSSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelAllHiddenInfo.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCchiNdof.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQAEventCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCncls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDG.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnTPCNcls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnGammaMonitor.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQinvCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctn3DSphericalEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoBPLCMS3DCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutAntiGamma.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistance.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutPt.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoAvgSepCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDGV0.cxx)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx
index 9032fcca169f24ff34d15cbb5678d9be1c5bd8ca..d03593b1d8286d7e9cb82f20dc734cae6dc972ac 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx
@@ -37,7 +37,9 @@ AliFemtoCorrFctnDEtaDPhi::AliFemtoCorrFctnDEtaDPhi(char* title, const int& aPhiB
   fDCosPtNumerator(0),
   fDCosPtDenominator(0),
   fPhi(0),
-  fEta(0)
+  fEta(0),
+  fYtYtNumerator(0),
+  fYtYtDenominator(0)
 {
   // set up numerator
   char tTitNumD[101] = "NumDPhiDEta";
@@ -74,6 +76,16 @@ AliFemtoCorrFctnDEtaDPhi::AliFemtoCorrFctnDEtaDPhi(char* title, const int& aPhiB
   strncat(tTitEta,title, 100);
   fEta = new TH1D(tTitEta,title,90,-1.2,1.2);
   
+  // set up numerator
+  char tTitYtNum[101] = "NumYtYt";
+  strncat(tTitYtNum,title, 100);
+  fYtYtNumerator = new TH2D(tTitYtNum,title,aPhiBins,1,5,aEtaBins,1,5);
+  // set up denominator
+  char tTitYtYtDen[101] = "DenYtYt";
+  strncat(tTitYtYtDen,title, 100);
+  fYtYtDenominator = new TH2D(tTitYtYtDen,title,aPhiBins,1,5,aEtaBins,1,5);
+
+
 
   // to enable error bar calculation...
   fDPhiDEtaNumerator->Sumw2();
@@ -84,6 +96,8 @@ AliFemtoCorrFctnDEtaDPhi::AliFemtoCorrFctnDEtaDPhi(char* title, const int& aPhiB
   fDCosDenominator->Sumw2();
   fPhi->Sumw2();
   fEta->Sumw2();
+  fYtYtNumerator->Sumw2();
+  fYtYtDenominator->Sumw2();
 }
 
 //____________________________
@@ -101,7 +115,9 @@ AliFemtoCorrFctnDEtaDPhi::AliFemtoCorrFctnDEtaDPhi(const AliFemtoCorrFctnDEtaDPh
   fDCosPtNumerator(0),
   fDCosPtDenominator(0),
   fPhi(0),
-  fEta(0)
+  fEta(0),
+  fYtYtNumerator(0),
+  fYtYtDenominator(0)
 {
   // copy constructor
   if (aCorrFctn.fDPhiDEtaNumerator)
@@ -157,6 +173,15 @@ AliFemtoCorrFctnDEtaDPhi::AliFemtoCorrFctnDEtaDPhi(const AliFemtoCorrFctnDEtaDPh
   else
     fEta = 0;
 
+ if (aCorrFctn.fYtYtNumerator)
+   fYtYtNumerator = new TH2D(*aCorrFctn.fDPhiDEtaDenominator);
+ else 
+   fYtYtNumerator = 0;
+
+ if (aCorrFctn.fYtYtDenominator)
+   fYtYtDenominator = new TH2D(*aCorrFctn.fDPhiDEtaDenominator);
+ else 
+   fYtYtDenominator = 0;
 }
 //____________________________
 AliFemtoCorrFctnDEtaDPhi::~AliFemtoCorrFctnDEtaDPhi(){
@@ -175,6 +200,9 @@ AliFemtoCorrFctnDEtaDPhi::~AliFemtoCorrFctnDEtaDPhi(){
   }
   delete fPhi;
   delete fEta;
+
+  delete fYtYtNumerator;
+  delete fYtYtDenominator;
 }
 //_________________________
 AliFemtoCorrFctnDEtaDPhi& AliFemtoCorrFctnDEtaDPhi::operator=(const AliFemtoCorrFctnDEtaDPhi& aCorrFctn)
@@ -236,6 +264,16 @@ AliFemtoCorrFctnDEtaDPhi& AliFemtoCorrFctnDEtaDPhi::operator=(const AliFemtoCorr
   else
     fEta = 0;
 
+ if (aCorrFctn.fYtYtNumerator)
+   fYtYtNumerator = new TH2D(*aCorrFctn.fDPhiDEtaDenominator);
+ else 
+   fYtYtNumerator = 0;
+
+ if (aCorrFctn.fYtYtDenominator)
+   fYtYtDenominator = new TH2D(*aCorrFctn.fDPhiDEtaDenominator);
+ else 
+   fYtYtDenominator = 0;
+
   return *this;
 }
 //_________________________
@@ -313,6 +351,11 @@ void AliFemtoCorrFctnDEtaDPhi::AddRealPair( AliFemtoPair* pair){
   fPhi->Fill(phi1);
   fEta->Fill(eta1);
 
+  double PionMass = 0.13956995;
+  double yt1 = TMath::Log(sqrt(1+(pair->Track1()->Track()->Pt()/PionMass)*(pair->Track1()->Track()->Pt()/PionMass))+(pair->Track1()->Track()->Pt()/PionMass));
+  double yt2 = TMath::Log(sqrt(1+(pair->Track2()->Track()->Pt()/PionMass)*(pair->Track2()->Track()->Pt()/PionMass))+(pair->Track2()->Track()->Pt()/PionMass));
+  fYtYtNumerator->Fill(yt1,yt2);
+
 }
 //____________________________
 void AliFemtoCorrFctnDEtaDPhi::AddMixedPair( AliFemtoPair* pair){
@@ -356,10 +399,15 @@ void AliFemtoCorrFctnDEtaDPhi::AddMixedPair( AliFemtoPair* pair){
   fDPhiDenominator->Fill(dphi);
 //   fDCosDenominator->Fill(cosphi);
 
-  if (fDoPtAnalysis) {
+  //if (fDoPtAnalysis) {
     //   fDPhiPtDenominator->Fill(dphi, ptmin);
     //   fDCosPtDenominator->Fill(cosphi, ptmin);
-  }
+  //}
+
+  double PionMass = 0.13956995;
+  double yt1 = TMath::Log(sqrt(1+(pair->Track1()->Track()->Pt()/PionMass)*(pair->Track1()->Track()->Pt()/PionMass))+(pair->Track1()->Track()->Pt()/PionMass));
+  double yt2 = TMath::Log(sqrt(1+(pair->Track2()->Track()->Pt()/PionMass)*(pair->Track2()->Track()->Pt()/PionMass))+(pair->Track2()->Track()->Pt()/PionMass));
+  fYtYtDenominator->Fill(yt1,yt2);
 }
 
 
@@ -380,6 +428,7 @@ void AliFemtoCorrFctnDEtaDPhi::WriteHistos()
     }*/
   fPhi->Write();
   fEta->Write();
+  
 }
 
 TList* AliFemtoCorrFctnDEtaDPhi::GetOutputList()
@@ -401,7 +450,8 @@ TList* AliFemtoCorrFctnDEtaDPhi::GetOutputList()
     }*/
   tOutputList->Add(fPhi);
   tOutputList->Add(fEta);
-
+  tOutputList->Add(fYtYtNumerator);
+  tOutputList->Add(fYtYtDenominator);
   return tOutputList;
 
 }

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.h b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.h
index 42e5eb538ab120a211a44c2d9b47cf44bed96a8f..20e7cd14d94dab8b2c577f92924aab592cc8113a 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.h
+++ b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.h
@@ -54,6 +54,10 @@ private:
   TH1D *fPhi;
   TH1D *fEta;
 
+  TH2D *fYtYtNumerator;
+  TH2D *fYtYtDenominator; 
+
+
 #ifdef __ROOT__
   ClassDef(AliFemtoCorrFctnDEtaDPhi, 1)
 #endif

diff --git a/PWGCF/PWGCFfemtoscopyUserLinkDef.h b/PWGCF/PWGCFfemtoscopyUserLinkDef.h
index 27fd115828d6d3492973f855a0d969cc20ffb804..8a304371d46764250f7a7a7c6cb28eba2ed95b55 100644 (file)
--- a/PWGCF/PWGCFfemtoscopyUserLinkDef.h
+++ b/PWGCF/PWGCFfemtoscopyUserLinkDef.h
@@ -34,6 +34,7 @@
 #pragma link C++ class AliFemtoCorrFctnTPCNcls;
 #pragma link C++ class AliFemtoCorrFctnDEtaDPhi;
 #pragma link C++ class AliFemtoCutMonitorParticlePtPDG;
+#pragma link C++ class AliFemtoCutMonitorParticlePtPDGV0;
 #pragma link C++ class AliFemtoCutMonitorParticleEtCorr;
 #pragma link C++ class AliFemtoCorrFctnGammaMonitor;
 #pragma link C++ class AliFemtoPairCutAntiGamma;