Code causing warning messages corrected.

[u/mrichter/AliRoot.git] / EVGEN / AliGenHaloProtvino.cxx

diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx
index c5e14d2fb657ceef0151bef368613b4bdc071b87..843865e5d0c8e546c333fd1c295a80c2e13c3051 100644 (file)
--- a/EVGEN/AliGenHaloProtvino.cxx
+++ b/EVGEN/AliGenHaloProtvino.cxx
@@ -13,40 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.9  2002/05/28 13:49:17  morsch
-- Udates for new pressure table
-- calculate time
-- first provisions for real events.
-
-Revision 1.8  2002/03/22 13:00:25  morsch
-Initialize sum to 0. (Jiri Chudoba).
-
-Revision 1.7  2002/02/21 16:09:45  morsch
-Move SetHighwaterMark() after last possible SetTrack()
-
-Revision 1.6  2002/02/01 15:28:22  morsch
-Fastidious print statements removed.
-
-Revision 1.5  2002/02/01 14:12:28  morsch
-Include new gas pressure estimates (LHC Pproject Note 273)
-
-Revision 1.4  2001/12/19 16:30:24  morsch
-Some bugs corrected and skip method added. (Rachid Guernane)
-
-Revision 1.3  2001/07/27 17:09:36  morsch
-Use local SetTrack, KeepTrack and SetHighWaterMark methods
-to delegate either to local stack or to stack owned by AliRun.
-(Piotr Skowronski, A.M.)
-
-Revision 1.2  2001/06/14 12:15:27  morsch
-Bugs corrected. SetSide() method added.
-
-Revision 1.1  2001/01/23 15:04:33  morsch
-Generator to read beam halo file from Protvino group.
-
-*/
+/* $Id$ */
 
 // Read background particles from a boundary source
 // Very specialized generator to simulate background from beam halo.
@@ -54,18 +21,19 @@ Generator to read beam halo file from Protvino group.
 // for this purpose.
 // Author: andreas.morsch@cern.ch
 
-#include "AliGenHaloProtvino.h"
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliPDG.h"
+#include <stdlib.h>
 
 #include <TDatabasePDG.h>
+#include <TPDGCode.h>
 #include <TSystem.h>
-#include <stdlib.h>
 
- ClassImp(AliGenHaloProtvino)
-     AliGenHaloProtvino::AliGenHaloProtvino()
-        :AliGenerator(-1)
+#include "AliGenHaloProtvino.h"
+#include "AliRun.h"
+
+ClassImp(AliGenHaloProtvino)
+
+AliGenHaloProtvino::AliGenHaloProtvino()
+    :AliGenerator(-1)
 {
 // Constructor
     
@@ -98,9 +66,11 @@ AliGenHaloProtvino::AliGenHaloProtvino(Int_t npart)
     SetAnalog(0);
 }
 
-AliGenHaloProtvino::AliGenHaloProtvino(const AliGenHaloProtvino & HaloProtvino)
+AliGenHaloProtvino::AliGenHaloProtvino(const AliGenHaloProtvino & HaloProtvino):
+    AliGenerator(HaloProtvino)
 {
-// copy constructor
+// Copy constructor
+    HaloProtvino.Copy(*this);
 }
 
 
@@ -308,9 +278,9 @@ void AliGenHaloProtvino::Generate()
       if (!fAnalog || gRandom->Rndm() < fParentWeight) {
 //    Pass parent particle
 //
-         SetTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
+         PushTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
          KeepTrack(ntP);
-         SetTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
+         PushTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
       }
 
       //
@@ -323,9 +293,9 @@ void AliGenHaloProtvino::Generate()
              origin[2]  = -origin[2];
              originP[2] = -originP[2];
              p[2]=-p[2];
-             SetTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
+             PushTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
              KeepTrack(ntP);
-             SetTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
+             PushTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
          }
       }
       SetHighWaterMark(nt);
@@ -345,6 +315,7 @@ void AliGenHaloProtvino::Generate()
 AliGenHaloProtvino& AliGenHaloProtvino::operator=(const  AliGenHaloProtvino& rhs)
 {
 // Assignment operator
+    rhs.Copy(*this);
     return *this;
 }
 
@@ -385,6 +356,15 @@ Float_t AliGenHaloProtvino::GassPressureWeight(Float_t zPrimary)
     return weight;
 }
 
+void AliGenHaloProtvino::Copy(AliGenHaloProtvino&) const
+{
+    //
+    // Copy 
+    //
+    Fatal("Copy","Not implemented!\n");
+}
+
+
 /*
 # Title:    README file for the sources of IR8 machine induced background
 # Author:   Vadim Talanov <Vadim.Talanov@cern.ch>