Additional histogram in PID monitor + adding lines to ESDTrackCut to make sqrt of...

diff --git a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx
index d8c4e34dd6ef5b06cd5fc3306ee37de8ae7b2a8b..dd0fa176a6a2aa1308472265a4f3b01ba4fafc32 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx
@@ -15,16 +15,18 @@ AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID():
   fTPCdEdx(0),
   fTOFParticle(0),
   fTOFTime(0x0),
-    fTOFNSigma(0),
-    fTPCNSigma(0),
-    fTPCTOFNSigma(0)
+  fTOFNSigma(0),
+  fTPCNSigma(0),
+  fTPCTOFNSigma(0),
+  fTPCvsTOFNSigma(0)
 {
   // Default constructor
-    fTPCdEdx =  new TH2D("TPCdEdx", "TPC dEdx vs. momentum", 100, 0.0, 5.0, 250, 0.0, 500.0);
-    fTOFTime = new TH2D("TOFTime", "TOF Time vs. momentum", 100, 0.1, 5.0, 400, -4000.0, 4000.0);
-    fTOFNSigma = new TH2D("TOFNSigma","TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
-    fTPCNSigma = new TH2D("TPCNSigma","TPC NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
-    fTPCTOFNSigma = new TH2D("TPCTOFNSigma","TPC & TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, 0.0, 10.0);
+  fTPCdEdx =  new TH2D("TPCdEdx", "TPC dEdx vs. momentum", 100, 0.0, 5.0, 250, 0.0, 500.0);
+  fTOFTime = new TH2D("TOFTime", "TOF Time vs. momentum", 100, 0.1, 5.0, 400, -4000.0, 4000.0);
+  fTOFNSigma = new TH2D("TOFNSigma","TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
+  fTPCNSigma = new TH2D("TPCNSigma","TPC NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
+  fTPCTOFNSigma = new TH2D("TPCTOFNSigma","TPC & TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, 0.0, 10.0);
+  fTPCvsTOFNSigma = new TH2D("TPCvsTOFNSigma","TPC vs TOF Nsigma",100, -5.0, 5.0, 100, -5.0, 5.0);
 
 }
 
@@ -33,27 +35,28 @@ AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID(const char *aName,
   fTPCdEdx(0),
   fTOFParticle(aTOFParticle),
   fTOFTime(0x0),
-    fTOFNSigma(0),
-    fTPCNSigma(0),
-    fTPCTOFNSigma(0)
+  fTOFNSigma(0),
+  fTPCNSigma(0),
+  fTPCTOFNSigma(0),
+  fTPCvsTOFNSigma(0)
 {
   // Normal constructor
   char name[200];
   snprintf(name, 200, "TPCdEdx%s", aName);
-    // fTPCdEdx = new TH2D(name, "TPC dEdx vs. momentum", 100, 0.0, 6.0, 250, 0.0, 500.0);
-    fTPCdEdx = new TH2D(name, "TPC dEdx vs. momentum", 200, 0.1, 4.0, 250, 0.0, 500.0);
+  // fTPCdEdx = new TH2D(name, "TPC dEdx vs. momentum", 100, 0.0, 6.0, 250, 0.0, 500.0);
+  fTPCdEdx = new TH2D(name, "TPC dEdx vs. momentum", 200, 0.1, 4.0, 250, 0.0, 500.0);
 
   snprintf(name, 200, "TOFTime%s", aName);
-    fTOFTime = new TH2D(name, "TOF Time vs. momentum", 100, 0.1, 5.0, 400, -4000.0, 4000.0);
+  fTOFTime = new TH2D(name, "TOF Time vs. momentum", 100, 0.1, 5.0, 400, -4000.0, 4000.0);
 
-    snprintf(name, 200, "TOFNSigma%s", aName);
-    fTOFNSigma = new TH2D(name,"TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
+  snprintf(name, 200, "TOFNSigma%s", aName);
+  fTOFNSigma = new TH2D(name,"TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
 
-    snprintf(name, 200, "TPCNSigma%s", aName);
-    fTPCNSigma = new TH2D(name,"TPC NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
+  snprintf(name, 200, "TPCNSigma%s", aName);
+  fTPCNSigma = new TH2D(name,"TPC NSigma vs. momentum", 100, 0.0, 5.0, 100, -5.0, 5.0);
 
-    snprintf(name, 200, "TPCTOFNSigma%s", aName);
-    fTPCTOFNSigma = new TH2D(name,"TPC & TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, 0.0, 10.0);
+  snprintf(name, 200, "TPCTOFNSigma%s", aName);
+  fTPCTOFNSigma = new TH2D(name,"TPC & TOF NSigma vs. momentum", 100, 0.0, 5.0, 100, 0.0, 10.0);
 
 }
 
@@ -62,9 +65,10 @@ AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID(const AliFemtoCutMo
   fTPCdEdx(0),
   fTOFParticle(0),
   fTOFTime(0x0),
-    fTOFNSigma(0),
-    fTPCNSigma(0),
-    fTPCTOFNSigma(0)
+  fTOFNSigma(0),
+  fTPCNSigma(0),
+  fTPCTOFNSigma(0),
+  fTPCvsTOFNSigma(0)
 
 {
   // copy constructor
@@ -74,14 +78,14 @@ AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID(const AliFemtoCutMo
   if (fTOFTime) delete fTOFTime;
   fTOFTime = new TH2D(*aCut.fTOFTime);
 
-    if (fTOFNSigma) delete fTOFNSigma;
-    fTOFNSigma= new TH2D(*aCut.fTOFNSigma);
+  if (fTOFNSigma) delete fTOFNSigma;
+  fTOFNSigma= new TH2D(*aCut.fTOFNSigma);
 
-    if (fTPCNSigma) delete fTPCNSigma;
-    fTPCNSigma= new TH2D(*aCut.fTPCNSigma);
+  if (fTPCNSigma) delete fTPCNSigma;
+  fTPCNSigma= new TH2D(*aCut.fTPCNSigma);
 
-    if (fTPCTOFNSigma) delete fTPCTOFNSigma;
-    fTPCTOFNSigma= new TH2D(*aCut.fTPCTOFNSigma);
+  if (fTPCTOFNSigma) delete fTPCTOFNSigma;
+  fTPCTOFNSigma= new TH2D(*aCut.fTPCTOFNSigma);
 }
 
 AliFemtoCutMonitorParticlePID::~AliFemtoCutMonitorParticlePID()
@@ -89,9 +93,10 @@ AliFemtoCutMonitorParticlePID::~AliFemtoCutMonitorParticlePID()
   // Destructor
   delete fTPCdEdx;
   delete fTOFTime;
-    delete fTOFNSigma;
-    delete fTPCNSigma;
-    delete fTPCTOFNSigma;
+  delete fTOFNSigma;
+  delete fTPCNSigma;
+  delete fTPCTOFNSigma;
+  delete fTPCvsTOFNSigma;
 
 }
 
@@ -107,14 +112,17 @@ AliFemtoCutMonitorParticlePID& AliFemtoCutMonitorParticlePID::operator=(const Al
   if (fTOFTime) delete fTOFTime;
   fTOFTime = new TH2D(*aCut.fTOFTime);
 
-    if(fTOFNSigma) delete fTOFNSigma;
-    fTOFNSigma = new TH2D(*aCut.fTOFNSigma);
+  if(fTOFNSigma) delete fTOFNSigma;
+  fTOFNSigma = new TH2D(*aCut.fTOFNSigma);
 
-    if(fTPCNSigma) delete fTPCNSigma;
-    fTPCNSigma = new TH2D(*aCut.fTPCNSigma);
+  if(fTPCNSigma) delete fTPCNSigma;
+  fTPCNSigma = new TH2D(*aCut.fTPCNSigma);
 
-    if(fTPCTOFNSigma) delete fTPCTOFNSigma;
-    fTPCTOFNSigma = new TH2D(*aCut.fTPCTOFNSigma);
+  if(fTPCTOFNSigma) delete fTPCTOFNSigma;
+  fTPCTOFNSigma = new TH2D(*aCut.fTPCTOFNSigma);
+
+  if(fTPCvsTOFNSigma) delete fTPCvsTOFNSigma;
+  fTPCvsTOFNSigma = new TH2D(*aCut.fTPCvsTOFNSigma);
 
   return *this;
 }
@@ -160,6 +168,11 @@ void AliFemtoCutMonitorParticlePID::Fill(const AliFemtoTrack* aTrack)
     if (fTOFParticle == 1) fTPCTOFNSigma->Fill(tMom, TMath::Hypot( aTrack->NSigmaTPCK(), aTrack->NSigmaTOFK() ) );
     if (fTOFParticle == 2) fTPCTOFNSigma->Fill(tMom, TMath::Hypot( aTrack->NSigmaTPCP(), aTrack->NSigmaTOFP() ) );
 
+    if (fTOFParticle == 0) fTPCvsTOFNSigma->Fill( aTrack->NSigmaTPCPi(), aTrack->NSigmaTOFPi());
+    if (fTOFParticle == 1) fTPCvsTOFNSigma->Fill( aTrack->NSigmaTPCK(), aTrack->NSigmaTOFK());
+    if (fTOFParticle == 2) fTPCvsTOFNSigma->Fill( aTrack->NSigmaTPCP(), aTrack->NSigmaTOFP());
+
+
 }
 
 void AliFemtoCutMonitorParticlePID::Write()
@@ -167,10 +180,10 @@ void AliFemtoCutMonitorParticlePID::Write()
   // Write out the relevant histograms
   fTPCdEdx->Write();
   fTOFTime->Write();
-    fTOFNSigma->Write();
-    fTPCNSigma->Write();
-    fTPCTOFNSigma->Write();
-
+  fTOFNSigma->Write();
+  fTPCNSigma->Write();
+  fTPCTOFNSigma->Write();
+  fTPCvsTOFNSigma->Write();
 }
 
 TList *AliFemtoCutMonitorParticlePID::GetOutputList()
@@ -178,9 +191,10 @@ TList *AliFemtoCutMonitorParticlePID::GetOutputList()
   TList *tOutputList = new TList();
   tOutputList->Add(fTPCdEdx);
   tOutputList->Add(fTOFTime);
-    tOutputList->Add(fTOFNSigma);
-    tOutputList->Add(fTPCNSigma);
-    tOutputList->Add(fTPCTOFNSigma);
+  tOutputList->Add(fTOFNSigma);
+  tOutputList->Add(fTPCNSigma);
+  tOutputList->Add(fTPCTOFNSigma);
+  tOutputList->Add(fTPCvsTOFNSigma);
 
   return tOutputList;
 }

diff --git a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h
index a8bfd08500f6ee3e7bcade18882ce24bf5cce30e..8072fc11a3eebee32dad54ffd626f9df8fe441f6 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h
+++ b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h
@@ -49,9 +49,11 @@ private:
   TH2D *fTPCdEdx;     // TPC dEdx information
   Int_t fTOFParticle; // Select TOF time hypothesis, 0-pion, 1-kaon, 2-proton
   TH2D *fTOFTime;     // TOF time
-    TH2D *fTOFNSigma;   // TOF NSigma values
-    TH2D *fTPCNSigma;   // TPC NSigma values
-    TH2D *fTPCTOFNSigma;   // TPC & TOF NSigma values
+  TH2D *fTOFNSigma;   // TOF NSigma values vs mom
+  TH2D *fTPCNSigma;   // TPC NSigma values vs mom
+  TH2D *fTPCTOFNSigma;   // TPC^2+ TOF^2 NSigma values vs mom
+  TH2D *fTPCvsTOFNSigma; // TPC vs TOF
+  
 
 };
 

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx
index 11f6e83b6fe4c2865ed7b586cfc24624cb737ff4..864f6caa3f5df2897caac8b0e50e6b0e0e6f5c68 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx
@@ -937,29 +937,41 @@ bool AliFemtoESDTrackCut::IsKaonNSigma(float mom, float nsigmaTPCK, float nsigma
 //old
 bool AliFemtoESDTrackCut::IsKaonNSigma(float mom, float nsigmaTPCK, float nsigmaTOFK)
 {
-
-  if(mom<0.4)
-    {
-      if(nsigmaTOFK<-999.)
-       {
-         if(TMath::Abs(nsigmaTPCK)<2.0) return true;
-       }
-      else if(TMath::Abs(nsigmaTOFK)<3.0 && TMath::Abs(nsigmaTPCK)<3.0) return true;
-    }
-  else if(mom>=0.4 && mom<=0.6)
-    {
-      if(nsigmaTOFK<-999.)
-       {
-         if(TMath::Abs(nsigmaTPCK)<2.0) return true;
-       }
-      else if(TMath::Abs(nsigmaTOFK)<3.0 && TMath::Abs(nsigmaTPCK)<3.0) return true;
+  if (fNsigmaTPCTOF) {
+    if (mom > 0.5) {
+      //        if (TMath::Hypot( nsigmaTOFP, nsigmaTPCP )/TMath::Sqrt(2) < 3.0)
+      if (TMath::Hypot( nsigmaTOFK, nsigmaTPCK ) < fNsigma)
+       return true;
     }
-  else if(nsigmaTOFK<-999.)
-    {
-      return false;
+    else {
+      if (TMath::Abs(nsigmaTPCK) < fNsigma)
+       return true;
     }
-  else if(TMath::Abs(nsigmaTOFK)<3.0 && TMath::Abs(nsigmaTPCK)<3.0) return true;
+  }
+  else {
 
+    if(mom<0.4)
+      {
+       if(nsigmaTOFK<-999.)
+         {
+           if(TMath::Abs(nsigmaTPCK)<2.0) return true;
+         }
+       else if(TMath::Abs(nsigmaTOFK)<3.0 && TMath::Abs(nsigmaTPCK)<3.0) return true;
+      }
+    else if(mom>=0.4 && mom<=0.6)
+      {
+       if(nsigmaTOFK<-999.)
+         {
+           if(TMath::Abs(nsigmaTPCK)<2.0) return true;
+         }
+       else if(TMath::Abs(nsigmaTOFK)<3.0 && TMath::Abs(nsigmaTPCK)<3.0) return true;
+      }
+    else if(nsigmaTOFK<-999.)
+      {
+       return false;
+      }
+    else if(TMath::Abs(nsigmaTOFK)<3.0 && TMath::Abs(nsigmaTPCK)<3.0) return true;
+  }
   return false;
 }
 
@@ -967,24 +979,36 @@ bool AliFemtoESDTrackCut::IsKaonNSigma(float mom, float nsigmaTPCK, float nsigma
 
 bool AliFemtoESDTrackCut::IsPionNSigma(float mom, float nsigmaTPCPi, float nsigmaTOFPi)
 {
-  if(mom<0.65)
-    {
-      if(nsigmaTOFPi<-999.)
-       {
-         if(mom<0.35 && TMath::Abs(nsigmaTPCPi)<3.0) return true;
-         else if(mom<0.5 && mom>=0.35 && TMath::Abs(nsigmaTPCPi)<3.0) return true;
-         else if(mom>=0.5 && TMath::Abs(nsigmaTPCPi)<2.0) return true;
-         else return false;
-       }
-      else if(TMath::Abs(nsigmaTOFPi)<3.0 && TMath::Abs(nsigmaTPCPi)<3.0) return true;
+  if (fNsigmaTPCTOF) {
+    if (mom > 0.5) {
+      //        if (TMath::Hypot( nsigmaTOFP, nsigmaTPCP )/TMath::Sqrt(2) < 3.0)
+      if (TMath::Hypot( nsigmaTOFPi, nsigmaTPCPi ) < fNsigma)
+       return true;
     }
-  else if(nsigmaTOFPi<-999.)
-    {
-      return false;
+    else {
+      if (TMath::Abs(nsigmaTPCPi) < fNsigma)
+       return true;
     }
-  else if(mom<1.5 && TMath::Abs(nsigmaTOFPi)<3.0 && TMath::Abs(nsigmaTPCPi)<5.0) return true;
-  else if(mom>=1.5 && TMath::Abs(nsigmaTOFPi)<2.0 && TMath::Abs(nsigmaTPCPi)<5.0) return true;
-
+  }
+  else {
+    if(mom<0.65)
+      {
+       if(nsigmaTOFPi<-999.)
+         {
+           if(mom<0.35 && TMath::Abs(nsigmaTPCPi)<3.0) return true;
+           else if(mom<0.5 && mom>=0.35 && TMath::Abs(nsigmaTPCPi)<3.0) return true;
+           else if(mom>=0.5 && TMath::Abs(nsigmaTPCPi)<2.0) return true;
+           else return false;
+         }
+       else if(TMath::Abs(nsigmaTOFPi)<3.0 && TMath::Abs(nsigmaTPCPi)<3.0) return true;
+      }
+    else if(nsigmaTOFPi<-999.)
+      {
+       return false;
+      }
+    else if(mom<1.5 && TMath::Abs(nsigmaTOFPi)<3.0 && TMath::Abs(nsigmaTPCPi)<5.0) return true;
+    else if(mom>=1.5 && TMath::Abs(nsigmaTOFPi)<2.0 && TMath::Abs(nsigmaTPCPi)<5.0) return true;
+  }
   return false;
 }
 
@@ -993,7 +1017,7 @@ bool AliFemtoESDTrackCut::IsProtonNSigma(float mom, float nsigmaTPCP, float nsig
 {
 
   if (fNsigmaTPCTOF) {
-    if (mom > 0.8) {
+    if (mom > 0.5) {
 //        if (TMath::Hypot( nsigmaTOFP, nsigmaTPCP )/TMath::Sqrt(2) < 3.0)
         if (TMath::Hypot( nsigmaTOFP, nsigmaTPCP ) < fNsigma)
             return true;