Changeset 42066

Timestamp:

Feb 24, 2022, 4:36:25 PM (4 years ago)

Author:

eugene

Message:

fix counting of Nmeas values; do not segfault of measure is not supplied; do not reset dbFlags ID_MEAS bits here

File:

• branches/eam_branches/ipp-20211108/Ohana/src/relphot/src/setMrelCatalog.c (modified) (7 diffs)

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

@@ -133 +133 @@
 int setMrelAverageExposure (Catalog *catalog, int cat, off_t ave, int Nsecfilt, int isSetMrelFinal, SetMrelInfo *results) {
 
-  int Nsec;
   off_t k;
 
@@ -179 +178 @@
     // these bits should not be set unless we use them in this pass
     // (note that we can only un-set them in the final pass when we actually have measure, not just measureT
-    if (measure) measure[k].dbFlags &= ~(ID_MEAS_PHOTOM_PSF | ID_MEAS_PHOTOM_APER | ID_MEAS_PHOTOM_KRON);
+    // CCL updated 2021.12.09:  the following line will reset the dbFlags for measure so I comment it out.
+    // if (measure) measure[k].dbFlags &= ~(ID_MEAS_PHOTOM_PSF | ID_MEAS_PHOTOM_APER | ID_MEAS_PHOTOM_KRON);
 
     // skip measurements that do not have a valid photcode (raise exception?)
@@ -272 +272 @@
 
       // the flat-field correction is stored in measure.Mflat
-      Mflat = isnan (measureT[k].Mflat) ? 0.0 : measureT[k].Mflat;
+      //Mflat = isnan (measureT[k].Mflat) ? 0.0 : measureT[k].Mflat;
+      if (measure) {
+        Mflat = isnan (measure[k].Mflat) ? 0.0 : measure[k].Mflat;
+      }
 
       // see note above re: final output vs image analysis
@@ -322 +325 @@
         results->aperData[Nsec].errlist[Nap] = dMap;
         results->aperData[Nsec].wgtlist[Nap] = modifiedWeight;
-        results->aperData[Nsec].ranking[Nap] = measureRank[k];
+        results->aperData[Nsec].ranking[Nap] = measureRank ? measureRank[k] : 0;
         results->aperData[Nsec].measSeq[Nap] = k;
         results->aperData[Nsec].msklist[Nap] = 0;
@@ -383 +386 @@
   float psfQfPerfMax = 0.0;
 
-  // now calculate the mean stats for the Nsec bands.
-  for (Nsec = 0; Nsec < Nsecfilt; Nsec++) {
+  // now calculate the mean stats for the selected Nsec bands.
+  for (int Ns = 0; Ns < Nphotcodes; Ns++) {
+    int thisCode = photcodes[Ns][0].code;
+    int Nsec = GetPhotcodeNsec(thisCode);
 
     // -preserve-ps1 means keep an existing average PS1 value
@@ -477 +482 @@
       secfilt[Nsec].dMkronChp = kronstats->error; 
       secfilt[Nsec].sMkronChp = kronstats->sigma; 
-      secfilt[Nsec].NusedKron = NrankingKRON;
+      // actually used is Nmeas, NrankingKRON is including masked data
+      secfilt[Nsec].NusedKron = kronstats->Nmeas;
     }
 
@@ -521 +527 @@
         secfilt[Nsec].dMapChp = apstats->error; 
         secfilt[Nsec].sMapChp = apstats->sigma; 
-        secfilt[Nsec].NusedAp = NrankingAPER;
+        // actually used is Nmeas, NrankingAPER is including masked data
+        secfilt[Nsec].NusedAp = apstats->Nmeas;
       }
       int minRankAper = (NrankingAPER > 0) ? results->aperData[Nsec].ranking[0] : 10;