Changeset 278 in svn for trunk

Timestamp:

Feb 20, 2009, 8:32:58 PM (15 years ago)

Author:

severine ovyn

Message:

TRootParticle TrootTracks

Location:

trunk/Utilities/ExRootAnalysis

Files:

• interface/BlockClasses.h (modified) (2 diffs)
• src/BlockClasses.cc (modified) (1 diff)

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -289 +289 @@
 //---------------------------------------------------------------------------
 
-class TRootTracks : public TSortableObject {
+class TRootTracks : public TRootParticle {
  public:
     TRootTracks(); // needed for storage in ExRootAnalysis
@@ -297 +297 @@
     void Set(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt);
     const TLorentzVector GetFourVector() const;
-    const float getEta() const {return Eta;}
-    const float getPhi() const {return Phi;}
-    const float getEtaOuter() const {return EtaOuter;}
-    const float getPhiOuter() const {return PhiOuter;}
+   // const float getEta() const {return Eta;}
+   // const float getPhi() const {return Phi;}
+   // const float getEtaOuter() const {return EtaOuter;}
+   // const float getPhiOuter() const {return PhiOuter;}
 
     static TCompare *fgCompare; //!
-    const TCompare *GetCompare() const { return fgCompare; }
-
-    float Eta, Phi; // (eta,phi) at the beginning of the track
+    //const TCompare *GetCompare() const { return fgCompare; }
+
+//    float Eta, Phi; // (eta,phi) at the beginning of the track
     float EtaOuter, PhiOuter; // (eta,phi) at the end of the track
-    float PT, E, Px, Py, Pz;  // transverse momentum
+//    float PT, E, Px, Py, Pz;  // transverse momentum
  ClassDef(TRootTracks, 1)
 };

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -131 +131 @@
 
 TRootTracks::TRootTracks() :
-        Eta(UNDEFINED), Phi(UNDEFINED), EtaOuter(UNDEFINED), PhiOuter(UNDEFINED), 
-        PT(UNDEFINED), E(UNDEFINED), Px(UNDEFINED), Py(UNDEFINED), Pz(UNDEFINED) {}
+        TRootParticle(),
+        EtaOuter(UNDEFINED), PhiOuter(UNDEFINED) {}
+/*        Eta = UNDEFINED;
+        Phi = UNDEFINED;
+        PT = UNDEFINED;
+        E = UNDEFINED;
+        Px = UNDEFINED;
+        Py = UNDEFINED;
+        Pz = UNDEFINED; 
+
+}*/
 
 TRootTracks::TRootTracks(const float inEta, const float inPhi, const float outEta, const float outPhi, const float pt) :
-        Eta(inEta), Phi(inPhi), EtaOuter(outEta), PhiOuter(outPhi), 
-        PT(pt) {
+        EtaOuter(outEta), PhiOuter(outPhi) {
+        Eta = inEta;
+        Phi = inPhi;
+        PT = pt;
         TLorentzVector p; p.SetPtEtaPhiE(PT,Eta,Phi,PT*cosh(Eta));
         Px = p.Px(); Py = p.Py(); Pz = p.Pz();  E=p.E();
 }
 TRootTracks::TRootTracks(const TRootTracks& track) :
-        Eta(track.Eta), Phi(track.Phi), 
-        EtaOuter(track.EtaOuter), PhiOuter(track.PhiOuter), 
-        PT(track.PT), E(track.E), Px(track.Px), Py(track.Py), Pz(track.Pz) {}
+        EtaOuter(track.EtaOuter), PhiOuter(track.PhiOuter)
+        {
+          Eta = track.Eta;
+          Phi = track.Phi;
+          PT = track.PT;
+          E = track.E;
+          Px = track.Px;
+          Py = track.Py;
+          Pz = track.Pz;
+        }
 
 TRootTracks& TRootTracks::operator=(const TRootTracks& track) {