Changeset 3c46e17 in git

Timestamp:

Jun 4, 2016, 8:08:56 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a9c67b3a

Parents:

3f8df25

Message:

added SumPT2 sorting

Files:

• classes/DelphesClasses.cc (modified) (1 diff)
• classes/DelphesClasses.h (modified) (2 diffs)
• classes/SortableObject.h (modified) (1 diff)
• modules/TreeWriter.cc (modified) (1 diff)

classes/DelphesClasses.cc

@@ -41 +41 @@
 CompBase *Tower::fgCompare = CompE<Tower>::Instance();
 CompBase *HectorHit::fgCompare = CompE<HectorHit>::Instance();
+CompBase *Vertex::fgCompare = CompSumPT2<Vertex>::Instance();
 CompBase *Candidate::fgCompare = CompMomentumPt<Candidate>::Instance();
 

classes/DelphesClasses.h

@@ -191 +191 @@
   Double_t GenSumPT2;
 
-  ClassDef(Vertex, 2)
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  ClassDef(Vertex, 3)
 };
 
@@ -651 +654 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 4)
+  ClassDef(Candidate, 5)
 };
 

classes/SortableObject.h

@@ -156 +156 @@
       return -1;
     else if(t1->ET < t2->ET)
+      return 1;
+    else
+      return 0;
+  }
+};
+
+//---------------------------------------------------------------------------
+
+template <typename T>
+class CompSumPT2: public CompBase
+{
+  CompSumPT2() {}
+public:
+  static CompSumPT2 *Instance()
+  {
+    static CompSumPT2 single;
+    return &single;
+  }
+
+  Int_t Compare(const TObject *obj1, const TObject *obj2) const
+  {
+    const T *t1 = static_cast<const T*>(obj1);
+    const T *t2 = static_cast<const T*>(obj2);
+    if(t1->SumPT2 > t2->SumPT2)
+      return -1;
+    else if(t1->SumPT2 < t2->SumPT2)
       return 1;
     else

modules/TreeWriter.cc

@@ -247 +247 @@
   Double_t x, y, z, t, xError, yError, zError, sigma, sumPT2, btvSumPT2, genDeltaZ, genSumPT2;
   UInt_t index, ndf;
+ 
+  array->Sort();
  
   // loop over all vertices