Parcourir la source

Fixed UEvent and UManager to complete previous commit.

Nikita Ermakov il y a 5 ans
Parent
commit
6f679ba7a7
3 fichiers modifiés avec 3 ajouts et 9 suppressions
  1. 2 2
      UEvent.cxx
  2. 0 7
      UEvent.h
  3. 1 0
      UManager.h

+ 2 - 2
UEvent.cxx

@@ -7,7 +7,6 @@
 #include "TClonesArray.h"
 
 // UNI headers
-#include "UParticle.h"
 #include "UEvent.h"
 
 ClassImp(UEvent);
@@ -48,12 +47,13 @@ void UEvent::print(Option_t* option) {
             << "Number of time steps       : " << fNes << std::endl
             << "Time step number           : " << fStepNr << std::endl
             << "Time of the time step (fm) : " << fStepT << std::endl
-            << "Number of particles        : " << fNpa << std::endl
             << "Comment                    :\n" << fComment << std::endl;
+#if 0
   TString opt = option;
   if(opt.Contains("all")) {
     // TODO: particle info?
   }
+#endif
   std::cout << "---------------------------------------------" << std::endl;
 }
 

+ 0 - 7
UEvent.h

@@ -11,7 +11,6 @@
 // Forward declarations
 class TString;
 class TClonesArray;
-class UParticle;
 
 //_________________
 class UEvent : public TObject {
@@ -49,10 +48,6 @@ class UEvent : public TObject {
   /// Return comment
   void comment(TString& comment) const { comment = fComment; }
 
-  Int_t    GetNpa()     const {return (Int_t)fNpa;}
-  TClonesArray* getParticleList() const {return fParticles;}
-  UParticle* getParticle(Int_t index) const;
-
   //
   // Setters
   //
@@ -104,8 +99,6 @@ class UEvent : public TObject {
   UShort_t      fStepNr;
   /// Event step time
   Float_t       fStepT;
-  /// Number of particles
-  UShort_t      fNpa;
   /// Generator-specific information
   TString       fComment;
 

+ 1 - 0
UManager.h

@@ -12,6 +12,7 @@ class TList;
 class UTask;
 class URun;
 class UEvent;
+class UParticle;
 
 //_________________
 class UManager : public TObject {