Changeset 40477 for branches/czw_branch/20170908/Ohana/src/relastro/include/relastro.h

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/include/relastro.h (modified) (5 diffs)

branches/czw_branch/20170908/Ohana/src/relastro/include/relastro.h

@@ -33 +33 @@
 typedef enum {OP_NONE, OP_IMAGES, OP_HIGH_SPEED, OP_MERGE_SOURCE, OP_UPDATE_OBJECTS, OP_UPDATE_OFFSETS, OP_LOAD_OBJECTS, OP_HPM, OP_PARALLEL_REGIONS, OP_PARALLEL_IMAGES, OP_REPAIR_STACKS, OP_REPAIR_WARPS, OP_REPAIR_OBJECT_ID} RelastroOp;
 
-typedef enum {TARGET_NONE, TARGET_SIMPLE, TARGET_CHIPS, SET_CHIPS, TARGET_MOSAICS} FitTarget;
+typedef enum {TARGET_NONE, TARGET_SIMPLE, TARGET_CHIPS, SET_CHIPS, SET_STACKS, TARGET_MOSAICS} FitTarget;
 
 typedef enum {
@@ -215 +215 @@
   unsigned int stop;
   off_t myImage;
-  float Mcal;
+  float McalPSF;
+  float McalAPER;
   float dMcal;
-  short Xm;
+  float McalChiSq;
   float secz;
   char flags;
@@ -366 +367 @@
 int    USE_ICRF_POLE;
 
+int    FIT_STACKS;
+int    IMSTATS_ONLY;
 int    REPAIR_STACKS;
 int    USE_IMAGE_COORDS_FOR_REPAIR;
@@ -377 +380 @@
 int    SKIP_CFH;
 
+int    UPDATE_ALL_MEASURE;
 int    UPDATE_PS1_STACK_MEASURE;
 int    UPDATE_PS1_CHIP_MEASURE;
@@ -621 +625 @@
 int UpdateChips (Catalog *catalog, int Ncatalog, int Nloop);
 int UpdateStacks (Catalog *catalog, int Ncatalog);
+int UpdateStacksWithFit (Catalog *catalog, int Ncatalog);
 int UpdateMosaic (Catalog *catalog, int Ncatalog);
 int UpdateMeasures (Catalog *catalog, int Ncatalog);