Retrofit from Release developement

diff --git a/ANALYSIS/ANALYSISLinkDef.h b/ANALYSIS/ANALYSISLinkDef.h
index 32844bf21305b9aff61afc269485a43f9aac9ac9..accfef2ea8a6e105303abdc9ef6850ba22d4af86 100644 (file)
--- a/ANALYSIS/ANALYSISLinkDef.h
+++ b/ANALYSIS/ANALYSISLinkDef.h
@@ -70,6 +70,9 @@
 #pragma link C++ class AliAODQInvCut+;
 #pragma link C++ class AliAODKtCut+;
 #pragma link C++ class AliAODKStarCut+;
+#pragma link C++ class AliAODKStarOutCut+;
+#pragma link C++ class AliAODKStarSideCut+;
+#pragma link C++ class AliAODKStarLongCut+;
 #pragma link C++ class AliAODQSideLCMSCut+;
 #pragma link C++ class AliAODQOutLCMSCut+;
 #pragma link C++ class AliAODQLongLCMSCut+;

diff --git a/ANALYSIS/AliAODPair.cxx b/ANALYSIS/AliAODPair.cxx
index e508f4cf00625f88e8cbbeae7a36878e4e74f97c..57fac0f2ddc4be9f2ed7ca4d653588f1550ac68f 100644 (file)
--- a/ANALYSIS/AliAODPair.cxx
+++ b/ANALYSIS/AliAODPair.cxx
@@ -467,6 +467,16 @@ Double_t AliAODPair::GetGammaToLCMS()
 }
 /************************************************************************/
 
+Double_t AliAODPair::GetGammaToTransverse()
+{
+  //calculates gamma factor of the boost to LCMS
+  Double_t beta = 2.0*GetKt() / GetMt();
+  Double_t gamma = 1.0/TMath::Sqrt(1.0 - beta*beta);
+
+  return gamma;
+}
+/************************************************************************/
+
 Double_t AliAODPair::GetMt()
 {
   //Calculates transverse mass of the pair
@@ -624,3 +634,20 @@ void   AliAODPair::DeleteSecond()
   delete fPart2;
   fPart2 = 0x0;
 }
+
+void   AliAODPair::Print(Option_t* /*option*/) 
+{
+  if (fPart1) fPart1->Print();
+  if (fPart2) fPart2->Print();
+  
+  Info("Print","GetKStar() %f",GetKStar());
+  Info("Print","GetKt() %f",GetKt() );
+  Info("Print","QInv %f", GetQInv() );
+  Info("Print","GetQOutLCMS() %f",GetQOutLCMS() );
+  Info("Print","GetQSideLCMS %f",GetQSideLCMS() );
+  Info("Print","GetQLongLCMS() %f", GetQLongLCMS());
+  Info("Print","GetDeltaTheta() %f", GetDeltaTheta());
+  Info("Print","GetDeltaPhi() %f", GetDeltaPhi());
+  
+  
+}

diff --git a/ANALYSIS/AliAODPair.h b/ANALYSIS/AliAODPair.h
index a928c62a9a56a717792da1f9e8c3900ab422e10c..69cb2d82e3c5dbf297ae334874755cab374600fa 100644 (file)
--- a/ANALYSIS/AliAODPair.h
+++ b/ANALYSIS/AliAODPair.h
@@ -67,6 +67,7 @@ class AliAODPair: public TObject
    virtual Double_t GetDeltaPhi();
    
    virtual Double_t GetGammaToLCMS();
+   virtual Double_t GetGammaToTransverse();
    virtual Double_t GetPIDProb() const {return fPart1->GetPidProb()*fPart2->GetPidProb();}
    
    virtual Double_t GetRStar() ;
@@ -74,6 +75,9 @@ class AliAODPair: public TObject
    
    void   MirrorSecond();
    void   DeleteSecond();
+   
+   void   Print(Option_t* /*option*/ = "" ) ;
+   
  protected:
    AliVAODParticle* fPart1;  //pointer to first particle
    AliVAODParticle* fPart2;  //pointer to second particle

diff --git a/ANALYSIS/AliAODPairBaseCut.h b/ANALYSIS/AliAODPairBaseCut.h
index 4f7917d156f9a7ec214458370687c5136b5f9a6c..6680165b1dda178b3940ec00b0d59f4f796aa4fc 100644 (file)
--- a/ANALYSIS/AliAODPairBaseCut.h
+++ b/ANALYSIS/AliAODPairBaseCut.h
@@ -17,6 +17,9 @@ class AliAODPairBaseCut: public TObject
       kHbtPairCutPropQInv, //Q invariant
       kHbtPairCutPropKt,
       kHbtPairCutPropKStar,
+      kHbtPairCutPropKStarOut,
+      kHbtPairCutPropKStarSide,
+      kHbtPairCutPropKStarLong,
       kHbtPairCutPropQSideLCMS,
       kHbtPairCutPropQOutLCMS,
       kHbtPairCutPropQLongLCMS,
