Changes in classes/SortableObject.h [3c46e17:341014c] in git

File:

• classes/SortableObject.h (modified) (18 diffs)

classes/SortableObject.h

@@ -26 +26 @@
  */
 
+#include "TObject.h"
 #include "TRef.h"
-#include "TObject.h"
 #include "TRefArray.h"
 
@@ -37 +37 @@
 {
 public:
-  virtual ~CompBase() { }
+  virtual ~CompBase() {}
   virtual Bool_t IsSortable(const TObject *) const { return kTRUE; }
   virtual Int_t Compare(const TObject *obj1, const TObject *obj2) const = 0;
@@ -47 +47 @@
 {
 public:
-
   Bool_t IsSortable() const { return GetCompare() ? GetCompare()->IsSortable(this) : kFALSE; }
   Int_t Compare(const TObject *obj) const { return GetCompare()->Compare(this, obj); }
@@ -64 +63 @@
 {
   CompE() {}
+
 public:
   static CompE *Instance()
@@ -73 +73 @@
   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);
+    const T *t1 = static_cast<const T *>(obj1);
+    const T *t2 = static_cast<const T *>(obj2);
     if(t1->E > t2->E)
       return -1;
@@ -90 +90 @@
 {
   CompPT() {}
+
 public:
   static CompPT *Instance()
@@ -99 +100 @@
   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);
+    const T *t1 = static_cast<const T *>(obj1);
+    const T *t2 = static_cast<const T *>(obj2);
     if(t1->PT > t2->PT)
       return -1;
@@ -116 +117 @@
 {
   CompMomentumPt() {}
+
 public:
   static CompMomentumPt *Instance()
@@ -125 +127 @@
   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);
+    const T *t1 = static_cast<const T *>(obj1);
+    const T *t2 = static_cast<const T *>(obj2);
     if(t1->Momentum.Pt() > t2->Momentum.Pt())
       return -1;
@@ -142 +144 @@
 {
   CompET() {}
+
 public:
   static CompET *Instance()
@@ -151 +154 @@
   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);
+    const T *t1 = static_cast<const T *>(obj1);
+    const T *t2 = static_cast<const T *>(obj2);
     if(t1->ET > t2->ET)
       return -1;
@@ -168 +171 @@
 {
   CompSumPT2() {}
+
 public:
   static CompSumPT2 *Instance()
@@ -177 +181 @@
   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);
+    const T *t1 = static_cast<const T *>(obj1);
+    const T *t2 = static_cast<const T *>(obj2);
     if(t1->SumPT2 > t2->SumPT2)
       return -1;
@@ -193 +197 @@
 class CompDeltaR: public CompBase
 {
-  CompDeltaR(const T2 *obj = 0) : fObj(obj) {}
+  CompDeltaR(const T2 *obj = 0) :
+    fObj(obj) {}
 
   Double_t DeltaPhi(Double_t phi1, Double_t phi2)
   {
     Double_t phi = TMath::Abs(phi1 - phi2);
-    return (phi <= TMath::Pi()) ? phi : (2.0*TMath::Pi()) - phi;
-  }
-
-  Double_t Sqr(Double_t x) { return x*x; }
+    return (phi <= TMath::Pi()) ? phi : (2.0 * TMath::Pi()) - phi;
+  }
+
+  Double_t Sqr(Double_t x) { return x * x; }
 
   Double_t SumSqr(Double_t a, Double_t b)
@@ -207 +212 @@
     Double_t aAbs = TMath::Abs(a);
     Double_t bAbs = TMath::Abs(b);
-    if(aAbs > bAbs) return aAbs * TMath::Sqrt(1.0 + Sqr(bAbs / aAbs));
-    else return (bAbs == 0) ? 0.0 : bAbs * TMath::Sqrt(1.0 + Sqr(aAbs / bAbs));
+    if(aAbs > bAbs)
+      return aAbs * TMath::Sqrt(1.0 + Sqr(bAbs / aAbs));
+    else
+      return (bAbs == 0) ? 0.0 : bAbs * TMath::Sqrt(1.0 + Sqr(aAbs / bAbs));
   };
 
@@ -214 +221 @@
 
 public:
-    static CompDeltaR *Instance(const T2 *obj = 0)
-  {
-      static CompDeltaR single(obj);
-      return &single;
+  static CompDeltaR *Instance(const T2 *obj = 0)
+  {
+    static CompDeltaR single(obj);
+    return &single;
   }
 
@@ -225 +232 @@
   {
     Double_t eta[3], phi[3], deltaR[2];
-    const T1 *t1 = static_cast<const T1*>(obj1);
-    const T1 *t2 = static_cast<const T1*>(obj2);
+    const T1 *t1 = static_cast<const T1 *>(obj1);
+    const T1 *t2 = static_cast<const T1 *>(obj2);
 
     eta[0] = fObj->Eta;
@@ -250 +257 @@
 
 #endif // SortableObject_h
-
-