Back to previus version

diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx
index 04e2806a84ca24d59d09db0fbd87c43948dcbc6f..1107ab561749672291f5b70d2e5f66c862b0314c 100644 (file)
--- a/HBTAN/AliHBTFunction.cxx
+++ b/HBTAN/AliHBTFunction.cxx
@@ -32,13 +32,8 @@ ClassImp( AliHBTFunction )
 
 AliHBTFunction::AliHBTFunction()
 {
-  fPairCut = new AliHBTEmptyPairCut(); //dummy cut
-}
-/******************************************************************/
-AliHBTFunction::AliHBTFunction(const char* name,const char* title)
-{
-  fPairCut = new AliHBTEmptyPairCut(); //dummy cut
-  Rename(name,title);
+ 
+ fPairCut = new AliHBTEmptyPairCut(); //dummy cut
 }
 /******************************************************************/
 
@@ -355,70 +350,14 @@ AliHBTOnePairFctn3D(Int_t nXbins, Double_t maxXval, Double_t minXval,
    fDenominator->Sumw2();
 
 }        
-/******************************************************************/
-
-AliHBTOnePairFctn3D::~AliHBTOnePairFctn3D()
-{
-  delete fNumerator;
-  delete fDenominator;
-}
-/******************************************************************/
-
 
-/******************************************************************/
-/******************************************************************/
-/******************************************************************/
-ClassImp( AliHBTTwoPairFctn1D)
 
-AliHBTTwoPairFctn1D::
-AliHBTTwoPairFctn1D(Int_t nbins, Double_t maxval, Double_t minval)
- {
-   TString numstr = fName + " Numerator";  //title and name of the 
-                                           //numerator histogram
-   TString denstr = fName + " Denominator";//title and name of the 
-                                           //denominator histogram
-         
-   fNumerator   = new TH1D(numstr.Data(),numstr.Data(),
-                           nbins,minval,maxval);
-              
-   fDenominator = new TH1D(denstr.Data(),denstr.Data(),
-                           nbins,minval,maxval);
-   
-   fNumerator->Sumw2();
-   fDenominator->Sumw2();
- }
-
-/******************************************************************/
-AliHBTTwoPairFctn1D::~AliHBTTwoPairFctn1D()
+AliHBTOnePairFctn3D::~AliHBTOnePairFctn3D()
 {
   delete fNumerator;
   delete fDenominator;
 }
-void AliHBTTwoPairFctn1D::
-ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
-{
-  partpair  = CheckPair(partpair);
-  trackpair = CheckPair(trackpair);
-  if( partpair && trackpair) 
-   { 
-     Double_t x = GetValue(trackpair,partpair);
-     fNumerator->Fill(x);
-   }
-}
-/******************************************************************/
 
-void AliHBTTwoPairFctn1D::
-ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
-{
-  partpair  = CheckPair(partpair);
-  trackpair = CheckPair(trackpair);
-  if( partpair && trackpair)
-   { 
-     Double_t x = GetValue(trackpair,partpair);
-     fDenominator->Fill(x);
-   }
-
-}
 
 /******************************************************************/
 /******************************************************************/
@@ -480,7 +419,3 @@ ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 
 }
 
-/******************************************************************/
-/******************************************************************/
-/******************************************************************/
-ClassImp(AliHBTTwoPairFctn3D)

diff --git a/HBTAN/AliHBTFunction.h b/HBTAN/AliHBTFunction.h
index 44140565d455c74fd60c29fced4f0aa3847ba6e0..c411c7ebfaeecd648ec05a7bdb705a8f73da298c 100644 (file)
--- a/HBTAN/AliHBTFunction.h
+++ b/HBTAN/AliHBTFunction.h
@@ -10,15 +10,15 @@
 #include <TH2.h>
 #include <TH3.h>
 
-
+ 
 class AliHBTAnalysis;
 
 class AliHBTFunction: public TNamed
 //Abstract base class for HBT functions
+//
 {
   public:
     AliHBTFunction();
-    AliHBTFunction(const char* name,const char* title);
     virtual ~AliHBTFunction();
     
     virtual TH1* GetNumerator() =0;
@@ -180,29 +180,6 @@ class AliHBTOnePairFctn3D: public AliHBTOnePairFctn
 /******************************************************************/
 /******************************************************************/
 
-class AliHBTTwoPairFctn1D: public AliHBTTwoPairFctn
-{
- public:
-  AliHBTTwoPairFctn1D(Int_t nbins = 200, Double_t maxval = 1.5, Double_t minval = 0.0);
-  AliHBTTwoPairFctn1D(const char*,const char*,
-                      Int_t nbins = 200, Double_t maxval = 1.5, Double_t minval = 0.0);
-  ~AliHBTTwoPairFctn1D();
-  
-  TH1* GetNumerator(){return fNumerator;}
-  TH1* GetDenominator(){return fDenominator;}
-  
-  void ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-  void ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
- 
- protected:
-  virtual Double_t GetValue(AliHBTPair* trackpair, AliHBTPair* partpair) = 0;
-
-  TH1D* fNumerator;
-  TH1D* fDenominator;
-  
- public:
-  ClassDef(AliHBTTwoPairFctn1D,1)
-};
 
 
 /******************************************************************/
@@ -213,7 +190,7 @@ class AliHBTTwoPairFctn2D: public AliHBTTwoPairFctn
  public:
   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);