@@ -111,6 +114,42 @@ class AliAODKStarCut: public AliAODPairBaseCut
 };
 /******************************************************************/
 
+class AliAODKStarOutCut: public AliAODPairBaseCut
+{
+ public:
+  AliAODKStarOutCut(Double_t min = 0.0, Double_t max = 0.0):AliAODPairBaseCut(min,max,kHbtPairCutPropKStarOut){}
+  virtual ~AliAODKStarOutCut(){}
+ protected:
+  virtual Double_t  GetValue(AliAODPair* pair) const {return pair->GetKStarOut();}
+
+  ClassDef(AliAODKStarOutCut,1)
+};
+/******************************************************************/
+class AliAODKStarSideCut: public AliAODPairBaseCut
+{
+ public:
+  AliAODKStarSideCut(Double_t min = 0.0, Double_t max = 0.0):AliAODPairBaseCut(min,max,kHbtPairCutPropKStarSide){}
+  virtual ~AliAODKStarSideCut(){}
+ protected:
+  virtual Double_t  GetValue(AliAODPair* pair) const {return pair->GetKStarSide();}
+
+  ClassDef(AliAODKStarSideCut,1)
+};
+
+/******************************************************************/
+
+class AliAODKStarLongCut: public AliAODPairBaseCut
+{
+ public:
+  AliAODKStarLongCut(Double_t min = 0.0, Double_t max = 0.0):AliAODPairBaseCut(min,max,kHbtPairCutPropKStarLong){}
+  virtual ~AliAODKStarLongCut(){}
+ protected:
+  virtual Double_t  GetValue(AliAODPair* pair) const {return pair->GetKStarLong();}
+
+  ClassDef(AliAODKStarLongCut,1)
+};
+/******************************************************************/
+
 class AliAODQSideLCMSCut: public AliAODPairBaseCut
 {
  public:

diff --git a/ANALYSIS/AliAODPairCut.cxx b/ANALYSIS/AliAODPairCut.cxx
index b51b787079f02642a28ce5ad6a4e98717650a5d8..033100afb65b9fbc10bd5a545774e9a9fde06b18 100644 (file)
--- a/ANALYSIS/AliAODPairCut.cxx
+++ b/ANALYSIS/AliAODPairCut.cxx
@@ -262,6 +262,33 @@ void AliAODPairCut::SetKStarRange(Double_t min, Double_t max)
 }
 /**********************************************************/
 
+void AliAODPairCut::SetKStarOutRange(Double_t min, Double_t max)
+{
+  // set range of accepted KStar (invariant pair momentum difference (fourvector))
+  AliAODKStarOutCut* cut= (AliAODKStarOutCut*)FindCut(AliAODPairBaseCut::kHbtPairCutPropKStarOut);
+  if(cut) cut->SetRange(min,max);
+  else fCuts[fNCuts++] = new AliAODKStarOutCut(min,max);
+}
+/**********************************************************/
+
+void AliAODPairCut::SetKStarSideRange(Double_t min, Double_t max)
+{
+  // set range of accepted KStar (invariant pair momentum difference (fourvector))
+  AliAODKStarSideCut* cut= (AliAODKStarSideCut*)FindCut(AliAODPairBaseCut::kHbtPairCutPropKStarSide);
+  if(cut) cut->SetRange(min,max);
+  else fCuts[fNCuts++] = new AliAODKStarSideCut(min,max);
+}
+/**********************************************************/
+
+void AliAODPairCut::SetKStarLongRange(Double_t min, Double_t max)
+{
+  // set range of accepted KStar (invariant pair momentum difference (fourvector))
+  AliAODKStarLongCut* cut= (AliAODKStarLongCut*)FindCut(AliAODPairBaseCut::kHbtPairCutPropKStarLong);
+  if(cut) cut->SetRange(min,max);
+  else fCuts[fNCuts++] = new AliAODKStarLongCut(min,max);
+}
+/**********************************************************/
+
 void AliAODPairCut::SetAvSeparationRange(Double_t min, Double_t max)
 {
   //sets avarage separation cut ->Anti-Merging cut

diff --git a/ANALYSIS/AliAODPairCut.h b/ANALYSIS/AliAODPairCut.h
index cd43db4bb719664382560d7e6b933f2ad3e9f91f..f78a52009972721e351d0a268a041d5d29b18bc4 100644 (file)
--- a/ANALYSIS/AliAODPairCut.h
+++ b/ANALYSIS/AliAODPairCut.h
@@ -42,6 +42,9 @@ class AliAODPairCut: public TNamed
   void SetQInvRange(Double_t min, Double_t max);
   void SetKtRange(Double_t min, Double_t max);
   void SetKStarRange(Double_t min, Double_t max);
+  void SetKStarOutRange(Double_t min, Double_t max);
+  void SetKStarSideRange(Double_t min, Double_t max);
+  void SetKStarLongRange(Double_t min, Double_t max);
   void SetQOutLCMSRange(Double_t min, Double_t max);
   void SetQSideLCMSRange(Double_t min, Double_t max);
   void SetQLongLCMSRange(Double_t min, Double_t max);