Changeset 1357 for trunk/WuerzburgSoft/Thomas/mphys/MParticle.h

Timestamp:

06/12/02 14:34:27 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/WuerzburgSoft/Thomas/mphys/MParticle.h (modified) (4 diffs)

trunk/WuerzburgSoft/Thomas/mphys/MParticle.h

@@ -2 +2 @@
 #define MARS_MParticle
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef ROOT_TObject
+#include <TObject.h>
 #endif
 
-class MParticle : public MParContainer
+/*
+ #ifndef MARS_MParContainer
+ #include "MParContainer.h"
+ #endif
+ */
+
+class MParticle : public TObject
 {
 public:
@@ -16 +22 @@
 protected:
     Double_t fEnergy; // [GeV] Energy
-//    Double_t fBeta;   // [1]   beta
 
     Double_t fZ;      // [1]   Red shift
@@ -27 +32 @@
 public:
     MParticle(ParticleType_t t, const char *name=NULL, const char *title=NULL);
-     //    ~MParticle();
+
+    static Double_t ZofR(Double_t *x, Double_t *k=NULL);
+    static Double_t RofZ(Double_t *x, Double_t *k=NULL);
 
     void operator=(MParticle &p)
@@ -38 +45 @@
     }
 
-    static Double_t MParticle::ZofR(Double_t *x, Double_t *k=NULL);
-    static Double_t MParticle::RofZ(Double_t *x, Double_t *k=NULL);
-
-    //    void Fill(const MParContainer *inp);
-
-    //    void Draw(Option_t *opt=NULL);
     virtual Double_t GetInteractionLength() const = 0;
 
     void SetEnergy(Double_t e) { fEnergy = e; }
-  //  void SetBeta(Double_t b)   { fBeta = b; }
-
     void SetZ(Double_t z)      { fZ = z; }
-    /*
-     void SetPhi(Double_t p)    { fPhi = p; }
-     void SetR(Double_t r)      { fR = r; }
-     void SetTheta(Double_t t)  { fTheta = t; }
-     void SetPsi(Double_t p)    { fPsi = p; }
-     */
 
     void SetNewDirection(Double_t theta, Double_t phi);