Changeset 41606 for branches/eam_branches/relphot.20210521/src/MosaicOps.c

Timestamp:

May 21, 2021, 2:04:53 PM (5 years ago)

Author:

eugene

Message:

I have stripped out all flatcorr references : flat correction is applied by setphot

File:

• branches/eam_branches/relphot.20210521/src/MosaicOps.c (modified) (14 diffs)

branches/eam_branches/relphot.20210521/src/MosaicOps.c

@@ -1 +1 @@
 # include "relphot.h"
 off_t findMosaic (unsigned int *startTimes, off_t Nmosaic, unsigned int start);
-int save_test_mosaic_measures (FILE *fout, int Nmos, Catalog *catalog, FlatCorrectionTable *flatcorr);
+int save_test_mosaic_measures (FILE *fout, int Nmos, Catalog *catalog);
 
 // see discussion in ImagesOps.c re: IDX_T
@@ -818 +818 @@
   Catalog *catalog;
   Image *image;
-  FlatCorrectionTable *flatcorr;
   SetMmosInfo info;
 } ThreadInfo;
 
-int setMmos_mosaic (Mosaic *mosaic, off_t Nmos, Image *image, Catalog *catalog, SetMmosInfo *info, FlatCorrectionTable *flatcorr);
+int setMmos_mosaic (Mosaic *mosaic, off_t Nmos, Image *image, Catalog *catalog, SetMmosInfo *info);
 void *setMmos_worker (void *data);
-int setMmos_threaded (Catalog *catalog, FlatCorrectionTable *flatcorr);
+int setMmos_threaded (Catalog *catalog);
 
 void SetMmosInfoInit (SetMmosInfo *info, off_t Nmax, int allocLists) {
@@ -890 +889 @@
 }
 
-int setMmos (Catalog *catalog, FlatCorrectionTable *flatcorr) {
+int setMmos (Catalog *catalog) {
 
   off_t i, N, Nmax;
@@ -903 +902 @@
   // so do not run setMmos in threaded mode if PLOTSTUFF is set
   if (NTHREADS && !PLOTSTUFF) {
-    int status = setMmos_threaded (catalog, flatcorr);
+    int status = setMmos_threaded (catalog);
     return status;
   }
@@ -923 +922 @@
 
   for (i = 0; i < Nmosaic; i++) {
-    setMmos_mosaic (&mosaic[i], i, image, catalog, &info, flatcorr);
+    setMmos_mosaic (&mosaic[i], i, image, catalog, &info);
   }
   SetMmosInfoFree (&info);
@@ -940 +939 @@
   
 // 'mosaic' is a pointer to the current mosaic of interest (Nmos)
-int setMmos_mosaic (Mosaic *myMosaic, off_t Nmos, Image *image, Catalog *catalog, SetMmosInfo *info, FlatCorrectionTable *flatcorr) {
+int setMmos_mosaic (Mosaic *myMosaic, off_t Nmos, Image *image, Catalog *catalog, SetMmosInfo *info) {
 
   off_t j, NimageReal;
@@ -1021 +1020 @@
     snprintf (filename, 64, "test.%05d.%02d.dat", (int) Nmos, npass_output);
     fout = fopen (filename, "w");
-    save_test_mosaic_measures (fout, Nmos, catalog, flatcorr);
+    save_test_mosaic_measures (fout, Nmos, catalog);
     fclose (fout);
   }
@@ -1072 +1071 @@
     // the flat-correction.  NOTE the sign of Mflat (Image.Mcal = Measure.Mcal - Mflat)
 
-    float Mflat = getMflat (m, c, flatcorr, catalog);
+    float Mflat = getMflat (m, c, catalog);
 
     off_t n = catalog[c].measureT[m].averef;
@@ -1187 +1186 @@
 }
   
-int save_test_mosaic_measures (FILE *fout, int Nmos, Catalog *catalog, FlatCorrectionTable *flatcorr) {
+int save_test_mosaic_measures (FILE *fout, int Nmos, Catalog *catalog) {
 
   int Nsecfilt = GetPhotcodeNsecfilt ();
@@ -1201 +1200 @@
     float Mgrid    = getMgridTiny (&catalog[c].measureT[m]);
     float MrelPSF  = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
-    float Mflat    = getMflat (m, c, flatcorr, catalog);
+    float Mflat    = getMflat (m, c, catalog);
 
     off_t n = catalog[c].measureT[m].averef;
@@ -1215 +1214 @@
 }
 
-int setMmos_threaded (Catalog *catalog, FlatCorrectionTable *flatcorr) {
+int setMmos_threaded (Catalog *catalog) {
 
   int i;
@@ -1252 +1251 @@
     threadinfo[i].catalog  =  catalog;
     threadinfo[i].image    =    image;
-    threadinfo[i].flatcorr = flatcorr;
 
     // we do NOT allocate the arrays here, we only supply basic info (Nmax, Nloop) used in
@@ -1321 +1319 @@
 
     Catalog *catalog = threadinfo->catalog;
-    FlatCorrectionTable *flatcorr = threadinfo->flatcorr;
     Image *image = threadinfo->image;
 
-    setMmos_mosaic (&mosaic[i], i, image, catalog, &results, flatcorr);
+    setMmos_mosaic (&mosaic[i], i, image, catalog, &results);
     SetMmosInfoAccum (&threadinfo->info, &results);
   }
@@ -1599 +1596 @@
 }
 
-StatType statsMosaicN (Catalog *catalog, FlatCorrectionTable *flatcorr) {
+StatType statsMosaicN (Catalog *catalog) {
 
   off_t i, j, m, c, n, N;