Changeset 39564 for trunk

Timestamp:

Apr 29, 2016, 12:08:42 PM (10 years ago)

Author:

eugene

Message:

limit objects, FWobjects, FGshape to objects with PS1 data

Location:

trunk/Ohana/src/dvopsps/src

Files:

• insert_FGshape_dvopsps.c (modified) (1 diff)
• insert_FGshape_dvopsps_catalog.c (modified) (3 diffs)
• insert_FWobjects_dvopsps_catalog.c (modified) (2 diffs)
• insert_objects_dvopsps_catalog.c (modified) (2 diffs)

trunk/Ohana/src/dvopsps/src/insert_FGshape_dvopsps.c

@@ -52 +52 @@
     dvo_catalog_init (&catalog, TRUE);
     catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
-    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_GALPHOT;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_GALPHOT;
 
     if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "r")) {

trunk/Ohana/src/dvopsps/src/insert_FGshape_dvopsps_catalog.c

@@ -13 +13 @@
 
   Average *average = catalog->average;
+  SecFilt *secfilt = catalog->secfilt;
   GalPhot *galphot = catalog->galphot;
+  int Nsecfilt = catalog->Nsecfilt;
 
   off_t found = 0;
@@ -28 +30 @@
   int Ninsert = 0;
 
+  int hasPS1_flag = ID_SECF_HAS_PS1 | ID_SECF_HAS_PS1_STACK;
+
   // NOTE for testing, just do a few objects
   if (!mysql) {
@@ -37 +41 @@
       missingID ++;
     }
+
+    int hasPS1 = FALSE;
+    for (int j = 0; !hasPS1 && (j < Nsecfilt); j++) {
+      if (secfilt[i*Nsecfilt + j].flags & hasPS1_flag) hasPS1 = TRUE;
+    }
+    if (!hasPS1) continue; // skip non-PS1 data
 
     off_t m = average[i].galphotOffset;

trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c

@@ -31 +31 @@
   int Ninsert = 0;
 
+  int hasPS1_flag = ID_SECF_HAS_PS1 | ID_SECF_HAS_PS1_STACK;
+
   // NOTE for testing, just do a few objects
   if (!mysql) {
@@ -40 +42 @@
       missingID ++;
     }
+
+    int hasPS1 = FALSE;
+    for (int j = 0; !hasPS1 && (j < Nsecfilt); j++) {
+      if (secfilt[i*Nsecfilt + j].flags & hasPS1_flag) hasPS1 = TRUE;
+    }
+    if (!hasPS1) continue; // skip non-PS1 data
 
     off_t m = average[i].lensobjOffset;

trunk/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

@@ -28 +28 @@
   int Ninsert = 0;
 
+  int hasPS1_flag = ID_SECF_HAS_PS1 | ID_SECF_HAS_PS1_STACK;
+
   // NOTE for testing, just do a few objects
   if (!mysql) {
@@ -37 +39 @@
       missingID ++;
     }
+
+    int hasPS1 = FALSE;
+    for (int j = 0; !hasPS1 && (j < Nsecfilt); j++) {
+      if (secfilt[i*Nsecfilt + j].flags & hasPS1_flag) hasPS1 = TRUE;
+    }
+    if (!hasPS1) continue; // skip non-PS1 data
 
     // XXX check return status