Changeset 408 in svn

Timestamp:

May 20, 2009, 10:47:03 AM (16 years ago)

Author:

Xavier Rouby

Message:

modifs in ZDC and RomanPot classes. New leaves in the branches

File:

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

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -346 +346 @@
 
 //---------------------------------------------------------------------------
-
+/*
 class TRootZdcHits: public TRootParticle
 {
@@ -358 +358 @@
   ClassDef(TRootZdcHits, 1)
 };
-
-
-/*class TRootZdcHits: public TSortableObject
+*/
+
+// gen-level info stored for forward detectors
+// this class is similar to TRootParticle, but for the member names
+class TRootGenFwdParticle: public TSortableObject {
+
+public:
+
+  TRootGenFwdParticle() {};
+  TRootGenFwdParticle(const TRootGenFwdParticle& p);
+  TRootGenFwdParticle& operator=(const TRootGenFwdParticle& p);
+  float genE;  // particle energy in GeV
+  float genPx; // particle momentum vector (x component) in GeV
+  float genPy; // particle momentum vector (y component) in GeV
+  float genPz; // particle momentum vector (z component) in GeV
+  float genPT; // particle transverse momentum in GeV
+
+  float genEta; // particle pseudorapidity
+  float genPhi; // particle azimuthal angle in rad
+  int   pid;
+
+  void Set(const TLorentzVector& momentum); // initialises the gen-level data
+  void Set(const float px, const float py, const float pz, const float e);
+  void SetEtaPhi(const float eta, const float phi) {genEta=eta; genPhi=phi;};
+  void SetEtaPhiEET(const float eta, const float phi, const float e, const float et);
+  static TCompare *fgCompare; //!
+  const TCompare *GetCompare() const { return fgCompare; }
+
+  ClassDef(TRootGenFwdParticle, 1)
+};
+
+
+
+//class TRootZdcHits: public TSortableObject
+class TRootZdcHits: public TRootGenFwdParticle
 {
 public:
@@ -368 +400 @@
   TRootZdcHits(const TRootZdcHits& zdc);
   TRootZdcHits& operator=(const TRootZdcHits& zdc); 
-  const TCompare *GetCompare() const { return fgCompare; }
   float E;
   float T; // time of flight [s]
@@ -377 +408 @@
   ClassDef(TRootZdcHits, 2)
 };
-*/
+
 
 //---------------------------------------------------------------------------
@@ -455 +486 @@
 //---------------------------------------------------------------------------
 
-class TRootRomanPotHits: public TSortableObject
+//class TRootRomanPotHits: public TSortableObject
+class TRootRomanPotHits: public TRootGenFwdParticle
 {
 public:
@@ -473 +505 @@
   int side; // -1 or 1
 
-  int pid;
-
-  static TCompare *fgCompare; //!
-  const TCompare *GetCompare() const { return fgCompare; }
-
-  ClassDef(TRootRomanPotHits, 1)
+  static TCompare *fgCompare; //!
+  //const TCompare *GetCompare() const { return fgCompare; }
+
+  ClassDef(TRootRomanPotHits, 2)
 };