Changeset 40212 for branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h

Timestamp:

Nov 22, 2017, 10:38:42 AM (9 years ago)

Author:

eugene

Message:

update names for consistency: secfilt.M -> secfilt.MpsfChp, etc

File:

• branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h (modified) (4 diffs)

branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h

@@ -77 +77 @@
   unsigned int stop;
   short photcode;
-  float Mcal;
+  float McalPSF;
+  float McalAPER;
   float dMcal;
   float dMsys;
-  unsigned short nFitPhotom;
-  short Xm;
+  float McalChiSq;
   float secz;
   float ubercalDist;
+  unsigned short nFitPhotom;
   unsigned int flags;
   char skipCal;               // if TRUE, this mosaic is incomplete and should not be calibrated
@@ -201 +202 @@
 
 typedef struct {
-  float Mcal;
+  float McalPSF;
+  float McalAPER;
   float dMcal;
   float dMagSys;
-  short Xm;
+  float McalChiSq;
   int nFitPhotom;
   int flags;
@@ -220 +222 @@
 
 typedef struct {
-  float Mcal;
+  float McalPSF;
+  float McalAPER;
   float dMcal;
   unsigned int imageID;
@@ -427 +430 @@
 float         getMgrid            PROTO((off_t meas, int cat));
 float         getMmos             PROTO((off_t meas, int cat));
-float         getMrel             PROTO((Catalog *catalog, off_t meas, int cat));
+float         getMrel             PROTO((Catalog *catalog, off_t meas, int cat, dvoMagClassType class, dvoMagSourceType source));
 short         getUbercalDist      PROTO((off_t meas, int cat));
 float         getCenterOffset     PROTO((off_t meas, int cat, Measure *measure, unsigned int *myID));