Two Particle Function -> One Pair; FourPart -> TwoPair

diff --git a/HBTAN/AliHBTAnalysis.cxx b/HBTAN/AliHBTAnalysis.cxx
index 334695405104804cfb92eb4078a243ec6a79dd5d..eba0546685c5e55ef3b235b675e341db7edeb844 100644 (file)
--- a/HBTAN/AliHBTAnalysis.cxx
+++ b/HBTAN/AliHBTAnalysis.cxx
@@ -24,9 +24,9 @@ AliHBTAnalysis::AliHBTAnalysis()
  {
    fReader = 0x0;
    
-   fTrackFunctions = new AliHBTTwoPartFctn* [fgkFctnArraySize];
-   fParticleFunctions = new AliHBTTwoPartFctn* [fgkFctnArraySize];
-   fParticleAndTrackFunctions = new AliHBTFourPartFctn* [fgkFctnArraySize];
+   fTrackFunctions = new AliHBTOnePairFctn* [fgkFctnArraySize];
+   fParticleFunctions = new AliHBTOnePairFctn* [fgkFctnArraySize];
+   fParticleAndTrackFunctions = new AliHBTTwoPairFctn* [fgkFctnArraySize];
    
    fNTrackFunctions = 0;
    fNParticleFunctions = 0;
@@ -559,7 +559,7 @@ void AliHBTAnalysis::SetGlobalPairCut(AliHBTPairCut* cut)
 
 /*************************************************************************************/
 
-void AliHBTAnalysis::AddTrackFunction(AliHBTTwoPartFctn* f)
+void AliHBTAnalysis::AddTrackFunction(AliHBTOnePairFctn* f)
 {
   if (f == 0x0) return;
   if (fNTrackFunctions == fgkFctnArraySize)
@@ -571,7 +571,7 @@ void AliHBTAnalysis::AddTrackFunction(AliHBTTwoPartFctn* f)
 }
 /*************************************************************************************/ 
 
-void AliHBTAnalysis::AddParticleFunction(AliHBTTwoPartFctn* f)
+void AliHBTAnalysis::AddParticleFunction(AliHBTOnePairFctn* f)
 {
   if (f == 0x0) return;
   
@@ -584,7 +584,7 @@ void AliHBTAnalysis::AddParticleFunction(AliHBTTwoPartFctn* f)
   
   
 }
-void AliHBTAnalysis::AddParticleAndTrackFunction(AliHBTFourPartFctn* f)
+void AliHBTAnalysis::AddParticleAndTrackFunction(AliHBTTwoPairFctn* f)
 {
   if (f == 0x0) return;
   if (fNParticleAndTrackFunctions == fgkFctnArraySize)

diff --git a/HBTAN/AliHBTAnalysis.h b/HBTAN/AliHBTAnalysis.h
index 9c94df6380d2db705c85f67517d924c21dc7e0ee..2b50eb671f8612713020752856c9011b5a918811 100644 (file)
--- a/HBTAN/AliHBTAnalysis.h
+++ b/HBTAN/AliHBTAnalysis.h
@@ -12,8 +12,8 @@ class AliHBTPair;
 
 class AliHBTRun;
 class AliHBTReader;
-class AliHBTTwoPartFctn;      
-class AliHBTFourPartFctn;
+class AliHBTOnePairFctn;      
+class AliHBTTwoPairFctn;
 
 
 class TList;
@@ -30,11 +30,11 @@ class AliHBTAnalysis: public TObject
 
      void SetGlobalPairCut(AliHBTPairCut* cut);
      
-     void AddTrackFunction(AliHBTTwoPartFctn*);
-     void AddParticleFunction(AliHBTTwoPartFctn*);
-     void AddParticleAndTrackFunction(AliHBTFourPartFctn*);
+     void AddTrackFunction(AliHBTOnePairFctn*);
+     void AddParticleFunction(AliHBTOnePairFctn*);
+     void AddParticleAndTrackFunction(AliHBTTwoPairFctn*);
      
-     void AddResolutionFunction(AliHBTFourPartFctn* f){AddParticleAndTrackFunction(f);}
+     void AddResolutionFunction(AliHBTTwoPairFctn* f){AddParticleAndTrackFunction(f);}
      
      void SetReader(AliHBTReader* r){fReader = r;}
      
@@ -51,9 +51,9 @@ class AliHBTAnalysis: public TObject
      virtual void ProcessTracksAndParticles();
      
      
-     AliHBTTwoPartFctn**  fTrackFunctions; //!array of pointers to functions that analyze rekonstructed tracks
-     AliHBTTwoPartFctn**  fParticleFunctions; //!array of pointers to functions that analyze generated particles
-     AliHBTFourPartFctn** fParticleAndTrackFunctions; //!array of pointers to functions that analyze both 
+     AliHBTOnePairFctn**  fTrackFunctions; //!array of pointers to functions that analyze rekonstructed tracks
+     AliHBTOnePairFctn**  fParticleFunctions; //!array of pointers to functions that analyze generated particles
+     AliHBTTwoPairFctn** fParticleAndTrackFunctions; //!array of pointers to functions that analyze both 
                                         //reconstructed tracks and generated particles
                //i.e. - resolution analyzers
      UInt_t fNTrackFunctions; //!

diff --git a/HBTAN/AliHBTCorrelFctn.cxx b/HBTAN/AliHBTCorrelFctn.cxx
index ea6f3f6100115de3818e75f062a240d3ac53ca7a..49121f37f5d2542a778046f74d6e4d21db6fc3a8 100644 (file)
--- a/HBTAN/AliHBTCorrelFctn.cxx
+++ b/HBTAN/AliHBTCorrelFctn.cxx
@@ -14,7 +14,7 @@ ClassImp(AliHBTQInvCorrelFctn)
 
 AliHBTQInvCorrelFctn::
 AliHBTQInvCorrelFctn(Int_t nbins, Double_t maxXval, Double_t minXval):
-                     AliHBTTwoPartFctn1D(nbins,maxXval,minXval)
+                     AliHBTOnePairFctn1D(nbins,maxXval,minXval)
 {
  Rename("qinvcf","Q_{inv} Correlation Function");
 }
@@ -61,7 +61,7 @@ ClassImp(AliHBTInvMassCorrelFctn)
 
 AliHBTInvMassCorrelFctn::
 AliHBTInvMassCorrelFctn(Int_t nbins, Double_t maxXval, Double_t minXval):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval)
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval)
 {
   Rename("InvMass CF","Invariant Mass Correlation Function");
 }

