Changeset 38851 for trunk

Timestamp:

Oct 13, 2015, 11:40:28 AM (11 years ago)

Author:

eugene

Message:

add zpFactor, REGION_ID

Location:

trunk/Ohana/src/dvopsps

Files:

• include/dvopsps.h (modified) (1 diff)
• src/insert_detections_dvopsps_catalog.c (modified) (4 diffs)
• src/insert_skytable.c (modified) (1 diff)

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

@@ -20 +20 @@
   float decErr;
   float zp;
+  float zpFactor;
   float telluricExt;
   float airmass;

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

@@ -186 +186 @@
 
   PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (objID, detectID, ippObjID, ippDetectID, imageID, catID, ");
-  PrintIOBuffer (buffer, "ra, dec_, raErr, decErr, zp, telluricExt, airmass, expTime, ");
+  PrintIOBuffer (buffer, "ra, dec_, raErr, decErr, zp, zpFactor, telluricExt, airmass, expTime, ");
   PrintIOBuffer (buffer, "Mpsf, dMpsf, Mkron, dMkron, Map, dMap, flags) VALUES \n");
 
@@ -256 +256 @@
   PRINT_FLOAT(buffer, detection->decErr,      "%.6f, ");
   PRINT_FLOAT(buffer, detection->zp,          "%.6f, ");
+  PRINT_FLOAT(buffer, detection->zpFactor,    "%.6e, ");
   PRINT_FLOAT(buffer, detection->telluricExt, "%.6f, ");
   PRINT_FLOAT(buffer, detection->airmass,     "%.6f, ");
@@ -310 +311 @@
   float nominalZP   = code->C * 0.001 + code->K * (measure->airmass - 1);
   float zp          = nominalZP - measure->Mcal;
+  float zpFactor    = pow(10.0, -0.4*zp + 3.56);
   float telluricExt = - measure->Mcal;
   float expTime     = pow(10.0, 0.4 * measure->dt);
@@ -327 +329 @@
 
   detection->zp           = zp;
+  detection->zpFactor     = zpFactor;
   detection->telluricExt  = telluricExt;
   detection->airmass      = airmass;

trunk/Ohana/src/dvopsps/src/insert_skytable.c

@@ -64 +64 @@
   }
 
-  PrintIOBuffer (buffer, "INSERT INTO dvoSkyTable (R_MIN, R_MAX, D_MIN, D_MAX, INDEX_, NAME) VALUES \n");
+  PrintIOBuffer (buffer, "INSERT INTO dvoSkyTable (R_MIN, R_MAX, D_MIN, D_MAX, REGION_ID, NAME) VALUES \n");
 
   return TRUE;