X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenHBTosl.cxx;h=50695409f233ff0d9125151bfce33243ef29497e;hb=05658a4f116c7f2fada5dee5f6e1f8166e793b5d;hp=cc78e5a09b7e89683b0dc9fa4eed222f1bacfc2f;hpb=e087ab36d56da6d6242b84a77e0a73a1c22855d7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenHBTosl.cxx b/EVGEN/AliGenHBTosl.cxx
index cc78e5a09b7..50695409f23 100644
--- a/EVGEN/AliGenHBTosl.cxx
+++ b/EVGEN/AliGenHBTosl.cxx
@@ -100,9 +100,11 @@ AliGenHBTosl::AliGenHBTosl():
  fQRange(0.06),
  fQNBins(60),
  fGenerator(0x0),
+ fStackBuffer(0),
  fBufferSize(5),
  fNBinsToScale(Int_t(fQNBins*0.1)),
  fDebug(0),
+ fSignalShapeCreated(0),
  fMaxIterations(1000),
  fMaxChiSquereChange(0.01),
  fMaxChiSquerePerNDF(1.5), 
@@ -112,6 +114,7 @@ AliGenHBTosl::AliGenHBTosl():
  fSamplePhiMax(TMath::TwoPi()+0.01),
  fSignalRegion(0.0),
  fMinFill(1000),
+ fSwapped(0),
  fLogFile(0x0)
 {
 //default constructor
@@ -129,6 +132,7 @@ AliGenHBTosl::AliGenHBTosl(Int_t n, Int_t pid):
  fQRange(0.06),
  fQNBins(60),
  fGenerator(0x0),
+ fStackBuffer(0),
  fBufferSize(5),
  fNBinsToScale(Int_t(fQNBins*0.1)),
  fDebug(0),
@@ -142,10 +146,43 @@ AliGenHBTosl::AliGenHBTosl(Int_t n, Int_t pid):
  fSamplePhiMax(TMath::TwoPi()+0.01),
  fSignalRegion(0.0),
  fMinFill(1000),
+ fSwapped(0),
  fLogFile(0x0)
 {
 //default constructor
 }
+
+AliGenHBTosl::AliGenHBTosl(const AliGenHBTosl & hbt):
+ AliGenerator(-1),
+ fQCoarseBackground(0x0),
+ fQCoarseSignal(0x0),
+ fQSignal(0x0),
+ fQBackground(0x0),
+ fQSecondSignal(0x0),
+ fQSecondBackground(0x0),
+ fQRange(0.06),
+ fQNBins(60),
+ fGenerator(0x0),
+ fStackBuffer(0),
+ fBufferSize(5),
+ fNBinsToScale(Int_t(fQNBins*0.1)),
+ fDebug(0),
+ fSignalShapeCreated(kFALSE),
+ fMaxIterations(1000),
+ fMaxChiSquereChange(0.01),
+ fMaxChiSquerePerNDF(1.5),
+ fQRadius(8.0),
+ fPID(kPiPlus),
+ fSamplePhiMin(-0.01),
+ fSamplePhiMax(TMath::TwoPi()+0.01),
+ fSignalRegion(0.0),
+ fMinFill(1000),
+ fSwapped(0),
+ fLogFile(0x0)
+{
+// Copy constructor
+    hbt.Copy(*this);
+}
 /***********************************************************/
 
 AliGenHBTosl::~AliGenHBTosl()
@@ -336,7 +373,7 @@ void AliGenHBTosl::Generate()
   }
  
  fGenerator->Generate();
- Int_t j = 0, ntr = 0;
+ Int_t ntr = 0;
  if ( genstack->GetNtrack() < fNpart/2)
   {
     Warning("Generate","************************************************************");
@@ -491,9 +528,11 @@ void AliGenHBTosl::Generate()
      qlong = gRandom->Uniform(qlongc-binwdh, qlongc+binwdh);
 
      TParticle* first = 0;
-     while (j < genstack->GetNtrack())
+     Int_t jj = 0;
+     
+     while (jj < genstack->GetNtrack())
       {
-        TParticle* tmpp = genstack->Particle(j++);
+        TParticle* tmpp = genstack->Particle(jj++);
         if (tmpp->GetPdgCode() == fPID)
          {
            if (CheckParticle(tmpp,0x0,stack) == kFALSE)
@@ -1253,7 +1292,7 @@ void AliGenHBTosl::StartSignalPass1()
     
     for (Int_t k = 1; k<=fQNBins; k++)
       {
-       for (Int_t j = 1; j<=fQNBins; j++)
+       for (j = 1; j<=fQNBins; j++)
          {  
            for (Int_t i = 1; i<=fQNBins; i++)
              {
@@ -1526,7 +1565,7 @@ void  AliGenHBTosl::GetQOutQSideQLong(TParticle* f, TParticle* s,Double_t& out,
   }
 
  Double_t beta = pzsum/esum;
- Double_t gamma = 1.0/TMath::Sqrt(1.0 - beta*beta);
+ Double_t gamma = 1.0/TMath::Sqrt((1.-beta)*(1.+beta));
 
  lon = gamma * ( pzdiff - beta*ediff );
 
@@ -1556,8 +1595,8 @@ Double_t AliGenHBTosl::Scale(TH3D* num, TH3D* den)
 
   if(fNBinsToScale < 1)
    {
+    AliError("Number of bins for scaling is smaller than 1");
     return 0.0;
-    AliError("Number of bins for scaling is smaller thnan 1");
    }
   Int_t fNBinsToScaleX = fNBinsToScale;
   Int_t fNBinsToScaleY = fNBinsToScale;
@@ -1834,7 +1873,7 @@ Bool_t AliGenHBTosl::CheckParticle(TParticle* p, TParticle* aupair ,AliStack* st
 {
  //Checks if a given particle is falling into signal region with any other particle
  //already existing on stack
- return kFALSE;
+  //PH return kFALSE;
   
  if (fSignalRegion <=0) return kFALSE;
  
@@ -1898,3 +1937,20 @@ void AliGenHBTosl::SwapGeneratingHistograms()
   fSwapped = kTRUE;
   
 }
+
+AliGenHBTosl& AliGenHBTosl::operator=(const  AliGenHBTosl& rhs)
+{
+// Assignment operator
+    rhs.Copy(*this);
+    return *this;
+}
+
+void AliGenHBTosl::Copy(TObject&) const
+{
+    //
+    // Copy 
+    //
+    Fatal("Copy","Not implemented!\n");
+}
+
+