diff --git a/HBTAN/AliHBTCorrelFctn.h b/HBTAN/AliHBTCorrelFctn.h
index 8b4ee79c483a550b73b6cf7f0af08791d5ba7895..b390bbf2f2a10c3552ede0a272175cc5572266b9 100644 (file)
--- a/HBTAN/AliHBTCorrelFctn.h
+++ b/HBTAN/AliHBTCorrelFctn.h
@@ -12,7 +12,7 @@
 //Piotr.Skowronski@cern.ch
 
 /*************************************************************************************/ 
-class AliHBTQInvCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQInvCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q Invaraint Correlation Function
 //1D two particle function 
@@ -28,13 +28,13 @@ class AliHBTQInvCorrelFctn: public AliHBTTwoPartFctn1D
 };
 /*************************************************************************************/ 
 
-class AliHBTQOutCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQOutCMSLCCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q OutCMSLCaraint Correlation Function
 //1D two particle function 
  public:
    AliHBTQOutCMSLCCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval){}
    virtual ~AliHBTQOutCMSLCCorrelFctn(){};
    TH1* GetResult();
  protected:
@@ -45,13 +45,13 @@ class AliHBTQOutCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
 };
 /*************************************************************************************/ 
 
-class AliHBTQLongCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQLongCMSLCCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q LongCMSLCaraint Correlation Function
 //1D two particle function 
  public:
    AliHBTQLongCMSLCCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval){}
    virtual ~AliHBTQLongCMSLCCorrelFctn(){};
    TH1* GetResult();
  protected:
@@ -62,13 +62,13 @@ class AliHBTQLongCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
 };
 /*************************************************************************************/ 
 
-class AliHBTQSideCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQSideCMSLCCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q SideCMSLCaraint Correlation Function
 //1D two particle function 
  public:
    AliHBTQSideCMSLCCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval){}
    virtual ~AliHBTQSideCMSLCCorrelFctn(){};
    TH1* GetResult();
  protected:
