Changeset 37038 for trunk/Ohana/src/relastro/include/relastro.h

Timestamp:

Jul 17, 2014, 10:14:00 AM (12 years ago)

Author:

eugene

Message:

lots of changes to replace measure.dR,dD with measure.R.D; updates to handle stack vs mean; ps1_v5 changes required

File:

• trunk/Ohana/src/relastro/include/relastro.h (modified) (4 diffs)

trunk/Ohana/src/relastro/include/relastro.h

@@ -5 +5 @@
 # include <assert.h>
 # include <pthread.h>
-
-# define MARKTIME(MSG,...) {                    \
-    gettimeofday (&stopTimer, (void *) NULL);   \
-    float dtime = DTIME (stopTimer, startTimer);        \
-    fprintf (stderr, MSG, __VA_ARGS__); }
-
-# define INITTIME \
-  struct timeval startTimer, stopTimer; \
-  gettimeofday (&startTimer, (void *) NULL);
 
 // choose off_t or int depending on full-scale relphot analysis resources
@@ -84 +75 @@
   double X, Y;  /* Chip Coords   - pixels  */
   float Mag;
-  float Color;
+  float ColorBlue;
+  float ColorRed;
   float dMag;
   float dPos;
@@ -218 +210 @@
 SkyRegionSelection SELECTION;
 
-char         *DCR_COLOR_POS,    *DCR_COLOR_NEG;
-PhotCode     *DCR_PHOTCODE_POS, *DCR_PHOTCODE_NEG; 
-int           DCR_NSEC_POS,      DCR_NSEC_NEG; 
+char         *DCR_BLUE_COLOR_POS,    *DCR_BLUE_COLOR_NEG;
+PhotCode     *DCR_BLUE_PHOTCODE_POS, *DCR_BLUE_PHOTCODE_NEG; 
+int           DCR_BLUE_NSEC_POS,      DCR_BLUE_NSEC_NEG; 
+
+char         *DCR_RED_COLOR_POS,    *DCR_RED_COLOR_NEG;
+PhotCode     *DCR_RED_PHOTCODE_POS, *DCR_RED_PHOTCODE_NEG; 
+int           DCR_RED_NSEC_POS,      DCR_RED_NSEC_NEG; 
 
 int ImagSelect;
@@ -532 +528 @@
 int select_mosaics_hostregion (RegionHostTable *regionHosts, Image *image, off_t Nimage);
 
-float getColor (off_t meas, int cat);
+float getColorBlue (off_t meas, int cat);
+float getColorRed (off_t meas, int cat);
 
 int strextend (char *input, char *format,...);