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

Timestamp:

Feb 23, 2007, 8:04:18 AM (19 years ago)

Author:

eugene

Message:

moved all average magnitude values to secfilt

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

@@ -232 +232 @@
 float PhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
 
-# if (0)
-short iPhotInst (Measure *measure);
-short iPhotAbs (Measure *measure);
-short iPhotCat (Measure *measure);
-short iPhotSys (Measure *measure, Average *average, SecFilt *secfilt);
-short iPhotRel (Measure *measure, Average *average, SecFilt *secfilt);
-short iPhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
-short iPhotAve (PhotCode *code, Average *average, SecFilt *secfilt);
-short iPhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure);
-short iPhotXm (PhotCode *code, Average *average, SecFilt *secfilt);
-short iPhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
-# endif
-
-float iPhotColor (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
+float PhotColorForCode (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
 int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color);
 
@@ -297 +284 @@
 
 /*** conversion functions / I/O conversions ***/
-Average *ReadRawAverage (FILE *f, int Naverage, int format);
+Average *ReadRawAverage (FILE *f, int Naverage, int format, SecFilt **primary);
 Measure *ReadRawMeasure (FILE *f, int Nmeasure, int format);
 SecFilt *ReadRawSecFilt (FILE *f, int Nsecfilt, int format);
-int WriteRawAverage (FILE *f, Average *average, int Naverage, int format);
+int WriteRawAverage (FILE *f, Average *average, int Naverage, int format, SecFilt *primary);
 int WriteRawMeasure (FILE *f, Measure *measure, int Nmeasure, int format);
 int WriteRawSecFilt (FILE *f, SecFilt *secfilt, int Nsecfilt, int format);
 
-Average *FtableToAverage (FTable *ftable, int *Naverage, int *format);
-Average *AverageLoneosToInternal (AverageLoneos *in, int Nvalues);
-Average *AverageElixirToInternal (AverageElixir *in, int Nvalues);
-Average *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues);
-Average *AveragePMtestToInternal (AveragePMtest *in, int Nvalues);
-AverageLoneos *AverageInternalToLoneos (Average *in, int Nvalues);
-AverageElixir *AverageInternalToElixir (Average *in, int Nvalues);
-AveragePanstarrs *AverageInternalToPanstarrs (Average *in, int Nvalues);
-AveragePMtest *AverageInternalToPMtest (Average *in, int Nvalues);
-
+Average *FtableToAverage (FTable *ftable, int *Naverage, int *format, SecFilt **primary);
 Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format);
-Measure *MeasureLoneosToInternal (MeasureLoneos *in, int Nvalues);
-Measure *MeasureElixirToInternal (MeasureElixir *in, int Nvalues);
-Measure *MeasurePanstarrsToInternal (MeasurePanstarrs *in, int Nvalues);
-MeasureLoneos *MeasureInternalToLoneos (Measure *in, int Nvalues);
-MeasureElixir *MeasureInternalToElixir (Measure *in, int Nvalues);
-MeasurePanstarrs *MeasureInternalToPanstarrs (Measure *in, int Nvalues);
-
 SecFilt *FtableToSecFilt (FTable *ftable, int *Nsecfilt, int *format);
-SecFilt *SecFiltLoneosToInternal (SecFiltLoneos *in, int Nvalues);
-SecFilt *SecFiltElixirToInternal (SecFiltElixir *in, int Nvalues);
-SecFilt *SecFiltPanstarrsToInternal (SecFiltPanstarrs *in, int Nvalues);
-SecFiltLoneos *SecFiltInternalToLoneos (SecFilt *in, int Nvalues);
-SecFiltElixir *SecFiltInternalToElixir (SecFilt *in, int Nvalues);
-SecFiltPanstarrs *SecFiltInternalToPanstarrs (SecFilt *in, int Nvalues);
-
-int AverageToFtable (FTable *ftable, Average *average, int Naverage, int format);
+int FtableToImage (FTable *ftable, Header *theader, int *format);
+
+int AverageToFtable (FTable *ftable, Average *average, int Naverage, int format, SecFilt *primary);
 int MeasureToFtable (FTable *ftable, Measure *measure, int Nmeasure, int format);
 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format);
