Changeset 40295 for trunk

Timestamp:

Dec 13, 2017, 5:46:34 PM (9 years ago)

Author:

eugene

Message:

pass secfilt->flags out as filtflags

Location:

trunk/Ohana/src/dvopsps

Files:

• include/dvopsps.h (modified) (2 diffs)
• src/insert_detections_dvopsps_catalog.c (modified) (8 diffs)

trunk/Ohana/src/dvopsps/include/dvopsps.h

@@ -36 +36 @@
   unsigned int flags;
   unsigned int objflags;
+  unsigned int filtflags;
 } Detections;
 
@@ -99 +100 @@
 int    insert_detections_mysql_array      PROTO((MYSQL *mysql, Detections *detections, int Ndetections));
 int    insert_detections_mysql_detvalue   PROTO((IOBuffer *buffer, Detections *detection));
-int    assign_detection_values            PROTO((Detections *detection, Measure *measure, Average *average));
+int    assign_detection_values            PROTO((Detections *detection, Measure *measure, Average *average, SecFilt *secfilt));
 
 int    init_detections                    PROTO((void));

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -19 +19 @@
 
   ZeroPoint = GetZeroPoint();
+  int Nsecfilt = GetPhotcodeNsecfilt ();
 
   int missingID = 0;
@@ -51 +52 @@
       if (measure->photcode >=  PHOTCODE_END) continue;
 
-      assign_detection_values (&detections[Ndetections], measure, average);
+      int equivCode = GetPhotcodeEquivCodebyCode (measure->photcode);
+      int Nsec = GetPhotcodeNsec (equivCode);
+
+      SecFilt *secfilt = (Nsec >= 0) ? &catalog->secfilt[Nsecfilt*i + Nsec] : NULL;
+
+      assign_detection_values (&detections[Ndetections], measure, average, secfilt);
       Ndetections ++;
 
@@ -97 +103 @@
 
   ZeroPoint = GetZeroPoint();
+  int Nsecfilt = GetPhotcodeNsecfilt ();
 
   INITTIME;
@@ -127 +134 @@
       if (measure[Nmeas].photcode >=  PHOTCODE_END) continue;
 
+      int equivCode = GetPhotcodeEquivCodebyCode (measure[Nmeas].photcode);
+      int Nsec = GetPhotcodeNsec (equivCode);
+
+      SecFilt *secfilt = (Nsec > -1) ? &catalog->secfilt[Nsecfilt*i + Nsec] : NULL;
+
       // XXX check return status
       Detections detection;
-      assign_detection_values (&detection, &measure[Nmeas], &average[i]);
+      assign_detection_values (&detection, &measure[Nmeas], &average[i], secfilt);
 
       if (!insert_detections_mysql_detvalue (&buffer, &detection)) {
@@ -184 +196 @@
   PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (objID, detectID, ippObjID, ippDetectID, imageID, catID, ");
   PrintIOBuffer (buffer, "ra, dec_, raErr, decErr, zpPSF, zpFactorPSF, zpAPER, zpFactorAPER, telluricExt, airmass, expTime, ");
-  PrintIOBuffer (buffer, "Mpsf, dMpsf, Mkron, dMkron, Map, dMap, flags, objflags) VALUES \n");
+  PrintIOBuffer (buffer, "Mpsf, dMpsf, Mkron, dMkron, Map, dMap, flags, objflags, filtflags) VALUES \n");
 
   return TRUE;
@@ -270 +282 @@
 
   PrintIOBuffer (buffer, "%u, ", detection->flags);      // measure.flags
-  PrintIOBuffer (buffer, "%u),\n", detection->objflags); // average.flags
+  PrintIOBuffer (buffer, "%u, ", detection->objflags); // average.flags
+  PrintIOBuffer (buffer, "%u),\n", detection->filtflags); // secfilt.flags
   return TRUE;
 }
@@ -305 +318 @@
 }
 
-int assign_detection_values (Detections *detection, Measure *measure, Average *average) {
+int assign_detection_values (Detections *detection, Measure *measure, Average *average, SecFilt *secfilt) {
 
   // myAbort ("check on measure->McalPSF vs McalAPER");
@@ -355 +368 @@
   detection->flags     = measure->dbFlags; // flags
   detection->objflags  = average->flags;   // flags
-
-  return TRUE;
-}
-
+  detection->filtflags = secfilt ? secfilt->flags : 0; // flags
+
+  return TRUE;
+}
+