Changeset 33274 for branches/eam_branches/ipp-20111122/Ohana/src/relphot/include/relphot.h

Timestamp:

Feb 15, 2012, 2:30:58 PM (14 years ago)

Author:

eugene

Message:

deprecate the old relphot command of the form: relphot (catalog) (photcode); fix the BrightCatalog I/O; add parallel-manual option for testing

File:

• branches/eam_branches/ipp-20111122/Ohana/src/relphot/include/relphot.h (modified) (7 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/include/relphot.h

@@ -41 +41 @@
 
 typedef struct {
-    AverageTiny *average;
-    MeasureTiny *measure;
-    SecFilt     *secfilt;
-    off_t Naverage;
-    off_t Nmeasure;
+  AverageTiny *average;       // array of (minimal) average data
+  MeasureTiny *measure;       // array of (minimal) measure data 
+  SecFilt     *secfilt;       // array of secfilt data (matched to average by Nsecfilt)
+  off_t       Naverage;
+  off_t       Nmeasure;
 } BrightCatalog;
 
@@ -57 +57 @@
   unsigned char trate;
 } ImageSubset;
+
+typedef struct {
+  Catalog *catalog;           // array of catalogs generated
+  int NCATALOG;               // number of catalogs allocated
+  int Ncatalog;               // number of catalogs generated
+  int Nsecfilt;               // number of catalogs generated
+  off_t *NAVERAGE;            // allocated Averages per catalog
+  off_t *NMEASURE;            // allocated Measures per catalog
+  int   *index;               // lookup table catID -> catalog[i]
+  int   *catIDs;              // lookup table catID <- catalog[i]
+  int    maxID;               // max catID value to date
+} CatalogSplitter;
 
 /* global variables set in parameter file */
@@ -85 +97 @@
 double IMFIT_SYS_SIGMA_LIM;
 double CLOUD_TOLERANCE;
+
+int    PARALLEL;
+int    PARALLEL_MANUAL;
 
 int    VERBOSE;
@@ -144 +159 @@
 
 SkyRegion UserPatch;
-int UserPatchSelect;
+char *UserCatalog;
 
 int USE_BASIC_CHECK;
@@ -214 +229 @@
 Catalog      *load_catalogs_parallel PROTO((SkyList *sky, int *Ncatalog));
 
-SkyList      *load_images         PROTO((FITS_DB *db, char *regionName, SkyRegion *region, int RegionSelect));
+SkyList      *load_images         PROTO((FITS_DB *db, char *regionName, SkyRegion *region));
 Image        *select_images       PROTO((SkyList *skylist, Image *timage, off_t Ntimage, off_t **LineNumber, off_t *Nimage));
 
@@ -285 +300 @@
 int BrightCatalogSave(char *filename, BrightCatalog *catalog);
 BrightCatalog *BrightCatalogMerge (Catalog *catalog, int Ncatalog);
+CatalogSplitter *BrightCatalogSplitInit (int Nsecfilt);
+int BrightCatalogSplitFree (CatalogSplitter *catalogs);
+int BrightCatalogSplit (CatalogSplitter *catalogs, BrightCatalog *bcatalog);
 
 int ImageSubsetSave(char *filename, ImageSubset *image, off_t Nimage);
@@ -291 +309 @@
 int CopyAverageTiny (AverageTiny *averageT, Average *average);
 int CopyMeasureTiny (MeasureTiny *measureT, Measure *measure);
+