-  virtual ~AliHBTTwoPairFctn2D();
+  ~AliHBTTwoPairFctn2D();
   
   TH1* GetNumerator(){return fNumerator;}
   TH1* GetDenominator(){return fDenominator;}
@@ -236,30 +213,6 @@ class AliHBTTwoPairFctn2D: public AliHBTTwoPairFctn
 /******************************************************************/
 /******************************************************************/
 /******************************************************************/
-class AliHBTTwoPairFctn3D: public AliHBTTwoPairFctn
-{
- public:
-  AliHBTTwoPairFctn3D(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 ~AliHBTTwoPairFctn3D(){}
-  
-  TH1* GetNumerator(){return fNumerator;}
-  TH1* GetDenominator(){return fDenominator;}
-  
-  void ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair){}
-  void ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair){}
- 
-  
- protected:
-  virtual void GetValues(AliHBTPair*,AliHBTPair*, Double_t&, Double_t&,Double_t&) = 0;
-
-  TH3D* fNumerator;
-  TH3D* fDenominator;
-  
- public:
-  ClassDef(AliHBTTwoPairFctn3D,1)
-};
 
 /******************************************************************/
 /******************************************************************/

diff --git a/HBTAN/HBTAnalysisLinkDef.h b/HBTAN/HBTAnalysisLinkDef.h
index 687101a817968ff65d3591ae9af4104ef910b4a8..856e763c473f6a6e61b41cd158f11363ceb87f85 100644 (file)
--- a/HBTAN/HBTAnalysisLinkDef.h
+++ b/HBTAN/HBTAnalysisLinkDef.h
@@ -9,14 +9,12 @@
 #pragma link C++ class AliHBTEvent+;
 #pragma link C++ class AliHBTRun+;
 #pragma link C++ class AliHBTFunction+;
-
 #pragma link C++ class AliHBTOnePairFctn+;
 #pragma link C++ class AliHBTTwoPairFctn+;
 #pragma link C++ class AliHBTOnePairFctn1D+;
 #pragma link C++ class AliHBTOnePairFctn2D+;
 #pragma link C++ class AliHBTOnePairFctn3D+;
 
-#pragma link C++ class AliHBTTwoPairFctn1D+;
 #pragma link C++ class AliHBTTwoPairFctn2D+;
 
 #pragma link C++ class AliHBTPair+;
@@ -70,9 +68,6 @@
 #pragma link C++ class AliHBTQSideResolVSQSideFctn+;
 #pragma link C++ class AliHBTQLongResolVSQLongFctn+;
 
-#pragma link C++ class AliTwoTrackEff+;
-#pragma link C++ class AliTwoTrackEff3D+;
-
 //#pragma link C++ class Xqinv+;
 //#pragma link C++ class Xqout+;
 //#pragma link C++ class Xqside+;

diff --git a/HBTAN/Makefile b/HBTAN/Makefile
index ae5a436a3c3a9253919d8a8c44ab7b8fea06ef02..9e8cfe2a4dba03f88151a8cbac2331bc29f3ef5d 100644 (file)
--- a/HBTAN/Makefile
+++ b/HBTAN/Makefile
@@ -19,8 +19,7 @@ SRCS          = AliHBTAnalysis.cxx AliHBTFunction.cxx \
                 AliHBTReader.cxx AliHBTReaderTPC.cxx\
                 AliHBTQResolutionFctns.cxx AliHBTReaderPPprod.cxx\
                AliHBTReaderITSv1.cxx AliHBTReaderITSv2.cxx\
-               AliHBTReaderKineTree.cxx\
-               AliTwoTrackEff.cxx
+               AliHBTReaderKineTree.cxx
 
 # Fortran sources
 

diff --git a/HBTAN/libHBTAN.pkg b/HBTAN/libHBTAN.pkg
index b04f55ef818e065c31db4334fb8c31cba331b176..672d081f09076a10d8bea7c2e86fc0f51ba8240c 100644 (file)
--- a/HBTAN/libHBTAN.pkg
+++ b/HBTAN/libHBTAN.pkg
@@ -3,8 +3,7 @@ AliHBTAnalysis.cxx    AliHBTPair.cxx         AliHBTQResolutionFctns.cxx  AliHBTR
 AliHBTCorrelFctn.cxx  AliHBTPairCut.cxx      AliHBTReader.cxx            AliHBTReaderTPC.cxx\
 AliHBTEvent.cxx       AliHBTParticle.cxx     AliHBTRun.cxx\
 AliHBTFunction.cxx    AliHBTParticleCut.cxx  \
-AliHBTReaderITSv1.cxx AliHBTReaderITSv2.cxx AliHBTReaderKineTree.cxx\
-AliTwoTrackEff.cxx
+AliHBTReaderITSv1.cxx AliHBTReaderITSv2.cxx AliHBTReaderKineTree.cxx
 
 
 HDRS:= $(SRCS:.cxx=.h)