Changeset 42073 for branches/eam_branches/ipp-20211108

Timestamp:

Feb 28, 2022, 10:52:06 AM (4 years ago)

Author:

eugene

Message:

add code to calculate averages for the radial aperture mags

Location:

branches/eam_branches/ipp-20211108/Ohana/src/relphot

Files:

• Makefile (modified) (2 diffs)
• include/lensing.h (added)
• include/relphot.h (modified) (2 diffs)
• src/args.c (modified) (1 diff)
• src/lensing.c (added)
• src/reload_catalogs.c (modified) (2 diffs)
• src/relphot_images.c (modified) (1 diff)
• src/setXradAverages.c (added)

branches/eam_branches/ipp-20211108/Ohana/src/relphot/Makefile

@@ -54 +54 @@
 $(SRC)/save_images.$(ARCH).o     \
 $(SRC)/MagResidSave.$(ARCH).o    \
+$(SRC)/setXradAverages.$(ARCH).o         \
+$(SRC)/lensing.$(ARCH).o         \
 $(SRC)/synthetic_mags.$(ARCH).o  \
 $(SRC)/plot_scatter.$(ARCH).o    \
@@ -117 +119 @@
 $(SRC)/save_images.$(ARCH).o     \
 $(SRC)/MagResidSave.$(ARCH).o    \
+$(SRC)/setXradAverages.$(ARCH).o         \
+$(SRC)/lensing.$(ARCH).o         \
 $(SRC)/load_catalogs.$(ARCH).o   \
 $(SRC)/reload_catalogs.$(ARCH).o \

branches/eam_branches/ipp-20211108/Ohana/src/relphot/include/relphot.h

@@ -486 +486 @@
 char  *OUTROOT;
 char  *UPDATE_CATFORMAT;
+int    UPDATE_XRAD;
 int    PLOTDELAY;
 int    UpdateAverages;
@@ -877 +878 @@
 
 int MagResidSave(char *filename, Catalog *catalog);
+int setXradAverages (Catalog *catalog);
 
 void ResetAverageAndMeasure (Catalog *catalog);

branches/eam_branches/ipp-20211108/Ohana/src/relphot/src/args.c

@@ -259 +259 @@
     UPDATE_CATFORMAT = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
+  }
+
+  UPDATE_XRAD = FALSE;
+  if ((N = get_argument (argc, argv, "-update-xrad-average"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_XRAD = TRUE;
   }
 

branches/eam_branches/ipp-20211108/Ohana/src/relphot/src/reload_catalogs.c

@@ -55 +55 @@
 
     catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    // if we want to update the average XRAD values in lensobj, need to load lensobj and lensing
+    if (UPDATE_XRAD || UPDATE_CATFORMAT) {
+      catalog.catflags |= DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
+    }
     // if we are going to update the format, we should update all tables
     if (UPDATE_CATFORMAT) {
-      catalog.catflags |= DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
+      catalog.catflags |= DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
     }
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
@@ -87 +91 @@
     setMrelFinal (&catalog, FALSE);
     TIMESTAMP(time6);
+
+    if (UPDATE_XRAD) {
+      setXradAverages (&catalog);
+    }
 
     // modify the output format as desired (ignore current format on disk)

branches/eam_branches/ipp-20211108/Ohana/src/relphot/src/relphot_images.c

@@ -133 +133 @@
     // if (GRID_ZEROPT) dump_grid ();
 
+    setMcal  (catalog);
+    setMmos  (catalog);
+    setMgrp  (catalog);
     MARKTIME("-- finalize Mcal values: %f sec\n", dtime);