Changeset 370 in svn for trunk/Utilities

Timestamp:

May 10, 2009, 8:16:52 PM (16 years ago)

Author:

Xavier Rouby

Message:

TRootZdcHits ok ; new class TRootForwardTaggerHits

Location:

trunk/Utilities/ExRootAnalysis

Files:

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

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -343 +343 @@
 
 //---------------------------------------------------------------------------
-class TRootZdcHits: public TRootParticle
-{
-public:
-  TRootZdcHits() {};
+class TRootZdcHits: public TSortableObject
+{
+public:
+
+  TRootZdcHits() {}; // do not put anything for the default constructor-- ExRootAnalysis constrain!!!
+  TRootZdcHits(const float e, const float t, const int side, const bool had);
+  TRootZdcHits(const TRootZdcHits& zdc);
+  TRootZdcHits& operator=(const TRootZdcHits& zdc); 
+  const TCompare *GetCompare() const { return fgCompare; }
+  float E;
   float T; // time of flight [s]
   int side; // -1 or +1
   static TCompare *fgCompare; //!
-
-  ClassDef(TRootZdcHits, 1)
+  bool hadronic_hit; // true if neutron, false if photon
+
+  ClassDef(TRootZdcHits, 2)
 };
 
@@ -434 +441 @@
 public:
   TRootRomanPotHits() {};
-  float T; // time of flight to the detector [s]
+  //  float T; // time of flight to the detector [s]
   float S; // distance to the IP [m]
   float E; // reconstructed energy [GeV]
@@ -453 +460 @@
 };
 
+//---------------------------------------------------------------------------
+
+class TRootForwardTaggerHits : public TRootRomanPotHits
+{
+public:
+  TRootForwardTaggerHits() {};
+  float T; // time of flight to the detector [s]
+
+  static TCompare *fgCompare; //!
+  const TCompare *GetCompare() const { return fgCompare; }
+
+  ClassDef(TRootForwardTaggerHits, 1)
+};
+
+
 #endif // BLOCKCLASSES_H
 

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -50 +50 @@
 TCompare *TRootLHEFParticle::fgCompare = 0;
 TCompare *TRootRomanPotHits::fgCompare =0;
+TCompare *TRootForwardTaggerHits::fgCompare =0;
 TCompare *TRootTrigger::fgCompare =0;
 
@@ -196 +197 @@
         E   =cal.getE();   ET   =cal.getET();
 }
+
+TRootZdcHits::TRootZdcHits(const float e, const float t, const int side, const bool had) : E(e), T(t), side(side), hadronic_hit(had) {}
+TRootZdcHits::TRootZdcHits(const TRootZdcHits& zdc) : E(zdc.E), T(zdc.T), side(zdc.side), hadronic_hit(zdc.hadronic_hit) {}
+TRootZdcHits& TRootZdcHits::operator=(const TRootZdcHits& zdc) {
+  if(this==&zdc) return *this;
+     E = zdc.E; T = zdc.T;  side = zdc.side; hadronic_hit = zdc.hadronic_hit;
+  return *this;
+}
+

trunk/Utilities/ExRootAnalysis/src/BlockClassesLinkDef.h

@@ -54 +54 @@
 #pragma link C++ class TRootZdcHits;
 #pragma link C++ class TRootRomanPotHits;
+#pragma link C++ class TRootForwardTaggerHits;
 #pragma link C++ class TRootTrigger;