Changeset 3392

Timestamp:

Mar 7, 2005, 6:22:23 PM (21 years ago)

Author:

eugene

Message:

added notes and minor pieces

Location:

trunk/Ohana

Files:

• etc/distributions.txt (modified) (2 diffs)
• etc/mkdist (modified) (1 diff)
• src/addstar/doc/Changes.txt (added)
• src/addstar/doc/notes.txt (added)
• src/mosastro/doc/astrom.txt (added)
• src/mosastro/doc/update.txt (added)
• src/opihi/cmd.data/rd.c (modified) (1 diff)
• src/opihi/dvo/pmeasure.c (modified) (3 diffs)
• src/opihi/pantasks/LocalJob.c (added)
• src/opihi/pclient/notes.txt (added)
• src/opihi/pclient/outline.txt (added)
• src/opihi/scripts/run.pclient (added)
• src/opihi/scripts/testscript (added)

trunk/Ohana/etc/distributions.txt

@@ -3 +3 @@
 DISTRIBUTION elixir-config 1.1
  USE config-1-1    config
+END
+
+DISTRIBUTION elixir-config 1.2
+ USE config-1-2    config
 END
 
@@ -33 +37 @@
  USE libohana-1-1    libohana
  USE libfits-1-1     libfits
+END
+
+# complete elixir distribution
+DISTRIBUTION elixir-ohana 1.2
+
+ USE base
+
+ USE addrefs-1-0     addrefs
+ USE addspphot-1-0   addspphot
+ USE addstar-1-0     addstar
+ USE delstar-1-0     delstar
+ USE elixir-1-1      elixir
+ USE gastro-1-0      gastro
+ USE gcompare-1-0    gcompare
+ USE gophot-1-0      gophot
+ USE imclean-1-0     imclean
+ USE imregister-1-1  imregister
+ USE kapa-1-0        kapa
+ USE kii-1-1         kii
+ USE misc-1-0        misc
+ USE nightd-1-0      nightd
+ USE opihi-2-1       opihi.v2
+ USE perl-1-0        perl
+ USE relphot-1-0     relphot
+ USE shell-1-0       shell
+ USE tcl-1-0         tcl
+
+ USE libdummy-1-0    libdummy
+ USE libohana-1-2    libohana
+ USE libfits-1-2     libfits
 END
 

trunk/Ohana/etc/mkdist

@@ -56 +56 @@
 }
 
-&vsystem ("mv ohana $group-$version");
+if ($group eq "elixir-config") {
+    &vsystem ("mv config $group-$version");
+} else {
+    &vsystem ("mv ohana $group-$version");
+}
 &vsystem ("rm -r `find $group-$version -name CVS`");
 &vsystem ("tar cvzf $group-$version.tgz  $group-$version");

trunk/Ohana/src/opihi/cmd.data/rd.c

@@ -121 +121 @@
     if (CCDKeyword == (char *) NULL) {
       fprintf (stderr, "CCDKEYWORD variable is not set; ");
-      fprintf (stderr, "using IMAGEID as default\n");
-      CCDKeyword = strcreate ("IMAGEID");
+      fprintf (stderr, "using EXTNAME as default\n");
+      CCDKeyword = strcreate ("EXTNAME");
     }
     done = FALSE;

trunk/Ohana/src/opihi/dvo/pmeasure.c

@@ -11 +11 @@
   unsigned IDclip, IDchoice, LimExclude;
   unsigned FlagChoice, FlagClip, flags;
+  int PhotcodeClip;
 
   Catalog catalog;
@@ -29 +30 @@
   Rmax = graphmode.coords.crval1 + 182.0;
 
+  PhotcodeClip = -1;
+  if (N = get_argument (argc, argv, "-p")) {
+    remove_argument (N, &argc, argv);
+    PhotcodeClip = GetPhotcodeCodebyName (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
   IDclip = FALSE;
   if (N = get_argument (argc, argv, "-ID")) {
@@ -120 +127 @@
           if (!(flags & FlagChoice)) continue;
         }
+        if ((PhotcodeClip != -1) && (catalog.measure[m+k].source != PhotcodeClip)) continue;
         mag = PhotCat (&catalog.measure[m+k]);
         Zvec.elements[N] = MIN (1.0, MAX (0.01, (mag - Mz) / Mr));