Changeset 267 in svn for trunk/Utilities/ExRootAnalysis

Timestamp:

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

Author:

severine ovyn

Message:

remove double

Location:

trunk/Utilities/ExRootAnalysis

Files:

• interface/BlockClasses.h (modified) (4 diffs)
• src/BlockClasses.cc (modified) (4 diffs)
• src/BlockClassesLinkDef.h (modified) (2 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

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -11 +11 @@
  *  to preserve mother-dautherlinks between particles.
  *
- *  $Date: 2009-02-11 09:19:14 $
- *  $Revision: 1.8 $
+ *  $Date: 2009-02-13 19:38:03 $
+ *  $Revision: 1.9 $
  *
  *  
@@ -25 +25 @@
 
 TCompare *TRootGenParticle::fgCompare = 0;
-TCompare *TRootJet::fgCompare = TComparePT<TRootJet>::Instance();
 TCompare *TRootElectron::fgCompare = TComparePT<TRootElectron>::Instance();
 TCompare *TRootMuon::fgCompare = TComparePT<TRootMuon>::Instance();
 TCompare *TRootPhoton::fgCompare = TComparePT<TRootPhoton>::Instance();
 TCompare *TRootTauJet::fgCompare = TComparePT<TRootTauJet>::Instance();
+TCompare *TRootJet::fgCompare = TComparePT<TRootJet>::Instance();
 TCompare *TRootTracks::fgCompare = TComparePT<TRootTracks>::Instance();
 TCompare *TRootETmis::fgCompare = 0;
@@ -50 +50 @@
         Eta = momentum.Eta();
         Phi = momentum.Phi();
+}
+
+void TRootTauJet::Set(const TLorentzVector& momentum) {
+
+        E   = momentum.E();
+        Px  = momentum.Px();
+        Py  = momentum.Py();
+        Pz  = momentum.Pz();
+        PT  = momentum.Pt();
+        Eta = momentum.Eta();
+        Phi = momentum.Phi();
+
 }
 
@@ -150 +162 @@
         E_em=cal.getEem(); E_had=cal.getEhad();
         E   =cal.getE();   ET   =cal.getET();
-        EtaCalo = cal.getEta();
-        PhiCalo = cal.getPhi();
+        //EtaCalo = cal.getEta();
+        //PhiCalo = cal.getPhi();
 }
 

trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h

@@ -4 +4 @@
  *  Lists classes to be included in cint dicitonary
  *
- *  $Date: 2009-02-11 09:19:14 $
- *  $Revision: 1.3 $
+ *  $Date: 2009-02-13 19:38:03 $
+ *  $Revision: 1.4 $
  *
  *  
@@ -24 +24 @@
 #pragma link C++ class TRootSelectorInfo;
 #pragma link C++ class TRootGenParticle;
-#pragma link C++ class TRootJet;
 #pragma link C++ class TRootElectron;
 #pragma link C++ class TRootMuon;
 #pragma link C++ class TRootPhoton;
 #pragma link C++ class TRootTauJet;
+#pragma link C++ class TRootJet;
 #pragma link C++ class TRootTracks;
 #pragma link C++ class TRootETmis;