Index: branches/eam_branches/relphot.20210521/include/relphot.h =================================================================== --- branches/eam_branches/relphot.20210521/include/relphot.h (revision 41604) +++ branches/eam_branches/relphot.20210521/include/relphot.h (revision 41606) @@ -518,5 +518,5 @@ int bcatalog PROTO((Catalog *subcatalog, Catalog *catalog, int Ncat)); void clean_images PROTO((void)); -void clean_measures PROTO((Catalog *catalog, int Ncatalog, int final, FlatCorrectionTable *flatcorr)); +void clean_measures PROTO((Catalog *catalog, int Ncatalog, int final)); void clean_mosaics PROTO((void)); void clean_tgroups PROTO((void)); @@ -555,5 +555,5 @@ float getMcal PROTO((off_t meas, int cat, dvoMagClassType class)); -float getMflat PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, Catalog *catalog)); +float getMflat PROTO((off_t meas, int cat, Catalog *catalog)); float getMgridTiny PROTO((MeasureTiny *measure)); float getMgrid PROTO((Measure *measure)); @@ -566,5 +566,5 @@ Image *getimages PROTO((off_t *N, off_t **LineNumber)); ImageSubset *getimages_subset PROTO((off_t *N)); -void global_stats PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr, int nloop)); +void global_stats PROTO((Catalog *catalog, int Ncatalog, int nloop)); void initGrid PROTO(()); void initGridBins PROTO(()); @@ -621,5 +621,5 @@ void plot_mosaic_fields PROTO((Catalog *catalog)); void plot_mosaics PROTO((void)); -void plot_scatter PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr)); +void plot_scatter PROTO((Catalog *catalog, int Ncatalog)); void plot_star_coords PROTO((Catalog *catalog, int Ncatalog)); void plot_stars PROTO((Catalog *catalog, int Ncatalog)); @@ -630,5 +630,5 @@ int open_graph PROTO((int N)); -void reload_catalogs PROTO((SkyList *skylist, FlatCorrectionTable *flatcorr, int hostID, char *hostpath)); +void reload_catalogs PROTO((SkyList *skylist, int hostID, char *hostpath)); int reload_catalogs_parallel PROTO((SkyList *sky)); int reload_images PROTO((FITS_DB *db)); @@ -639,20 +639,20 @@ void setMcalFromMosaics PROTO((void)); void setMcalFromTGroups PROTO((void)); -int setMcalOutput PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr)); - -void setMcal PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr)); -int setMmos PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr)); -int setMgrp PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr)); - -int setMrel PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr)); -void setMrelFinal PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr, int simpleAverage)); -int setMrelOutput PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr)); - -void setMcalTest PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr)); +int setMcalOutput PROTO((Catalog *catalog, int Ncatalog)); + +void setMcal PROTO((Catalog *catalog)); +int setMmos PROTO((Catalog *catalog)); +int setMgrp PROTO((Catalog *catalog)); + +int setMrel PROTO((Catalog *catalog, int Ncatalog)); +void setMrelFinal PROTO((Catalog *catalog, int simpleAverage)); +int setMrelOutput PROTO((Catalog *catalog, int Ncatalog)); + +void setMcalTest PROTO((Catalog *catalog)); int setMave PROTO((Catalog *catalog, int Ncatalog)); void set_ZP PROTO((double ZERO)); int setrefcode PROTO((Image *image, off_t Nimage)); -void skip_measurements PROTO((Catalog *catalog, int pass, FlatCorrectionTable *flatcorr)); +void skip_measurements PROTO((Catalog *catalog, int pass)); void sortA PROTO((double *X, int N)); void sortB PROTO((double *X, double *Y, int N)); @@ -660,9 +660,9 @@ void sortD PROTO((double *X, double *Y, double *Z, int N)); StatType statsImageM PROTO((Catalog *catalog)); -StatType statsImageN PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr)); +StatType statsImageN PROTO((Catalog *catalog)); StatType statsImageX PROTO((Catalog *catalog)); StatType statsImagedM PROTO((Catalog *catalog)); StatType statsMosaicM PROTO((Catalog *catalog)); -StatType statsMosaicN PROTO((Catalog *catalog, FlatCorrectionTable *flatcorr)); +StatType statsMosaicN PROTO((Catalog *catalog)); StatType statsMosaicX PROTO((Catalog *catalog)); StatType statsMosaicdM PROTO((Catalog *catalog)); @@ -671,5 +671,5 @@ StatType statsTGroupdM PROTO((Catalog *catalog)); -StatType statsStarN PROTO((Catalog *catalog, int Ncatalog, int Nsec, int seccode, FlatCorrectionTable *flatcorr)); +StatType statsStarN PROTO((Catalog *catalog, int Ncatalog, int Nsec, int seccode)); StatType statsStarS PROTO((Catalog *catalog, int Ncatalog, int Nsec)); StatType statsStarX PROTO((Catalog *catalog, int Ncatalog, int Nsec)); @@ -717,8 +717,8 @@ int print_measure_set_alt (Average *average, SecFilt *secfilt, Measure *measure); -int setMrel_catalog_alt (Catalog *catalog, int Nc, int isSetMrelFinal, FlatCorrectionTable *flatcorr, SetMrelInfo *results, int Nsecfilt); -int setMrelAverageExposure (Catalog *catalog, int cat, off_t ave, int Nsecfilt, int isSetMrelFinal, FlatCorrectionTable *flatcorr, SetMrelInfo *results); -int setMrelAverageStack (Catalog *catalog, int cat, off_t ave, int Nsecfilt, FlatCorrectionTable *flatcorr); -int setMrelAverageForcedWarp (Catalog *catalog, int cat, off_t ave, int Nsecfilt, FlatCorrectionTable *flatcorr, SetMrelInfo *results); +int setMrel_catalog_alt (Catalog *catalog, int Nc, int isSetMrelFinal, SetMrelInfo *results, int Nsecfilt); +int setMrelAverageExposure (Catalog *catalog, int cat, off_t ave, int Nsecfilt, int isSetMrelFinal, SetMrelInfo *results); +int setMrelAverageStack (Catalog *catalog, int cat, off_t ave, int Nsecfilt); +int setMrelAverageForcedWarp (Catalog *catalog, int cat, off_t ave, int Nsecfilt, SetMrelInfo *results); int setGlobalObjStats (Average *average, Measure *measure);