Changeset 12031 for branches/dvo-mods-2007-02/Ohana/src/libdvo/include/dvo.h

Timestamp:

Feb 23, 2007, 4:39:53 PM (19 years ago)

Author:

eugene

Message:

remove the concept of primary / secondary photcodes: all average mags go into the secfilt table

File:

• branches/dvo-mods-2007-02/Ohana/src/libdvo/include/dvo.h (modified) (3 diffs)

branches/dvo-mods-2007-02/Ohana/src/libdvo/include/dvo.h

@@ -39 +39 @@
 
 /* photometry code types */
-# define PHOT_PRI 0x01
+// # define PHOT_PRI 0x01
 # define PHOT_SEC 0x02
 # define PHOT_DEP 0x03
@@ -133 +133 @@
 
 typedef struct {
-  int Ncode;
-  int Nsecfilt;
-  int hashcode[0x10000];
-  int hashNsec[0x10000];
+  int Ncode;                                      // number of photcodes
+  int Nsecfilt;                                   // number of average magnitudes
+  int hashcode[0x10000];                  // index from photcode value to sequence
+  int hashNsec[0x10000];                  // index from photcode value to Nsec seq
+  int codeNsec[0x10000];                  // index from Nsec seq to photcode value
   PhotCode *code;
 } PhotCodeData;
@@ -235 +236 @@
 int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color);
 
-int LoadPhotcodes (char *filename);
+PhotCodeData *GetPhotcodeTable ();
+
+int LoadPhotcodes (char *catdir_file, char *master_file);
+int LoadPhotcodesText (char *filename);
+int LoadPhotcodesFITS (char *filename);
+
 int GetPhotcodeCodebyName (char *name);
 int GetPhotcodeEquivCodebyName (char *name);