Changeset 41646

Timestamp:

Jun 7, 2021, 4:11:39 PM (5 years ago)

Author:

eugene

Message:

add options to allow PS1, PS2, Megacam, HSC grids to be independently set

Location:

branches/eam_branches/relphot.20210521

Files:

• include/relphot.h (modified) (1 diff)
• src/GridOps.c (modified) (4 diffs)
• src/args.c (modified) (1 diff)

branches/eam_branches/relphot.20210521/include/relphot.h

@@ -438 +438 @@
 int    TGROUP_ZEROPT;
 int    GRID_ZEROPT;
+
+int    GRID_BIN_HSC;
+int    GRID_BIN_CFH;
+int    GRID_BIN_GPC1;
+int    GRID_BIN_GPC2;
 
 int    FREEZE_IMAGES;

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

@@ -19 +19 @@
 static int                 NGridCorr = 0;
 
-# if (1)
+# if (0)
 /* PS1 / PS2 values */
 # define NX_CHIP 4900
@@ -25 +25 @@
 # define NX_BIN 16
 # define NY_BIN 16
-# else
+# endif
+
 /* test values */
-# define NX_CHIP 1000
-# define NY_CHIP 1000
-# define NX_BIN 2
-# define NY_BIN 2
-# endif
+# define NX_CHIP_DEFAULT 1000
+# define NY_CHIP_DEFAULT 1000
+# define NX_BIN_DEFAULT 2
+# define NY_BIN_DEFAULT 2
 
 void initGridBins (void) {
@@ -141 +141 @@
     if (!code) continue;
 
+    int NX_CHIP = NX_CHIP_DEFAULT;
+    int NY_CHIP = NY_CHIP_DEFAULT;
+    int NX_BIN  = NX_BIN_DEFAULT;
+    int NY_BIN  = NY_BIN_DEFAULT;
+    if (isGPC1chip(code)) { NX_CHIP = 4900; NY_CHIP = 4900; NX_BIN = NY_BIN = GRID_BIN_GPC1; }
+    if (isGPC2chip(code)) { NX_CHIP = 4900; NY_CHIP = 4900; NX_BIN = NY_BIN = GRID_BIN_GPC2; }
+    if (isHSCchip(code))  { NX_CHIP = 2100; NY_CHIP = 4200; NX_BIN = NY_BIN = GRID_BIN_HSC;  }
+    if (isCFHchip(code))  { NX_CHIP = 2100; NY_CHIP = 4200; NX_BIN = NY_BIN = GRID_BIN_CFH;  }
+
     if (GridCorr[code]) continue; // already created this one
 
@@ -150 +159 @@
     GridCorr[code]->Ny = NY_BIN;
     GridCorr[code]->dX = NX_BIN / (float) NX_CHIP;
-    GridCorr[code]->dY = NY_BIN / (float) NX_CHIP;
+    GridCorr[code]->dY = NY_BIN / (float) NY_CHIP;
 
     // we are normally accessing this array randomly, so there is no advantage to

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

@@ -401 +401 @@
     remove_argument (N, &argc, argv);
     GRID_MEANFILE = strcreate (argv[N]); // used by relphot -averages and relphot -apply-offsets
+    remove_argument (N, &argc, argv);
+  }
+
+  GRID_BIN_GPC1 = 16;
+  if ((N = get_argument (argc, argv, "-grid-bin-gpc1"))) {
+    remove_argument (N, &argc, argv);
+    GRID_BIN_GPC1 = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  GRID_BIN_GPC2 = 16;
+  if ((N = get_argument (argc, argv, "-grid-bin-gpc2"))) {
+    remove_argument (N, &argc, argv);
+    GRID_BIN_GPC2 = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  GRID_BIN_HSC = 8;
+  if ((N = get_argument (argc, argv, "-grid-bin-hsc"))) {
+    remove_argument (N, &argc, argv);
+    GRID_BIN_HSC = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  GRID_BIN_CFH = 8;
+  if ((N = get_argument (argc, argv, "-grid-bin-cfh"))) {
+    remove_argument (N, &argc, argv);
+    GRID_BIN_CFH = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }