Changeset 41606 for branches/eam_branches/relphot.20210521/src/setMrelCatalog.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/setMrelCatalog.c (modified) (6 diffs)

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

@@ -60 +60 @@
 int useOLS = TRUE; // chosen based on iteration below
 
-int setMrel_catalog_alt (Catalog *catalog, int Nc, int isSetMrelFinal, FlatCorrectionTable *flatcorr, SetMrelInfo *results, int Nsecfilt) {
+int setMrel_catalog_alt (Catalog *catalog, int Nc, int isSetMrelFinal, SetMrelInfo *results, int Nsecfilt) {
 
   off_t j;
@@ -75 +75 @@
 
     if (STAGES & STAGE_CHIP) {
-      setMrelAverageExposure (&catalog[Nc], Nc, j, Nsecfilt, isSetMrelFinal, flatcorr, results);
+      setMrelAverageExposure (&catalog[Nc], Nc, j, Nsecfilt, isSetMrelFinal, results);
     }
 
     // only apply Stack operation on setMrelFinal in first pass 
     if (isSetMrelFinal && (STAGES & STAGE_STACK) && !IS_DIFF_DB) {
-      setMrelAverageStack (&catalog[Nc], Nc, j, Nsecfilt, flatcorr);
+      setMrelAverageStack (&catalog[Nc], Nc, j, Nsecfilt);
     }
 
     // only measure force-warp mean values if issetMrelFinal (make it optional?)
     if (isSetMrelFinal && (STAGES & STAGE_WARP)) {
-      setMrelAverageForcedWarp (&catalog[Nc], Nc, j, Nsecfilt, flatcorr, results);
+      setMrelAverageForcedWarp (&catalog[Nc], Nc, j, Nsecfilt, results);
     }
   }
@@ -113 +113 @@
 
 // set mean of chip measurements (selected by photcode range for now):
-int setMrelAverageExposure (Catalog *catalog, int cat, off_t ave, int Nsecfilt, int isSetMrelFinal, FlatCorrectionTable *flatcorr, SetMrelInfo *results) {
+int setMrelAverageExposure (Catalog *catalog, int cat, off_t ave, int Nsecfilt, int isSetMrelFinal, SetMrelInfo *results) {
 
   int Nsec;
@@ -270 +270 @@
 
     // XXX I am not convinced the sign on Mflat here is correct
-    float Moff =  Mflat + Mcal + Mmos + Mgrp + Mgrid;
+    float Moff =  Mcal + Mmos + Mgrp + Mgrid - Mflat;
 
     if (isSetMrelFinal) {
@@ -552 +552 @@
 // measure->McalAPER to image->McalPSF for chips and warps, but not stacks
 
-int setMrelAverageStack (Catalog *catalog, int cat, off_t ave, int Nsecfilt, FlatCorrectionTable *flatcorr) {
+int setMrelAverageStack (Catalog *catalog, int cat, off_t ave, int Nsecfilt) {
 
   // we are guaranteed to have average, measure, secfilt
@@ -884 +884 @@
 // chips and warps, but not stacks
 
-int setMrelAverageForcedWarp (Catalog *catalog, int cat, off_t ave, int Nsecfilt, FlatCorrectionTable *flatcorr, SetMrelInfo *results) {
-  OHANA_UNUSED_PARAM(flatcorr);
+int setMrelAverageForcedWarp (Catalog *catalog, int cat, off_t ave, int Nsecfilt, SetMrelInfo *results) {
 
   // we are guaranteed to have average, measure, secfilt