Changeset 18621 for trunk/FACT++/drive/FilterLed.h

Timestamp:

09/18/16 14:46:35 (8 years ago)

Author:

tbretz

Message:

Removed references to root, replaced with basic types.

File:

• trunk/FACT++/drive/FilterLed.h (modified) (4 diffs)

trunk/FACT++/drive/FilterLed.h

@@ -2 +2 @@
 #define CAOS_FilterLed
 
-#ifndef __CINT__
-#include <TROOT.h>
-#endif
-
-typedef unsigned char byte;
+#include <stdint.h>
+#include <vector>
 
 class Led;
-class Leds;
 class Ring;
 
 class FilterLed
 {
-    byte *fImg;
+    uint8_t *fImg;
     int fW;
     int fH;
@@ -21 +17 @@
     float fCut;
 
-    Float_t FindCluster(int &cnt, float *sum, UInt_t x, UInt_t y,
-                        UInt_t x0, UInt_t y0, UInt_t x1, UInt_t y1) const;
+    float FindCluster(int &cnt, float *sum, uint32_t x, uint32_t y,
+                        uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1) const;
 
-    void GetMinMax(const int offset, byte *min, byte *max) const;
+    void GetMinMax(const int offset, uint8_t *min, uint8_t *max) const;
     int  GetMeanPosition(const int x, const int y, const int boxx, const int boxy) const;
     int  GetMeanPosition(const int x, const int y, const int boxx, const int boxy,
@@ -40 +36 @@
 
 public:
-    FilterLed(byte *img, int w, int h, double cut=2.5)
-      : fImg(img), fW(w), fH(h), fBoxX(w), fBoxY(h), fCut(cut)
+    FilterLed(uint8_t *img, int w, int h, double cut=2.5) : fImg(img),
+        fW(w), fH(h), fBoxX(w), fBoxY(h), fCut(cut)
     {
     }
 
-    FilterLed(byte *img, int w, int h, int boxx, int boxy, double cut=2.5)
-      : fImg(img), fW(w), fH(h), fBoxX(boxx), fBoxY(boxy), fCut(cut)
+    FilterLed(uint8_t *img, int w, int h, int boxx, int boxy, double cut=2.5) : fImg(img),
+        fW(w), fH(h), fBoxX(boxx), fBoxY(boxy), fCut(cut)
     {
     }
@@ -53 +49 @@
     void SetBox(int box)   { fBoxX = fBoxY = box; }
     void SetBox(int boxx, int boxy)   { fBoxX = boxx; fBoxY = boxy; }
-    void SetCut(float cut) { fCut = cut; } 
-    void FindStar(Leds &leds, int xc, int yc, bool circle=false) 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;
-    void Execute() const { Execute(fW/2, fH/2); }
+    void SetCut(float cut) { fCut = cut; }
+    void FindStar(std::vector<Led> &leds, int xc, int yc, bool circle=false) const;
+
+    void Execute(std::vector<Led> &leds, int xc, int yc, double &bright) const;
+    void Execute(std::vector<Led> &leds, int xc, int yc) const;
+    void Execute(std::vector<Led> &leds) const { Execute(leds, fW/2, fH/2); }
+
     void MarkPoint(const Led &led) const;
-    void MarkPoint(Float_t x, Float_t y, Float_t mag) const;
+    void MarkPoint(float x, float y, float mag) const;
     void Stretch() const;
-    void DrawCircle(float cx, float cy, float r, byte col=0x40) const;
-    void DrawCircle(float r, byte col=0x40) const { DrawCircle(fW/2, fH/2, r, col); }
-    void DrawCircle(const Ring &c, byte col=0x40) const;
-    void DrawCircle(const Ring &c, double r, byte col) const;
-    void DrawHexagon(float cx, float cy, float r, byte col=0x40) const;
-    void DrawHexagon(const Ring &c, double r, byte col) const;
 
-    ClassDef(FilterLed, 0)
+    void DrawCircle(float cx, float cy, float r, uint8_t col=0x40) const;
+    void DrawCircle(float r, uint8_t col=0x40) const { DrawCircle(fW/2, fH/2, r, col); }
+    void DrawCircle(const Ring &c, uint8_t col=0x40) const;
+    void DrawCircle(const Ring &c, double r, uint8_t col) const;
+    void DrawHexagon(float cx, float cy, float r, uint8_t col=0x40) const;
+    void DrawHexagon(const Ring &c, double r, uint8_t col) const;
 };