From b458b4d68769ef412daabc7497beaaf034b82152 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 8 Mar 2011 12:20:29 +0100 Subject: Improve detector geometry parsing, add bad regions --- src/detector.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'src/detector.h') diff --git a/src/detector.h b/src/detector.h index 6349041b..4c849a77 100644 --- a/src/detector.h +++ b/src/detector.h @@ -25,6 +25,8 @@ struct hdfile; struct panel { + char name[1024]; /* Name for this panel */ + int min_fs; /* Smallest FS value considered to be in the panel */ int max_fs; /* Largest FS value considered to be in this panel */ int min_ss; /* ... and so on */ @@ -49,14 +51,30 @@ struct panel double yss; }; + +struct badregion +{ + char name[1024]; + double min_x; + double max_x; + double min_y; + double max_y; +}; + + struct detector { - struct panel *panels; - int n_panels; - int max_fs; - int max_ss; /* Size of overall array needed, minus 1 */ + struct panel *panels; + int n_panels; + + int max_fs; + int max_ss; /* Size of overall array needed, minus 1 */ + + struct badregion *bad; + int n_bad; }; + extern struct rvec get_q(struct image *image, double fs, double ss, double *ttp, double k); -- cgit v1.2.3