Changeset 6706

Timestamp:

Mar 26, 2006, 2:51:06 PM (20 years ago)

Author:

eugene

Message:

moved to ChangeLog.txt

Location:

trunk/Ohana

Files:

• Configure.in (modified) (1 diff)
• Makefile (modified) (1 diff)
• src/elixir/src/MachineOps.c (modified) (2 diffs)
• src/imclean/doc/Changes.log (deleted)
• src/imregister/detrend/args.detregister.c (modified) (1 diff)
• src/imregister/detrend/imdef.c (modified) (1 diff)
• src/imregister/doc/Change.log (modified) (1 diff)
• src/misc/doc/Changes.log (deleted)
• src/nightd/doc/Changes.log (deleted)
• src/perl/doc/Changes.log (deleted)
• src/relphot/doc/Changes.log (deleted)

trunk/Ohana/Configure.in

@@ -34 +34 @@
 RANLIB-linux = ranlib
 RANLIB-lin64 = ranlib
+RANLIB-linrh = ranlib
 RANLIB = $(RANLIB-$(ARCH))

trunk/Ohana/Makefile

@@ -71 +71 @@
 LIBS-linux = libohana libfits libdvo libkapa libdummy
 LIBS-lin64 = libohana libfits libdvo libkapa libdummy
+LIBS-linrh = libohana libfits libdvo libkapa libdummy
 LIBS-sid   = libohana libfits libdvo libkapa libdummy
 LIBS-sol   = libohana libfits libdvo libkapa 

trunk/Ohana/src/elixir/src/MachineOps.c

@@ -410 +410 @@
 
   fprintf (stderr, "can't find this machine, process combination!\n");
-  fprintf (stderr, "machine: %lx, process: %lx\n", (size_t) machine, (size_t) process);
+  fprintf (stderr, "machine: %p process: %p\n", machine, process);
   return;
 }
@@ -437 +437 @@
 
   fprintf (stderr, "can't find an active process for this machine!\n");
-  fprintf (stderr, "machine: %lx\n", (size_t) machine);
+  fprintf (stderr, "machine: %p\n", machine);
 
 }

trunk/Ohana/src/imregister/detrend/args.detregister.c

@@ -40 +40 @@
  
   /* set optional label */
-  descriptor[0].imageID = strcreate ("test");
+  descriptor[0].imageID = NULL;
   if ((N = get_argument (argc, argv, "-ID"))) {
     remove_argument (N, &argc, argv);

trunk/Ohana/src/imregister/detrend/imdef.c

@@ -135 +135 @@
   }
 
-  /* set the image ID (!!!!) -- this is not being done.. */
-  if (fits_scan (&header, "CRUNID",   "%s", 1, line)) {
-    descriptor[0].imageID = strcreate (line);
+  /* set the image ID (if not supplied) based on the camera header */
+  if (descriptor[0].imageID == NULL) {
+    if (fits_scan (&header, "CRUNID",   "%s", 1, line)) {
+      descriptor[0].imageID = strcreate (line);
+    }
   }
+  if (descriptor[0].imageID == NULL) {
+    descriptor[0].imageID = strcreate ("test");
+  }  
   
   return (TRUE);

trunk/Ohana/src/imregister/doc/Change.log

@@ +1 @@
+
+imregister-1-4:
+  dropped IMAGE_CATALOG from config
+  fixed imageID if not in header
+  changed mkdirhier to updated version (libohana 1.7)
 
 imregister-1-3: