Changeset 4865 for trunk/MagicSoft/Cosy/videodev

Timestamp:

09/05/04 18:56:47 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

• FilterLed.cc (modified) (5 diffs)
• FilterLed.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/videodev/FilterLed.cc

@@ -227 +227 @@
 
     Execute(leds, xc, yc);
-
+ 
     // Mark Stars in image
     for (int i=first; i<leds.GetEntriesFast(); i++)
@@ -233 +233 @@
 }
 
+
+void FilterLed::ExecuteAndMark(Leds &leds, int xc, int yc, double &bright) const
+{
+    const Int_t first = leds.GetEntriesFast();
+
+    Execute(leds, xc, yc, bright);
+ 
+    // Mark Stars in image
+    for (int i=first; i<leds.GetEntriesFast(); i++)
+        MarkPoint(leds(i));
+}
+
 void FilterLed::Execute(int xc, int yc) const
 {
@@ -240 +252 @@
 
 void FilterLed::Execute(Leds &leds, int xc, int yc) const
+{
+    double bright;
+    Execute(leds, xc, yc, bright);
+}
+
+
+void FilterLed::Execute(Leds &leds, int xc, int yc, double &bright) const
 {
     int x0 = xc-fBox;
@@ -269 +288 @@
     sq  /= wx*hy;
 
+    bright=sum;
+
+    
     // 254 because b<=max and not b<max
     const double sdev = sqrt(sq-sum*sum);
@@ -345 +367 @@
 
     RemoveTwinsInterpol(leds, first, 5);
+    
+   
 }
 

trunk/MagicSoft/Cosy/videodev/FilterLed.h

@@ -22 +22 @@
     void GetMinMax(const int offset, byte *min, byte *max) const;
     int  GetMeanPosition(const int x, const int y, const int box) const;
-    int  GetMeanPosition(const int x, const int y, const int box, float &mx, float &my, unsigned int &sum) const;
+    int  GetMeanPosition(const int x, const int y, const int box, 
+                         float &mx, float &my, unsigned int &sum) const;
     void RemoveTwinsInterpol(Leds &leds, Int_t first, Double_t radius) const;
     void DrawBox(const int x1, const int y1,
@@ -30 +31 @@
 public:
     FilterLed(byte *img, int w, int h, double cut=2.5)
-        : fImg(img), fW(w), fH(h), fBox(w>h?w:h), fCut(cut)
+      : fImg(img), fW(w), fH(h), fBox(w>h?w:h), fCut(cut)
     {
     }
 
     FilterLed(byte *img, int w, int h, int box, double cut=2.5)
-        : fImg(img), fW(w), fH(h), fBox(box), fCut(cut)
+      : fImg(img), fW(w), fH(h), fBox(box), fCut(cut)
     {
     }
 
     void SetBox(int box)   { fBox = box; }
-    void SetCut(float cut) { fCut = cut; }
-
+    void SetCut(float cut) { fCut = cut; } 
     void FindStar(Leds &leds, int xc, int yc) const;
-
+    void Execute(Leds &leds, int xc, int yc, double &bright) const;
     void Execute(Leds &leds, int xc, int yc) const;
     void Execute(Leds &leds) const { Execute(leds, fW/2, fH/2); }
     void ExecuteAndMark(Leds &leds, int xc, int yc) const;
+    void ExecuteAndMark(Leds &leds, int xc, int yc, double &bright) const;
     void ExecuteAndMark(Leds &leds) const { ExecuteAndMark(leds, fW/2, fH/2); }
     void Execute(int xc, int yc) const;