Changeset 37067 for branches/eam_branches/ipp-ops-20130712/Ohana/src/opihi/include/data.h

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/include/data.h (modified) (4 diffs)

branches/eam_branches/ipp-ops-20130712/Ohana/src/opihi/include/data.h

@@ -33 +33 @@
   char **pageIDs;
 } Book;
+
+// the interpolating spline has valu
+typedef struct {
+  int Nknots;
+  opihi_flt *xk;
+  opihi_flt *yk;
+  opihi_flt *y2;
+  char *name;
+} Spline;
+
+typedef struct {
+  char *name;
+  int Ninput;
+  int Nx;
+  int Ny;
+  float **buffers;
+} MedImageType;
 
 void InitData (void);
@@ -144 +161 @@
 
 /* starfuncs.c */
-double get_aperture_stats (Matrix *matrix, int X, int Y, int Npix, int Nborder, double max);
+double get_aperture_stats (Matrix *matrix, int X, int Y, int Npix, int Nborder, double max, int VERBOSE);
 int set_rough_radii (double Ra, double Ri, double Ro);
 int get_rough_star (float *data, int Nx, int Ny, int x, int y, opihi_flt *xc, opihi_flt *yc, opihi_flt *sx, opihi_flt *sy, opihi_flt *sxy, opihi_flt *zs, opihi_flt *zp, opihi_flt *sk);
@@ -170 +187 @@
 void FreeQueues (void);
 void FreeBooks (void);
-
-// the interpolating spline has valu
-typedef struct {
-  int Nknots;
-  opihi_flt *xk;
-  opihi_flt *yk;
-  opihi_flt *y2;
-  char *name;
-} Spline;
 
 /* in SplineOps.c */
@@ -207 +215 @@
 double hermitian_10(double x);
 
+/* in MedImageOps.c */
+void InitMedImages ();
+void FreeMedImages ();
+void FreeMedImage (MedImageType *medimage);
+MedImageType *FindMedImage (char *name);
+MedImageType *CreateMedImage (char *name, int Nx, int Ny);
+int DeleteMedImage (MedImageType *medimage);
+void ListMedImages ();
+
 # endif