Changeset 43068 for branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimInsertStars.c

Timestamp:

Jul 3, 2026, 3:08:04 PM (4 weeks ago)

Author:

eugene

Message:

add -mjd-obs; add chip & cell names to output test file; more trace verbosity; fix chebyshev scales for bias variations

File:

• branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimInsertStars.c (modified) (6 diffs)

branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimInsertStars.c

@@ -31 +31 @@
     float nSigmaLim = psMetadataLookupF32(NULL, recipe, "STARS.SIGMA.LIM"); // significance of faintest stars
 
+    char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // 
+    char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // 
+
     float readnoise = psMetadataLookupF32(NULL, cell->concepts, "CELL.READNOISE");// CCD read noise, e
     if (isnan(readnoise)) {
@@ -62 +65 @@
     assert (psf);
 
+    // EAM : I think this dX,dY double-counts the offset applied to xChip,yChip in pmSourceFromModel
     int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);
     int dY = PM_CELL_TO_CHIP (0.0, y0Cell, yParityCell, binning);
+    dX = 0; dY = 0;
 
     psArray *sources = psArrayAllocEmpty (stars->n);
@@ -70 +75 @@
     char outname[1024];
     char *outroot = psMetadataLookupStr(&mdok, config->arguments, "OUTPUT");
-    sprintf (outname, "%s.dat", outroot);
+    sprintf (outname, "%s.%s.%s.dat", outroot, chipName, cellName);
 
     FILE *outfile = fopen (outname, "w");
@@ -81 +86 @@
     for (long i = 0; i < stars->n; i++) {
         ppSimStar *star = stars->data[i];
-        psTrace("ppSim", 10, "Inserting star at %.1f,%.1f --> %.2f\n", star->x, star->y, star->flux);
-
         // star->x,y are in fpa coordinates
 
@@ -92 +95 @@
         float xCell = PM_CHIP_TO_CELL(xChip, x0Cell, xParityCell, binning);
         float yCell = PM_CHIP_TO_CELL(yChip, y0Cell, yParityCell, binning);
+
+        psTrace("ppSim", 10, "Inserting star at %.1f %.1f --> %.2f : %.1f %.1f : %.1f %.1f\n", star->x, star->y, star->flux, xChip, yChip, xCell, yCell);
 
         // XXX Note, the below does not put the edges of stars on the readout if they fall slightly off
@@ -105 +110 @@
 
         // instantiate a model for the PSF at this location, set desired flux
+        // EAM : we use xChip,yChip here, corrected to xCell,yCell in pmSourceFromModel
         pmModel *model = pmModelFromPSFforXY (psf, xChip, yChip, 1.0);
         pmModelSetFlux (model, flux);