@@ -79,7 +79,7 @@ class AliHBTQSideCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
 };
 /*************************************************************************************/ 
 
-class AliHBTInvMassCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTInvMassCorrelFctn: public AliHBTOnePairFctn1D
 {
 //   Invariant Mass Function 
  public:

diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx
index 439d0daf4cad25c8df1b620c50414b4714b00341..1107ab561749672291f5b70d2e5f66c862b0314c 100644 (file)
--- a/HBTAN/AliHBTFunction.cxx
+++ b/HBTAN/AliHBTFunction.cxx
@@ -13,7 +13,7 @@ Base classes for HBT functions
           /            \
          /              \
         /                \
-    two part          four part 
+    one pair          two pair 
     /   |   \         /   |   \
    /    |    \       /    |    \
   1D   2D    3D     1D   2D    3D
@@ -151,22 +151,22 @@ Rename(const Char_t * name, const Char_t * title)
 /******************************************************************/
 /******************************************************************/
 
-ClassImp( AliHBTTwoPartFctn )
+ClassImp( AliHBTOnePairFctn )
 
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
 
-ClassImp( AliHBTFourPartFctn)
+ClassImp( AliHBTTwoPairFctn)
 
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
 
-ClassImp( AliHBTTwoPartFctn1D )
+ClassImp( AliHBTOnePairFctn1D )
 
-AliHBTTwoPartFctn1D::
-AliHBTTwoPartFctn1D(Int_t nbins, Double_t maxXval, Double_t minXval)
+AliHBTOnePairFctn1D::
+AliHBTOnePairFctn1D(Int_t nbins, Double_t maxXval, Double_t minXval)
  {
  //Constructor of Two Part One Dimentional Function 
  // nbins: number of bins in histograms - default 100
@@ -188,21 +188,21 @@ AliHBTTwoPartFctn1D(Int_t nbins, Double_t maxXval, Double_t minXval)
    
  }
 /******************************************************************/
-AliHBTTwoPartFctn1D::~AliHBTTwoPartFctn1D()
+AliHBTOnePairFctn1D::~AliHBTOnePairFctn1D()
 {
   delete fNumerator;
   delete fDenominator;
 }
 /******************************************************************/
 
-void AliHBTTwoPartFctn1D::ProcessSameEventParticles(AliHBTPair* pair)
+void AliHBTOnePairFctn1D::ProcessSameEventParticles(AliHBTPair* pair)
 {
  //Fills the numerator
    pair = CheckPair(pair);
    if(pair) fNumerator->Fill(GetValue(pair));
 }
 /******************************************************************/
-void AliHBTTwoPartFctn1D::ProcessDiffEventParticles(AliHBTPair* pair)
+void AliHBTOnePairFctn1D::ProcessDiffEventParticles(AliHBTPair* pair)
  {
   //fills denumerator
    pair = CheckPair(pair);
@@ -210,7 +210,7 @@ void AliHBTTwoPartFctn1D::ProcessDiffEventParticles(AliHBTPair* pair)
 
   }
 /******************************************************************/
-Double_t AliHBTTwoPartFctn1D::Scale()
+Double_t AliHBTOnePairFctn1D::Scale()
 {
   if (gDebug>0) cout<<"Enetered Scale()"<<endl;
   if(!fNumerator) 
@@ -266,10 +266,10 @@ Double_t AliHBTTwoPartFctn1D::Scale()
 /******************************************************************/
 /******************************************************************/
 
-ClassImp( AliHBTTwoPartFctn2D )
+ClassImp( AliHBTOnePairFctn2D )
 
-AliHBTTwoPartFctn2D::
-AliHBTTwoPartFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval , 
+AliHBTOnePairFctn2D::
+AliHBTOnePairFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval , 
                     Int_t nYbins, Double_t maxYval, Double_t minYval)
 
 {
@@ -290,12 +290,12 @@ AliHBTTwoPartFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval ,
    fDenominator->Sumw2();
 
 }        
-AliHBTTwoPartFctn2D::~AliHBTTwoPartFctn2D()
+AliHBTOnePairFctn2D::~AliHBTOnePairFctn2D()
 {
   delete fNumerator;
   delete fDenominator;
 }
-void AliHBTTwoPartFctn2D::ProcessSameEventParticles(AliHBTPair* pair)
+void AliHBTOnePairFctn2D::ProcessSameEventParticles(AliHBTPair* pair)
 {
   pair = CheckPair(pair);
   if(pair) 
@@ -306,7 +306,7 @@ void AliHBTTwoPartFctn2D::ProcessSameEventParticles(AliHBTPair* pair)
    }
 }
 
-void AliHBTTwoPartFctn2D::ProcessDiffEventParticles(AliHBTPair* pair)
+void AliHBTOnePairFctn2D::ProcessDiffEventParticles(AliHBTPair* pair)
 {
   pair = CheckPair(pair);
   if(pair) 
@@ -323,10 +323,10 @@ void AliHBTTwoPartFctn2D::ProcessDiffEventParticles(AliHBTPair* pair)
 /******************************************************************/
 /******************************************************************/
 
-ClassImp( AliHBTTwoPartFctn3D)
+ClassImp( AliHBTOnePairFctn3D)
 
-AliHBTTwoPartFctn3D::
-AliHBTTwoPartFctn3D(Int_t nXbins, Double_t maxXval, Double_t minXval, 
+AliHBTOnePairFctn3D::
+AliHBTOnePairFctn3D(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                     Int_t nYbins, Double_t maxYval, Double_t minYval, 
                     Int_t nZbins, Double_t maxZval, Double_t minZval)
 
@@ -352,7 +352,7 @@ AliHBTTwoPartFctn3D(Int_t nXbins, Double_t maxXval, Double_t minXval,
 }        
 
 
-AliHBTTwoPartFctn3D::~AliHBTTwoPartFctn3D()
+AliHBTOnePairFctn3D::~AliHBTOnePairFctn3D()
 {
   delete fNumerator;
   delete fDenominator;
@@ -362,11 +362,11 @@ AliHBTTwoPartFctn3D::~AliHBTTwoPartFctn3D()
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
-ClassImp( AliHBTFourPartFctn2D)
+ClassImp( AliHBTTwoPairFctn2D)
 
 
-AliHBTFourPartFctn2D::
-AliHBTFourPartFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval , 
+AliHBTTwoPairFctn2D::
+AliHBTTwoPairFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval , 
                     Int_t nYbins, Double_t maxYval, Double_t minYval)
 
 {
@@ -387,12 +387,12 @@ AliHBTFourPartFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval ,
    fDenominator->Sumw2();
 
 }        
-AliHBTFourPartFctn2D::~AliHBTFourPartFctn2D()
+AliHBTTwoPairFctn2D::~AliHBTTwoPairFctn2D()
 {
   delete fNumerator;
   delete fDenominator;
 }
-void AliHBTFourPartFctn2D::
+void AliHBTTwoPairFctn2D::
 ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
   partpair  = CheckPair(partpair);
@@ -405,7 +405,7 @@ ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
    }
 }
 
-void AliHBTFourPartFctn2D::
+void AliHBTTwoPairFctn2D::
 ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
   partpair  = CheckPair(partpair);

diff --git a/HBTAN/AliHBTFunction.h b/HBTAN/AliHBTFunction.h
index 806d7f75fac3a3ee14f59f6afa8729d84ca56609..9fc75fd8231314a5a9faeca906c13278abe84836 100644 (file)
--- a/HBTAN/AliHBTFunction.h
+++ b/HBTAN/AliHBTFunction.h
@@ -59,11 +59,11 @@ inline AliHBTPair* AliHBTFunction::CheckPair(AliHBTPair* pair)
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
-class AliHBTTwoPartFctn: public AliHBTFunction
+class AliHBTOnePairFctn: public AliHBTFunction
 {
   public:
-    AliHBTTwoPartFctn(){}
-    virtual ~AliHBTTwoPartFctn(){}
+    AliHBTOnePairFctn(){}
+    virtual ~AliHBTOnePairFctn(){}
     
     virtual void ProcessSameEventParticles(AliHBTPair* pair) = 0;
     virtual void ProcessDiffEventParticles(AliHBTPair* pair) = 0;
@@ -72,17 +72,17 @@ class AliHBTTwoPartFctn: public AliHBTFunction
     
   protected:
   public:  
-   ClassDef(AliHBTTwoPartFctn,1)
+   ClassDef(AliHBTOnePairFctn,1)
   
 };
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
-class AliHBTFourPartFctn: public AliHBTFunction
+class AliHBTTwoPairFctn: public AliHBTFunction
 {
   public:
-    AliHBTFourPartFctn(){};
-    virtual ~AliHBTFourPartFctn(){};
+    AliHBTTwoPairFctn(){};
+    virtual ~AliHBTTwoPairFctn(){};
     
     virtual void 
     ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair) = 0;