+int ImageToFtable (FTable *ftable, Header *theader, int format);
+int ImageToVtable (VTable *vtable, Header *theader, int format);
+
+Image            *ImageElixirToInternal (ImageElixir *in, int Nvalues);
+Image            *ImageLoneosToInternal (ImageLoneos *in, int Nvalues);
+Image            *ImagePanstarrsToInternal (ImagePanstarrs *in, int Nvalues);
+
+ImageElixir      *ImageInternalToElixir (Image *in, int Nvalues);
+ImageLoneos      *ImageInternalToLoneos (Image *in, int Nvalues);
+ImagePanstarrs   *ImageInternalToPanstarrs (Image *in, int Nvalues);
+
+Average          *AverageLoneosToInternal (AverageLoneos *in, int Nvalues, SecFilt **primary);
+Average          *AverageElixirToInternal (AverageElixir *in, int Nvalues, SecFilt **primary);
+Average          *AveragePMtestToInternal (AveragePMtest *in, int Nvalues);
+Average          *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues);
+
+AverageLoneos    *AverageInternalToLoneos (Average *in, int Nvalues, SecFilt *primary);
+AverageElixir    *AverageInternalToElixir (Average *in, int Nvalues, SecFilt *primary);
+AveragePMtest    *AverageInternalToPMtest (Average *in, int Nvalues);
+AveragePanstarrs *AverageInternalToPanstarrs (Average *in, int Nvalues);
+
+Measure          *MeasureLoneosToInternal (MeasureLoneos *in, int Nvalues);
+Measure          *MeasureElixirToInternal (MeasureElixir *in, int Nvalues);
+Measure          *MeasurePanstarrsToInternal (MeasurePanstarrs *in, int Nvalues);
+
+MeasureLoneos    *MeasureInternalToLoneos (Measure *in, int Nvalues);
+MeasureElixir    *MeasureInternalToElixir (Measure *in, int Nvalues);
+MeasurePanstarrs *MeasureInternalToPanstarrs (Measure *in, int Nvalues);
+
+SecFilt          *SecFiltLoneosToInternal (SecFiltLoneos *in, int Nvalues);
+SecFilt          *SecFiltElixirToInternal (SecFiltElixir *in, int Nvalues);
+SecFilt          *SecFiltPanstarrsToInternal (SecFiltPanstarrs *in, int Nvalues);
+
+SecFiltLoneos    *SecFiltInternalToLoneos (SecFilt *in, int Nvalues);
+SecFiltElixir    *SecFiltInternalToElixir (SecFilt *in, int Nvalues);
+SecFiltPanstarrs *SecFiltInternalToPanstarrs (SecFilt *in, int Nvalues);
 
 /*** DVO image db I/O Functions ***/
@@ -345 +347 @@
 int dvo_image_addrows (FITS_DB *db, Image *new, int Nnew);
 void dvo_image_create (FITS_DB *db, double ZeroPoint);
-
-int FtableToImage (FTable *ftable, Header *theader, int *format);
-int ImageToFtable (FTable *ftable, Header *theader, int format);
-int ImageToVtable (VTable *vtable, Header *theader, int format);
-Image *ImageElixirToInternal (ImageElixir *in, int Nvalues);
-ImageElixir *ImageInternalToElixir (Image *in, int Nvalues);
-Image *ImageLoneosToInternal (ImageLoneos *in, int Nvalues);
-ImageLoneos *ImageInternalToLoneos (Image *in, int Nvalues);
-Image *ImagePanstarrsToInternal (ImagePanstarrs *in, int Nvalues);
-ImagePanstarrs *ImageInternalToPanstarrs (Image *in, int Nvalues);
 
 /* skyregion APIs */