X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenExtFile.h;h=b0c9786ed9d723154dbe2eef175b7f91e85aac18;hb=f58d19bbacfa48c3af8fca9022757680d0a18810;hp=dc1579a96e599cfcce41c8f70473d0a44c11a1f5;hpb=3da306186bdfe9b8dedf54c4b9cdcf2bff5b132c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenExtFile.h b/EVGEN/AliGenExtFile.h
index dc1579a96e5..b0c9786ed9d 100644
--- a/EVGEN/AliGenExtFile.h
+++ b/EVGEN/AliGenExtFile.h
@@ -1,53 +1,40 @@
-#ifndef AliGenExtFile_H
-#define AliGenExtFile_H
+#ifndef ALIGENEXTFILE_H
+#define ALIGENEXTFILE_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
 
-/////////////////////////////////////////////////////////
-//  Manager and hits classes for set:MUON version 0    //
-/////////////////////////////////////////////////////////
-#include "AliGenerator.h"
-#include "TNamed.h"
-#include "TF1.h"
-#include "TArrayF.h"
-#include "TTree.h"
 
-// Read background particles from a FLUKA boundary source file
+// Event generator that can read the old ALICE event format based on CW-ntuples
+// http://consult.cern.ch/alice/Internal_Notes/1995/32/abstract
+// Author: andreas.morsch@cern.ch
 
-class AliGenExtFile : public AliGenerator
+#include "AliGenMC.h"
+#include "AliGenReader.h"
+
+class TTree;
+
+class AliGenExtFile : public AliGenMC
 {
- 
-protected:
-  const Text_t     *fFileName;         //! Choose the file
-  Int_t           fNcurrent;           // points to the next entry
-  TTree           *fTreeNtuple;        // pointer to the TTree
-//Declaration of variables read from the file -- TTree type
-  //Declaration of leaves types
-   Int_t           Nihead;
-   Int_t           Ihead[12];
-   Int_t           Nrhead;
-   Float_t         Rhead[6];
-   UInt_t          Idpart;
-   Float_t         Theta;
-   Float_t         Phi;
-   Float_t         P;
-   Float_t         E;
-public:
-   AliGenExtFile();
-  AliGenExtFile(Int_t npart);
-  virtual ~AliGenExtFile();
-  // Initialise 
-  virtual void Init() {}
-  // Initialise fluka data 
-  virtual void NtupleInit();
-  // set file name of data file
-  virtual void SetFileName(const Text_t *filname) {fFileName=filname;}
-  // generate event
-  virtual void Generate();
-
-  ClassDef(AliGenExtFile,1) //Boundary source
+ public:
+    AliGenExtFile();
+    AliGenExtFile(Int_t npart);
+    AliGenExtFile(const AliGenExtFile &ext);
+    virtual ~AliGenExtFile();
+    // Initialise 
+    virtual void Init();
+    // generate event
+    virtual void Generate();
+    AliGenExtFile & operator=(const AliGenExtFile & rhs);
+    void SetReader(AliGenReader* reader) {fReader = reader;}
+ protected:
+    void CdEventFile();
+    void Copy(TObject&) const;
+    const Text_t     *fFileName;      //! File to read from
+    AliGenReader     *fReader;        //! Reader to read the file
+    
+  ClassDef(AliGenExtFile,1) //Generate particles from external file
 };
 #endif