Changeset 37658 for branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h

Timestamp:

Nov 21, 2014, 4:50:19 PM (12 years ago)

Author:

eugene

Message:

substantial rework to fully support parallel ops (needs testing)

File:

• branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h (modified) (3 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h

@@ -151 +151 @@
 } FrameCorrectionType;
 
+typedef struct {
+  // AstromOffsetMap *map;
+  Coords *coords; // carries a pointer to the AstromOffsetMap
+  FrameCorrectionType *frame;
+} FrameCorrectionSet;
+
+
+typedef struct {
+  double *Rave;
+  double *Dave;
+  double *dRoff;
+  double *dDoff;
+  int Nicrfobj;
+} ICRFobj;
+
 /* global variables set in parameter file */
 # define DVO_MAX_PATH 1024
@@ -203 +218 @@
 int    USE_ICRF_LOCAL;
 int    USE_ICRF_SHFIT;
+int    USE_ICRF_POLE;
 
 int    RESET;
@@ -578 +594 @@
 int select_catalog_ICRF (Catalog *catalog, int Ncatalog);
 
+void ICRFobjFree (ICRFobj *icrfobj);
+ICRFobj *get_ICRF_data (Catalog *catalog, int Ncatalog);
+ICRFobj *merge_icrf_obj (ICRFobj *target, ICRFobj *source);
+ICRFobj *slurp_icrf_obj (RegionHostTable *regionHosts, int nloop);
+int share_icrf_obj (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
+
+int ICRFobjSave(char *filename, ICRFobj *icrfobj);
+ICRFobj *ICRFobjLoad(char *filename);
+
+int SHfitWithMask (double *R, double *D, double *value, int *mask, int Npts, SHterms *fit);
+
 FrameCorrectionType *FrameCorrectionInit (double scale);
 void FrameCorrectionFree (FrameCorrectionType *frame);
 
-int FrameCorrection (Catalog *catalog, int Ncatalog);
-int FrameCorrectionFitSH (Catalog *catalog, int Ncatalog, SHterms *dR, SHterms *dD);
+int FrameCorrectionParallelMaster (RegionHostTable *regionHosts);
+int FrameCorrectionParallelSlave (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
+int FrameCorrectionSerial (Catalog *catalog, int Ncatalog);
+
+FrameCorrectionSet *FrameCorrectionMeasure (ICRFobj *icrfobj);
+
 int FrameCorrectionFromSH (FrameCorrectionType *frame, SHterms *dR, SHterms *dD);
 
-int FrameCorrectionFitLocal (Catalog *catalog, int Ncatalog, AstromOffsetMap *map, Coords *coords);
-int FrameCorrectionApply (Catalog *catalog, int Ncatalog, FrameCorrectionType *frame, AstromOffsetMap *map, Coords *coords, int POLE);
+Coords *FrameCorrectionImageToMap (Header *header, Matrix *matrix, Coords *coords, int raDirection);
+int FrameCorrectionMapToImage (Header *header, Matrix *matrix, Coords *coords, int raDirection);
+int FrameCorrectionSHtoImage (Header *header, Matrix *matrix, FrameCorrectionType *frame, int raDirection);
+FrameCorrectionType *FrameCorrectionImageToSH (Header *header, Matrix *matrix, FrameCorrectionType *frame, int raDirection);
+int FrameCorrectionFromSH (FrameCorrectionType *frame, SHterms *dR, SHterms *dD);
+void FrameCorrectionFree (FrameCorrectionType *frame);
+FrameCorrectionType *FrameCorrectionInit (double scale);
+void FrameCorrectionSetFree (FrameCorrectionSet *set);
+FrameCorrectionSet *FrameCorrectionSetInit ();
+
+int FrameCorrectionSetSave(char *filename, FrameCorrectionSet *set);
+FrameCorrectionSet *FrameCorrectionSetLoad(char *filename);
+
+int FrameCorrectionFitSH (ICRFobj *icrfobj, SHterms *dRc, SHterms *dDc);
+int FrameCorrectionFitLocal (ICRFobj *icrfobj, Coords *coords);
+int FrameCorrectionApply (Catalog *catalog, int Ncatalog, FrameCorrectionType *frame, Coords *coords);
 
 int dump_stardata_pts (StarData *raw, int Npts, char *filename);