Changeset 1810 for trunk/MagicSoft/Cosy/base

Timestamp:

03/11/03 13:52:48 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/base

Files:

• MStar.h (modified) (1 diff)
• MStarList.cc (modified) (3 diffs)
• MStarList.h (modified) (1 diff)
• timer.cc (modified) (1 diff)
• timer.h (modified) (1 diff)

trunk/MagicSoft/Cosy/base/MStar.h

@@ -21 +21 @@
     void Set(Double_t mx, Double_t my) { fX=mx; fY=my; }
 
+    Int_t Compare(const TObject *obj) const
+    {
+        const MStar *const s = (MStar*)obj;
+
+        if (fMag<s->fMag)
+            return -1;
+
+        if (fMag>s->fMag)
+            return 1;
+
+        return 0;
+    }
+
+    Bool_t IsSortable() const { return kTRUE; }
+
+
     ClassDef(MStar, 1)
 };

trunk/MagicSoft/Cosy/base/MStarList.cc

@@ -1 +1 @@
 #include "MStarList.h"
+
+#include <iostream.h>
 
 void MStarList::RemoveTwins(Double_t radius)
@@ -18 +20 @@
             return;
 
+        fStars.RemoveAt(idx);
+
         MStarListIter Next(this, *first, radius);
-        Delete(idx);
 
         MStar *pos;
@@ -29 +32 @@
             mx += pos->GetX();
             my += pos->GetY();
-            Delete(pos);
+            fStars.Remove(pos);
             cnt++;
         }

trunk/MagicSoft/Cosy/base/MStarList.h

@@ -38 +38 @@
 
     void RemoveTwins(Double_t radius);
+
+    void Sort() { fStars.Sort(); }
+
+    void Expand(int n) { fStars.Expand(n); }
 };
 

trunk/MagicSoft/Cosy/base/timer.cc

@@ -26 +26 @@
 //    fDiv = fmod((fMs+fSecs)/(60*60*24), 1.0);
 }
+
+void Timer::GetTimeval(struct timeval *tv) const
+{
+    tv->tv_sec  = fSecs;
+    tv->tv_usec = fMs;
+}
+
 /*
 void Timer::Set(const long mjd)

trunk/MagicSoft/Cosy/base/timer.h

@@ -33 +33 @@
     void SetTimer(const struct timeval *tv);
 
+    void GetTimeval(struct timeval *tv) const;
+
     int GetSecs() { return fSecs; }