Merging correctly the changes with the previous code clean-up

[u/mrichter/AliRoot.git] / HBTAN / AliHBTLLWeightFctn.h

diff --git a/HBTAN/AliHBTLLWeightFctn.h b/HBTAN/AliHBTLLWeightFctn.h
index 885104bef729b014e73463279bc3a7a00bcf70f9..a300c0366e6d234f32e2128f36a9311994658bd8 100644 (file)
--- a/HBTAN/AliHBTLLWeightFctn.h
+++ b/HBTAN/AliHBTLLWeightFctn.h
@@ -1,13 +1,9 @@
-//This function allows to obtain Q_inv correlation function with weights
-//calculated by Lednicky's alghorithm.
-//Numerator is filled with weighted events. Weights are attributed to reconstructed tracks.
-//Weights are calculated with corresponding simulated particles momenta.
-//Denominator is filled with mixing unweighted reconstructed tracks.
-//One needs both pairs 
-//(simulated and recontructed), thus function is of class AliHBTTwoPairFctn1D.
+#ifndef ALIHBTLLWEIGHTQINVFCTN_H
+#define ALIHBTLLWEIGHTQINVFCTN_H
+
+/* $Id$ */
+
 
-#ifndef ALIHBTLLWEIGHTFCTN_H
-#define ALIHBTLLWEIGHTFCTN_H
 #include "AliHBTFunction.h"
 
 
@@ -15,108 +11,89 @@ class AliHBTLLWeights;
 
 class AliHBTLLWeightQInvFctn: public AliHBTTwoPairFctn1D
 {
-//  friend class AliHBTOnePairFctn1D;
-
-  public:
-      AliHBTLLWeightQInvFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0);
-      virtual  ~AliHBTLLWeightQInvFctn(){};
-      TH1* GetResult(); 
-
-      void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-      void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-      
-      Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
-           { return trackpair->GetQInv()-partpair->GetQInv();} //isn't use                                                                    
-       
-
-  protected:
-
-  private:
-  public:
-     ClassDef(AliHBTLLWeightQInvFctn,1)
+ public:
+  AliHBTLLWeightQInvFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0);
+  virtual  ~AliHBTLLWeightQInvFctn(){};
+  TH1* GetResult(); 
+  
+  void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair) const
+    { return trackpair->GetQInv()-partpair->GetQInv();} //isn't use                                                                    
+  ClassDef(AliHBTLLWeightQInvFctn,1)
 };
 /*************************************************************************************/ 
-/*************************************************************************************/ 
-/*************************************************************************************/ 
-/*************************************************************************************/ 
 
 class AliHBTLLWeightQOutFctn: public AliHBTTwoPairFctn1D
 {
 
- friend class AliHBTOnePairFctn1D;
+  //  friend class AliHBTOnePairFctn1D;
  public:
-   AliHBTLLWeightQOutFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
-   virtual ~AliHBTLLWeightQOutFctn(){};
-   TH1* GetResult();
+  AliHBTLLWeightQOutFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
+    AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
+  virtual ~AliHBTLLWeightQOutFctn(){};
+  TH1* GetResult();
  protected:
-   void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-   void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
       
-    Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
-           { return trackpair->GetQOutCMSLC()-partpair->GetQOutCMSLC();} //isn't use                                                                    
-  public:
-    ClassDef(AliHBTLLWeightQOutFctn,1)
+  Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
+    { return trackpair->GetQOutCMSLC()-partpair->GetQOutCMSLC();} //isn't use                                                                    
+  ClassDef(AliHBTLLWeightQOutFctn,1)
  
 };
 /*************************************************************************************/ 
 class AliHBTLLWeightQLongFctn: public AliHBTTwoPairFctn1D
 {
-
- friend class AliHBTOnePairFctn1D;
+  //  friend class AliHBTOnePairFctn1D;
  public:
-   AliHBTLLWeightQLongFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
-   virtual ~AliHBTLLWeightQLongFctn(){};
-   TH1* GetResult();
+  AliHBTLLWeightQLongFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
+    AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
+  virtual ~AliHBTLLWeightQLongFctn(){};
+  TH1* GetResult();
  protected:
-   void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-   void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-      
-    Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
-           { return trackpair->GetQLongCMSLC()-partpair->GetQLongCMSLC();} //isn't use                                                                    
-  public:
-    ClassDef(AliHBTLLWeightQLongFctn,1)
+  void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)
+    { return trackpair->GetQLongCMSLC()-partpair->GetQLongCMSLC();} //isn't used
+
+  ClassDef(AliHBTLLWeightQLongFctn,1)
  
 };
 /*************************************************************************************/ 
 class AliHBTLLWeightQSideFctn: public AliHBTTwoPairFctn1D
 {
-
- friend class AliHBTOnePairFctn1D;
+  // friend class AliHBTOnePairFctn1D;
  public:
-   AliHBTLLWeightQSideFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
-   virtual ~AliHBTLLWeightQSideFctn(){};
-   TH1* GetResult();
+  AliHBTLLWeightQSideFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
+    AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
+  virtual ~AliHBTLLWeightQSideFctn(){};
+  TH1* GetResult();
  protected:
-   void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-   void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
       
-    Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
-           { return trackpair->GetQLongCMSLC()-partpair->GetQLongCMSLC();} //isn't use                                                                    
-  public:
-    ClassDef(AliHBTLLWeightQSideFctn,1) 
+  Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
+    { return trackpair->GetQLongCMSLC()-partpair->GetQLongCMSLC();} //isn't used
+
+  ClassDef(AliHBTLLWeightQSideFctn,1) 
 };
 /*************************************************************************************/ 
 class AliHBTLLWeightTwoKStarFctn: public AliHBTTwoPairFctn1D
 {
-
- friend class AliHBTOnePairFctn1D;
+  // friend class AliHBTOnePairFctn1D;
  public:
-   AliHBTLLWeightTwoKStarFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
-   virtual ~AliHBTLLWeightTwoKStarFctn(){};
-   TH1* GetResult();
+  AliHBTLLWeightTwoKStarFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
+    AliHBTTwoPairFctn1D(nbins,maxXval,minXval){}
+  virtual ~AliHBTLLWeightTwoKStarFctn(){};
+  TH1* GetResult();
  protected:
-   void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-   void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
+  void   ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
       
-    Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
-           { return trackpair->GetKStar()-partpair->GetKStar();} //isn't use                                                                    
-  public:
-    ClassDef(AliHBTLLWeightTwoKStarFctn,1) 
-};
+  Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair)         
+    { return trackpair->GetKStar()-partpair->GetKStar();} //isn't used
+  ClassDef(AliHBTLLWeightTwoKStarFctn,1) 
 
-  
+};
 #endif