Changeset 34690 for branches/eam_branches/ipp-20120905/Ohana/src/delstar/src/delete_photcodes.c

Timestamp:

Nov 23, 2012, 8:51:06 PM (14 years ago)

Author:

eugene

Message:

delstar -photcodes works for objects, but not yet images

File:

• branches/eam_branches/ipp-20120905/Ohana/src/delstar/src/delete_photcodes.c (modified) (8 diffs)

branches/eam_branches/ipp-20120905/Ohana/src/delstar/src/delete_photcodes.c

@@ -1 +1 @@
 # include "delstar.h"
-
-# if (0)
-void delete_photcodes (FITS_DB *db, photcodes, Nphotcodes) {
-
-  int found, code;
-  off_t i, j, k, n;
-  off_t Nregions, NREGIONS;
-  off_t *imlist;
-  SkyList *skylist, *skyset;
-  SkyTable *sky;
-  Catalog catalog;
-
-  // xxx where does this go?
-  photcodesDrop = ParsePhotcodeList (PHOTCODE_LIST, &NphotcodesDrop, FALSE);
-
-  /* load sky from correct table */
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, TRUE, SKY_DEPTH, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
-
-  // determine the populated SkyRegions overlapping the requested area (default depth)
-  skylist = SkyListByPatch (sky, -1, &UserPatch);
-
-  // delete images with these photcodes
-  delete_photcodes_catalogs (db, photcodesDrop, NphotcodesDrop);
-
-  fprintf (stderr, "SUCCESS\n");
-  exit (0);
-}
-# endif
 
 int delete_photcodes (SkyList *skylist, int hostID, char *hostpath) {
@@ -73 +44 @@
 
     delete_photcodes_catalog (&catalog, photcodes, Nphotcodes);
-    dvo_catalog_save (&catalog, VERBOSE);
+    dvo_catalog_save_complete (&catalog, VERBOSE);
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
@@ -165 +136 @@
   Measure *measureOut = NULL;
   Average *averageOut = NULL;
+  SecFilt *secfiltOut = NULL;
 
   off_t *measureDrop, *measureSeqRaw, *measureSeqOut, *measureRefOut, *measureAveRaw, *averageNmeas, *averageDmeas, *averageSeqOut, *averageRefOut, *measureAveOut;
+
+  int Nsecfilt = GetPhotcodeNsecfilt ();
 
   /* internal counters */
@@ -174 +148 @@
   Measure *measure = catalog[0].measure;
   Average *average = catalog[0].average;
+  SecFilt *secfilt = catalog[0].secfilt;
   
   if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT"\n",  catalog[0].Naverage,  catalog[0].Nmeasure);
@@ -286 +261 @@
   }
 
+  // copy the secfilt entries for the (kept) average entries
+  ALLOCATE (secfiltOut, SecFilt, NaveOut*Nsecfilt);
+  for (i = 0; i < NaveOut; i++) {
+    j = averageSeqOut[i];
+    for (m = 0; m < Nsecfilt; m++) {
+      secfiltOut[i*Nsecfilt + m] = secfilt[j*Nsecfilt + m];
+    }
+  }
+
   // update the values of average.measureOffset and average.Nmeasure
   FREE(measure);
@@ -291 +275 @@
   catalog[0].measure = measureOut;
   catalog[0].average = averageOut;
+  catalog[0].secfilt = secfiltOut;
+  catalog[0].Nmeasure = NmeasOut;
+  catalog[0].Naverage = NaveOut;
 
   // update catalog.Nmeasure and catalog.Naverage, double check 
@@ -296 +283 @@
   int measureOffsetOK = TRUE;
   int averefOK = TRUE;
-  for (i = 0; i < Naverage; i++) {
+  for (i = 0; i < NaveOut; i++) {
     NmeasureTotal += catalog[0].average[i].Nmeasure;
     if (VERBOSE && !(NmeasureTotal <= catalog[0].Nmeasure)) {
@@ -333 +320 @@
 
   catalog[0].sorted = TRUE;
+
+  if (VERBOSE) fprintf (stderr, "ending with Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT"\n",  catalog[0].Naverage,  catalog[0].Nmeasure);
 
   FREE (measureDrop);