Changeset 7393

Timestamp:

Jun 7, 2006, 7:20:35 AM (20 years ago)

Author:

eugene

Message:

dropping old functions and prototypes

Location:

trunk/Ohana/src/delstar

Files:

• Makefile (modified) (2 diffs)
• include/delstar.h (modified) (3 diffs)
• src/orphans.c (modified) (1 diff)
• src/sort_lists.c (modified) (1 diff)

trunk/Ohana/src/delstar/Makefile

@@ -28 +28 @@
 $(SRC)/delete_times.$(ARCH).o     \
 $(SRC)/gimages.$(ARCH).o          \
-$(SRC)/gregion_image.$(ARCH).o    \
-$(SRC)/gregion_patch.$(ARCH).o    \
-$(SRC)/RegionOps.$(ARCH).o        \
 $(SRC)/gcatalog.$(ARCH).o         \
 $(SRC)/wcatalog.$(ARCH).o         \
@@ -39 +36 @@
 $(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o          
+
+OLD = \
+$(SRC)/gregion_image.$(ARCH).o    \
+$(SRC)/gregion_patch.$(ARCH).o    \
+$(SRC)/RegionOps.$(ARCH).o        
 
 default: $(PROGRAM)

trunk/Ohana/src/delstar/include/delstar.h

@@ -39 +39 @@
 void       ConfigInit             PROTO((int *argc, char **argv));
 int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
-int        FindRegionByPoint      PROTO((GSCRegion *region, double ra, double dec, GSCRegion *gsc, int Ngsc));
-int        FindRegionDecBandStart PROTO((GSCRegion *region, int Nregion, double dec));
-int        FindRegionDecBandStop  PROTO((GSCRegion *region, int Nregion, double dec));
 FILE      *GetDB                  PROTO((int *state));
 Image     *GetImages              PROTO((int *nimage));
-GSCRegion *LoadRegions            PROTO((int *nregions));
 int        SetImages              PROTO((Image *new, int Nnew));
 void       SetProtect             PROTO((int mode));
@@ -62 +58 @@
 int        gcatalog               PROTO((Catalog *catalog));
 Image     *gimages                PROTO((char *filename));
-GSCRegion *gregion_image          PROTO((Image *image, int *Nregions));
-GSCRegion *gregion_patch          PROTO((GSCRegion *patch, int *nregions));
 Image     *gtimes                 PROTO((int *NIMAGE));
 void       help                   PROTO(());
@@ -73 +67 @@
 int        save_image_db          PROTO(());
 void       sort_lists             PROTO((float *X, float *Y, int *S, int N));
-void       sort_regions           PROTO((GSCRegion *region, int N));
 void       unlock_image_db        PROTO((FITS_DB *db));
 void       usage                  PROTO(());

trunk/Ohana/src/delstar/src/orphans.c

@@ +1 @@
+// this file is a stub : fix up / clean up
 
 delete_orphans () {
-    ALLOCATE (region, GSCRegion, 1);
+    ALLOCATE (region, SkyRegion, 1);
     catalog.filename = argv[1];
     gcatalog (&catalog);

trunk/Ohana/src/delstar/src/sort_lists.c

@@ -46 +46 @@
 }
 
-void sort_regions (GSCRegion *region, int N) {
-
-  int l,j,ir,i;
-  GSCRegion tmp;
-  
-  l = N >> 1;
-  ir = N - 1;
-  for (;;) {
-    if (l > 0) {
-      l--;
-      tmp = region[l];
-    } else {
-      tmp = region[ir];
-      region[ir] = region[0];
-      if (--ir == 0) {
-        region[0] = tmp;
-        return;
-      }
-    }
-    i = l;
-    j = (l << 1) + 1;
-    while (j <= ir) {
-      if (j < ir && region[j].DEC[0] < region[j+1].DEC[0]) j++;
-      if (tmp.DEC[0] < region[j].DEC[0]) {
-        region[i] = region[j];
-        j += (i=j) + 1;
-      }
-      else j = ir + 1;
-    }
-    region[i] = tmp;
-  }
-}
-