@@ -92,7 +92,7 @@ class AliHBTFourPartFctn: public AliHBTFunction
             
   protected:
   public:  
-   ClassDef(AliHBTFourPartFctn,1)
+   ClassDef(AliHBTTwoPairFctn,1)
   
 };
 /******************************************************************/
@@ -100,11 +100,11 @@ class AliHBTFourPartFctn: public AliHBTFunction
 /******************************************************************/
 
 
-class AliHBTTwoPartFctn1D: public AliHBTTwoPartFctn
+class AliHBTOnePairFctn1D: public AliHBTOnePairFctn
 {
  public:
-  AliHBTTwoPartFctn1D(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0);
-  virtual ~AliHBTTwoPartFctn1D();
+  AliHBTOnePairFctn1D(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0);
+  virtual ~AliHBTOnePairFctn1D();
   
   
   TH1* GetNumerator(){return fNumerator;}
@@ -123,19 +123,19 @@ class AliHBTTwoPartFctn1D: public AliHBTTwoPartFctn
   Int_t fNBinsToScale;
   
  public:
-  ClassDef(AliHBTTwoPartFctn1D,2)
+  ClassDef(AliHBTOnePairFctn1D,2)
 };
 
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
 
-class AliHBTTwoPartFctn2D: public AliHBTTwoPartFctn
+class AliHBTOnePairFctn2D: public AliHBTOnePairFctn
 {
  public:
-  AliHBTTwoPartFctn2D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
+  AliHBTOnePairFctn2D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
                       Int_t nYbins = 200, Double_t maxYval = .15, Double_t minYval =-0.15);
-  ~AliHBTTwoPartFctn2D();
+  ~AliHBTOnePairFctn2D();
   
   TH1* GetNumerator(){return fNumerator;}
   TH1* GetDenominator(){return fDenominator;}
@@ -151,20 +151,20 @@ class AliHBTTwoPartFctn2D: public AliHBTTwoPartFctn
   TH2D* fDenominator;
   
  public:
-  ClassDef(AliHBTTwoPartFctn2D,1)
+  ClassDef(AliHBTOnePairFctn2D,1)
 };
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
 
-class AliHBTTwoPartFctn3D: public AliHBTTwoPartFctn
+class AliHBTOnePairFctn3D: public AliHBTOnePairFctn
 {
  public:
-  AliHBTTwoPartFctn3D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
+  AliHBTOnePairFctn3D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
                       Int_t nYbins = 200, Double_t maxYval = .15, Double_t minYval =-0.15, 
                       Int_t nZbins = 200, Double_t maxZval = .15, Double_t minZval =-0.15);
            
-  virtual ~AliHBTTwoPartFctn3D();
+  virtual ~AliHBTOnePairFctn3D();
 
   TH1* GetNumerator(){return fNumerator;}
   TH1* GetDenominator(){return fDenominator;}
@@ -173,7 +173,7 @@ class AliHBTTwoPartFctn3D: public AliHBTTwoPartFctn
   TH3D* fNumerator;
   TH3D* fDenominator;
  public:
-  ClassDef(AliHBTTwoPartFctn3D,1)
+  ClassDef(AliHBTOnePairFctn3D,1)
 };
 /******************************************************************/
 /******************************************************************/
@@ -184,12 +184,12 @@ class AliHBTTwoPartFctn3D: public AliHBTTwoPartFctn
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
-class AliHBTFourPartFctn2D: public AliHBTFourPartFctn
+class AliHBTTwoPairFctn2D: public AliHBTTwoPairFctn
 {
  public:
-  AliHBTFourPartFctn2D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
+  AliHBTTwoPairFctn2D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
                        Int_t nYbins = 200, Double_t maxYval = .15, Double_t minYval =-0.15);
-  ~AliHBTFourPartFctn2D();
+  ~AliHBTTwoPairFctn2D();
   
   TH1* GetNumerator(){return fNumerator;}
   TH1* GetDenominator(){return fDenominator;}
@@ -205,7 +205,7 @@ class AliHBTFourPartFctn2D: public AliHBTFourPartFctn
   TH2D* fDenominator;
   
  public:
-  ClassDef(AliHBTFourPartFctn2D,1)
+  ClassDef(AliHBTTwoPairFctn2D,1)
 };
 
 

diff --git a/HBTAN/AliHBTQResolutionFctns.cxx b/HBTAN/AliHBTQResolutionFctns.cxx
index 1e049553dada6ac7195b38c9b7603ac0eaa0f62f..4e0727ef9ac18d0f116ce98abc96f9a3217a0364 100644 (file)
--- a/HBTAN/AliHBTQResolutionFctns.cxx
+++ b/HBTAN/AliHBTQResolutionFctns.cxx
@@ -9,7 +9,7 @@ ClassImp( AliHBTQOutResolVSQInvFctn )
 AliHBTQOutResolVSQInvFctn::
 AliHBTQOutResolVSQInvFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                           Int_t nYbins, Double_t maxYval, Double_t minYval):
-                AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QOutResolVSQInv","Q_{Out} Resolution vs. Q_{Inv}");
 }
@@ -22,7 +22,7 @@ ClassImp( AliHBTQSideResolVSQInvFctn )
 AliHBTQSideResolVSQInvFctn::
 AliHBTQSideResolVSQInvFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                           Int_t nYbins, Double_t maxYval, Double_t minYval):
-                AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QSideResolVSQInv","Q_{Side} Resolution vs. Q_{Inv}");
 }
@@ -36,7 +36,7 @@ ClassImp( AliHBTQLongResolVSQInvFctn )
 AliHBTQLongResolVSQInvFctn::
 AliHBTQLongResolVSQInvFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QLongResolVSQInv","Q_{Long} Resolution vs. Q_{Inv}");
 }
@@ -50,7 +50,7 @@ ClassImp( AliHBTQInvResolVSKtFctn )
 AliHBTQInvResolVSKtFctn::
 AliHBTQInvResolVSKtFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                         Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QInvResolVSKt","Q_{Inv} Resolution vs. K_{t}");
 }
@@ -63,7 +63,7 @@ ClassImp( AliHBTQOutResolVSKtFctn )
 AliHBTQOutResolVSKtFctn::
 AliHBTQOutResolVSKtFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QOutResolVSKt","Q_{Out} Resolution vs. K_{t} ");
 }
@@ -77,7 +77,7 @@ ClassImp( AliHBTQSideResolVSKtFctn )
 AliHBTQSideResolVSKtFctn::
 AliHBTQSideResolVSKtFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QSideResolVSKt","Q_{Side} Resolution vs. K_{t} ");
 }
@@ -90,7 +90,7 @@ ClassImp( AliHBTQLongResolVSKtFctn )
 AliHBTQLongResolVSKtFctn::
 AliHBTQLongResolVSKtFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QLongResolVSKt","Q_{Long} Resolution vs. K_{t} ");
 }
@@ -104,7 +104,7 @@ ClassImp( AliHBTQOutResolVSQOutFctn)
 AliHBTQOutResolVSQOutFctn::
 AliHBTQOutResolVSQOutFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QOutResolVSQOut","Q_{Out} Resolution vs. Q_{Out} ");
 }
@@ -117,7 +117,7 @@ ClassImp( AliHBTQSideResolVSQSideFctn )
 AliHBTQSideResolVSQSideFctn::
 AliHBTQSideResolVSQSideFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QSideResolVSQSide","Q_{Side} Resolution vs. Q_{Side} ");
 }
@@ -130,7 +130,7 @@ ClassImp( AliHBTQLongResolVSQLongFctn )
 AliHBTQLongResolVSQLongFctn::
 AliHBTQLongResolVSQLongFctn(Int_t nXbins, Double_t maxXval, Double_t minXval, 
                            Int_t nYbins, Double_t maxYval, Double_t minYval):
-                           AliHBTFourPartFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
+                           AliHBTTwoPairFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval)
 {
  Rename("QLongResolVSQLong","Q_{Long} Resolution vs. Q_{Long} ");
 }

diff --git a/HBTAN/AliHBTQResolutionFctns.h b/HBTAN/AliHBTQResolutionFctns.h
index 2238a771265f9b42a003c539ba526a7f029c4a49..3c39498b252a8fd8a812b5023e91bd05ce99c7b0 100644 (file)
--- a/HBTAN/AliHBTQResolutionFctns.h
+++ b/HBTAN/AliHBTQResolutionFctns.h
@@ -8,7 +8,7 @@
 //this class creates resolution function of Qout 
 //(difference of simulated pair Qout and recontructed pair)
 //in function of QInv
-//it inherits from AliHBTFourPartFctn2D
+//it inherits from AliHBTTwoPairFctn2D
 //  it needs two pairs to compare
 //  and is two dimentional: numerator and denominator are TH2D
 
@@ -29,7 +29,7 @@ class AliHBTQLongResolVSQLongFctn;//QLongCMSLC Res   VS   QLong
 #include "AliHBTFunction.h"
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQOutResolVSQInvFctn: public AliHBTFourPartFctn2D
+class AliHBTQOutResolVSQInvFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQOutResolVSQInvFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -51,7 +51,7 @@ class AliHBTQOutResolVSQInvFctn: public AliHBTFourPartFctn2D
 
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQSideResolVSQInvFctn: public AliHBTFourPartFctn2D
+class AliHBTQSideResolVSQInvFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQSideResolVSQInvFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -72,7 +72,7 @@ class AliHBTQSideResolVSQInvFctn: public AliHBTFourPartFctn2D
 
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQLongResolVSQInvFctn: public AliHBTFourPartFctn2D
+class AliHBTQLongResolVSQInvFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQLongResolVSQInvFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -93,7 +93,7 @@ class AliHBTQLongResolVSQInvFctn: public AliHBTFourPartFctn2D
 
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQInvResolVSKtFctn: public AliHBTFourPartFctn2D
+class AliHBTQInvResolVSKtFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQInvResolVSKtFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -113,7 +113,7 @@ class AliHBTQInvResolVSKtFctn: public AliHBTFourPartFctn2D
  };
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQOutResolVSKtFctn: public AliHBTFourPartFctn2D
+class AliHBTQOutResolVSKtFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQOutResolVSKtFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -132,7 +132,7 @@ class AliHBTQOutResolVSKtFctn: public AliHBTFourPartFctn2D
  };
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQSideResolVSKtFctn: public AliHBTFourPartFctn2D
+class AliHBTQSideResolVSKtFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQSideResolVSKtFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -151,7 +151,7 @@ class AliHBTQSideResolVSKtFctn: public AliHBTFourPartFctn2D
  };
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQLongResolVSKtFctn: public AliHBTFourPartFctn2D
+class AliHBTQLongResolVSKtFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQLongResolVSKtFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -171,7 +171,7 @@ class AliHBTQLongResolVSKtFctn: public AliHBTFourPartFctn2D
  };
 /***********************************************************************/
 /***********************************************************************/
-class AliHBTQOutResolVSQOutFctn: public AliHBTFourPartFctn2D
+class AliHBTQOutResolVSQOutFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQOutResolVSQOutFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -193,7 +193,7 @@ class AliHBTQOutResolVSQOutFctn: public AliHBTFourPartFctn2D
 /***********************************************************************/
 /***********************************************************************/
 
-class AliHBTQSideResolVSQSideFctn: public AliHBTFourPartFctn2D
+class AliHBTQSideResolVSQSideFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQSideResolVSQSideFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
@@ -216,7 +216,7 @@ class AliHBTQSideResolVSQSideFctn: public AliHBTFourPartFctn2D
 /***********************************************************************/
 /***********************************************************************/
 
-class AliHBTQLongResolVSQLongFctn: public AliHBTFourPartFctn2D
+class AliHBTQLongResolVSQLongFctn: public AliHBTTwoPairFctn2D
  {
   public: 
    AliHBTQLongResolVSQLongFctn(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0,