Changeset 267 in svn for trunk/Utilities/ExRootAnalysis/interface

Timestamp:

Feb 13, 2009, 8:38:04 PM (16 years ago)

Author:

severine ovyn

Message:

remove double

File:

• trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h (modified) (4 diffs)

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -13 +13 @@
  *  present in the data members of the Block TRoot class.
  *
- *  $Date: 2009-02-11 09:19:14 $
- *  $Revision: 1.12 $
+ *  $Date: 2009-02-13 19:38:03 $
+ *  $Revision: 1.13 $
  *
  *  
@@ -312 +312 @@
 */
 
-//class TRootCalo: public TSortableObject {
-class TRootCalo: public TRootParticle {
+class TRootCalo: public TSortableObject 
+{
+//class TRootCalo: public TRootParticle {
  public:
+   float Eta;
+   float Phi;
+   float E;
    TRootCalo() ;
    TRootCalo(const TRootCalo& cal);
@@ -320 +324 @@
    void set(const D_CaloTower&  cal);
    static TCompare *fgCompare; //!
- //  const TCompare *GetCompare() const { return fgCompare; }
+   const TCompare *GetCompare() const { return fgCompare; }
    const float getET() const {return ET;}
  
@@ -345 +349 @@
 //---------------------------------------------------------------------------
 
-class TRootJet: public TRootParticle
+class TRootTauJet: public TSortableObject
+{
+public:
+  TRootTauJet() {};
+
+  float E;  // particle energy in GeV
+  float Px; // particle momentum vector (x component) in GeV
+  float Py; // particle momentum vector (y component) in GeV
+  float Pz; // particle momentum vector (z component) in GeV
+
+  float Eta; // particle pseudorapidity  
+  float Phi; // particle azimuthal angle in rad 
+
+  void Set(const TLorentzVector& momentum);// { return TRootParticle::Set(momentum); }
+
+  static TCompare *fgCompare; //!
+  const TCompare *GetCompare() const { return fgCompare; }
+  
+  float PT; // particle transverse momentum in GeV
+
+  ClassDef(TRootTauJet, 1)
+};
+
+//---------------------------------------------------------------------------
+
+class TRootJet: public TRootTauJet
 {
 public:
   TRootJet() {};
+
+  static TCompare *fgCompare; //!
+
   bool Btag;
 
-  static TCompare *fgCompare; //!
-  
   ClassDef(TRootJet, 1)
 };
 
-//---------------------------------------------------------------------------
-
-class TRootTauJet: public TRootParticle
-{
-public:
-  TRootTauJet() {};
-  static TCompare *fgCompare; //!
-
-  ClassDef(TRootTauJet, 1)
-};
+//------------------------------------------------------------------------------
 
 class TRootTrigger: public TSortableObject