Changeset 270 in svn for trunk/Utilities

Timestamp:

Feb 14, 2009, 2:06:20 AM (16 years ago)

Author:

severine ovyn

Message:

remove double GEN pfff

Location:

trunk/Utilities/ExRootAnalysis

Files:

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

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -164 +164 @@
   float Phi; // particle azimuthal angle in rad 
 
-  float EtaCalo; // particle pseudorapidity when entering the calo, 
-  float PhiCalo; // particle azimuthal angle in rad when entering the calo
-
   void Set(const TLorentzVector& momentum);
   void Set(const float px, const float py, const float pz, const float e);
   void SetEtaPhi(const float eta, const float phi) {Eta=eta; Phi=phi;};
-  void SetEtaPhiCalo(const float eta, const float phi) {EtaCalo=eta; PhiCalo=phi;};
   void SetEtaPhiEET(const float eta, const float phi, const float e, const float et);
   static TCompare *fgCompare; //!
@@ -179 +175 @@
 };
 
-
-//---------------------------------------------------------------------------
-
-class TRootGenParticle: public TRootParticle {
-
-public:
-  TRootGenParticle() {_initialised=false;}
+//--------------------------------------------------------------------------
+
+class GenParticle: public TRootParticle {
+
+public:
+  GenParticle() {};
   int PID; // particle HEP ID number [RawHepEventParticle::pid()]
   int Status; // particle status [RawHepEventParticle::status()]
@@ -193 +188 @@
   int D2; // particle 2nd daughter [RawHepEventParticle::daughter2() - 1]
 
+  float Charge;
+
+  float T; // particle vertex position (t component) [RawHepEventParticle::t()]
+  float X; // particle vertex position (x component) [RawHepEventParticle::x()]
+  float Y; // particle vertex position (y component) [RawHepEventParticle::y()]
+  float Z; // particle vertex position (z component) [RawHepEventParticle::z()]
+  float M;
+ 
+
+  static TCompare *fgCompare; //!
+  
+  ClassDef(GenParticle, 1)
+};
+
+//---------------------------------------------------------------------------
+
+class TRootGenParticle: public TRootParticle {
+
+public:
+  TRootGenParticle() {_initialised=false;}
+  TRootGenParticle(GenParticle* part);
+
+  int PID; // particle HEP ID number [RawHepEventParticle::pid()]
+  int Status; // particle status [RawHepEventParticle::status()]
+  int M1; // particle 1st mother [RawHepEventParticle::mother1() - 1]
+  int M2; // particle 2nd mother [RawHepEventParticle::mother2() - 1]
+  int D1; // particle 1st daughter [RawHepEventParticle::daughter1() - 1]
+  int D2; // particle 2nd daughter [RawHepEventParticle::daughter2() - 1]
+
   float T; // particle vertex position (t component) [RawHepEventParticle::t()]
   float X; // particle vertex position (x component) [RawHepEventParticle::x()]
@@ -199 +223 @@
   float M;
   void setFractions();
-  const float getCharge() const {return Charge;};
   const float getFem()  {if(!_initialised) setFractions(); return _Fem;}
   const float getFhad() {if(!_initialised) setFractions(); return _Fhad;}
 
+  float EtaCalo; // particle pseudorapidity when entering the calo, 
+  float PhiCalo; // particle azimuthal angle in rad when entering the calo
+  void SetEtaPhiCalo(const float eta, const float phi) {EtaCalo=eta; PhiCalo=phi;};
+
+  static TCompare *fgCompare; //!
+
   float Charge;      // electrical charge
-
-  static TCompare *fgCompare; //!
  protected:
   float _Fem, _Fhad; // fractions of energy deposit
@@ -222 +249 @@
   static TCompare *fgCompare; //!
 
+  float EtaCalo; // particle pseudorapidity when entering the calo, 
+  float PhiCalo; // particle azimuthal angle in rad when entering the calo
+  void SetEtaPhiCalo(const float eta, const float phi) {EtaCalo=eta; PhiCalo=phi;};
+
   bool IsolFlag;
 
@@ -247 +278 @@
   int Charge; // particle Charge [RawHepEventParticle::pid()]
   bool IsolFlag;
+  float EtaCalo; // particle pseudorapidity when entering the calo, 
+  float PhiCalo; // particle azimuthal angle in rad when entering the calo
+  void SetEtaPhiCalo(const float eta, const float phi) {EtaCalo=eta; PhiCalo=phi;};
+
   static TCompare *fgCompare; //!
 

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -36 +36 @@
 
 TCompare *TRootGenParticle::fgCompare = 0;
+TCompare *GenParticle::fgCompare = 0;
 TCompare *TRootElectron::fgCompare = TComparePT<TRootElectron>::Instance();
 TCompare *TRootMuon::fgCompare = TComparePT<TRootMuon>::Instance();
@@ -90 +91 @@
    Px = PT*cos(Phi);
    Py = PT*sin(Phi);
+}
+
+TRootGenParticle::TRootGenParticle(GenParticle* part) :
+PID(part->PID),Status(part->Status),M1(part->M1),M2(part->M2),D1(part->D1),D2(part->D2),
+T(part->T),X(part->X),Y(part->Y),Z(part->Z),M(part->M){
+    E=part->E;
+    Px=part->Px;
+    Py=part->Py;
+    Pz=part->Pz;
+    Eta=part->Eta;
+    Phi=part->Phi;
+    PT=part->PT;
+    _initialised=false;
 }
 

trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h

@@ -42 +42 @@
 #pragma link C++ class TRootSelectorInfo;
 #pragma link C++ class TRootGenParticle;
+#pragma link C++ class GenParticle;
 #pragma link C++ class TRootElectron;
 #pragma link C++ class TRootMuon;